diff options
| -rw-r--r-- | manpath.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -235,12 +235,13 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile) "includes", "man", "paper", "style", "indent", "width", "tag", "fragment", "mdoc", "noval", "toc" }; + const size_t ntoks = sizeof(toks) / sizeof(toks[0]); const char *errstr; char *oldval; size_t len, tok; - for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) { + for (tok = 0; tok < ntoks; tok++) { len = strlen(toks[tok]); if ( ! strncmp(cp, toks[tok], len) && strchr(" = ", cp[len]) != NULL) { @@ -257,7 +258,7 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile) warnx("-O %s=?: Missing argument value", toks[tok]); return -1; } - if (tok > 6 && *cp != '\0') { + if (tok > 6 && tok < ntoks && *cp != '\0') { warnx("-O %s: Does not take a value: %s", toks[tok], cp); return -1; } |