Support nesting of elements with next-line scope.

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 7ae27dcacaf8e2cd4efb521cb92341be99cc0351..cad227507eaf34302dd3c86e7646d25b69c96097 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.304 2018/04/13 19:55:30 schwarze Exp $ */
+/*     $Id: main.c,v 1.308 2018/08/23 19:33:27 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
        size_t           i, sz;
        int              prio, best_prio;
        enum outmode     outmode;
-       int              fd;
+       int              fd, startdir;
        int              show_usage;
        int              options;
        int              use_pager;
@@ -321,7 +321,8 @@ main(int argc, char *argv[])
 
        if (use_pager &&
            (conf.output.width == 0 || conf.output.indent == 0) &&
-           ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1) {
+           ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 &&
+           ws.ws_col > 1) {
                if (conf.output.width == 0 && ws.ws_col < 79)
                        conf.output.width = ws.ws_col - 1;
                if (conf.output.indent == 0 && ws.ws_col < 66)
@@ -386,15 +387,34 @@ main(int argc, char *argv[])
                    argc, argv, &res, &sz))
                        usage(search.argmode);
 
-               if (sz == 0) {
-                       if (search.argmode == ARG_NAME)
-                               fs_search(&search, &conf.manpath,
-                                   argc, argv, &res, &sz);
-                       else
-                               warnx("nothing appropriate");
+               if (sz == 0 && search.argmode == ARG_NAME)
+                       fs_search(&search, &conf.manpath,
+                           argc, argv, &res, &sz);
+
+               if (search.argmode == ARG_NAME) {
+                       for (c = 0; c < argc; c++) {
+                               if (strchr(argv[c], '/') == NULL)
+                                       continue;
+                               if (access(argv[c], R_OK) == -1) {
+                                       warn("%s", argv[c]);
+                                       continue;
+                               }
+                               res = mandoc_reallocarray(res,
+                                   sz + 1, sizeof(*res));
+                               res[sz].file = mandoc_strdup(argv[c]);
+                               res[sz].names = NULL;
+                               res[sz].output = NULL;
+                               res[sz].ipath = SIZE_MAX;
+                               res[sz].bits = 0;
+                               res[sz].sec = 10;
+                               res[sz].form = FORM_SRC;
+                               sz++;
+                       }
                }
 
                if (sz == 0) {
+                       if (search.argmode != ARG_NAME)
+                               warnx("nothing appropriate");
                        rc = MANDOCLEVEL_BADARG;
                        goto out;
                }
@@ -466,19 +486,35 @@ main(int argc, char *argv[])
        curp.mp = mparse_alloc(options, curp.mmin, mmsg,
            curp.os_e, curp.os_s);
 
-       /*
-        * Conditionally start up the lookaside buffer before parsing.
-        */
-       if (OUTT_MAN == curp.outtype)
-               mparse_keep(curp.mp);
-
        if (argc < 1) {
                if (use_pager)
                        tag_files = tag_init();
                parse(&curp, STDIN_FILENO, "<stdin>");
        }
 
+       /*
+        * Remember the original working directory, if possible.
+        * This will be needed if some names on the command line
+        * are page names and some are relative file names.
+        * Do not error out if the current directory is not
+        * readable: Maybe it won't be needed after all.
+        */
+       startdir = open(".", O_RDONLY | O_DIRECTORY);
+
        while (argc > 0) {
+
+               /*
+                * Changing directories is not needed in ARG_FILE mode.
+                * Do it on a best-effort basis.  Even in case of
+                * failure, some functionality may still work.
+                */
+               if (resp != NULL) {
+                       if (resp->ipath != SIZE_MAX)
+                               (void)chdir(conf.manpath.paths[resp->ipath]);
+                       else if (startdir != -1)
+                               (void)fchdir(startdir);
+               }
+
                fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv);
                if (fd != -1) {
                        if (use_pager) {
@@ -488,11 +524,9 @@ main(int argc, char *argv[])
 
                        if (resp == NULL)
                                parse(&curp, fd, *argv);
-                       else if (resp->form == FORM_SRC) {
-                               /* For .so only; ignore failure. */
-                               (void)chdir(conf.manpath.paths[resp->ipath]);
+                       else if (resp->form == FORM_SRC)
                                parse(&curp, fd, resp->file);
-                       } else
+                       else
                                passthrough(resp->file, fd,
                                    conf.output.synopsisonly);
 
@@ -525,6 +559,10 @@ main(int argc, char *argv[])
                if (--argc)
                        mparse_reset(curp.mp);
        }
+       if (startdir != -1) {
+               (void)fchdir(startdir);
+               close(startdir);
+       }
 
        if (curp.outdata != NULL) {
                switch (curp.outtype) {
@@ -745,8 +783,15 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
                                    cfg->firstmatch)
                                        return 1;
                }
-               if (res != NULL && *ressz == lastsz)
-                       warnx("No entry for %s in the manual.", *argv);
+               if (res != NULL && *ressz == lastsz &&
+                   strchr(*argv, '/') == NULL) {
+                       if (cfg->sec == NULL)
+                               warnx("No entry for %s in the manual.",
+                                   *argv);
+                       else
+                               warnx("No entry for %s in section %s "
+                                   "of the manual.", *argv, cfg->sec);
+               }
                lastsz = *ressz;
                argv++;
                argc--;
@@ -827,7 +872,7 @@ parse(struct curparse *curp, int fd, const char *file)
                        tree_man(curp->outdata, man);
                        break;
                case OUTT_MAN:
-                       man_man(curp->outdata, man);
+                       mparse_copy(curp->mp);
                        break;
                case OUTT_PDF:
                case OUTT_ASCII: