summaryrefslogtreecommitdiff
path: root/usr/src/cmd/mandoc/manpath.c
diff options
context:
space:
mode:
authorYuri Pankov <yuri.pankov@nexenta.com>2017-07-29 16:02:29 +0300
committerRichard Lowe <richlowe@richlowe.net>2017-08-11 19:00:16 -0400
commitc66b8046543352459a11a51501b628d1c98a8c44 (patch)
tree1121a5f9a15592e29af27c5f55a10ec607cf88d6 /usr/src/cmd/mandoc/manpath.c
parent12014b724f98604d61f9756b7e199416475d7396 (diff)
downloadillumos-gate-c66b8046543352459a11a51501b628d1c98a8c44.tar.gz
8547 update mandoc to 1.14.3
Reviewed by: Robert Mustacchi <rm@joyent.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/cmd/mandoc/manpath.c')
-rw-r--r--usr/src/cmd/mandoc/manpath.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/usr/src/cmd/mandoc/manpath.c b/usr/src/cmd/mandoc/manpath.c
index f43ace6069..54f7a6b110 100644
--- a/usr/src/cmd/mandoc/manpath.c
+++ b/usr/src/cmd/mandoc/manpath.c
@@ -1,4 +1,4 @@
-/* $Id: manpath.c,v 1.33 2017/02/10 15:45:28 schwarze Exp $ */
+/* $Id: manpath.c,v 1.35 2017/07/01 09:47:30 schwarze Exp $ */
/*
* Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -91,6 +91,13 @@ manconf_parse(struct manconf *conf, const char *file,
manpath_parseline(&conf->manpath, defp, 0);
}
+void
+manpath_base(struct manpaths *dirs)
+{
+ char path_base[] = MANPATH_BASE;
+ manpath_parseline(dirs, path_base, 0);
+}
+
/*
* Parse a FULL pathname from a colon-separated list of arrays.
*/
@@ -299,7 +306,7 @@ manconf_output(struct manoutput *conf, const char *cp, int fromfile)
mandoc_asprintf(&oldval, "%zu", conf->width);
break;
}
- conf->width = strtonum(cp, 58, 1000, &errstr);
+ conf->width = strtonum(cp, 1, 1000, &errstr);
if (errstr == NULL)
return 0;
warnx("-O width=%s is %s", cp, errstr);