version 1.2, 2009/03/23 15:20:51 |
version 1.8, 2009/03/25 21:46:24 |
Line 83 man_free(struct man *man) |
|
Line 83 man_free(struct man *man) |
|
|
|
|
|
struct man * |
struct man * |
man_alloc(void) |
man_alloc(void *data, int pflags, const struct man_cb *cb) |
{ |
{ |
struct man *p; |
struct man *p; |
|
|
|
|
|
|
man_alloc1(p); |
man_alloc1(p); |
|
|
|
if (cb) |
|
(void)memcpy(&p->cb, cb, sizeof(struct man_cb)); |
|
|
p->htab = man_hash_alloc(); |
p->htab = man_hash_alloc(); |
|
p->data = data; |
|
p->pflags = pflags; |
|
|
return(p); |
return(p); |
} |
} |
|
|
|
|
man_endparse(struct man *m) |
man_endparse(struct man *m) |
{ |
{ |
|
|
/* FIXME. */ |
if (MAN_HALT & m->flags) |
return(1); |
return(0); |
|
else if (man_macroend(m)) |
|
return(1); |
|
m->flags |= MAN_HALT; |
|
return(0); |
} |
} |
|
|
|
|
Line 125 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 170 man_node_append(struct man *man, struct man_node *p) |
|
Line 180 man_node_append(struct man *man, struct man_node *p) |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
#if 0 |
|
if ( ! man_valid_pre(man, p)) |
|
return(0); |
|
if ( ! man_action_pre(man, p)) |
|
return(0); |
|
#endif |
|
|
|
man->last = p; |
man->last = p; |
|
|
switch (p->type) { |
switch (p->type) { |
case (MAN_TEXT): |
case (MAN_TEXT): |
#if 0 |
|
if ( ! man_valid_post(man)) |
if ( ! man_valid_post(man)) |
return(0); |
return(0); |
if ( ! man_action_post(man)) |
if ( ! man_action_post(man)) |
return(0); |
return(0); |
#endif |
|
break; |
break; |
default: |
default: |
break; |
break; |
Line 288 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 289 man_pmacro(struct man *m, int ln, char *buf) |
|
i++; |
i++; |
if (0 == buf[i]) |
if (0 == buf[i]) |
return(1); |
return(1); |
warnx("invalid syntax"); |
return(man_vwarn(m, ln, 0, "invalid syntax")); |
return(0); |
|
} |
} |
|
|
if (buf[1] && '\\' == buf[1]) |
if (buf[1] && '\\' == buf[1]) |
Line 308 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 308 man_pmacro(struct man *m, int ln, char *buf) |
|
mac[i - 1] = 0; |
mac[i - 1] = 0; |
|
|
if (i == 5 || i <= 1) { |
if (i == 5 || i <= 1) { |
warnx("unknown macro: %s", mac); |
if ( ! (MAN_IGN_MACRO & m->pflags)) { |
goto err; |
(void)man_verr(m, ln, 1, |
} |
"ill-formed macro: %s", mac); |
|
goto err; |
|
} |
|
if ( ! man_vwarn(m, ln, 1, "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, 1, |
|
"unknown macro: %s", mac); |
|
goto err; |
|
} |
|
if ( ! man_vwarn(m, ln, 1, "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 334 err: /* Error out. */ |
|
Line 346 err: /* Error out. */ |
|
m->flags |= MAN_HALT; |
m->flags |= MAN_HALT; |
return(0); |
return(0); |
} |
} |
|
|
|
|
|
int |
|
man_verr(struct man *man, int ln, int pos, const char *fmt, ...) |
|
{ |
|
char buf[256]; |
|
va_list ap; |
|
|
|
if (NULL == man->cb.man_err) |
|
return(0); |
|
|
|
va_start(ap, fmt); |
|
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
|
va_end(ap); |
|
return((*man->cb.man_err)(man->data, ln, pos, buf)); |
|
} |
|
|
|
|
|
int |
|
man_vwarn(struct man *man, int ln, int pos, const char *fmt, ...) |
|
{ |
|
char buf[256]; |
|
va_list ap; |
|
|
|
if (NULL == man->cb.man_warn) |
|
return(0); |
|
|
|
va_start(ap, fmt); |
|
(void)vsnprintf(buf, sizeof(buf) - 1, fmt, ap); |
|
va_end(ap); |
|
return((*man->cb.man_warn)(man->data, ln, pos, buf)); |
|
} |
|
|
|
|