Commit and commit message by deraadt@:

[mandoc.git] / demandoc.c

diff --git a/demandoc.c b/demandoc.c
index aad42085b185b7ab274f4c88dd9fd46846674c3a..57d0cc5f4120dee213091c638803161c87948ea2 100644 (file)
--- a/demandoc.c
+++ b/demandoc.c
@@ -1,4 +1,4 @@
-/*     $Id: demandoc.c,v 1.7 2012/05/31 22:27:14 schwarze Exp $ */
+/*     $Id: demandoc.c,v 1.33 2019/03/03 11:01:15 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,26 +14,27 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
-#include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#include "mandoc.h"
+#include "roff.h"
 #include "man.h"
 #include "mdoc.h"
-#include "mandoc.h"
+#include "mandoc_parse.h"
 
 static void     pline(int, int *, int *, int);
-static void     pman(const struct man_node *, int *, int *, int);
+static void     pman(const struct roff_node *, int *, int *, int);
 static void     pmandoc(struct mparse *, int, const char *, int);
-static void     pmdoc(const struct mdoc_node *, int *, int *, int);
+static void     pmdoc(const struct roff_node *, int *, int *, int);
 static void     pstring(const char *, int, int *, int);
 static void     usage(void);
 
@@ -43,11 +44,12 @@ int
 main(int argc, char *argv[])
 {
        struct mparse   *mp;
-       int              ch, i, list;
+       int              ch, fd, i, list;
        extern int       optind;
 
-       progname = strrchr(argv[0], '/');
-       if (progname == NULL)
+       if (argc < 1)
+               progname = "demandoc";
+       else if ((progname = strrchr(argv[0], '/')) == NULL)
                progname = argv[0];
        else
                ++progname;
@@ -70,25 +72,32 @@ main(int argc, char *argv[])
                        break;
                default:
                        usage();
-                       return((int)MANDOCLEVEL_BADARG);
+                       return (int)MANDOCLEVEL_BADARG;
                }
 
        argc -= optind;
        argv += optind;
 
-       mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL, NULL);
+       mchars_alloc();
+       mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 |
+           MPARSE_VALIDATE, MANDOC_OS_OTHER, NULL);
        assert(mp);
 
-       if (0 == argc)
+       if (argc < 1)
                pmandoc(mp, STDIN_FILENO, "<stdin>", list);
 
        for (i = 0; i < argc; i++) {
                mparse_reset(mp);
-               pmandoc(mp, -1, argv[i], list);
+               if ((fd = mparse_open(mp, argv[i])) == -1) {
+                       perror(argv[i]);
+                       continue;
+               }
+               pmandoc(mp, fd, argv[i], list);
        }
 
        mparse_free(mp);
-       return((int)MANDOCLEVEL_OK);
+       mchars_free();
+       return (int)MANDOCLEVEL_OK;
 }
 
 static void
@@ -101,25 +110,19 @@ usage(void)
 static void
 pmandoc(struct mparse *mp, int fd, const char *fn, int list)
 {
-       struct mdoc     *mdoc;
-       struct man      *man;
+       struct roff_meta        *meta;
        int              line, col;
 
-       if (mparse_readfd(mp, fd, fn) >= MANDOCLEVEL_FATAL) {
-               fprintf(stderr, "%s: Parse failure\n", fn);
-               return;
-       }
-
-       mparse_result(mp, &mdoc, &man);
+       mparse_readfd(mp, fd, fn);
+       close(fd);
+       meta = mparse_result(mp);
        line = 1;
        col = 0;
 
-       if (mdoc) 
-               pmdoc(mdoc_node(mdoc), &line, &col, list);
-       else if (man)
-               pman(man_node(man), &line, &col, list);
+       if (meta->macroset == MACROSET_MDOC)
+               pmdoc(meta->first->child, &line, &col, list);
        else
-               return;
+               pman(meta->first->child, &line, &col, list);
 
        if ( ! list)
                putchar('\n');
@@ -164,7 +167,7 @@ again:
                end = p - 1;
 
                while (end > start)
-                       if ('.' == *end || ',' == *end || 
+                       if ('.' == *end || ',' == *end ||
                                        '\'' == *end || '"' == *end ||
                                        ')' == *end || '!' == *end ||
                                        '?' == *end || ':' == *end ||
@@ -196,7 +199,7 @@ again:
        /*
         * Print the input word, skipping any special characters.
         */
-       while ('\0' != *p) 
+       while ('\0' != *p)
                if ('\\' == *p) {
                        p++;
                        esc = mandoc_escape(&p, NULL, NULL);
@@ -217,7 +220,7 @@ pline(int line, int *linep, int *col, int list)
 
        /*
         * Print out as many lines as needed to reach parity with the
-        * original input. 
+        * original input.
         */
 
        while (*linep < line) {
@@ -229,29 +232,29 @@ pline(int line, int *linep, int *col, int list)
 }
 
 static void
-pmdoc(const struct mdoc_node *p, int *line, int *col, int list)
+pmdoc(const struct roff_node *p, int *line, int *col, int list)
 {
 
        for ( ; p; p = p->next) {
-               if (MDOC_LINE & p->flags)
+               if (NODE_LINE & p->flags)
                        pline(p->line, line, col, list);
-               if (MDOC_TEXT == p->type)
+               if (ROFFT_TEXT == p->type)
                        pstring(p->string, p->pos, col, list);
-               if (p->child) 
+               if (p->child)
                        pmdoc(p->child, line, col, list);
        }
 }
 
 static void
-pman(const struct man_node *p, int *line, int *col, int list)
+pman(const struct roff_node *p, int *line, int *col, int list)
 {
 
        for ( ; p; p = p->next) {
-               if (MAN_LINE & p->flags)
+               if (NODE_LINE & p->flags)
                        pline(p->line, line, col, list);
-               if (MAN_TEXT == p->type)
+               if (ROFFT_TEXT == p->type)
                        pstring(p->string, p->pos, col, list);
-               if (p->child) 
+               if (p->child)
                        pman(p->child, line, col, list);
        }
 }