alias = alias->next;
}
- /* A hidden option must be a full match (no best matches) */
- if (as->parms[i].flags & CMD_HIDE || !enableAbbreviation)
+ /* A hidden option, or one which cannot be abbreviated,
+ * must be a full match (no best matches) */
+ if (as->parms[i].flags & CMD_HIDE ||
+ as->parms[i].flags & CMD_NOABBRV ||
+ !enableAbbreviation)
continue;
if (strncmp(as->parms[i].name, aname, cmdlen) == 0) {
int i;
struct cmd_parmdesc *tp;
char *str;
+ char *name;
size_t len;
size_t xtralen;
continue; /* seeked over slot */
if (tp->flags & CMD_HIDE)
continue; /* skip hidden options */
+
+ /* The parameter name is the real name, plus any aliases */
+ if (!tp->aliases) {
+ name = strdup(tp->name);
+ } else {
+ size_t namelen;
+ struct cmd_item *alias;
+ namelen = strlen(tp->name) + 1;
+ for (alias = tp->aliases; alias != NULL; alias = alias->next)
+ namelen+=strlen(alias->data) + 3;
+
+ name = malloc(namelen);
+ strlcpy(name, tp->name, namelen);
+
+ for (alias = tp->aliases; alias != NULL; alias = alias->next) {
+ strlcat(name, " | ", namelen);
+ strlcat(name, alias->data, namelen);
+ }
+ }
+
/* Work out if we can fit what we want to on this line, or if we need to
* start a new one */
str = ParmHelpString(tp);
- xtralen = 1 + strlen(tp->name) + strlen(str) +
+ xtralen = 1 + strlen(name) + strlen(str) +
((tp->flags & CMD_OPTIONAL)? 2: 0);
if (len + xtralen > 78) {
printf(" %s%s%s%s",
tp->flags & CMD_OPTIONAL?"[":"",
- tp->name,
+ name,
str,
tp->flags & CMD_OPTIONAL?"]":"");
free(str);
}
int
-cmd_AddParmAtOffset(struct cmd_syndesc *as, char *aname, int atype,
- afs_int32 aflags, char *ahelp, int ref)
+cmd_AddParmAtOffset(struct cmd_syndesc *as, int ref, char *aname, int atype,
+ afs_int32 aflags, char *ahelp)
{
struct cmd_parmdesc *tp;
if (as->nParms >= CMD_MAXPARMS)
return CMD_EXCESSPARMS;
- return cmd_AddParmAtOffset(as, aname, atype, aflags, ahelp, as->nParms++);
+ return cmd_AddParmAtOffset(as, as->nParms++, aname, atype, aflags, ahelp);
}
int
ts = cmd_CreateSyntax("apropos", AproposProc, NULL,
"search by help text");
cmd_AddParm(ts, "-topic", CMD_SINGLE, CMD_REQUIRED, "help string");
- ts = cmd_CreateSyntax("version", VersionProc, NULL,
- (char *)CMD_HIDDEN);
- ts = cmd_CreateSyntax("-version", VersionProc, NULL,
- (char *)CMD_HIDDEN);
- ts = cmd_CreateSyntax("-help", HelpProc, NULL,
- (char *)CMD_HIDDEN);
- ts = cmd_CreateSyntax("--version", VersionProc, NULL,
- (char *)CMD_HIDDEN);
- ts = cmd_CreateSyntax("--help", HelpProc, NULL,
- (char *)CMD_HIDDEN);
+
+ cmd_CreateSyntax("version", VersionProc, NULL,
+ (char *)CMD_HIDDEN);
+ cmd_CreateSyntax("-version", VersionProc, NULL,
+ (char *)CMD_HIDDEN);
+ cmd_CreateSyntax("-help", HelpProc, NULL,
+ (char *)CMD_HIDDEN);
+ cmd_CreateSyntax("--version", VersionProc, NULL,
+ (char *)CMD_HIDDEN);
+ cmd_CreateSyntax("--help", HelpProc, NULL,
+ (char *)CMD_HIDDEN);
}
}
struct cmd_syndesc *ts = NULL;
struct cmd_parmdesc *tparm;
int i;
- int j = 0;
int curType;
int positional;
int ambig;
* are considered switches. This allow negative numbers. */
if ((argv[i][0] == '-') && !isdigit(argv[i][1])) {
+ int j;
/* Find switch */
if (strrchr(argv[i], '=') != NULL) {
continue;
}
- if (ts->parms[j].type != CMD_FLAG) {
- code = AddItem(tparm, argv[i], pname);
- if (code)
+ if (tparm->type == CMD_SINGLE ||
+ tparm->type == CMD_SINGLE_OR_FLAG) {
+ if (tparm->items) {
+ fprintf(stderr, "%sToo many values after switch %s\n",
+ NName(pname, ": "), tparm->name);
+ code = CMD_NOTLIST;
goto out;
+ }
+ AddItem(tparm, argv[i], pname); /* Add to end of list */
+ } else if (tparm->type == CMD_LIST) {
+ AddItem(tparm, argv[i], pname); /* Add to end of list */
}
/* Now, if we're in positional mode, advance to the next item */
}
int
+cmd_OptionAsUint(struct cmd_syndesc *syn, int pos,
+ unsigned int *value)
+{
+ if (pos > syn->nParms)
+ return CMD_EXCESSPARMS;
+ if (syn->parms[pos].items == NULL ||
+ syn->parms[pos].items->data == NULL)
+ return CMD_MISSING;
+ if (syn->parms[pos].items == &dummy)
+ return 0;
+
+ *value = strtoul(syn->parms[pos].items->data, NULL, 10);
+
+ return 0;
+}
+
+int
cmd_OptionAsString(struct cmd_syndesc *syn, int pos, char **value)
{
if (pos > syn->nParms)