X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audioc.c;h=b0f822b733d42b3cc22eadc2515cbbb3e61439a7;hb=625fdbbafaf3842753bff02b349eaaf9554d846d;hp=64152ce09323bc9b458f38ff09272f94e949db38;hpb=d73a140ae7f77a18f858a66d1a354d106088c6ca;p=paraslash.git

diff --git a/audioc.c b/audioc.c
index 64152ce0..b0f822b7 100644
--- a/audioc.c
+++ b/audioc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -106,7 +106,7 @@ static void audioc_pre_select(struct sched *s, struct task *t)
 	para_fd_set(at->fd, &s->rfds, &s->max_fileno);
 }
 
-static void audioc_post_select(struct sched *s, struct task *t)
+static int audioc_post_select(struct sched *s, struct task *t)
 {
 	char *buf = NULL;
 	struct audioc_task *at = container_of(t, struct audioc_task, task);
@@ -115,7 +115,7 @@ static void audioc_post_select(struct sched *s, struct task *t)
 	if (ret < 0)
 		goto out;
 	if (!FD_ISSET(at->fd, &s->rfds))
-		return;
+		return 0;
 	buf = para_malloc(conf.bufsize_arg);
 	ret = recv_bin_buffer(at->fd, buf, conf.bufsize_arg);
 	PARA_DEBUG_LOG("recv: %d\n", ret);
@@ -124,16 +124,14 @@ static void audioc_post_select(struct sched *s, struct task *t)
 	if (ret < 0)
 		goto out;
 	btr_add_output(buf, ret, at->btrn);
-	return;
+	return 0;
 out:
 	if (ret < 0) {
 		free(buf);
-		btr_remove_node(at->btrn);
-		btr_free_node(at->btrn);
-		at->btrn = NULL;
+		btr_remove_node(&at->btrn);
 		close(at->fd);
 	}
-	t->error = ret;
+	return ret;
 }
 
 static struct audioc_task audioc_task = {
@@ -253,16 +251,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;
 }
 
@@ -272,10 +269,11 @@ static char *configfile_exists(void)
  * \param argc Usual argument count.
  * \param argv Usual argument vector.
  *
- * It creates a temporary local socket in order to communicate with para_audiod.
- * Authentication consists in sending a ucred buffer that contains the user id.
+ * It connects to the "well-known" local socket to communicate with
+ * para_audiod. Authentication is performed by sending a ucred buffer
+ * containing the user id to the local socket.
  *
- * Any output received through the local socket is sent to stdout.
+ * Any data received from the socket is written to stdout.
  *
  * \return EXIT_SUCCESS or EXIT_FAILURE.
  *
@@ -283,12 +281,11 @@ static char *configfile_exists(void)
  */
 int main(int argc, char *argv[])
 {
-	int ret = -E_AUDIOC_SYNTAX, fd;
+	int ret, fd;
 	char *cf, *buf = NULL, *args = NULL;
 	size_t bufsize;
 
-	if (audioc_cmdline_parser(argc, argv, &conf))
-		goto out;
+	audioc_cmdline_parser(argc, argv, &conf);
 	HANDLE_VERSION_FLAG("audioc", conf);
 	cf = configfile_exists();
 	if (cf) {
@@ -296,14 +293,12 @@ int main(int argc, char *argv[])
 			.override = 0,
 			.initialize = 0,
 			.check_required = 0,
-			.check_ambiguity = 0
+			.check_ambiguity = 0,
+			.print_errors = 1,
+
 		};
-		ret = audioc_cmdline_parser_config_file(cf, &conf, &params);
+		audioc_cmdline_parser_config_file(cf, &conf, &params);
 		free(cf);
-		if (ret) {
-			fprintf(stderr, "parse error in config file\n");
-			exit(EXIT_FAILURE);
-		}
 	}
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (conf.socket_given)
@@ -341,7 +336,7 @@ int main(int argc, char *argv[])
 		size_t n = ret = recv_bin_buffer(fd, buf, bufsize);
 		if (ret <= 0)
 			break;
-		ret = write_all(STDOUT_FILENO, buf, &n);
+		ret = write_all(STDOUT_FILENO, buf, n);
 	} while (ret >= 0);
 out:
 	free(buf);