summaryrefslogtreecommitdiffstats
path: root/man.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2009-03-26 11:16:21 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2009-03-26 11:16:21 +0000
commit85e36c433929ad75eea12adc0e68cab5fdca3f1d (patch)
treec7b563cb2460da8d637536e9354b7cbd34298ccb /man.c
parent35f2108111d8f83fc25edd4c460e0f37db93901b (diff)
downloadmandoc-85e36c433929ad75eea12adc0e68cab5fdca3f1d.tar.gz
Fixed inheritence of initial macro into man_macro.
Removed warnxs from man_macro (man_vwarn).
Diffstat (limited to 'man.c')
-rw-r--r--man.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/man.c b/man.c
index ae5c9d13..45fada80 100644
--- a/man.c
+++ b/man.c
@@ -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);