version 1.47, 2010/01/01 17:14:27 |
version 1.54, 2010/03/24 20:10:53 |
Line 35 const char *const __man_merrnames[WERRMAX] = { |
|
Line 35 const char *const __man_merrnames[WERRMAX] = { |
|
"invalid manual section", /* WMSEC */ |
"invalid manual section", /* WMSEC */ |
"invalid date format", /* WDATE */ |
"invalid date format", /* WDATE */ |
"scope of prior line violated", /* WLNSCOPE */ |
"scope of prior line violated", /* WLNSCOPE */ |
|
"over-zealous prior line scope violation", /* WLNSCOPE2 */ |
"trailing whitespace", /* WTSPACE */ |
"trailing whitespace", /* WTSPACE */ |
"unterminated quoted parameter", /* WTQUOTE */ |
"unterminated quoted parameter", /* WTQUOTE */ |
"document has no body", /* WNODATA */ |
"document has no body", /* WNODATA */ |
Line 48 const char *const __man_merrnames[WERRMAX] = { |
|
Line 49 const char *const __man_merrnames[WERRMAX] = { |
|
"scope open on exit", /* WEXITSCOPE */ |
"scope open on exit", /* WEXITSCOPE */ |
"no scope context", /* WNOSCOPE */ |
"no scope context", /* WNOSCOPE */ |
"literal context already open", /* WOLITERAL */ |
"literal context already open", /* WOLITERAL */ |
"no literal context open" /* WNLITERAL */ |
"no literal context open", /* WNLITERAL */ |
|
"invalid nesting of roff declarations", /* WROFFNEST */ |
}; |
}; |
|
|
const char *const __man_macronames[MAN_MAX] = { |
const char *const __man_macronames[MAN_MAX] = { |
Line 59 const char *const __man_macronames[MAN_MAX] = { |
|
Line 61 const char *const __man_macronames[MAN_MAX] = { |
|
"R", "B", "I", "IR", |
"R", "B", "I", "IR", |
"RI", "na", "i", "sp", |
"RI", "na", "i", "sp", |
"nf", "fi", "r", "RE", |
"nf", "fi", "r", "RE", |
"RS", "DT", "UC", "PD" |
"RS", "DT", "UC", "PD", |
|
"Sp", "Vb", "Ve", "de", |
|
"dei", "am", "ami", "ig", |
|
".", |
}; |
}; |
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
|
|
static struct man_node *man_node_alloc(int, int, |
static struct man_node *man_node_alloc(int, int, |
enum man_type, int); |
enum man_type, enum mant); |
static int man_node_append(struct man *, |
static int man_node_append(struct man *, |
struct man_node *); |
struct man_node *); |
|
static void man_node_free(struct man_node *); |
|
static void man_node_unlink(struct man *, |
|
struct man_node *); |
static int man_ptext(struct man *, int, char *); |
static int man_ptext(struct man *, int, char *); |
static int man_pmacro(struct man *, int, char *); |
static int man_pmacro(struct man *, int, char *); |
static void man_free1(struct man *); |
static void man_free1(struct man *); |
Line 158 man_free1(struct man *man) |
|
Line 166 man_free1(struct man *man) |
|
{ |
{ |
|
|
if (man->first) |
if (man->first) |
man_node_freelist(man->first); |
man_node_delete(man, man->first); |
if (man->meta.title) |
if (man->meta.title) |
free(man->meta.title); |
free(man->meta.title); |
if (man->meta.source) |
if (man->meta.source) |
Line 177 man_alloc1(struct man *m) |
|
Line 185 man_alloc1(struct man *m) |
|
m->last = mandoc_calloc(1, sizeof(struct man_node)); |
m->last = mandoc_calloc(1, sizeof(struct man_node)); |
m->first = m->last; |
m->first = m->last; |
m->last->type = MAN_ROOT; |
m->last->type = MAN_ROOT; |
|
m->last->tok = MAN_MAX; |
m->next = MAN_NEXT_CHILD; |
m->next = MAN_NEXT_CHILD; |
} |
} |
|
|
Line 204 man_node_append(struct man *man, struct man_node *p) |
|
Line 213 man_node_append(struct man *man, struct man_node *p) |
|
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
|
|
assert(p->parent); |
p->parent->nchild++; |
p->parent->nchild++; |
|
|
if ( ! man_valid_pre(man, p)) |
if ( ! man_valid_pre(man, p)) |
Line 240 man_node_append(struct man *man, struct man_node *p) |
|
Line 250 man_node_append(struct man *man, struct man_node *p) |
|
|
|
|
|
static struct man_node * |
static struct man_node * |
man_node_alloc(int line, int pos, enum man_type type, int tok) |
man_node_alloc(int line, int pos, enum man_type type, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
Line 254 man_node_alloc(int line, int pos, enum man_type type, |
|
Line 264 man_node_alloc(int line, int pos, enum man_type type, |
|
|
|
|
|
int |
int |
man_elem_alloc(struct man *m, int line, int pos, int tok) |
man_elem_alloc(struct man *m, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
Line 267 man_elem_alloc(struct man *m, int line, int pos, int t |
|
Line 277 man_elem_alloc(struct man *m, int line, int pos, int t |
|
|
|
|
|
int |
int |
man_head_alloc(struct man *m, int line, int pos, int tok) |
man_head_alloc(struct man *m, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
Line 280 man_head_alloc(struct man *m, int line, int pos, int t |
|
Line 290 man_head_alloc(struct man *m, int line, int pos, int t |
|
|
|
|
|
int |
int |
man_body_alloc(struct man *m, int line, int pos, int tok) |
man_body_alloc(struct man *m, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
Line 293 man_body_alloc(struct man *m, int line, int pos, int t |
|
Line 303 man_body_alloc(struct man *m, int line, int pos, int t |
|
|
|
|
|
int |
int |
man_block_alloc(struct man *m, int line, int pos, int tok) |
man_block_alloc(struct man *m, int line, int pos, enum mant tok) |
{ |
{ |
struct man_node *p; |
struct man_node *p; |
|
|
Line 312 pstring(struct man *m, int line, int pos, |
|
Line 322 pstring(struct man *m, int line, int pos, |
|
struct man_node *n; |
struct man_node *n; |
size_t sv; |
size_t sv; |
|
|
n = man_node_alloc(line, pos, MAN_TEXT, -1); |
n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX); |
n->string = mandoc_malloc(len + 1); |
n->string = mandoc_malloc(len + 1); |
sv = strlcpy(n->string, p, len + 1); |
sv = strlcpy(n->string, p, len + 1); |
|
|
Line 334 man_word_alloc(struct man *m, int line, int pos, const |
|
Line 344 man_word_alloc(struct man *m, int line, int pos, const |
|
} |
} |
|
|
|
|
void |
/* |
|
* Free all of the resources held by a node. This does NOT unlink a |
|
* node from its context; for that, see man_node_unlink(). |
|
*/ |
|
static void |
man_node_free(struct man_node *p) |
man_node_free(struct man_node *p) |
{ |
{ |
|
|
if (p->string) |
if (p->string) |
free(p->string); |
free(p->string); |
if (p->parent) |
|
p->parent->nchild--; |
|
free(p); |
free(p); |
} |
} |
|
|
|
|
void |
void |
man_node_freelist(struct man_node *p) |
man_node_delete(struct man *m, struct man_node *p) |
{ |
{ |
struct man_node *n; |
|
|
|
if (p->child) |
while (p->child) |
man_node_freelist(p->child); |
man_node_delete(m, p->child); |
assert(0 == p->nchild); |
|
n = p->next; |
man_node_unlink(m, p); |
man_node_free(p); |
man_node_free(p); |
if (n) |
|
man_node_freelist(n); |
|
} |
} |
|
|
|
|
|
|
man_ptext(struct man *m, int line, char *buf) |
man_ptext(struct man *m, int line, char *buf) |
{ |
{ |
int i, j; |
int i, j; |
|
char sv; |
|
|
/* Literal free-form text whitespace is preserved. */ |
/* Literal free-form text whitespace is preserved. */ |
|
|
Line 378 man_ptext(struct man *m, int line, char *buf) |
|
Line 388 man_ptext(struct man *m, int line, char *buf) |
|
|
|
for (i = 0; ' ' == buf[i]; i++) |
for (i = 0; ' ' == buf[i]; i++) |
/* Skip leading whitespace. */ ; |
/* Skip leading whitespace. */ ; |
if (0 == buf[i]) { |
|
|
if ('\0' == buf[i]) { |
|
/* Trailing whitespace? */ |
|
if (i && ' ' == buf[i - 1]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
if ( ! pstring(m, line, 0, &buf[i], 0)) |
if ( ! pstring(m, line, 0, &buf[i], 0)) |
return(0); |
return(0); |
goto descope; |
goto descope; |
Line 392 man_ptext(struct man *m, int line, char *buf) |
|
Line 407 man_ptext(struct man *m, int line, char *buf) |
|
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
continue; |
continue; |
|
|
buf[i++] = 0; |
sv = buf[i]; |
|
buf[i++] = '\0'; |
|
|
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
return(0); |
return(0); |
|
|
|
/* Trailing whitespace? Check at overwritten byte. */ |
|
|
|
if (' ' == sv && '\0' == buf[i]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
|
|
for ( ; ' ' == buf[i]; i++) |
for ( ; ' ' == buf[i]; i++) |
/* Skip trailing whitespace. */ ; |
/* Skip trailing whitespace. */ ; |
|
|
j = i; |
j = i; |
if (0 == buf[i]) |
|
|
/* Trailing whitespace? */ |
|
|
|
if (' ' == buf[i - 1] && '\0' == buf[i]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
|
|
|
if ('\0' == buf[i]) |
break; |
break; |
} |
} |
|
|
Line 446 macrowarn(struct man *m, int ln, const char *buf) |
|
Line 476 macrowarn(struct man *m, int ln, const char *buf) |
|
int |
int |
man_pmacro(struct man *m, int ln, char *buf) |
man_pmacro(struct man *m, int ln, char *buf) |
{ |
{ |
int i, j, c, ppos, fl; |
int i, j, ppos, fl; |
|
enum mant tok; |
char mac[5]; |
char mac[5]; |
struct man_node *n; |
struct man_node *n; |
|
|
Line 463 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 494 man_pmacro(struct man *m, int ln, char *buf) |
|
i++; |
i++; |
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
if (0 == buf[i]) |
if ('\0' == buf[i]) |
goto out; |
goto out; |
} |
} |
|
|
Line 472 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 503 man_pmacro(struct man *m, int ln, char *buf) |
|
/* Copy the first word into a nil-terminated buffer. */ |
/* Copy the first word into a nil-terminated buffer. */ |
|
|
for (j = 0; j < 4; j++, i++) { |
for (j = 0; j < 4; j++, i++) { |
if (0 == (mac[j] = buf[i])) |
if ('\0' == (mac[j] = buf[i])) |
break; |
break; |
else if (' ' == buf[i]) |
else if (' ' == buf[i]) |
break; |
break; |
Line 496 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 527 man_pmacro(struct man *m, int ln, char *buf) |
|
return(1); |
return(1); |
} |
} |
|
|
if (MAN_MAX == (c = man_hash_find(mac))) { |
if (MAN_MAX == (tok = man_hash_find(mac))) { |
if ( ! macrowarn(m, ln, mac)) |
if ( ! macrowarn(m, ln, mac)) |
goto err; |
goto err; |
return(1); |
return(1); |
Line 507 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 538 man_pmacro(struct man *m, int ln, char *buf) |
|
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
|
|
/* Remove prior ELINE macro, if applicable. */ |
/* Trailing whitespace? */ |
|
|
if (m->flags & MAN_ELINE) { |
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
|
if ( ! man_pwarn(m, ln, i - 1, WTSPACE)) |
|
goto err; |
|
|
|
/* |
|
* Remove prior ELINE macro, as it's being clobbering by a new |
|
* macro. Note that NSCOPED macros do not close out ELINE |
|
* macros---they don't print text---so we let those slip by. |
|
*/ |
|
|
|
if ( ! (MAN_NSCOPED & man_macros[tok].flags) && |
|
m->flags & MAN_ELINE) { |
|
assert(MAN_TEXT != m->last->type); |
|
|
|
/* |
|
* This occurs in the following construction: |
|
* .B |
|
* .br |
|
* .B |
|
* .br |
|
* I hate man macros. |
|
* Flat-out disallow this madness. |
|
*/ |
|
if (MAN_NSCOPED & man_macros[m->last->tok].flags) |
|
return(man_perr(m, ln, ppos, WLNSCOPE)); |
|
|
n = m->last; |
n = m->last; |
|
|
|
assert(n); |
assert(NULL == n->child); |
assert(NULL == n->child); |
assert(0 == n->nchild); |
assert(0 == n->nchild); |
|
|
if ( ! man_nwarn(m, n, WLNSCOPE)) |
if ( ! man_nwarn(m, n, WLNSCOPE)) |
return(0); |
return(0); |
|
|
if (n->prev) { |
man_node_delete(m, n); |
assert(n != n->parent->child); |
|
assert(n == n->prev->next); |
|
n->prev->next = NULL; |
|
m->last = n->prev; |
|
m->next = MAN_NEXT_SIBLING; |
|
} else { |
|
assert(n == n->parent->child); |
|
n->parent->child = NULL; |
|
m->last = n->parent; |
|
m->next = MAN_NEXT_CHILD; |
|
} |
|
|
|
man_node_free(n); |
|
m->flags &= ~MAN_ELINE; |
m->flags &= ~MAN_ELINE; |
} |
} |
|
|
/* Begin recursive parse sequence. */ |
/* Begin recursive parse sequence. */ |
|
|
assert(man_macros[c].fp); |
assert(man_macros[tok].fp); |
|
|
if ( ! (*man_macros[c].fp)(m, c, ln, ppos, &i, buf)) |
if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf)) |
goto err; |
goto err; |
|
|
out: |
out: |
if ( ! (MAN_BLINE & fl)) |
/* |
|
* We weren't in a block-line scope when entering the |
|
* above-parsed macro, so return. |
|
* |
|
* FIXME: this prohibits the nesting of blocks (e.g., `de' and |
|
* family) within BLINE or ELINE systems. This is annoying. |
|
*/ |
|
|
|
if ( ! (MAN_BLINE & fl)) { |
|
m->flags &= ~MAN_ILINE; |
return(1); |
return(1); |
|
} |
|
|
|
/* |
|
* If we're in a block scope, then allow this macro to slip by |
|
* without closing scope around it. |
|
*/ |
|
|
|
if (MAN_ILINE & m->flags) { |
|
m->flags &= ~MAN_ILINE; |
|
return(1); |
|
} |
|
|
/* |
/* |
* If we've opened a new next-line element scope, then return |
* If we've opened a new next-line element scope, then return |
* now, as the next line will close out the block scope. |
* now, as the next line will close out the block scope. |
Line 612 man_err(struct man *m, int line, int pos, int iserr, e |
|
Line 678 man_err(struct man *m, int line, int pos, int iserr, e |
|
return(man_verr(m, line, pos, p)); |
return(man_verr(m, line, pos, p)); |
|
|
return(man_vwarn(m, line, pos, p)); |
return(man_vwarn(m, line, pos, p)); |
|
} |
|
|
|
|
|
/* |
|
* Unlink a node from its context. If "m" is provided, the last parse |
|
* point will also be adjusted accordingly. |
|
*/ |
|
static void |
|
man_node_unlink(struct man *m, struct man_node *n) |
|
{ |
|
|
|
/* Adjust siblings. */ |
|
|
|
if (n->prev) |
|
n->prev->next = n->next; |
|
if (n->next) |
|
n->next->prev = n->prev; |
|
|
|
/* Adjust parent. */ |
|
|
|
if (n->parent) { |
|
n->parent->nchild--; |
|
if (n->parent->child == n) |
|
n->parent->child = n->prev ? n->prev : n->next; |
|
} |
|
|
|
/* Adjust parse point, if applicable. */ |
|
|
|
if (m && m->last == n) { |
|
/*XXX: this can occur when bailing from validation. */ |
|
/*assert(NULL == n->next);*/ |
|
if (n->prev) { |
|
m->last = n->prev; |
|
m->next = MAN_NEXT_SIBLING; |
|
} else { |
|
m->last = n->parent; |
|
m->next = MAN_NEXT_CHILD; |
|
} |
|
} |
|
|
|
if (m && m->first == n) |
|
m->first = NULL; |
} |
} |