X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui_common.c;h=26c3d61b73feacd5b77d45e86767944ef5680564;hp=d806ebe2df2b6e741ce80837fc59e3c28acb9536;hb=34762fdc56d5294c15e03fda433ecfccdc6c5fb2;hpb=ef1066346672b1a83a4d2146e61659984a3b97fd

diff --git a/gui_common.c b/gui_common.c
index d806ebe2..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;
@@ -24,7 +30,7 @@ int read_audiod_pipe(int fd, void (*line_handler)(char *) )
 	if (ret > 0) {
 		loaded += ret;
 		buf[loaded] = '\0';
-		loaded = for_each_line(buf, loaded, line_handler, 0);
+		loaded = for_each_line(buf, loaded, line_handler);
 	}
 	return ret;
 }