diff options
| author | Michal Nowak <mnowak@startmail.com> | 2019-05-30 07:50:30 +0200 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2019-06-21 14:59:14 -0400 |
| commit | cec8643b41ebefad6c677010fc784dc4bb0550f3 (patch) | |
| tree | c4eca564abb29cbe5a704a1a1b182a6d0cb526fc /usr/src/cmd/mandoc/manpath.c | |
| parent | 07188943efdbeedd24142a14db7384af1478ba54 (diff) | |
| download | illumos-joyent-cec8643b41ebefad6c677010fc784dc4bb0550f3.tar.gz | |
11190 Update mandoc to 1.14.5
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Gergő Doma <domag02@gmail.com>
Approved by: Dan McDonald <danmcd@joyent.com>
Diffstat (limited to 'usr/src/cmd/mandoc/manpath.c')
| -rw-r--r-- | usr/src/cmd/mandoc/manpath.c | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/usr/src/cmd/mandoc/manpath.c b/usr/src/cmd/mandoc/manpath.c index 54f7a6b110..74f38a95db 100644 --- a/usr/src/cmd/mandoc/manpath.c +++ b/usr/src/cmd/mandoc/manpath.c @@ -1,6 +1,6 @@ -/* $Id: manpath.c,v 1.35 2017/07/01 09:47:30 schwarze Exp $ */ +/* $Id: manpath.c,v 1.37 2018/11/22 11:30:23 schwarze Exp $ */ /* - * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> + * Copyright (c) 2011,2014,2015,2017,2018 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * * Permission to use, copy, modify, and distribute this software for any @@ -232,8 +232,8 @@ int manconf_output(struct manoutput *conf, const char *cp, int fromfile) { const char *const toks[] = { - "includes", "man", "paper", "style", - "indent", "width", "fragment", "mdoc", "noval" + "includes", "man", "paper", "style", "indent", "width", + "tag", "fragment", "mdoc", "noval", "toc" }; const char *errstr; @@ -257,7 +257,7 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile) warnx("-O %s=?: Missing argument value", toks[tok]); return -1; } - if ((tok == 6 || tok == 7) && *cp != '\0') { + if (tok > 6 && *cp != '\0') { warnx("-O %s: Does not take a value: %s", toks[tok], cp); return -1; } @@ -312,14 +312,24 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile) warnx("-O width=%s is %s", cp, errstr); return -1; case 6: - conf->fragment = 1; + if (conf->tag != NULL) { + oldval = mandoc_strdup(conf->tag); + break; + } + conf->tag = mandoc_strdup(cp); return 0; case 7: - conf->mdoc = 1; + conf->fragment = 1; return 0; case 8: + conf->mdoc = 1; + return 0; + case 9: conf->noval = 1; return 0; + case 10: + conf->toc = 1; + return 0; default: if (fromfile) warnx("-O %s: Bad argument", cp); |