tp = as->parms;
for (i = 0; i < CMD_MAXPARMS; i++, tp++) {
switch (tp->type) {
+ case CMD_SINGLE_OR_FLAG:
+ if (tp->items == &dummy)
+ break;
+ /* Deliberately fall through here */
case CMD_SINGLE:
case CMD_LIST:
/* free whole list in both cases, just for fun */
continue;
}
- if (tparm->type == CMD_SINGLE) {
+ 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);
if (tparm->type == 0)
continue; /* Skipped parm slot */
if ((tparm->flags & CMD_PROCESSED) && tparm->items == 0) {
- fprintf(stderr, "%s The field '%s' isn't completed properly\n",
+ if (tparm->type == CMD_SINGLE_OR_FLAG) {
+ tparm->items = &dummy;
+ } else {
+ fprintf(stderr, "%s The field '%s' isn't completed properly\n",
NName(pname, ": "), tparm->name);
- code = CMD_TOOFEW;
- goto out;
+ code = CMD_TOOFEW;
+ goto out;
+ }
}
if (!(tparm->flags & CMD_OPTIONAL) && tparm->items == 0) {
fprintf(stderr, "%sMissing required parameter '%s'\n",
if (syn->parms[pos].items == NULL ||
syn->parms[pos].items->data == NULL)
return CMD_MISSING;
+ if (syn->parms[pos].items == &dummy)
+ return 0;
+
*value = strtol(syn->parms[pos].items->data, NULL, 10);
return 0;
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;
if (*value)
free(*value);
+
*value = strdup(syn->parms[pos].items->data);
return 0;
int retval;
char *retstring;
- plan(62);
+ plan(70);
initialize_CMD_error_table();
cmd_FreeOptions(&retopts);
cmd_FreeArgv(tv);
+ /* Add something that can be a flag or a value, and put something after
+ * it so we can check for parse problems*/
+ cmd_AddParm(opts, "-perhaps", CMD_SINGLE_OR_FLAG, CMD_OPTIONAL,
+ "what am I");
+ cmd_AddParm(opts, "-sanity", CMD_SINGLE, CMD_OPTIONAL, "sanity check");
+
+ /* Try using as an option */
+
+ code = cmd_ParseLine("-first 1 -perhaps 2 -sanity 3", tv, &tc, 100);
+ is_int(0, code, "cmd_ParseLine succeeds");
+ code = cmd_Parse(tc, tv, &retopts);
+ is_int(0, code, "cmd_Parse succeeds for option-as-flag as opt");
+ code = cmd_OptionAsInt(retopts, 6, &retval);
+ is_int(0, code, "cmd_OptionAsInt succeeds");
+ is_int(2, retval, " ... and we have the correct value");
+ cmd_FreeOptions(&retopts);
+ cmd_FreeArgv(tv);
+
+ /* And now, as a flag */
+
+ code = cmd_ParseLine("-first 1 -perhaps -sanity 3", tv, &tc, 100);
+ is_int(0, code, "cmd_ParseLine succeeds");
+ code = cmd_Parse(tc, tv, &retopts);
+ is_int(0, code, "cmd_Parse succeeds for option-as-flag as flag");
+ code = cmd_OptionAsInt(retopts, 6, &retval);
+ is_int(CMD_MISSING, code, " ... pulling out a value fails as expected");
+ cmd_OptionAsFlag(retopts, 6, &retval);
+ ok(retval, " ... but parsing as a flag works");
+ cmd_FreeOptions(&retopts);
+ cmd_FreeArgv(tv);
+
return 0;
}