if (strlen(a1) == 0) {
return "";
} else {
- strncpy(tbuffer, a1, sizeof(tbuffer));
- strncat(tbuffer, a2, sizeof(tbuffer));
- tbuffer[sizeof(tbuffer)-1]='\0';
+ strlcpy(tbuffer, a1, sizeof(tbuffer));
+ strlcat(tbuffer, a2, sizeof(tbuffer));
return tbuffer;
}
}
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
-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);
}
}
argv++;
count++;
}
- *(argv++) = 0; /* use last slot for terminating null */
+ *argv = NULL; /* use last slot for terminating null */
/* don't count terminating null */
*an = count;
return 0;
}
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)