X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client.c;h=219cf2d8c1078a0e04e0ce00dd89420dd44264f4;hp=d70bdb937e58c8b568917ac37b43c3b8dd458434;hb=534a94f441767947874cb15d18211edf758e9277;hpb=a775408e5d2e3b21dff741b89ff5330b397b5138

diff --git a/client.c b/client.c
index d70bdb93..219cf2d8 100644
--- a/client.c
+++ b/client.c
@@ -36,8 +36,7 @@ __printf_2_3 void (*para_log)(int, const char*, ...) = stderr_log;
 
 #ifdef HAVE_READLINE
 #include "interactive.h"
-#include "server.completion.h"
-#include "afs.completion.h"
+#include "server_cmd.lsg.h"
 
 struct exec_task {
 	struct task *task;
@@ -279,7 +278,7 @@ static void ls_completer(struct i9e_completion_info *ci,
 	char *opts[] = {
 		"--", "-l", "-l=s", "-l=l", "-l=v", "-l=p", "-l=m", "-l=c",
 		"-p", "-a", "-r", "-d", "-s=p", "-s=l", "-s=s", "-s=n", "-s=f",
-		"-s=c", "-s=i", "-s=y", "-s=b", "-s=d", "-s=a", NULL
+		"-s=c", "-s=i", "-s=y", "-s=b", "-s=d", "-s=a", "-F", "-b", NULL
 	};
 	if (ci->word[0] == '-')
 		i9e_complete_option(opts, ci, cr);
@@ -459,9 +458,12 @@ static int client_i9e_line_handler(char *line)
 	return 1;
 }
 
+I9E_DUMMY_COMPLETER(SUPERCOMMAND_UNAVAILABLE);
 static struct i9e_completer completers[] = {
-	SERVER_COMPLETERS
-	AFS_COMPLETERS
+#define LSG_SERVER_CMD_CMD(_name) {.name = #_name, \
+	.completer = _name ## _completer}
+	LSG_SERVER_CMD_COMMANDS
+#undef LSG_SERVER_CMD_CMD
 	{.name = NULL}
 };