Let man(1) display preformatted manuals by simply reading them

from the file and copying them to the standard output.
This works even for mixed formats: "man -a groff mandoc" displays
groff(1) [formatted], mandoc(1) [unformatted], groff(7) [formatted],
and mandoc(7) [unformatted] in that order.

diff --git a/main.c b/main.c
index e949afd38523c3309219685199927cb294879885..ece2ebcb29cbf359e96a916cbb979ea6dff991ee 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.185 2014/08/22 18:07:15 schwarze Exp $ */
+/*     $Id: main.c,v 1.186 2014/08/23 00:34:59 schwarze Exp $ */

 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>


@@ -23,6 +23,7 @@
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>

+#include <fcntl.h>

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


@@ -86,6 +87,7 @@ static        void              mmsg(enum mandocerr, enum mandoclevel,
                                const char *, int, int, const char *);
 static void              parse(struct curparse *, int,
                                const char *, enum mandoclevel *);
                                const char *, int, int, const char *);
 static void              parse(struct curparse *, int,
                                const char *, enum mandoclevel *);

+static enum mandoclevel  passthrough(const char *);

 static void              spawn_pager(void);
 static int               toptions(struct curparse *, char *);
 static void              usage(enum argmode) __attribute__((noreturn));
 static void              spawn_pager(void);
 static int               toptions(struct curparse *, char *);
 static void              usage(enum argmode) __attribute__((noreturn));


@@ -105,8 +107,7 @@ main(int argc, char *argv[])
        char            *conf_file, *defpaths, *auxpaths;
        char            *defos;
 #if HAVE_SQLITE3
        char            *conf_file, *defpaths, *auxpaths;
        char            *defos;
 #if HAVE_SQLITE3

-       struct manpage  *res;
-       char            **auxargv;
+       struct manpage  *res, *resp;

        size_t           isec, i, sz;
        int              prio, best_prio;
        char             sec;
        size_t           isec, i, sz;
        int              prio, best_prio;
        char             sec;


@@ -250,7 +251,7 @@ main(int argc, char *argv[])
        argc -= optind;
        argv += optind;
 #if HAVE_SQLITE3
        argc -= optind;
        argv += optind;
 #if HAVE_SQLITE3

-       auxargv = NULL;
+       resp = NULL;

 #endif
 
        /* Quirk for a man(1) section argument without -s. */
 #endif
 
        /* Quirk for a man(1) section argument without -s. */


@@ -280,6 +281,7 @@ main(int argc, char *argv[])
                if( ! mansearch(&search, &paths, argc, argv, &res, &sz))
                        usage(search.argmode);
                manpath_free(&paths);
                if( ! mansearch(&search, &paths, argc, argv, &res, &sz))
                        usage(search.argmode);
                manpath_free(&paths);

+               resp = res;

 
                /*
                 * For standard man(1) and -a output mode,
 
                /*
                 * For standard man(1) and -a output mode,


@@ -289,15 +291,9 @@ main(int argc, char *argv[])
 
                if (outmode == OUTMODE_ONE) {
                        argc = 1;
 
                if (outmode == OUTMODE_ONE) {
                        argc = 1;

-                       argv[0] = res[0].file;
-                       argv[1] = NULL;

                        best_prio = 10;
                        best_prio = 10;

-               } else if (outmode == OUTMODE_ALL) {
+               } else if (outmode == OUTMODE_ALL)

                        argc = (int)sz;
                        argc = (int)sz;

-                       argv = auxargv = mandoc_reallocarray(
-                           NULL, sz + 1, sizeof(char *));
-                       argv[argc] = NULL;
-               }

 
                /* Iterate all matching manuals. */
 
 
                /* Iterate all matching manuals. */
 


@@ -308,9 +304,7 @@ main(int argc, char *argv[])
                                printf("%s - %s\n", res[i].names,
                                    res[i].output == NULL ? "" :
                                    res[i].output);
                                printf("%s - %s\n", res[i].names,
                                    res[i].output == NULL ? "" :
                                    res[i].output);

-                       else if (outmode == OUTMODE_ALL)
-                               argv[i] = res[i].file;
-                       else {
+                       else if (outmode == OUTMODE_ONE) {

                                /* Search for the best section. */
                                isec = strcspn(res[i].file, "123456789");
                                sec = res[i].file[isec];
                                /* Search for the best section. */
                                isec = strcspn(res[i].file, "123456789");
                                sec = res[i].file[isec];


@@ -320,7 +314,7 @@ main(int argc, char *argv[])
                                if (prio >= best_prio)
                                        continue;
                                best_prio = prio;
                                if (prio >= best_prio)
                                        continue;
                                best_prio = prio;

-                               argv[0] = res[i].file;
+                               resp = res + i;

                        }
                }
 
                        }
                }
 


@@ -355,14 +349,23 @@ main(int argc, char *argv[])
        if (OUTT_MAN == curp.outtype)
                mparse_keep(curp.mp);
 
        if (OUTT_MAN == curp.outtype)
                mparse_keep(curp.mp);
 

-       if (NULL == *argv)
+       if (argc == 0)

                parse(&curp, STDIN_FILENO, "<stdin>", &rc);
 
                parse(&curp, STDIN_FILENO, "<stdin>", &rc);
 

-       while (*argv) {
-               parse(&curp, -1, *argv, &rc);
+       while (argc) {
+#if HAVE_SQLITE3
+               if (resp != NULL) {
+                       if (resp->form)
+                               parse(&curp, -1, resp->file, &rc);
+                       else
+                               rc = passthrough(resp->file);
+                       resp++;
+               } else
+#endif
+                       parse(&curp, -1, *argv++, &rc);

                if (MANDOCLEVEL_OK != rc && curp.wstop)
                        break;
                if (MANDOCLEVEL_OK != rc && curp.wstop)
                        break;

-               ++argv;
+               argc--;

        }
 
        if (curp.outfree)
        }
 
        if (curp.outfree)


@@ -375,7 +378,6 @@ out:
        if (search.argmode != ARG_FILE) {
                mansearch_free(res, sz);
                mansearch_setup(0);
        if (search.argmode != ARG_FILE) {
                mansearch_free(res, sz);
                mansearch_setup(0);

-               free(auxargv);

        }
 #endif
 
        }
 #endif
 


@@ -533,6 +535,40 @@ parse(struct curparse *curp, int fd, const char *file,
                *level = rc;
 }
 
                *level = rc;
 }
 

+static enum mandoclevel
+passthrough(const char *file)
+{
+       char             buf[BUFSIZ];
+       const char      *syscall;
+       ssize_t          nr, nw, off;
+       int              fd;
+
+       fd = open(file, O_RDONLY);
+       if (fd == -1) {
+               syscall = "open";
+               goto fail;
+       }
+
+       while ((nr = read(fd, buf, BUFSIZ)) != -1 && nr != 0)
+               for (off = 0; off < nr; off += nw)
+                       if ((nw = write(STDOUT_FILENO, buf + off,
+                           (size_t)(nr - off))) == -1 || nw == 0) {
+                               syscall = "write";
+                               goto fail;
+                       }
+
+        if (nr == 0) {
+               close(fd);
+               return(MANDOCLEVEL_OK);
+        }
+
+       syscall = "read";
+fail:
+       fprintf(stderr, "%s: %s: SYSERR: %s: %s",
+           progname, file, syscall, strerror(errno));
+       return(MANDOCLEVEL_SYSERR);
+}
+

 static int
 moptions(int *options, char *arg)
 {
 static int
 moptions(int *options, char *arg)
 {