From 5de9962d505334046c0fa822f58e3cc0d94c9e80 Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Wed, 8 Jan 2003 00:41:53 +0000 Subject: [PATCH] Fixed bug #21297. The fix also fixes miscalculation of lines numbers by 1 due the previously mentioned bug. --- sapi/cgi/cgi_main.c | 7 +++++++ sapi/cli/php_cli.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c index 299ff33696..161835cd2f 100644 --- a/sapi/cgi/cgi_main.c +++ b/sapi/cgi/cgi_main.c @@ -1413,6 +1413,13 @@ consult the installation file that came with this distribution, or visit \n\ while (c != 10 && c != 13) { c = fgetc(file_handle.handle.fp); /* skip to end of line */ } + /* handle situations where line is terminated by \r\n */ + if (c == 13) { + if (fgetc(file_handle.handle.fp) != 10) { + long pos = ftell(file_handle.handle.fp); + fseek(file_handle.handle.fp, pos - 1, SEEK_SET); + } + } CG(start_lineno) = 2; } else { rewind(file_handle.handle.fp); diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c index a98865f531..412180b577 100644 --- a/sapi/cli/php_cli.c +++ b/sapi/cli/php_cli.c @@ -695,6 +695,13 @@ int main(int argc, char *argv[]) while (c != 10 && c != 13) { c = fgetc(file_handle.handle.fp); /* skip to end of line */ } + /* handle situations where line is terminated by \r\n */ + if (c == 13) { + if (fgetc(file_handle.handle.fp) != 10) { + long pos = ftell(file_handle.handle.fp); + fseek(file_handle.handle.fp, pos - 1, SEEK_SET); + } + } CG(start_lineno) = 2; } else { rewind(file_handle.handle.fp); -- 2.50.1