diff options
| -rw-r--r-- | manpath.c | 26 |
1 files changed, 17 insertions, 9 deletions
@@ -223,8 +223,12 @@ int manconf_output(struct manoutput *conf, const char *cp, int fromfile) { const char *const toks[] = { + /* Tokens requiring an argument. */ "includes", "man", "paper", "style", "indent", "width", - "tag", "outfilename", "tagfilename", + "outfilename", "tagfilename", + /* Token taking an optional argument. */ + "tag", + /* Tokens not taking arguments. */ "fragment", "mdoc", "noval", "toc" }; const size_t ntoks = sizeof(toks) / sizeof(toks[0]); @@ -307,26 +311,30 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile) "-O width=%s is %s", cp, errstr); return -1; case 6: - if (conf->tag != NULL) { - oldval = mandoc_strdup(conf->tag); - break; - } - conf->tag = mandoc_strdup(cp); - return 0; - case 7: if (conf->outfilename != NULL) { oldval = mandoc_strdup(conf->outfilename); break; } conf->outfilename = mandoc_strdup(cp); return 0; - case 8: + case 7: if (conf->tagfilename != NULL) { oldval = mandoc_strdup(conf->tagfilename); break; } conf->tagfilename = mandoc_strdup(cp); return 0; + /* + * If the index of the following token changes, + * do not forget to adjust the range check above the switch. + */ + case 8: + if (conf->tag != NULL) { + oldval = mandoc_strdup(conf->tag); + break; + } + conf->tag = mandoc_strdup(cp); + return 0; case 9: conf->fragment = 1; return 0; |