OpenBSD src/sbin was used as a tool to hunt bugs in mandoc.

[mandoc.git] / mdoc.c

diff --git a/mdoc.c b/mdoc.c
index b1059eadc20b3e33b6a290096bc947c99d8c5329..d55b1120f0c2eb91d54a5dc7f3f93bc255cc7091 100644 (file)
--- a/mdoc.c
+++ b/mdoc.c
@@ -1,6 +1,7 @@
-/*     $Id: mdoc.c,v 1.145 2010/05/31 21:32:57 kristaps Exp $ */
+/*     $Id: mdoc.c,v 1.162 2010/08/08 14:51:32 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -21,7 +22,6 @@
 #include <sys/types.h>
 
 #include <assert.h>
 #include <sys/types.h>
 
 #include <assert.h>

-#include <ctype.h>

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


@@ -191,7 +191,8 @@ mdoc_free(struct mdoc *mdoc)
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *
  * Allocate volatile and non-volatile parse resources.  
  */
 struct mdoc *

-mdoc_alloc(void *data, int pflags, mandocmsg msg)
+mdoc_alloc(struct regset *regs, void *data, 
+               int pflags, mandocmsg msg)

 {
        struct mdoc     *p;
 
 {
        struct mdoc     *p;
 


@@ -200,6 +201,7 @@ mdoc_alloc(void *data, int pflags, mandocmsg msg)
        p->msg = msg;
        p->data = data;
        p->pflags = pflags;
        p->msg = msg;
        p->data = data;
        p->pflags = pflags;

+       p->regs = regs;

 
        mdoc_hash_init();
        mdoc_alloc1(p);
 
        mdoc_hash_init();
        mdoc_alloc1(p);


@@ -236,6 +238,20 @@ mdoc_parseln(struct mdoc *m, int ln, char *buf, int offs)
                return(0);
 
        m->flags |= MDOC_NEWLINE;
                return(0);
 
        m->flags |= MDOC_NEWLINE;

+
+       /*
+        * Let the roff nS register switch SYNOPSIS mode early,
+        * such that the parser knows at all times
+        * whether this mode is on or off.
+        * Note that this mode is also switched by the Sh macro.
+        */
+       if (m->regs->regs[(int)REG_nS].set) {
+               if (m->regs->regs[(int)REG_nS].v.u)
+                       m->flags |= MDOC_SYNOPSIS;
+               else
+                       m->flags &= ~MDOC_SYNOPSIS;
+       }
+

        return(('.' == buf[offs] || '\'' == buf[offs]) ? 
                        mdoc_pmacro(m, ln, buf, offs) :
                        mdoc_ptext(m, ln, buf, offs));
        return(('.' == buf[offs] || '\'' == buf[offs]) ? 
                        mdoc_pmacro(m, ln, buf, offs) :
                        mdoc_ptext(m, ln, buf, offs));


@@ -258,8 +274,7 @@ mdoc_vmsg(struct mdoc *mdoc, enum mandocerr t,
 
 
 int
 
 
 int

-mdoc_macro(struct mdoc *m, enum mdoct tok, 
-               int ln, int pp, int *pos, char *buf)
+mdoc_macro(MACRO_PROT_ARGS)

 {
        assert(tok < MDOC_MAX);
 
 {
        assert(tok < MDOC_MAX);
 


@@ -267,13 +282,13 @@ mdoc_macro(struct mdoc *m, enum mdoct tok,
 
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
                        MDOC_PBODY & m->flags)
 
        if (MDOC_PROLOGUE & mdoc_macros[tok].flags && 
                        MDOC_PBODY & m->flags)

-               return(mdoc_pmsg(m, ln, pp, MANDOCERR_BADBODY));
+               return(mdoc_pmsg(m, line, ppos, MANDOCERR_BADBODY));

 
        /* If we're in the prologue, deny "body" macros.  */
 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
                        ! (MDOC_PBODY & m->flags)) {
 
        /* If we're in the prologue, deny "body" macros.  */
 
        if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) && 
                        ! (MDOC_PBODY & m->flags)) {

-               if ( ! mdoc_pmsg(m, ln, pp, MANDOCERR_BADPROLOG))
+               if ( ! mdoc_pmsg(m, line, ppos, MANDOCERR_BADPROLOG))

                        return(0);
                if (NULL == m->meta.title)
                        m->meta.title = mandoc_strdup("UNKNOWN");
                        return(0);
                if (NULL == m->meta.title)
                        m->meta.title = mandoc_strdup("UNKNOWN");


@@ -286,7 +301,7 @@ mdoc_macro(struct mdoc *m, enum mdoct tok,
                m->flags |= MDOC_PBODY;
        }
 
                m->flags |= MDOC_PBODY;
        }
 

-       return((*mdoc_macros[tok].fp)(m, tok, ln, pp, pos, buf));
+       return((*mdoc_macros[tok].fp)(m, tok, line, ppos, pos, buf));

 }
 
 
 }
 
 


@@ -330,6 +345,8 @@ node_append(struct mdoc *mdoc, struct mdoc_node *p)
                p->parent->tail = p;
                break;
        case (MDOC_BODY):
                p->parent->tail = p;
                break;
        case (MDOC_BODY):

+               if (p->end)
+                       break;

                assert(MDOC_BLOCK == p->parent->type);
                p->parent->body = p;
                break;
                assert(MDOC_BLOCK == p->parent->type);
                p->parent->body = p;
                break;


@@ -366,9 +383,17 @@ node_alloc(struct mdoc *m, int line, int pos,
        p->pos = pos;
        p->tok = tok;
        p->type = type;
        p->pos = pos;
        p->tok = tok;
        p->type = type;

+
+       /* Flag analysis. */
+
+       if (MDOC_SYNOPSIS & m->flags)
+               p->flags |= MDOC_SYNPRETTY;
+       else
+               p->flags &= ~MDOC_SYNPRETTY;

        if (MDOC_NEWLINE & m->flags)
                p->flags |= MDOC_LINE;
        m->flags &= ~MDOC_NEWLINE;
        if (MDOC_NEWLINE & m->flags)
                p->flags |= MDOC_LINE;
        m->flags &= ~MDOC_NEWLINE;

+

        return(p);
 }
 
        return(p);
 }
 


