X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audioc.c;h=0c0eea47985f7cd0343ea791709895b25c15d940;hp=e12d6e98fce4baa902d03e21c48aee4fba0237da;hb=d4b040af5e31260dbf71f4547484179f32be4746;hpb=65dfcde0ee400d5a32a06122eb47d03d2139212c

diff --git a/audioc.c b/audioc.c
index e12d6e98..0c0eea47 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.
  */
@@ -253,16 +253,15 @@ __noreturn static void print_completions(void)
 
 static char *configfile_exists(void)
 {
-	static char *config_file;
+	char *config_file;
 	struct stat statbuf;
+	char *home = para_homedir();
 
-	if (!config_file) {
-		char *home = para_homedir();
-		config_file = make_message("%s/.paraslash/audioc.conf", home);
-		free(home);
-	}
+	config_file = make_message("%s/.paraslash/audioc.conf", home);
+	free(home);
 	if (!stat(config_file, &statbuf))
 		return config_file;
+	free(config_file);
 	return NULL;
 }
 
@@ -284,7 +283,7 @@ static char *configfile_exists(void)
 int main(int argc, char *argv[])
 {
 	int ret = -E_AUDIOC_SYNTAX, fd;
-	char *cf, *buf = NULL, *args;
+	char *cf, *buf = NULL, *args = NULL;
 	size_t bufsize;
 
 	if (audioc_cmdline_parser(argc, argv, &conf))
@@ -298,7 +297,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);
 		}
@@ -332,6 +333,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)
@@ -339,6 +343,8 @@ int main(int argc, char *argv[])
 		ret = write_all(STDOUT_FILENO, buf, &n);
 	} while (ret >= 0);
 out:
+	free(buf);
+	free(args);
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;