version 1.16, 2009/06/17 14:14:51 |
version 1.20, 2009/06/25 08:42:06 |
|
|
enum merr { |
enum merr { |
ETOOLONG, |
ETOOLONG, |
EMALLOC, |
EMALLOC, |
|
EUTSNAME, |
ENUMFMT |
ENUMFMT |
}; |
}; |
|
|
Line 89 const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 90 const struct actions mdoc_actions[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* Ad */ |
{ NULL, NULL }, /* An */ |
{ NULL, NULL }, /* An */ |
{ NULL, post_ar }, /* Ar */ |
{ NULL, post_ar }, /* Ar */ |
{ NULL, NULL }, /* Cd */ |
{ NULL, NULL }, /* Cd */ /* FIXME: tabs are accepted! */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Cm */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Dv */ |
{ NULL, NULL }, /* Er */ |
{ NULL, NULL }, /* Er */ |
Line 272 perr(struct mdoc *m, int line, int pos, enum merr type |
|
Line 273 perr(struct mdoc *m, int line, int pos, enum merr type |
|
case (ETOOLONG): |
case (ETOOLONG): |
p = "argument text too long"; |
p = "argument text too long"; |
break; |
break; |
|
case (EUTSNAME): |
|
p = "utsname"; |
|
break; |
case (EMALLOC): |
case (EMALLOC): |
p = "memory exhausted"; |
p = "memory exhausted"; |
break; |
break; |
Line 505 post_os(POST_ARGS) |
|
Line 509 post_os(POST_ARGS) |
|
|
|
if (0 == buf[0]) { |
if (0 == buf[0]) { |
if (-1 == uname(&utsname)) |
if (-1 == uname(&utsname)) |
return(mdoc_err(m, "utsname")); |
return(verr(m, EUTSNAME)); |
if (strlcat(buf, utsname.sysname, 64) >= 64) |
if (strlcat(buf, utsname.sysname, 64) >= 64) |
return(verr(m, ETOOLONG)); |
return(verr(m, ETOOLONG)); |
if (strlcat(buf, " ", 64) >= 64) |
if (strlcat(buf, " ", 64) >= 64) |
Line 614 post_bl_width(struct mdoc *m) |
|
Line 618 post_bl_width(struct mdoc *m) |
|
*/ |
*/ |
|
|
if (0 == strcmp(p, "Ds")) |
if (0 == strcmp(p, "Ds")) |
width = 8; |
width = 6; |
else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p))) |
else if (MDOC_MAX == (tok = mdoc_hash_find(m->htab, p))) |
return(1); |
return(1); |
else if (0 == (width = mdoc_macro2len(tok))) |
else if (0 == (width = mdoc_macro2len(tok))) |
Line 663 post_bl_head(POST_ARGS) |
|
Line 667 post_bl_head(POST_ARGS) |
|
* column field. Then, delete the head children. |
* column field. Then, delete the head children. |
*/ |
*/ |
|
|
for (i = 0, nn = m->last->child; nn; nn = nn->next, i++) |
n->args->argv[c].sz = (size_t)m->last->nchild; |
/* Count children. */; |
n->args->argv[c].value = malloc |
|
((size_t)m->last->nchild * sizeof(char *)); |
|
|
n->args->argv[c].sz = (size_t)i; |
|
n->args->argv[c].value = malloc((size_t)i * sizeof(char *)); |
|
|
|
for (i = 0, nn = m->last->child; nn; i++) { |
for (i = 0, nn = m->last->child; nn; i++) { |
n->args->argv[c].value[i] = nn->string; |
n->args->argv[c].value[i] = nn->string; |
nn->string = NULL; |
nn->string = NULL; |
Line 677 post_bl_head(POST_ARGS) |
|
Line 679 post_bl_head(POST_ARGS) |
|
mdoc_node_free(nnp); |
mdoc_node_free(nnp); |
} |
} |
|
|
|
m->last->nchild = 0; |
m->last->child = NULL; |
m->last->child = NULL; |
|
|
return(1); |
return(1); |
} |
} |
|
|