X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client.c;h=ee7d980e88ffcf3cfcfa0cc3a75227da176091b3;hb=27c08870ba172782f6406045007b6ff32a4f7329;hp=c45826ab645741755e4ab836edc7f26bcd1bf442;hpb=e2167286448ce2ed9a01a548e7e9832563035088;p=paraslash.git

diff --git a/client.c b/client.c
index c45826ab..ee7d980e 100644
--- a/client.c
+++ b/client.c
@@ -100,7 +100,7 @@ static int create_merged_lpr(const char *line)
 	/*
 	 * The original lpr for the interactive session has no non-option
 	 * arguments. We create a fresh lpr from the words in "line" and merge
-	 * it with the orignal lpr.
+	 * it with the original lpr.
 	 */
 	ret = lls(lls_parse(argc, argv, cmd, &argv_lpr, &errctx));
 	free_argv(argv);
@@ -243,14 +243,19 @@ I9E_DUMMY_COMPLETER(term);
 I9E_DUMMY_COMPLETER(stop);
 I9E_DUMMY_COMPLETER(addatt);
 I9E_DUMMY_COMPLETER(init);
-I9E_DUMMY_COMPLETER(tasks);
 
 static struct i9e_completer completers[];
 
 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, completers);
+	char *opts[] = {LSG_SERVER_CMD_HELP_OPTS, NULL};
+
+	if (ci->word[0] == '-') {
+		i9e_complete_option(opts, ci, cr);
+		return;
+	}
+	cr->matches = i9e_complete_commands(ci->word, completers);
 }
 
 static void stat_completer(struct i9e_completion_info *ci,
@@ -336,7 +341,7 @@ static void setatt_completer(struct i9e_completion_info *ci,
 	if (ret < 0)
 		goto out;
 	num_atts = ret;
-	sl = para_realloc(sl, (2 * num_atts + 1) * sizeof(char *));
+	sl = arr_realloc(sl, 2 * num_atts + 1, sizeof(char *));
 	for (i = 0; i < num_atts; i++) {
 		char *orig = sl[i];
 		sl[i] = make_message("%s+", orig);
@@ -430,7 +435,7 @@ static void select_completer(struct i9e_completion_info *ci,
 		goto free_moods;
 	num_pl = ret;
 	n = num_moods + num_pl;
-	mops = para_malloc((n + 1) * sizeof(char *));
+	mops = arr_alloc(n + 1, sizeof(char *));
 	for (i = 0; i < num_moods; i++)
 		mops[i] = make_message("m/%s", moods[i]);
 	for (i = 0; i < num_pl; i++)