mdocml: When reporting "whitespace at end of input line" on lines ending

[schwarze@mdocml.bsd.lv]

Log Message:
-----------
When reporting "whitespace at end of input line" on lines ending with
roff(7) comments, let the column number in the message point to the 
end of the line rather than to the beginning of the comment.
Improvement suggested by bluhm@.

Modified Files:
--------------
    mdocml:
        read.c

Revision Data
-------------
Index: read.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/read.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -Lread.c -Lread.c -u -p -r1.153 -r1.154
--- read.c
+++ read.c
@@ -315,6 +315,7 @@ mparse_buf_r(struct mparse *curp, struct
 	const char	*save_file;
 	char		*cp;
 	size_t		 pos; /* byte number in the ln buffer */
+	size_t		 j;  /* auxiliary byte number in the blk buffer */
 	enum rofferr	 rr;
 	int		 of;
 	int		 lnn; /* line number in the real file */
@@ -420,6 +421,7 @@ mparse_buf_r(struct mparse *curp, struct
 			}
 
 			if ('"' == blk.buf[i + 1] || '#' == blk.buf[i + 1]) {
+				j = i;
 				i += 2;
 				/* Comment, skip to end of line */
 				for (; i < blk.sz; ++i) {
@@ -430,7 +432,7 @@ mparse_buf_r(struct mparse *curp, struct
 						mandoc_msg(
 						    MANDOCERR_SPACE_EOL,
 						    curp, curp->line,
-						    pos, NULL);
+						    pos + i-1 - j, NULL);
 					++i;
 					++lnn;
 					break;
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv