add missing HISTORY information

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 94b591ff9a544c65453d7bc829481eb1e0f710c6..1b1b5b73a11a8c1b16a85cf709affcd88c35927c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/*     $Id: main.c,v 1.264 2016/04/13 12:26:25 schwarze Exp $ */
+/*     $Id: main.c,v 1.280 2017/01/27 13:47:10 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>

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

  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any


@@ -30,11 +30,15 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <glob.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <glob.h>

+#if HAVE_SANDBOX_INIT
+#include <sandbox.h>
+#endif

 #include <signal.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>

+#include <time.h>

 #include <unistd.h>
 
 #include "mandoc_aux.h"
 #include <unistd.h>
 
 #include "mandoc_aux.h"


@@ -47,12 +51,6 @@
 #include "manconf.h"
 #include "mansearch.h"
 
 #include "manconf.h"
 #include "mansearch.h"
 

-#if !defined(__GNUC__) || (__GNUC__ < 2)
-# if !defined(lint)
-#  define __attribute__(x)
-# endif
-#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
-

 enum   outmode {
        OUTMODE_DEF = 0,
        OUTMODE_FLN,
 enum   outmode {
        OUTMODE_DEF = 0,
        OUTMODE_FLN,


@@ -83,6 +81,9 @@ struct        curparse {
        struct manoutput *outopts;      /* output options */
 };
 
        struct manoutput *outopts;      /* output options */
 };
 

+
+int                      mandocdb(int, char *[]);
+

 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 *,


@@ -91,12 +92,10 @@ static      void              fs_search(const struct mansearch *,
                                const struct manpaths *, int, char**,
                                struct manpage **, size_t *);
 static int               koptions(int *, char *);
                                const struct manpaths *, int, char**,
                                struct manpage **, size_t *);
 static int               koptions(int *, char *);

-#if HAVE_SQLITE3
-int                      mandocdb(int, char**);
-#endif

 static int               moptions(int *, char *);
 static void              mmsg(enum mandocerr, enum mandoclevel,
                                const char *, int, int, const char *);
 static int               moptions(int *, char *);
 static void              mmsg(enum mandocerr, enum mandoclevel,
                                const char *, int, int, const char *);

+static void              outdata_alloc(struct curparse *);

 static void              parse(struct curparse *, int, const char *);
 static void              passthrough(const char *, int, int);
 static pid_t             spawn_pager(struct tag_files *);
 static void              parse(struct curparse *, int, const char *);
 static void              passthrough(const char *, int, int);
 static pid_t             spawn_pager(struct tag_files *);


@@ -124,6 +123,7 @@ main(int argc, char *argv[])
        struct manpage  *res, *resp;
        char            *conf_file, *defpaths;
        const char      *sec;
        struct manpage  *res, *resp;
        char            *conf_file, *defpaths;
        const char      *sec;

+       const char      *thisarg;

        size_t           i, sz;
        int              prio, best_prio;
        enum outmode     outmode;
        size_t           i, sz;
        int              prio, best_prio;
        enum outmode     outmode;


@@ -147,17 +147,20 @@ main(int argc, char *argv[])
        setprogname(progname);
 #endif
 
        setprogname(progname);
 #endif
 

-#if HAVE_SQLITE3

        if (strncmp(progname, "mandocdb", 8) == 0 ||
            strcmp(progname, BINM_MAKEWHATIS) == 0)
                return mandocdb(argc, argv);
        if (strncmp(progname, "mandocdb", 8) == 0 ||
            strcmp(progname, BINM_MAKEWHATIS) == 0)
                return mandocdb(argc, argv);

-#endif

 
 #if HAVE_PLEDGE
        if (pledge("stdio rpath tmppath tty proc exec flock", NULL) == -1)
                err((int)MANDOCLEVEL_SYSERR, "pledge");
 #endif
 
 
 #if HAVE_PLEDGE
        if (pledge("stdio rpath tmppath tty proc exec flock", NULL) == -1)
                err((int)MANDOCLEVEL_SYSERR, "pledge");
 #endif
 

+#if HAVE_SANDBOX_INIT
+       if (sandbox_init(kSBXProfileNoInternet, SANDBOX_NAMED, NULL) == -1)
+               errx((int)MANDOCLEVEL_SYSERR, "sandbox_init");
+#endif
+

        /* Search options. */
 
        memset(&conf, 0, sizeof(conf));
        /* Search options. */
 
        memset(&conf, 0, sizeof(conf));


@@ -245,9 +248,14 @@ main(int argc, char *argv[])
                        break;
                case 'O':
                        search.outkey = optarg;
                        break;
                case 'O':
                        search.outkey = optarg;

-                       while (optarg != NULL)
-                               manconf_output(&conf.output,
-                                   strsep(&optarg, ","));
+                       while (optarg != NULL) {
+                               thisarg = optarg;
+                               if (manconf_output(&conf.output,
+                                   strsep(&optarg, ","), 0) == 0)
+                                       continue;
+                               warnx("-O %s: Bad argument", thisarg);
+                               return (int)MANDOCLEVEL_BADARG;
+                       }

                        break;
                case 'S':
                        search.arch = optarg;
                        break;
                case 'S':
                        search.arch = optarg;


@@ -344,9 +352,6 @@ main(int argc, char *argv[])
        /* man(1), whatis(1), apropos(1) */
 
        if (search.argmode != ARG_FILE) {
        /* man(1), whatis(1), apropos(1) */
 
        if (search.argmode != ARG_FILE) {

-               if (argc == 0)
-                       usage(search.argmode);
-

                if (search.argmode == ARG_NAME &&
                    outmode == OUTMODE_ONE)
                        search.firstmatch = 1;
                if (search.argmode == ARG_NAME &&
                    outmode == OUTMODE_ONE)
                        search.firstmatch = 1;


@@ -354,19 +359,9 @@ main(int argc, char *argv[])
                /* Access the mandoc database. */
 
                manconf_parse(&conf, conf_file, defpaths, auxpaths);
                /* Access the mandoc database. */
 
                manconf_parse(&conf, conf_file, defpaths, auxpaths);

-#if HAVE_SQLITE3
-               mansearch_setup(1);

                if ( ! mansearch(&search, &conf.manpath,
                    argc, argv, &res, &sz))
                        usage(search.argmode);
                if ( ! mansearch(&search, &conf.manpath,
                    argc, argv, &res, &sz))
                        usage(search.argmode);

-#else
-               if (search.argmode != ARG_NAME) {
-                       fputs("mandoc: database support not compiled in\n",
-                           stderr);
-                       return (int)MANDOCLEVEL_BADARG;
-               }
-               sz = 0;
-#endif

 
                if (sz == 0) {
                        if (search.argmode == ARG_NAME)
 
                if (sz == 0) {
                        if (search.argmode == ARG_NAME)


@@ -469,7 +464,7 @@ main(int argc, char *argv[])
 
                        if (resp == NULL)
                                parse(&curp, fd, *argv);
 
                        if (resp == NULL)
                                parse(&curp, fd, *argv);

-                       else if (resp->form & FORM_SRC) {
+                       else if (resp->form == FORM_SRC) {

                                /* For .so only; ignore failure. */
                                chdir(conf.manpath.paths[resp->ipath]);
                                parse(&curp, fd, resp->file);
                                /* For .so only; ignore failure. */
                                chdir(conf.manpath.paths[resp->ipath]);
                                parse(&curp, fd, resp->file);


@@ -477,8 +472,11 @@ main(int argc, char *argv[])
                                passthrough(resp->file, fd,
                                    conf.output.synopsisonly);
 
                                passthrough(resp->file, fd,
                                    conf.output.synopsisonly);
 

-                       if (argc > 1 && curp.outtype <= OUTT_UTF8)
-                               ascii_sepline(curp.outdata);
+                       if (argc > 1 && curp.outtype <= OUTT_UTF8) {
+                               if (curp.outdata == NULL)
+                                       outdata_alloc(&curp);
+                               terminal_sepline(curp.outdata);
+                       }

                } else if (rc < MANDOCLEVEL_ERROR)
                        rc = MANDOCLEVEL_ERROR;
 
                } else if (rc < MANDOCLEVEL_ERROR)
                        rc = MANDOCLEVEL_ERROR;
 


@@ -517,10 +515,7 @@ main(int argc, char *argv[])
 out:
        if (search.argmode != ARG_FILE) {
                manconf_free(&conf);
 out:
        if (search.argmode != ARG_FILE) {
                manconf_free(&conf);

-#if HAVE_SQLITE3

                mansearch_free(res, sz);
                mansearch_free(res, sz);

-               mansearch_setup(0);
-#endif

        }
 
        free(defos);
        }
 
        free(defos);


@@ -542,10 +537,10 @@ out:
 
                        /* Stop here until moved to the foreground. */
 
 
                        /* Stop here until moved to the foreground. */
 

-                       tc_pgid = tcgetpgrp(STDIN_FILENO);
+                       tc_pgid = tcgetpgrp(tag_files->ofd);

                        if (tc_pgid != man_pgid) {
                                if (tc_pgid == pager_pid) {
                        if (tc_pgid != man_pgid) {
                                if (tc_pgid == pager_pid) {

-                                       (void)tcsetpgrp(STDIN_FILENO,
+                                       (void)tcsetpgrp(tag_files->ofd,

                                            man_pgid);
                                        if (signum == SIGTTIN)
                                                continue;
                                            man_pgid);
                                        if (signum == SIGTTIN)
                                                continue;


@@ -558,7 +553,7 @@ out:
                        /* Once in the foreground, activate the pager. */
 
                        if (pager_pid) {
                        /* Once in the foreground, activate the pager. */
 
                        if (pager_pid) {

-                               (void)tcsetpgrp(STDIN_FILENO, pager_pid);
+                               (void)tcsetpgrp(tag_files->ofd, pager_pid);

                                kill(pager_pid, SIGCONT);
                        } else
                                pager_pid = spawn_pager(tag_files);
                                kill(pager_pid, SIGCONT);
                        } else
                                pager_pid = spawn_pager(tag_files);


@@ -624,7 +619,8 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
        glob_t           globinfo;
        struct manpage  *page;
        char            *file;
        glob_t           globinfo;
        struct manpage  *page;
        char            *file;

-       int              form, globres;
+       int              globres;
+       enum form        form;

 
        form = FORM_SRC;
        mandoc_asprintf(&file, "%s/man%s/%s.%s",
 
        form = FORM_SRC;
        mandoc_asprintf(&file, "%s/man%s/%s.%s",


@@ -662,10 +658,8 @@ fs_lookup(const struct manpaths *paths, size_t ipath,
                return 0;
 
 found:
                return 0;
 
 found:

-#if HAVE_SQLITE3
-       warnx("outdated mandoc.db lacks %s(%s) entry, run makewhatis %s",
-           name, sec, paths->paths[ipath]);
-#endif
+       warnx("outdated mandoc.db lacks %s(%s) entry, run %s %s",
+           name, sec, BINM_MAKEWHATIS, paths->paths[ipath]);

        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
        page = *res + (*ressz - 1);
        page->file = file;
        *res = mandoc_reallocarray(*res, ++*ressz, sizeof(struct manpage));
        page = *res + (*ressz - 1);
        page->file = file;


@@ -738,32 +732,8 @@ parse(struct curparse *curp, int fd, const char *file)
        if (rctmp != MANDOCLEVEL_OK && curp->wstop)
                return;
 
        if (rctmp != MANDOCLEVEL_OK && curp->wstop)
                return;
 

-       /* If unset, allocate output dev now (if applicable). */
-
-       if (curp->outdata == NULL) {
-               switch (curp->outtype) {
-               case OUTT_HTML:
-                       curp->outdata = html_alloc(curp->outopts);
-                       break;
-               case OUTT_UTF8:
-                       curp->outdata = utf8_alloc(curp->outopts);
-                       break;
-               case OUTT_LOCALE:
-                       curp->outdata = locale_alloc(curp->outopts);
-                       break;
-               case OUTT_ASCII:
-                       curp->outdata = ascii_alloc(curp->outopts);
-                       break;
-               case OUTT_PDF:
-                       curp->outdata = pdf_alloc(curp->outopts);
-                       break;
-               case OUTT_PS:
-                       curp->outdata = ps_alloc(curp->outopts);
-                       break;
-               default:
-                       break;
-               }
-       }
+       if (curp->outdata == NULL)
+               outdata_alloc(curp);

 
        mparse_result(curp->mp, &man, NULL);
 
 
        mparse_result(curp->mp, &man, NULL);
 


@@ -817,6 +787,34 @@ parse(struct curparse *curp, int fd, const char *file)
                        break;
                }
        }
                        break;
                }
        }

+       mparse_updaterc(curp->mp, &rc);
+}
+
+static void
+outdata_alloc(struct curparse *curp)
+{
+       switch (curp->outtype) {
+       case OUTT_HTML:
+               curp->outdata = html_alloc(curp->outopts);
+               break;
+       case OUTT_UTF8:
+               curp->outdata = utf8_alloc(curp->outopts);
+               break;
+       case OUTT_LOCALE:
+               curp->outdata = locale_alloc(curp->outopts);
+               break;
+       case OUTT_ASCII:
+               curp->outdata = ascii_alloc(curp->outopts);
+               break;
+       case OUTT_PDF:
+               curp->outdata = pdf_alloc(curp->outopts);
+               break;
+       case OUTT_PS:
+               curp->outdata = ps_alloc(curp->outopts);
+               break;
+       default:
+               break;
+       }

 }
 
 static void
 }
 
 static void


@@ -829,11 +827,17 @@ passthrough(const char *file, int fd, int synopsis_only)
        const char      *syscall;
        char            *line, *cp;
        size_t           linesz;
        const char      *syscall;
        char            *line, *cp;
        size_t           linesz;

+       ssize_t          len, written;

        int              print;
 
        line = NULL;
        linesz = 0;
 
        int              print;
 
        line = NULL;
        linesz = 0;
 

+       if (fflush(stdout) == EOF) {
+               syscall = "fflush";
+               goto fail;
+       }
+

        if ((stream = fdopen(fd, "r")) == NULL) {
                close(fd);
                syscall = "fdopen";
        if ((stream = fdopen(fd, "r")) == NULL) {
                close(fd);
                syscall = "fdopen";


@@ -841,14 +845,16 @@ passthrough(const char *file, int fd, int synopsis_only)
        }
 
        print = 0;
        }
 
        print = 0;

-       while (getline(&line, &linesz, stream) != -1) {
+       while ((len = getline(&line, &linesz, stream)) != -1) {

                cp = line;
                if (synopsis_only) {
                        if (print) {
                                if ( ! isspace((unsigned char)*cp))
                                        goto done;
                cp = line;
                if (synopsis_only) {
                        if (print) {
                                if ( ! isspace((unsigned char)*cp))
                                        goto done;

-                               while (isspace((unsigned char)*cp))
+                               while (isspace((unsigned char)*cp)) {

                                        cp++;
                                        cp++;

+                                       len--;
+                               }

                        } else {
                                if (strcmp(cp, synb) == 0 ||
                                    strcmp(cp, synr) == 0)
                        } else {
                                if (strcmp(cp, synb) == 0 ||
                                    strcmp(cp, synr) == 0)


@@ -856,9 +862,11 @@ passthrough(const char *file, int fd, int synopsis_only)
                                continue;
                        }
                }
                                continue;
                        }
                }

-               if (fputs(cp, stdout)) {
+               for (; len > 0; len -= written) {
+                       if ((written = write(STDOUT_FILENO, cp, len)) != -1)
+                               continue;

                        fclose(stream);
                        fclose(stream);

-                       syscall = "fputs";
+                       syscall = "write";

                        goto fail;
                }
        }
                        goto fail;
                }
        }


@@ -969,7 +977,7 @@ woptions(struct curparse *curp, char *arg)
 
        while (*arg) {
                o = arg;
 
        while (*arg) {
                o = arg;

-               switch (getsubopt(&arg, UNCONST(toks), &v)) {
+               switch (getsubopt(&arg, (char * const *)toks, &v)) {

                case 0:
                        curp->wstop = 1;
                        break;
                case 0:
                        curp->wstop = 1;
                        break;


@@ -1001,7 +1009,8 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 {
        const char      *mparse_msg;
 
 {
        const char      *mparse_msg;
 

-       fprintf(stderr, "%s: %s:", getprogname(), file);
+       fprintf(stderr, "%s: %s:", getprogname(),
+           file == NULL ? "<stdin>" : file);

 
        if (line)
                fprintf(stderr, "%d:%d:", line, col + 1);
 
        if (line)
                fprintf(stderr, "%d:%d:", line, col + 1);


@@ -1020,6 +1029,7 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 static pid_t
 spawn_pager(struct tag_files *tag_files)
 {
 static pid_t
 spawn_pager(struct tag_files *tag_files)
 {

+       const struct timespec timeout = { 0, 100000000 };  /* 0.1s */

 #define MAX_PAGER_ARGS 16
        char            *argv[MAX_PAGER_ARGS];
        const char      *pager;
 #define MAX_PAGER_ARGS 16
        char            *argv[MAX_PAGER_ARGS];
        const char      *pager;


@@ -1053,11 +1063,11 @@ spawn_pager(struct tag_files *tag_files)
                        break;
        }
 
                        break;
        }
 

-       /* For more(1) and less(1), use the tag file. */
+       /* For less(1), use the tag file. */

 
        if ((cmdlen = strlen(argv[0])) >= 4) {
                cp = argv[0] + cmdlen - 4;
 
        if ((cmdlen = strlen(argv[0])) >= 4) {
                cp = argv[0] + cmdlen - 4;

-               if (strcmp(cp, "less") == 0 || strcmp(cp, "more") == 0) {
+               if (strcmp(cp, "less") == 0) {

                        argv[argc++] = mandoc_strdup("-T");
                        argv[argc++] = tag_files->tfn;
                }
                        argv[argc++] = mandoc_strdup("-T");
                        argv[argc++] = tag_files->tfn;
                }


@@ -1069,12 +1079,10 @@ spawn_pager(struct tag_files *tag_files)
        case -1:
                err((int)MANDOCLEVEL_SYSERR, "fork");
        case 0:
        case -1:
                err((int)MANDOCLEVEL_SYSERR, "fork");
        case 0:

-               /* Set pgrp in both parent and child to avoid racing exec. */
-               (void)setpgid(0, 0);

                break;
        default:
                (void)setpgid(pager_pid, 0);
                break;
        default:
                (void)setpgid(pager_pid, 0);

-               (void)tcsetpgrp(STDIN_FILENO, pager_pid);
+               (void)tcsetpgrp(tag_files->ofd, pager_pid);

 #if HAVE_PLEDGE
                if (pledge("stdio rpath tmppath tty proc", NULL) == -1)
                        err((int)MANDOCLEVEL_SYSERR, "pledge");
 #if HAVE_PLEDGE
                if (pledge("stdio rpath tmppath tty proc", NULL) == -1)
                        err((int)MANDOCLEVEL_SYSERR, "pledge");


@@ -1089,6 +1097,12 @@ spawn_pager(struct tag_files *tag_files)
                err((int)MANDOCLEVEL_SYSERR, "pager stdout");
        close(tag_files->ofd);
        close(tag_files->tfd);
                err((int)MANDOCLEVEL_SYSERR, "pager stdout");
        close(tag_files->ofd);
        close(tag_files->tfd);

+
+       /* Do not start the pager before controlling the terminal. */
+
+       while (tcgetpgrp(STDOUT_FILENO) != getpid())
+               nanosleep(&timeout, NULL);
+

        execvp(argv[0], argv);
        err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);
 }
        execvp(argv[0], argv);
        err((int)MANDOCLEVEL_SYSERR, "exec %s", argv[0]);
 }