Re: cvs: php-src(PHP_5_3) /ext/standard file.c

Yes, the code indeed is very different. I suggest you look in the mirror to find out who to blame. And then do a diff -u between file.c on PHP_5_2, PHP_5_3 and HEAD. Make your life easier and sync the files between branches before you commit any more fixes.. --Jani p.s. I found 1 other bug not being fixed in HEAD by very quick diff and cvs log rumba. Guess who committed that one? Ilia Alshanetsky kirjoitti:

Work in progress, the code is very different there and the patch will be very different. Ilia Alshanetsky On 18-May-09, at 5:19 PM, Jani Taskinen wrote:

What about HEAD? --Jani Ilia Alshanetsky kirjoitti:

iliaa        Mon May 18 18:45:30 2009 UTC
 Modified files:              (Branch: PHP_5_3)
   /php-src/ext/standard    file.c   Log:

Fixed bug #48313 (fgetcsv() does not return null for empty rows)

    http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.409.2.6.2.28.2.32&r2=1.409.2.6.2.28.2.33&diff_format=u 

Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.409.2.6.2.28.2.32 php-src/ext/standard/file.c:1.409.2.6.2.28.2.33

--- php-src/ext/standard/file.c:1.409.2.6.2.28.2.32    Fri May  8 09:44:17 2009
+++ php-src/ext/standard/file.c    Mon May 18 18:45:30 2009

@@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.409.2.6.2.28.2.32 2009/05/08 09:44:17 lbarnaud Exp $ */ +/* $Id: file.c,v 1.409.2.6.2.28.2.33 2009/05/18 18:45:30 iliaa Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -2343,8 +2343,12 @@

        }
         /* 3. Now pass our field back to php */
-        *comp_end = '\0';
-        add_next_index_stringl(return_value, temp, comp_end - temp, 1);
+        if (comp_end - temp) {
+            *comp_end = '\0';
+            add_next_index_stringl(return_value, temp, comp_end - temp, 1);
+        } else {
+            add_next_index_null(return_value);
+        }
    } while (inc_len > 0);

out:

-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php