version 1.16, 2009/06/17 14:14:51 |
version 1.22, 2009/07/06 11:14:03 |
|
|
|
|
#include "libmdoc.h" |
#include "libmdoc.h" |
|
|
enum mwarn { |
|
WBADSEC, |
|
WNOWIDTH, |
|
WBADDATE |
|
}; |
|
|
|
enum merr { |
enum merr { |
|
EBADDATE, |
|
ENOWIDTH, |
|
EBADSEC, |
ETOOLONG, |
ETOOLONG, |
EMALLOC, |
EMALLOC, |
|
EUTSNAME, |
ENUMFMT |
ENUMFMT |
}; |
}; |
|
|
|
|
int (*post)(POST_ARGS); |
int (*post)(POST_ARGS); |
}; |
}; |
|
|
static int pwarn(struct mdoc *, int, int, enum mwarn); |
static int perr(struct mdoc *, int, int, enum merr, int); |
static int perr(struct mdoc *, int, int, enum merr); |
|
static int concat(struct mdoc *, const struct mdoc_node *, |
static int concat(struct mdoc *, const struct mdoc_node *, |
char *, size_t); |
char *, size_t); |
|
|
Line 67 static int post_std(POST_ARGS); |
|
Line 64 static int post_std(POST_ARGS); |
|
static int pre_bd(PRE_ARGS); |
static int pre_bd(PRE_ARGS); |
static int pre_dl(PRE_ARGS); |
static int pre_dl(PRE_ARGS); |
|
|
#define vwarn(m, t) pwarn((m), (m)->last->line, (m)->last->pos, (t)) |
#define vwarn(m, t) perr((m), (m)->last->line, (m)->last->pos, (t), 0) |
#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t)) |
#define verr(m, t) perr((m), (m)->last->line, (m)->last->pos, (t), 1) |
#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t)) |
#define nerr(m, n, t) perr((m), (n)->line, (n)->pos, (t), 1) |
|
|
const struct actions mdoc_actions[MDOC_MAX] = { |
const struct actions mdoc_actions[MDOC_MAX] = { |
{ NULL, NULL }, /* Ap */ |
{ NULL, NULL }, /* Ap */ |
Line 89 const struct actions mdoc_actions[MDOC_MAX] = { |
|
Line 86 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 260 concat(struct mdoc *m, const struct mdoc_node *n, |
|
Line 257 concat(struct mdoc *m, const struct mdoc_node *n, |
|
|
|
|
|
static int |
static int |
perr(struct mdoc *m, int line, int pos, enum merr type) |
perr(struct mdoc *m, int line, int pos, enum merr type, int iserr) |
{ |
{ |
char *p; |
char *p; |
|
|
p = NULL; |
p = NULL; |
|
|
switch (type) { |
switch (type) { |
case (ENUMFMT): |
case (ENUMFMT): |
p = "bad number format"; |
p = "bad number format"; |
Line 272 perr(struct mdoc *m, int line, int pos, enum merr type |
|
Line 270 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; |
} |
case (EBADSEC): |
assert(p); |
|
return(mdoc_perr(m, line, pos, p)); |
|
} |
|
|
|
|
|
static int |
|
pwarn(struct mdoc *m, int line, int pos, enum mwarn type) |
|
{ |
|
char *p; |
|
int c; |
|
|
|
p = NULL; |
|
c = WARN_SYNTAX; |
|
switch (type) { |
|
case (WBADSEC): |
|
p = "inappropriate document section in manual section"; |
p = "inappropriate document section in manual section"; |
c = WARN_COMPAT; |
|
break; |
break; |
case (WNOWIDTH): |
case (ENOWIDTH): |
p = "cannot determine default width"; |
p = "cannot determine default width"; |
break; |
break; |
case (WBADDATE): |
case (EBADDATE): |
p = "malformed date syntax"; |
p = "malformed date syntax"; |
break; |
break; |
} |
} |
|
|
assert(p); |
assert(p); |
return(mdoc_pwarn(m, line, pos, c, p)); |
if (iserr) |
|
return(mdoc_perr(m, line, pos, p)); |
|
|
|
return(mdoc_pwarn(m, line, pos, p)); |
} |
} |
|
|
|
|
Line 387 post_sh(POST_ARGS) |
|
Line 376 post_sh(POST_ARGS) |
|
case (9): |
case (9): |
break; |
break; |
default: |
default: |
return(vwarn(m, WBADSEC)); |
return(vwarn(m, EBADSEC)); |
} |
} |
break; |
break; |
default: |
default: |
Line 505 post_os(POST_ARGS) |
|
Line 494 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 550 post_bl_tagwidth(struct mdoc *m) |
|
Line 539 post_bl_tagwidth(struct mdoc *m) |
|
if (n) { |
if (n) { |
if (MDOC_TEXT != n->type) { |
if (MDOC_TEXT != n->type) { |
if (0 == (sz = (int)mdoc_macro2len(n->tok))) |
if (0 == (sz = (int)mdoc_macro2len(n->tok))) |
if ( ! vwarn(m, WNOWIDTH)) |
if ( ! vwarn(m, ENOWIDTH)) |
return(0); |
return(0); |
} else |
} else |
sz = (int)strlen(n->string) + 1; |
sz = (int)strlen(n->string) + 1; |
Line 614 post_bl_width(struct mdoc *m) |
|
Line 603 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))) |
return(vwarn(m, WNOWIDTH)); |
return(vwarn(m, ENOWIDTH)); |
|
|
/* The value already exists: free and reallocate it. */ |
/* The value already exists: free and reallocate it. */ |
|
|
Line 663 post_bl_head(POST_ARGS) |
|
Line 652 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 664 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); |
} |
} |
|
|
Line 775 post_dd(POST_ARGS) |
|
Line 764 post_dd(POST_ARGS) |
|
return(0); |
return(0); |
|
|
if (0 == (m->meta.date = mdoc_atotime(buf))) { |
if (0 == (m->meta.date = mdoc_atotime(buf))) { |
if ( ! vwarn(m, WBADDATE)) |
if ( ! vwarn(m, EBADDATE)) |
return(0); |
return(0); |
m->meta.date = time(NULL); |
m->meta.date = time(NULL); |
} |
} |