Browse Source

replace the stack var by a macro

pull/2612/head
Anatol Belski 9 years ago
parent
commit
9ad0d0ca3c
  1. 10
      ext/standard/dl.c
  2. 1
      main/build-defs.h.in
  3. 8
      main/php_ini.c
  4. 1
      win32/build/config.w32.h.in

10
ext/standard/dl.c

@ -116,17 +116,15 @@ PHPAPI int php_load_extension(char *filename, int type, int start_now)
} else {
spprintf(&libpath, 0, "%s%c%s", extension_dir, DEFAULT_SLASH, filename); /* SAFE */
}
if (VCWD_ACCESS(libpath, F_OK)) {
/* If file does not exist, consider as extension name and build file name */
const char *libpath_prefix = "";
char *orig_libpath = libpath;
#if PHP_WIN32
libpath_prefix = "php_";
#endif
if (slash_suffix) {
spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */
spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */
} else {
spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */
spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */
}
if (VCWD_ACCESS(libpath, F_OK)) {

1
main/build-defs.h.in

@ -89,3 +89,4 @@
#define PHP_CONFIG_FILE_PATH "@EXPANDED_PHP_CONFIG_FILE_PATH@"
#define PHP_CONFIG_FILE_SCAN_DIR "@EXPANDED_PHP_CONFIG_FILE_SCAN_DIR@"
#define PHP_SHLIB_SUFFIX "@SHLIB_DL_SUFFIX_NAME@"
#define PHP_SHLIB_EXT_PREFIX ""

8
main/php_ini.c

@ -375,16 +375,12 @@ static void php_load_zend_extension_cb(void *arg)
if (VCWD_ACCESS(libpath, F_OK)) {
/* If file does not exist, consider as extension name and build file name */
const char *libpath_prefix = "";
char *orig_libpath = libpath;
#if PHP_WIN32
libpath_prefix = "php_";
#endif
if (slash_suffix) {
spprintf(&libpath, 0, "%s%s%s." PHP_SHLIB_SUFFIX, extension_dir, libpath_prefix, filename); /* SAFE */
spprintf(&libpath, 0, "%s" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, filename); /* SAFE */
} else {
spprintf(&libpath, 0, "%s%c%s%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, libpath_prefix, filename); /* SAFE */
spprintf(&libpath, 0, "%s%c" PHP_SHLIB_EXT_PREFIX "%s." PHP_SHLIB_SUFFIX, extension_dir, DEFAULT_SLASH, filename); /* SAFE */
}
if (VCWD_ACCESS(libpath, F_OK)) {

1
win32/build/config.w32.h.in

@ -136,6 +136,7 @@
#define HAVE_FNMATCH
#define HAVE_GLOB
#define PHP_SHLIB_SUFFIX "dll"
#define PHP_SHLIB_EXT_PREFIX "php_"
#define HAVE_SQLDATASOURCES
/* Win32 supports strcoll */

Loading…
Cancel
Save