Fix allowing silly '\'' control character.

[mandoc.git] / mdoc_action.c

diff --git a/mdoc_action.c b/mdoc_action.c
index b9b95f997ae4b826baa4d8c322bc29866634847a..dcc07a9ef433dff952f561324f8276727b4c3627 100644 (file)
--- a/mdoc_action.c
+++ b/mdoc_action.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_action.c,v 1.54 2010/05/08 07:30:19 kristaps Exp $ */
+/*     $Id: mdoc_action.c,v 1.58 2010/05/15 16:24:38 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -366,9 +366,10 @@ post_st(POST_ARGS)
 
        assert(MDOC_TEXT == n->child->type);
        p = mdoc_a2st(n->child->string);
 
        assert(MDOC_TEXT == n->child->type);
        p = mdoc_a2st(n->child->string);

-       assert(p);
-       free(n->child->string);
-       n->child->string = mandoc_strdup(p);
+       if (p != NULL) {
+               free(n->child->string);
+               n->child->string = mandoc_strdup(p);
+       }

        return(1);
 }
 
        return(1);
 }
 


@@ -381,15 +382,27 @@ post_st(POST_ARGS)
 static int
 post_at(POST_ARGS)
 {
 static int
 post_at(POST_ARGS)
 {

-       struct mdoc_node        *nn;
-       const char              *p;
+       struct mdoc_node *nn;
+       const char       *p, *q;
+       char             *buf;
+       size_t            sz;

 
        if (n->child) {
                assert(MDOC_TEXT == n->child->type);
                p = mdoc_a2att(n->child->string);
 
        if (n->child) {
                assert(MDOC_TEXT == n->child->type);
                p = mdoc_a2att(n->child->string);

-               assert(p);
-               free(n->child->string);
-               n->child->string = mandoc_strdup(p);
+               if (p) {
+                       free(n->child->string);
+                       n->child->string = mandoc_strdup(p);
+               } else {
+                       p = "AT&T UNIX ";
+                       q = n->child->string;
+                       sz = strlen(p) + strlen(q) + 1;
+                       buf = mandoc_malloc(sz);
+                       strlcpy(buf, p, sz);
+                       strlcat(buf, q, sz);
+                       free(n->child->string);
+                       n->child->string = buf;
+               }

                return(1);
        }
 
                return(1);
        }
 


@@ -419,7 +432,7 @@ post_sh(POST_ARGS)
 
        if ( ! concat(m, buf, n->child, BUFSIZ))
                return(0);
 
        if ( ! concat(m, buf, n->child, BUFSIZ))
                return(0);

-       sec = mdoc_atosec(buf);
+       sec = mdoc_str2sec(buf);

        /*
         * The first section should always make us move into a non-new
         * state.
        /*
         * The first section should always make us move into a non-new
         * state.


@@ -433,17 +446,14 @@ post_sh(POST_ARGS)
        case (SEC_RETURN_VALUES):
                /* FALLTHROUGH */
        case (SEC_ERRORS):
        case (SEC_RETURN_VALUES):
                /* FALLTHROUGH */
        case (SEC_ERRORS):

-               switch (m->meta.msec) {
-               case (2):
-                       /* FALLTHROUGH */
-               case (3):
-                       /* FALLTHROUGH */
-               case (9):
+               assert(m->meta.msec);
+               if (*m->meta.msec == '2')

                        break;
                        break;

-               default:
-                       return(mdoc_nwarn(m, n, EBADSEC));
-               }
-               break;
+               if (*m->meta.msec == '3')
+                       break;
+               if (*m->meta.msec == '9')
+                       break;
+               return(mdoc_nwarn(m, n, EWRONGMSEC));

        default:
                break;
        }
        default:
                break;
        }


@@ -460,8 +470,6 @@ post_dt(POST_ARGS)
 {
        struct mdoc_node *nn;
        const char       *cp;
 {
        struct mdoc_node *nn;
        const char       *cp;

-       char             *ep;
-       long              lval;

 
        if (m->meta.title)
                free(m->meta.title);
 
        if (m->meta.title)
                free(m->meta.title);


@@ -471,16 +479,16 @@ post_dt(POST_ARGS)
                free(m->meta.arch);
 
        m->meta.title = m->meta.vol = m->meta.arch = NULL;
                free(m->meta.arch);
 
        m->meta.title = m->meta.vol = m->meta.arch = NULL;

-       m->meta.msec = 0;
-

        /* Handles: `.Dt' 
         *   --> title = unknown, volume = local, msec = 0, arch = NULL
         */
 
        if (NULL == (nn = n->child)) {
                /* XXX: make these macro values. */
        /* Handles: `.Dt' 
         *   --> title = unknown, volume = local, msec = 0, arch = NULL
         */
 
        if (NULL == (nn = n->child)) {
                /* XXX: make these macro values. */

+               /* FIXME: warn about missing values. */

                m->meta.title = mandoc_strdup("unknown");
                m->meta.vol = mandoc_strdup("local");
                m->meta.title = mandoc_strdup("unknown");
                m->meta.vol = mandoc_strdup("local");

+               m->meta.msec = mandoc_strdup("1");

                return(post_prol(m, n));
        }
 
                return(post_prol(m, n));
        }
 


@@ -491,8 +499,10 @@ post_dt(POST_ARGS)
        m->meta.title = mandoc_strdup(nn->string);
 
        if (NULL == (nn = nn->next)) {
        m->meta.title = mandoc_strdup(nn->string);
 
        if (NULL == (nn = nn->next)) {

+               /* FIXME: warn about missing msec. */

                /* XXX: make this a macro value. */
                m->meta.vol = mandoc_strdup("local");
                /* XXX: make this a macro value. */
                m->meta.vol = mandoc_strdup("local");

+               m->meta.msec = mandoc_strdup("1");

                return(post_prol(m, n));
        }
 
                return(post_prol(m, n));
        }
 


@@ -505,13 +515,13 @@ post_dt(POST_ARGS)
 
        cp = mdoc_a2msec(nn->string);
        if (cp) {
 
        cp = mdoc_a2msec(nn->string);
        if (cp) {

-               /* FIXME: where is strtonum!? */

                m->meta.vol = mandoc_strdup(cp);
                m->meta.vol = mandoc_strdup(cp);

-               lval = strtol(nn->string, &ep, 10);
-               if (nn->string[0] != '\0' && *ep == '\0')
-                       m->meta.msec = (int)lval;
-       } else 
+               m->meta.msec = mandoc_strdup(nn->string);
+       } else if (mdoc_nwarn(m, n, EBADMSEC)) {

                m->meta.vol = mandoc_strdup(nn->string);
                m->meta.vol = mandoc_strdup(nn->string);

+               m->meta.msec = mandoc_strdup(nn->string);
+       } else
+               return(0);

 
        if (NULL == (nn = nn->next))
                return(post_prol(m, n));
 
        if (NULL == (nn = nn->next))
                return(post_prol(m, n));


@@ -528,6 +538,7 @@ post_dt(POST_ARGS)
                free(m->meta.vol);
                m->meta.vol = mandoc_strdup(cp);
        } else {
                free(m->meta.vol);
                m->meta.vol = mandoc_strdup(cp);
        } else {

+               /* FIXME: warn about bad arch. */

                cp = mdoc_a2arch(nn->string);
                if (NULL == cp) {
                        free(m->meta.vol);
                cp = mdoc_a2arch(nn->string);
                if (NULL == cp) {
                        free(m->meta.vol);