X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=647367a396b2d96368931af790c45dd4f188b7c1;hp=b304e427183d264b09d38eabbc0ec6c77990dec3;hb=742be1f7334570492615fdf89ce46123e3f71886;hpb=e5de57de1b8bf1df96c152fc92f5a49f75d6d96c

diff --git a/play.c b/play.c
index b304e427..647367a3 100644
--- a/play.c
+++ b/play.c
@@ -11,6 +11,7 @@
 #include "write_cmd.lsg.h"
 #include "play.lsg.h"
 #include "para.h"
+#include "lsu.h"
 #include "list.h"
 #include "error.h"
 #include "buffer_tree.h"
@@ -139,7 +140,7 @@ static void handle_help_flags(void)
 
 	if (OPT_GIVEN(DETAILED_HELP))
 		help = lls_long_help(CMD_PTR);
-	else if (OPT_GIVEN(HELP))
+	else if (OPT_GIVEN(HELP) || lls_num_inputs(play_lpr) == 0)
 		help = lls_short_help(CMD_PTR);
 	else
 		return;
@@ -150,76 +151,38 @@ static void handle_help_flags(void)
 
 static void parse_config_or_die(int argc, char *argv[])
 {
-	const struct lls_command *cmd = CMD_PTR;
-	int i, ret, cf_argc;
-	char *cf, *errctx, **cf_argv;
-	struct lls_parse_result *cf_lpr, *merged_lpr;
+	int i, ret;
 	unsigned num_kmas;
-	void *map;
-	size_t sz;
+	char *errctx;
 
-	ret = lls(lls_parse(argc, argv, cmd, &play_lpr, &errctx));
-	if (ret < 0)
-		goto fail;
+	ret = lls(lls_parse(argc, argv, CMD_PTR, &play_lpr, &errctx));
+	if (ret < 0) {
+		if (errctx)
+			PARA_EMERG_LOG("%s\n", errctx);
+		free(errctx);
+		PARA_EMERG_LOG("failed to parse command line options: %s\n",
+			para_strerror(-ret));
+		exit(EXIT_FAILURE);
+	}
 	loglevel = OPT_UINT32_VAL(LOGLEVEL);
 	version_handle_flag("play", OPT_GIVEN(VERSION));
-	handle_help_flags();
-	if (OPT_GIVEN(CONFIG_FILE))
-		cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
-	else {
-		char *home = para_homedir();
-		cf = make_message("%s/.paraslash/play.conf", home);
-		free(home);
-	}
-	ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL);
+	handle_help_flags(); /* also handles the zero-arg case */
+	ret = lsu_merge_config_file_options(OPT_STRING_VAL(CONFIG_FILE),
+		"play.conf", &play_lpr, CMD_PTR, play_suite, 0 /* flags */);
 	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;
-		goto free_cf;
+		PARA_EMERG_LOG("failed to parse config file: %s\n",
+			para_strerror(-ret));
+		exit(EXIT_FAILURE);
 	}
-	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, &cf_lpr, &errctx));
-	lls_free_argv(cf_argv);
-	if (ret < 0)
-		goto free_cf;
-	ret = lls(lls_merge(play_lpr, cf_lpr, cmd, &merged_lpr, &errctx));
-	lls_free_parse_result(cf_lpr, cmd);
-	if (ret < 0)
-		goto free_cf;
-	lls_free_parse_result(play_lpr, cmd);
-	play_lpr = merged_lpr;
 	loglevel = OPT_UINT32_VAL(LOGLEVEL);
-
-	ret = lls(lls_check_arg_count(play_lpr, 1, INT_MAX, &errctx));
-	if (ret < 0)
-		goto free_cf;
 	num_kmas = OPT_GIVEN(KEY_MAP);
 	for (i = 0; i < num_kmas; i++) {
 		const char *kma = lls_string_val(i, OPT_RESULT(KEY_MAP));
 		if (*kma && strchr(kma + 1, ':'))
 			continue;
 		PARA_EMERG_LOG("invalid key map arg: %s\n", kma);
-		goto free_cf;
+		exit(EXIT_FAILURE);
 	}
-	ret = 1;
-free_cf:
-	free(cf);
-	if (ret >= 0)
-		return;
-	lls_free_parse_result(play_lpr, cmd);
-fail:
-	if (errctx)
-		PARA_EMERG_LOG("%s\n", errctx);
-	free(errctx);
-	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-	exit(EXIT_FAILURE);
 }
 
 static char get_playback_state(void)
@@ -709,9 +672,15 @@ I9E_DUMMY_COMPLETER(quit);
 I9E_DUMMY_COMPLETER(ff);
 
 static void help_completer(struct i9e_completion_info *ci,
-		struct i9e_completion_result *result)
+		struct i9e_completion_result *cr)
 {
-	result->matches = i9e_complete_commands(ci->word, pp_completers);
+	char *opts[] = {LSG_PLAY_CMD_HELP_OPTS, NULL};
+
+	if (ci->word[0] == '-') {
+		i9e_complete_option(opts, ci, cr);
+		return;
+	}
+	cr->matches = i9e_complete_commands(ci->word, pp_completers);
 }
 
 static struct i9e_completer pp_completers[] = {
@@ -745,27 +714,15 @@ EXPORT_PLAY_CMD_HANDLER(quit);
 
 static int com_help(struct lls_parse_result *lpr)
 {
-	int i, ret;
-	char *buf, *errctx;
+	int i;
+	char *buf;
 	size_t sz;
-	const struct lls_command *cmd;
+	unsigned n;
+	const struct lls_opt_result *r =
+		lls_opt_result(LSG_PLAY_CMD_HELP_OPT_LONG, lpr);
+	bool long_help = lls_opt_given(r);
 
-	ret = lls(lls_check_arg_count(lpr, 0, 1, &errctx));
-	if (ret < 0) {
-		if (errctx)
-			PARA_ERROR_LOG("%s\n", errctx);
-		free(errctx);
-		return ret;
-	}
-	if (lls_num_inputs(lpr) == 0) {
-		if (pt->background) {
-			for (i = 1; (cmd = lls_cmd(i, play_cmd_suite)); i++) {
-				sz = xasprintf(&buf, "%s\t%s\n",
-					lls_command_name(cmd), lls_purpose(cmd));
-				btr_add_output(buf, sz, pt->btrn);
-			}
-			return 0;
-		}
+	if (!pt->background) {
 		FOR_EACH_MAPPED_KEY(i) {
 			bool internal = is_internal_key(i);
 			int idx = get_key_map_idx(i);
@@ -780,18 +737,8 @@ static int com_help(struct lls_parse_result *lpr)
 		}
 		return 0;
 	}
-	ret = lls(lls_lookup_subcmd(lls_input(0, lpr), play_cmd_suite,
-		&errctx));
-	if (ret < 0) {
-		if (errctx)
-			PARA_ERROR_LOG("%s\n", errctx);
-		free(errctx);
-		return ret;
-	}
-	cmd = lls_cmd(ret, play_cmd_suite);
-	buf = lls_long_help(cmd);
-	assert(buf);
-	btr_add_output(buf, strlen(buf), pt->btrn);
+	lsu_com_help(long_help, lpr, play_cmd_suite, NULL, &buf, &n);
+	btr_add_output(buf, n, pt->btrn);
 	return 0;
 }
 EXPORT_PLAY_CMD_HANDLER(help);