pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): Conform to musl libc

Browse Source
This commit is contained in:
Michael Carlberg 2016-06-14 13:17:03 +02:00
parent fc2a6ed795
commit 939a704764
4 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/services/command.hpp
View File

@ -15,8 +15,8 @@ class Command
protected:
std::string cmd;
int stdout[2];
int stdin[2];
int fd_stdout[2];
int fd_stdin[2];
pid_t fork_pid;
int fork_status;

51
src/services/command.cpp
View File

@ -4,6 +4,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <signal.h>
#include <sys/wait.h>
#include "lemonbuddy.hpp"
#include "services/command.hpp"
@ -30,18 +31,18 @@ Command::Command(const std::string& cmd, int stdout[2], int stdin[2])
: cmd(cmd)
{
if (stdin != nullptr) {
this->stdin[PIPE_READ] = stdin[PIPE_READ];
this->stdin[PIPE_WRITE] = stdin[PIPE_WRITE];
} else if (false == proc::pipe(this->stdin))
this->fd_stdin[PIPE_READ] = stdin[PIPE_READ];
this->fd_stdin[PIPE_WRITE] = stdin[PIPE_WRITE];
} else if (false == proc::pipe(this->fd_stdin))
throw CommandException("Failed to allocate pipe");
if (stdout != nullptr) {
this->stdout[PIPE_READ] = stdout[PIPE_READ];
this->stdout[PIPE_WRITE] = stdout[PIPE_WRITE];
} else if (false == proc::pipe(this->stdout)) {
if ((this->stdin[PIPE_READ] = close(this->stdin[PIPE_READ])) == -1)
this->fd_stdout[PIPE_READ] = stdout[PIPE_READ];
this->fd_stdout[PIPE_WRITE] = stdout[PIPE_WRITE];
} else if (false == proc::pipe(this->fd_stdout)) {
if ((this->fd_stdin[PIPE_READ] = close(this->fd_stdin[PIPE_READ])) == -1)
throw CommandException("Failed to close fd: "+ StrErrno());
if ((this->stdin[PIPE_WRITE] = close(this->stdin[PIPE_WRITE])) == -1)
if ((this->fd_stdin[PIPE_WRITE] = close(this->fd_stdin[PIPE_WRITE])) == -1)
throw CommandException("Failed to close fd: "+ StrErrno());
throw CommandException("Failed to allocate pipe");
}
@ -49,13 +50,13 @@ Command::Command(const std::string& cmd, int stdout[2], int stdin[2])
Command::~Command()
{
if (this->stdin[PIPE_READ] > 0 && (close(this->stdin[PIPE_READ]) == -1))
if (this->fd_stdin[PIPE_READ] > 0 && (close(this->fd_stdin[PIPE_READ]) == -1))
log_error("Failed to close fd: "+ StrErrno());
if (this->stdin[PIPE_WRITE] > 0 && (close(this->stdin[PIPE_WRITE]) == -1))
if (this->fd_stdin[PIPE_WRITE] > 0 && (close(this->fd_stdin[PIPE_WRITE]) == -1))
log_error("Failed to close fd: "+ StrErrno());
if (this->stdout[PIPE_READ] > 0 && (close(this->stdout[PIPE_READ]) == -1))
if (this->fd_stdout[PIPE_READ] > 0 && (close(this->fd_stdout[PIPE_READ]) == -1))
log_error("Failed to close fd: "+ StrErrno());
if (this->stdout[PIPE_WRITE] > 0 && (close(this->stdout[PIPE_WRITE]) == -1))
if (this->fd_stdout[PIPE_WRITE] > 0 && (close(this->fd_stdout[PIPE_WRITE]) == -1))
log_error("Failed to close fd: "+ StrErrno());
}
@ -65,21 +66,21 @@ int Command::exec(bool wait_for_completion)
throw CommandException("Failed to fork process: "+ StrErrno());
if (proc::in_forked_process(this->fork_pid)) {
if (dup2(this->stdin[PIPE_READ], STDIN_FILENO) == -1)
if (dup2(this->fd_stdin[PIPE_READ], STDIN_FILENO) == -1)
throw CommandException("Failed to redirect stdin in child process");
if (dup2(this->stdout[PIPE_WRITE], STDOUT_FILENO) == -1)
if (dup2(this->fd_stdout[PIPE_WRITE], STDOUT_FILENO) == -1)
throw CommandException("Failed to redirect stdout in child process");
if (dup2(this->stdout[PIPE_WRITE], STDERR_FILENO) == -1)
if (dup2(this->fd_stdout[PIPE_WRITE], STDERR_FILENO) == -1)
throw CommandException("Failed to redirect stderr in child process");
// Close file descriptors that won't be used by forked process
if ((this->stdin[PIPE_READ] = close(this->stdin[PIPE_READ])) == -1)
if ((this->fd_stdin[PIPE_READ] = close(this->fd_stdin[PIPE_READ])) == -1)
throw CommandException("Failed to close fd: "+ StrErrno());
if ((this->stdin[PIPE_WRITE] = close(this->stdin[PIPE_WRITE])) == -1)
if ((this->fd_stdin[PIPE_WRITE] = close(this->fd_stdin[PIPE_WRITE])) == -1)
throw CommandException("Failed to close fd: "+ StrErrno());
if ((this->stdout[PIPE_READ] = close(this->stdout[PIPE_READ])) == -1)
if ((this->fd_stdout[PIPE_READ] = close(this->fd_stdout[PIPE_READ])) == -1)
throw CommandException("Failed to close fd: "+ StrErrno());
if ((this->stdout[PIPE_WRITE] = close(this->stdout[PIPE_WRITE])) == -1)
if ((this->fd_stdout[PIPE_WRITE] = close(this->fd_stdout[PIPE_WRITE])) == -1)
throw CommandException("Failed to close fd: "+ StrErrno());
// Replace the forked process with the given command
@ -89,9 +90,9 @@ int Command::exec(bool wait_for_completion)
register_pid(this->fork_pid);
// Close file descriptors that won't be used by parent process
if ((this->stdin[PIPE_READ] = close(this->stdin[PIPE_READ])) == -1)
if ((this->fd_stdin[PIPE_READ] = close(this->fd_stdin[PIPE_READ])) == -1)
throw CommandException("Failed to close fd: "+ StrErrno());
if ((this->stdout[PIPE_WRITE] = close(this->stdout[PIPE_WRITE])) == -1)
if ((this->fd_stdout[PIPE_WRITE] = close(this->fd_stdout[PIPE_WRITE])) == -1)
throw CommandException("Failed to close fd: "+ StrErrno());
if (wait_for_completion)
@ -131,19 +132,19 @@ int Command::wait()
}
void Command::tail(std::function<void(std::string)> callback) {
io::tail(this->stdout[PIPE_READ], callback);
io::tail(this->fd_stdout[PIPE_READ], callback);
}
int Command::writeline(const std::string& data) {
return io::writeline(this->stdin[PIPE_WRITE], data);
return io::writeline(this->fd_stdin[PIPE_WRITE], data);
}
int Command::get_stdout(int c) {
return this->stdout[c];
return this->fd_stdout[c];
}
// int Command::get_stdin(int c) {
// return this->stdin[c];
// return this->fd_stdin[c];
// }
pid_t Command::get_pid() {

2
src/utils/proc.cpp
View File

@ -80,7 +80,7 @@ namespace proc
}
pid_t wait(int *status) {
return ::wait(&status);
return ::wait(status);
}
pid_t wait_for_completion(pid_t pid, int *status, int options)

3
src/utils/xlib.cpp
View File

@ -1,7 +1,4 @@
#include <algorithm>
// #include <cstring>
// #include <X11/Xos.h>
// #include <X11/Xutil.h>
#include <X11/extensions/Xrandr.h>
#include "utils/memory.hpp"