Re: line termination in manuals

[Ingo Schwarze <schwarze@usta.de>]

Hi Joerg,

Joerg Sonnenberger wrote on Sat, Jan 22, 2011 at 10:35:10PM +0100:
> On Sat, Jan 22, 2011 at 10:28:14PM +0100, Ingo Schwarze wrote:

> At least add a comment that this falls through to the next statement
> for handling.  Otherwise it looks fine.

Gah, writing comments is good.
It makes you think again about the code,
so you find bugs.

When the last character in blk.buf is '\r' (without a newline
at the end of the file), my first attempt would have overrun
the buffer by one byte.

Thus, i'm committing the following shortly.

Yours,
  Ingo


Index: main.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.69
diff -u -r1.69 main.c
--- main.c	20 Jan 2011 21:33:11 -0000	1.69
+++ main.c	22 Jan 2011 22:12:58 -0000
@@ -669,6 +669,15 @@
 		}
 
 		while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) {
+
+			/*
+			 * When finding an unescaped newline character,
+			 * leave the character loop to process the line.
+			 * Skip a preceding carriage return, if any.
+			 */
+
+			if ('\r' == blk.buf[i] && '\n' == blk.buf[i+1])
+				++i;
 			if ('\n' == blk.buf[i]) {
 				++i;
 				++lnn;
@@ -703,11 +712,18 @@
 				continue;
 			}
 
-			/* Found escape & at least one other char. */
+			/*
+			 * Found escape and at least one other character.
+			 * When it's a newline character, skip it.
+			 * When there is a carriage return in between,
+			 * skip that one as well.
+			 */
 
+			if ('\r' == blk.buf[i + 1] && i + 1 < (int)blk.sz &&
+			    '\n' == blk.buf[i + 2])
+				++i;
 			if ('\n' == blk.buf[i + 1]) {
 				i += 2;
-				/* Escaped newlines are skipped over */
 				++lnn;
 				continue;
 			}
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv