Skip to content

main/php_ini.c: remove dead code #4512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 10, 2022
Merged

main/php_ini.c: remove dead code #4512

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 20 additions & 30 deletions main/php_ini.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ PHPAPI void config_zval_dtor(zval *zvalue)
zend_string_release_ex(Z_STR_P(zvalue), 1);
}
}
/* Reset / free active_ini_sectin global */
/* Reset / free active_ini_section global */
#define RESET_ACTIVE_INI_HASH() do { \
active_ini_hash = NULL; \
is_special_section = 0; \
Expand Down Expand Up @@ -395,6 +395,17 @@ static void php_load_zend_extension_cb(void *arg) { }
#endif
/* }}} */

static void append_ini_path(char *php_ini_search_path, int search_path_size, const char *path)
{
static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };

if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}

strlcat(php_ini_search_path, path, search_path_size);
}

/* {{{ php_init_config */
int php_init_config(void)
{
Expand Down Expand Up @@ -424,7 +435,6 @@ int php_init_config(void)
int search_path_size;
char *default_location;
char *env_location;
static const char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 };
#ifdef PHP_WIN32
char *reg_location;
char phprc_path[MAXPATHLEN];
Expand Down Expand Up @@ -475,31 +485,22 @@ int php_init_config(void)

/* Add environment location */
if (env_location[0]) {
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, env_location, search_path_size);
append_ini_path(php_ini_search_path, search_path_size, env_location);
php_ini_file_name = env_location;
}

#ifdef PHP_WIN32
/* Add registry location */
reg_location = GetIniPathFromRegistry();
if (reg_location != NULL) {
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, reg_location, search_path_size);
append_ini_path(php_ini_search_path, search_path_size, reg_location);
efree(reg_location);
}
#endif

/* Add cwd (not with CLI) */
if (!sapi_module.php_ini_ignore_cwd) {
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, ".", search_path_size);
append_ini_path(php_ini_search_path, search_path_size, ".");
}

if (PG(php_binary)) {
Expand All @@ -511,10 +512,8 @@ int php_init_config(void)
if (separator_location && separator_location != binary_location) {
*(separator_location) = 0;
}
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, binary_location, search_path_size);
append_ini_path(php_ini_search_path, search_path_size, binary_location);

efree(binary_location);
}

Expand All @@ -523,29 +522,20 @@ int php_init_config(void)
default_location = (char *) emalloc(MAXPATHLEN + 1);

if (0 < GetWindowsDirectory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, default_location, search_path_size);
append_ini_path(php_ini_search_path, search_path_size, default_location);
}

/* For people running under terminal services, GetWindowsDirectory will
* return their personal Windows directory, so lets add the system
* windows directory too */
if (0 < GetSystemWindowsDirectory(default_location, MAXPATHLEN)) {
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, default_location, search_path_size);
append_ini_path(php_ini_search_path, search_path_size, default_location);
}
efree(default_location);

#else
default_location = PHP_CONFIG_FILE_PATH;
if (*php_ini_search_path) {
strlcat(php_ini_search_path, paths_separator, search_path_size);
}
strlcat(php_ini_search_path, default_location, search_path_size);
append_ini_path(php_ini_search_path, search_path_size, default_location);
#endif
}

Expand Down