Prevent negative arguments to the .ll request from causing integer

[mandoc.git] / man_macro.c

diff --git a/man_macro.c b/man_macro.c
index 9857379656ddcdfd82762e35bbc6069b3f129675..c9ee79ddffb37407440c22b0ba493c3132bb19cd 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,7 +1,7 @@
-/*     $Id: man_macro.c,v 1.85 2014/07/09 11:28:26 schwarze Exp $ */
+/*     $Id: man_macro.c,v 1.90 2014/11/03 23:18:39 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -16,9 +16,9 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include <sys/types.h>
 
 #include <assert.h>
 #include <ctype.h>
@@ -61,15 +61,15 @@ const       struct man_macro __man_macros[MAN_MAX] = {
        { blk_imp, MAN_BSCOPE }, /* P */
        { blk_imp, MAN_BSCOPE }, /* IP */
        { blk_imp, MAN_BSCOPE }, /* HP */
-       { in_line_eoln, MAN_SCOPED }, /* SM */
-       { in_line_eoln, MAN_SCOPED }, /* SB */
+       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* SM */
+       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* SB */
        { in_line_eoln, 0 }, /* BI */
        { in_line_eoln, 0 }, /* IB */
        { in_line_eoln, 0 }, /* BR */
        { in_line_eoln, 0 }, /* RB */
-       { in_line_eoln, MAN_SCOPED }, /* R */
-       { in_line_eoln, MAN_SCOPED }, /* B */
-       { in_line_eoln, MAN_SCOPED }, /* I */
+       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* R */
+       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* B */
+       { in_line_eoln, MAN_SCOPED | MAN_JOIN }, /* I */
        { in_line_eoln, 0 }, /* IR */
        { in_line_eoln, 0 }, /* RI */
        { in_line_eoln, MAN_NSCOPED }, /* na */
@@ -100,28 +100,61 @@ man_unscope(struct man *man, const struct man_node *to)
 {
        struct man_node *n;
 
-       man->next = MAN_NEXT_SIBLING;
        to = to->parent;
        n = man->last;
        while (n != to) {
-               if (NULL == to &&
-                   MAN_BLOCK == n->type &&
-                   0 == (MAN_VALID & n->flags) &&
-                   MAN_EXPLICIT & man_macros[n->tok].flags)
-                       mandoc_msg(MANDOCERR_BLK_NOEND,
-                           man->parse, n->line, n->pos,
-                           man_macronames[n->tok]);
+
+               /* Reached the end of the document? */
+
+               if (to == NULL && ! (n->flags & MAN_VALID)) {
+                       if (man->flags & (MAN_BLINE | MAN_ELINE) &&
+                           man_macros[n->tok].flags & MAN_SCOPED) {
+                               mandoc_vmsg(MANDOCERR_BLK_LINE,
+                                   man->parse, n->line, n->pos,
+                                   "EOF breaks %s",
+                                   man_macronames[n->tok]);
+                               if (man->flags & MAN_ELINE)
+                                       man->flags &= ~MAN_ELINE;
+                               else {
+                                       assert(n->type == MAN_HEAD);
+                                       n = n->parent;
+                                       man->flags &= ~MAN_BLINE;
+                               }
+                               man->last = n;
+                               n = n->parent;
+                               man_node_delete(man, man->last);
+                               continue;
+                       }
+                       if (n->type == MAN_BLOCK &&
+                           man_macros[n->tok].flags & MAN_EXPLICIT)
+                               mandoc_msg(MANDOCERR_BLK_NOEND,
+                                   man->parse, n->line, n->pos,
+                                   man_macronames[n->tok]);
+               }
+
                /*
                 * We might delete the man->last node
                 * in the post-validation phase.
                 * Save a pointer to the parent such that
                 * we know where to continue the iteration.
                 */
+
                man->last = n;
                n = n->parent;
                if ( ! man_valid_post(man))
                        return(0);
        }
+
+       /*
+        * If we ended up at the parent of the node we were
+        * supposed to rewind to, that means the target node
+        * got deleted, so add the next node we parse as a child
+        * of the parent instead of as a sibling of the target.
+        */
+
+       man->next = (man->last == to) ?
+           MAN_NEXT_CHILD : MAN_NEXT_SIBLING;
+
        return(1);
 }
 
@@ -390,7 +423,10 @@ in_line_eoln(MACRO_PROT_ARGS)
                la = *pos;
                if ( ! man_args(man, line, pos, buf, &p))
                        break;
-               if ( ! man_word_alloc(man, line, la, p))
+               if (man_macros[tok].flags & MAN_JOIN &&
+                   man->last->type == MAN_TEXT)
+                       man_word_append(man, p);
+               else if ( ! man_word_alloc(man, line, la, p))
                        return(0);
        }
 
@@ -415,13 +451,6 @@ in_line_eoln(MACRO_PROT_ARGS)
                return(1);
        }
 
-       /* Set ignorable context, if applicable. */
-
-       if (MAN_NSCOPED & man_macros[tok].flags) {
-               assert( ! (MAN_SCOPED & man_macros[tok].flags));
-               man->flags |= MAN_ILINE;
-       }
-
        assert(MAN_ROOT != man->last->type);
        man->next = MAN_NEXT_SIBLING;