summaryrefslogtreecommitdiffstats
path: root/manpath.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2020-08-27 14:59:47 +0000
committerIngo Schwarze <schwarze@openbsd.org>2020-08-27 14:59:47 +0000
commita0616bd47e8c1a705d6153a71a7215f5117d42f8 (patch)
tree4a10b93cbbb61a57d4318ada31bb754511a8f559 /manpath.c
parent6d938d5fd92ef89159c86ac4fe36f376aa5802f9 (diff)
downloadmandoc-a0616bd47e8c1a705d6153a71a7215f5117d42f8.tar.gz
Fix a regression caused by the insertion of two new tokens,
which unintentionally made the -O tag= argument mandatory, breaking commands like "man -akO tag Ic=ulimit". Noticed while answering questions from Ian Ropers.
Diffstat (limited to 'manpath.c')
-rw-r--r--manpath.c26
1 files changed, 17 insertions, 9 deletions
diff --git a/manpath.c b/manpath.c
index 545784cd..f77a3627 100644
--- a/manpath.c
+++ b/manpath.c
@@ -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;