Update changelog and copyright, bump version and more

[i3/i3] / i3bar / src / child.c

diff --git a/i3bar/src/child.c b/i3bar/src/child.c
index 97162cb4bacc0125cfaba0b620ac447d1368988d..3f59d060f51979d15fd367a9444d8d3eb7f451a2 100644 (file)
--- a/i3bar/src/child.c
+++ b/i3bar/src/child.c
@@ -1,7 +1,7 @@
 /*
  * 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
  *
@@ -11,6 +11,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <signal.h>
 #include <stdio.h>
 #include <fcntl.h>
@@ -20,20 +21,31 @@
 
 #include "common.h"
 
+/* Global variables for child_*() */
+pid_t child_pid;
+
 /* stdin- and sigchild-watchers */
 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);
+    }
+
+    if (child_sig != NULL) {
+        ev_child_stop(main_loop, child_sig);
+        FREE(child_sig);
+    }
 }
 
 /*
@@ -47,7 +59,7 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
     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) {
@@ -56,32 +68,38 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
                 buffer[rec-1] = '\0';
                 break;
             }
-            printf("ERROR: read() failed!");
+            ELOG("read() failed!: %s\n", strerror(errno));
             exit(EXIT_FAILURE);
         }
         if (n == 0) {
-            if (rec == buffer_len) {
-                char *tmp = buffer;
-                buffer = malloc(buffer_len + STDIN_CHUNK_SIZE);
-                memset(buffer, '\0', buffer_len);
-                strncpy(buffer, tmp, buffer_len);
-                buffer_len += STDIN_CHUNK_SIZE;
-                FREE(tmp);
-            } else {
+            if (rec != 0) {
                 /* remove trailing newline and finish up */
                 buffer[rec-1] = '\0';
-                break;
             }
+
+            /* end of file, kill the watcher */
+            DLOG("stdin: EOF\n");
+            cleanup();
+            break;
         }
         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;
-    printf("%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();
 }
 
@@ -92,7 +110,7 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
  *
  */
 void child_sig_cb(struct ev_loop *loop, ev_child *watcher, int revents) {
-    printf("Child (pid: %d) unexpectedly exited with status %d\n",
+    DLOG("Child (pid: %d) unexpectedly exited with status %d\n",
            child_pid,
            watcher->rstatus);
     cleanup();
@@ -112,9 +130,10 @@ void start_child(char *command) {
         child_pid = fork();
         switch (child_pid) {
             case -1:
-                printf("ERROR: Couldn't fork()");
+                ELOG("Couldn't fork(): %s\n", strerror(errno));
                 exit(EXIT_FAILURE);
             case 0:
+                /* Child-process. Reroute stdout and start shell */
                 close(fd[0]);
 
                 dup2(fd[1], STDOUT_FILENO);
@@ -127,14 +146,22 @@ void start_child(char *command) {
                 execl(shell, shell, "-c", command, (char*) NULL);
                 return;
             default:
+                /* Parent-process. Rerout stdin */
                 close(fd[1]);
 
                 dup2(fd[0], STDIN_FILENO);
 
+                /* 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();
+                }
+
                 break;
         }
     }
 
+    /* We set O_NONBLOCK because blocking is evil in event-driven software */
     fcntl(STDIN_FILENO, F_SETFL, O_NONBLOCK);
 
     stdin_io = malloc(sizeof(ev_io));
@@ -155,9 +182,13 @@ void start_child(char *command) {
  */
 void kill_child() {
     if (child_pid != 0) {
-        kill(child_pid, SIGQUIT);
+        kill(child_pid, SIGCONT);
+        kill(child_pid, SIGTERM);
+        int status;
+        waitpid(child_pid, &status, 0);
+        child_pid = 0;
+        cleanup();
     }
-    cleanup();
 }
 
 /*