version 1.84, 2011/09/18 10:25:28 |
version 1.85, 2011/09/18 15:54:48 |
|
|
mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) |
mdoc_word_alloc(struct mdoc *m, int line, int pos, const char *p) |
{ |
{ |
struct mdoc_node *n; |
struct mdoc_node *n; |
size_t sv, len; |
|
|
|
len = strlen(p); |
|
|
|
n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT); |
n = node_alloc(m, line, pos, MDOC_MAX, MDOC_TEXT); |
n->string = mandoc_malloc(len + 1); |
n->string = roff_strdup(m->roff, p); |
sv = strlcpy(n->string, p, len + 1); |
|
|
|
/* Prohibit truncation. */ |
|
assert(sv < len + 1); |
|
|
|
if ( ! node_append(m, n)) |
if ( ! node_append(m, n)) |
return(0); |
return(0); |
|
|
|
|
ws = NULL; |
ws = NULL; |
for (c = end = buf + offs; *c; c++) { |
for (c = end = buf + offs; *c; c++) { |
switch (*c) { |
switch (*c) { |
case '-': |
|
if (mandoc_hyph(buf + offs, c)) |
|
*c = ASCII_HYPH; |
|
ws = NULL; |
|
break; |
|
case ' ': |
case ' ': |
if (NULL == ws) |
if (NULL == ws) |
ws = c; |
ws = c; |