php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-26 09:12:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix fgetcsv() to reflect the change on 4.3.5 behaviour.

Browse Source
This commit is contained in:
Moriyoshi Koizumi
2004-01-18 20:29:34 +00:00
parent c1df34cae0
commit abfda09eda
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/standard/file.c
View File

@@ -1904,6 +1904,7 @@ PHP_FUNCTION(fgetcsv)
/* real enclosure */
memcpy(tptr, hunk_begin, bptr - hunk_begin - 1);
tptr += (bptr - hunk_begin - 1);
hunk_begin = bptr;
goto quit_loop_2;
}
memcpy(tptr, hunk_begin, bptr - hunk_begin);
@@ -1929,6 +1930,7 @@ PHP_FUNCTION(fgetcsv)
/* real enclosure */
memcpy(tptr, hunk_begin, bptr - hunk_begin - 1);
tptr += (bptr - hunk_begin - 1);
hunk_begin = bptr;
goto quit_loop_2;
case 1:
bptr += inc_len;
@@ -1959,7 +1961,6 @@ PHP_FUNCTION(fgetcsv)
/* break is omitted intentionally */
case 1:
if (*bptr == delimiter) {
bptr += inc_len;
goto quit_loop_3;
}
break;
@@ -1971,6 +1972,9 @@ PHP_FUNCTION(fgetcsv)
}
quit_loop_3:
memcpy(tptr, hunk_begin, bptr - hunk_begin);
tptr += (bptr - hunk_begin);
bptr += inc_len;
comp_end = tptr;
} else {
/* 2B. Handle non-enclosure field */