diff options
Diffstat (limited to 'roff.c')
-rw-r--r-- | roff.c | 37 |
1 files changed, 24 insertions, 13 deletions
@@ -1,4 +1,4 @@ -/* $Id: roff.c,v 1.95 2010/07/21 09:15:48 kristaps Exp $ */ +/* $Id: roff.c,v 1.96 2010/07/27 13:16:00 kristaps Exp $ */ /* * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> @@ -969,30 +969,40 @@ roff_cond(ROFF_ARGS) static enum rofferr roff_ds(ROFF_ARGS) { - char *name, *string, *end; + char *name, *string; + + /* + * A symbol is named by the first word following the macro + * invocation up to a space. Its value is anything after the + * name's trailing whitespace and optional double-quote. Thus, + * + * [.ds foo "bar " ] + * + * will have `bar " ' as its value. + */ name = *bufp + pos; if ('\0' == *name) return(ROFF_IGN); string = name; + /* Read until end of name. */ while (*string && ' ' != *string) string++; + + /* Nil-terminate name. */ if (*string) - *(string++) = NULL; - if (*string && '"' == *string) - string++; + *(string++) = '\0'; + + /* Read past spaces. */ while (*string && ' ' == *string) string++; - end = string; - while (*end) - end++; - if (string < end) { - end--; - if (*end == '"') - *end = '\0'; - } + /* Read passed initial double-quote. */ + if (*string && '"' == *string) + string++; + + /* The rest is the value. */ roff_setstr(r, name, string); return(ROFF_IGN); } @@ -1060,6 +1070,7 @@ roff_setstr(struct roff *r, const char *name, const char *string) } else free(n->string); + ROFF_DEBUG("roff: new symbol: [%s] = [%s]\n", name, string); n->string = string ? strdup(string) : NULL; } |