version 1.60, 2010/04/08 07:53:01 |
version 1.61, 2010/05/07 15:49:36 |
Line 83 static int man_ptext(struct man *, int, char *); |
|
Line 83 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 *); |
|
|
|
|
Line 318 man_block_alloc(struct man *m, int line, int pos, enum |
|
Line 316 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 376 man_node_delete(struct man *m, struct man_node *p) |
|
Line 368 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. */ |
/* Ignore bogus comments. */ |
|
|
Line 392 man_ptext(struct man *m, int line, char *buf) |
|
Line 383 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++) { |
/* Warn if the last un-escaped character is whitespace. */ |
if (' ' != buf[i]) |
|
continue; |
|
|
|
/* 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 (1 == i || ('\\' != 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++) |
if ( ! man_word_alloc(m, line, 0, buf)) |
/* Skip trailing whitespace. */ ; |
|
|
|
j = 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; |
|
} |
|
|
|
if (j != i && ! pstring(m, line, j, &buf[j], (size_t)(i - j))) |
|
return(0); |
return(0); |
|
|
descope: |
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 |