version 1.5, 2009/03/25 15:36:05 |
version 1.10, 2009/03/26 11:16:21 |
Line 83 man_free(struct man *man) |
|
Line 83 man_free(struct man *man) |
|
|
|
|
|
struct man * |
struct man * |
man_alloc(void *data, const struct man_cb *cb) |
man_alloc(void *data, int pflags, const struct man_cb *cb) |
{ |
{ |
struct man *p; |
struct man *p; |
|
|
Line 98 man_alloc(void *data, const struct man_cb *cb) |
|
Line 98 man_alloc(void *data, const struct man_cb *cb) |
|
|
|
p->htab = man_hash_alloc(); |
p->htab = man_hash_alloc(); |
p->data = data; |
p->data = data; |
|
p->pflags = pflags; |
|
|
return(p); |
return(p); |
} |
} |
|
|
Line 133 man_free1(struct man *man) |
|
Line 135 man_free1(struct man *man) |
|
man_node_freelist(man->first); |
man_node_freelist(man->first); |
if (man->meta.title) |
if (man->meta.title) |
free(man->meta.title); |
free(man->meta.title); |
if (man->meta.os) |
if (man->meta.source) |
free(man->meta.os); |
free(man->meta.source); |
if (man->meta.vol) |
if (man->meta.vol) |
free(man->meta.vol); |
free(man->meta.vol); |
} |
} |
Line 273 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, 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 281 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 283 man_pmacro(struct man *m, int ln, char *buf) |
|
if (0 == buf[1]) |
if (0 == buf[1]) |
return(1); |
return(1); |
|
|
if (' ' == buf[1]) { |
i = 1; |
i = 2; |
|
|
if (' ' == buf[i]) { |
|
i++; |
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
if (0 == buf[i]) |
if (0 == buf[i]) |
return(1); |
return(1); |
warnx("invalid syntax"); |
|
return(0); |
|
} |
} |
|
|
if (buf[1] && '\\' == buf[1]) |
ppos = i; |
if (buf[2] && '\"' == buf[2]) |
|
|
if (buf[i] && '\\' == buf[i]) |
|
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 (i = 1; i < 5; i++) { |
for (j = 0; j < 4; j++, i++) { |
if (0 == (mac[i - 1] = buf[i])) |
if (0 == (mac[j] = buf[i])) |
break; |
break; |
else if (' ' == buf[i]) |
else if (' ' == buf[i]) |
break; |
break; |
} |
} |
|
|
mac[i - 1] = 0; |
mac[j] = 0; |
|
|
if (i == 5 || i <= 1) { |
if (j == 4 || j < 1) { |
warnx("unknown macro: %s", mac); |
if ( ! (MAN_IGN_MACRO & m->pflags)) { |
goto err; |
(void)man_verr(m, ln, ppos, |
} |
"ill-formed macro: %s", mac); |
|
goto err; |
|
} |
|
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_MAX == (c = man_hash_find(m->htab, mac))) { |
warnx("unknown macro: %s", mac); |
if ( ! (MAN_IGN_MACRO & m->pflags)) { |
goto err; |
(void)man_verr(m, ln, ppos, |
|
"unknown macro: %s", mac); |
|
goto err; |
|
} |
|
if ( ! man_vwarn(m, ln, ppos, |
|
"unknown macro: %s", mac)) |
|
goto err; |
|
return(1); |
} |
} |
|
|
/* The macro is sane. Jump to the next word. */ |
/* The macro is sane. Jump to the next word. */ |
Line 323 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); |