X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=1a89681d196bce31b863e390bd60fc62f441a886;hp=552b625bb9749b40538bcf229d813125f09bd500;hb=9aa1f3d69c0aa335b3026581defbc09eb2c4efb4;hpb=9b406cbe5d20ba969713ca3d7a8033e697476d75

diff --git a/gui.c b/gui.c
index 552b625b..1a89681d 100644
--- a/gui.c
+++ b/gui.c
@@ -659,7 +659,8 @@ static int status_post_select(struct sched *s, void *context)
 	ret2 = for_each_stat_item(st->buf, st->loaded, update_item);
 	if (ret < 0 || ret2 < 0) {
 		st->loaded = 0;
-		PARA_NOTICE_LOG("closing stat pipe: %s\n", para_strerror(-ret));
+		PARA_NOTICE_LOG("closing stat pipe: %s\n",
+			para_strerror(ret < 0? -ret : -ret2));
 		close(st->fd);
 		st->fd = -1;
 		clear_all_items();
@@ -870,6 +871,23 @@ static void parse_config_file_or_die(bool override)
 		}
 		goto out;
 	}
+	/*
+	 * When the gengetopt config file parser is called more than once, any
+	 * key map arguments found in the config file are _appended_ to the old
+	 * values, even though we turn on ->override. We want the new arguments
+	 * to replace the old ones, so we must empty the key_map_arg array
+	 * first. Unfortunately, this also clears any key map arguments given
+	 * at the command line.
+	 */
+	if (override) {
+		int i;
+		for (i = 0; i < conf.key_map_given; i++) {
+			free(conf.key_map_arg[i]);
+			conf.key_map_arg[i] = NULL;
+		}
+		conf.key_map_given = 0;
+	}
+
 	gui_cmdline_parser_config_file(config_file, &conf, &params);
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	check_key_map_args_or_die();
@@ -1131,12 +1149,6 @@ static int input_post_select(__a_unused struct sched *s, __a_unused void *contex
 	return 0;
 }
 
-static void signal_pre_select(struct sched *s, void *context)
-{
-	struct signal_task *st = context;
-	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
-}
-
 static void print_scroll_msg(void)
 {
 	unsigned lines_total, filled = ringbuffer_filled(bot_win_rb);
@@ -1407,10 +1419,11 @@ __noreturn static void print_help_and_die(void)
 
 static int setup_tasks_and_schedule(void)
 {
+	int ret;
 	struct exec_task exec_task = {.task = NULL};
 	struct status_task status_task = {.fd = -1};
 	struct input_task input_task = {.task = NULL};
-	struct signal_task signal_task = {.task = NULL};
+	struct signal_task *signal_task;
 	struct sched sched = {
 		.default_timeout = {
 			.tv_sec = conf.timeout_arg  / 1000,
@@ -1439,18 +1452,21 @@ static int setup_tasks_and_schedule(void)
 		.context = &input_task,
 	}, &sched);
 
-	signal_task.fd = para_signal_init();
+	signal_task = signal_init_or_die();
 	para_install_sighandler(SIGINT);
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGCHLD);
 	para_install_sighandler(SIGUSR1);
-	signal_task.task = task_register(&(struct task_info) {
+	signal_task->task = task_register(&(struct task_info) {
 		.name = "signal",
 		.pre_select = signal_pre_select,
 		.post_select = signal_post_select,
-		.context = &signal_task,
+		.context = signal_task,
 	}, &sched);
-	return schedule(&sched);
+	ret = schedule(&sched);
+	sched_shutdown(&sched);
+	signal_shutdown(signal_task);
+	return ret;
 }
 
 /**