nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

i3bar: Don't start child unless status_command 

If a command is passed to `start_child` which is NULL, such as in the
case when there is no `status_command` specified in the bar config, do
not start a child process to listen on stdin.

fixes #1140
This commit is contained in:
Tony Crisci 2013-12-26 22:00:06 -05:00 committed by Michael Stapelberg
parent 38b6936c25
commit ac74a63662
3 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
i3bar/src/child.c
View File

@ -452,10 +452,16 @@ void child_write_output(void) {
/* /*
* Start a child-process with the specified command and reroute stdin. * Start a child-process with the specified command and reroute stdin.
* We actually start a $SHELL to execute the command so we don't have to care * We actually start a $SHELL to execute the command so we don't have to care
* about arguments and such * about arguments and such.
*
* If `command' is NULL, such as in the case when no `status_command' is given
* in the bar config, no child will be started.
* *
*/ */
void start_child(char *command) { void start_child(char *command) {
if (command == NULL)
return;
/* Allocate a yajl parser which will be used to parse stdin. */ /* Allocate a yajl parser which will be used to parse stdin. */
memset(&callbacks, '\0', sizeof(yajl_callbacks)); memset(&callbacks, '\0', sizeof(yajl_callbacks));
callbacks.yajl_map_key = stdin_map_key; callbacks.yajl_map_key = stdin_map_key;
@ -478,43 +484,41 @@ void start_child(char *command) {
gen = yajl_gen_alloc(NULL); gen = yajl_gen_alloc(NULL);
#endif #endif
if (command != NULL) { int pipe_in[2]; /* pipe we read from */
int pipe_in[2]; /* pipe we read from */ int pipe_out[2]; /* pipe we write to */
int pipe_out[2]; /* pipe we write to */
if (pipe(pipe_in) == -1) if (pipe(pipe_in) == -1)
err(EXIT_FAILURE, "pipe(pipe_in)"); err(EXIT_FAILURE, "pipe(pipe_in)");
if (pipe(pipe_out) == -1) if (pipe(pipe_out) == -1)
err(EXIT_FAILURE, "pipe(pipe_out)"); err(EXIT_FAILURE, "pipe(pipe_out)");
child.pid = fork(); child.pid = fork();
switch (child.pid) { switch (child.pid) {
case -1: case -1:
ELOG("Couldn't fork(): %s\n", strerror(errno)); ELOG("Couldn't fork(): %s\n", strerror(errno));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
case 0: case 0:
/* Child-process. Reroute streams and start shell */ /* Child-process. Reroute streams and start shell */
close(pipe_in[0]); close(pipe_in[0]);
close(pipe_out[1]); close(pipe_out[1]);
dup2(pipe_in[1], STDOUT_FILENO); dup2(pipe_in[1], STDOUT_FILENO);
dup2(pipe_out[0], STDIN_FILENO); dup2(pipe_out[0], STDIN_FILENO);
setpgid(child.pid, 0); setpgid(child.pid, 0);
execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, (char*) NULL); execl(_PATH_BSHELL, _PATH_BSHELL, "-c", command, (char*) NULL);
return; return;
default: default:
/* Parent-process. Reroute streams */ /* Parent-process. Reroute streams */
close(pipe_in[1]); close(pipe_in[1]);
close(pipe_out[0]); close(pipe_out[0]);
dup2(pipe_in[0], STDIN_FILENO); dup2(pipe_in[0], STDIN_FILENO);
child_stdin = pipe_out[1]; child_stdin = pipe_out[1];
break; break;
}
} }
/* We set O_NONBLOCK because blocking is evil in event-driven software */ /* We set O_NONBLOCK because blocking is evil in event-driven software */

4
i3bar/src/config.c
View File

@ -127,10 +127,6 @@ static int config_string_cb(void *params_, const unsigned char *val, unsigned in
} }
if (!strcmp(cur_key, "status_command")) { if (!strcmp(cur_key, "status_command")) {
/* We cannot directly start the child here, because start_child() also
* needs to be run when no command was specified (to setup stdin).
* Therefore we save the command in 'config' and access it later in
* got_bar_config() */
DLOG("command = %.*s\n", len, val); DLOG("command = %.*s\n", len, val);
sasprintf(&config.command, "%.*s", len, val); sasprintf(&config.command, "%.*s", len, val);
return 1; return 1;

3
i3bar/src/ipc.c
View File

@ -100,9 +100,6 @@ void got_bar_config(char *reply) {
/* Resolve color strings to colorpixels and save them, then free the strings. */ /* Resolve color strings to colorpixels and save them, then free the strings. */
init_colors(&(config.colors)); init_colors(&(config.colors));
/* The name of this function is actually misleading. Even if no command is
* specified, this function initiates the watchers to listen on stdin and
* react accordingly */
start_child(config.command); start_child(config.command);
FREE(config.command); FREE(config.command);
} }