Fixed 'command_name --help' to prevent exit of captive-cmdline(1).

[captive.git] / src / client / cmdline / cmd_help.c

diff --git a/src/client/cmdline/cmd_help.c b/src/client/cmdline/cmd_help.c
index f56d334..4744f26 100644 (file)
--- a/src/client/cmdline/cmd_help.c
+++ b/src/client/cmdline/cmd_help.c
@@ -42,7 +42,7 @@ GQuark r=0;
 
 
 const struct poptOption cmd_help_table[]={
-               POPT_AUTOHELP
+               CMDLINE_POPT_AUTOHELP
                POPT_TABLEEND
                };
 
@@ -54,9 +54,19 @@ int cmd_name_maxlen;
 
        g_return_if_fail(!errp || !*errp);
 
+       if (cmd_argv[0]) {
+const char *cmd_help_argv[3];
+
+               cmd_help_argv[0]=cmd_argv[0];
+               cmd_help_argv[1]="--help";
+               cmd_help_argv[2]=NULL;
+               invoke_cmd(2,cmd_help_argv);
+               return;
+               }
+
        cmd_name_maxlen=0;
        for (commandp=cmdline_command_table+1;commandp->name;commandp++)
                cmd_name_maxlen=MAX(cmd_name_maxlen,(int)strlen(commandp->name));
        for (commandp=cmdline_command_table+1;commandp->name;commandp++)
-               printf("%-*s\t%s\n",cmd_name_maxlen,commandp->name,commandp->description);
+               printf("%-*s\t%s\n",cmd_name_maxlen,commandp->name,_(commandp->description));
 }