version 1.9, 2009/03/26 09:55:39 |
version 1.10, 2009/03/26 11:16:21 |
Line 275 man_ptext(struct man *m, int line, char *buf) |
|
Line 275 man_ptext(struct man *m, int line, char *buf) |
|
int |
int |
man_pmacro(struct man *m, int ln, char *buf) |
man_pmacro(struct man *m, int ln, char *buf) |
{ |
{ |
int i, j, c; |
int i, j, c, ppos; |
char mac[5]; |
char mac[5]; |
|
|
/* Comments and empties are quickly ignored. */ |
/* Comments and empties are quickly ignored. */ |
Line 293 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 293 man_pmacro(struct man *m, int ln, char *buf) |
|
return(1); |
return(1); |
} |
} |
|
|
|
ppos = i; |
|
|
if (buf[i] && '\\' == buf[i]) |
if (buf[i] && '\\' == buf[i]) |
if (buf[i + 1] && '\"' == buf[i + 1]) |
if (buf[i + 1] && '\"' == buf[i + 1]) |
return(1); |
return(1); |
|
|
/* Copy the first word into a nil-terminated buffer. */ |
/* Copy the first word into a nil-terminated buffer. */ |
|
|
for (j = 0; j < 4; j++) { |
for (j = 0; j < 4; j++, i++) { |
if (0 == (mac[j] = buf[j + i])) |
if (0 == (mac[j] = buf[i])) |
break; |
break; |
else if (' ' == buf[j + i]) |
else if (' ' == buf[i]) |
break; |
break; |
} |
} |
|
|
Line 310 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 312 man_pmacro(struct man *m, int ln, char *buf) |
|
|
|
if (j == 4 || j < 1) { |
if (j == 4 || j < 1) { |
if ( ! (MAN_IGN_MACRO & m->pflags)) { |
if ( ! (MAN_IGN_MACRO & m->pflags)) { |
(void)man_verr(m, ln, i, |
(void)man_verr(m, ln, ppos, |
"ill-formed macro: %s", mac); |
"ill-formed macro: %s", mac); |
goto err; |
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; |
goto err; |
return(1); |
return(1); |
} |
} |
|
|
if (MAN_MAX == (c = man_hash_find(m->htab, mac))) { |
if (MAN_MAX == (c = man_hash_find(m->htab, mac))) { |
if ( ! (MAN_IGN_MACRO & m->pflags)) { |
if ( ! (MAN_IGN_MACRO & m->pflags)) { |
(void)man_verr(m, ln, i, |
(void)man_verr(m, ln, ppos, |
"unknown macro: %s", mac); |
"unknown macro: %s", mac); |
goto err; |
goto err; |
} |
} |
if ( ! man_vwarn(m, ln, i, "unknown macro: %s", mac)) |
if ( ! man_vwarn(m, ln, ppos, |
|
"unknown macro: %s", mac)) |
goto err; |
goto err; |
return(1); |
return(1); |
} |
} |
Line 337 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 341 man_pmacro(struct man *m, int ln, char *buf) |
|
|
|
/* Begin recursive parse sequence. */ |
/* Begin recursive parse sequence. */ |
|
|
if ( ! man_macro(m, c, ln, 1, &i, buf)) |
if ( ! man_macro(m, c, ln, ppos, &i, buf)) |
goto err; |
goto err; |
|
|
return(1); |
return(1); |