Correctly set valsz this time.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 273f48d023ed1fd705e9581b280ecf9e98ffdb9f..1d0a431baa09b7ea4aa51545a93382f3674e20f6 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.58 2011/03/22 14:33:05 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.64 2011/07/07 05:42:32 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -38,6 +38,8 @@ static        int              blk_close(MACRO_PROT_ARGS);
 static int              blk_exp(MACRO_PROT_ARGS);
 static int              blk_imp(MACRO_PROT_ARGS);
 static int              in_line_eoln(MACRO_PROT_ARGS);
+static int              man_args(struct man *, int, 
+                               int *, char *, char **);
 
 static int              rew_scope(enum man_type, 
                                struct man *, enum mant);
@@ -118,6 +120,9 @@ man_unscope(struct man *m, const struct man_node *to,
 
        assert(to);
 
+       assert(MAN_ROOT != m->last->type);
+       m->next = MAN_NEXT_SIBLING;
+
        /* LINTED */
        while (m->last != to) {
                /*
@@ -138,9 +143,6 @@ man_unscope(struct man *m, const struct man_node *to,
        if ( ! man_valid_post(m))
                return(0);
 
-       m->next = MAN_ROOT == m->last->type ? 
-               MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
-
        return(1);
 }
 
@@ -296,7 +298,7 @@ blk_close(MACRO_PROT_ARGS)
 int
 blk_exp(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
 
        /* 
@@ -305,11 +307,6 @@ blk_exp(MACRO_PROT_ARGS)
         * anywhere.
         */
 
-       if ( ! rew_scope(MAN_BODY, m, tok))
-               return(0);
-       if ( ! rew_scope(MAN_BLOCK, m, tok))
-               return(0);
-
        if ( ! man_block_alloc(m, line, ppos, tok))
                return(0);
        if ( ! man_head_alloc(m, line, ppos, tok))
@@ -317,13 +314,8 @@ blk_exp(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
-               w = man_args(m, line, pos, buf, &p);
-
-               if (-1 == w)
-                       return(0);
-               if (0 == w)
+               if ( ! man_args(m, line, pos, buf, &p))
                        break;
-
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
        }
@@ -348,7 +340,7 @@ blk_exp(MACRO_PROT_ARGS)
 int
 blk_imp(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
        struct man_node *n;
 
@@ -372,13 +364,8 @@ blk_imp(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
-               w = man_args(m, line, pos, buf, &p);
-
-               if (-1 == w)
-                       return(0);
-               if (0 == w)
+               if ( ! man_args(m, line, pos, buf, &p))
                        break;
-
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
        }
@@ -406,7 +393,7 @@ blk_imp(MACRO_PROT_ARGS)
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
        struct man_node *n;
 
@@ -417,11 +404,7 @@ in_line_eoln(MACRO_PROT_ARGS)
 
        for (;;) {
                la = *pos;
-               w = man_args(m, line, pos, buf, &p);
-
-               if (-1 == w)
-                       return(0);
-               if (0 == w)
+               if ( ! man_args(m, line, pos, buf, &p))
                        break;
                if ( ! man_word_alloc(m, line, la, p))
                        return(0);
@@ -445,6 +428,9 @@ in_line_eoln(MACRO_PROT_ARGS)
                assert( ! (MAN_SCOPED & man_macros[tok].flags));
                m->flags |= MAN_ILINE;
        }
+
+       assert(MAN_ROOT != m->last->type);
+       m->next = MAN_NEXT_SIBLING;
        
        /*
         * Rewind our element scope.  Note that when TH is pruned, we'll
@@ -470,9 +456,6 @@ in_line_eoln(MACRO_PROT_ARGS)
        if (m->last->type != MAN_ROOT && ! man_valid_post(m))
                return(0);
 
-       m->next = MAN_ROOT == m->last->type ?
-               MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
-
        return(1);
 }
 
@@ -484,3 +467,18 @@ man_macroend(struct man *m)
        return(man_unscope(m, m->first, MANDOCERR_SCOPEEXIT));
 }
 
+static int
+man_args(struct man *m, int line, int *pos, char *buf, char **v)
+{
+       char     *start;
+
+       assert(*pos);
+       *v = start = buf + *pos;
+       assert(' ' != *start);
+
+       if ('\0' == *start)
+               return(0);
+
+       *v = mandoc_getarg(m->parse, v, line, pos);
+       return(1);
+}