{ "rmdir" ,N_("Remove guest-os directory[1].") ,cmd_rmdir_table ,cmd_rmdir ,1,1 },
{ "commit",N_("Write any pending changes and remount the volume.") ,cmd_commit_table,cmd_commit,0,0 },
{ "quit" ,N_("Quit this program.") ,cmd_quit_table ,cmd_quit ,0,0 },
- { "help" ,N_("Show this list of commands.") ,cmd_help_table ,cmd_help ,0,0 },
+ { "help" ,N_("Show this list of commands or help for command[1].") ,cmd_help_table ,cmd_help ,0,1 },
{ NULL }, /* G_N_ELEMENTS() not usable as sizeof() is not visible for 'extern' */
};
+static gboolean displayArgs_hit;
+
+static void displayArgs(poptContext con,enum poptCallbackReason foo,struct poptOption *key,const char *arg,void *data)
+{
+ displayArgs_hit=TRUE;
+
+ if (key->shortName=='?')
+ poptPrintHelp(con,stdout,0);
+ else
+ poptPrintUsage(con,stdout,0);
+}
+
+const struct poptOption cmdline_poptHelpOptions[]={
+ { argInfo:POPT_ARG_INTL_DOMAIN,arg:"popt" },
+ { NULL ,'\0',POPT_ARG_CALLBACK,(void *)&displayArgs,'\0',NULL,NULL },
+ { "help" ,'?' ,0 ,NULL,'?',/* N_ */("Show this help message"), NULL },
+ { "usage",'\0',0 ,NULL,'u',/* N_ */("Display brief usage message"),NULL },
+ POPT_TABLEEND
+ };
+
+
static void invoke_cmd_err(int cmd_argc,const char **cmd_argv,GError **errp)
{
const struct cmdline_command *commandp;
_("Unknown command, try 'help': %s"),cmd_name);
return;
}
+ displayArgs_hit=FALSE;
cmd_context=poptGetContext(
PACKAGE, /* name */
cmd_argc,cmd_argv, /* argc,argv */
if (errint!=0) {
g_set_error(errp,CMDLINE_MAIN_ERROR,CMDLINE_MAIN_ERROR_READING_COMMAND_CONFIG,
_("Error '%s' reading default configuration for command: %s"),poptStrerror(errint),cmd_name);
- return;
+ goto err_free_context;
}
errint=poptGetNextOpt(cmd_context);
if (errint!=-1) {
g_set_error(errp,CMDLINE_MAIN_ERROR,CMDLINE_MAIN_ERROR_EXCEEDING_COMMAND_OPTION,
_("Exceeding command option for command: %s"),cmd_name);
- return;
+ goto err_free_context;
}
if (!(cmdarg_argv=poptGetArgs(cmd_context)))
cmdarg_argv=&emptyargv_NULL;
+
+ if (displayArgs_hit)
+ goto err_free_context;
for (csp=cmdarg_argv,cmdarg_argc=0;*csp;csp++)
cmdarg_argc++;
g_set_error(errp,CMDLINE_MAIN_ERROR,CMDLINE_MAIN_ERROR_INVALID_COMMAND_ARGUMENT_COUNT,
_("Invalid number of command '%s' arguments: %d; expected from %d to %d incl."),
cmd_name,cmdarg_argc,commandp->argsn_min,commandp->argsn_max);
- return;
+ goto err_free_context;
}
(*commandp->func)(cmdarg_argv,errp);
+err_free_context:
poptFreeContext(cmd_context);
}