[PHP-CVS] cvs: php-src(PHP_5_2) /main safe_mode.c

[Jani Taskinen]

jani            Thu Oct 11 09:33:53 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/main       safe_mode.c 
  Log:
  MFB53
  
http://cvs.php.net/viewvc.cgi/php-src/main/safe_mode.c?r1=1.62.2.1.2.12&r2=1.62.2.1.2.13&diff_format=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.62.2.1.2.12 
php-src/main/safe_mode.c:1.62.2.1.2.13
--- php-src/main/safe_mode.c:1.62.2.1.2.12      Thu Oct 11 08:28:02 2007
+++ php-src/main/safe_mode.c    Thu Oct 11 09:33:53 2007
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: safe_mode.c,v 1.62.2.1.2.12 2007/10/11 08:28:02 jani Exp $ */
+/* $Id: safe_mode.c,v 1.62.2.1.2.13 2007/10/11 09:33:53 jani Exp $ */
 
 #include "php.h"
 
@@ -89,13 +89,12 @@
 #if HAVE_BROKEN_GETCWD
                char ftest[MAXPATHLEN];
 
-               strcpy(ftest,filename);
+               strcpy(ftest, filename);
                if (VCWD_GETCWD(ftest, sizeof(ftest)) == NULL) {
-                       strcpy(path,filename);
-               } else {
-                       expand_filepath(filename, path TSRMLS_CC);
-               }
+                       strcpy(path, filename);
+               } else
 #endif
+               expand_filepath(filename, path TSRMLS_CC);
 
                ret = VCWD_STAT(path, &sb);
                if (ret < 0) {

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