version 1.30, 2009/08/19 09:14:50 |
version 1.36, 2009/08/21 13:18:32 |
Line 41 const char *const __man_merrnames[WERRMAX] = { |
|
Line 41 const char *const __man_merrnames[WERRMAX] = { |
|
"unknown macro", /* WMACRO */ |
"unknown macro", /* WMACRO */ |
"ill-formed macro", /* WMACROFORM */ |
"ill-formed macro", /* WMACROFORM */ |
"scope open on exit", /* WEXITSCOPE */ |
"scope open on exit", /* WEXITSCOPE */ |
"no scope context" /* WNOSCOPE */ |
"no scope context", /* WNOSCOPE */ |
|
"literal context already open", /* WOLITERAL */ |
|
"no literal context open" /* WNLITERAL */ |
}; |
}; |
|
|
const char *const __man_macronames[MAN_MAX] = { |
const char *const __man_macronames[MAN_MAX] = { |
Line 52 const char *const __man_macronames[MAN_MAX] = { |
|
Line 54 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" |
"RS", "DT" |
}; |
}; |
|
|
const char * const *man_macronames = __man_macronames; |
const char * const *man_macronames = __man_macronames; |
Line 65 static int man_ptext(struct man *, int, char *); |
|
Line 67 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 int man_alloc1(struct man *); |
static int man_alloc1(struct man *); |
|
static int pstring(struct man *, int, int, |
|
const char *, size_t); |
|
|
|
#ifdef __linux__ |
|
extern size_t strlcpy(char *, const char *, size_t); |
|
#endif |
|
|
|
|
const struct man_node * |
const struct man_node * |
man_node(const struct man *m) |
man_node(const struct man *m) |
{ |
{ |
Line 318 man_block_alloc(struct man *m, int line, int pos, int |
|
Line 326 man_block_alloc(struct man *m, int line, int pos, int |
|
} |
} |
|
|
|
|
int |
static int |
man_word_alloc(struct man *m, int line, int pos, const char *word) |
pstring(struct man *m, int line, int pos, |
|
const char *p, size_t len) |
{ |
{ |
struct man_node *p; |
struct man_node *n; |
|
size_t sv; |
|
|
p = man_node_alloc(line, pos, MAN_TEXT, -1); |
n = man_node_alloc(line, pos, MAN_TEXT, -1); |
if (NULL == p) |
if (NULL == n) |
return(0); |
return(0); |
if (NULL == (p->string = strdup(word))) |
|
|
n->string = malloc(len + 1); |
|
if (NULL == n->string) { |
|
free(n); |
return(0); |
return(0); |
if ( ! man_node_append(m, p)) |
} |
|
|
|
sv = strlcpy(n->string, p, len + 1); |
|
|
|
/* Prohibit truncation. */ |
|
assert(sv < len + 1); |
|
|
|
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))); |
|
} |
|
|
|
|
void |
void |
man_node_free(struct man_node *p) |
man_node_free(struct man_node *p) |
{ |
{ |
Line 364 man_node_freelist(struct man_node *p) |
|
Line 392 man_node_freelist(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; |
|
|
/* First allocate word. */ |
/* Literal free-form text whitespace is preserved. */ |
|
|
/* FIXME: dechunk words! */ |
if (MAN_LITERAL & m->flags) { |
|
if ( ! man_word_alloc(m, line, 0, buf)) |
|
return(0); |
|
goto descope; |
|
} |
|
|
if ( ! man_word_alloc(m, line, 0, buf)) |
/* First de-chunk and allocate words. */ |
|
|
|
for (i = 0; ' ' == buf[i]; i++) |
|
/* Skip leading whitespace. */ ; |
|
if (0 == buf[i]) { |
|
if ( ! pstring(m, line, 0, &buf[i], 0)) |
|
return(0); |
|
goto descope; |
|
} |
|
|
|
for (j = i; buf[i]; i++) { |
|
if (' ' != buf[i]) |
|
continue; |
|
|
|
/* Escaped whitespace. */ |
|
if (i && ' ' == buf[i] && '\\' == buf[i - 1]) |
|
continue; |
|
|
|
buf[i++] = 0; |
|
if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
|
return(0); |
|
|
|
for ( ; ' ' == buf[i]; i++) |
|
/* Skip trailing whitespace. */ ; |
|
|
|
j = i; |
|
if (0 == buf[i]) |
|
break; |
|
} |
|
|
|
if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
return(0); |
return(0); |
m->next = MAN_NEXT_SIBLING; |
|
|
|
|
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 |
* out the block scope (also if applicable). |
* out the block scope (also if applicable). |
*/ |
*/ |
|
|
/* XXX - this should be in man_action.c. */ |
|
|
|
if (MAN_ELINE & m->flags) { |
if (MAN_ELINE & m->flags) { |
m->flags &= ~MAN_ELINE; |
m->flags &= ~MAN_ELINE; |
if ( ! man_unscope(m, m->last->parent)) |
if ( ! man_unscope(m, m->last->parent)) |
Line 400 man_ptext(struct man *m, int line, char *buf) |
|
Line 462 man_ptext(struct man *m, int line, 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, c, ppos, fl; |
char mac[5]; |
char mac[5]; |
|
struct man_node *n; |
|
|
/* Comments and empties are quickly ignored. */ |
/* Comments and empties are quickly ignored. */ |
|
|
Line 458 man_pmacro(struct man *m, int ln, char *buf) |
|
Line 521 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. */ |
|
|
|
if (m->flags & MAN_ELINE) { |
|
n = m->last; |
|
assert(NULL == n->child); |
|
if ( ! man_nwarn(m, n, WLNSCOPE)) |
|
return(0); |
|
|
|
if (n->prev) { |
|
assert(n != n->parent->child); |
|
assert(n == n->prev->next); |
|
n->prev->next = NULL; |
|
m->last = n->prev; |
|
} else { |
|
assert(n == n->parent->child); |
|
n->parent->child = NULL; |
|
m->last = n->parent; |
|
} |
|
|
|
man_node_free(n); |
|
m->flags &= ~MAN_ELINE; |
|
} |
|
|
/* Begin recursive parse sequence. */ |
/* Begin recursive parse sequence. */ |
|
|
assert(man_macros[c].fp); |
assert(man_macros[c].fp); |
|
|
return(1); |
return(1); |
|
|
/* Close out the block scope opened in the prior line. */ |
/* Close out the block scope opened in the prior line. */ |
|
|
/* XXX - this should be in man_action.c. */ |
|
|
|
assert(MAN_BLINE & m->flags); |
assert(MAN_BLINE & m->flags); |
m->flags &= ~MAN_BLINE; |
m->flags &= ~MAN_BLINE; |