diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2013-05-29 22:48:10 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2013-05-29 22:48:10 +0000 |
| commit | a63d21dde30a8fa447b23c76761b0dc6d28c8387 (patch) | |
| tree | 7c1d733cd4b76a9498a734b2c111b6175d763355 /manpath.c | |
| parent | 4b87be282b3a0f2d920933c1b948c3cd69863df4 (diff) | |
| download | mandoc-a63d21dde30a8fa447b23c76761b0dc6d28c8387.tar.gz mandoc-a63d21dde30a8fa447b23c76761b0dc6d28c8387.tar.zst mandoc-a63d21dde30a8fa447b23c76761b0dc6d28c8387.zip | |
Sync to OpenBSD:
* Guard <sys/param.h> inclusion by #ifdef USE_MANPATH
to make it more obvious why this isn't needed on OpenBSD.
Noticed by deraadt@.
* Resolve gratuitious whitespace differences:
Blanks before tabs and on empty lines.
Diffstat (limited to 'manpath.c')
| -rw-r--r-- | manpath.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: manpath.c,v 1.9 2012/06/08 10:32:40 kristaps Exp $ */ +/* $Id: manpath.c,v 1.10 2013/05/29 22:48:10 schwarze Exp $ */ /* * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> @@ -19,7 +19,9 @@ #include "config.h" #endif +#ifdef USE_MANPATH #include <sys/param.h> +#endif #include <assert.h> #include <ctype.h> @@ -90,8 +92,8 @@ manpath_parse(struct manpaths *dirs, const char *file, char *insert; /* Always prepend -m. */ - manpath_parseline(dirs, auxp); - + manpath_parseline(dirs, auxp); + /* If -M is given, it overrides everything else. */ if (NULL != defp) { manpath_parseline(dirs, defp); |