From: Andre Noll <maan@tuebingen.mpg.de>
Date: Tue, 13 Mar 2018 23:10:42 +0000 (+0100)
Subject: play: Implement help --long.
X-Git-Tag: v0.6.2~2^2~9
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=694aab410a10ce242a6ea8784515f51eac0d5fe0;p=paraslash.git

play: Implement help --long.

Also para_play benefits from the conversion to the generic
lsu_com_help(). After this patch, the three help commands of server,
audiod and play have the same syntax and their output is formatted
in the same way.
---

diff --git a/configure.ac b/configure.ac
index 80671ad5..7510528b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -724,6 +724,7 @@ play_errlist_objs="
 	file_write
 	version
 	sync_filter
+	lsu
 "
 NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
diff --git a/m4/lls/play_cmd.suite.m4 b/m4/lls/play_cmd.suite.m4
index 195b47b9..36d475da 100644
--- a/m4/lls/play_cmd.suite.m4
+++ b/m4/lls/play_cmd.suite.m4
@@ -13,6 +13,7 @@ caption = list of commands
 		list of available commands. When called with the name of a command
 		as first argument, it prints the description of this command.
 	[/description]
+	m4_include(`long-help.m4')
 
 [subcommand fg]
 	purpose = enter command mode
diff --git a/play.c b/play.c
index 78d53fa8..876fa9c2 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"
@@ -708,6 +709,12 @@ I9E_DUMMY_COMPLETER(ff);
 static void help_completer(struct i9e_completion_info *ci,
 		struct i9e_completion_result *result)
 {
+	char *opts[] = {LSG_PLAY_CMD_HELP_OPTS, NULL};
+
+	if (ci->word[0] == '-') {
+		i9e_complete_option(opts, ci, result);
+		return;
+	}
 	result->matches = i9e_complete_commands(ci->word, pp_completers);
 }
 
@@ -742,27 +749,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);
@@ -777,18 +772,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);