X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=d779ff864ddebfc38a34ba1a0d166b5c04089556;hp=69a9243da25245d5a4a67c1bf98deaef222dc593;hb=62c0894fbb589dd45e69b7d9ef1fd152a9960d62;hpb=53af5c6efb309565990203fd8504a812ec9166c9

diff --git a/gui.c b/gui.c
index 69a9243d..d779ff86 100644
--- a/gui.c
+++ b/gui.c
@@ -13,6 +13,7 @@
 #include "gui.lsg.h"
 #include "para.h"
 #include "gui.h"
+#include "lsu.h"
 #include "string.h"
 #include "ringbuffer.h"
 #include "fd.h"
@@ -191,7 +192,7 @@ static bool curses_active(void)
 }
 
 /* taken from mutt */
-static char *km_keyname(int c)
+static const char *km_keyname(int c)
 {
 	static char buf[10];
 
@@ -857,64 +858,23 @@ static void check_key_map_args_or_die(void)
 static void parse_config_file_or_die(bool reload)
 {
 	int ret;
-	char *cf = NULL, *errctx = NULL;
-	void *map;
-	size_t sz;
-	int cf_argc;
-	char **cf_argv;
-	struct lls_parse_result *cf_lpr, *merged_lpr;
-
-	if (OPT_GIVEN(CONFIG_FILE))
-		cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
-	else {
-		char *home = para_homedir();
-		cf = make_message("%s/.paraslash/gui.conf", home);
-		free(home);
-	}
-	ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL);
-	if (ret < 0) {
-		if (ret != -E_EMPTY && ret != -ERRNO_TO_PARA_ERROR(ENOENT))
-			goto free_cf;
-		if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
-			goto free_cf;
-		ret = 0;
-		lpr = cmdline_lpr;
-		goto success;
-	}
-	ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx));
-	para_munmap(map, sz);
-	if (ret < 0)
-		goto free_cf;
-	cf_argc = ret;
-	ret = lls(lls_parse(cf_argc, cf_argv, CMD_PTR, &cf_lpr, &errctx));
-	lls_free_argv(cf_argv);
-	if (ret < 0)
-		goto free_cf;
-	if (reload) /* config file overrides command line */
-		ret = lls(lls_merge(cf_lpr, cmdline_lpr, CMD_PTR, &merged_lpr,
-			&errctx));
-	else /* command line options override config file options */
-		ret = lls(lls_merge(cmdline_lpr, cf_lpr, CMD_PTR, &merged_lpr,
-			&errctx));
-	lls_free_parse_result(cf_lpr, CMD_PTR);
-	if (ret < 0)
-		goto free_cf;
+	unsigned flags = MCF_DONT_FREE;
+
 	if (lpr != cmdline_lpr)
 		lls_free_parse_result(lpr, CMD_PTR);
-	lpr = merged_lpr;
-success:
-	loglevel = OPT_UINT32_VAL(LOGLEVEL);
-	check_key_map_args_or_die();
-	theme_init(OPT_STRING_VAL(THEME), &theme);
-free_cf:
-	free(cf);
+	lpr = cmdline_lpr;
+	if (reload)
+		flags |= MCF_OVERRIDE;
+	ret = lsu_merge_config_file_options(OPT_STRING_VAL(CONFIG_FILE),
+		"gui.conf", &lpr, CMD_PTR, gui_suite, flags);
 	if (ret < 0) {
-		if (errctx)
-			PARA_ERROR_LOG("%s\n", errctx);
-		free(errctx);
-		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+		PARA_EMERG_LOG("failed to parse config file: %s\n",
+			para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
+	loglevel = OPT_UINT32_VAL(LOGLEVEL);
+	check_key_map_args_or_die();
+	theme_init(OPT_STRING_VAL(THEME), &theme);
 }
 
 /* Reread configuration, terminate on errors. */
@@ -1089,6 +1049,7 @@ static void handle_command(int c)
 {
 	int i;
 	const struct lls_opt_result *lor = OPT_RESULT(KEY_MAP);
+	const char *keyname = km_keyname(c);
 
 	/* first check user-defined key bindings */
 	FOR_EACH_KEY_MAP(i) {
@@ -1099,7 +1060,7 @@ static void handle_command(int c)
 			free(tmp);
 			return;
 		}
-		if (strcmp(tmp, km_keyname(c))) {
+		if (strcmp(tmp, keyname)) {
 			free(tmp);
 			continue;
 		}
@@ -1119,13 +1080,13 @@ static void handle_command(int c)
 	}
 	/* not found, check internal key bindings */
 	for (i = 0; command_list[i].handler; i++) {
-		if (!strcmp(km_keyname(c), command_list[i].key)) {
+		if (!strcmp(keyname, command_list[i].key)) {
 			command_list[i].handler();
 			return;
 		}
 	}
 	print_in_bar(COLOR_ERRMSG, "key '%s' is not bound, press ? for help",
-		km_keyname(c));
+		keyname);
 }
 
 static int input_post_select(__a_unused struct sched *s,