From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from localhost (fantadrom.bsd.lv [local]); by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id d3f096e0; for ; Sat, 21 Mar 2015 12:20:06 -0500 (EST) Date: Sat, 21 Mar 2015 12:20:06 -0500 (EST) Message-Id: <11790616586776662175.enqueue@fantadrom.bsd.lv> X-Mailinglist: mdocml-source Reply-To: source@mdocml.bsd.lv MIME-Version: 1.0 From: schwarze@mdocml.bsd.lv To: source@mdocml.bsd.lv Subject: mdocml: when there is no -m, no -M, no MANPATH and no /etc/man.conf, X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/ Content-Type: text/plain; charset=utf-8 Log Message: ----------- when there is no -m, no -M, no MANPATH and no /etc/man.conf, fall back to /usr/share/man:/usr/X11R6/man:/usr/local/man Modified Files: -------------- mdocml: manpath.c Revision Data ------------- Index: manpath.c =================================================================== RCS file: /home/cvs/mdocml/mdocml/manpath.c,v retrieving revision 1.19 retrieving revision 1.20 diff -Lmanpath.c -Lmanpath.c -u -p -r1.19 -r1.20 --- manpath.c +++ manpath.c @@ -1,6 +1,6 @@ /* $Id$ */ /* - * Copyright (c) 2011, 2014 Ingo Schwarze + * Copyright (c) 2011, 2014, 2015 Ingo Schwarze * Copyright (c) 2011 Kristaps Dzonsons * * Permission to use, copy, modify, and distribute this software for any @@ -32,6 +32,7 @@ #define MAN_CONF_FILE "/etc/man.conf" #define MAN_CONF_KEY "_whatdb" +#define MANPATH_DEFAULT "/usr/share/man:/usr/X11R6/man:/usr/local/man" static void manpath_add(struct manpaths *, const char *, int); static void manpath_parseline(struct manpaths *, char *, int); @@ -86,6 +87,7 @@ manpath_parse(struct manpaths *dirs, con free(buf); pclose(stream); #else + char manpath_default[] = MANPATH_DEFAULT; char *insert; /* Always prepend -m. */ @@ -105,6 +107,8 @@ manpath_parse(struct manpaths *dirs, con /* No MANPATH; use man.conf(5) only. */ if (NULL == defp || '\0' == defp[0]) { manpath_manconf(dirs, file); + if (dirs->sz == 0) + manpath_parseline(dirs, manpath_default, 0); return; } -- To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv