more info on man(7) .Xr hyperlinking
[mandoc.git] / main.c
diff --git a/main.c b/main.c
index 56bfd63543ec4e70c6b36a8536720ef558ba27cd..b64b3be115017ee869aa5dd6c5525e974f9019d5 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/*     $Id: main.c,v 1.274 2016/07/19 21:31:55 schwarze Exp $ */
+/*     $Id: main.c,v 1.279 2017/01/09 17:49:57 schwarze Exp $ */
 /*
  * 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
@@ -95,6 +95,7 @@ static        int               koptions(int *, 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 *);
@@ -465,8 +466,11 @@ main(int argc, char *argv[])
                                passthrough(resp->file, fd,
                                    conf.output.synopsisonly);
 
-                       if (argc > 1 && curp.outtype <= OUTT_UTF8)
+                       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;
 
@@ -527,10 +531,10 @@ out:
 
                        /* 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) {
-                                       (void)tcsetpgrp(STDIN_FILENO,
+                                       (void)tcsetpgrp(tag_files->ofd,
                                            man_pgid);
                                        if (signum == SIGTTIN)
                                                continue;
@@ -543,7 +547,7 @@ out:
                        /* 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);
@@ -722,32 +726,8 @@ parse(struct curparse *curp, int fd, const char *file)
        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);
 
@@ -801,6 +781,34 @@ parse(struct curparse *curp, int fd, const char *file)
                        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
@@ -813,11 +821,17 @@ passthrough(const char *file, int fd, int synopsis_only)
        const char      *syscall;
        char            *line, *cp;
        size_t           linesz;
+       ssize_t          len, written;
        int              print;
 
        line = NULL;
        linesz = 0;
 
+       if (fflush(stdout) == EOF) {
+               syscall = "fflush";
+               goto fail;
+       }
+
        if ((stream = fdopen(fd, "r")) == NULL) {
                close(fd);
                syscall = "fdopen";
@@ -825,14 +839,16 @@ passthrough(const char *file, int fd, int synopsis_only)
        }
 
        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;
-                               while (isspace((unsigned char)*cp))
+                               while (isspace((unsigned char)*cp)) {
                                        cp++;
+                                       len--;
+                               }
                        } else {
                                if (strcmp(cp, synb) == 0 ||
                                    strcmp(cp, synr) == 0)
@@ -840,9 +856,11 @@ passthrough(const char *file, int fd, int synopsis_only)
                                continue;
                        }
                }
-               if (fputs(cp, stdout)) {
+               for (; len > 0; len -= written) {
+                       if ((written = write(STDOUT_FILENO, cp, len)) != -1)
+                               continue;
                        fclose(stream);
-                       syscall = "fputs";
+                       syscall = "write";
                        goto fail;
                }
        }
@@ -985,7 +1003,8 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 {
        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);
@@ -1057,7 +1076,7 @@ spawn_pager(struct tag_files *tag_files)
                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");
@@ -1075,7 +1094,7 @@ spawn_pager(struct tag_files *tag_files)
 
        /* Do not start the pager before controlling the terminal. */
 
-       while (tcgetpgrp(STDIN_FILENO) != getpid())
+       while (tcgetpgrp(STDOUT_FILENO) != getpid())
                nanosleep(&timeout, NULL);
 
        execvp(argv[0], argv);