X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=5f92888979387b3dbe443b085e98ae0d9632ebe8;hp=73bc2cf36bc0bbd51f43490548c2241e65bf13b0;hb=017a63ecd7f2ff30233b50d455355400197bb660;hpb=a535ae69516f69b594eb7199175f7f4559152a4e

diff --git a/audioc.c b/audioc.c
index 73bc2cf3..5f928889 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,6 +9,7 @@
 #include <regex.h>
 #include <sys/types.h>
 #include <stdbool.h>
+#include <signal.h>
 
 #include "audioc.cmdline.h"
 #include "para.h"
@@ -297,7 +298,9 @@ int main(int argc, char *argv[])
 			.check_required = 0,
 			.check_ambiguity = 0
 		};
-		if (audioc_cmdline_parser_config_file(cf, &conf, &params)) {
+		ret = audioc_cmdline_parser_config_file(cf, &conf, &params);
+		free(cf);
+		if (ret) {
 			fprintf(stderr, "parse error in config file\n");
 			exit(EXIT_FAILURE);
 		}
@@ -331,6 +334,9 @@ int main(int argc, char *argv[])
 		goto out;
 	bufsize = conf.bufsize_arg;
 	buf = para_malloc(bufsize);
+	ret = mark_fd_blocking(STDOUT_FILENO);
+	if (ret < 0)
+		goto out;
 	do {
 		size_t n = ret = recv_bin_buffer(fd, buf, bufsize);
 		if (ret <= 0)
@@ -338,6 +344,7 @@ int main(int argc, char *argv[])
 		ret = write_all(STDOUT_FILENO, buf, &n);
 	} while (ret >= 0);
 out:
+	free(buf);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;