version 1.57, 2010/03/27 10:26:39 |
version 1.71, 2010/05/16 00:04:46 |
|
|
|
|
const char *const __man_merrnames[WERRMAX] = { |
const char *const __man_merrnames[WERRMAX] = { |
"invalid character", /* WNPRINT */ |
"invalid character", /* WNPRINT */ |
"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 */ |
"over-zealous prior line scope violation", /* WLNSCOPE2 */ |
Line 50 const char *const __man_merrnames[WERRMAX] = { |
|
Line 49 const char *const __man_merrnames[WERRMAX] = { |
|
"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 */ |
|
"scope in roff instructions broken", /* WROFFSCOPE */ |
|
"document title should be uppercase", /* WTITLECASE */ |
"document title should be uppercase", /* WTITLECASE */ |
|
"deprecated comment style", /* WBADCOMMENT */ |
}; |
}; |
|
|
const char *const __man_macronames[MAN_MAX] = { |
const char *const __man_macronames[MAN_MAX] = { |
Line 64 const char *const __man_macronames[MAN_MAX] = { |
|
Line 62 const char *const __man_macronames[MAN_MAX] = { |
|
"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", |
"Sp", "Vb", "Ve", |
"dei", "am", "ami", "ig", |
|
".", |
|
}; |
}; |
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
Line 82 static int man_ptext(struct man *, int, char *); |
|
Line 78 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 *); |
static void man_alloc1(struct man *); |
static void man_alloc1(struct man *); |
static int pstring(struct man *, int, int, |
|
const char *, size_t); |
|
static int macrowarn(struct man *, int, const char *); |
static int macrowarn(struct man *, int, const char *); |
|
|
|
|
|
|
man_parseln(struct man *m, int ln, char *buf) |
man_parseln(struct man *m, int ln, char *buf) |
{ |
{ |
|
|
return('.' == *buf || '\'' == *buf ? |
return(('.' == *buf || '\'' == *buf) ? |
man_pmacro(m, ln, buf) : |
man_pmacro(m, ln, buf) : |
man_ptext(m, ln, buf)); |
man_ptext(m, ln, buf)); |
} |
} |
Line 175 man_free1(struct man *man) |
|
Line 169 man_free1(struct man *man) |
|
free(man->meta.source); |
free(man->meta.source); |
if (man->meta.vol) |
if (man->meta.vol) |
free(man->meta.vol); |
free(man->meta.vol); |
|
if (man->meta.msec) |
|
free(man->meta.msec); |
} |
} |
|
|
|
|
Line 317 man_block_alloc(struct man *m, int line, int pos, enum |
|
Line 313 man_block_alloc(struct man *m, int line, int pos, enum |
|
} |
} |
|
|
|
|
static int |
int |
pstring(struct man *m, int line, int pos, |
man_word_alloc(struct man *m, int line, int pos, const char *word) |
const char *p, size_t len) |
|
{ |
{ |
struct man_node *n; |
struct man_node *n; |
size_t sv; |
size_t sv, len; |
|
|
|
len = strlen(word); |
|
|
n = man_node_alloc(line, pos, MAN_TEXT, MAN_MAX); |
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, word, len + 1); |
|
|
/* Prohibit truncation. */ |
/* Prohibit truncation. */ |
assert(sv < len + 1); |
assert(sv < len + 1); |
|
|
if ( ! man_node_append(m, n)) |
if ( ! man_node_append(m, n)) |
return(0); |
return(0); |
|
|
m->next = MAN_NEXT_SIBLING; |
m->next = MAN_NEXT_SIBLING; |
return(1); |
return(1); |
} |
} |
|
|
|
|
int |
|
man_word_alloc(struct man *m, int line, int pos, const char *word) |
|
{ |
|
|
|
return(pstring(m, line, pos, word, strlen(word))); |
|
} |
|
|
|
|
|
/* |
/* |
* Free all of the resources held by a node. This does NOT unlink a |
* Free all of the resources held by a node. This does NOT unlink a |
* node from its context; for that, see man_node_unlink(). |
* node from its context; for that, see man_node_unlink(). |
Line 375 man_node_delete(struct man *m, struct man_node *p) |
|
Line 365 man_node_delete(struct man *m, struct man_node *p) |
|
static int |
static int |
man_ptext(struct man *m, int line, char *buf) |
man_ptext(struct man *m, int line, char *buf) |
{ |
{ |
int i, j; |
int i; |
char sv; |
|
|
|
|
/* Ignore bogus comments. */ |
|
|
|
if ('\\' == buf[0] && '.' == buf[1] && '\"' == buf[2]) |
|
return(man_pwarn(m, line, 0, WBADCOMMENT)); |
|
|
/* Literal free-form text whitespace is preserved. */ |
/* Literal free-form text whitespace is preserved. */ |
|
|
if (MAN_LITERAL & m->flags) { |
if (MAN_LITERAL & m->flags) { |
Line 386 man_ptext(struct man *m, int line, char *buf) |
|
Line 380 man_ptext(struct man *m, int line, char *buf) |
|
goto descope; |
goto descope; |
} |
} |
|
|
/* First de-chunk and allocate words. */ |
/* Pump blank lines directly into the backend. */ |
|
|
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? */ |
/* Allocate a blank entry. */ |
if (i && ' ' == buf[i - 1]) |
if ( ! man_word_alloc(m, line, 0, "")) |
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
|
if ( ! pstring(m, line, 0, &buf[i], 0)) |
|
return(0); |
return(0); |
goto descope; |
goto descope; |
} |
} |
|
|
for (j = i; buf[i]; i++) { |
/* |
if (' ' != buf[i]) |
* Warn if the last un-escaped character is whitespace. Then |
continue; |
* strip away the remaining spaces (tabs stay!). |
|
*/ |
|
|
/* Escaped whitespace. */ |
i = (int)strlen(buf); |
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
assert(i); |
continue; |
|
|
|
sv = buf[i]; |
if (' ' == buf[i - 1] || '\t' == buf[i - 1]) { |
buf[i++] = '\0'; |
if (i > 1 && '\\' != buf[i - 2]) |
|
|
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
|
return(0); |
|
|
|
/* Trailing whitespace? Check at overwritten byte. */ |
|
|
|
if (' ' == sv && '\0' == buf[i]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
return(0); |
return(0); |
|
|
for ( ; ' ' == buf[i]; i++) |
for (--i; i && ' ' == buf[i]; i--) |
/* Skip trailing whitespace. */ ; |
/* Spin back to non-space. */ ; |
|
|
j = i; |
/* Jump ahead of escaped whitespace. */ |
|
i += '\\' == buf[i] ? 2 : 1; |
|
|
/* Trailing whitespace? */ |
buf[i] = '\0'; |
|
|
if (' ' == buf[i - 1] && '\0' == buf[i]) |
|
if ( ! man_pwarn(m, line, i - 1, WTSPACE)) |
|
return(0); |
|
|
|
if ('\0' == buf[i]) |
|
break; |
|
} |
} |
|
|
if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
if ( ! man_word_alloc(m, line, 0, buf)) |
return(0); |
return(0); |
|
|
descope: |
/* |
|
* End-of-sentence check. If the last character is an unescaped |
|
* EOS character, then flag the node as being the end of a |
|
* sentence. The front-end will know how to interpret this. |
|
*/ |
|
|
|
/* FIXME: chain of close delims. */ |
|
|
|
assert(i); |
|
|
|
if (mandoc_eos(buf, (size_t)i)) |
|
m->last->flags |= MAN_EOS; |
|
|
|
descope: |
/* |
/* |
* Co-ordinate what happens with having a next-line scope open: |
* Co-ordinate what happens with having a next-line scope open: |
* first close out the element scope (if applicable), then close |
* first close out the element scope (if applicable), then close |
|
|
macrowarn(struct man *m, int ln, const char *buf) |
macrowarn(struct man *m, int ln, const char *buf) |
{ |
{ |
if ( ! (MAN_IGN_MACRO & m->pflags)) |
if ( ! (MAN_IGN_MACRO & m->pflags)) |
return(man_verr(m, ln, 0, |
return(man_verr(m, ln, 0, "unknown macro: %s%s", |
"unknown macro: %s%s", |
|
buf, strlen(buf) > 3 ? "..." : "")); |
buf, strlen(buf) > 3 ? "..." : "")); |
return(man_vwarn(m, ln, 0, "unknown macro: %s%s", |
return(man_vwarn(m, ln, 0, "unknown macro: %s%s", |
buf, strlen(buf) > 3 ? "..." : "")); |
buf, strlen(buf) > 3 ? "..." : "")); |
Line 478 macrowarn(struct man *m, int ln, const char *buf) |
|
Line 467 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, ppos, fl; |
int i, j, ppos; |
enum mant tok; |
enum mant tok; |
char mac[5]; |
char mac[5]; |
struct man_node *n; |
struct man_node *n; |
|
|
/* Comments and empties are quickly ignored. */ |
/* Comments and empties are quickly ignored. */ |
|
|
fl = m->flags; |
|
|
|
if ('\0' == buf[1]) |
if ('\0' == buf[1]) |
return(1); |
return(1); |
|
|
Line 496 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 483 man_pmacro(struct man *m, int ln, char *buf) |
|
* Skip whitespace between the control character and initial |
* Skip whitespace between the control character and initial |
* text. "Whitespace" is both spaces and tabs. |
* text. "Whitespace" is both spaces and tabs. |
*/ |
*/ |
|
|
if (' ' == buf[i] || '\t' == buf[i]) { |
if (' ' == buf[i] || '\t' == buf[i]) { |
i++; |
i++; |
while (buf[i] && (' ' == buf[i] || '\t' == buf[i])) |
while (buf[i] && (' ' == buf[i] || '\t' == buf[i])) |
Line 544 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 532 man_pmacro(struct man *m, int ln, char *buf) |
|
while (buf[i] && ' ' == buf[i]) |
while (buf[i] && ' ' == buf[i]) |
i++; |
i++; |
|
|
/* Trailing whitespace? */ |
/* |
|
* Trailing whitespace. Note that tabs are allowed to be passed |
|
* into the parser as "text", so we only warn about spaces here. |
|
*/ |
|
|
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
if ('\0' == buf[i] && ' ' == buf[i - 1]) |
if ( ! man_pwarn(m, ln, i - 1, WTSPACE)) |
if ( ! man_pwarn(m, ln, i - 1, WTSPACE)) |
Line 585 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 576 man_pmacro(struct man *m, int ln, char *buf) |
|
m->flags &= ~MAN_ELINE; |
m->flags &= ~MAN_ELINE; |
} |
} |
|
|
/* Begin recursive parse sequence. */ |
/* |
|
* Save the fact that we're in the next-line for a block. In |
|
* this way, embedded roff instructions can "remember" state |
|
* when they exit. |
|
*/ |
|
|
assert(man_macros[tok].fp); |
if (MAN_BLINE & m->flags) |
|
m->flags |= MAN_BPLINE; |
|
|
|
/* Call to handler... */ |
|
|
|
assert(man_macros[tok].fp); |
if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf)) |
if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf)) |
goto err; |
goto err; |
|
|
|
|
/* |
/* |
* We weren't in a block-line scope when entering the |
* We weren't in a block-line scope when entering the |
* above-parsed macro, so return. |
* 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)) { |
if ( ! (MAN_BPLINE & m->flags)) { |
m->flags &= ~MAN_ILINE; |
m->flags &= ~MAN_ILINE; |
return(1); |
return(1); |
} |
} |
|
m->flags &= ~MAN_BPLINE; |
|
|
/* |
/* |
* If we're in a block scope, then allow this macro to slip by |
* If we're in a block scope, then allow this macro to slip by |