Fix an obvious bug found during the /* FALLTHROUGH */ cleanup:

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index 9446ea6971a42cc81e477b6161e107ae02215848..f912e76694bf85061efb8929643aa6b46eb7491c 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*     $Id: manpath.c,v 1.25 2015/05/07 12:08:13 schwarze Exp $        */
+/*     $Id: manpath.c,v 1.27 2015/10/11 21:12:55 schwarze Exp $        */

 /*
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>


@@ -21,6 +21,7 @@
 #include <sys/stat.h>
 
 #include <ctype.h>
 #include <sys/stat.h>
 
 #include <ctype.h>

+#include <err.h>

 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>


@@ -29,7 +30,9 @@
 #include "mandoc_aux.h"
 #include "manconf.h"
 
 #include "mandoc_aux.h"
 #include "manconf.h"
 

+#if !HAVE_MANPATH

 static void     manconf_file(struct manconf *, const char *);
 static void     manconf_file(struct manconf *, const char *);

+#endif

 static void     manpath_add(struct manpaths *, const char *, int);
 static void     manpath_parseline(struct manpaths *, char *, int);
 
 static void     manpath_add(struct manpaths *, const char *, int);
 static void     manpath_parseline(struct manpaths *, char *, int);
 


@@ -163,10 +166,8 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
        size_t           i;
 
        if (NULL == (cp = realpath(dir, buf))) {
        size_t           i;
 
        if (NULL == (cp = realpath(dir, buf))) {

-               if (complain) {
-                       fputs("manpath: ", stderr);
-                       perror(dir);
-               }
+               if (complain)
+                       warn("manpath: %s", dir);

                return;
        }
 
                return;
        }
 


@@ -175,10 +176,8 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
                        return;
 
        if (stat(cp, &sb) == -1) {
                        return;
 
        if (stat(cp, &sb) == -1) {

-               if (complain) {
-                       fputs("manpath: ", stderr);
-                       perror(dir);
-               }
+               if (complain)
+                       warn("manpath: %s", dir);

                return;
        }
 
                return;
        }
 


@@ -203,6 +202,7 @@ manconf_free(struct manconf *conf)
        free(conf->output.style);
 }
 
        free(conf->output.style);
 }
 

+#if !HAVE_MANPATH

 static void
 manconf_file(struct manconf *conf, const char *file)
 {
 static void
 manconf_file(struct manconf *conf, const char *file)
 {


@@ -263,6 +263,7 @@ out:
        if (*manpath_default != '\0')
                manpath_parseline(&conf->manpath, manpath_default, 0);
 }
        if (*manpath_default != '\0')
                manpath_parseline(&conf->manpath, manpath_default, 0);
 }

+#endif

 
 void
 manconf_output(struct manoutput *conf, const char *cp)
 
 void
 manconf_output(struct manoutput *conf, const char *cp)