=================================================================== RCS file: /cvs/mandoc/read.c,v retrieving revision 1.150.2.2 retrieving revision 1.150.2.3 diff -u -p -r1.150.2.2 -r1.150.2.3 --- mandoc/read.c 2016/11/10 12:52:12 1.150.2.2 +++ mandoc/read.c 2017/01/09 02:21:37 1.150.2.3 @@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.150.2.2 2016/11/10 12:52:12 schwarze Exp $ */ +/* $Id: read.c,v 1.150.2.3 2017/01/09 02:21:37 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons * Copyright (c) 2010-2016 Ingo Schwarze @@ -317,6 +317,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size 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 */ @@ -422,6 +423,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size } if ('"' == blk.buf[i + 1] || '#' == blk.buf[i + 1]) { + j = i; i += 2; /* Comment, skip to end of line */ for (; i < blk.sz; ++i) { @@ -432,7 +434,7 @@ mparse_buf_r(struct mparse *curp, struct buf blk, size mandoc_msg( MANDOCERR_SPACE_EOL, curp, curp->line, - pos, NULL); + pos + i-1 - j, NULL); ++i; ++lnn; break;