In HTML output, allow switching the desired font for subsequent

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 22175639ed931c6650178c22a86d6ae498d7c2bf..b91c15860ab1051dc0a452bf7abd3ec9dad3663c 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,7 +1,7 @@
-/*     $Id: main.c,v 1.316 2019/01/01 08:18:11 schwarze Exp $ */
+/*     $Id: main.c,v 1.322 2019/03/06 10:18:58 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -21,7 +21,6 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #include <sys/param.h> /* MACHINE */
-#include <sys/termios.h>
 #include <sys/wait.h>
 
 #include <assert.h>
@@ -40,6 +39,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <termios.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -148,6 +148,7 @@ main(int argc, char *argv[])
        setprogname(progname);
 #endif
 
+       mandoc_msg_setoutfile(stderr);
        if (strncmp(progname, "mandocdb", 8) == 0 ||
            strcmp(progname, BINM_MAKEWHATIS) == 0)
                return mandocdb(argc, argv);
@@ -560,7 +561,7 @@ main(int argc, char *argv[])
                        }
                } else
                        mandoc_msg(MANDOCERR_FILE, 0, 0,
-                           "%s", strerror(errno));
+                           "%s: %s", thisarg, strerror(errno));
 
                if (curp.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK)
                        break;
@@ -796,7 +797,11 @@ fs_search(const struct mansearch *cfg, const struct manpaths *paths,
                }
                if (res != NULL && *ressz == lastsz &&
                    strchr(*argv, '/') == NULL) {
-                       if (cfg->sec == NULL)
+                       if (cfg->arch != NULL &&
+                           arch_valid(cfg->arch, OSENUM) == 0)
+                               warnx("Unknown architecture \"%s\".",
+                                   cfg->arch);
+                       else if (cfg->sec == NULL)
                                warnx("No entry for %s in the manual.",
                                    *argv);
                        else
@@ -834,6 +839,8 @@ parse(struct curparse *curp, int fd, const char *file)
 
        if (curp->outdata == NULL)
                outdata_alloc(curp);
+       else if (curp->outtype == OUTT_HTML)
+               html_reset(curp);
 
        mandoc_xr_reset();
        meta = mparse_result(curp->mp);
@@ -1154,7 +1161,9 @@ spawn_pager(struct tag_files *tag_files)
        char            *argv[MAX_PAGER_ARGS];
        const char      *pager;
        char            *cp;
+#if HAVE_LESS_T
        size_t           cmdlen;
+#endif
        int              argc, use_ofn;
        pid_t            pager_pid;
 
@@ -1186,6 +1195,7 @@ spawn_pager(struct tag_files *tag_files)
        /* For less(1), use the tag file. */
 
        use_ofn = 1;
+#if HAVE_LESS_T
        if ((cmdlen = strlen(argv[0])) >= 4) {
                cp = argv[0] + cmdlen - 4;
                if (strcmp(cp, "less") == 0) {
@@ -1198,6 +1208,7 @@ spawn_pager(struct tag_files *tag_files)
                        }
                }
        }
+#endif
        if (use_ofn)
                argv[argc++] = tag_files->ofn;
        argv[argc] = NULL;