From 0adad43d8e400e273ae243cc98ab1503673eb8be Mon Sep 17 00:00:00 2001 From: Michael Meffie Date: Thu, 21 Aug 2014 00:25:45 -0400 Subject: [PATCH] cmd: add flags argument to create syntax function Add the flags argument to cmd_CreateSyntax() and update all callers. The flags argument will be used to set command options, such as CMD_HIDDEN. Change-Id: Ia51be9635f262516cb084d236a9e0756f608bf16 Reviewed-on: http://gerrit.openafs.org/11430 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/WINNT/afs_setup_utils/afsrm.c | 2 +- src/WINNT/afsd/cklog.c | 2 +- src/WINNT/afsd/cunlog.c | 2 +- src/WINNT/afsd/fs.c | 116 +++++++++++++++++------------------ src/WINNT/afsd/symlink.c | 6 +- src/WINNT/afsreg/test/regman.c | 16 ++--- src/afsd/afsd.c | 2 +- src/afsmonitor/afsmonitor.c | 2 +- src/afsweb/weblog.c | 2 +- src/aklog/klog.c | 2 +- src/bozo/bos.c | 60 +++++++++--------- src/bu_utils/fms.c | 2 +- src/bucoord/main.c | 60 +++++++++--------- src/budb/server.c | 2 +- src/butc/read_tape.c | 2 +- src/butc/tcmain.c | 2 +- src/butc/test.c | 12 ++-- src/cmd/cmd.c | 38 +++++++++--- src/cmd/cmd.p.h | 4 +- src/cmd/test/ctest.c | 4 +- src/cmd/test/dtest.c | 2 +- src/cmd/test/itest.c | 6 +- src/gtx/object_test.c | 2 +- src/gtx/screen_test.c | 2 +- src/kauth/admin_tools.c | 38 ++++++------ src/kauth/kdb.c | 2 +- src/kauth/klog.c | 2 +- src/kauth/knfs.c | 2 +- src/kauth/kpasswd.c | 2 +- src/kauth/manyklog.c | 2 +- src/kauth/rebuild.c | 2 +- src/kauth/test/multiklog.c | 2 +- src/kauth/test/test_getticket.c | 2 +- src/kauth/test/test_rxkad_free.c | 2 +- src/libadmin/cfg/test/cfgtest.c | 28 ++++----- src/libadmin/test/bos.c | 72 +++++++++++----------- src/libadmin/test/client.c | 28 ++++----- src/libadmin/test/kas.c | 22 +++---- src/libadmin/test/pts.c | 40 ++++++------ src/libadmin/test/util.c | 6 +- src/libadmin/test/vos.c | 70 ++++++++++----------- src/log/unlog.c | 2 +- src/platform/SOLARIS/fs_conv_sol26.c | 4 +- src/ptserver/db_verify.c | 2 +- src/ptserver/pt_util.c | 2 +- src/ptserver/pts.c | 36 +++++------ src/ptserver/ptserver.c | 2 +- src/ptserver/testpt.c | 6 +- src/rxdebug/rxdebug.c | 2 +- src/rxkad/test/stress.c | 2 +- src/scout/scout.c | 2 +- src/tsalvaged/salvsync-debug.c | 12 ++-- src/ubik/udebug.c | 2 +- src/uss/uss.c | 10 +-- src/venus/afsio.c | 20 +++--- src/venus/cacheout.c | 4 +- src/venus/cmdebug.c | 2 +- src/venus/dedebug.c | 2 +- src/venus/fs.c | 102 +++++++++++++++--------------- src/venus/fstrace.c | 12 ++-- src/venus/kdump.c | 2 +- src/venus/test/getinitparams.c | 2 +- src/venus/twiddle.c | 2 +- src/venus/whatfid.c | 2 +- src/viced/viced.c | 2 +- src/vlserver/cnvldb.c | 2 +- src/vlserver/vlclient.c | 2 +- src/vlserver/vldb_check.c | 2 +- src/vlserver/vlserver.c | 2 +- src/vol/fssync-debug.c | 40 ++++++------ src/vol/salvaged.c | 2 +- src/vol/salvager.c | 2 +- src/vol/vol-bless.c | 2 +- src/vol/volinfo-main.c | 2 +- src/vol/volscan-main.c | 2 +- src/volser/restorevol.c | 2 +- src/volser/vol-dump.c | 2 +- src/volser/volmain.c | 2 +- src/volser/vos.c | 74 +++++++++++----------- src/xstat/xstat_cm_test.c | 2 +- src/xstat/xstat_fs_test.c | 2 +- tests/cmd/command-t.c | 2 +- 82 files changed, 536 insertions(+), 516 deletions(-) diff --git a/src/WINNT/afs_setup_utils/afsrm.c b/src/WINNT/afs_setup_utils/afsrm.c index c0d1e60..71f828a 100644 --- a/src/WINNT/afs_setup_utils/afsrm.c +++ b/src/WINNT/afs_setup_utils/afsrm.c @@ -40,7 +40,7 @@ SetupCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("client34", DoClient34, NULL, + ts = cmd_CreateSyntax("client34", DoClient34, NULL, 0, "remove AFS 3.4a client"); } diff --git a/src/WINNT/afsd/cklog.c b/src/WINNT/afsd/cklog.c index 9ea1822..1dd63f5 100644 --- a/src/WINNT/afsd/cklog.c +++ b/src/WINNT/afsd/cklog.c @@ -44,7 +44,7 @@ void main (argc, argv) /* Start up sockets */ WSAStartup(0x0101, &WSAjunk); - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "obtain Kerberos authentication"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "obtain Kerberos authentication"); #define aXFLAG 0 #define aPRINCIPAL 1 diff --git a/src/WINNT/afsd/cunlog.c b/src/WINNT/afsd/cunlog.c index de7fb0a..c3d82dd 100644 --- a/src/WINNT/afsd/cunlog.c +++ b/src/WINNT/afsd/cunlog.c @@ -57,7 +57,7 @@ main(argc, argv) WSAStartup(0x0101, &WSAjunk); - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "Release Kerberos authentication"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "Release Kerberos authentication"); cmd_AddParm(ts, "-cell", CMD_LIST, CMD_OPTIONAL, "cell name"); code = cmd_Dispatch(argc, argv); diff --git a/src/WINNT/afsd/fs.c b/src/WINNT/afsd/fs.c index ebe13ae..8f27a42 100644 --- a/src/WINNT/afsd/fs.c +++ b/src/WINNT/afsd/fs.c @@ -5176,32 +5176,32 @@ int wmain(int argc, wchar_t **wargv) osi_Init(); #ifndef WIN32 - ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, NULL, + ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, NULL, 0, "get client network interface addresses"); cmd_CreateAlias(ts, "gc"); - ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, NULL, + ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, NULL, 0, "set client network interface addresses"); cmd_AddParm(ts, "-address", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, "client network interfaces"); cmd_CreateAlias(ts, "sc"); #endif /* WIN32 */ - ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, NULL, "set server ranks"); + ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, NULL, 0, "set server ranks"); cmd_AddParm(ts, "-servers", CMD_LIST, CMD_OPTIONAL|CMD_EXPANDS, "fileserver names and ranks"); cmd_AddParm(ts, "-vlservers", CMD_LIST, CMD_OPTIONAL|CMD_EXPANDS, "VL server names and ranks"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "input from named file"); cmd_AddParm(ts, "-stdin", CMD_FLAG, CMD_OPTIONAL, "input from stdin"); cmd_CreateAlias(ts, "sp"); - ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, NULL, "get server ranks"); + ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, NULL, 0, "get server ranks"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "output to named file"); cmd_AddParm(ts, "-numeric", CMD_FLAG, CMD_OPTIONAL, "addresses only"); cmd_AddParm(ts, "-vlservers", CMD_FLAG, CMD_OPTIONAL, "VL servers"); /* cmd_AddParm(ts, "-cell", CMD_FLAG, CMD_OPTIONAL, "cellname"); */ cmd_CreateAlias(ts, "gp"); - ts = cmd_CreateSyntax("setacl", SetACLCmd, NULL, "set access control list"); + ts = cmd_CreateSyntax("setacl", SetACLCmd, NULL, 0, "set access control list"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); cmd_AddParm(ts, "-acl", CMD_LIST, 0, "access list entries"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "clear access list"); @@ -5211,7 +5211,7 @@ int wmain(int argc, wchar_t **wargv) cmd_AddParm(ts, "-if", CMD_FLAG, CMD_OPTIONAL, "initial file acl (DFS only)"); cmd_CreateAlias(ts, "sa"); - ts = cmd_CreateSyntax("listacl", ListACLCmd, NULL, "list access control list"); + ts = cmd_CreateSyntax("listacl", ListACLCmd, NULL, 0, "list access control list"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); parm_listacl_id = ts->nParms; cmd_AddParm(ts, "-id", CMD_FLAG, CMD_OPTIONAL, "initial directory acl"); @@ -5219,16 +5219,16 @@ int wmain(int argc, wchar_t **wargv) cmd_AddParm(ts, "-cmd", CMD_FLAG, CMD_OPTIONAL, "output as 'fs setacl' command"); cmd_CreateAlias(ts, "la"); - ts = cmd_CreateSyntax("getcalleraccess", GetCallerAccess, NULL, + ts = cmd_CreateSyntax("getcalleraccess", GetCallerAccess, NULL, 0, "list callers access"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); cmd_CreateAlias(ts, "gca"); - ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, NULL, "clean up access control list"); + ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, NULL, 0, "clean up access control list"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("copyacl", CopyACLCmd, NULL, "copy access control list"); + ts = cmd_CreateSyntax("copyacl", CopyACLCmd, NULL, 0, "copy access control list"); cmd_AddParm(ts, "-fromdir", CMD_SINGLE, 0, "source directory (or DFS file)"); cmd_AddParm(ts, "-todir", CMD_LIST, 0, "destination directory (or DFS file)"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "first clear dest access list"); @@ -5238,17 +5238,17 @@ int wmain(int argc, wchar_t **wargv) cmd_CreateAlias(ts, "ca"); - ts = cmd_CreateSyntax("flush", FlushCmd, NULL, "flush file from cache"); + ts = cmd_CreateSyntax("flush", FlushCmd, NULL, 0, "flush file from cache"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); #ifndef WIN32 - ts = cmd_CreateSyntax("flushmount", FlushMountCmd, NULL, + ts = cmd_CreateSyntax("flushmount", FlushMountCmd, NULL, 0, "flush mount symlink from cache"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); #endif - ts = cmd_CreateSyntax("setvol", SetVolCmd, NULL, "set volume status"); + ts = cmd_CreateSyntax("setvol", SetVolCmd, NULL, 0, "set volume status"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_OPTIONAL, "disk space quota in 1K units"); #ifdef notdef @@ -5258,30 +5258,30 @@ int wmain(int argc, wchar_t **wargv) cmd_AddParm(ts, "-offlinemsg", CMD_SINGLE, CMD_OPTIONAL, "offline message"); cmd_CreateAlias(ts, "sv"); - ts = cmd_CreateSyntax("messages", MessagesCmd, NULL, "control Cache Manager messages"); + ts = cmd_CreateSyntax("messages", MessagesCmd, NULL, 0, "control Cache Manager messages"); cmd_AddParm(ts, "-show", CMD_SINGLE, CMD_OPTIONAL, "[user|console|all|none]"); - ts = cmd_CreateSyntax("examine", ExamineCmd, NULL, "display file/volume status"); + ts = cmd_CreateSyntax("examine", ExamineCmd, NULL, 0, "display file/volume status"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); cmd_CreateAlias(ts, "lv"); cmd_CreateAlias(ts, "listvol"); - ts = cmd_CreateSyntax("listquota", ListQuotaCmd, NULL, "list volume quota"); + ts = cmd_CreateSyntax("listquota", ListQuotaCmd, NULL, 0, "list volume quota"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "lq"); - ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, NULL, "show server disk space usage"); + ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, NULL, 0, "show server disk space usage"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "df"); - ts = cmd_CreateSyntax("quota", QuotaCmd, NULL, "show volume quota usage"); + ts = cmd_CreateSyntax("quota", QuotaCmd, NULL, 0, "show volume quota usage"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("lsmount", ListMountCmd, NULL, "list mount point"); + ts = cmd_CreateSyntax("lsmount", ListMountCmd, NULL, 0, "list mount point"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); - ts = cmd_CreateSyntax("mkmount", MakeMountCmd, NULL, "make mount point"); + ts = cmd_CreateSyntax("mkmount", MakeMountCmd, NULL, 0, "make mount point"); cmd_AddParm(ts, "-dir", CMD_SINGLE, 0, "directory"); cmd_AddParm(ts, "-vol", CMD_SINGLE, 0, "volume name"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); @@ -5296,31 +5296,31 @@ int wmain(int argc, wchar_t **wargv) */ - ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, NULL, "remove mount point"); + ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, NULL, 0, "remove mount point"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); - ts = cmd_CreateSyntax("checkservers", CheckServersCmd, NULL, "check local cell's servers"); + ts = cmd_CreateSyntax("checkservers", CheckServersCmd, NULL, 0, "check local cell's servers"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell to check"); cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "check all cells"); cmd_AddParm(ts, "-fast", CMD_FLAG, CMD_OPTIONAL, "just list, don't check"); cmd_AddParm(ts,"-interval",CMD_SINGLE,CMD_OPTIONAL,"seconds between probes"); - ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd, NULL, "check volumeID/name mappings"); + ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd, NULL, 0, "check volumeID/name mappings"); cmd_CreateAlias(ts, "checkbackups"); - ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, NULL, "set cache size"); + ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, NULL, 0, "set cache size"); cmd_AddParm(ts, "-blocks", CMD_SINGLE, CMD_OPTIONAL, "size in 1K byte blocks (0 => reset)"); cmd_CreateAlias(ts, "cachesize"); cmd_AddParm(ts, "-reset", CMD_FLAG, CMD_OPTIONAL, "reset size back to boot value"); - ts = cmd_CreateSyntax("getcacheparms", GetCacheParmsCmd, NULL, "get cache usage info"); + ts = cmd_CreateSyntax("getcacheparms", GetCacheParmsCmd, NULL, 0, "get cache usage info"); - ts = cmd_CreateSyntax("listcells", ListCellsCmd, NULL, "list configured cells"); + ts = cmd_CreateSyntax("listcells", ListCellsCmd, NULL, 0, "list configured cells"); cmd_AddParm(ts, "-numeric", CMD_FLAG, CMD_OPTIONAL, "addresses only"); - ts = cmd_CreateSyntax("setquota", SetQuotaCmd, NULL, "set volume quota"); + ts = cmd_CreateSyntax("setquota", SetQuotaCmd, NULL, 0, "set volume quota"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-max", CMD_SINGLE, 0, "max quota in kbytes"); #ifdef notdef @@ -5328,7 +5328,7 @@ int wmain(int argc, wchar_t **wargv) #endif cmd_CreateAlias(ts, "sq"); - ts = cmd_CreateSyntax("newcell", NewCellCmd, NULL, "configure new cell"); + ts = cmd_CreateSyntax("newcell", NewCellCmd, NULL, 0, "configure new cell"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "cell name"); cmd_AddParm(ts, "-servers", CMD_LIST, CMD_OPTIONAL, "primary servers"); cmd_AddParm(ts, "-linkedcell", CMD_SINGLE, CMD_OPTIONAL, "linked cell name"); @@ -5345,50 +5345,50 @@ int wmain(int argc, wchar_t **wargv) cmd_AddParm(ts, "-dns", CMD_FLAG, CMD_OPTIONAL, "force use of dns"); #ifndef WIN32 - ts = cmd_CreateSyntax("newalias", NewAliasCmd, NULL, + ts = cmd_CreateSyntax("newalias", NewAliasCmd, NULL, 0, "configure new cell alias"); cmd_AddParm(ts, "-alias", CMD_SINGLE, 0, "alias name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "real name of cell"); #endif - ts = cmd_CreateSyntax("whichcell", WhichCellCmd, NULL, "list file's cell"); + ts = cmd_CreateSyntax("whichcell", WhichCellCmd, NULL, 0, "list file's cell"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); - ts = cmd_CreateSyntax("whereis", WhereIsCmd, NULL, "list file's location"); + ts = cmd_CreateSyntax("whereis", WhereIsCmd, NULL, 0, "list file's location"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); - ts = cmd_CreateSyntax("wscell", WSCellCmd, NULL, "list workstation's cell"); + ts = cmd_CreateSyntax("wscell", WSCellCmd, NULL, 0, "list workstation's cell"); /* - ts = cmd_CreateSyntax("primarycell", PrimaryCellCmd, 0, "obsolete (listed primary cell)"); + ts = cmd_CreateSyntax("primarycell", PrimaryCellCmd, 0, 0, "obsolete (listed primary cell)"); */ #ifndef AFS_NT40_ENV - ts = cmd_CreateSyntax("monitor", MonitorCmd, NULL, "set cache monitor host address"); + ts = cmd_CreateSyntax("monitor", MonitorCmd, NULL, 0, "set cache monitor host address"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "host name or 'off'"); cmd_CreateAlias(ts, "mariner"); #endif - ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, NULL, "get cell status"); + ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, NULL, 0, "get cell status"); cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name"); - ts = cmd_CreateSyntax("setcell", SetCellCmd, NULL, "set cell status"); + ts = cmd_CreateSyntax("setcell", SetCellCmd, NULL, 0, "set cell status"); cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name"); cmd_AddParm(ts, "-suid", CMD_FLAG, CMD_OPTIONAL, "allow setuid programs"); cmd_AddParm(ts, "-nosuid", CMD_FLAG, CMD_OPTIONAL, "disallow setuid programs"); - ts = cmd_CreateSyntax("flushall", FlushAllCmd, NULL, "flush all data"); + ts = cmd_CreateSyntax("flushall", FlushAllCmd, NULL, 0, "flush all data"); - ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, NULL, "flush all data in volume"); + ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, NULL, 0, "flush all data in volume"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("sysname", SysNameCmd, NULL, "get/set sysname (i.e. @sys) value"); + ts = cmd_CreateSyntax("sysname", SysNameCmd, NULL, 0, "get/set sysname (i.e. @sys) value"); cmd_AddParm(ts, "-newsys", CMD_LIST, CMD_OPTIONAL, "new sysname"); #ifndef AFS_NT40_ENV - ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, NULL, "enable/disable translators to AFS"); + ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, NULL, 0, "enable/disable translators to AFS"); cmd_AddParm(ts, "-type", CMD_SINGLE, 0, "exporter name"); cmd_AddParm(ts, "-start", CMD_SINGLE, CMD_OPTIONAL, "start/stop translator ('on' or 'off')"); cmd_AddParm(ts, "-convert", CMD_SINGLE, CMD_OPTIONAL, "convert from afs to unix mode ('on or 'off')"); @@ -5396,92 +5396,92 @@ int wmain(int argc, wchar_t **wargv) cmd_AddParm(ts, "-submounts", CMD_SINGLE, CMD_OPTIONAL, "allow nfs mounts to subdirs of /afs/.. ('on' or 'off')"); #endif - ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, NULL, + ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, NULL, 0, "store to server after file close"); cmd_AddParm(ts, "-kbytes", CMD_SINGLE, CMD_OPTIONAL, "asynchrony for specified names"); cmd_AddParm(ts, "-files", CMD_LIST, CMD_OPTIONAL, "specific pathnames"); cmd_AddParm(ts, "-allfiles", CMD_SINGLE, CMD_OPTIONAL, "new default (KB)"); cmd_CreateAlias(ts, "sb"); - ts = cmd_CreateSyntax("setcrypt", SetCryptCmd, NULL, "set cache manager encryption flag"); + ts = cmd_CreateSyntax("setcrypt", SetCryptCmd, NULL, 0, "set cache manager encryption flag"); cmd_AddParm(ts, "-crypt", CMD_SINGLE, 0, "on, auth or off"); - ts = cmd_CreateSyntax("getcrypt", GetCryptCmd, NULL, "get cache manager encryption flag"); + ts = cmd_CreateSyntax("getcrypt", GetCryptCmd, NULL, 0, "get cache manager encryption flag"); - ts = cmd_CreateSyntax("rxstatproc", RxStatProcCmd, NULL, + ts = cmd_CreateSyntax("rxstatproc", RxStatProcCmd, NULL, 0, "Manage per process RX statistics"); cmd_AddParm(ts, "-enable", CMD_FLAG, CMD_OPTIONAL, "Enable RX stats"); cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "Disable RX stats"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "Clear RX stats"); - ts = cmd_CreateSyntax("rxstatpeer", RxStatPeerCmd, NULL, + ts = cmd_CreateSyntax("rxstatpeer", RxStatPeerCmd, NULL, 0, "Manage per peer RX statistics"); cmd_AddParm(ts, "-enable", CMD_FLAG, CMD_OPTIONAL, "Enable RX stats"); cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "Disable RX stats"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "Clear RX stats"); #ifndef WIN32 - ts = cmd_CreateSyntax("setcbaddr", CallBackRxConnCmd, NULL, "configure callback connection address"); + ts = cmd_CreateSyntax("setcbaddr", CallBackRxConnCmd, NULL, 0, "configure callback connection address"); cmd_AddParm(ts, "-addr", CMD_SINGLE, CMD_OPTIONAL, "host name or address"); #endif - ts = cmd_CreateSyntax("trace", TraceCmd, NULL, "enable or disable CM tracing"); + ts = cmd_CreateSyntax("trace", TraceCmd, NULL, 0, "enable or disable CM tracing"); cmd_AddParm(ts, "-on", CMD_FLAG, CMD_OPTIONAL, "enable tracing"); cmd_AddParm(ts, "-off", CMD_FLAG, CMD_OPTIONAL, "disable tracing"); cmd_AddParm(ts, "-reset", CMD_FLAG, CMD_OPTIONAL, "reset log contents"); cmd_AddParm(ts, "-dump", CMD_FLAG, CMD_OPTIONAL, "dump log contents"); cmd_CreateAlias(ts, "tr"); - ts = cmd_CreateSyntax("uuid", UuidCmd, NULL, "manage the UUID for the cache manager"); + ts = cmd_CreateSyntax("uuid", UuidCmd, NULL, 0, "manage the UUID for the cache manager"); cmd_AddParm(ts, "-generate", CMD_FLAG, CMD_OPTIONAL, "generate a new UUID"); - ts = cmd_CreateSyntax("memdump", MemDumpCmd, NULL, "dump memory allocs in debug builds"); + ts = cmd_CreateSyntax("memdump", MemDumpCmd, NULL, 0, "dump memory allocs in debug builds"); cmd_AddParm(ts, "-begin", CMD_FLAG, CMD_OPTIONAL, "set a memory checkpoint"); cmd_AddParm(ts, "-end", CMD_FLAG, CMD_OPTIONAL, "dump memory allocs"); - ts = cmd_CreateSyntax("cscpolicy", CSCPolicyCmd, NULL, "change client side caching policy for AFS shares"); + ts = cmd_CreateSyntax("cscpolicy", CSCPolicyCmd, NULL, 0, "change client side caching policy for AFS shares"); cmd_AddParm(ts, "-share", CMD_SINGLE, CMD_OPTIONAL, "AFS share"); cmd_AddParm(ts, "-manual", CMD_FLAG, CMD_OPTIONAL, "manual caching of documents"); cmd_AddParm(ts, "-programs", CMD_FLAG, CMD_OPTIONAL, "automatic caching of programs and documents"); cmd_AddParm(ts, "-documents", CMD_FLAG, CMD_OPTIONAL, "automatic caching of documents"); cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "disable caching"); - ts = cmd_CreateSyntax("minidump", MiniDumpCmd, NULL, "Generate MiniDump of current service state"); + ts = cmd_CreateSyntax("minidump", MiniDumpCmd, NULL, 0, "Generate MiniDump of current service state"); - ts = cmd_CreateSyntax("test_volstat", TestVolStatCmd, NULL, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("test_volstat", TestVolStatCmd, NULL, 0, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-network", CMD_SINGLE, CMD_OPTIONAL, "set network state up or down"); cmd_AddParm(ts, "-check", CMD_FLAG, CMD_OPTIONAL, "check state of offline volumes"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name or number"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume name or number"); cmd_AddParm(ts, "-state", CMD_SINGLE, CMD_OPTIONAL, "new volume state: online, busy, offline, down"); - ts = cmd_CreateSyntax("smbunicode", SmbUnicodeCmd, NULL, "enable or disable Unicode on new SMB connections"); + ts = cmd_CreateSyntax("smbunicode", SmbUnicodeCmd, NULL, 0, "enable or disable Unicode on new SMB connections"); cmd_AddParm(ts, "-on", CMD_FLAG, CMD_OPTIONAL, "enable Unicode on new connections"); cmd_AddParm(ts, "-off", CMD_FLAG, CMD_OPTIONAL, "disable Unicode on new connections"); - ts = cmd_CreateSyntax("getfid", GetFidCmd, NULL, "get file id for object(s) in afs"); + ts = cmd_CreateSyntax("getfid", GetFidCmd, NULL, 0, "get file id for object(s) in afs"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); - ts = cmd_CreateSyntax("chown", ChOwnCmd, NULL, "set owner for object(s) in afs"); + ts = cmd_CreateSyntax("chown", ChOwnCmd, NULL, 0, "set owner for object(s) in afs"); cmd_AddParm(ts, "-owner", CMD_SINGLE, 0, "user name or id"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); - ts = cmd_CreateSyntax("chgrp", ChGrpCmd, NULL, "set owner for object(s) in afs"); + ts = cmd_CreateSyntax("chgrp", ChGrpCmd, NULL, 0, "set owner for object(s) in afs"); cmd_AddParm(ts, "-group", CMD_SINGLE, 0, "user/group name or id"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); - ts = cmd_CreateSyntax("chmod", ChModCmd, NULL, "set UNIX mode for object(s) in afs"); + ts = cmd_CreateSyntax("chmod", ChModCmd, NULL, 0, "set UNIX mode for object(s) in afs"); cmd_AddParm(ts, "-mode", CMD_SINGLE, 0, "UNIX mode bits"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-literal", CMD_FLAG, CMD_OPTIONAL, "literal evaluation of mountpoints and symlinks"); - ts = cmd_CreateSyntax("setverify", SetDataVerifyCmd, NULL, "set cache manager data verify mode"); + ts = cmd_CreateSyntax("setverify", SetDataVerifyCmd, NULL, 0, "set cache manager data verify mode"); cmd_AddParm(ts, "-verify", CMD_SINGLE, 0, "on or off"); - ts = cmd_CreateSyntax("getverify", GetDataVerifyCmd, NULL, "get cache manager data verify mode"); + ts = cmd_CreateSyntax("getverify", GetDataVerifyCmd, NULL, 0, "get cache manager data verify mode"); code = cmd_Dispatch(argc, argv); diff --git a/src/WINNT/afsd/symlink.c b/src/WINNT/afsd/symlink.c index adbf0ac..5787f11 100644 --- a/src/WINNT/afsd/symlink.c +++ b/src/WINNT/afsd/symlink.c @@ -393,14 +393,14 @@ wmain(int argc, wchar_t **wargv) osi_Init(); - ts = cmd_CreateSyntax("list", ListLinkCmd, NULL, "list symlink"); + ts = cmd_CreateSyntax("list", ListLinkCmd, NULL, 0, "list symlink"); cmd_AddParm(ts, "-name", CMD_LIST, 0, "name"); - ts = cmd_CreateSyntax("make", MakeLinkCmd, NULL, "make symlink"); + ts = cmd_CreateSyntax("make", MakeLinkCmd, NULL, 0, "make symlink"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name"); cmd_AddParm(ts, "-to", CMD_SINGLE, 0, "target"); - ts = cmd_CreateSyntax("remove", RemoveLinkCmd, NULL, "remove symlink"); + ts = cmd_CreateSyntax("remove", RemoveLinkCmd, NULL, 0, "remove symlink"); cmd_AddParm(ts, "-name", CMD_LIST, 0, "name"); cmd_CreateAlias(ts, "rm"); diff --git a/src/WINNT/afsreg/test/regman.c b/src/WINNT/afsreg/test/regman.c index 49212e5..04fa7ca 100644 --- a/src/WINNT/afsreg/test/regman.c +++ b/src/WINNT/afsreg/test/regman.c @@ -286,15 +286,15 @@ SetupVptCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("vptlist", DoVptList, NULL, + ts = cmd_CreateSyntax("vptlist", DoVptList, NULL, 0, "list vice partition table"); - ts = cmd_CreateSyntax("vptadd", DoVptAdd, NULL, + ts = cmd_CreateSyntax("vptadd", DoVptAdd, NULL, 0, "add entry to vice partition table"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED, "partition name"); cmd_AddParm(ts, "-dev", CMD_SINGLE, CMD_REQUIRED, "device name"); - ts = cmd_CreateSyntax("vptdel", DoVptDel, NULL, + ts = cmd_CreateSyntax("vptdel", DoVptDel, NULL, 0, "remove entry from vice partition table"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED, "partition name"); } @@ -304,10 +304,10 @@ SetupDirCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("dirget", DoDirGet, NULL, + ts = cmd_CreateSyntax("dirget", DoDirGet, NULL, 0, "display the AFS server installation directory"); - ts = cmd_CreateSyntax("dirset", DoDirSet, NULL, + ts = cmd_CreateSyntax("dirset", DoDirSet, NULL, 0, "set the AFS server installation directory"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_REQUIRED, "directory path"); } @@ -317,11 +317,11 @@ SetupBosCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("boscfg", DoBosCfg, NULL, + ts = cmd_CreateSyntax("boscfg", DoBosCfg, NULL, 0, "configure the AFS BOS control service"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_OPTIONAL, "service binary path"); - ts = cmd_CreateSyntax("bosdel", DoBosDel, NULL, + ts = cmd_CreateSyntax("bosdel", DoBosDel, NULL, 0, "delete (unconfigure) the AFS BOS control service"); } @@ -330,7 +330,7 @@ SetupVersionCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("version", DoVersionGet, NULL, + ts = cmd_CreateSyntax("version", DoVersionGet, NULL, 0, "display AFS version information"); } diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c index 5b7ede2..9b01abe 100644 --- a/src/afsd/afsd.c +++ b/src/afsd/afsd.c @@ -2472,7 +2472,7 @@ afsd_init(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax(NULL, mainproc, NULL, "start AFS"); + ts = cmd_CreateSyntax(NULL, mainproc, NULL, 0, "start AFS"); /* 0 - 10 */ cmd_AddParmAtOffset(ts, OPT_blocks, "-blocks", CMD_SINGLE, diff --git a/src/afsmonitor/afsmonitor.c b/src/afsmonitor/afsmonitor.c index b617ecd..f900e0f 100644 --- a/src/afsmonitor/afsmonitor.c +++ b/src/afsmonitor/afsmonitor.c @@ -4229,7 +4229,7 @@ main(int argc, char **argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", afsmonInit, NULL, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", afsmonInit, NULL, 0, "initialize the program"); cmd_AddParm(ts, "-config", CMD_SINGLE, CMD_OPTIONAL, "configuration file"); cmd_AddParm(ts, "-frequency", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/afsweb/weblog.c b/src/afsweb/weblog.c index c8db04f..47696a6 100644 --- a/src/afsweb/weblog.c +++ b/src/afsweb/weblog.c @@ -121,7 +121,7 @@ main(int argc, char **argv) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "obtain Kerberos authentication for web servers"); /* define the command line arguments */ diff --git a/src/aklog/klog.c b/src/aklog/klog.c index 48fd483..88e4907 100644 --- a/src/aklog/klog.c +++ b/src/aklog/klog.c @@ -99,7 +99,7 @@ main(int argc, char *argv[]) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "obtain Kerberos authentication"); #define aXFLAG 0 diff --git a/src/bozo/bos.c b/src/bozo/bos.c index 816853f..e37ea2f 100644 --- a/src/bozo/bos.c +++ b/src/bozo/bos.c @@ -1720,12 +1720,12 @@ main(int argc, char **argv) initialize_CMD_error_table(); initialize_BZ_error_table(); - ts = cmd_CreateSyntax("start", StartServer, NULL, "start running a server"); + ts = cmd_CreateSyntax("start", StartServer, NULL, 0, "start running a server"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, 0, "server process name"); add_std_args(ts); - ts = cmd_CreateSyntax("stop", StopServer, NULL, "halt a server instance"); + ts = cmd_CreateSyntax("stop", StopServer, NULL, 0, "halt a server instance"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, 0, "server process name"); cmd_Seek(ts, 8); @@ -1733,7 +1733,7 @@ main(int argc, char **argv) "wait for process to stop"); add_std_args(ts); - ts = cmd_CreateSyntax("status", StatServer, NULL, + ts = cmd_CreateSyntax("status", StatServer, NULL, 0, "show server instance status"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, CMD_OPTIONAL, @@ -1741,7 +1741,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "long status"); add_std_args(ts); - ts = cmd_CreateSyntax("shutdown", Shutdown, NULL, "shutdown all processes"); + ts = cmd_CreateSyntax("shutdown", Shutdown, NULL, 0, "shutdown all processes"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, CMD_OPTIONAL, "instances"); cmd_Seek(ts, 8); @@ -1749,12 +1749,12 @@ main(int argc, char **argv) "wait for process to stop"); add_std_args(ts); - ts = cmd_CreateSyntax("startup", Startup, NULL, "start all processes"); + ts = cmd_CreateSyntax("startup", Startup, NULL, 0, "start all processes"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, CMD_OPTIONAL, "instances"); add_std_args(ts); - ts = cmd_CreateSyntax("restart", Restart, NULL, "restart processes"); + ts = cmd_CreateSyntax("restart", Restart, NULL, 0, "restart processes"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, CMD_OPTIONAL, "instances"); cmd_AddParm(ts, "-bosserver", CMD_FLAG, CMD_OPTIONAL, @@ -1764,7 +1764,7 @@ main(int argc, char **argv) #ifndef OPBOS - ts = cmd_CreateSyntax("create", CreateServer, NULL, + ts = cmd_CreateSyntax("create", CreateServer, NULL, 0, "create a new server instance"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_SINGLE, 0, "server process name"); @@ -1774,105 +1774,105 @@ main(int argc, char **argv) "Notifier program"); add_std_args(ts); - ts = cmd_CreateSyntax("delete", DeleteServer, NULL, + ts = cmd_CreateSyntax("delete", DeleteServer, NULL, 0, "delete a server instance"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-instance", CMD_LIST, 0, "server process name"); add_std_args(ts); - ts = cmd_CreateSyntax("adduser", AddSUser, NULL, + ts = cmd_CreateSyntax("adduser", AddSUser, NULL, 0, "add users to super-user list"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-user", CMD_LIST, 0, "user names"); add_std_args(ts); - ts = cmd_CreateSyntax("removeuser", RemoveSUser, NULL, + ts = cmd_CreateSyntax("removeuser", RemoveSUser, NULL, 0, "remove users from super-user list"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-user", CMD_LIST, 0, "user names"); add_std_args(ts); - ts = cmd_CreateSyntax("listusers", ListSUsers, NULL, "list super-users"); + ts = cmd_CreateSyntax("listusers", ListSUsers, NULL, 0, "list super-users"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); add_std_args(ts); - ts = cmd_CreateSyntax("addkey", AddKey, NULL, + ts = cmd_CreateSyntax("addkey", AddKey, NULL, 0, "add keys to key dbase (kvno 999 is bcrypt)"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-key", CMD_SINGLE, CMD_OPTIONAL, "key"); cmd_AddParm(ts, "-kvno", CMD_SINGLE, 0, "key version number"); add_std_args(ts); - ts = cmd_CreateSyntax("removekey", RemoveKey, NULL, + ts = cmd_CreateSyntax("removekey", RemoveKey, NULL, 0, "remove keys from key dbase"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-kvno", CMD_LIST, 0, "key version number"); add_std_args(ts); - ts = cmd_CreateSyntax("listkeys", ListKeys, NULL, "list keys"); + ts = cmd_CreateSyntax("listkeys", ListKeys, NULL, 0, "list keys"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-showkey", CMD_FLAG, CMD_OPTIONAL, "show the actual key rather than the checksum"); add_std_args(ts); - ts = cmd_CreateSyntax("listhosts", ListHosts, NULL, "get cell host list"); + ts = cmd_CreateSyntax("listhosts", ListHosts, NULL, 0, "get cell host list"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); add_std_args(ts); cmd_CreateAlias(ts, "getcell"); - ts = cmd_CreateSyntax("setcellname", SetCellName, NULL, "set cell name"); + ts = cmd_CreateSyntax("setcellname", SetCellName, NULL, 0, "set cell name"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "cell name"); add_std_args(ts); - ts = cmd_CreateSyntax("addhost", AddHost, NULL, "add host to cell dbase"); + ts = cmd_CreateSyntax("addhost", AddHost, NULL, 0, "add host to cell dbase"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-host", CMD_LIST, 0, "host name"); cmd_AddParm(ts, "-clone", CMD_FLAG, CMD_OPTIONAL, "vote doesn't count"); add_std_args(ts); - ts = cmd_CreateSyntax("removehost", RemoveHost, NULL, + ts = cmd_CreateSyntax("removehost", RemoveHost, NULL, 0, "remove host from cell dbase"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-host", CMD_LIST, 0, "host name"); add_std_args(ts); - ts = cmd_CreateSyntax("setauth", SetAuth, NULL, + ts = cmd_CreateSyntax("setauth", SetAuth, NULL, 0, "set authentication required flag"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-authrequired", CMD_SINGLE, 0, "on or off: authentication required for admin requests"); add_std_args(ts); - ts = cmd_CreateSyntax("install", Install, NULL, "install program"); + ts = cmd_CreateSyntax("install", Install, NULL, 0, "install program"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-file", CMD_LIST, 0, "files to install"); cmd_AddParm(ts, "-dir", CMD_SINGLE, CMD_OPTIONAL, "destination dir"); add_std_args(ts); - ts = cmd_CreateSyntax("uninstall", UnInstall, NULL, "uninstall program"); + ts = cmd_CreateSyntax("uninstall", UnInstall, NULL, 0, "uninstall program"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-file", CMD_LIST, 0, "files to uninstall"); cmd_AddParm(ts, "-dir", CMD_SINGLE, CMD_OPTIONAL, "destination dir"); add_std_args(ts); - ts = cmd_CreateSyntax("getlog", GetLogCmd, NULL, "examine log file"); + ts = cmd_CreateSyntax("getlog", GetLogCmd, NULL, 0, "examine log file"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-file", CMD_SINGLE, 0, "log file to examine"); add_std_args(ts); - ts = cmd_CreateSyntax("getdate", GetDate, NULL, "get dates for programs"); + ts = cmd_CreateSyntax("getdate", GetDate, NULL, 0, "get dates for programs"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-file", CMD_LIST, 0, "files to check"); cmd_AddParm(ts, "-dir", CMD_SINGLE, CMD_OPTIONAL, "destination dir"); add_std_args(ts); - ts = cmd_CreateSyntax("exec", Exec, NULL, "execute shell command on server"); + ts = cmd_CreateSyntax("exec", Exec, NULL, 0, "execute shell command on server"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-cmd", CMD_SINGLE, 0, "command to execute"); add_std_args(ts); - ts = cmd_CreateSyntax("prune", Prune, NULL, "prune server files"); + ts = cmd_CreateSyntax("prune", Prune, NULL, 0, "prune server files"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-bak", CMD_FLAG, CMD_OPTIONAL, "delete .BAK files"); cmd_AddParm(ts, "-old", CMD_FLAG, CMD_OPTIONAL, "delete .OLD files"); @@ -1880,7 +1880,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "delete all junk files"); add_std_args(ts); - ts = cmd_CreateSyntax("setrestart", SetRestartCmd, NULL, + ts = cmd_CreateSyntax("setrestart", SetRestartCmd, NULL, 0, "set restart times"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name"); cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_REQUIRED, @@ -1892,13 +1892,13 @@ main(int argc, char **argv) add_std_args(ts); cmd_CreateAlias(ts, "setr"); - ts = cmd_CreateSyntax("getrestart", GetRestartCmd, NULL, + ts = cmd_CreateSyntax("getrestart", GetRestartCmd, NULL, 0, "get restart times"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name"); add_std_args(ts); cmd_CreateAlias(ts, "getr"); - ts = cmd_CreateSyntax("salvage", SalvageCmd, NULL, + ts = cmd_CreateSyntax("salvage", SalvageCmd, NULL, 0, "salvage partition or volumes"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, @@ -1920,12 +1920,12 @@ main(int argc, char **argv) "(DAFS) force salvage of demand attach fileserver"); add_std_args(ts); - ts = cmd_CreateSyntax("getrestricted", GetRestrict, NULL, + ts = cmd_CreateSyntax("getrestricted", GetRestrict, NULL, 0, "get restrict mode"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); add_std_args(ts); - ts = cmd_CreateSyntax("setrestricted", SetRestrict, NULL, + ts = cmd_CreateSyntax("setrestricted", SetRestrict, NULL, 0, "set restrict mode"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-mode", CMD_SINGLE, 0, "mode to set"); diff --git a/src/bu_utils/fms.c b/src/bu_utils/fms.c index ecde75d..c2a9949 100644 --- a/src/bu_utils/fms.c +++ b/src/bu_utils/fms.c @@ -59,7 +59,7 @@ main(int argc, char **argv) sigaction(SIGINT, &intaction, &oldaction); cptr = - cmd_CreateSyntax(NULL, tt_fileMarkSize, NULL, + cmd_CreateSyntax(NULL, tt_fileMarkSize, NULL, 0, "write a tape full of file marks"); cmd_AddParm(cptr, "-tape", CMD_SINGLE, CMD_REQUIRED, "tape special file"); diff --git a/src/bucoord/main.c b/src/bucoord/main.c index 818a7f8..34a3a79 100644 --- a/src/bucoord/main.c +++ b/src/bucoord/main.c @@ -478,7 +478,7 @@ main(int argc, char **argv) cmd_SetBeforeProc(MyBeforeProc, NULL); - ts = cmd_CreateSyntax("dump", bc_DumpCmd, NULL, "start dump"); + ts = cmd_CreateSyntax("dump", bc_DumpCmd, NULL, 0, "start dump"); cmd_AddParm(ts, "-volumeset", CMD_SINGLE, CMD_OPTIONAL, "volume set name"); cmd_AddParm(ts, "-dump", CMD_SINGLE, CMD_OPTIONAL, "dump level name"); @@ -494,7 +494,7 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("volrestore", bc_VolRestoreCmd, NULL, + ts = cmd_CreateSyntax("volrestore", bc_VolRestoreCmd, NULL, 0, "restore volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "destination machine"); @@ -515,7 +515,7 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("diskrestore", bc_DiskRestoreCmd, NULL, + ts = cmd_CreateSyntax("diskrestore", bc_DiskRestoreCmd, NULL, 0, "restore partition"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine to restore"); @@ -535,9 +535,9 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - cmd_CreateSyntax("quit", bc_QuitCmd, NULL, "leave the program"); + cmd_CreateSyntax("quit", bc_QuitCmd, NULL, 0, "leave the program"); - ts = cmd_CreateSyntax("volsetrestore", bc_VolsetRestoreCmd, NULL, + ts = cmd_CreateSyntax("volsetrestore", bc_VolsetRestoreCmd, NULL, 0, "restore a set of volumes"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "volume set name"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "file name"); @@ -550,7 +550,7 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("addhost", bc_AddHostCmd, NULL, "add host to config"); + ts = cmd_CreateSyntax("addhost", bc_AddHostCmd, NULL, 0, "add host to config"); cmd_AddParm(ts, "-tapehost", CMD_SINGLE, CMD_REQUIRED, "tape machine name"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, @@ -558,7 +558,7 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("delhost", bc_DeleteHostCmd, NULL, + ts = cmd_CreateSyntax("delhost", bc_DeleteHostCmd, NULL, 0, "delete host to config"); cmd_AddParm(ts, "-tapehost", CMD_SINGLE, CMD_REQUIRED, "tape machine name"); @@ -567,29 +567,29 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("listhosts", bc_ListHostsCmd, NULL, + ts = cmd_CreateSyntax("listhosts", bc_ListHostsCmd, NULL, 0, "list config hosts"); if (!interact) add_std_args(ts); - cmd_CreateSyntax("jobs", bc_JobsCmd, NULL, "list running jobs"); + cmd_CreateSyntax("jobs", bc_JobsCmd, NULL, 0, "list running jobs"); - ts = cmd_CreateSyntax("kill", bc_KillCmd, NULL, "kill running job"); + ts = cmd_CreateSyntax("kill", bc_KillCmd, NULL, 0, "kill running job"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_REQUIRED, "job ID or dump set name"); - ts = cmd_CreateSyntax("listvolsets", bc_ListVolSetCmd, NULL, + ts = cmd_CreateSyntax("listvolsets", bc_ListVolSetCmd, NULL, 0, "list volume sets"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "volume set name"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("listdumps", bc_ListDumpScheduleCmd, NULL, + ts = cmd_CreateSyntax("listdumps", bc_ListDumpScheduleCmd, NULL, 0, "list dump schedules"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("addvolset", bc_AddVolSetCmd, NULL, + ts = cmd_CreateSyntax("addvolset", bc_AddVolSetCmd, NULL, 0, "create a new volume set"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_REQUIRED, "volume set name"); cmd_AddParm(ts, "-temporary", CMD_FLAG, CMD_OPTIONAL, @@ -597,20 +597,20 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("status", bc_GetTapeStatusCmd, NULL, + ts = cmd_CreateSyntax("status", bc_GetTapeStatusCmd, NULL, 0, "get tape coordinator status"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, "TC port offset"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("delvolset", bc_DeleteVolSetCmd, NULL, + ts = cmd_CreateSyntax("delvolset", bc_DeleteVolSetCmd, NULL, 0, "delete a volume set"); cmd_AddParm(ts, "-name", CMD_LIST, CMD_REQUIRED, "volume set name"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("addvolentry", bc_AddVolEntryCmd, NULL, + ts = cmd_CreateSyntax("addvolentry", bc_AddVolEntryCmd, NULL, 0, "add a new volume entry"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_REQUIRED, "volume set name"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "machine name"); @@ -620,26 +620,26 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("delvolentry", bc_DeleteVolEntryCmd, NULL, + ts = cmd_CreateSyntax("delvolentry", bc_DeleteVolEntryCmd, NULL, 0, "delete a volume set sub-entry"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_REQUIRED, "volume set name"); cmd_AddParm(ts, "-entry", CMD_SINGLE, CMD_REQUIRED, "volume set index"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("adddump", bc_AddDumpCmd, NULL, "add dump schedule"); + ts = cmd_CreateSyntax("adddump", bc_AddDumpCmd, NULL, 0, "add dump schedule"); cmd_AddParm(ts, "-dump", CMD_LIST, CMD_REQUIRED, "dump level name"); cmd_AddParm(ts, "-expires", CMD_LIST, CMD_OPTIONAL, "expiration date"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("deldump", bc_DeleteDumpCmd, NULL, + ts = cmd_CreateSyntax("deldump", bc_DeleteDumpCmd, NULL, 0, "delete dump schedule"); cmd_AddParm(ts, "-dump", CMD_SINGLE, CMD_REQUIRED, "dump level name"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("labeltape", bc_LabelTapeCmd, NULL, "label a tape"); + ts = cmd_CreateSyntax("labeltape", bc_LabelTapeCmd, NULL, 0, "label a tape"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "AFS tape name, defaults to NULL"); cmd_AddParm(ts, "-size", CMD_SINGLE, CMD_OPTIONAL, @@ -651,14 +651,14 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("readlabel", bc_ReadLabelCmd, NULL, + ts = cmd_CreateSyntax("readlabel", bc_ReadLabelCmd, NULL, 0, "read the label on tape"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, "TC port offset"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("scantape", bc_ScanDumpsCmd, NULL, + ts = cmd_CreateSyntax("scantape", bc_ScanDumpsCmd, NULL, 0, "dump information recovery from tape"); cmd_AddParm(ts, "-dbadd", CMD_FLAG, CMD_OPTIONAL, "add information to the database"); @@ -667,34 +667,34 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("volinfo", bc_dblookupCmd, NULL, + ts = cmd_CreateSyntax("volinfo", bc_dblookupCmd, NULL, 0, "query the backup database"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume name"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("setexp", bc_SetExpCmd, NULL, + ts = cmd_CreateSyntax("setexp", bc_SetExpCmd, NULL, 0, "set/clear dump expiration dates"); cmd_AddParm(ts, "-dump", CMD_LIST, CMD_REQUIRED, "dump level name"); cmd_AddParm(ts, "-expires", CMD_LIST, CMD_OPTIONAL, "expiration date"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("savedb", bc_saveDbCmd, NULL, "save backup database"); + ts = cmd_CreateSyntax("savedb", bc_saveDbCmd, NULL, 0, "save backup database"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, "TC port offset"); cmd_AddParm(ts, "-archive", CMD_LIST, CMD_OPTIONAL, "date time"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("restoredb", bc_restoreDbCmd, NULL, + ts = cmd_CreateSyntax("restoredb", bc_restoreDbCmd, NULL, 0, "restore backup database"); cmd_AddParm(ts, "-portoffset", CMD_SINGLE, CMD_OPTIONAL, "TC port offset"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("dumpinfo", bc_dumpInfoCmd, NULL, + ts = cmd_CreateSyntax("dumpinfo", bc_dumpInfoCmd, NULL, 0, "provide information about a dump in the database"); cmd_AddParm(ts, "-ndumps", CMD_SINGLE, CMD_OPTIONAL, "no. of dumps"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_OPTIONAL, "dump id"); @@ -703,13 +703,13 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("dbverify", bc_dbVerifyCmd, NULL, + ts = cmd_CreateSyntax("dbverify", bc_dbVerifyCmd, NULL, 0, "check ubik database integrity"); cmd_AddParm(ts, "-detail", CMD_FLAG, CMD_OPTIONAL, "additional details"); if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("deletedump", bc_deleteDumpCmd, NULL, + ts = cmd_CreateSyntax("deletedump", bc_deleteDumpCmd, NULL, 0, "delete dumps from the database"); cmd_AddParm(ts, "-dumpid", CMD_LIST, CMD_OPTIONAL, "dump id"); cmd_AddParm(ts, "-from", CMD_LIST, CMD_OPTIONAL, "date time"); @@ -729,7 +729,7 @@ main(int argc, char **argv) if (!interact) add_std_args(ts); - ts = cmd_CreateSyntax("interactive", bc_interactCmd, NULL, + ts = cmd_CreateSyntax("interactive", bc_interactCmd, NULL, 0, "enter interactive mode"); add_std_args(ts); diff --git a/src/budb/server.c b/src/budb/server.c index 3e4bb01..c6e11f5 100644 --- a/src/budb/server.c +++ b/src/budb/server.c @@ -139,7 +139,7 @@ initializeArgHandler(void) cmd_SetBeforeProc(MyBeforeProc, NULL); - cptr = cmd_CreateSyntax(NULL, argHandler, NULL, "Backup database server"); + cptr = cmd_CreateSyntax(NULL, argHandler, NULL, 0, "Backup database server"); cmd_AddParm(cptr, "-database", CMD_SINGLE, CMD_OPTIONAL, "database directory"); diff --git a/src/butc/read_tape.c b/src/butc/read_tape.c index ae552ed..569a740 100644 --- a/src/butc/read_tape.c +++ b/src/butc/read_tape.c @@ -543,7 +543,7 @@ main(int argc, char **argv) setlinebuf(stdout); - ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, + ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, 0, "Restore volumes from backup tape"); cmd_AddParm(ts, "-tape", CMD_SINGLE, CMD_REQUIRED, "tape device"); cmd_AddParm(ts, "-restore", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/butc/tcmain.c b/src/butc/tcmain.c index c6d1bbc..d98fd79 100644 --- a/src/butc/tcmain.c +++ b/src/butc/tcmain.c @@ -1175,7 +1175,7 @@ main(int argc, char **argv) setlinebuf(stdout); - ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, "tape coordinator"); + ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, 0, "tape coordinator"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "port offset"); cmd_AddParm(ts, "-debuglevel", CMD_SINGLE, CMD_OPTIONAL, "0 | 1 | 2"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); diff --git a/src/butc/test.c b/src/butc/test.c index 18348f9..515f5bd 100644 --- a/src/butc/test.c +++ b/src/butc/test.c @@ -290,20 +290,20 @@ main(argc, argv) #endif cmd_SetBeforeProc(MyBeforeProc, NULL); - ts = cmd_CreateSyntax("dump", PerformDump, NULL, "perform a dump"); + ts = cmd_CreateSyntax("dump", PerformDump, NULL, 0, "perform a dump"); - ts = cmd_CreateSyntax("restore", PerformRestore, NULL, "perform a restore"); + ts = cmd_CreateSyntax("restore", PerformRestore, NULL, 0, "perform a restore"); - ts = cmd_CreateSyntax("check", CheckDump, NULL, "check a dump"); + ts = cmd_CreateSyntax("check", CheckDump, NULL, 0, "check a dump"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "dump id"); - ts = cmd_CreateSyntax("abort", AbortDump, NULL, "abort a dump"); + ts = cmd_CreateSyntax("abort", AbortDump, NULL, 0, "abort a dump"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "dump id"); - ts = cmd_CreateSyntax("wait", WaitForDump, NULL, "wait for a dump"); + ts = cmd_CreateSyntax("wait", WaitForDump, NULL, 0, "wait for a dump"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "dump id"); - ts = cmd_CreateSyntax("end", EndDump, NULL, "end a dump"); + ts = cmd_CreateSyntax("end", EndDump, NULL, 0, "end a dump"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "dump id"); code = cmd_Dispatch(argc, argv); diff --git a/src/cmd/cmd.c b/src/cmd/cmd.c index 317b0d2..cff5731 100644 --- a/src/cmd/cmd.c +++ b/src/cmd/cmd.c @@ -433,10 +433,24 @@ SortSyntax(struct cmd_syndesc *as) return 0; } +/*! + * Create a command syntax. + * + * \note Use cmd_AddParm() or cmd_AddParmAtOffset() to set the + * parameters for the new command. + * + * \param[in] aname name used to invoke the command + * \param[in] aproc procedure to be called when command is invoked + * \param[in] arock opaque data pointer to be passed to aproc + * \param[in] aflags command option flags (CMD_HIDDEN) + * \param[in] ahelp help string to display for this command + * + * \return a pointer to the cmd_syndesc or NULL if error. + */ struct cmd_syndesc * cmd_CreateSyntax(char *aname, int (*aproc) (struct cmd_syndesc * ts, void *arock), - void *arock, char *ahelp) + void *arock, afs_uint32 aflags, char *ahelp) { struct cmd_syndesc *td; @@ -444,9 +458,15 @@ cmd_CreateSyntax(char *aname, if (noOpcodes) return NULL; + /* Allow only valid cmd flags. */ + if (aflags & ~CMD_HIDDEN) { + return NULL; + } + td = calloc(1, sizeof(struct cmd_syndesc)); assert(td); td->aliasOf = td; /* treat aliasOf as pointer to real command, no matter what */ + td->flags = aflags; /* copy in name, etc */ if (aname) { @@ -457,7 +477,7 @@ cmd_CreateSyntax(char *aname, noOpcodes = 1; } if (ahelp) { - /* Piggy-back the hidden option onto the help string */ + /* Piggy-back the hidden option onto the help string. */ if (ahelp == (char *)CMD_HIDDEN) { td->flags |= CMD_HIDDEN; } else { @@ -751,23 +771,23 @@ initSyntax(void) struct cmd_syndesc *ts; if (!noOpcodes) { - ts = cmd_CreateSyntax("help", HelpProc, NULL, + ts = cmd_CreateSyntax("help", HelpProc, NULL, 0, "get help on commands"); cmd_AddParm(ts, "-topic", CMD_LIST, CMD_OPTIONAL, "help string"); - ts = cmd_CreateSyntax("apropos", AproposProc, NULL, + ts = cmd_CreateSyntax("apropos", AproposProc, NULL, 0, "search by help text"); cmd_AddParm(ts, "-topic", CMD_SINGLE, CMD_REQUIRED, "help string"); - cmd_CreateSyntax("version", VersionProc, NULL, + cmd_CreateSyntax("version", VersionProc, NULL, 0, "show version"); - cmd_CreateSyntax("-version", VersionProc, NULL, + cmd_CreateSyntax("-version", VersionProc, NULL, 0, (char *)CMD_HIDDEN); - cmd_CreateSyntax("-help", HelpProc, NULL, + cmd_CreateSyntax("-help", HelpProc, NULL, 0, (char *)CMD_HIDDEN); - cmd_CreateSyntax("--version", VersionProc, NULL, + cmd_CreateSyntax("--version", VersionProc, NULL, 0, (char *)CMD_HIDDEN); - cmd_CreateSyntax("--help", HelpProc, NULL, + cmd_CreateSyntax("--help", HelpProc, NULL, 0, (char *)CMD_HIDDEN); } } diff --git a/src/cmd/cmd.p.h b/src/cmd/cmd.p.h index 19c5057..4a5f303 100644 --- a/src/cmd/cmd.p.h +++ b/src/cmd/cmd.p.h @@ -56,14 +56,14 @@ struct cmd_syndesc { int (*proc) (struct cmd_syndesc * ts, void *arock); void *rock; int nParms; /* number of parms */ - afs_int32 flags; /* random flags */ + afs_uint32 flags; /* random flags */ struct cmd_parmdesc parms[CMD_MAXPARMS]; /* parms themselves */ }; extern struct cmd_syndesc *cmd_CreateSyntax(char *namep, int (*aprocp) (struct cmd_syndesc * ts, void *arock), - void *rockp, char *helpp); + void *rockp, afs_uint32 aflags, char *helpp); extern int cmd_SetBeforeProc(int (*aproc) (struct cmd_syndesc * ts, void *beforeRock), void *arock); diff --git a/src/cmd/test/ctest.c b/src/cmd/test/ctest.c index e9220c8..d087e25 100644 --- a/src/cmd/test/ctest.c +++ b/src/cmd/test/ctest.c @@ -42,10 +42,10 @@ main(int argc, char **argv) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("apple", cproc1, NULL, "describe apple"); + ts = cmd_CreateSyntax("apple", cproc1, NULL, 0, "describe apple"); cmd_CreateAlias(ts, "appl"); - ts = cmd_CreateSyntax("pear", cproc2, NULL, "describe pear"); + ts = cmd_CreateSyntax("pear", cproc2, NULL, 0, "describe pear"); cmd_AddParm(ts, "-num", CMD_LIST, 0, "number of pears"); cmd_AddParm(ts, "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate"); cmd_AddParm(ts, "-spotpos", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, 0); diff --git a/src/cmd/test/dtest.c b/src/cmd/test/dtest.c index 4ab4574..aa8a3cd 100644 --- a/src/cmd/test/dtest.c +++ b/src/cmd/test/dtest.c @@ -33,7 +33,7 @@ main(int argc, char **argv) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax(NULL, cproc, NULL, "describe pear"); + ts = cmd_CreateSyntax(NULL, cproc, NULL, 0, "describe pear"); cmd_AddParm(ts, "-num", CMD_SINGLE, 0, "number of pears"); cmd_AddParm(ts, "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate"); cmd_AddParm(ts, "-spotpos", CMD_LIST, CMD_OPTIONAL, 0); diff --git a/src/cmd/test/itest.c b/src/cmd/test/itest.c index bb0eaf6..e7fb694 100644 --- a/src/cmd/test/itest.c +++ b/src/cmd/test/itest.c @@ -56,9 +56,9 @@ main(int argc, char **argv) initialize_CMD_error_table(); - ts = cmd_CreateSyntax("apple", cproc1, NULL, "describe apple"); + ts = cmd_CreateSyntax("apple", cproc1, NULL, 0, "describe apple"); - ts = cmd_CreateSyntax("pear", cproc2, NULL, "describe pear"); + ts = cmd_CreateSyntax("pear", cproc2, NULL, 0, "describe pear"); cmd_AddParm(ts, "-num", CMD_LIST, 0, "number of pears"); cmd_AddParm(ts, "-noauth", CMD_FLAG, CMD_OPTIONAL, "don't authenticate"); cmd_AddParm(ts, "-spotpos", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, 0); @@ -66,7 +66,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); cmd_CreateAlias(ts, "alias"); - ts = cmd_CreateSyntax("quit", cproc3, 0, "quit"); + ts = cmd_CreateSyntax("quit", cproc3, 0, 0, "quit"); while (1) { printf("> "); diff --git a/src/gtx/object_test.c b/src/gtx/object_test.c index 95beaa5..ad6ce97 100644 --- a/src/gtx/object_test.c +++ b/src/gtx/object_test.c @@ -437,7 +437,7 @@ main(argc, argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", object_testInit, NULL, + ts = cmd_CreateSyntax("initcmd", object_testInit, NULL, 0, "Initialize the program"); cmd_AddParm(ts, "-package", CMD_SINGLE, CMD_REQUIRED, "Graphics package to use"); diff --git a/src/gtx/screen_test.c b/src/gtx/screen_test.c index f94e650..7c5f03b 100644 --- a/src/gtx/screen_test.c +++ b/src/gtx/screen_test.c @@ -276,7 +276,7 @@ main(argc, argv) * There really aren't any opcodes here, but we do want to interpret switches * from the command line. So, all we need do is set up the initcmd ``opcode''. */ - ts = cmd_CreateSyntax("initcmd", screen_testInit, NULL, + ts = cmd_CreateSyntax("initcmd", screen_testInit, NULL, 0, "Initialize, interpret command line"); cmd_AddParm(ts, "-package", CMD_SINGLE, CMD_REQUIRED, "Graphics package to use"); diff --git a/src/kauth/admin_tools.c b/src/kauth/admin_tools.c index b139315..579e97f 100644 --- a/src/kauth/admin_tools.c +++ b/src/kauth/admin_tools.c @@ -1665,14 +1665,14 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) cmd_SetBeforeProc(MyBeforeProc, NULL); cmd_SetAfterProc(MyAfterProc, NULL); - ts = cmd_CreateSyntax("interactive", Interactive, NULL, + ts = cmd_CreateSyntax("interactive", Interactive, NULL, 0, "enter interactive mode"); add_std_args(ts); - cmd_CreateSyntax("noauthentication", NoAuth, NULL, + cmd_CreateSyntax("noauthentication", NoAuth, NULL, 0, "connect to AuthServer w/o using token"); - ts = cmd_CreateSyntax("list", ListUsers, NULL, + ts = cmd_CreateSyntax("list", ListUsers, NULL, 0, "list all users in database"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "show detailed info about each user"); @@ -1683,26 +1683,26 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) add_std_args(ts); cmd_CreateAlias(ts, "ls"); - ts = cmd_CreateSyntax("examine", ExamineUser, NULL, + ts = cmd_CreateSyntax("examine", ExamineUser, NULL, 0, "examine the entry for a user"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_AddParm(ts, "-showkey", CMD_FLAG, CMD_OPTIONAL, "show the user's actual key rather than the checksum"); add_std_args(ts); - ts = cmd_CreateSyntax("create", CreateUser, NULL, + ts = cmd_CreateSyntax("create", CreateUser, NULL, 0, "create an entry for a user"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_AddParm(ts, "-initial_password", CMD_SINGLE, CMD_OPTIONAL, "initial password"); add_std_args(ts); - ts = cmd_CreateSyntax("delete", DeleteUser, NULL, "delete a user"); + ts = cmd_CreateSyntax("delete", DeleteUser, NULL, 0, "delete a user"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); add_std_args(ts); cmd_CreateAlias(ts, "rm"); - ts = cmd_CreateSyntax("setfields", SetFields, NULL, + ts = cmd_CreateSyntax("setfields", SetFields, NULL, 0, "set various fields in a user's entry"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_AddParm(ts, "-flags", CMD_SINGLE, CMD_OPTIONAL, @@ -1727,18 +1727,18 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) cmd_CreateAlias(ts, "sf"); - ts = cmd_CreateSyntax("unlock", Unlock, NULL, + ts = cmd_CreateSyntax("unlock", Unlock, NULL, 0, "Enable authentication ID after max failed attempts exceeded"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "authentication ID"); add_std_args(ts); - ts = cmd_CreateSyntax("stringtokey", StringToKey, NULL, + ts = cmd_CreateSyntax("stringtokey", StringToKey, NULL, 0, "convert a string to a key"); cmd_AddParm(ts, "-string", CMD_SINGLE, 0, "password string"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); - ts = cmd_CreateSyntax("setpassword", SetPassword, NULL, + ts = cmd_CreateSyntax("setpassword", SetPassword, NULL, 0, "set a user's password"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_AddParm(ts, "-new_password", CMD_SINGLE, CMD_OPTIONAL, @@ -1752,7 +1752,7 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) #endif /* set a user's key */ - ts = cmd_CreateSyntax("setkey", SetPassword, NULL, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("setkey", SetPassword, NULL, 0, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); cmd_Seek(ts, 2); cmd_AddParm(ts, "-new_key", CMD_SINGLE, 0, "eight byte new key"); @@ -1761,7 +1761,7 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) add_std_args(ts); /* get a user's password */ - ts = cmd_CreateSyntax("getpassword", GetPassword, NULL, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("getpassword", GetPassword, NULL, 0, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of user"); /* don't take standard args */ /* add_std_args (ts); */ @@ -1770,27 +1770,27 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) #endif /* get a random key */ - ts = cmd_CreateSyntax("getrandomkey", GetRandomKey, NULL, + ts = cmd_CreateSyntax("getrandomkey", GetRandomKey, NULL, 0, (char *)CMD_HIDDEN); add_std_args(ts); /* get a ticket for a specific server */ - ts = cmd_CreateSyntax("getticket", GetTicket, NULL, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("getticket", GetTicket, NULL, 0, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "name of server"); cmd_AddParm(ts, "-lifetime", CMD_SINGLE, CMD_OPTIONAL, "ticket lifetime"); add_std_args(ts); - ts = cmd_CreateSyntax("statistics", Statistics, NULL, + ts = cmd_CreateSyntax("statistics", Statistics, NULL, 0, "show statistics for AuthServer"); add_std_args(ts); /* show debugging info from AuthServer */ - ts = cmd_CreateSyntax("debuginfo", DebugInfo, NULL, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("debuginfo", DebugInfo, NULL, 0, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-hostname", CMD_SINGLE, CMD_OPTIONAL, "authentication server host name"); add_std_args(ts); - ts = cmd_CreateSyntax("forgetticket", ForgetTicket, NULL, + ts = cmd_CreateSyntax("forgetticket", ForgetTicket, NULL, 0, "delete user's tickets"); #ifdef notdef cmd_AddParm(ts, "-name", CMD_SINGLE, (CMD_OPTIONAL | CMD_HIDE), @@ -1798,13 +1798,13 @@ ka_AdminInteractive(int cmd_argc, char *cmd_argv[]) #endif cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "delete all tickets"); - ts = cmd_CreateSyntax("listtickets", ListTickets, NULL, + ts = cmd_CreateSyntax("listtickets", ListTickets, NULL, 0, "show all cache manager tickets"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "name of server"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "show session key and ticket"); - cmd_CreateSyntax("quit", Quit, NULL, "exit program"); + cmd_CreateSyntax("quit", Quit, NULL, 0, "exit program"); finished = 1; conn = 0; /* no connection yet */ diff --git a/src/kauth/kdb.c b/src/kauth/kdb.c index 0703cdd..74dc18f 100644 --- a/src/kauth/kdb.c +++ b/src/kauth/kdb.c @@ -109,7 +109,7 @@ main(int argc, char **argv) sprintf(dbmfile_help, "dbmfile to use (default %s)", AFSDIR_SERVER_KALOGDB_FILEPATH); dbmfile = AFSDIR_SERVER_KALOGDB_FILEPATH; - ts = cmd_CreateSyntax(NULL, cmdproc, NULL, "Dump contents of dbm database"); + ts = cmd_CreateSyntax(NULL, cmdproc, NULL, 0, "Dump contents of dbm database"); cmd_AddParm(ts, "-dbmfile", CMD_SINGLE, CMD_OPTIONAL, dbmfile_help); cmd_AddParm(ts, "-key", CMD_SINGLE, CMD_OPTIONAL, "extract entries that match specified key"); diff --git a/src/kauth/klog.c b/src/kauth/klog.c index ea15360..458c606 100644 --- a/src/kauth/klog.c +++ b/src/kauth/klog.c @@ -90,7 +90,7 @@ main(int argc, char *argv[]) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "obtain Kerberos authentication"); #define aXFLAG 0 diff --git a/src/kauth/knfs.c b/src/kauth/knfs.c index e7c257a..8b6dd82 100644 --- a/src/kauth/knfs.c +++ b/src/kauth/knfs.c @@ -440,7 +440,7 @@ main(int argc, char **argv) sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, cmdproc, NULL, "copy tickets for NFS"); + ts = cmd_CreateSyntax(NULL, cmdproc, NULL, 0, "copy tickets for NFS"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host name"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_OPTIONAL, "user ID (decimal)"); cmd_AddParm(ts, "-sysname", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/kauth/kpasswd.c b/src/kauth/kpasswd.c index eb2a9f6..fbe9cbf 100644 --- a/src/kauth/kpasswd.c +++ b/src/kauth/kpasswd.c @@ -103,7 +103,7 @@ main(int argc, char *argv[], char **envp) zero_argv = argv; init_child(*argv); - ts = cmd_CreateSyntax(NULL, CommandProc, 0, "change user's password"); + ts = cmd_CreateSyntax(NULL, CommandProc, 0, 0, "change user's password"); #define aXFLAG 0 #define aPRINCIPAL 1 diff --git a/src/kauth/manyklog.c b/src/kauth/manyklog.c index 83c432e..760ffe8 100644 --- a/src/kauth/manyklog.c +++ b/src/kauth/manyklog.c @@ -88,7 +88,7 @@ main(argc, argv) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "obtain Kerberos authentication"); #define aXFLAG 0 diff --git a/src/kauth/rebuild.c b/src/kauth/rebuild.c index cb55863..e7baaca 100644 --- a/src/kauth/rebuild.c +++ b/src/kauth/rebuild.c @@ -628,7 +628,7 @@ main(int argc, char **argv) setlinebuf(stdout); - ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, "KADB check"); + ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, 0, "KADB check"); cmd_AddParm(ts, "-database", CMD_SINGLE, CMD_REQUIRED, "kadb_file"); cmd_AddParm(ts, "-uheader", CMD_FLAG, CMD_OPTIONAL, "Display UBIK header"); diff --git a/src/kauth/test/multiklog.c b/src/kauth/test/multiklog.c index adaa7d5..da48608 100644 --- a/src/kauth/test/multiklog.c +++ b/src/kauth/test/multiklog.c @@ -73,7 +73,7 @@ main(argc, argv) zero_argc = argc; zero_argv = argv; - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "obtain Kerberos authentication"); #define aXFLAG 0 diff --git a/src/kauth/test/test_getticket.c b/src/kauth/test/test_getticket.c index a6ca374..03c41ac 100644 --- a/src/kauth/test/test_getticket.c +++ b/src/kauth/test/test_getticket.c @@ -506,7 +506,7 @@ main(argc, argv) initialize_ACFG_error_table(); initialize_KA_error_table(); - ts = cmd_CreateSyntax(NULL, Main, NULL, "Main program"); + ts = cmd_CreateSyntax(NULL, Main, NULL, 0, "Main program"); /* 0 */ cmd_AddParm(ts, "-patient", CMD_FLAG, CMD_OPTIONAL, "wait for TGS ticket to age"); cmd_Seek(ts, 12); diff --git a/src/kauth/test/test_rxkad_free.c b/src/kauth/test/test_rxkad_free.c index bf39e65..7f8d360 100644 --- a/src/kauth/test/test_rxkad_free.c +++ b/src/kauth/test/test_rxkad_free.c @@ -369,7 +369,7 @@ main(argc, argv) initialize_ACFG_error_table(); initialize_KA_error_table(); - ts = cmd_CreateSyntax(NULL, Main, NULL, "Main program"); + ts = cmd_CreateSyntax(NULL, Main, NULL, 0, "Main program"); /* 0 */ cmd_AddParm(ts, "-number", CMD_SINGLE, CMD_OPTIONAL, "number of iterations"); /* 1 */ cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/libadmin/cfg/test/cfgtest.c b/src/libadmin/cfg/test/cfgtest.c index b520da5..3eb5436 100644 --- a/src/libadmin/cfg/test/cfgtest.c +++ b/src/libadmin/cfg/test/cfgtest.c @@ -208,21 +208,21 @@ SetupCellServDbCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("CellServDbAddHost", DoCellServDbAddHost, NULL, + ts = cmd_CreateSyntax("CellServDbAddHost", DoCellServDbAddHost, NULL, 0, "add configuration target to server CellServDB"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-syshost", CMD_SINGLE, CMD_OPTIONAL, "system control host"); - ts = cmd_CreateSyntax("CellServDbRemoveHost", DoCellServDbRemoveHost, NULL, + ts = cmd_CreateSyntax("CellServDbRemoveHost", DoCellServDbRemoveHost, NULL, 0, "remove configuration target from server CellServDB"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-syshost", CMD_SINGLE, CMD_OPTIONAL, "system control host"); - ts = cmd_CreateSyntax("CellServDbEnumerate", DoCellServDbEnumerate, NULL, + ts = cmd_CreateSyntax("CellServDbEnumerate", DoCellServDbEnumerate, NULL, 0, "enumerate server CellServDB from specified host"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host name"); @@ -313,18 +313,18 @@ SetupServerCmd(void) struct cmd_syndesc *ts; ts = cmd_CreateSyntax("DbServersWaitForQuorum", DoDbServersWaitForQuorum, - NULL, "wait for database servers to achieve quorum"); + NULL, 0, "wait for database servers to achieve quorum"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-timeout", CMD_SINGLE, CMD_OPTIONAL, "timeout in seconds"); - ts = cmd_CreateSyntax("FileServerStop", DoFileServerStop, NULL, + ts = cmd_CreateSyntax("FileServerStop", DoFileServerStop, NULL, 0, "stop and unconfigure fileserver on specified host"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); - ts = cmd_CreateSyntax("FileServerStart", DoFileServerStart, NULL, + ts = cmd_CreateSyntax("FileServerStart", DoFileServerStart, NULL, 0, "start the fileserver on specified host"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); @@ -377,7 +377,7 @@ SetupHostCmd(void) struct cmd_syndesc *ts; ts = cmd_CreateSyntax("HostPartitionTableEnumerate", - DoHostPartitionTableEnumerate, NULL, + DoHostPartitionTableEnumerate, NULL, 0, "enumerate vice partition table"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); @@ -602,7 +602,7 @@ SetupClientCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("ClientCellServDbAdd", DoClientCellServDbAdd, NULL, + ts = cmd_CreateSyntax("ClientCellServDbAdd", DoClientCellServDbAdd, NULL, 0, "add host entry to client CellServDB"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); @@ -610,38 +610,38 @@ SetupClientCmd(void) cmd_AddParm(ts, "-dbhost", CMD_SINGLE, CMD_REQUIRED, "host to add"); ts = cmd_CreateSyntax("ClientCellServDbRemove", DoClientCellServDbRemove, - NULL, "remove host entry from client CellServDB"); + NULL, 0, "remove host entry from client CellServDB"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_REQUIRED, "cell name"); cmd_AddParm(ts, "-dbhost", CMD_SINGLE, CMD_REQUIRED, "host to remove"); - ts = cmd_CreateSyntax("ClientSetCell", DoClientSetCell, NULL, + ts = cmd_CreateSyntax("ClientSetCell", DoClientSetCell, NULL, 0, "set default client cell"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_REQUIRED, "cell name"); cmd_AddParm(ts, "-dbhosts", CMD_LIST, CMD_REQUIRED, "database hosts"); - ts = cmd_CreateSyntax("ClientQueryStatus", DoClientQueryStatus, NULL, + ts = cmd_CreateSyntax("ClientQueryStatus", DoClientQueryStatus, NULL, 0, "query status of client on host"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); - ts = cmd_CreateSyntax("HostQueryStatus", DoHostQueryStatus, NULL, + ts = cmd_CreateSyntax("HostQueryStatus", DoHostQueryStatus, NULL, 0, "query status of server on host"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); - ts = cmd_CreateSyntax("ClientStart", DoClientStart, NULL, + ts = cmd_CreateSyntax("ClientStart", DoClientStart, NULL, 0, "start the client"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-timeout", CMD_SINGLE, CMD_REQUIRED, "wait timeout"); - ts = cmd_CreateSyntax("ClientStop", DoClientStop, NULL, "stop the client"); + ts = cmd_CreateSyntax("ClientStop", DoClientStop, NULL, 0, "stop the client"); cmd_AddParm(ts, "-cfghost", CMD_SINGLE, CMD_REQUIRED, "configuration host"); cmd_AddParm(ts, "-timeout", CMD_SINGLE, CMD_REQUIRED, "wait timeout"); diff --git a/src/libadmin/test/bos.c b/src/libadmin/test/bos.c index 1449482..4da7879 100644 --- a/src/libadmin/test/bos.c +++ b/src/libadmin/test/bos.c @@ -1808,7 +1808,7 @@ SetupBosAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("BosProcessCreate", DoBosProcessCreate, NULL, + ts = cmd_CreateSyntax("BosProcessCreate", DoBosProcessCreate, NULL, 0, "create a new bos process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process will be created"); @@ -1824,7 +1824,7 @@ SetupBosAdminCmd(void) "path to notifier binary that is run when process terminates"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosFSProcessCreate", DoBosFSProcessCreate, NULL, + ts = cmd_CreateSyntax("BosFSProcessCreate", DoBosFSProcessCreate, NULL, 0, "create a fs bos process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process will be created"); @@ -1840,7 +1840,7 @@ SetupBosAdminCmd(void) "path to notifier binary that is run when process terminates"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessDelete", DoBosProcessDelete, NULL, + ts = cmd_CreateSyntax("BosProcessDelete", DoBosProcessDelete, NULL, 0, "delete a bos process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process will be deleted"); @@ -1849,7 +1849,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessExecutionStateGet", - DoBosProcessExecutionStateGet, NULL, + DoBosProcessExecutionStateGet, NULL, 0, "get the process execution state of a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1858,7 +1858,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessExecutionStateSet", - DoBosProcessExecutionStateSet, NULL, + DoBosProcessExecutionStateSet, NULL, 0, "set the process execution state of a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1871,7 +1871,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessExecutionStateSetTemporary", - DoBosProcessExecutionStateSetTemporary, NULL, + DoBosProcessExecutionStateSetTemporary, NULL, 0, "set the process execution state " "of a process temporarily"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1884,12 +1884,12 @@ SetupBosAdminCmd(void) "set the process state to running"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessNameList", DoBosProcessNameList, NULL, + ts = cmd_CreateSyntax("BosProcessNameList", DoBosProcessNameList, NULL, 0, "list the names of all processes at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessInfoGet", DoBosProcessInfoGet, NULL, + ts = cmd_CreateSyntax("BosProcessInfoGet", DoBosProcessInfoGet, NULL, 0, "get information about a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1898,7 +1898,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessParameterList", - DoBosProcessParameterList, NULL, + DoBosProcessParameterList, NULL, 0, "list the parameters of a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1906,7 +1906,7 @@ SetupBosAdminCmd(void) "the name of the process"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessNotifierGet", DoBosProcessNotifierGet, NULL, + ts = cmd_CreateSyntax("BosProcessNotifierGet", DoBosProcessNotifierGet, NULL, 0, "get the notifier for a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1914,7 +1914,7 @@ SetupBosAdminCmd(void) "the name of the process"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessRestart", DoBosProcessRestart, NULL, + ts = cmd_CreateSyntax("BosProcessRestart", DoBosProcessRestart, NULL, 0, "restart a process"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where process exists"); @@ -1922,13 +1922,13 @@ SetupBosAdminCmd(void) "the name of the process"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessAllStop", DoBosProcessAllStop, NULL, + ts = cmd_CreateSyntax("BosProcessAllStop", DoBosProcessAllStop, NULL, 0, "stop all processes at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where processes exists"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosProcessAllWaitStop", DoBosProcessAllWaitStop, NULL, + ts = cmd_CreateSyntax("BosProcessAllWaitStop", DoBosProcessAllWaitStop, NULL, 0, "stop all processes at a bos server and block " "until they all exit"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1936,7 +1936,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessAllWaitTransition", - DoBosProcessAllWaitTransition, NULL, + DoBosProcessAllWaitTransition, NULL, 0, "wait until all processes have transitioned to " "their desired state"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1944,7 +1944,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosProcessAllStopAndRestart", - DoBosProcessAllStopAndRestart, NULL, + DoBosProcessAllStopAndRestart, NULL, 0, "stop all processes at a bos server and " "then restart them"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1953,7 +1953,7 @@ SetupBosAdminCmd(void) "include the bos server in the processes to be restarted"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosAdminCreate", DoBosAdminCreate, NULL, + ts = cmd_CreateSyntax("BosAdminCreate", DoBosAdminCreate, NULL, 0, "create an admin user at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where admin will be created"); @@ -1961,7 +1961,7 @@ SetupBosAdminCmd(void) "the name of the administrator to add"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosAdminDelete", DoBosAdminDelete, NULL, + ts = cmd_CreateSyntax("BosAdminDelete", DoBosAdminDelete, NULL, 0, "delete an admin user at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where admin will be deleted"); @@ -1969,13 +1969,13 @@ SetupBosAdminCmd(void) "the name of the administrator to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosAdminList", DoBosAdminList, NULL, + ts = cmd_CreateSyntax("BosAdminList", DoBosAdminList, NULL, 0, "list all admin users at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where admins will be listed"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosKeyCreate", DoBosKeyCreate, NULL, + ts = cmd_CreateSyntax("BosKeyCreate", DoBosKeyCreate, NULL, 0, "create a key at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where key will be created"); @@ -1984,7 +1984,7 @@ SetupBosAdminCmd(void) cmd_AddParm(ts, "-key", CMD_SINGLE, CMD_REQUIRED, "new encryption key"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosKeyDelete", DoBosKeyDelete, NULL, + ts = cmd_CreateSyntax("BosKeyDelete", DoBosKeyDelete, NULL, 0, "delete a key at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where key will be deleted"); @@ -1992,41 +1992,41 @@ SetupBosAdminCmd(void) "version number of the key"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosKeyList", DoBosKeyList, NULL, + ts = cmd_CreateSyntax("BosKeyList", DoBosKeyList, NULL, 0, "list keys at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where keys exist"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosCellSet", DoBosCellSet, NULL, + ts = cmd_CreateSyntax("BosCellSet", DoBosCellSet, NULL, 0, "set the cell at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_REQUIRED, "new cell"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosCellGet", DoBosCellGet, NULL, + ts = cmd_CreateSyntax("BosCellGet", DoBosCellGet, NULL, 0, "get the cell at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosHostCreate", DoBosHostCreate, NULL, + ts = cmd_CreateSyntax("BosHostCreate", DoBosHostCreate, NULL, 0, "add a host entry to the server CellServDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host to add"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosHostDelete", DoBosHostDelete, NULL, + ts = cmd_CreateSyntax("BosHostDelete", DoBosHostDelete, NULL, 0, "delete a host entry from the server CellServDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosHostList", DoBosHostList, NULL, + ts = cmd_CreateSyntax("BosHostList", DoBosHostList, NULL, 0, "list all host entries from the server CellServDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosExecutableCreate", DoBosExecutableCreate, NULL, + ts = cmd_CreateSyntax("BosExecutableCreate", DoBosExecutableCreate, NULL, 0, "create a new binary at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-binary", CMD_SINGLE, CMD_REQUIRED, @@ -2035,7 +2035,7 @@ SetupBosAdminCmd(void) "path where the binary will be stored"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosExecutableRevert", DoBosExecutableRevert, NULL, + ts = cmd_CreateSyntax("BosExecutableRevert", DoBosExecutableRevert, NULL, 0, "revert a binary at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-executable", CMD_SINGLE, CMD_REQUIRED, @@ -2043,14 +2043,14 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosExecutableTimestampGet", - DoBosExecutableTimestampGet, NULL, + DoBosExecutableTimestampGet, NULL, 0, "get the timestamps for a binary at bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); cmd_AddParm(ts, "-executable", CMD_SINGLE, CMD_REQUIRED, "path to the binary to revert"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosExecutablePrune", DoBosExecutablePrune, NULL, + ts = cmd_CreateSyntax("BosExecutablePrune", DoBosExecutablePrune, NULL, 0, "prune various files at bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-oldfiles", CMD_FLAG, CMD_OPTIONAL, "prune .old files"); @@ -2059,7 +2059,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosExecutableRestartTimeSet", - DoBosExecutableRestartTimeSet, NULL, + DoBosExecutableRestartTimeSet, NULL, 0, "set the restart times at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-daily", CMD_FLAG, CMD_OPTIONAL, @@ -2071,7 +2071,7 @@ SetupBosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("BosExecutableRestartTimeGet", - DoBosExecutableRestartTimeGet, NULL, + DoBosExecutableRestartTimeGet, NULL, 0, "get the restart times at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); cmd_AddParm(ts, "-daily", CMD_FLAG, CMD_OPTIONAL, @@ -2080,14 +2080,14 @@ SetupBosAdminCmd(void) "get weekly restart time"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosLogGet", DoBosLogGet, NULL, + ts = cmd_CreateSyntax("BosLogGet", DoBosLogGet, NULL, 0, "get a log file from the bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); cmd_AddParm(ts, "-logfile", CMD_SINGLE, CMD_REQUIRED, "path to the log file to retrieve"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosAuthSet", DoBosAuthSet, NULL, + ts = cmd_CreateSyntax("BosAuthSet", DoBosAuthSet, NULL, 0, "set the authorization level at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to modify"); cmd_AddParm(ts, "-requireauth", CMD_FLAG, CMD_OPTIONAL, @@ -2096,7 +2096,7 @@ SetupBosAdminCmd(void) "don't require authorization"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosCommandExecute", DoBosCommandExecute, 0, + ts = cmd_CreateSyntax("BosCommandExecute", DoBosCommandExecute, 0, 0, "execute a command at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -2104,7 +2104,7 @@ SetupBosAdminCmd(void) "command to execute"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("BosSalvage", DoBosSalvage, NULL, + ts = cmd_CreateSyntax("BosSalvage", DoBosSalvage, NULL, 0, "execute a salvage command at a bos server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where salvager will execute"); diff --git a/src/libadmin/test/client.c b/src/libadmin/test/client.c index 5eefe0a..eeb9035 100644 --- a/src/libadmin/test/client.c +++ b/src/libadmin/test/client.c @@ -1207,12 +1207,12 @@ SetupClientAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("ClientLocalCellGet", DoClientLocalCellGet, NULL, + ts = cmd_CreateSyntax("ClientLocalCellGet", DoClientLocalCellGet, NULL, 0, "get the name of this machine's cell"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientMountPointCreate", DoClientMountPointCreate, - NULL, "create a mount point"); + NULL, 0, "create a mount point"); cmd_AddParm(ts, "-directory", CMD_SINGLE, CMD_REQUIRED, "directory where mount point will be created"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, @@ -1223,12 +1223,12 @@ SetupClientAdminCmd(void) "check that the volume exists before mounting"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientAFSServerGet", DoClientAFSServerGet, NULL, + ts = cmd_CreateSyntax("ClientAFSServerGet", DoClientAFSServerGet, NULL, 0, "retrieve information about an afs server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientAFSServerList", DoClientAFSServerList, NULL, + ts = cmd_CreateSyntax("ClientAFSServerList", DoClientAFSServerList, NULL, 0, "retrieve information about all afs " "servers in a cell"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, @@ -1241,7 +1241,7 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientRPCStatsStateGet", DoClientRPCStatsStateGet, - NULL, "retrieve the rpc stat collection state"); + NULL, 0, "retrieve the rpc stat collection state"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); cmd_AddParm(ts, "-process", CMD_SINGLE, CMD_REQUIRED, @@ -1252,7 +1252,7 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientRPCStatsStateEnable", - DoClientRPCStatsStateEnable, NULL, + DoClientRPCStatsStateEnable, NULL, 0, "set the rpc stat collection state to on"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1264,7 +1264,7 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientRPCStatsStateDisable", - DoClientRPCStatsStateDisable, NULL, + DoClientRPCStatsStateDisable, NULL, 0, "set the rpc stat collection state to off"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1275,7 +1275,7 @@ SetupClientAdminCmd(void) "stats to retrieve "); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientRPCStatsList", DoClientRPCStatsList, NULL, + ts = cmd_CreateSyntax("ClientRPCStatsList", DoClientRPCStatsList, NULL, 0, "list the rpc stats"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1286,7 +1286,7 @@ SetupClientAdminCmd(void) "stats to retrieve "); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientRPCStatsClear", DoClientRPCStatsClear, NULL, + ts = cmd_CreateSyntax("ClientRPCStatsClear", DoClientRPCStatsClear, NULL, 0, "reset rpc stat counters"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1322,7 +1322,7 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientRPCStatsVersionGet", - DoClientRPCStatsVersionGet, NULL, + DoClientRPCStatsVersionGet, NULL, 0, "list the server's rpc stats version"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); @@ -1332,27 +1332,27 @@ SetupClientAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("ClientCMGetServerPrefs", DoClientCMGetServerPrefs, - NULL, "list a client's server preferences "); + NULL, 0, "list a client's server preferences "); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "UDP port to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientCMListCells", DoClientCMListCells, NULL, + ts = cmd_CreateSyntax("ClientCMListCells", DoClientCMListCells, NULL, 0, "list a client's CellServDB "); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "UDP port to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientCMLocalCell", DoClientCMLocalCell, NULL, + ts = cmd_CreateSyntax("ClientCMLocalCell", DoClientCMLocalCell, NULL, 0, "get the name of the client's local cell"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "UDP port to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClientCMClientConfig", DoClientCMClientConfig, NULL, + ts = cmd_CreateSyntax("ClientCMClientConfig", DoClientCMClientConfig, NULL, 0, "get the client's cache configuration"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where command will execute"); diff --git a/src/libadmin/test/kas.c b/src/libadmin/test/kas.c index 6312974..ae86c16 100644 --- a/src/libadmin/test/kas.c +++ b/src/libadmin/test/kas.c @@ -724,7 +724,7 @@ SetupKasAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("KasPrincipalCreate", DoKasPrincipalCreate, NULL, + ts = cmd_CreateSyntax("KasPrincipalCreate", DoKasPrincipalCreate, NULL, 0, "create a new principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to create"); @@ -734,7 +734,7 @@ SetupKasAdminCmd(void) "initial principal password"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalDelete", DoKasPrincipalDelete, NULL, + ts = cmd_CreateSyntax("KasPrincipalDelete", DoKasPrincipalDelete, NULL, 0, "delete a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to delete"); @@ -742,7 +742,7 @@ SetupKasAdminCmd(void) "principal instance"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalGet", DoKasPrincipalGet, NULL, + ts = cmd_CreateSyntax("KasPrincipalGet", DoKasPrincipalGet, NULL, 0, "get information about a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to get"); @@ -750,11 +750,11 @@ SetupKasAdminCmd(void) "principal instance"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalList", DoKasPrincipalList, NULL, + ts = cmd_CreateSyntax("KasPrincipalList", DoKasPrincipalList, NULL, 0, "list all principals"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalKeySet", DoKasPrincipalKeySet, NULL, + ts = cmd_CreateSyntax("KasPrincipalKeySet", DoKasPrincipalKeySet, NULL, 0, "set the password for a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to modify"); @@ -767,7 +767,7 @@ SetupKasAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("KasPrincipalLockStatusGet", - DoKasPrincipalLockStatusGet, NULL, + DoKasPrincipalLockStatusGet, NULL, 0, "get the lock status of a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to query"); @@ -775,7 +775,7 @@ SetupKasAdminCmd(void) "principal instance"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalUnlock", DoKasPrincipalUnlock, NULL, + ts = cmd_CreateSyntax("KasPrincipalUnlock", DoKasPrincipalUnlock, NULL, 0, "unlock a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to unlock"); @@ -783,7 +783,7 @@ SetupKasAdminCmd(void) "principal instance"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasPrincipalFieldsSet", DoKasPrincipalFieldsSet, NULL, + ts = cmd_CreateSyntax("KasPrincipalFieldsSet", DoKasPrincipalFieldsSet, NULL, 0, "modify a principal"); cmd_AddParm(ts, "-principal", CMD_SINGLE, CMD_REQUIRED, "principal to modify"); @@ -823,17 +823,17 @@ SetupKasAdminCmd(void) "maximum failed password attempts is exceeded"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasServerStatsGet", DoKasServerStatsGet, NULL, + ts = cmd_CreateSyntax("KasServerStatsGet", DoKasServerStatsGet, NULL, 0, "get stats on a kaserver"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasServerDebugGet", DoKasServerDebugGet, NULL, + ts = cmd_CreateSyntax("KasServerDebugGet", DoKasServerDebugGet, NULL, 0, "get debug info from a kaserver"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("KasServerRandomKeyGet", DoKasServerRandomKeyGet, NULL, + ts = cmd_CreateSyntax("KasServerRandomKeyGet", DoKasServerRandomKeyGet, NULL, 0, "create a random key"); SetupCommonCmdArgs(ts); diff --git a/src/libadmin/test/pts.c b/src/libadmin/test/pts.c index 504b32c..e558543 100644 --- a/src/libadmin/test/pts.c +++ b/src/libadmin/test/pts.c @@ -572,61 +572,61 @@ SetupPtsAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("PtsGroupMemberAdd", DoPtsGroupMemberAdd, NULL, + ts = cmd_CreateSyntax("PtsGroupMemberAdd", DoPtsGroupMemberAdd, NULL, 0, "add a user to a group"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to add"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupOwnerChange", DoPtsGroupOwnerChange, NULL, + ts = cmd_CreateSyntax("PtsGroupOwnerChange", DoPtsGroupOwnerChange, NULL, 0, "change the owner of a group"); cmd_AddParm(ts, "-owner", CMD_SINGLE, CMD_REQUIRED, "new owner"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupCreate", DoPtsGroupCreate, NULL, + ts = cmd_CreateSyntax("PtsGroupCreate", DoPtsGroupCreate, NULL, 0, "create a new group"); cmd_AddParm(ts, "-owner", CMD_SINGLE, CMD_REQUIRED, "owner of group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to create"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupGet", DoPtsGroupGet, NULL, + ts = cmd_CreateSyntax("PtsGroupGet", DoPtsGroupGet, NULL, 0, "get information about a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupDelete", DoPtsGroupDelete, NULL, + ts = cmd_CreateSyntax("PtsGroupDelete", DoPtsGroupDelete, NULL, 0, "delete a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupMaxGet", DoPtsGroupMaxGet, NULL, + ts = cmd_CreateSyntax("PtsGroupMaxGet", DoPtsGroupMaxGet, NULL, 0, "get the maximum group id"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupMaxSet", DoPtsGroupMaxSet, NULL, + ts = cmd_CreateSyntax("PtsGroupMaxSet", DoPtsGroupMaxSet, NULL, 0, "set the maximum group id"); cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_REQUIRED, "new max group id"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupMemberList", DoPtsGroupMemberList, NULL, + ts = cmd_CreateSyntax("PtsGroupMemberList", DoPtsGroupMemberList, NULL, 0, "list members of a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupMemberRemove", DoPtsGroupMemberRemove, NULL, + ts = cmd_CreateSyntax("PtsGroupMemberRemove", DoPtsGroupMemberRemove, NULL, 0, "remove a member from a group"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to remove"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupRename", DoPtsGroupRename, NULL, + ts = cmd_CreateSyntax("PtsGroupRename", DoPtsGroupRename, NULL, 0, "rename a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); cmd_AddParm(ts, "-newname", CMD_SINGLE, CMD_REQUIRED, "new group name"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsGroupModify", DoPtsGroupModify, NULL, + ts = cmd_CreateSyntax("PtsGroupModify", DoPtsGroupModify, NULL, 0, "modify a group"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_REQUIRED, "group to modify"); cmd_AddParm(ts, "-liststatus", CMD_SINGLE, CMD_REQUIRED, @@ -641,28 +641,28 @@ SetupPtsAdminCmd(void) "list delete permission "); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserCreate", DoPtsUserCreate, NULL, + ts = cmd_CreateSyntax("PtsUserCreate", DoPtsUserCreate, NULL, 0, "create a new user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to create"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserDelete", DoPtsUserDelete, NULL, + ts = cmd_CreateSyntax("PtsUserDelete", DoPtsUserDelete, NULL, 0, "delete a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserGet", DoPtsUserGet, NULL, + ts = cmd_CreateSyntax("PtsUserGet", DoPtsUserGet, NULL, 0, "get information about a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserRename", DoPtsUserRename, NULL, + ts = cmd_CreateSyntax("PtsUserRename", DoPtsUserRename, NULL, 0, "rename a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to modify"); cmd_AddParm(ts, "-newname", CMD_SINGLE, CMD_REQUIRED, "new user name"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserModify", DoPtsUserModify, NULL, + ts = cmd_CreateSyntax("PtsUserModify", DoPtsUserModify, NULL, 0, "change a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to modify"); cmd_AddParm(ts, "-groupquota", CMD_SINGLE, CMD_OPTIONAL, @@ -675,21 +675,21 @@ SetupPtsAdminCmd(void) "list membership permission "); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserMaxGet", DoPtsUserMaxGet, NULL, + ts = cmd_CreateSyntax("PtsUserMaxGet", DoPtsUserMaxGet, NULL, 0, "get the max user id"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserMaxSet", DoPtsUserMaxSet, NULL, + ts = cmd_CreateSyntax("PtsUserMaxSet", DoPtsUserMaxSet, NULL, 0, "set the max user id"); cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_REQUIRED, "max user id"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsUserMemberList", DoPtsUserMemberList, NULL, + ts = cmd_CreateSyntax("PtsUserMemberList", DoPtsUserMemberList, NULL, 0, "list group membership for a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("PtsOwnedGroupList", DoPtsOwnedGroupList, NULL, + ts = cmd_CreateSyntax("PtsOwnedGroupList", DoPtsOwnedGroupList, NULL, 0, "list groups owned by a user"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_REQUIRED, "user to query"); SetupCommonCmdArgs(ts); diff --git a/src/libadmin/test/util.c b/src/libadmin/test/util.c index ef0653f..3f36040 100644 --- a/src/libadmin/test/util.c +++ b/src/libadmin/test/util.c @@ -87,17 +87,17 @@ SetupUtilAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("UtilErrorTranslate", DoUtilErrorTranslate, NULL, + ts = cmd_CreateSyntax("UtilErrorTranslate", DoUtilErrorTranslate, NULL, 0, "translate an error code"); cmd_AddParm(ts, "-error", CMD_SINGLE, CMD_REQUIRED, "error code"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("UtilDatabaseServerList", DoUtilDatabaseServerList, - NULL, "list the database servers in a cell"); + NULL, 0, "list the database servers in a cell"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_REQUIRED, "cell to list"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("UtilNameToAddress", DoUtilNameToAddress, NULL, + ts = cmd_CreateSyntax("UtilNameToAddress", DoUtilNameToAddress, NULL, 0, "translate a host name to an address"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_REQUIRED, "host name"); SetupCommonCmdArgs(ts); diff --git a/src/libadmin/test/vos.c b/src/libadmin/test/vos.c index eebbc77..4331256 100644 --- a/src/libadmin/test/vos.c +++ b/src/libadmin/test/vos.c @@ -1817,13 +1817,13 @@ SetupVosAdminCmd(void) { struct cmd_syndesc *ts; - ts = cmd_CreateSyntax("VosBackupVolumeCreate", DoVosBackupVolumeCreate, NULL, + ts = cmd_CreateSyntax("VosBackupVolumeCreate", DoVosBackupVolumeCreate, NULL, 0, "create a backup volume"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to back up"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosBackupVolumeCreateMultiple", - DoVosBackupVolumeCreateMultiple, NULL, + DoVosBackupVolumeCreateMultiple, NULL, 0, "create a backup volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "server housing volumes to back up"); @@ -1835,7 +1835,7 @@ SetupVosAdminCmd(void) "exclude volumes from backup that match prefix"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosPartitionGet", DoVosPartitionGet, NULL, + ts = cmd_CreateSyntax("VosPartitionGet", DoVosPartitionGet, NULL, 0, "get information about a partition"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server housing partition of interest"); @@ -1843,13 +1843,13 @@ SetupVosAdminCmd(void) "partition to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosPartitionList", DoVosPartitionList, NULL, + ts = cmd_CreateSyntax("VosPartitionList", DoVosPartitionList, NULL, 0, "list information about all partitions at a server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server housing partitions of interest"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosServerSync", DoVosServerSync, NULL, + ts = cmd_CreateSyntax("VosServerSync", DoVosServerSync, NULL, 0, "sync server with vldb"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to sync"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, @@ -1857,7 +1857,7 @@ SetupVosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosFileServerAddressChange", - DoVosFileServerAddressChange, NULL, + DoVosFileServerAddressChange, NULL, 0, "change a server's address in the vldb"); cmd_AddParm(ts, "-oldaddress", CMD_SINGLE, CMD_REQUIRED, "old address to change"); @@ -1865,29 +1865,29 @@ SetupVosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosFileServerAddressRemove", - DoVosFileServerAddressRemove, NULL, + DoVosFileServerAddressRemove, NULL, 0, "remove a server's address from the vldb"); cmd_AddParm(ts, "-address", CMD_SINGLE, CMD_REQUIRED, "address to remove"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosFileServerList", DoVosFileServerList, NULL, + ts = cmd_CreateSyntax("VosFileServerList", DoVosFileServerList, NULL, 0, "list the file servers in a cell"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosServerTransactionStatusList", - DoVosServerTransactionStatusList, NULL, + DoVosServerTransactionStatusList, NULL, 0, "list the active transactions at a server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to query"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBGet", DoVosVLDBGet, NULL, + ts = cmd_CreateSyntax("VosVLDBGet", DoVosVLDBGet, NULL, 0, "get a vldb entry for a volume"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to retrieve"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBList", DoVosVLDBList, NULL, + ts = cmd_CreateSyntax("VosVLDBList", DoVosVLDBList, NULL, 0, "list a group of vldb entries"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "limit entries to a particular server"); @@ -1895,7 +1895,7 @@ SetupVosAdminCmd(void) "limit entries to a particular partition"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBEntryRemove", DoVosVLDBEntryRemove, NULL, + ts = cmd_CreateSyntax("VosVLDBEntryRemove", DoVosVLDBEntryRemove, NULL, 0, "remove vldb entries"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "limit entries to a particular server"); @@ -1904,7 +1904,7 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_OPTIONAL, "volume to remove"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBUnlock", DoVosVLDBUnlock, NULL, + ts = cmd_CreateSyntax("VosVLDBUnlock", DoVosVLDBUnlock, NULL, 0, "unlock a group of vldb entries"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "limit entries to a particular server"); @@ -1912,18 +1912,18 @@ SetupVosAdminCmd(void) "limit entries to a particular partition"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBEntryLock", DoVosVLDBList, NULL, + ts = cmd_CreateSyntax("VosVLDBEntryLock", DoVosVLDBList, NULL, 0, "lock a single vldb entry"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to lock"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBEntryUnlock", DoVosVLDBEntryUnlock, NULL, + ts = cmd_CreateSyntax("VosVLDBEntryUnlock", DoVosVLDBEntryUnlock, NULL, 0, "unlock a single vldb entry"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to unlock"); SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosVLDBReadOnlySiteCreate", - DoVosVLDBReadOnlySiteCreate, NULL, + DoVosVLDBReadOnlySiteCreate, NULL, 0, "create a read only site"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where read only will be created"); @@ -1934,7 +1934,7 @@ SetupVosAdminCmd(void) SetupCommonCmdArgs(ts); ts = cmd_CreateSyntax("VosVLDBReadOnlySiteDelete", - DoVosVLDBReadOnlySiteDelete, NULL, + DoVosVLDBReadOnlySiteDelete, NULL, 0, "delete a read only site before initial replication"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "server where read only will be deleted"); @@ -1943,7 +1943,7 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVLDBSync", DoVosVLDBSync, NULL, + ts = cmd_CreateSyntax("VosVLDBSync", DoVosVLDBSync, NULL, 0, "sync vldb with server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server to sync"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, @@ -1951,7 +1951,7 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "force sync to occur"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeCreate", DoVosVolumeCreate, NULL, + ts = cmd_CreateSyntax("VosVolumeCreate", DoVosVolumeCreate, NULL, 0, "create a read write volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where volume will be created"); @@ -1963,7 +1963,7 @@ SetupVosAdminCmd(void) "size quota of new volume in 1kb units"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeDelete", DoVosVolumeDelete, NULL, + ts = cmd_CreateSyntax("VosVolumeDelete", DoVosVolumeDelete, NULL, 0, "delete a volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server where volume exists"); @@ -1972,13 +1972,13 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to delete"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeRename", DoVosVolumeRename, NULL, + ts = cmd_CreateSyntax("VosVolumeRename", DoVosVolumeRename, NULL, 0, "rename a volume"); cmd_AddParm(ts, "-oldname", CMD_SINGLE, CMD_REQUIRED, "old volume name"); cmd_AddParm(ts, "-newname", CMD_SINGLE, CMD_REQUIRED, "new volume name"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeDump", DoVosVolumeDump, NULL, + ts = cmd_CreateSyntax("VosVolumeDump", DoVosVolumeDump, NULL, 0, "dump a volume to a file"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "dump volume at a particular server"); @@ -1991,7 +1991,7 @@ SetupVosAdminCmd(void) "file to contain dump results"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeRestore", DoVosVolumeRestore, NULL, + ts = cmd_CreateSyntax("VosVolumeRestore", DoVosVolumeRestore, NULL, 0, "restore a volume from a dumpfile"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume to restore"); @@ -2006,7 +2006,7 @@ SetupVosAdminCmd(void) "does a full restore of volume"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeOnline", DoVosVolumeOnline, NULL, + ts = cmd_CreateSyntax("VosVolumeOnline", DoVosVolumeOnline, NULL, 0, "bring a volume online"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume"); @@ -2018,7 +2018,7 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-busy", CMD_FLAG, CMD_OPTIONAL, "mark volume busy"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeOffline", DoVosVolumeOffline, NULL, + ts = cmd_CreateSyntax("VosVolumeOffline", DoVosVolumeOffline, NULL, 0, "take a volume offline"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume"); @@ -2028,7 +2028,7 @@ SetupVosAdminCmd(void) "volume to bring offline"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeGet", DoVosVolumeGet, NULL, + ts = cmd_CreateSyntax("VosVolumeGet", DoVosVolumeGet, NULL, 0, "get a volume entry"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume"); @@ -2038,7 +2038,7 @@ SetupVosAdminCmd(void) "volume to retrieve"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeList", DoVosVolumeList, NULL, + ts = cmd_CreateSyntax("VosVolumeList", DoVosVolumeList, NULL, 0, "list a group of volumes"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "limit volumes to a particular server"); @@ -2046,7 +2046,7 @@ SetupVosAdminCmd(void) "limit volumes to a particular partition"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeMove", DoVosVolumeMove, NULL, + ts = cmd_CreateSyntax("VosVolumeMove", DoVosVolumeMove, NULL, 0, "move a volume"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to move"); cmd_AddParm(ts, "-fromserver", CMD_SINGLE, CMD_REQUIRED, "source server"); @@ -2058,7 +2058,7 @@ SetupVosAdminCmd(void) "destination partition"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeRelease", DoVosVolumeRelease, NULL, + ts = cmd_CreateSyntax("VosVolumeRelease", DoVosVolumeRelease, NULL, 0, "release updates to read only"); cmd_AddParm(ts, "-volume", CMD_SINGLE, CMD_REQUIRED, "volume to replicate"); @@ -2066,7 +2066,7 @@ SetupVosAdminCmd(void) "force release to occur"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeZap", DoVosVolumeZap, NULL, "zap a volume"); + ts = cmd_CreateSyntax("VosVolumeZap", DoVosVolumeZap, NULL, 0, "zap a volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses the volume to zap"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED, @@ -2075,18 +2075,18 @@ SetupVosAdminCmd(void) cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "force zap"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosPartitionNameToId", DoVosPartitionNameToId, NULL, + ts = cmd_CreateSyntax("VosPartitionNameToId", DoVosPartitionNameToId, NULL, 0, "convert a partition name to a number"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_REQUIRED, "partition to convert"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosPartitionIdToName", DoVosPartitionIdToName, NULL, + ts = cmd_CreateSyntax("VosPartitionIdToName", DoVosPartitionIdToName, NULL, 0, "convert a number to a partition"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_REQUIRED, "number to convert"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeQuotaChange", DoVosVolumeQuotaChange, NULL, + ts = cmd_CreateSyntax("VosVolumeQuotaChange", DoVosVolumeQuotaChange, NULL, 0, "change the quota for a partition"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses the volume"); @@ -2097,7 +2097,7 @@ SetupVosAdminCmd(void) "new quota in 1kb units"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("VosVolumeGet2", DoVosVolumeGet2, NULL, + ts = cmd_CreateSyntax("VosVolumeGet2", DoVosVolumeGet2, NULL, 0, "get a volume entry"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume"); @@ -2107,7 +2107,7 @@ SetupVosAdminCmd(void) "volume to retrieve"); SetupCommonCmdArgs(ts); - ts = cmd_CreateSyntax("ClearVolUpdateCounter", DoVos_ClearVolUpdateCounter, NULL, + ts = cmd_CreateSyntax("ClearVolUpdateCounter", DoVos_ClearVolUpdateCounter, NULL, 0, "clear volUpdateCounter"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server that houses volume"); diff --git a/src/log/unlog.c b/src/log/unlog.c index f9ee1c8..bc4428e 100644 --- a/src/log/unlog.c +++ b/src/log/unlog.c @@ -107,7 +107,7 @@ main(int argc, char *argv[]) sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "Release Kerberos authentication"); cmd_AddParm(ts, "-cell", CMD_LIST, CMD_OPTIONAL, "cell name"); diff --git a/src/platform/SOLARIS/fs_conv_sol26.c b/src/platform/SOLARIS/fs_conv_sol26.c index 43eecbd..b6db067 100644 --- a/src/platform/SOLARIS/fs_conv_sol26.c +++ b/src/platform/SOLARIS/fs_conv_sol26.c @@ -192,14 +192,14 @@ main(argc, argv) printf("must be run as root; sorry\n"); exit(1); } - ts = cmd_CreateSyntax("convert", ConvCmd, NULL, + ts = cmd_CreateSyntax("convert", ConvCmd, NULL, 0, "Convert to AFS SunOS 5.6 format"); cmd_AddParm(ts, "-part", CMD_LIST, CMD_OPTIONAL, "AFS partition name"); cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose mode"); cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "Safeguard enforce switch"); cmd_AddParm(ts, "-device", CMD_LIST, CMD_OPTIONAL, "AFS raw device name"); - ts = cmd_CreateSyntax("unconvert", UnConvCmd, NULL, + ts = cmd_CreateSyntax("unconvert", UnConvCmd, NULL, 0, "Convert back from AFS SunOS 5.6 to earlier formats"); cmd_AddParm(ts, "-part", CMD_LIST, CMD_OPTIONAL, "AFS partition name"); cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "verbose mode"); diff --git a/src/ptserver/db_verify.c b/src/ptserver/db_verify.c index a4bbabd..c28c443 100644 --- a/src/ptserver/db_verify.c +++ b/src/ptserver/db_verify.c @@ -1431,7 +1431,7 @@ main(int argc, char *argv[]) setlinebuf(stdout); - ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, "PRDB check"); + ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, 0, "PRDB check"); cmd_AddParm(ts, "-database", CMD_SINGLE, CMD_REQUIRED, "ptdb_file"); cmd_AddParm(ts, "-uheader", CMD_FLAG, CMD_OPTIONAL, "Display UBIK header"); diff --git a/src/ptserver/pt_util.c b/src/ptserver/pt_util.c index 2b6d35b..0fcfbe1 100644 --- a/src/ptserver/pt_util.c +++ b/src/ptserver/pt_util.c @@ -108,7 +108,7 @@ main(int argc, char **argv) struct cmd_syndesc *cs; /*Command line syntax descriptor */ afs_int32 code; /*Return code */ - cs = cmd_CreateSyntax(NULL, CommandProc, NULL, + cs = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "access protection database"); cmd_AddParm(cs, "-w", CMD_FLAG, CMD_OPTIONAL, "update prdb with contents of data file"); diff --git a/src/ptserver/pts.c b/src/ptserver/pts.c index bd264e2..6504de3 100644 --- a/src/ptserver/pts.c +++ b/src/ptserver/pts.c @@ -1156,7 +1156,7 @@ main(int argc, char **argv) memset(&state, 0, sizeof(state)); state.sec = 1; /* default is auth */ - ts = cmd_CreateSyntax("creategroup", CreateGroup, NULL, + ts = cmd_CreateSyntax("creategroup", CreateGroup, NULL, 0, "create a new group"); cmd_AddParm(ts, "-name", CMD_LIST, 0, "group name"); cmd_AddParm(ts, "-owner", CMD_SINGLE, CMD_OPTIONAL, "owner of the group"); @@ -1165,24 +1165,24 @@ main(int argc, char **argv) add_std_args(ts); cmd_CreateAlias(ts, "cg"); - ts = cmd_CreateSyntax("createuser", CreateUser, NULL, "create a new user"); + ts = cmd_CreateSyntax("createuser", CreateUser, NULL, 0, "create a new user"); cmd_AddParm(ts, "-name", CMD_LIST, 0, "user name"); cmd_AddParm(ts, "-id", CMD_LIST, CMD_OPTIONAL, "user id"); add_std_args(ts); cmd_CreateAlias(ts, "cu"); - ts = cmd_CreateSyntax("adduser", AddToGroup, NULL, "add a user to a group"); + ts = cmd_CreateSyntax("adduser", AddToGroup, NULL, 0, "add a user to a group"); cmd_AddParm(ts, "-user", CMD_LIST, 0, "user name"); cmd_AddParm(ts, "-group", CMD_LIST, 0, "group name"); add_std_args(ts); - ts = cmd_CreateSyntax("removeuser", RemoveFromGroup, NULL, + ts = cmd_CreateSyntax("removeuser", RemoveFromGroup, NULL, 0, "remove a user from a group"); cmd_AddParm(ts, "-user", CMD_LIST, 0, "user name"); cmd_AddParm(ts, "-group", CMD_LIST, 0, "group name"); add_std_args(ts); - ts = cmd_CreateSyntax("membership", ListMembership, NULL, + ts = cmd_CreateSyntax("membership", ListMembership, NULL, 0, "list membership of a user or group"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); cmd_AddParm(ts, "-supergroups", CMD_FLAG, CMD_OPTIONAL, "show supergroups"); @@ -1190,37 +1190,37 @@ main(int argc, char **argv) add_std_args(ts); cmd_CreateAlias(ts, "groups"); - ts = cmd_CreateSyntax("delete", Delete, NULL, + ts = cmd_CreateSyntax("delete", Delete, NULL, 0, "delete a user or group from database"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); add_std_args(ts); - ts = cmd_CreateSyntax("examine", CheckEntry, NULL, "examine an entry"); + ts = cmd_CreateSyntax("examine", CheckEntry, NULL, 0, "examine an entry"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); add_std_args(ts); cmd_CreateAlias(ts, "check"); - ts = cmd_CreateSyntax("chown", ChownGroup, NULL, + ts = cmd_CreateSyntax("chown", ChownGroup, NULL, 0, "change ownership of a group"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "group name"); cmd_AddParm(ts, "-owner", CMD_SINGLE, 0, "new owner"); add_std_args(ts); - ts = cmd_CreateSyntax("rename", ChangeName, NULL, "rename user or group"); + ts = cmd_CreateSyntax("rename", ChangeName, NULL, 0, "rename user or group"); cmd_AddParm(ts, "-oldname", CMD_SINGLE, 0, "old name"); cmd_AddParm(ts, "-newname", CMD_SINGLE, 0, "new name"); add_std_args(ts); cmd_CreateAlias(ts, "chname"); - ts = cmd_CreateSyntax("listmax", ListMax, NULL, "list max id"); + ts = cmd_CreateSyntax("listmax", ListMax, NULL, 0, "list max id"); add_std_args(ts); - ts = cmd_CreateSyntax("setmax", SetMaxCommand, NULL, "set max id"); + ts = cmd_CreateSyntax("setmax", SetMaxCommand, NULL, 0, "set max id"); cmd_AddParm(ts, "-group", CMD_SINGLE, CMD_OPTIONAL, "group max"); cmd_AddParm(ts, "-user", CMD_SINGLE, CMD_OPTIONAL, "user max"); add_std_args(ts); - ts = cmd_CreateSyntax("setfields", SetFields, NULL, + ts = cmd_CreateSyntax("setfields", SetFields, NULL, 0, "set fields for an entry"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); cmd_AddParm(ts, "-access", CMD_SINGLE, CMD_OPTIONAL, "set privacy flags"); @@ -1232,30 +1232,30 @@ main(int argc, char **argv) #endif add_std_args(ts); - ts = cmd_CreateSyntax("listowned", ListOwned, NULL, + ts = cmd_CreateSyntax("listowned", ListOwned, NULL, 0, "list groups owned by an entry or zero id gets orphaned groups"); cmd_AddParm(ts, "-nameorid", CMD_LIST, 0, "user or group name or id"); add_std_args(ts); - ts = cmd_CreateSyntax("listentries", ListEntries, NULL, + ts = cmd_CreateSyntax("listentries", ListEntries, NULL, 0, "list users/groups in the protection database"); cmd_AddParm(ts, "-users", CMD_FLAG, CMD_OPTIONAL, "list user entries"); cmd_AddParm(ts, "-groups", CMD_FLAG, CMD_OPTIONAL, "list group entries"); add_std_args(ts); - ts = cmd_CreateSyntax("interactive", pts_Interactive, NULL, + ts = cmd_CreateSyntax("interactive", pts_Interactive, NULL, 0, "enter interactive mode"); add_std_args(ts); cmd_CreateAlias(ts, "in"); - ts = cmd_CreateSyntax("quit", pts_Quit, NULL, "exit program"); + ts = cmd_CreateSyntax("quit", pts_Quit, NULL, 0, "exit program"); add_std_args(ts); - ts = cmd_CreateSyntax("source", pts_Source, NULL, "read commands from file"); + ts = cmd_CreateSyntax("source", pts_Source, NULL, 0, "read commands from file"); cmd_AddParm(ts, "-file", CMD_SINGLE, 0, "filename"); add_std_args(ts); - ts = cmd_CreateSyntax("sleep", pts_Sleep, NULL, "pause for a bit"); + ts = cmd_CreateSyntax("sleep", pts_Sleep, NULL, 0, "pause for a bit"); cmd_AddParm(ts, "-delay", CMD_SINGLE, 0, "seconds"); add_std_args(ts); diff --git a/src/ptserver/ptserver.c b/src/ptserver/ptserver.c index 248b663..53aeae7 100644 --- a/src/ptserver/ptserver.c +++ b/src/ptserver/ptserver.c @@ -302,7 +302,7 @@ main(int argc, char **argv) cmd_DisableAbbreviations(); cmd_DisablePositionalCommands(); - opts = cmd_CreateSyntax(NULL, NULL, NULL, NULL); + opts = cmd_CreateSyntax(NULL, NULL, NULL, 0, NULL); /* ptserver specific options */ cmd_AddParmAtOffset(opts, OPT_database, "-database", CMD_SINGLE, diff --git a/src/ptserver/testpt.c b/src/ptserver/testpt.c index 8ddf429..c9d60c2 100644 --- a/src/ptserver/testpt.c +++ b/src/ptserver/testpt.c @@ -1085,7 +1085,7 @@ main(int argc, char *argv[]) cmd_SetBeforeProc(MyBeforeProc, NULL); cmd_SetAfterProc(MyAfterProc, NULL); - ts = cmd_CreateSyntax("usedIds", ListUsedIds, NULL, + ts = cmd_CreateSyntax("usedIds", ListUsedIds, NULL, 0, "Find used (or unused) user (or group) ids"); cmd_AddParm(ts, "-startId", CMD_SINGLE, CMD_OPTIONAL, "id to start checking"); @@ -1094,10 +1094,10 @@ main(int argc, char *argv[]) cmd_AddParm(ts, "-unused", CMD_FLAG, CMD_OPTIONAL, "print unused ids"); add_std_args(ts); - ts = cmd_CreateSyntax("initcmd", TestPrServ, NULL, "test the prserver"); + ts = cmd_CreateSyntax("initcmd", TestPrServ, NULL, 0, "test the prserver"); add_std_args(ts); - ts = cmd_CreateSyntax("testmanymembers", TestManyMembers, NULL, + ts = cmd_CreateSyntax("testmanymembers", TestManyMembers, NULL, 0, "test creating users and groups w/ many members"); cmd_AddParm(ts, "-number", CMD_SINGLE, 0, "number of users/groups to create"); diff --git a/src/rxdebug/rxdebug.c b/src/rxdebug/rxdebug.c index 7b23cbc..e4dcfcf 100644 --- a/src/rxdebug/rxdebug.c +++ b/src/rxdebug/rxdebug.c @@ -597,7 +597,7 @@ main(int argc, char **argv) } #endif - ts = cmd_CreateSyntax(NULL, MainCommand, NULL, "probe RX server"); + ts = cmd_CreateSyntax(NULL, MainCommand, NULL, 0, "probe RX server"); cmd_AddParm(ts, "-servers", CMD_SINGLE, CMD_REQUIRED, "server machine"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "IP port"); cmd_AddParm(ts, "-nodally", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/rxkad/test/stress.c b/src/rxkad/test/stress.c index 0020fcc..8c1c163 100644 --- a/src/rxkad/test/stress.c +++ b/src/rxkad/test/stress.c @@ -305,7 +305,7 @@ main(int argc, char **argv) exit(1); } #endif - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "run Rx authentication stress test"); cmd_AddParm(ts, "-server", CMD_FLAG, CMD_OPTIONAL, "start server"); cmd_AddParm(ts, "-client", CMD_SINGLE, CMD_OPTIONAL, "start client"); diff --git a/src/scout/scout.c b/src/scout/scout.c index 5f61e4b..9396c50 100644 --- a/src/scout/scout.c +++ b/src/scout/scout.c @@ -2356,7 +2356,7 @@ main(int argc, char **argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", scoutInit, NULL, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", scoutInit, NULL, 0, "initialize the program"); cmd_AddParm(ts, "-server", CMD_LIST, CMD_REQUIRED, "FileServer name(s) to monitor"); cmd_AddParm(ts, "-basename", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/tsalvaged/salvsync-debug.c b/src/tsalvaged/salvsync-debug.c index c4f3f98..3c0681d 100644 --- a/src/tsalvaged/salvsync-debug.c +++ b/src/tsalvaged/salvsync-debug.c @@ -135,25 +135,25 @@ main(int argc, char **argv) } - ts = cmd_CreateSyntax("stats", OpStats, NULL, "get salvageserver statistics (SALVSYNC_NOP opcode)"); + ts = cmd_CreateSyntax("stats", OpStats, NULL, 0, "get salvageserver statistics (SALVSYNC_NOP opcode)"); COMMON_PARMS_DECL(ts); cmd_CreateAlias(ts, "nop"); - ts = cmd_CreateSyntax("salvage", OpSalvage, NULL, "schedule a salvage (SALVSYNC_SALVAGE opcode)"); + ts = cmd_CreateSyntax("salvage", OpSalvage, NULL, 0, "schedule a salvage (SALVSYNC_SALVAGE opcode)"); SALV_PARMS_DECL(ts); - ts = cmd_CreateSyntax("cancel", OpCancel, NULL, "cancel a salvage (SALVSYNC_CANCEL opcode)"); + ts = cmd_CreateSyntax("cancel", OpCancel, NULL, 0, "cancel a salvage (SALVSYNC_CANCEL opcode)"); SALV_PARMS_DECL(ts); - ts = cmd_CreateSyntax("raiseprio", OpRaisePrio, NULL, "raise a salvage priority (SALVSYNC_RAISEPRIO opcode)"); + ts = cmd_CreateSyntax("raiseprio", OpRaisePrio, NULL, 0, "raise a salvage priority (SALVSYNC_RAISEPRIO opcode)"); SALV_PARMS_DECL(ts); cmd_CreateAlias(ts, "rp"); - ts = cmd_CreateSyntax("query", OpQuery, NULL, "query salvage status (SALVSYNC_QUERY opcode)"); + ts = cmd_CreateSyntax("query", OpQuery, NULL, 0, "query salvage status (SALVSYNC_QUERY opcode)"); SALV_PARMS_DECL(ts); cmd_CreateAlias(ts, "qry"); - ts = cmd_CreateSyntax("kill", OpCancelAll, NULL, "cancel all scheduled salvages (SALVSYNC_CANCELALL opcode)"); + ts = cmd_CreateSyntax("kill", OpCancelAll, NULL, 0, "cancel all scheduled salvages (SALVSYNC_CANCELALL opcode)"); COMMON_PARMS_DECL(ts); err = cmd_Dispatch(argc, argv); diff --git a/src/ubik/udebug.c b/src/ubik/udebug.c index 7954a84..a36e4b2 100644 --- a/src/ubik/udebug.c +++ b/src/ubik/udebug.c @@ -338,7 +338,7 @@ main(int argc, char **argv) nsa.sa_flags = SA_FULLDUMP; sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "probe ubik server"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "probe ubik server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_REQUIRED, "server machine"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "IP port"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "print all info"); diff --git a/src/uss/uss.c b/src/uss/uss.c index c9afaf5..4f51c23 100644 --- a/src/uss/uss.c +++ b/src/uss/uss.c @@ -1814,7 +1814,7 @@ main(int argc, char *argv[]) /* ----------------------------- add ----------------------------- */ - cs = cmd_CreateSyntax("add", AddUser, NULL, "create a new user account"); + cs = cmd_CreateSyntax("add", AddUser, NULL, 0, "create a new user account"); cmd_AddParm(cs, "-user", CMD_SINGLE, 0, "login name"); cmd_AddParm(cs, "-realname", CMD_SINGLE, CMD_OPTIONAL, "full name in quotes"); @@ -1849,7 +1849,7 @@ main(int argc, char *argv[]) /* ---------------------------- bulk ----------------------------- */ - cs = cmd_CreateSyntax("bulk", HandleBulk, NULL, "bulk input mode"); + cs = cmd_CreateSyntax("bulk", HandleBulk, NULL, 0, "bulk input mode"); cmd_AddParm(cs, "-file", CMD_SINGLE, 0, "bulk input file"); cmd_Seek(cs, AUSS_TEMPLATE); cmd_AddParm(cs, "-template", CMD_SINGLE, CMD_OPTIONAL, @@ -1874,7 +1874,7 @@ main(int argc, char *argv[]) /* ---------------------------- delete --------------------------- */ - cs = cmd_CreateSyntax("delete", DelUser, NULL, "delete a user account"); + cs = cmd_CreateSyntax("delete", DelUser, NULL, 0, "delete a user account"); cmd_AddParm(cs, "-user", CMD_SINGLE, 0, "login name"); cmd_AddParm(cs, "-mountpoint", CMD_SINGLE, CMD_OPTIONAL, "mountpoint for user's volume"); @@ -1908,7 +1908,7 @@ main(int argc, char *argv[]) #if USS_DONT_HIDE_SOME_FEATURES /* ------------------------- purgevolumes ------------------------ */ - cs = cmd_CreateSyntax("purgevolumes", PurgeVolumes, NULL, + cs = cmd_CreateSyntax("purgevolumes", PurgeVolumes, NULL, 0, "destroy a deleted user's volume"); cmd_AddParm(cs, "-volname", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, "Name(s) of volume(s) to destroy"); @@ -1931,7 +1931,7 @@ main(int argc, char *argv[]) #if USS_DONT_HIDE_SOME_FEATURES /* ---------------------------- restore -------------------------- */ - cs = cmd_CreateSyntax("restore", RestoreUser, NULL, + cs = cmd_CreateSyntax("restore", RestoreUser, NULL, 0, "restore a deleted user account"); cmd_AddParm(cs, "-user", CMD_SINGLE, 0, "login name to restore"); cmd_AddParm(cs, "-uid", CMD_SINGLE, 0, "user id number"); diff --git a/src/venus/afsio.c b/src/venus/afsio.c index 43de5e4..e32b08a 100644 --- a/src/venus/afsio.c +++ b/src/venus/afsio.c @@ -297,7 +297,7 @@ main(int argc, char **argv) opr_Verify(pthread_key_create(&uclient_key, NULL) == 0); #endif - ts = cmd_CreateSyntax("lock", lockFile, (void *)LockWrite, + ts = cmd_CreateSyntax("lock", lockFile, (void *)LockWrite, 0, "lock a file in AFS"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_REQUIRED, "AFS-filename"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cellname"); @@ -309,7 +309,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-waitseconds", CMD_SINGLE, CMD_OPTIONAL, "seconds to wait before giving up"); cmd_AddParm(ts, "-readlock", CMD_FLAG, CMD_OPTIONAL, "read lock only"); - ts = cmd_CreateSyntax("fidlock", lockFile, (void *)LockWrite, + ts = cmd_CreateSyntax("fidlock", lockFile, (void *)LockWrite, 0, "lock by FID a file from AFS"); cmd_AddParm(ts, "-fid", CMD_SINGLE, CMD_REQUIRED, "volume.vnode.uniquifier"); @@ -322,7 +322,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-waitseconds", CMD_SINGLE, CMD_OPTIONAL, "seconds to wait before giving up"); cmd_AddParm(ts, "-readlock", CMD_FLAG, CMD_OPTIONAL, "read lock only"); - ts = cmd_CreateSyntax("unlock", lockFile, (void *)LockRelease, + ts = cmd_CreateSyntax("unlock", lockFile, (void *)LockRelease, 0, "unlock a file in AFS"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_REQUIRED, "AFS-filename"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cellname"); @@ -333,7 +333,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-realm", CMD_SINGLE, CMD_OPTIONAL, "REALMNAME"); cmd_AddParm(ts, "-waitseconds", CMD_SINGLE, CMD_OPTIONAL, "seconds to wait before giving up"); - ts = cmd_CreateSyntax("fidunlock", lockFile, (void *)LockRelease, + ts = cmd_CreateSyntax("fidunlock", lockFile, (void *)LockRelease, 0, "unlock by FID a file from AFS"); cmd_AddParm(ts, "-fid", CMD_SINGLE, CMD_REQUIRED, "volume.vnode.uniquifier"); @@ -345,7 +345,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-realm", CMD_SINGLE, CMD_OPTIONAL, "REALMNAME"); cmd_AddParm(ts, "-waitseconds", CMD_SINGLE, CMD_OPTIONAL, "seconds to wait before giving up"); - ts = cmd_CreateSyntax("read", readFile, NULL, + ts = cmd_CreateSyntax("read", readFile, NULL, 0, "read a file from AFS"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_REQUIRED, "AFS-filename"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cellname"); @@ -355,7 +355,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-md5", CMD_FLAG, CMD_OPTIONAL, "calculate md5 checksum"); cmd_AddParm(ts, "-realm", CMD_SINGLE, CMD_OPTIONAL, "REALMNAME"); - ts = cmd_CreateSyntax("fidread", readFile, CMD_REQUIRED, + ts = cmd_CreateSyntax("fidread", readFile, CMD_REQUIRED, 0, "read on a non AFS-client a file from AFS"); cmd_AddParm(ts, "-fid", CMD_SINGLE, CMD_REQUIRED, "volume.vnode.uniquifier"); @@ -365,7 +365,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-md5", CMD_FLAG, CMD_OPTIONAL, "calculate md5 checksum"); cmd_AddParm(ts, "-realm", CMD_SINGLE, CMD_OPTIONAL, "REALMNAME"); - ts = cmd_CreateSyntax("write", writeFile, NULL, + ts = cmd_CreateSyntax("write", writeFile, NULL, 0, "write a file into AFS"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_REQUIRED, "AFS-filename"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cellname"); @@ -379,7 +379,7 @@ main(int argc, char **argv) "create data pattern of specified length instead reading from stdin"); cmd_AddParm(ts, "-realm", CMD_SINGLE, CMD_OPTIONAL, "REALMNAME"); - ts = cmd_CreateSyntax("fidwrite", writeFile, CMD_REQUIRED, + ts = cmd_CreateSyntax("fidwrite", writeFile, CMD_REQUIRED, 0, "write a file into AFS"); cmd_AddParm(ts, "-vnode", CMD_SINGLE, CMD_REQUIRED, "volume.vnode.uniquifier"); @@ -392,7 +392,7 @@ main(int argc, char **argv) "overwrite existing file"); cmd_AddParm(ts, "-realm", CMD_SINGLE, CMD_OPTIONAL, "REALMNAME"); - ts = cmd_CreateSyntax("append", writeFile, NULL, + ts = cmd_CreateSyntax("append", writeFile, NULL, 0, "append to a file in AFS"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_REQUIRED, "AFS-filename"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cellname"); @@ -401,7 +401,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-crypt", CMD_FLAG, CMD_OPTIONAL, (char *)0); cmd_AddParm(ts, "-realm", CMD_SINGLE, CMD_OPTIONAL, "REALMNAME"); - ts = cmd_CreateSyntax("fidappend", writeFile, NULL, + ts = cmd_CreateSyntax("fidappend", writeFile, NULL, 0, "append to a file in AFS"); cmd_AddParm(ts, "-vnode", CMD_SINGLE, CMD_REQUIRED, "volume.vnode.uniquifier"); diff --git a/src/venus/cacheout.c b/src/venus/cacheout.c index 075b697..33f1861 100644 --- a/src/venus/cacheout.c +++ b/src/venus/cacheout.c @@ -345,7 +345,7 @@ main(int argc, char **argv) cmd_SetBeforeProc(MyBeforeProc, NULL); ts = cmd_CreateSyntax("initcmd" /*"invalidatecache" */ , InvalidateCache, - NULL, "invalidate server ACL cache"); + NULL, 0, "invalidate server ACL cache"); cmd_AddParm(ts, "-id", CMD_LIST, CMD_OPTIONAL, "user identifier"); cmd_AddParm(ts, "-ip", CMD_LIST, CMD_OPTIONAL, "IP address"); cmd_CreateAlias(ts, "ic"); @@ -354,7 +354,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-localauth", CMD_FLAG, CMD_OPTIONAL, "user server tickets"); cmd_AddParm(ts, "-encrypt", CMD_FLAG, CMD_OPTIONAL, "encrypt commands"); - ts = cmd_CreateSyntax("listservers", GetServerList, NULL, + ts = cmd_CreateSyntax("listservers", GetServerList, NULL, 0, "list servers in the cell"); cmd_CreateAlias(ts, "ls"); diff --git a/src/venus/cmdebug.c b/src/venus/cmdebug.c index 4454e0c..a5596e7 100644 --- a/src/venus/cmdebug.c +++ b/src/venus/cmdebug.c @@ -607,7 +607,7 @@ main(int argc, char **argv) rx_Init(0); - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "query afs cache manager"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "query afs cache manager"); cmd_AddParm(ts, "-servers", CMD_SINGLE, CMD_REQUIRED, "server machine"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "IP port"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "print all info"); diff --git a/src/venus/dedebug.c b/src/venus/dedebug.c index e03f62b..bdf4620 100644 --- a/src/venus/dedebug.c +++ b/src/venus/dedebug.c @@ -103,7 +103,7 @@ char **argv; { #endif rx_Init(0); - ts = cmd_CreateSyntax(NULL, CommandProc, NULL, "probe unik server"); + ts = cmd_CreateSyntax(NULL, CommandProc, NULL, 0, "probe unik server"); cmd_AddParm(ts, "-servers", CMD_SINGLE, CMD_REQUIRED, "server machine"); cmd_AddParm(ts, "-port", CMD_SINGLE, CMD_OPTIONAL, "IP port"); cmd_AddParm(ts, "-long", CMD_FLAG, CMD_OPTIONAL, "print all info"); diff --git a/src/venus/fs.c b/src/venus/fs.c index 4329434..e4712ff 100644 --- a/src/venus/fs.c +++ b/src/venus/fs.c @@ -3648,17 +3648,17 @@ main(int argc, char **argv) #endif /* try to find volume location information */ - ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, NULL, + ts = cmd_CreateSyntax("getclientaddrs", GetClientAddrsCmd, NULL, 0, "get client network interface addresses"); cmd_CreateAlias(ts, "gc"); - ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, NULL, + ts = cmd_CreateSyntax("setclientaddrs", SetClientAddrsCmd, NULL, 0, "set client network interface addresses"); cmd_AddParm(ts, "-address", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, "client network interfaces"); cmd_CreateAlias(ts, "sc"); - ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, NULL, + ts = cmd_CreateSyntax("setserverprefs", SetPrefCmd, NULL, 0, "set server ranks"); cmd_AddParm(ts, "-servers", CMD_LIST, CMD_OPTIONAL | CMD_EXPANDS, "fileserver names and ranks"); @@ -3669,7 +3669,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-stdin", CMD_FLAG, CMD_OPTIONAL, "input from stdin"); cmd_CreateAlias(ts, "sp"); - ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, NULL, + ts = cmd_CreateSyntax("getserverprefs", GetPrefCmd, NULL, 0, "get server ranks"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "output to named file"); @@ -3678,7 +3678,7 @@ main(int argc, char **argv) /* cmd_AddParm(ts, "-cell", CMD_FLAG, CMD_OPTIONAL, "cellname"); */ cmd_CreateAlias(ts, "gp"); - ts = cmd_CreateSyntax("setacl", SetACLCmd, NULL, "set access control list"); + ts = cmd_CreateSyntax("setacl", SetACLCmd, NULL, 0, "set access control list"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); cmd_AddParm(ts, "-acl", CMD_LIST, 0, "access list entries"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "clear access list"); @@ -3691,7 +3691,7 @@ main(int argc, char **argv) "initial file acl (DFS only)"); cmd_CreateAlias(ts, "sa"); - ts = cmd_CreateSyntax("listacl", ListACLCmd, NULL, + ts = cmd_CreateSyntax("listacl", ListACLCmd, NULL, 0, "list access control list"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); parm_listacl_id = ts->nParms; @@ -3700,16 +3700,16 @@ main(int argc, char **argv) cmd_AddParm(ts, "-cmd", CMD_FLAG, CMD_OPTIONAL, "output as 'fs setacl' command"); cmd_CreateAlias(ts, "la"); - ts = cmd_CreateSyntax("getcalleraccess", GetCallerAccess, NULL, + ts = cmd_CreateSyntax("getcalleraccess", GetCallerAccess, NULL, 0, "list callers access"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "gca"); - ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, NULL, + ts = cmd_CreateSyntax("cleanacl", CleanACLCmd, NULL, 0, "clean up access control list"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("copyacl", CopyACLCmd, NULL, + ts = cmd_CreateSyntax("copyacl", CopyACLCmd, NULL, 0, "copy access control list"); cmd_AddParm(ts, "-fromdir", CMD_SINGLE, 0, "source directory (or DFS file)"); @@ -3723,13 +3723,13 @@ main(int argc, char **argv) cmd_CreateAlias(ts, "ca"); - ts = cmd_CreateSyntax("flush", FlushCmd, NULL, "flush file from cache"); + ts = cmd_CreateSyntax("flush", FlushCmd, NULL, 0, "flush file from cache"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("flushmount", FlushMountCmd, NULL, + ts = cmd_CreateSyntax("flushmount", FlushMountCmd, NULL, 0, "flush mount symlink from cache"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("setvol", SetVolCmd, NULL, "set volume status"); + ts = cmd_CreateSyntax("setvol", SetVolCmd, NULL, 0, "set volume status"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-max", CMD_SINGLE, CMD_OPTIONAL, "disk space quota in 1K units"); @@ -3742,34 +3742,34 @@ main(int argc, char **argv) "offline message"); cmd_CreateAlias(ts, "sv"); - ts = cmd_CreateSyntax("messages", MessagesCmd, NULL, + ts = cmd_CreateSyntax("messages", MessagesCmd, NULL, 0, "control Cache Manager messages"); cmd_AddParm(ts, "-show", CMD_SINGLE, CMD_OPTIONAL, "[user|console|all|none]"); - ts = cmd_CreateSyntax("examine", ExamineCmd, NULL, "display file/volume status"); + ts = cmd_CreateSyntax("examine", ExamineCmd, NULL, 0, "display file/volume status"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_CreateAlias(ts, "lv"); cmd_CreateAlias(ts, "listvol"); - ts = cmd_CreateSyntax("listquota", ListQuotaCmd, NULL, "list volume quota"); + ts = cmd_CreateSyntax("listquota", ListQuotaCmd, NULL, 0, "list volume quota"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-human", CMD_FLAG, CMD_OPTIONAL, "human-readable listing"); cmd_CreateAlias(ts, "lq"); - ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, NULL, + ts = cmd_CreateSyntax("diskfree", DiskFreeCmd, NULL, 0, "show server disk space usage"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-human", CMD_FLAG, CMD_OPTIONAL, "human-readable listing"); cmd_CreateAlias(ts, "df"); - ts = cmd_CreateSyntax("quota", QuotaCmd, NULL, "show volume quota usage"); + ts = cmd_CreateSyntax("quota", QuotaCmd, NULL, 0, "show volume quota usage"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("lsmount", ListMountCmd, NULL, "list mount point"); + ts = cmd_CreateSyntax("lsmount", ListMountCmd, NULL, 0, "list mount point"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); - ts = cmd_CreateSyntax("mkmount", MakeMountCmd, NULL, "make mount point"); + ts = cmd_CreateSyntax("mkmount", MakeMountCmd, NULL, 0, "make mount point"); cmd_AddParm(ts, "-dir", CMD_SINGLE, 0, "directory"); cmd_AddParm(ts, "-vol", CMD_SINGLE, 0, "volume name"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell name"); @@ -3778,7 +3778,7 @@ main(int argc, char **argv) "don't check name with VLDB"); #if defined(AFS_CACHE_BYPASS) - ts = cmd_CreateSyntax("bypassthreshold", BypassThresholdCmd, 0, + ts = cmd_CreateSyntax("bypassthreshold", BypassThresholdCmd, NULL, 0, "get/set cache bypass file size threshold"); cmd_AddParm(ts, "-size", CMD_SINGLE, CMD_OPTIONAL, "file size"); #endif @@ -3791,10 +3791,10 @@ defect 3069 */ - ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, NULL, "remove mount point"); + ts = cmd_CreateSyntax("rmmount", RemoveMountCmd, NULL, 0, "remove mount point"); cmd_AddParm(ts, "-dir", CMD_LIST, 0, "directory"); - ts = cmd_CreateSyntax("checkservers", CheckServersCmd, NULL, + ts = cmd_CreateSyntax("checkservers", CheckServersCmd, NULL, 0, "check local cell's servers"); cmd_AddParm(ts, "-cell", CMD_SINGLE, CMD_OPTIONAL, "cell to check"); cmd_AddParm(ts, "-all", CMD_FLAG, CMD_OPTIONAL, "check all cells"); @@ -3803,12 +3803,12 @@ defect 3069 cmd_AddParm(ts, "-interval", CMD_SINGLE, CMD_OPTIONAL, "seconds between probes"); - ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd, NULL, + ts = cmd_CreateSyntax("checkvolumes", CheckVolumesCmd, NULL, 0, "check volumeID/name mappings"); cmd_CreateAlias(ts, "checkbackups"); - ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, NULL, + ts = cmd_CreateSyntax("setcachesize", SetCacheSizeCmd, NULL, 0, "set cache size"); cmd_AddParm(ts, "-blocks", CMD_SINGLE, CMD_OPTIONAL, "size in 1K byte blocks (0 => reset)"); @@ -3817,19 +3817,19 @@ defect 3069 cmd_AddParm(ts, "-reset", CMD_FLAG, CMD_OPTIONAL, "reset size back to boot value"); - ts = cmd_CreateSyntax("getcacheparms", GetCacheParmsCmd, NULL, + ts = cmd_CreateSyntax("getcacheparms", GetCacheParmsCmd, NULL, 0, "get cache usage info"); cmd_AddParm(ts, "-files", CMD_FLAG, CMD_OPTIONAL, "Show cach files used as well"); cmd_AddParm(ts, "-excessive", CMD_FLAG, CMD_OPTIONAL, "excessively verbose cache stats"); - ts = cmd_CreateSyntax("listcells", ListCellsCmd, NULL, + ts = cmd_CreateSyntax("listcells", ListCellsCmd, NULL, 0, "list configured cells"); cmd_AddParm(ts, "-numeric", CMD_FLAG, CMD_OPTIONAL, "addresses only"); - cmd_CreateSyntax("listaliases", ListAliasesCmd, NULL, + cmd_CreateSyntax("listaliases", ListAliasesCmd, NULL, 0, "list configured cell aliases"); - ts = cmd_CreateSyntax("setquota", SetQuotaCmd, NULL, "set volume quota"); + ts = cmd_CreateSyntax("setquota", SetQuotaCmd, NULL, 0, "set volume quota"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_OPTIONAL, "dir/file path"); cmd_AddParm(ts, "-max", CMD_SINGLE, 0, "max quota in kbytes"); #ifdef notdef @@ -3837,13 +3837,13 @@ defect 3069 #endif cmd_CreateAlias(ts, "sq"); - ts = cmd_CreateSyntax("newcell", NewCellCmd, NULL, "configure new cell"); + ts = cmd_CreateSyntax("newcell", NewCellCmd, NULL, 0, "configure new cell"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "cell name"); cmd_AddParm(ts, "-servers", CMD_LIST, CMD_REQUIRED, "primary servers"); cmd_AddParm(ts, "-linkedcell", CMD_SINGLE, CMD_OPTIONAL, "linked cell name"); - ts = cmd_CreateSyntax("newalias", NewAliasCmd, NULL, + ts = cmd_CreateSyntax("newalias", NewAliasCmd, NULL, 0, "configure new cell alias"); cmd_AddParm(ts, "-alias", CMD_SINGLE, 0, "alias name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "real name of cell"); @@ -3861,44 +3861,44 @@ defect 3069 "cell's vldb server port"); #endif - ts = cmd_CreateSyntax("whichcell", WhichCellCmd, NULL, "list file's cell"); + ts = cmd_CreateSyntax("whichcell", WhichCellCmd, NULL, 0, "list file's cell"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("whereis", WhereIsCmd, NULL, "list file's location"); + ts = cmd_CreateSyntax("whereis", WhereIsCmd, NULL, 0, "list file's location"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - cmd_CreateSyntax("wscell", WSCellCmd, NULL, "list workstation's cell"); + cmd_CreateSyntax("wscell", WSCellCmd, NULL, 0, "list workstation's cell"); /* ts = cmd_CreateSyntax("primarycell", PrimaryCellCmd, NULL, "obsolete (listed primary cell)"); */ /* set cache monitor host address */ - ts = cmd_CreateSyntax("monitor", MonitorCmd, NULL, (char *)CMD_HIDDEN); + ts = cmd_CreateSyntax("monitor", MonitorCmd, NULL, 0, (char *)CMD_HIDDEN); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "host name or 'off'"); cmd_CreateAlias(ts, "mariner"); - ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, NULL, "get cell status"); + ts = cmd_CreateSyntax("getcellstatus", GetCellCmd, NULL, 0, "get cell status"); cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name"); - ts = cmd_CreateSyntax("setcell", SetCellCmd, NULL, "set cell status"); + ts = cmd_CreateSyntax("setcell", SetCellCmd, NULL, 0, "set cell status"); cmd_AddParm(ts, "-cell", CMD_LIST, 0, "cell name"); cmd_AddParm(ts, "-suid", CMD_FLAG, CMD_OPTIONAL, "allow setuid programs"); cmd_AddParm(ts, "-nosuid", CMD_FLAG, CMD_OPTIONAL, "disallow setuid programs"); - ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, NULL, + ts = cmd_CreateSyntax("flushvolume", FlushVolumeCmd, NULL, 0, "flush all data in volume"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - cmd_CreateSyntax("flushall", FlushAllVolumesCmd, NULL, "flush all data from the cache"); + cmd_CreateSyntax("flushall", FlushAllVolumesCmd, NULL, 0, "flush all data from the cache"); - ts = cmd_CreateSyntax("sysname", SysNameCmd, NULL, + ts = cmd_CreateSyntax("sysname", SysNameCmd, NULL, 0, "get/set sysname (i.e. @sys) value"); cmd_AddParm(ts, "-newsys", CMD_LIST, CMD_OPTIONAL, "new sysname"); - ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, NULL, + ts = cmd_CreateSyntax("exportafs", ExportAfsCmd, NULL, 0, "enable/disable translators to AFS"); cmd_AddParm(ts, "-type", CMD_SINGLE, 0, "exporter name"); cmd_AddParm(ts, "-start", CMD_SINGLE, CMD_OPTIONAL, @@ -3915,7 +3915,7 @@ defect 3069 "enable callbacks to get creds from new clients (on | off)"); - ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, NULL, + ts = cmd_CreateSyntax("storebehind", StoreBehindCmd, NULL, 0, "store to server after file close"); cmd_AddParm(ts, "-kbytes", CMD_SINGLE, CMD_OPTIONAL, "asynchrony for specified names"); @@ -3925,47 +3925,47 @@ defect 3069 cmd_AddParm(ts, "-verbose", CMD_FLAG, CMD_OPTIONAL, "show status"); cmd_CreateAlias(ts, "sb"); - ts = cmd_CreateSyntax("setcrypt", SetCryptCmd, NULL, + ts = cmd_CreateSyntax("setcrypt", SetCryptCmd, NULL, 0, "set cache manager encryption flag"); cmd_AddParm(ts, "-crypt", CMD_SINGLE, 0, "on or off"); - cmd_CreateSyntax("getcrypt", GetCryptCmd, NULL, + cmd_CreateSyntax("getcrypt", GetCryptCmd, NULL, 0, "get cache manager encryption flag"); - ts = cmd_CreateSyntax("rxstatproc", RxStatProcCmd, NULL, + ts = cmd_CreateSyntax("rxstatproc", RxStatProcCmd, NULL, 0, "Manage per process RX statistics"); cmd_AddParm(ts, "-enable", CMD_FLAG, CMD_OPTIONAL, "Enable RX stats"); cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "Disable RX stats"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "Clear RX stats"); - ts = cmd_CreateSyntax("rxstatpeer", RxStatPeerCmd, NULL, + ts = cmd_CreateSyntax("rxstatpeer", RxStatPeerCmd, NULL, 0, "Manage per peer RX statistics"); cmd_AddParm(ts, "-enable", CMD_FLAG, CMD_OPTIONAL, "Enable RX stats"); cmd_AddParm(ts, "-disable", CMD_FLAG, CMD_OPTIONAL, "Disable RX stats"); cmd_AddParm(ts, "-clear", CMD_FLAG, CMD_OPTIONAL, "Clear RX stats"); - ts = cmd_CreateSyntax("setcbaddr", CallBackRxConnCmd, NULL, "configure callback connection address"); + ts = cmd_CreateSyntax("setcbaddr", CallBackRxConnCmd, NULL, 0, "configure callback connection address"); cmd_AddParm(ts, "-addr", CMD_SINGLE, CMD_OPTIONAL, "host name or address"); /* try to find volume location information */ - ts = cmd_CreateSyntax("getfid", GetFidCmd, NULL, + ts = cmd_CreateSyntax("getfid", GetFidCmd, NULL, 0, "get fid for file(s)"); cmd_AddParm(ts, "-path", CMD_LIST, CMD_OPTIONAL, "dir/file path"); - ts = cmd_CreateSyntax("discon", DisconCmd, NULL, + ts = cmd_CreateSyntax("discon", DisconCmd, NULL, 0, "disconnection mode"); cmd_AddParm(ts, "-mode", CMD_SINGLE, CMD_REQUIRED, "offline | online"); cmd_AddParm(ts, "-policy", CMD_SINGLE, CMD_OPTIONAL, "client | server"); cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "Force reconnection, despite any synchronization issues."); cmd_AddParm(ts, "-uid", CMD_SINGLE, CMD_OPTIONAL, "Numeric UID of user whose tokens to use at reconnect."); - ts = cmd_CreateSyntax("nukenfscreds", NukeNFSCredsCmd, NULL, "nuke credentials for NFS client"); + ts = cmd_CreateSyntax("nukenfscreds", NukeNFSCredsCmd, NULL, 0, "nuke credentials for NFS client"); cmd_AddParm(ts, "-addr", CMD_SINGLE, 0, "host name or address"); - ts = cmd_CreateSyntax("uuid", UuidCmd, NULL, "manage the UUID for the cache manager"); + ts = cmd_CreateSyntax("uuid", UuidCmd, NULL, 0, "manage the UUID for the cache manager"); cmd_AddParm(ts, "-generate", CMD_FLAG, CMD_REQUIRED, "generate a new UUID"); - ts = cmd_CreateSyntax("precache", PreCacheCmd, 0, + ts = cmd_CreateSyntax("precache", PreCacheCmd, NULL, 0, "set precache size"); cmd_AddParm(ts, "-blocks", CMD_SINGLE, CMD_OPTIONAL, "size in 1K byte blocks (0 => disable)"); diff --git a/src/venus/fstrace.c b/src/venus/fstrace.c index 47f6269..12a5949 100644 --- a/src/venus/fstrace.c +++ b/src/venus/fstrace.c @@ -1746,7 +1746,7 @@ SetUpDump(void) struct cmd_syndesc *dumpSyntax; dumpSyntax = - cmd_CreateSyntax("dump", DoDump, NULL, "dump AFS trace logs"); + cmd_CreateSyntax("dump", DoDump, NULL, 0, "dump AFS trace logs"); (void)cmd_AddParm(dumpSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "event set name"); (void)cmd_AddParm(dumpSyntax, "-follow", CMD_SINGLE, CMD_OPTIONAL, @@ -1822,7 +1822,7 @@ SetUpShowLog(void) struct cmd_syndesc *showSyntax; showSyntax = - cmd_CreateSyntax("lslog", DoShowLog, NULL, + cmd_CreateSyntax("lslog", DoShowLog, NULL, 0, "list available logs"); (void)cmd_AddParm(showSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "event set name"); @@ -1881,7 +1881,7 @@ SetUpShowSet(void) struct cmd_syndesc *showSyntax; showSyntax = - cmd_CreateSyntax("lsset", DoShowSet, NULL, + cmd_CreateSyntax("lsset", DoShowSet, NULL, 0, "list available event sets"); (void)cmd_AddParm(showSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "event set name"); @@ -1939,7 +1939,7 @@ SetUpClear(void) struct cmd_syndesc *clearSyntax; clearSyntax = - cmd_CreateSyntax("clear", DoClear, NULL, + cmd_CreateSyntax("clear", DoClear, NULL, 0, "clear logs by logname or by event set"); (void)cmd_AddParm(clearSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "event set name"); @@ -2026,7 +2026,7 @@ SetUpSet(void) struct cmd_syndesc *setSyntax; setSyntax = - cmd_CreateSyntax("setset", DoSet, NULL, + cmd_CreateSyntax("setset", DoSet, NULL, 0, "set state of event sets"); (void)cmd_AddParm(setSyntax, "-set", CMD_LIST, CMD_OPTIONAL, "event set name"); @@ -2087,7 +2087,7 @@ SetUpResize(void) struct cmd_syndesc *setsizeSyntax; setsizeSyntax = - cmd_CreateSyntax("setlog", DoResize, NULL, + cmd_CreateSyntax("setlog", DoResize, NULL, 0, "set the size of a log"); (void)cmd_AddParm(setsizeSyntax, "-log", CMD_LIST, CMD_OPTIONAL, "trace log name"); diff --git a/src/venus/kdump.c b/src/venus/kdump.c index e70742f..aaa3963 100644 --- a/src/venus/kdump.c +++ b/src/venus/kdump.c @@ -922,7 +922,7 @@ main(int argc, char **argv) sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, cmdproc, NULL, + ts = cmd_CreateSyntax(NULL, cmdproc, NULL, 0, "Read internal cache manager structs"); cmd_AddParm(ts, "-kobj", CMD_SINGLE, CMD_OPTIONAL, "kernel object (default /vmunix)"); diff --git a/src/venus/test/getinitparams.c b/src/venus/test/getinitparams.c index 3c3da0e..6dda452 100644 --- a/src/venus/test/getinitparams.c +++ b/src/venus/test/getinitparams.c @@ -114,7 +114,7 @@ main(int ac, char **av) sigaction(SIGSEGV, &nsa, NULL); #endif - ts = cmd_CreateSyntax(NULL, GetInitParamsCmd, NULL, + ts = cmd_CreateSyntax(NULL, GetInitParamsCmd, NULL, 0, "Get CM initialization parameters"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "filename in AFS"); diff --git a/src/venus/twiddle.c b/src/venus/twiddle.c index 94d83dc..7735453 100644 --- a/src/venus/twiddle.c +++ b/src/venus/twiddle.c @@ -136,7 +136,7 @@ main(int argc, char **argv) /* try to find volume location information */ - ts = cmd_CreateSyntax(NULL, Twiddle, NULL, "adjust rx parms"); + ts = cmd_CreateSyntax(NULL, Twiddle, NULL, 0, "adjust rx parms"); cmd_AddParm(ts, "-initReceiveWindow ", CMD_SINGLE, CMD_OPTIONAL, "16"); cmd_AddParm(ts, "-maxReceiveWindow ", CMD_SINGLE, CMD_OPTIONAL, "16"); cmd_AddParm(ts, "-initSendWindow ", CMD_SINGLE, CMD_OPTIONAL, "8"); diff --git a/src/venus/whatfid.c b/src/venus/whatfid.c index 830f69b..b021a87 100644 --- a/src/venus/whatfid.c +++ b/src/venus/whatfid.c @@ -93,7 +93,7 @@ main(argc, argv) pn = argv[0]; - ts = cmd_CreateSyntax("initcmd", WhatFidCmd, NULL, "list fid for file(s)"); + ts = cmd_CreateSyntax("initcmd", WhatFidCmd, NULL, 0, "list fid for file(s)"); WhatFidCmd_FileParm = cmd_AddParm(ts, "-path", CMD_LIST, 0, "pathnames"); WhatFidCmd_FollowLinkParm = cmd_AddParm(ts, "-link", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/viced/viced.c b/src/viced/viced.c index b135916..6072647 100644 --- a/src/viced/viced.c +++ b/src/viced/viced.c @@ -996,7 +996,7 @@ ParseArgs(int argc, char *argv[]) extern int aixlow_water; #endif - opts = cmd_CreateSyntax(NULL, NULL, NULL, NULL); + opts = cmd_CreateSyntax(NULL, NULL, NULL, 0, NULL); /* fileserver options */ cmd_AddParmAtOffset(opts, OPT_large, "-L", CMD_FLAG, diff --git a/src/vlserver/cnvldb.c b/src/vlserver/cnvldb.c index f31d31c..d64c086 100644 --- a/src/vlserver/cnvldb.c +++ b/src/vlserver/cnvldb.c @@ -978,7 +978,7 @@ main(int argc, char **argv) struct cmd_syndesc *ts; afs_int32 code; - ts = cmd_CreateSyntax("initcmd", handleit, NULL, "optional"); + ts = cmd_CreateSyntax("initcmd", handleit, NULL, 0, "optional"); cmd_AddParm(ts, "-to", CMD_SINGLE, CMD_OPTIONAL, "goal version"); cmd_AddParm(ts, "-from", CMD_SINGLE, CMD_OPTIONAL, "current version"); cmd_AddParm(ts, "-path", CMD_SINGLE, CMD_OPTIONAL, "pathname"); diff --git a/src/vlserver/vlclient.c b/src/vlserver/vlclient.c index 403e20c..7a62084 100644 --- a/src/vlserver/vlclient.c +++ b/src/vlserver/vlclient.c @@ -1037,7 +1037,7 @@ main(int argc, char **argv) afs_int32 code; strcpy(confdir, AFSDIR_CLIENT_ETC_DIRPATH); - ts = cmd_CreateSyntax("initcmd", handleit, NULL, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", handleit, NULL, 0, "initialize the program"); cmd_AddParm(ts, "-cellpath", CMD_LIST, CMD_OPTIONAL, "Cell configuration directory"); cmd_AddParm(ts, "-server", CMD_LIST, CMD_OPTIONAL, diff --git a/src/vlserver/vldb_check.c b/src/vlserver/vldb_check.c index 1b5ee18..33938b9 100644 --- a/src/vlserver/vldb_check.c +++ b/src/vlserver/vldb_check.c @@ -1605,7 +1605,7 @@ main(int argc, char **argv) setlinebuf(stdout); - ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, "vldb check"); + ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, 0, "vldb check"); cmd_AddParm(ts, "-database", CMD_SINGLE, CMD_REQUIRED, "vldb_file"); cmd_AddParm(ts, "-uheader", CMD_FLAG, CMD_OPTIONAL, "Display UBIK header"); diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c index 7ae8e88..04284a9 100644 --- a/src/vlserver/vlserver.c +++ b/src/vlserver/vlserver.c @@ -217,7 +217,7 @@ main(int argc, char **argv) cmd_DisableAbbreviations(); cmd_DisablePositionalCommands(); - opts = cmd_CreateSyntax(NULL, NULL, NULL, NULL); + opts = cmd_CreateSyntax(NULL, NULL, NULL, 0, NULL); /* vlserver specific options */ cmd_AddParmAtOffset(opts, OPT_noauth, "-noauth", CMD_FLAG, diff --git a/src/vol/fssync-debug.c b/src/vol/fssync-debug.c index 7f11e18..27380fc 100644 --- a/src/vol/fssync-debug.c +++ b/src/vol/fssync-debug.c @@ -157,52 +157,52 @@ main(int argc, char **argv) fssd_argc = argc; #endif - ts = cmd_CreateSyntax("online", VolOnline, NULL, "bring a volume online (FSYNC_VOL_ON opcode)"); + ts = cmd_CreateSyntax("online", VolOnline, NULL, 0, "bring a volume online (FSYNC_VOL_ON opcode)"); VOLOP_PARMS_DECL(ts); - ts = cmd_CreateSyntax("offline", VolOffline, NULL, "take a volume offline (FSYNC_VOL_OFF opcode)"); + ts = cmd_CreateSyntax("offline", VolOffline, NULL, 0, "take a volume offline (FSYNC_VOL_OFF opcode)"); VOLOP_PARMS_DECL(ts); - ts = cmd_CreateSyntax("mode", VolMode, NULL, "change volume attach mode (FSYNC_VOL_NEEDVOLUME opcode)"); + ts = cmd_CreateSyntax("mode", VolMode, NULL, 0, "change volume attach mode (FSYNC_VOL_NEEDVOLUME opcode)"); VOLOP_PARMS_DECL(ts); cmd_CreateAlias(ts, "needvolume"); - ts = cmd_CreateSyntax("detach", VolDetach, NULL, "detach a volume (FSYNC_VOL_DONE opcode)"); + ts = cmd_CreateSyntax("detach", VolDetach, NULL, 0, "detach a volume (FSYNC_VOL_DONE opcode)"); VOLOP_PARMS_DECL(ts); - ts = cmd_CreateSyntax("callback", VolBreakCBKs, NULL, "break callbacks for volume (FSYNC_VOL_BREAKCBKS opcode)"); + ts = cmd_CreateSyntax("callback", VolBreakCBKs, NULL, 0, "break callbacks for volume (FSYNC_VOL_BREAKCBKS opcode)"); VOLOP_PARMS_DECL(ts); cmd_CreateAlias(ts, "cbk"); - ts = cmd_CreateSyntax("move", VolMove, NULL, "set volume moved flag (FSYNC_VOL_MOVE opcode)"); + ts = cmd_CreateSyntax("move", VolMove, NULL, 0, "set volume moved flag (FSYNC_VOL_MOVE opcode)"); VOLOP_PARMS_DECL(ts); - ts = cmd_CreateSyntax("list", VolList, NULL, "sync local volume list (FSYNC_VOL_LISTVOLUMES opcode)"); + ts = cmd_CreateSyntax("list", VolList, NULL, 0, "sync local volume list (FSYNC_VOL_LISTVOLUMES opcode)"); VOLOP_PARMS_DECL(ts); cmd_CreateAlias(ts, "ls"); - ts = cmd_CreateSyntax("leaveoff", VolLeaveOff, 0, "leave volume offline (FSYNC_VOL_LEAVE_OFF opcode)"); + ts = cmd_CreateSyntax("leaveoff", VolLeaveOff, 0, 0, "leave volume offline (FSYNC_VOL_LEAVE_OFF opcode)"); VOLOP_PARMS_DECL(ts); - ts = cmd_CreateSyntax("attach", VolForceAttach, 0, "force full attachment (FSYNC_VOL_ATTACH opcode)"); + ts = cmd_CreateSyntax("attach", VolForceAttach, 0, 0, "force full attachment (FSYNC_VOL_ATTACH opcode)"); VOLOP_PARMS_DECL(ts); - ts = cmd_CreateSyntax("error", VolForceError, 0, "force into hard error state (FSYNC_VOL_FORCE_ERROR opcode)"); + ts = cmd_CreateSyntax("error", VolForceError, 0, 0, "force into hard error state (FSYNC_VOL_FORCE_ERROR opcode)"); VOLOP_PARMS_DECL(ts); - ts = cmd_CreateSyntax("query", VolQuery, NULL, "get volume structure (FSYNC_VOL_QUERY opcode)"); + ts = cmd_CreateSyntax("query", VolQuery, NULL, 0, "get volume structure (FSYNC_VOL_QUERY opcode)"); VOLOP_PARMS_DECL(ts); cmd_CreateAlias(ts, "qry"); - ts = cmd_CreateSyntax("header", VolHdrQuery, NULL, "get volume disk data structure (FSYNC_VOL_QUERY_HDR opcode)"); + ts = cmd_CreateSyntax("header", VolHdrQuery, NULL, 0, "get volume disk data structure (FSYNC_VOL_QUERY_HDR opcode)"); VOLOP_PARMS_DECL(ts); cmd_CreateAlias(ts, "hdr"); - ts = cmd_CreateSyntax("volop", VolOpQuery, NULL, "get pending volume operation info (FSYNC_VOL_QUERY_VOP opcode)"); + ts = cmd_CreateSyntax("volop", VolOpQuery, NULL, 0, "get pending volume operation info (FSYNC_VOL_QUERY_VOP opcode)"); VOLOP_PARMS_DECL(ts); cmd_CreateAlias(ts, "vop"); - ts = cmd_CreateSyntax("vnode", VnQuery, NULL, "get vnode structure (FSYNC_VOL_QUERY_VNODE opcode)"); + ts = cmd_CreateSyntax("vnode", VnQuery, NULL, 0, "get vnode structure (FSYNC_VOL_QUERY_VNODE opcode)"); cmd_Seek(ts, CUSTOM_PARMS_OFFSET); cmd_AddParm(ts, "-volumeid", CMD_SINGLE, 0, "volume id"); cmd_AddParm(ts, "-vnodeid", CMD_SINGLE, 0, "vnode id"); @@ -210,42 +210,42 @@ main(int argc, char **argv) cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); COMMON_PARMS_DECL(ts); - ts = cmd_CreateSyntax("stats", StatsQuery, NULL, "see 'stats help' for more information"); + ts = cmd_CreateSyntax("stats", StatsQuery, NULL, 0, "see 'stats help' for more information"); cmd_Seek(ts, CUSTOM_PARMS_OFFSET); cmd_AddParm(ts, "-cmd", CMD_SINGLE, 0, "subcommand"); cmd_AddParm(ts, "-arg1", CMD_SINGLE, CMD_OPTIONAL, "arg1"); cmd_AddParm(ts, "-arg2", CMD_SINGLE, CMD_OPTIONAL, "arg2"); COMMON_PARMS_DECL(ts); - ts = cmd_CreateSyntax("vgcquery", VGCQuery, 0, "query volume group cache (FSYNC_VG_QUERY opcode)"); + ts = cmd_CreateSyntax("vgcquery", VGCQuery, 0, 0, "query volume group cache (FSYNC_VG_QUERY opcode)"); cmd_Seek(ts, CUSTOM_PARMS_OFFSET); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-volumeid", CMD_SINGLE, 0, "volume id"); COMMON_PARMS_DECL(ts); cmd_CreateAlias(ts, "vgcqry"); - ts = cmd_CreateSyntax("vgcadd", VGCAdd, 0, "add entry to volume group cache (FSYNC_VG_ADD opcode)"); + ts = cmd_CreateSyntax("vgcadd", VGCAdd, 0, 0, "add entry to volume group cache (FSYNC_VG_ADD opcode)"); cmd_Seek(ts, CUSTOM_PARMS_OFFSET); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-parent", CMD_SINGLE, 0, "parent volume id"); cmd_AddParm(ts, "-child", CMD_SINGLE, 0, "child volume id"); COMMON_PARMS_DECL(ts); - ts = cmd_CreateSyntax("vgcdel", VGCDel, 0, "delete entry from volume group cache (FSYNC_VG_DEL opcode)"); + ts = cmd_CreateSyntax("vgcdel", VGCDel, 0, 0, "delete entry from volume group cache (FSYNC_VG_DEL opcode)"); cmd_Seek(ts, CUSTOM_PARMS_OFFSET); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-parent", CMD_SINGLE, 0, "parent volume id"); cmd_AddParm(ts, "-child", CMD_SINGLE, 0, "child volume id"); COMMON_PARMS_DECL(ts); - ts = cmd_CreateSyntax("vgcscan", VGCScan, 0, + ts = cmd_CreateSyntax("vgcscan", VGCScan, 0, 0, "start volume group cache re-scan" " (FSYNC_VG_SCAN opcode)"); cmd_Seek(ts, CUSTOM_PARMS_OFFSET); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); COMMON_PARMS_DECL(ts); - ts = cmd_CreateSyntax("vgcscanall", VGCScanAll, 0, + ts = cmd_CreateSyntax("vgcscanall", VGCScanAll, 0, 0, "start whole-server volume group cache re-scan" " (FSYNC_VG_SCAN_ALL opcode)"); COMMON_PARMS_DECL(ts); diff --git a/src/vol/salvaged.c b/src/vol/salvaged.c index 77f5541..5a6947e 100644 --- a/src/vol/salvaged.c +++ b/src/vol/salvaged.c @@ -381,7 +381,7 @@ main(int argc, char **argv) logFileName = strdup(AFSDIR_SERVER_SALSRVLOG_FILEPATH); - ts = cmd_CreateSyntax("initcmd", handleit, &arock, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", handleit, &arock, 0, "initialize the program"); cmd_AddParmAtOffset(ts, OPT_partition, "-partition", CMD_SINGLE, CMD_OPTIONAL, "Name of partition to salvage"); cmd_AddParmAtOffset(ts, OPT_volumeid, "-volumeid", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/vol/salvager.c b/src/vol/salvager.c index 1a5e92b..d9b96ad 100644 --- a/src/vol/salvager.c +++ b/src/vol/salvager.c @@ -465,7 +465,7 @@ main(int argc, char **argv) } #endif - ts = cmd_CreateSyntax("initcmd", handleit, NULL, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", handleit, NULL, 0, "initialize the program"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "Name of partition to salvage"); cmd_AddParm(ts, "-volumeid", CMD_SINGLE, CMD_OPTIONAL, diff --git a/src/vol/vol-bless.c b/src/vol/vol-bless.c index 158c37f..a28996f 100644 --- a/src/vol/vol-bless.c +++ b/src/vol/vol-bless.c @@ -81,7 +81,7 @@ main(int argc, char **argv) struct cmd_syndesc *ts; afs_int32 code; - ts = cmd_CreateSyntax(NULL, handleit, NULL, "Manipulate volume blessed bit"); + ts = cmd_CreateSyntax(NULL, handleit, NULL, 0, "Manipulate volume blessed bit"); cmd_AddParm(ts, "-id", CMD_SINGLE, CMD_REQUIRED, "Volume id"); cmd_AddParm(ts, "-bless", CMD_FLAG, CMD_OPTIONAL, "Set blessed bit"); cmd_AddParm(ts, "-unbless", CMD_FLAG, CMD_OPTIONAL, "Clear blessed bit"); diff --git a/src/vol/volinfo-main.c b/src/vol/volinfo-main.c index 55264c1..d630788 100644 --- a/src/vol/volinfo-main.c +++ b/src/vol/volinfo-main.c @@ -154,7 +154,7 @@ main(int argc, char **argv) afs_int32 code; struct cmd_syndesc *ts; - ts = cmd_CreateSyntax(NULL, VolInfo, NULL, + ts = cmd_CreateSyntax(NULL, VolInfo, NULL, 0, "Dump volume's internal state"); cmd_AddParmAtOffset(ts, P_CHECKOUT, "-checkout", CMD_FLAG, CMD_OPTIONAL, "Checkout volumes from running fileserver"); diff --git a/src/vol/volscan-main.c b/src/vol/volscan-main.c index 50311ef..79490df 100644 --- a/src/vol/volscan-main.c +++ b/src/vol/volscan-main.c @@ -221,7 +221,7 @@ main(int argc, char **argv) afs_int32 code; struct cmd_syndesc *ts; - ts = cmd_CreateSyntax(NULL, VolScan, NULL, + ts = cmd_CreateSyntax(NULL, VolScan, NULL, 0, "Print volume vnode information"); cmd_AddParmAtOffset(ts, P_CHECKOUT, "-checkout", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/volser/restorevol.c b/src/volser/restorevol.c index c4e0ff7..aef5627 100644 --- a/src/volser/restorevol.c +++ b/src/volser/restorevol.c @@ -960,7 +960,7 @@ main(int argc, char **argv) setlinebuf(stdout); - ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, "vldb check"); + ts = cmd_CreateSyntax(NULL, WorkerBee, NULL, 0, "vldb check"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "dump file"); cmd_AddParm(ts, "-dir", CMD_SINGLE, CMD_OPTIONAL, "restore dir"); cmd_AddParm(ts, "-extension", CMD_SINGLE, CMD_OPTIONAL, "name extension"); diff --git a/src/volser/vol-dump.c b/src/volser/vol-dump.c index 9de1780..56b4657 100644 --- a/src/volser/vol-dump.c +++ b/src/volser/vol-dump.c @@ -272,7 +272,7 @@ main(int argc, char **argv) "trying to continue anyway\n"); } - ts = cmd_CreateSyntax(NULL, handleit, NULL, + ts = cmd_CreateSyntax(NULL, handleit, NULL, 0, "Dump a volume to a 'vos dump' format file without using volserver"); cmd_AddParm(ts, "-part", CMD_LIST, CMD_OPTIONAL, "AFS partition name"); cmd_AddParm(ts, "-volumeid", CMD_LIST, CMD_OPTIONAL, "Volume id"); diff --git a/src/volser/volmain.c b/src/volser/volmain.c index 166ee2a..cf16ac9 100644 --- a/src/volser/volmain.c +++ b/src/volser/volmain.c @@ -250,7 +250,7 @@ ParseArgs(int argc, char **argv) { char *sync_behavior = NULL; char *restricted_query_parameter = NULL; - opts = cmd_CreateSyntax(NULL, NULL, NULL, NULL); + opts = cmd_CreateSyntax(NULL, NULL, NULL, 0, NULL); cmd_AddParmAtOffset(opts, OPT_log, "-log", CMD_FLAG, CMD_OPTIONAL, "log vos users"); cmd_AddParmAtOffset(opts, OPT_rxbind, "-rxbind", CMD_FLAG, CMD_OPTIONAL, diff --git a/src/volser/vos.c b/src/volser/vos.c index 412ed89..8b08d37 100644 --- a/src/volser/vos.c +++ b/src/volser/vos.c @@ -5908,7 +5908,7 @@ main(int argc, char **argv) cmd_SetBeforeProc(MyBeforeProc, NULL); - ts = cmd_CreateSyntax("create", CreateVolume, NULL, "create a new volume"); + ts = cmd_CreateSyntax("create", CreateVolume, NULL, 0, "create a new volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-name", CMD_SINGLE, 0, "volume name"); @@ -5921,14 +5921,14 @@ main(int argc, char **argv) #endif COMMONPARMS; - ts = cmd_CreateSyntax("remove", DeleteVolume, NULL, "delete a volume"); + ts = cmd_CreateSyntax("remove", DeleteVolume, NULL, 0, "delete a volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("move", MoveVolume, NULL, "move a volume"); + ts = cmd_CreateSyntax("move", MoveVolume, NULL, 0, "move a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source"); cmd_AddParm(ts, "-frompartition", CMD_SINGLE, 0, @@ -5941,7 +5941,7 @@ main(int argc, char **argv) "copy live volume without cloning"); COMMONPARMS; - ts = cmd_CreateSyntax("copy", CopyVolume, NULL, "copy a volume"); + ts = cmd_CreateSyntax("copy", CopyVolume, NULL, 0, "copy a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID on source"); cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source"); cmd_AddParm(ts, "-frompartition", CMD_SINGLE, 0, @@ -5959,7 +5959,7 @@ main(int argc, char **argv) "copy live volume without cloning"); COMMONPARMS; - ts = cmd_CreateSyntax("shadow", ShadowVolume, NULL, + ts = cmd_CreateSyntax("shadow", ShadowVolume, NULL, 0, "make or update a shadow volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID on source"); cmd_AddParm(ts, "-fromserver", CMD_SINGLE, 0, "machine name on source"); @@ -5983,12 +5983,12 @@ main(int argc, char **argv) "do incremental update if target exists"); COMMONPARMS; - ts = cmd_CreateSyntax("backup", BackupVolume, NULL, + ts = cmd_CreateSyntax("backup", BackupVolume, NULL, 0, "make backup of a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("clone", CloneVolume, NULL, + ts = cmd_CreateSyntax("clone", CloneVolume, NULL, 0, "make clone of a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "server"); @@ -6005,7 +6005,7 @@ main(int argc, char **argv) "make clone volume readwrite, not read-only"); COMMONPARMS; - ts = cmd_CreateSyntax("release", ReleaseVolume, NULL, "release a volume"); + ts = cmd_CreateSyntax("release", ReleaseVolume, NULL, 0, "release a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "force a complete release and full dumps"); @@ -6016,7 +6016,7 @@ main(int argc, char **argv) "force a reclone and complete release with incremental dumps"); COMMONPARMS; - ts = cmd_CreateSyntax("dump", DumpVolumeCmd, NULL, "dump a volume"); + ts = cmd_CreateSyntax("dump", DumpVolumeCmd, NULL, 0, "dump a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_OPTIONAL, "dump from time"); cmd_AddParm(ts, "-file", CMD_SINGLE, CMD_OPTIONAL, "dump file"); @@ -6028,7 +6028,7 @@ main(int argc, char **argv) "omit unchanged directories from an incremental dump"); COMMONPARMS; - ts = cmd_CreateSyntax("restore", RestoreVolumeCmd, NULL, + ts = cmd_CreateSyntax("restore", RestoreVolumeCmd, NULL, 0, "restore a volume"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); @@ -6049,12 +6049,12 @@ main(int argc, char **argv) "do not delete old site when restoring to a new site"); COMMONPARMS; - ts = cmd_CreateSyntax("unlock", LockReleaseCmd, NULL, + ts = cmd_CreateSyntax("unlock", LockReleaseCmd, NULL, 0, "release lock on VLDB entry for a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("changeloc", ChangeLocation, NULL, + ts = cmd_CreateSyntax("changeloc", ChangeLocation, NULL, 0, "change an RW volume's location in the VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name for new location"); @@ -6063,7 +6063,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("addsite", AddSite, NULL, "add a replication site"); + ts = cmd_CreateSyntax("addsite", AddSite, NULL, 0, "add a replication site"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name for new site"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name for new site"); @@ -6072,18 +6072,18 @@ main(int argc, char **argv) cmd_AddParm(ts, "-valid", CMD_FLAG, CMD_OPTIONAL, "publish as an up-to-date site in VLDB"); COMMONPARMS; - ts = cmd_CreateSyntax("remsite", RemoveSite, NULL, + ts = cmd_CreateSyntax("remsite", RemoveSite, NULL, 0, "remove a replication site"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("listpart", ListPartitions, NULL, "list partitions"); + ts = cmd_CreateSyntax("listpart", ListPartitions, NULL, 0, "list partitions"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); COMMONPARMS; - ts = cmd_CreateSyntax("listvol", ListVolumes, NULL, + ts = cmd_CreateSyntax("listvol", ListVolumes, NULL, 0, "list volumes on server (bypass VLDB)"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); @@ -6098,7 +6098,7 @@ main(int argc, char **argv) "machine readable format"); COMMONPARMS; - ts = cmd_CreateSyntax("syncvldb", SyncVldb, NULL, + ts = cmd_CreateSyntax("syncvldb", SyncVldb, NULL, 0, "synchronize VLDB with server"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); @@ -6106,14 +6106,14 @@ main(int argc, char **argv) cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it"); COMMONPARMS; - ts = cmd_CreateSyntax("syncserv", SyncServer, NULL, + ts = cmd_CreateSyntax("syncserv", SyncServer, NULL, 0, "synchronize server with VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it"); COMMONPARMS; - ts = cmd_CreateSyntax("examine", ExamineVolume, NULL, + ts = cmd_CreateSyntax("examine", ExamineVolume, NULL, 0, "everything about the volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-extended", CMD_FLAG, CMD_OPTIONAL, @@ -6124,7 +6124,7 @@ main(int argc, char **argv) cmd_CreateAlias(ts, "volinfo"); cmd_CreateAlias(ts, "e"); - ts = cmd_CreateSyntax("setfields", SetFields, NULL, + ts = cmd_CreateSyntax("setfields", SetFields, NULL, 0, "change volume info fields"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-maxquota", CMD_SINGLE, CMD_OPTIONAL, "quota (KB)"); @@ -6132,7 +6132,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-clearVolUpCounter", CMD_FLAG, CMD_OPTIONAL, "clear volUpdateCounter"); COMMONPARMS; - ts = cmd_CreateSyntax("offline", volOffline, NULL, "force the volume status to offline"); + ts = cmd_CreateSyntax("offline", volOffline, NULL, 0, "force the volume status to offline"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "server name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); @@ -6140,13 +6140,13 @@ main(int argc, char **argv) cmd_AddParm(ts, "-busy", CMD_FLAG, CMD_OPTIONAL, "busy volume"); COMMONPARMS; - ts = cmd_CreateSyntax("online", volOnline, NULL, "force the volume status to online"); + ts = cmd_CreateSyntax("online", volOnline, NULL, 0, "force the volume status to online"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "server name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("zap", VolumeZap, NULL, + ts = cmd_CreateSyntax("zap", VolumeZap, NULL, 0, "delete the volume, don't bother with VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); @@ -6157,17 +6157,17 @@ main(int argc, char **argv) "also delete backup volume if one is found"); COMMONPARMS; - ts = cmd_CreateSyntax("status", VolserStatus, NULL, + ts = cmd_CreateSyntax("status", VolserStatus, NULL, 0, "report on volser status"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); COMMONPARMS; - ts = cmd_CreateSyntax("rename", RenameVolume, NULL, "rename a volume"); + ts = cmd_CreateSyntax("rename", RenameVolume, NULL, 0, "rename a volume"); cmd_AddParm(ts, "-oldname", CMD_SINGLE, 0, "old volume name "); cmd_AddParm(ts, "-newname", CMD_SINGLE, 0, "new volume name "); COMMONPARMS; - ts = cmd_CreateSyntax("listvldb", ListVLDB, NULL, + ts = cmd_CreateSyntax("listvldb", ListVLDB, NULL, 0, "list volumes in the VLDB"); cmd_AddParm(ts, "-name", CMD_SINGLE, CMD_OPTIONAL, "volume name or ID"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); @@ -6179,7 +6179,7 @@ main(int argc, char **argv) "do not alphabetically sort the volume names"); COMMONPARMS; - ts = cmd_CreateSyntax("backupsys", BackSys, NULL, "en masse backups"); + ts = cmd_CreateSyntax("backupsys", BackSys, NULL, 0, "en masse backups"); cmd_AddParm(ts, "-prefix", CMD_LIST, CMD_OPTIONAL, "common prefix on volume(s)"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); @@ -6191,7 +6191,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-dryrun", CMD_FLAG, CMD_OPTIONAL, "list what would be done, don't do it"); COMMONPARMS; - ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL, + ts = cmd_CreateSyntax("delentry", DeleteEntry, NULL, 0, "delete VLDB entry for a volume"); cmd_AddParm(ts, "-id", CMD_LIST, CMD_OPTIONAL, "volume name or ID"); cmd_AddParm(ts, "-prefix", CMD_SINGLE, CMD_OPTIONAL, @@ -6203,7 +6203,7 @@ main(int argc, char **argv) "list what would be done, don't do it"); COMMONPARMS; - ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL, + ts = cmd_CreateSyntax("partinfo", PartitionInfo, NULL, 0, "list partition information"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); @@ -6211,18 +6211,18 @@ main(int argc, char **argv) "print storage summary"); COMMONPARMS; - ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, NULL, + ts = cmd_CreateSyntax("unlockvldb", UnlockVLDB, NULL, 0, "unlock all the locked entries in the VLDB"); cmd_AddParm(ts, "-server", CMD_SINGLE, CMD_OPTIONAL, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); COMMONPARMS; - ts = cmd_CreateSyntax("lock", LockEntry, NULL, + ts = cmd_CreateSyntax("lock", LockEntry, NULL, 0, "lock VLDB entry for a volume"); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); COMMONPARMS; - ts = cmd_CreateSyntax("changeaddr", ChangeAddr, NULL, + ts = cmd_CreateSyntax("changeaddr", ChangeAddr, NULL, 0, "change the IP address of a file server"); cmd_AddParm(ts, "-oldaddr", CMD_SINGLE, 0, "original IP address"); cmd_AddParm(ts, "-newaddr", CMD_SINGLE, CMD_OPTIONAL, "new IP address"); @@ -6230,7 +6230,7 @@ main(int argc, char **argv) "remove the IP address from the VLDB"); COMMONPARMS; - ts = cmd_CreateSyntax("listaddrs", ListAddrs, NULL, + ts = cmd_CreateSyntax("listaddrs", ListAddrs, NULL, 0, "list the IP address of all file servers registered in the VLDB"); cmd_AddParm(ts, "-uuid", CMD_SINGLE, CMD_OPTIONAL, "uuid of server"); cmd_AddParm(ts, "-host", CMD_SINGLE, CMD_OPTIONAL, "address of host"); @@ -6238,7 +6238,7 @@ main(int argc, char **argv) "print uuid of hosts"); COMMONPARMS; - ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, NULL, + ts = cmd_CreateSyntax("convertROtoRW", ConvertRO, NULL, 0, "convert a RO volume into a RW volume (after loss of old RW volume)"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-partition", CMD_SINGLE, 0, "partition name"); @@ -6246,7 +6246,7 @@ main(int argc, char **argv) cmd_AddParm(ts, "-force", CMD_FLAG, CMD_OPTIONAL, "don't ask"); COMMONPARMS; - ts = cmd_CreateSyntax("size", Sizes, NULL, + ts = cmd_CreateSyntax("size", Sizes, NULL, 0, "obtain various sizes of the volume."); cmd_AddParm(ts, "-id", CMD_SINGLE, 0, "volume name or ID"); cmd_AddParm(ts, "-partition", CMD_SINGLE, CMD_OPTIONAL, "partition name"); @@ -6256,14 +6256,14 @@ main(int argc, char **argv) cmd_AddParm(ts, "-time", CMD_SINGLE, CMD_OPTIONAL, "dump from time"); COMMONPARMS; - ts = cmd_CreateSyntax("endtrans", EndTrans, NULL, + ts = cmd_CreateSyntax("endtrans", EndTrans, NULL, 0, "end a volserver transaction"); cmd_AddParm(ts, "-server", CMD_SINGLE, 0, "machine name"); cmd_AddParm(ts, "-transaction", CMD_SINGLE, 0, "transaction ID"); COMMONPARMS; - ts = cmd_CreateSyntax("setaddrs", SetAddrs, NULL, + ts = cmd_CreateSyntax("setaddrs", SetAddrs, NULL, 0, "set the list of IP address for a given UUID in the VLDB"); cmd_AddParm(ts, "-uuid", CMD_SINGLE, 0, "uuid of server"); cmd_AddParm(ts, "-host", CMD_LIST, 0, "address of host"); diff --git a/src/xstat/xstat_cm_test.c b/src/xstat/xstat_cm_test.c index af8f7a4..b284237 100644 --- a/src/xstat/xstat_cm_test.c +++ b/src/xstat/xstat_cm_test.c @@ -942,7 +942,7 @@ main(int argc, char **argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", RunTheTest, NULL, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", RunTheTest, NULL, 0, "initialize the program"); cmd_AddParm(ts, "-cmname", CMD_LIST, CMD_REQUIRED, "Cache Manager name(s) to monitor"); cmd_AddParm(ts, "-collID", CMD_LIST, CMD_REQUIRED, diff --git a/src/xstat/xstat_fs_test.c b/src/xstat/xstat_fs_test.c index ef2269c..853c212 100644 --- a/src/xstat/xstat_fs_test.c +++ b/src/xstat/xstat_fs_test.c @@ -839,7 +839,7 @@ main(int argc, char **argv) /* * Set up the commands we understand. */ - ts = cmd_CreateSyntax("initcmd", RunTheTest, 0, "initialize the program"); + ts = cmd_CreateSyntax("initcmd", RunTheTest, 0, 0, "initialize the program"); cmd_AddParm(ts, "-fsname", CMD_LIST, CMD_REQUIRED, "File Server name(s) to monitor"); cmd_AddParm(ts, "-collID", CMD_LIST, CMD_REQUIRED, diff --git a/tests/cmd/command-t.c b/tests/cmd/command-t.c index 0b0c83f..19c9f7f 100644 --- a/tests/cmd/command-t.c +++ b/tests/cmd/command-t.c @@ -99,7 +99,7 @@ main(int argc, char **argv) initialize_CMD_error_table(); - opts = cmd_CreateSyntax(NULL, testproc, NULL, NULL); + opts = cmd_CreateSyntax(NULL, testproc, NULL, 0, NULL); cmd_AddParm(opts, "-flag", CMD_FLAG, CMD_OPTIONAL, "a flag"); cmd_AddParm(opts, "-first", CMD_SINGLE, CMD_REQUIRED, "first option"); cmd_AddParm(opts, "-second", CMD_LIST, CMD_OPTIONAL, "second option"); -- 1.9.4