X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client.c;h=24f9c61c1c505e304b590b4ad7d7bce7041e13b0;hb=181beb316afad036ac01a778544c5dec0a8d51c7;hp=c45826ab645741755e4ab836edc7f26bcd1bf442;hpb=53af5c6efb309565990203fd8504a812ec9166c9;p=paraslash.git

diff --git a/client.c b/client.c
index c45826ab..24f9c61c 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);
@@ -123,7 +123,7 @@ fail:
 static int execute_client_command(const char *cmd, char **result)
 {
 	int ret;
-	struct sched command_sched = {.default_timeout = {.tv_sec = 1}};
+	struct sched command_sched = {.default_timeout = 1000};
 	struct exec_task exec_task = {
 		.result_buf = para_strdup(""),
 		.result_size = 1,
@@ -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,
@@ -619,7 +624,7 @@ int main(int argc, char *argv[])
 	int ret;
 
 	crypt_init();
-	sched.default_timeout.tv_sec = 1;
+	sched.default_timeout = 1000;
 
 	ret = client_parse_config(argc, argv, &ct, &client_loglevel);
 	if (ret < 0)