mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #45779 (regression with shebang lines processing)

Browse Source
This commit is contained in:
Dmitry Stogov 2008-08-12 16:43:53 +00:00
parent bfb468c275
commit 05376077b3
4 changed files with 368 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

728
Zend/zend_language_scanner.c
View File

File diff suppressed because it is too large Load Diff

2
Zend/zend_language_scanner.l
View File

@ -848,6 +848,7 @@ yymore_restart:
while (++YYCURSOR < YYLIMIT) {
if (*YYCURSOR == '\n') {
++YYCURSOR;
CG(zend_lineno)++;
goto restart;
}
@ -855,6 +856,7 @@ yymore_restart:
if (++YYCURSOR < YYLIMIT && *YYCURSOR == '\n') { /* match \r\n as single newline */
++YYCURSOR;
}
CG(zend_lineno)++;
goto restart;
}
}

2
Zend/zend_language_scanner_defs.h
View File

@ -1,4 +1,4 @@
/* Generated by re2c 0.13.5 on Mon Jul 28 15:23:25 2008 */
/* Generated by re2c 0.13.5 on Tue Aug 12 20:38:47 2008 */
#line 3 "Zend/zend_language_scanner_defs.h"
enum YYCONDTYPE {

17
sapi/cli/php_cli.c
View File

@ -575,23 +575,6 @@ static int cli_seek_file_begin(zend_file_handle *file_handle, char *script_file,
return FAILURE;
}
file_handle->filename = script_file;
/* #!php support */
c = fgetc(file_handle->handle.fp);
if (c == '#') {
while (c != '\n' && c != '\r') {
c = fgetc(file_handle->handle.fp); /* skip to end of line */
}
/* handle situations where line is terminated by \r\n */
if (c == '\r') {
if (fgetc(file_handle->handle.fp) != '\n') {
long pos = ftell(file_handle->handle.fp);
fseek(file_handle->handle.fp, pos - 1, SEEK_SET);
}
}
*lineno = 2;
} else {
rewind(file_handle->handle.fp);
}
return SUCCESS;
}
/* }}} */