summaryrefslogtreecommitdiffstats
path: root/roff.c
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-07-27 13:16:00 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-07-27 13:16:00 +0000
commitd162ac252080ea1ff3c25eaf02fb59a95b442927 (patch)
treed5674ffbf58545adcef89af82dfda0706bb124dc /roff.c
parent9f29c093c60470f2b843f8a7da226ea467592755 (diff)
downloadmandoc-d162ac252080ea1ff3c25eaf02fb59a95b442927.tar.gz
Fix `ds' handling. This was stripping characters from "val", when the
syntax of `ds' is such that ALL text following the first non-space/non-double-quote is part of the value. This also fixes the warning of *(string++) = NULL report by kristaps@ and joerg@.
Diffstat (limited to 'roff.c')
-rw-r--r--roff.c35
1 files changed, 23 insertions, 12 deletions
diff --git a/roff.c b/roff.c
index 45608ede..248d3118 100644
--- a/roff.c
+++ b/roff.c
@@ -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;
}