Re: Sx quoting and Header

[Ingo Schwarze <schwarze@usta.de>]

Hi Nicolas,

Nicolas Joly wrote on Mon, Dec 27, 2010 at 02:26:23PM +0100:

> This does not work for hrefs ... it does not add the "x" protection
> char because, in that case, *dst = '#' and not '\0'.

Oh indeed.  That was sloppy.
Thanks for catching the regression!

> What about letting the caller do the protection instead ?

Hm, your patch is nice too, in particular it's a bit shorter.

On the other hand, doing things required for structural reasons
in one central place is not a bad idea either, it reduces the
risk of forgetting it at one of the several places, in particular
when adding code at a later time.

What finally decided the question is that Kristaps currently
has mdoc_html.c kind of locked, he is working on that very code,
and it will probably change.  Interfering with that seemed like
a bad idea, making html_idcat() a bit safer in parallel, on the
other hand, not a problem.

Thanks again,
  Ingo


P.S.
Here is what i just committed:

Index: html.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/html.c,v
retrieving revision 1.123
diff -u -p -r1.123 html.c
--- html.c	24 Dec 2010 14:14:00 -0000	1.123
+++ html.c	27 Dec 2010 21:29:35 -0000
@@ -771,20 +771,24 @@ html_idcat(char *dst, const char *src, i
 {
 	int		 ssz;
 
-	assert(sz);
+	assert(sz > 2);
 
 	/* Cf. <http://www.w3.org/TR/html4/types.html#h-6.2>. */
 
-	for ( ; *dst != '\0' && sz; dst++, sz--)
-		/* Jump to end. */ ;
-
-	assert(sz > 2);
-
 	/* We can't start with a number (bah). */
 
-	*dst++ = 'x';
-	*dst = '\0';
-	sz--;
+	if ('#' == *dst) {
+		dst++;
+		sz--;
+	}
+	if ('\0' == *dst) {
+		*dst++ = 'x';
+		*dst = '\0';
+		sz--;
+	}
+
+	for ( ; *dst != '\0' && sz; dst++, sz--)
+		/* Jump to end. */ ;
 
 	for ( ; *src != '\0' && sz > 1; src++) {
 		ssz = snprintf(dst, (size_t)sz, "%.2x", *src);
--
 To unsubscribe send an email to discuss+unsubscribe@mdocml.bsd.lv