Fixed inheritence of initial macro into man_macro.

Removed warnxs from man_macro (man_vwarn).

diff --git a/Makefile b/Makefile
index e184349c4aa7b55f3dcd4cb73cdb42fd84d110e5..5dbcd6c15e26297daa2e984d09d56273f8d7ae31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,7 @@ MAINSRCS   = main.c term.c ascii.c terminal.c tree.c compat.c
 LLNS      = llib-llibmdoc.ln llib-llibman.ln llib-lmandoc.ln
 LNS       = $(MAINLNS) $(MDOCLNS) $(MANLNS)
 LIBS      = libmdoc.a libman.a
-OBJS      = $(MDOCOBJS) $(MAINOBJS)
+OBJS      = $(MDOCOBJS) $(MAINOBJS) $(MANOBJS)
 SRCS      = $(MDOCSRCS) $(MAINSRCS) $(MANSRCS)
 DATAS     = arch.in att.in lib.in msec.in st.in vol.in ascii.in
 HEADS     = mdoc.h libmdoc.h man.h libman.h term.h 

diff --git a/man.c b/man.c
index 898abd8e6983774618b7b88fb2b6cfafa2b79ca2..d424570f35c2e6e778caea49793690c8b84aa96d 100644 (file)
--- a/man.c
+++ b/man.c
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.9 2009/03/26 09:55:39 kristaps Exp $ */
+/* $Id: man.c,v 1.10 2009/03/26 11:16:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -275,7 +275,7 @@ man_ptext(struct man *m, int line, char *buf)
 int
 man_pmacro(struct man *m, int ln, char *buf)
 {
-       int               i, j, c;
+       int               i, j, c, ppos;
        char              mac[5];
 
        /* Comments and empties are quickly ignored. */
@@ -293,16 +293,18 @@ man_pmacro(struct man *m, int ln, char *buf)
                        return(1);
        }
 
+       ppos = i;
+
        if (buf[i] && '\\' == buf[i])
                if (buf[i + 1] && '\"' == buf[i + 1])
                        return(1);
 
        /* Copy the first word into a nil-terminated buffer. */
 
-       for (j = 0; j < 4; j++) {
-               if (0 == (mac[j] = buf[j + i]))
+       for (j = 0; j < 4; j++, i++) {
+               if (0 == (mac[j] = buf[i]))
                        break;
-               else if (' ' == buf[j + i])
+               else if (' ' == buf[i])
                        break;
        }
 
@@ -310,22 +312,24 @@ man_pmacro(struct man *m, int ln, char *buf)
 
        if (j == 4 || j < 1) {
                if ( ! (MAN_IGN_MACRO & m->pflags)) {
-                       (void)man_verr(m, ln, i, 
+                       (void)man_verr(m, ln, ppos, 
                                "ill-formed macro: %s", mac);
                        goto err;
                } 
-               if ( ! man_vwarn(m, ln, 0, "ill-formed macro: %s", mac))
+               if ( ! man_vwarn(m, ln, ppos, 
+                               "ill-formed macro: %s", mac))
                        goto err;
                return(1);
        }
        
        if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
                if ( ! (MAN_IGN_MACRO & m->pflags)) {
-                       (void)man_verr(m, ln, i, 
+                       (void)man_verr(m, ln, ppos, 
                                "unknown macro: %s", mac);
                        goto err;
                } 
-               if ( ! man_vwarn(m, ln, i, "unknown macro: %s", mac))
+               if ( ! man_vwarn(m, ln, ppos, 
+                               "unknown macro: %s", mac))
                        goto err;
                return(1);
        }
@@ -337,7 +341,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 
        /* Begin recursive parse sequence. */
 
-       if ( ! man_macro(m, c, ln, 1, &i, buf))
+       if ( ! man_macro(m, c, ln, ppos, &i, buf))
                goto err;
 
        return(1);

diff --git a/man_macro.c b/man_macro.c
index 7121e490e64ab4fb721e9f7b6a23fa4bfa14d972..70b3a912ee24cd45028767004e9ad5f38b202e87 100644 (file)
--- a/man_macro.c
+++ b/man_macro.c
@@ -1,4 +1,4 @@
-/* $Id: man_macro.c,v 1.7 2009/03/25 16:07:36 kristaps Exp $ */
+/* $Id: man_macro.c,v 1.8 2009/03/26 11:16:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -18,7 +18,6 @@
  */
 #include <assert.h>
 #include <ctype.h>
-#include <err.h> /* XXX */
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -113,7 +112,7 @@ man_macroend(struct man *m)
 
 /* ARGSUSED */
 static int
-man_args(struct man *man, int line, 
+man_args(struct man *m, int line, 
                int *pos, char *buf, char **v)
 {
 
@@ -146,8 +145,10 @@ man_args(struct man *man, int line,
                if (buf[*pos])
                        return(1);
 
-               warnx("tail whitespace");
-               return(-1);
+               if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+                       return(-1);
+
+               return(1);
        }
 
        /*
@@ -162,8 +163,9 @@ man_args(struct man *man, int line,
                (*pos)++;
 
        if (0 == buf[*pos]) {
-               warnx("unterminated quotation");
-               return(-1);
+               if ( ! man_vwarn(m, line, *pos, "unterminated quote"))
+                       return(-1);
+               return(1);
        }
 
        buf[(*pos)++] = 0;
@@ -176,6 +178,7 @@ man_args(struct man *man, int line,
        if (buf[*pos])
                return(1);
 
-       warnx("tail whitespace");
-       return(-1);
+       if ( ! man_vwarn(m, line, *pos, "trailing spaces"))
+               return(-1);
+       return(1);
 }