From 8f00108b9e7335a68e0dfa8b30abc8679c8c6a0a Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sat, 26 Nov 2011 22:38:11 +0000 Subject: Sync to OpenBSD, mostly gratuitous and whitespace differences, but a few serious things as well: * -M overrides MANPATH * -m prepends to the path * put back database close calls that got lost in mandocdb * missing sys/types.h in manpath.c, needed for size_t ok kristaps@ --- manpath.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'manpath.c') diff --git a/manpath.c b/manpath.c index 81c5b6a5..7ce672e2 100644 --- a/manpath.c +++ b/manpath.c @@ -1,4 +1,4 @@ -/* $Id: manpath.c,v 1.3 2011/11/24 10:44:56 kristaps Exp $ */ +/* $Id: manpath.c,v 1.4 2011/11/26 22:38:11 schwarze Exp $ */ /* * Copyright (c) 2011 Ingo Schwarze * Copyright (c) 2011 Kristaps Dzonsons @@ -19,6 +19,7 @@ #include "config.h" #endif +#include #include #include #include @@ -35,25 +36,25 @@ static void manpath_add(struct manpaths *, const char *); void -manpath_parse(struct manpaths *dirs, char *defp, char *auxp) +manpath_parse(struct manpaths *dirs, char *defp, char *auxp) { - if (NULL != getenv("MANPATH")) + manpath_parseline(dirs, auxp); + + if (NULL == defp) defp = getenv("MANPATH"); if (NULL == defp) manpath_parseconf(dirs); else manpath_parseline(dirs, defp); - - manpath_parseline(dirs, auxp); } /* * Parse a FULL pathname from a colon-separated list of arrays. */ void -manpath_parseline(struct manpaths *dirs, char *path) +manpath_parseline(struct manpaths *dirs, char *path) { char *dir; @@ -69,7 +70,7 @@ manpath_parseline(struct manpaths *dirs, char *path) * Grow the array one-by-one for simplicity's sake. */ static void -manpath_add(struct manpaths *dirs, const char *dir) +manpath_add(struct manpaths *dirs, const char *dir) { char buf[PATH_MAX]; char *cp; @@ -83,7 +84,7 @@ manpath_add(struct manpaths *dirs, const char *dir) return; dirs->paths = mandoc_realloc - (dirs->paths, + (dirs->paths, ((size_t)dirs->sz + 1) * sizeof(char *)); dirs->paths[dirs->sz++] = mandoc_strdup(cp); @@ -143,7 +144,7 @@ manpath_manconf(const char *file, struct manpaths *dirs) { FILE *stream; char *p, *q; - size_t len, keysz; + size_t len, keysz; keysz = strlen(MAN_CONF_KEY); assert(keysz > 0); -- cgit v1.2.3