[PHP-CVS] cvs: php-src(PHP_4_3) /main php_ini.c

[Zeev Suraski]

zeev            Thu Jul  1 11:43:40 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/main       php_ini.c 
  Log:
  MFH (more or less) registry-based setting for the location of php.ini
  
  
http://cvs.php.net/diff.php/php-src/main/php_ini.c?r1=1.106.2.13&r2=1.106.2.14&ty=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.106.2.13 php-src/main/php_ini.c:1.106.2.14
--- php-src/main/php_ini.c:1.106.2.13   Mon Feb 16 09:29:07 2004
+++ php-src/main/php_ini.c      Thu Jul  1 11:43:40 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_ini.c,v 1.106.2.13 2004/02/16 14:29:07 derick Exp $ */
+/* $Id: php_ini.c,v 1.106.2.14 2004/07/01 15:43:40 zeev Exp $ */
 
 /* Check CWD for php.ini */
 #define INI_CHECK_CWD
@@ -31,6 +31,7 @@
 #include "SAPI.h"
 #include "php_main.h"
 #include "php_scandir.h"
+#include "win32/php_registry.h"
 
 #if HAVE_SCANDIR && HAVE_ALPHASORT && HAVE_DIRENT_H
 #include <dirent.h>
@@ -227,11 +228,20 @@
 }
 /* }}} */
 
+#ifdef PHP_WIN32
+#define NUM_INI_SEARCH_LOCATIONS       4
+#else
+#define NUM_INI_SEARCH_LOCATIONS       3
+#endif
+
 /* {{{ php_init_config
  */
 int php_init_config()
 {
        char *env_location, *php_ini_search_path;
+#ifdef PHP_WIN32
+       char *registry_location;
+#endif
        char *binary_location;
        int safe_mode_state;
        char *open_basedir;
@@ -271,7 +281,7 @@
                char *default_location;
                static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
 
-               php_ini_search_path = (char *) emalloc(MAXPATHLEN * 3 + 
strlen(env_location) + 3 + 1);
+               php_ini_search_path = (char *) emalloc(MAXPATHLEN * 
NUM_INI_SEARCH_LOCATIONS + strlen(env_location) + NUM_INI_SEARCH_LOCATIONS + 1);
                free_ini_search_path = 1;
                php_ini_search_path[0] = 0;
 
@@ -286,6 +296,17 @@
                        }
                        strcat(php_ini_search_path, env_location);
                }
+
+#ifdef PHP_WIN32
+               registry_location = GetIniPathFromRegistry();
+               if (registry_location) {
+                       if (*php_ini_search_path) {
+                               strcat(php_ini_search_path, paths_separator);
+                       }
+                       strcat(php_ini_search_path, registry_location);
+                       efree(registry_location);
+               }
+#endif
 
                /* Add cwd */
 #ifdef INI_CHECK_CWD

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