Re: line termination in manuals

[Ingo Schwarze <schwarze@usta.de>]

Hi Joerg,

Joerg Sonnenberger wrote on Sat, Jan 22, 2011 at 09:05:17PM +0100:
> On Sat, Jan 22, 2011 at 08:56:56PM +0100, Ingo Schwarze wrote:

>> deraadt@ pointed out that, if somebody would compile mandoc
>> on Windows, the C library would take care of different
>> conventions regarding line termination.

> Actually, it wouldn't. We explicitly read the file as whole or mmap it
> and separate it at \n. I don't see a good reason why we couldn't just
> drop \r before \n and accept both silently.

Good point.

The following works for me.

OK?
  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 21:27:00 -0000
@@ -669,6 +669,8 @@
 		}
 
 		while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) {
+			if ('\r' == blk.buf[i] && '\n' == blk.buf[i+1])
+				++i;
 			if ('\n' == blk.buf[i]) {
 				++i;
 				++lnn;
@@ -705,6 +707,8 @@
 
 			/* Found escape & at least one other char. */
 
+			if ('\r' == blk.buf[i+1] && '\n' == blk.buf[i+2])
+				++i;
 			if ('\n' == blk.buf[i + 1]) {
 				i += 2;
 				/* Escaped newlines are skipped over */
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv