do not crash when a manpath directory contains a symbolic link

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index b571905bc7baf916968964375e8e9c75a85cdd47..f0e2d873bef30a6ec17ff02665f3095c7498e50f 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,6 +1,6 @@
-/* $Id: main.c,v 1.352 2020/07/21 15:10:01 schwarze Exp $ */
+/* $Id: main.c,v 1.356 2021/08/14 13:53:08 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2010-2012, 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2012, 2014-2021 Ingo Schwarze <schwarze@openbsd.org>

  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *


@@ -93,7 +93,7 @@ struct        outstate {
 
 int                      mandocdb(int, char *[]);
 
 
 int                      mandocdb(int, char *[]);
 

-static void              check_xr(void);
+static void              check_xr(struct manpaths *);

 static int               fs_lookup(const struct manpaths *,
                                size_t ipath, const char *,
                                const char *, const char *,
 static int               fs_lookup(const struct manpaths *,
                                size_t ipath, const char *,
                                const char *, const char *,


@@ -104,7 +104,7 @@ static      int               fs_search(const struct mansearch *,
 static void              glob_esc(char **, const char *, const char *);
 static void              outdata_alloc(struct outstate *, struct manoutput *);
 static void              parse(struct mparse *, int, const char *,
 static void              glob_esc(char **, const char *, const char *);
 static void              outdata_alloc(struct outstate *, struct manoutput *);
 static void              parse(struct mparse *, int, const char *,

-                               struct outstate *, struct manoutput *);
+                               struct outstate *, struct manconf *);

 static void              passthrough(int, int);
 static void              process_onefile(struct mparse *, struct manpage *,
                                int, struct outstate *, struct manconf *);
 static void              passthrough(int, int);
 static void              process_onefile(struct mparse *, struct manpage *,
                                int, struct outstate *, struct manconf *);


@@ -452,7 +452,8 @@ main(int argc, char *argv[])
 
        /* Read the configuration file. */
 
 
        /* Read the configuration file. */
 

-       if (search.argmode != ARG_FILE)
+       if (search.argmode != ARG_FILE ||
+           mandoc_msg_getmin() == MANDOCERR_STYLE)

                manconf_parse(&conf, conf_file, defpaths, auxpaths);
 
        /* man(1): Resolve each name individually. */
                manconf_parse(&conf, conf_file, defpaths, auxpaths);
 
        /* man(1): Resolve each name individually. */


@@ -846,7 +847,9 @@ process_onefile(struct mparse *mp, struct manpage *resp, int startdir,
        if (outst->use_pager) {
                outst->use_pager = 0;
                outst->tag_files = term_tag_init(conf->output.outfilename,
        if (outst->use_pager) {
                outst->use_pager = 0;
                outst->tag_files = term_tag_init(conf->output.outfilename,

+                   outst->outtype == OUTT_HTML ? ".html" : "",

                    conf->output.tagfilename);
                    conf->output.tagfilename);

+#if HAVE_PLEDGE

                if ((conf->output.outfilename != NULL ||
                     conf->output.tagfilename != NULL) &&
                    pledge("stdio rpath cpath", NULL) == -1) {
                if ((conf->output.outfilename != NULL ||
                     conf->output.tagfilename != NULL) &&
                    pledge("stdio rpath cpath", NULL) == -1) {


@@ -854,6 +857,7 @@ process_onefile(struct mparse *mp, struct manpage *resp, int startdir,
                            "%s", strerror(errno));
                        exit(mandoc_msg_getrc());
                }
                            "%s", strerror(errno));
                        exit(mandoc_msg_getrc());
                }

+#endif

        }
        if (outst->had_output && outst->outtype <= OUTT_UTF8) {
                if (outst->outdata == NULL)
        }
        if (outst->had_output && outst->outtype <= OUTT_UTF8) {
                if (outst->outdata == NULL)


@@ -862,7 +866,7 @@ process_onefile(struct mparse *mp, struct manpage *resp, int startdir,
        }
 
        if (resp->form == FORM_SRC)
        }
 
        if (resp->form == FORM_SRC)

-               parse(mp, fd, resp->file, outst, &conf->output);
+               parse(mp, fd, resp->file, outst, conf);

        else {
                passthrough(fd, conf->output.synopsisonly);
                outst->had_output = 1;
        else {
                passthrough(fd, conf->output.synopsisonly);
                outst->had_output = 1;


@@ -883,8 +887,9 @@ process_onefile(struct mparse *mp, struct manpage *resp, int startdir,
 
 static void
 parse(struct mparse *mp, int fd, const char *file,
 
 static void
 parse(struct mparse *mp, int fd, const char *file,

-    struct outstate *outst, struct manoutput *outconf)
+    struct outstate *outst, struct manconf *conf)

 {
 {

+       static struct manpaths   basepaths;

        static int               previous;
        struct roff_meta        *meta;
 
        static int               previous;
        struct roff_meta        *meta;
 


@@ -910,7 +915,7 @@ parse(struct mparse *mp, int fd, const char *file,
                return;
 
        if (outst->outdata == NULL)
                return;
 
        if (outst->outdata == NULL)

-               outdata_alloc(outst, outconf);
+               outdata_alloc(outst, &conf->output);

        else if (outst->outtype == OUTT_HTML)
                html_reset(outst->outdata);
 
        else if (outst->outtype == OUTT_HTML)
                html_reset(outst->outdata);
 


@@ -963,28 +968,32 @@ parse(struct mparse *mp, int fd, const char *file,
                case OUTT_PS:
                        terminal_man(outst->outdata, meta);
                        break;
                case OUTT_PS:
                        terminal_man(outst->outdata, meta);
                        break;

+               case OUTT_MARKDOWN:
+                       mandoc_msg(MANDOCERR_MAN_TMARKDOWN, 0, 0, NULL);
+                       break;

                default:
                        break;
                }
        }
                default:
                        break;
                }
        }

-       if (outconf->tag != NULL && outconf->tag_found == 0 &&
-           tag_exists(outconf->tag))
-               outconf->tag_found = 1;
-       if (mandoc_msg_getmin() < MANDOCERR_STYLE)
-               check_xr();
+       if (conf->output.tag != NULL && conf->output.tag_found == 0 &&
+           tag_exists(conf->output.tag))
+               conf->output.tag_found = 1;
+
+       if (mandoc_msg_getmin() < MANDOCERR_STYLE) {
+               if (basepaths.sz == 0)
+                       manpath_base(&basepaths);
+               check_xr(&basepaths);
+       } else if (mandoc_msg_getmin() < MANDOCERR_WARNING)
+               check_xr(&conf->manpath);

 }
 
 static void
 }
 
 static void

-check_xr(void)
+check_xr(struct manpaths *paths)

 {
 {

-       static struct manpaths   paths;

        struct mansearch         search;
        struct mandoc_xr        *xr;
        size_t                   sz;
 
        struct mansearch         search;
        struct mandoc_xr        *xr;
        size_t                   sz;
 

-       if (paths.sz == 0)
-               manpath_base(&paths);
-

        for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) {
                if (xr->line == -1)
                        continue;
        for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) {
                if (xr->line == -1)
                        continue;


@@ -993,9 +1002,9 @@ check_xr(void)
                search.outkey = NULL;
                search.argmode = ARG_NAME;
                search.firstmatch = 1;
                search.outkey = NULL;
                search.argmode = ARG_NAME;
                search.firstmatch = 1;

-               if (mansearch(&search, &paths, 1, &xr->name, NULL, &sz))
+               if (mansearch(&search, paths, 1, &xr->name, NULL, &sz))

                        continue;
                        continue;

-               if (fs_search(&search, &paths, xr->name, NULL, &sz) != -1)
+               if (fs_search(&search, paths, xr->name, NULL, &sz) != -1)

                        continue;
                if (xr->count == 1)
                        mandoc_msg(MANDOCERR_XR_BAD, xr->line,
                        continue;
                if (xr->count == 1)
                        mandoc_msg(MANDOCERR_XR_BAD, xr->line,