X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=c17a4ae444fad58f597c1f886c0c573d463cd88b;hp=693577794627c83c5e369164c76a075eb6375d56;hb=ac3208b6651ae6e33d0dc8b6c408cc106cb613da;hpb=552bece901fe44668ac418b2aabb92a4a7750458

diff --git a/audiod.c b/audiod.c
index 69357779..c17a4ae4 100644
--- a/audiod.c
+++ b/audiod.c
@@ -757,13 +757,12 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void signal_post_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = container_of(t, struct signal_task, task);
-	int signum;
 
 	if (!FD_ISSET(st->fd, &s->rfds))
 		return;
 
-	signum = para_next_signal();
-	switch (signum) {
+	st->signum = para_next_signal();
+	switch (st->signum) {
 	case SIGINT:
 	case SIGTERM:
 	case SIGHUP:
@@ -1031,22 +1030,27 @@ int main(int argc, char *argv[])
 {
 	char *config_file;
 	int ret, i;
-	struct sched s;
+	static struct sched s;
 	struct command_task command_task_struct, *cmd_task = &command_task_struct;
+	struct audiod_cmdline_parser_params params = {
+		.override = 0,
+		.initialize = 1,
+		.check_required = 0,
+		.check_ambiguity = 0,
+		.print_errors = 1
+	};
 
 	valid_fd_012();
-	audiod_cmdline_parser(argc, argv, &conf);
+	audiod_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("audiod", conf);
 	para_drop_privileges(conf.user_arg, conf.group_arg);
 	config_file = configfile_exists();
 	if (config_file) {
-		struct audiod_cmdline_parser_params params = {
-			.override = 0,
-			.initialize = 0,
-			.check_required = 0,
-			.check_ambiguity = 0
-
-		};
+		params.override = 0;
+		params.initialize = 0;
+		params.check_required = 1;
+		params.check_ambiguity = 0;
+		params.print_errors = 1;
 		if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
 			PARA_EMERG_LOG("parse error in config file\n");
 			exit(EXIT_FAILURE);