From: Dan Langille Date: Mon, 12 Jan 2009 06:18:26 +0000 (+0000) Subject: Adjust cmdstruct: X-Git-Tag: Release-7.0.0~3471 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a3ba5d75054ef1a4566ef544e042b8c7cfd6ac9b;p=bacula%2Fbacula Adjust cmdstruct: - sort commands in alphabetical order: easier to reconcile with docs - include the options for the command where not already included NOTE: This makes some lines very long. If that's not acceptable, we'll have to look at this closer. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8358 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/dird/ua_cmds.c b/bacula/src/dird/ua_cmds.c index 920cbfe87f..c8db5126ad 100644 --- a/bacula/src/dird/ua_cmds.c +++ b/bacula/src/dird/ua_cmds.c @@ -111,48 +111,48 @@ int quit_cmd(UAContext *ua, const char *cmd); struct cmdstruct { const char *key; int (*func)(UAContext *ua, const char *cmd); const char *help; const bool use_in_rs;}; static struct cmdstruct commands[] = { /* Can use it in Console RunScript*/ - { NT_("add"), add_cmd, _("add media to a pool"), false}, + { NT_("add"), add_cmd, _("[pool= storage= jobid=] -- add media to a pool"), false}, { NT_("autodisplay"), autodisplay_cmd, _("autodisplay [on|off] -- console messages"),false}, { NT_("automount"), automount_cmd, _("automount [on|off] -- after label"), false}, - { NT_("cancel"), cancel_cmd, _("cancel [ | ] -- cancel a job"), false}, - { NT_("create"), create_cmd, _("create DB Pool from resource"), false}, - { NT_("delete"), delete_cmd, _("delete [pool= | media volume=]"), true}, + { NT_("cancel"), cancel_cmd, _("cancel [jobid= job= ujobid=] -- cancel a job"), false}, + { NT_("create"), create_cmd, _("create [pool=] -- create DB Pool from resource"), false}, + { NT_("delete"), delete_cmd, _("delete [volume= pool= job jobid=]"), true}, { NT_("disable"), disable_cmd, _("disable -- disable a job"), true}, { NT_("enable"), enable_cmd, _("enable -- enable a job"), true}, { NT_("estimate"), estimate_cmd, _("performs FileSet estimate, listing gives full listing"), true}, { NT_("exit"), quit_cmd, _("exit = quit"), false}, { NT_("gui"), gui_cmd, _("gui [on|off] -- non-interactive gui mode"), false}, { NT_("help"), help_cmd, _("print this command"), false}, - { NT_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | files | copies ]; from catalog"), true}, { NT_("label"), label_cmd, _("label a tape"), false}, + { NT_("list"), list_cmd, _("list [pools | jobs | jobtotals | media | files | copies ]; from catalog"), true}, { NT_("llist"), llist_cmd, _("full or long list like list command"), true}, - { NT_("messages"), messagescmd, _("messages"), false}, { NT_("memory"), memory_cmd, _("print current memory usage"), true}, - { NT_("mount"), mount_cmd, _("mount "), false}, - { NT_("prune"), prunecmd, _("prune expired records from catalog"), true}, + { NT_("messages"), messagescmd, _("messages"), false}, + { NT_("mount"), mount_cmd, _("mount storage= [ slot= ] [ drive= ] or mount [ jobid= | job= ]"), false}, + { NT_("prune"), prunecmd, _("files|jobs|volume client= volume= prune expired records from catalog"), true}, { NT_("purge"), purgecmd, _("purge records from catalog"), true}, { NT_("python"), python_cmd, _("python control commands"), false}, { NT_("quit"), quit_cmd, _("quit"), false}, { NT_("query"), querycmd, _("query catalog"), false}, { NT_("restore"), restore_cmd, _("restore files"), false}, - { NT_("relabel"), relabel_cmd, _("relabel a tape"), false}, + { NT_("relabel"), relabel_cmd, _("relabel storage= oldvolume= volume= -- relabel a tape"), false}, { NT_("release"), release_cmd, _("release "), false}, { NT_("reload"), reload_cmd, _("reload conf file"), true}, - { NT_("run"), run_cmd, _("run "), false}, /* need to be check */ - { NT_("status"), status_cmd, _("status [storage | client]="), true}, - { NT_("setdebug"), setdebug_cmd, _("sets debug level"), true}, + { NT_("run"), run_cmd, _("run job= client= fileset= level= storage= where= when= yes"), false}, /* need to be check */ + { NT_("setdebug"), setdebug_cmd, _("setdebug level=nn [trace=0/1 client= | dir | director | storage= | all] -- sets debug level"), true}, { NT_("setip"), setip_cmd, _("sets new client address -- if authorized"), false}, { NT_("show"), show_cmd, _("show (resource records) [jobs | pools | ... | all]"), true}, + { NT_("status"), status_cmd, _("status [all | dir= | director | client= | storage= | days=nnn]"), true}, { NT_("sqlquery"), sqlquerycmd, _("use SQL to query catalog"), false}, { NT_("time"), time_cmd, _("print current time"), true}, { NT_("trace"), trace_cmd, _("turn on/off trace to file"), true}, - { NT_("unmount"), unmount_cmd, _("unmount "), false}, - { NT_("umount"), unmount_cmd, _("umount for old-time Unix guys"),false}, + { NT_("unmount"), unmount_cmd, _("unmount storage= [ drive= ] or unmount [ jobid= | job= ]"), false}, + { NT_("umount"), unmount_cmd, _("umount - for old-time Unix guys, see unmount"),false}, { NT_("update"), update_cmd, _("update Volume, Pool or slots"), true}, - { NT_("use"), use_cmd, _("use catalog xxx"), false}, + { NT_("use"), use_cmd, _("use -- catalog xxx"), false}, { NT_("var"), var_cmd, _("does variable expansion"), false}, { NT_("version"), version_cmd, _("print Director version"), true}, - { NT_("wait"), wait_cmd, _("wait until no jobs are running [ | | ]"), false}, + { NT_("wait"), wait_cmd, _("wait [ | | ] -- wait until no jobs are running"), false}, }; #define comsize (sizeof(commands)/sizeof(struct cmdstruct))