@@ -415,6 +440,22 @@ mdoc_body_alloc(struct mdoc *m, int line, int pos, enum mdoct tok)
 }
 
 
 }
 
 

+int
+mdoc_endbody_alloc(struct mdoc *m, int line, int pos, enum mdoct tok,
+               struct mdoc_node *body, enum mdoc_endbody end)
+{
+       struct mdoc_node *p;
+
+       p = node_alloc(m, line, pos, tok, MDOC_BODY);
+       p->pending = body;
+       p->end = end;
+       if ( ! node_append(m, p))
+               return(0);
+       m->next = MDOC_NEXT_SIBLING;
+       return(1);
+}
+
+

 int
 mdoc_block_alloc(struct mdoc *m, int line, int pos, 
                enum mdoct tok, struct mdoc_arg *args)
 int
 mdoc_block_alloc(struct mdoc *m, int line, int pos, 
                enum mdoct tok, struct mdoc_arg *args)


@@ -472,10 +513,26 @@ mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p)
 }
 
 
 }
 
 

-void
+static void

 mdoc_node_free(struct mdoc_node *p)
 {
 
 mdoc_node_free(struct mdoc_node *p)
 {
 

+       /*
+        * XXX: if these end up being problematic in terms of memory
+        * management and dereferencing freed blocks, then make them
+        * into reference-counted double-pointers.
+        */
+
+       if (MDOC_Bd == p->tok && MDOC_BLOCK == p->type)
+               if (p->data.Bd)
+                       free(p->data.Bd);
+       if (MDOC_Bl == p->tok && MDOC_BLOCK == p->type)
+               if (p->data.Bl)
+                       free(p->data.Bl);
+       if (MDOC_Bf == p->tok && MDOC_HEAD == p->type)
+               if (p->data.Bf)
+                       free(p->data.Bf);
+

        if (p->string)
                free(p->string);
        if (p->args)
        if (p->string)
                free(p->string);
        if (p->args)


@@ -568,7 +625,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&

-                       LIST_column == n->data.list) {
+                       LIST_column == n->data.Bl->type) {

                /* `Bl' is open without any children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
                /* `Bl' is open without any children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));


@@ -577,7 +634,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&

-                       LIST_column == n->parent->data.list) {
+                       LIST_column == n->parent->data.Bl->type) {

                /* `Bl' has block-level `It' children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));
                /* `Bl' has block-level `It' children. */
                m->flags |= MDOC_FREECOL;
                return(mdoc_macro(m, MDOC_It, line, offs, &offs, buf));


@@ -663,7 +720,7 @@ mdoc_ptext(struct mdoc *m, int line, char *buf, int offs)
 
        assert(buf < end);
 
 
        assert(buf < end);
 

-       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs)))
+       if (mandoc_eos(buf+offs, (size_t)(end-buf-offs), 0))

                m->last->flags |= MDOC_EOS;
 
        return(1);
                m->last->flags |= MDOC_EOS;
 
        return(1);


