X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui_common.c;h=26c3d61b73feacd5b77d45e86767944ef5680564;hp=07cab16fe211c740c7a25a484e1fee5271490498;hb=34762fdc56d5294c15e03fda433ecfccdc6c5fb2;hpb=19c9891a4083cf0d5d7ee82b09bed71a1059f71e diff --git a/gui_common.c b/gui_common.c index 07cab16f..26c3d61b 100644 --- a/gui_common.c +++ b/gui_common.c @@ -1,19 +1,25 @@ #include "para.h" +#include "fd.h" extern const char *status_item_list[NUM_STAT_ITEMS]; - int para_open_audiod_pipe(char *cmd) { int fds[3] = {0, 1, 0}; pid_t pid; - return para_exec_cmdline_pid(&pid, cmd, fds) > 0? - fds[1] : -1; + int ret = para_exec_cmdline_pid(&pid, cmd, fds); + if (ret < 0) + return ret; + ret = mark_fd_nonblock(fds[1]); + if (ret > 0) + return fds[1]; + close(fds[1]); + return ret; } int read_audiod_pipe(int fd, void (*line_handler)(char *) ) { - static char buf[STRINGSIZE]; + static char buf[4096]; const ssize_t bufsize = sizeof(buf) - 1; static ssize_t loaded; ssize_t ret;