/*
* 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 <sys/wait.h>
#include <signal.h>
#include <stdio.h>
#include <fcntl.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();
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:
/* Child-process. Reroute stdout and start shell */
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;
}
}
*/
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();
}
/*