X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audioc.c;h=164a1554f0ee2ceba94f6a509ea4911fba8a66f9;hb=042767ce4032ee7bec7df1716411a175259cfbf1;hp=d3e092e29301f71e02948259483623e56967966f;hpb=6101e63b98b5517b65bd967e6efbb0af47738084;p=paraslash.git

diff --git a/audioc.c b/audioc.c
index d3e092e2..164a1554 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.
  */
@@ -17,6 +17,7 @@
 #include "net.h"
 #include "string.h"
 #include "fd.h"
+#include "ggo.h"
 #include "version.h"
 
 INIT_AUDIOC_ERRLISTS;
@@ -106,7 +107,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 +116,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 +125,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 = {
@@ -196,7 +195,7 @@ __noreturn static void interactive_session(void)
 		.loglevel = loglevel,
 		.completers = audiod_completers,
 	};
-	PARA_NOTICE_LOG("\n%s\n", VERSION_TEXT("audioc"));
+	PARA_NOTICE_LOG("\n%s\n", version_text("audioc"));
 	if (conf.history_file_given)
 		history_file = para_strdup(conf.history_file_arg);
 	else {
@@ -265,6 +264,15 @@ static char *configfile_exists(void)
 	return NULL;
 }
 
+__noreturn static void print_help_and_die(void)
+{
+	struct ggo_help h = DEFINE_GGO_HELP(audioc);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	exit(0);
+}
+
 /**
  * The client program to connect to para_audiod.
  *
@@ -283,29 +291,29 @@ 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;
-	HANDLE_VERSION_FLAG("audioc", conf);
+	audioc_cmdline_parser(argc, argv, &conf);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	version_handle_flag("audioc", conf.version_given);
+	if (conf.help_given || conf.detailed_help_given)
+		print_help_and_die();
 	cf = configfile_exists();
 	if (cf) {
 		struct audioc_cmdline_parser_params params = {
 			.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);
 	}
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (conf.socket_given)
 		socket_name = para_strdup(conf.socket_arg);
 	else {