Re: roff.c question

[Ingo Schwarze <schwarze@usta.de>]

Hi Kristaps,

>  1) roff_res() should not expand \\* or \\\\*,
>     but it should expand \* and \\\*.

OK for the following patch?

It fixes this test case:

  .TH bsbs 1 "December 3, 2010"
  .SH NAME
  bsbs - double backslash in a string definition
  .SH DESCRIPTION
  .ds right wrong
  .ds inner *[right]
  .ds outer \\*[inner]
  result: \*[outer]
  .PP
  The above line must be "result: *[right]",
  not "result: wrong".


Index: roff.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.21
diff -u -p -r1.21 roff.c
--- roff.c	28 Nov 2010 19:35:33 -0000	1.21
+++ roff.c	3 Dec 2010 21:44:36 -0000
@@ -338,14 +338,19 @@ static int
 roff_res(struct roff *r, char **bufp, size_t *szp, int pos)
 {
 	const char	*cp, *cpp, *st, *res;
-	int		 i, maxl;
+	int		 i, bs, maxl;
 	size_t		 nsz;
 	char		*n;
 
-	/* LINTED */
-	for (cp = &(*bufp)[pos]; (cpp = strstr(cp, "\\*")); cp++) {
-		cp = cpp + 2;
-		switch (*cp) {
+	cp = *bufp + pos;
+	bs = 0;
+	while (*cp) {
+		cpp = cp++;
+		if ('\\' == *cp)
+			bs = !bs;
+		if ( ! (bs && '*' == *cp))
+			continue;
+		switch (*(++cp)) {
 		case ('('):
 			cp++;
 			maxl = 2;
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv