Re: cvs: php4 /main php_ini.c

Since your patch i can no longer use -c <path> [marcus@zaphod php4]$ ./cli -c /home/marcus test.php input in flex scanner failed [marcus@zaphod php4]$ ./cli -c /home/marcus/php.in test.php Hello World! The applied patch repairs it for my linux Can someone with Windows verify the patch (maybe the macros are not available). marcus cvs -z3 -q diff main\php_ini.c (in directory S:\php4\) Index: main/php_ini.c =================================================================== RCS file: /repository/php4/main/php_ini.c,v retrieving revision 1.82 diff -u -r1.82 php_ini.c

--- main/php_ini.c      13 Apr 2002 14:12:17 -0000      1.82
+++ main/php_ini.c      14 Apr 2002 18:37:29 -0000

@@ -266,7 +266,12 @@

        fh.handle.fp = NULL;
        /* Check if php_ini_path_override is a file */
        if (php_ini_path_override && php_ini_path_override[0]) {
-               fh.handle.fp = VCWD_FOPEN(php_ini_path_override, "r");
+               struct stat statbuf;
+               if (!VCWD_STAT(php_ini_path_override, &statbuf)) {
+            if (!S_ISDIR(statbuf.st_mode)) {
+                       fh.handle.fp = VCWD_FOPEN(php_ini_path_override, "r");
+               }
+           }
        }
        /* Search php.ini file in search path */
        if (!fh.handle.fp)

At 16:12 13.04.2002, Yasuo Ohgaki wrote:

yohgaki         Sat Apr 13 10:12:18 2002 EDT

Modified files:

    /php4/main  php_ini.c

Log: Fix cli/cgi -c option # I must be sleeping Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.81 php4/main/php_ini.c:1.82

--- php4/main/php_ini.c:1.81    Thu Apr 11 20:20:28 2002

+++ php4/main/php_ini.c Sat Apr 13 10:12:17 2002 @@ -16,7 +16,7 @@

    +----------------------------------------------------------------------+

*/ -/* $Id: php_ini.c,v 1.81 2002/04/12 00:20:28 yohgaki Exp $ */ +/* $Id: php_ini.c,v 1.82 2002/04/13 14:12:17 yohgaki Exp $ */ #include "php.h" #ifndef PHP_WIN32 @@ -265,7 +265,7 @@

        fh.handle.fp = NULL;
        /* Check if php_ini_path_override is a file */
-       if (php_ini_path_override && !php_ini_path_override[0]) {
+       if (php_ini_path_override && php_ini_path_override[0]) {
                fh.handle.fp = VCWD_FOPEN(php_ini_path_override, "r");
        }
        /* Search php.ini file in search path */

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