The st_size member of struct stat is off_t, which is signed,

[mandoc.git] / mdoc_man.c

diff --git a/mdoc_man.c b/mdoc_man.c
index 966ffa8cb1d675fd79c7f8e3dcb5b9b2560cf195..9c086a576c4ed261252d7ecacdb3583582e969c0 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.86 2015/02/11 14:15:12 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.88 2015/02/17 20:37:17 schwarze Exp $ */
 /*
  * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -29,8 +29,7 @@
 #include "mdoc.h"
 #include "main.h"
 
-#define        DECL_ARGS const struct mdoc_meta *meta, \
-                 const struct mdoc_node *n
+#define        DECL_ARGS const struct mdoc_meta *meta, struct mdoc_node *n
 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */
@@ -186,8 +185,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
        { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
-       { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Do */
-       { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Dq */
+       { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Do */
+       { cond_body, pre_enc, post_enc, "\\(Lq", "\\(Rq" }, /* Dq */
        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
@@ -548,10 +547,10 @@ void
 man_mdoc(void *arg, const struct mdoc *mdoc)
 {
        const struct mdoc_meta *meta;
-       const struct mdoc_node *n;
+       struct mdoc_node *n;
 
        meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc);
+       n = mdoc_node(mdoc)->child;
 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
            meta->title,
@@ -567,15 +566,18 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
-       print_node(meta, n);
+       while (n != NULL) {
+               print_node(meta, n);
+               n = n->next;
+       }
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
-       const struct mdoc_node  *sub;
        const struct manact     *act;
+       struct mdoc_node        *sub;
        int                      cond, do_sub;
 
        /*
@@ -588,6 +590,7 @@ print_node(DECL_ARGS)
        act = NULL;
        cond = 0;
        do_sub = 1;
+       n->flags &= ~MDOC_ENDED;
 
        if (MDOC_TEXT == n->type) {
                /*
@@ -635,7 +638,7 @@ print_node(DECL_ARGS)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)
-               n->pending->flags |= MDOC_ENDED;
+               n->body->flags |= MDOC_ENDED;
 
        if (ENDBODY_NOSPACE == n->end)
                outflags &= ~(MMAN_spc | MMAN_nl);