diff options
| author | Hartmut Holzgraefe <hholzgra@php.net> | 2000-12-14 14:34:51 +0000 |
|---|---|---|
| committer | Hartmut Holzgraefe <hholzgra@php.net> | 2000-12-14 14:34:51 +0000 |
| commit | 3844c9cfb667f0995328a5e5a5593b5877d022ab (patch) | |
| tree | de46d05587be4565b20de3da42d6a0f88e15c13c | |
| parent | f825493be1bb49cdab52c0534d463e103cbd7808 (diff) | |
| download | php-git-3844c9cfb667f0995328a5e5a5593b5877d022ab.tar.gz | |
fgetcsv() will now work correct with empty fields in tab delimited files
# fix for bug #8258 and regression test
| -rw-r--r-- | ext/standard/file.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/standard/file.c b/ext/standard/file.c index d421230de7..57713ee3ac 100644 --- a/ext/standard/file.c +++ b/ext/standard/file.c @@ -1741,7 +1741,7 @@ PHP_FUNCTION(fread) } /* }}} */ -/* {{{ proto array fgetcsv(int fp, int length) +/* {{{ proto array fgetcsv(int fp, int length [, string delimiter]) Get line from file pointer and parse for CSV fields */ PHP_FUNCTION(fgetcsv) { @@ -1813,7 +1813,7 @@ PHP_FUNCTION(fgetcsv) { lineEnd = emalloc(sizeof(char) * (len + 1)); bptr = buf; tptr = buf + strlen(buf) -1; - while ( isspace((int)*tptr) && (tptr > bptr) ) tptr--; + while ( isspace((int)*tptr) && (*tptr!=delimiter) && (tptr > bptr) ) tptr--; tptr++; strcpy(lineEnd, tptr); @@ -1839,7 +1839,7 @@ PHP_FUNCTION(fgetcsv) { do { /* 1. Strip any leading space */ - while(isspace((int)*bptr)) bptr++; + while(isspace((int)*bptr) && (*bptr!=delimiter)) bptr++; /* 2. Read field, leaving bptr pointing at start of next field */ if (*bptr == '"') { /* 2A. handle quote delimited field */ @@ -1874,7 +1874,7 @@ PHP_FUNCTION(fgetcsv) { } bptr = buf; tptr = buf + strlen(buf) -1; - while ( isspace((int)*tptr) && (tptr > bptr) ) tptr--; + while ( isspace((int)*tptr) && (*tptr!=delimiter) && (tptr > bptr) ) tptr--; tptr++; strcpy(lineEnd, tptr); *tptr++ = ' '; *tptr = 0; @@ -1889,7 +1889,7 @@ PHP_FUNCTION(fgetcsv) { *tptr=0; /* terminate temporary string */ if (strlen(temp)) { tptr--; - while (isspace((int)*tptr)) *tptr-- = 0; /* strip any trailing spaces */ + while (isspace((int)*tptr) && (*tptr!=delimiter)) *tptr-- = 0; /* strip any trailing spaces */ } if (*bptr == delimiter) bptr++; } |