/*
+ * vim:ts=4:sw=4:expandtab
+ *
* i3bar - an xcb-based status- and ws-bar for i3
*
- * © 2010 Axel Wagner and contributors
+ * © 2010-2011 Axel Wagner and contributors
*
* See file LICNSE for license information
*
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
-#include <signal.h>
#include <sys/wait.h>
+#include <signal.h>
#include <stdio.h>
#include <fcntl.h>
#include <string.h>
ev_io *stdin_io;
ev_child *child_sig;
+/* The buffer statusline points to */
+char *statusline_buffer = NULL;
+
/*
* Stop and free() the stdin- and sigchild-watchers
*
*/
void cleanup() {
- ev_io_stop(main_loop, stdin_io);
- ev_child_stop(main_loop, child_sig);
- FREE(stdin_io);
- FREE(child_sig);
- FREE(statusline);
+ if (stdin_io != NULL) {
+ ev_io_stop(main_loop, stdin_io);
+ FREE(stdin_io);
+ FREE(statusline_buffer);
+ /* statusline pointed to memory within statusline_buffer */
+ statusline = NULL;
+ }
+
+ if (child_sig != NULL) {
+ ev_child_stop(main_loop, child_sig);
+ FREE(child_sig);
+ }
}
/*
int rec = 0;
int buffer_len = STDIN_CHUNK_SIZE;
char *buffer = malloc(buffer_len);
- memset(buffer, '\0', buffer_len);
+ buffer[0] = '\0';
while(1) {
n = read(fd, buffer + rec, buffer_len - rec);
if (n == -1) {
buffer[rec-1] = '\0';
break;
}
- ELOG("read() failed!\n");
+ ELOG("read() failed!: %s\n", strerror(errno));
exit(EXIT_FAILURE);
}
if (n == 0) {
- if (rec == buffer_len) {
- buffer_len += STDIN_CHUNK_SIZE;
- buffer = realloc(buffer, buffer_len);
- } else {
+ if (rec != 0) {
/* remove trailing newline and finish up */
buffer[rec-1] = '\0';
- break;
}
+
+ /* end of file, kill the watcher */
+ ELOG("stdin: received EOF\n");
+ cleanup();
+ draw_bars();
+ return;
}
rec += n;
+
+ if (rec == buffer_len) {
+ buffer_len += STDIN_CHUNK_SIZE;
+ buffer = realloc(buffer, buffer_len);
+ }
}
- if (strlen(buffer) == 0) {
+ if (*buffer == '\0') {
FREE(buffer);
return;
}
- FREE(statusline);
- statusline = buffer;
- DLOG("%s\n", buffer);
+ FREE(statusline_buffer);
+ statusline = statusline_buffer = buffer;
+ for (n = 0; buffer[n] != '\0'; ++n) {
+ if (buffer[n] == '\n')
+ statusline = &buffer[n + 1];
+ }
+ DLOG("%s\n", statusline);
draw_bars();
}
*
*/
void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) {
- DLOG("Child (pid: %d) unexpectedly exited with status %d\n",
+ ELOG("Child (pid: %d) unexpectedly exited with status %d\n",
child_pid,
watcher->rstatus);
cleanup();
/*
* 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
- * about arguments and such.
- * We also double-fork() to avoid zombies and pass the pid of the child through a
- * temporary pipe back to i3bar
+ * about arguments and such
*
*/
void start_child(char *command) {
child_pid = 0;
if (command != NULL) {
- int fd[2], tmp[2];
- /* This pipe will be used to communicate between e.g. i3status and i3bar */
+ int fd[2];
pipe(fd);
- /* We also need this temporary pipe to get back the pid of i3status */
- pipe(tmp);
- switch (fork()) {
+ child_pid = fork();
+ switch (child_pid) {
case -1:
- ELOG("Couldn't fork()\n");
+ ELOG("Couldn't fork(): %s\n", strerror(errno));
exit(EXIT_FAILURE);
case 0:
- /* Double-fork(), so the child gets reparented to init */
- switch(child_pid = fork()) {
- case -1:
- ELOG("Couldn't fork() twice\n");
- exit(EXIT_FAILURE);
- case 0:
- /* Child-process. Reroute stdout and start shell */
- close(fd[0]);
-
- dup2(fd[1], STDOUT_FILENO);
-
- static const char *shell = NULL;
-
- if ((shell = getenv("SHELL")) == NULL)
- shell = "/bin/sh";
-
- execl(shell, shell, "-c", command, (char*) NULL);
- return;
- default:
- /* Temporary parent. We tell i3bar about the pid of i3status and exit */
- write(tmp[1], &child_pid, sizeof(int));
- close(tmp[0]);
- close(tmp[1]);
- exit(EXIT_SUCCESS);
- }
+ /* Child-process. Reroute stdout and start shell */
+ close(fd[0]);
+
+ dup2(fd[1], STDOUT_FILENO);
+
+ static const char *shell = NULL;
+
+ if ((shell = getenv("SHELL")) == NULL)
+ shell = "/bin/sh";
+
+ execl(shell, shell, "-c", command, (char*) NULL);
+ return;
default:
/* Parent-process. Rerout stdin */
close(fd[1]);
dup2(fd[0], STDIN_FILENO);
- /* We also need to get the pid of i3status from the temporary pipe */
- size_t rec = 0;
- while (rec < sizeof(int)) {
- rec += read(tmp[0], &child_pid, sizeof(int) - rec);
+ /* If hide-on-modifier is set, we start of by sending the
+ * child a SIGSTOP, because the bars aren't mapped at start */
+ if (config.hide_on_modifier) {
+ stop_child();
}
- /* The temporary pipe is no longer needed */
- close(tmp[0]);
- close(tmp[1]);
+
break;
}
}
- wait(0);
/* We set O_NONBLOCK because blocking is evil in event-driven software */
fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK);
*/
void kill_child() {
if (child_pid != 0) {
+ kill(child_pid, SIGCONT);
kill(child_pid, SIGTERM);
+ int status;
+ waitpid(child_pid, &status, 0);
+ child_pid = 0;
+ cleanup();
}
- cleanup();
}
/*
projects / i3 / i3 / blobdiff