version 1.139, 2011/01/22 13:16:02 |
version 1.140, 2011/01/24 23:41:55 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 684 parsebuf(struct curparse *curp, struct buf blk, int st |
|
Line 684 parsebuf(struct curparse *curp, struct buf blk, int st |
|
} |
} |
|
|
while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) { |
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] && i + 1 < (int)blk.sz && |
|
'\n' == blk.buf[i + 1]) |
|
++i; |
if ('\n' == blk.buf[i]) { |
if ('\n' == blk.buf[i]) { |
++i; |
++i; |
++lnn; |
++lnn; |
Line 718 parsebuf(struct curparse *curp, struct buf blk, int st |
|
Line 728 parsebuf(struct curparse *curp, struct buf blk, int st |
|
continue; |
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 + 2 < (int)blk.sz && |
|
'\n' == blk.buf[i + 2]) |
|
++i; |
if ('\n' == blk.buf[i + 1]) { |
if ('\n' == blk.buf[i + 1]) { |
i += 2; |
i += 2; |
/* Escaped newlines are skipped over */ |
|
++lnn; |
++lnn; |
continue; |
continue; |
} |
} |