Correctly catch `Vt' semicolon in mandoc-db.

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 979232c9e7ce32616b7fd09c03c253a58eb2ffd8..915648b4309f7d2f8cab909ad06b793ae3eb1fcb 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/*     $Id: man_macro.c,v 1.56 2011/03/17 11:56:17 kristaps Exp $ */
+/*     $Id: man_macro.c,v 1.62 2011/04/19 16:38:48 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -23,7 +23,9 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "man.h"
 #include "mandoc.h"
+#include "libmandoc.h"
 #include "libman.h"
 
 enum   rew {
@@ -36,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);
@@ -294,7 +298,7 @@ blk_close(MACRO_PROT_ARGS)
 int
 blk_exp(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
 
        /* 
@@ -315,13 +319,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);
        }
@@ -346,7 +345,7 @@ blk_exp(MACRO_PROT_ARGS)
 int
 blk_imp(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
        struct man_node *n;
 
@@ -370,13 +369,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);
        }
@@ -404,7 +398,7 @@ blk_imp(MACRO_PROT_ARGS)
 int
 in_line_eoln(MACRO_PROT_ARGS)
 {
-       int              w, la;
+       int              la;
        char            *p;
        struct man_node *n;
 
@@ -415,11 +409,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);
@@ -482,3 +472,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);
+}