version 1.172, 2011/07/26 14:09:01 |
version 1.175, 2011/08/19 13:59:23 |
Line 72 static void check_text(struct mdoc *, int, int, char |
|
Line 72 static void check_text(struct mdoc *, int, int, char |
|
static void check_argv(struct mdoc *, |
static void check_argv(struct mdoc *, |
struct mdoc_node *, struct mdoc_argv *); |
struct mdoc_node *, struct mdoc_argv *); |
static void check_args(struct mdoc *, struct mdoc_node *); |
static void check_args(struct mdoc *, struct mdoc_node *); |
|
static int concat(char *, const struct mdoc_node *, size_t); |
static int concat(struct mdoc *, char *, |
|
const struct mdoc_node *, size_t); |
|
static enum mdoc_sec a2sec(const char *); |
static enum mdoc_sec a2sec(const char *); |
static size_t macro2len(enum mdoct); |
static size_t macro2len(enum mdoct); |
|
|
Line 705 pre_bl(PRE_ARGS) |
|
Line 703 pre_bl(PRE_ARGS) |
|
if (LIST_column == lt) { |
if (LIST_column == lt) { |
n->norm->Bl.ncols = |
n->norm->Bl.ncols = |
n->args->argv[i].sz; |
n->args->argv[i].sz; |
n->norm->Bl.cols = (const char **) |
n->norm->Bl.cols = (void *) |
n->args->argv[i].value; |
n->args->argv[i].value; |
} |
} |
} |
} |
|
|
post_nm(POST_ARGS) |
post_nm(POST_ARGS) |
{ |
{ |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
|
int c; |
|
|
/* If no child specified, make sure we have the meta name. */ |
/* If no child specified, make sure we have the meta name. */ |
|
|
Line 1118 post_nm(POST_ARGS) |
|
Line 1117 post_nm(POST_ARGS) |
|
|
|
/* If no meta name, set it from the child. */ |
/* If no meta name, set it from the child. */ |
|
|
if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ)) |
buf[0] = '\0'; |
|
if (-1 == (c = concat(buf, mdoc->last->child, BUFSIZ))) { |
|
mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM); |
return(0); |
return(0); |
|
} |
|
|
|
assert(c); |
mdoc->meta.name = mandoc_strdup(buf); |
mdoc->meta.name = mandoc_strdup(buf); |
|
|
return(1); |
return(1); |
} |
} |
|
|
Line 1393 post_bl_block_width(POST_ARGS) |
|
Line 1395 post_bl_block_width(POST_ARGS) |
|
|
|
assert(i < (int)n->args->argc); |
assert(i < (int)n->args->argc); |
|
|
snprintf(buf, NUMSIZ, "%zun", width); |
snprintf(buf, NUMSIZ, "%un", (unsigned int)width); |
free(n->args->argv[i].value[0]); |
free(n->args->argv[i].value[0]); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
n->args->argv[i].value[0] = mandoc_strdup(buf); |
|
|
Line 1443 post_bl_block_tag(POST_ARGS) |
|
Line 1445 post_bl_block_tag(POST_ARGS) |
|
|
|
/* Defaults to ten ens. */ |
/* Defaults to ten ens. */ |
|
|
snprintf(buf, NUMSIZ, "%zun", sz); |
snprintf(buf, NUMSIZ, "%un", (unsigned int)sz); |
|
|
/* |
/* |
* We have to dynamically add this to the macro's argument list. |
* We have to dynamically add this to the macro's argument list. |
Line 1519 post_bl_head(POST_ARGS) |
|
Line 1521 post_bl_head(POST_ARGS) |
|
((size_t)mdoc->last->nchild * sizeof(char *)); |
((size_t)mdoc->last->nchild * sizeof(char *)); |
|
|
mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; |
mdoc->last->norm->Bl.ncols = np->args->argv[j].sz; |
mdoc->last->norm->Bl.cols = (const char **)np->args->argv[j].value; |
mdoc->last->norm->Bl.cols = (void *)np->args->argv[j].value; |
|
|
for (i = 0, nn = mdoc->last->child; nn; i++) { |
for (i = 0, nn = mdoc->last->child; nn; i++) { |
np->args->argv[j].value[i] = nn->string; |
np->args->argv[j].value[i] = nn->string; |
Line 1818 post_sh_head(POST_ARGS) |
|
Line 1820 post_sh_head(POST_ARGS) |
|
{ |
{ |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
enum mdoc_sec sec; |
enum mdoc_sec sec; |
|
int c; |
|
|
/* |
/* |
* Process a new section. Sections are either "named" or |
* Process a new section. Sections are either "named" or |
Line 1826 post_sh_head(POST_ARGS) |
|
Line 1829 post_sh_head(POST_ARGS) |
|
* manual sections. |
* manual sections. |
*/ |
*/ |
|
|
if ( ! concat(mdoc, buf, mdoc->last->child, BUFSIZ)) |
sec = SEC_CUSTOM; |
|
buf[0] = '\0'; |
|
if (-1 == (c = concat(buf, mdoc->last->child, BUFSIZ))) { |
|
mdoc_nmsg(mdoc, mdoc->last->child, MANDOCERR_MEM); |
return(0); |
return(0); |
|
} else if (1 == c) |
|
sec = a2sec(buf); |
|
|
sec = a2sec(buf); |
|
|
|
/* The NAME should be first. */ |
/* The NAME should be first. */ |
|
|
if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed) |
if (SEC_NAME != sec && SEC_NONE == mdoc->lastnamed) |
Line 1978 post_dd(POST_ARGS) |
|
Line 1984 post_dd(POST_ARGS) |
|
{ |
{ |
char buf[DATESIZE]; |
char buf[DATESIZE]; |
struct mdoc_node *n; |
struct mdoc_node *n; |
|
int c; |
|
|
if (mdoc->meta.date) |
if (mdoc->meta.date) |
free(mdoc->meta.date); |
free(mdoc->meta.date); |
Line 1989 post_dd(POST_ARGS) |
|
Line 1996 post_dd(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
if ( ! concat(mdoc, buf, n->child, DATESIZE)) |
buf[0] = '\0'; |
|
if (-1 == (c = concat(buf, n->child, DATESIZE))) { |
|
mdoc_nmsg(mdoc, n->child, MANDOCERR_MEM); |
return(0); |
return(0); |
|
} |
|
|
|
assert(c); |
mdoc->meta.date = mandoc_normdate |
mdoc->meta.date = mandoc_normdate |
(mdoc->parse, buf, n->line, n->pos); |
(mdoc->parse, buf, n->line, n->pos); |
|
|
Line 2146 post_os(POST_ARGS) |
|
Line 2157 post_os(POST_ARGS) |
|
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
char buf[BUFSIZ]; |
char buf[BUFSIZ]; |
|
int c; |
#ifndef OSNAME |
#ifndef OSNAME |
struct utsname utsname; |
struct utsname utsname; |
#endif |
#endif |
Line 2162 post_os(POST_ARGS) |
|
Line 2174 post_os(POST_ARGS) |
|
if (mdoc->meta.os) |
if (mdoc->meta.os) |
free(mdoc->meta.os); |
free(mdoc->meta.os); |
|
|
if ( ! concat(mdoc, buf, n->child, BUFSIZ)) |
buf[0] = '\0'; |
|
if (-1 == (c = concat(buf, n->child, BUFSIZ))) { |
|
mdoc_nmsg(mdoc, n->child, MANDOCERR_MEM); |
return(0); |
return(0); |
|
} |
|
|
|
assert(c); |
|
|
/* XXX: yes, these can all be dynamically-adjusted buffers, but |
/* XXX: yes, these can all be dynamically-adjusted buffers, but |
* it's really not worth the extra hackery. |
* it's really not worth the extra hackery. |
*/ |
*/ |
Line 2230 post_std(POST_ARGS) |
|
Line 2247 post_std(POST_ARGS) |
|
return(1); |
return(1); |
} |
} |
|
|
|
/* |
|
* Concatenate a node, stopping at the first non-text. |
|
* Concatenation is separated by a single whitespace. |
|
* Returns -1 on fatal (string overrun) error, 0 if child nodes were |
|
* encountered, 1 otherwise. |
|
*/ |
static int |
static int |
concat(struct mdoc *m, char *p, const struct mdoc_node *n, size_t sz) |
concat(char *p, const struct mdoc_node *n, size_t sz) |
{ |
{ |
|
|
p[0] = '\0'; |
for ( ; NULL != n; n = n->next) { |
|
if (MDOC_TEXT != n->type) |
/* |
|
* Concatenate sibling nodes together. All siblings must be of |
|
* type MDOC_TEXT or an assertion is raised. Concatenation is |
|
* separated by a single whitespace. Returns 0 on fatal (string |
|
* overrun) error. |
|
*/ |
|
|
|
for ( ; n; n = n->next) { |
|
assert(MDOC_TEXT == n->type); |
|
|
|
if (strlcat(p, n->string, sz) >= sz) { |
|
mdoc_nmsg(m, n, MANDOCERR_MEM); |
|
return(0); |
return(0); |
} |
if ('\0' != p[0] && strlcat(p, " ", sz) >= sz) |
|
return(-1); |
if (NULL == n->next) |
if (strlcat(p, n->string, sz) >= sz) |
continue; |
return(-1); |
|
concat(p, n->child, sz); |
if (strlcat(p, " ", sz) >= sz) { |
|
mdoc_nmsg(m, n, MANDOCERR_MEM); |
|
return(0); |
|
} |
|
} |
} |
|
|
return(1); |
return(1); |