@@ -689,7 +746,7 @@ macrowarn(struct mdoc *m, int ln, const char *buf, int offs)
  * Parse a macro line, that is, a line beginning with the control
  * character.
  */
  * Parse a macro line, that is, a line beginning with the control
  * character.
  */

-int
+static int

 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 {
        enum mdoct        tok;
 mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 {
        enum mdoct        tok;


@@ -706,11 +763,11 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 
        i = offs;
 
 
        i = offs;
 

-       /* Accept whitespace after the initial control char. */
+       /* Accept tabs/whitespace after the initial control char. */

 
 

-       if (' ' == buf[i]) {
+       if (' ' == buf[i] || '\t' == buf[i]) {

                i++;
                i++;

-               while (buf[i] && ' ' == buf[i])
+               while (buf[i] && (' ' == buf[i] || '\t' == buf[i]))

                        i++;
                if ('\0' == buf[i])
                        return(1);
                        i++;
                if ('\0' == buf[i])
                        return(1);


@@ -718,23 +775,14 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
 
        sv = i;
 
 
        sv = i;
 

-       /* Copy the first word into a nil-terminated buffer. */
-
-       for (j = 0; j < 4; j++, i++) {
-               if ('\0' == (mac[j] = buf[i]))
-                       break;
-               else if (' ' == buf[i])
-                       break;
-
-               /* Check for invalid characters. */
-
-               if (isgraph((u_char)buf[i]))
-                       continue;
-               if ( ! mdoc_pmsg(m, ln, i, MANDOCERR_BADCHAR))
-                       return(0);
-               i--;
-       }
+       /* 
+        * Copy the first word into a nil-terminated buffer.
+        * Stop copying when a tab, space, or eoln is encountered.
+        */

 
 

+       j = 0;
+       while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
+               mac[j++] = buf[i++];

        mac[j] = '\0';
 
        if (j == 4 || j < 2) {
        mac[j] = '\0';
 
        if (j == 4 || j < 2) {


@@ -749,7 +797,12 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
                return(1);
        }
 
                return(1);
        }
 

-       /* The macro is sane.  Jump to the next word. */
+       /* Disregard the first trailing tab, if applicable. */
+
+       if ('\t' == buf[i])
+               i++;
+
+       /* Jump to the next non-whitespace word. */

 
        while (buf[i] && ' ' == buf[i])
                i++;
 
        while (buf[i] && ' ' == buf[i])
                i++;


@@ -783,9 +836,9 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&
         */
 
        if (MDOC_Bl == n->tok && MDOC_BODY == n->type &&

-                       LIST_column == n->data.list) {
+                       LIST_column == n->data.Bl->type) {

                m->flags |= MDOC_FREECOL;
                m->flags |= MDOC_FREECOL;

-               if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
+               if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf))

                        goto err;
                return(1);
        }
                        goto err;
                return(1);
        }


@@ -799,7 +852,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char *buf, int offs)
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&
        if (MDOC_It == n->tok && MDOC_BLOCK == n->type &&
                        NULL != n->parent &&
                        MDOC_Bl == n->parent->tok &&

-                       LIST_column == n->parent->data.list) {
+                       LIST_column == n->parent->data.Bl->type) {

                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
                        goto err;
                m->flags |= MDOC_FREECOL;
                if ( ! mdoc_macro(m, MDOC_It, ln, sv, &sv, buf)) 
                        goto err;