Separate the lines received in a single read.
Fixes the case where multiple lines are read in a single read syscall (it could be better optimized in the future). Also fixes a memory corruption issue when rec == 0.
This commit is contained in:
parent
cd4b77ab72
commit
96e14d8103
|
@ -14,6 +14,7 @@ typedef int bool;
|
|||
|
||||
struct ev_loop* main_loop;
|
||||
char *statusline;
|
||||
char *statusline_buffer;
|
||||
|
||||
struct rect_t {
|
||||
int x;
|
||||
|
|
|
@ -27,6 +27,9 @@ pid_t child_pid;
|
|||
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
|
||||
*
|
||||
|
@ -36,7 +39,7 @@ void cleanup() {
|
|||
ev_child_stop(main_loop, child_sig);
|
||||
FREE(stdin_io);
|
||||
FREE(child_sig);
|
||||
FREE(statusline);
|
||||
FREE(statusline_buffer);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -50,7 +53,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) {
|
||||
|
@ -67,8 +70,10 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
|
|||
buffer_len += STDIN_CHUNK_SIZE;
|
||||
buffer = realloc(buffer, buffer_len);
|
||||
} else {
|
||||
/* remove trailing newline and finish up */
|
||||
buffer[rec-1] = '\0';
|
||||
if (rec != 0) {
|
||||
/* remove trailing newline and finish up */
|
||||
buffer[rec-1] = '\0';
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -78,9 +83,13 @@ void stdin_io_cb(struct ev_loop *loop, ev_io *watcher, int revents) {
|
|||
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();
|
||||
}
|
||||
|
||||
|
|
|
@ -249,7 +249,7 @@ int main(int argc, char **argv) {
|
|||
|
||||
FREE(socket_path);
|
||||
|
||||
FREE(statusline);
|
||||
FREE(statusline_buffer);
|
||||
|
||||
clean_xcb();
|
||||
ev_default_destroy();
|
||||
|
|
Loading…
Reference in New Issue