diff options
| author | Anatol Belski <ab@php.net> | 2017-07-06 20:47:04 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-07-06 20:47:04 +0200 |
| commit | 9ad0d0ca3c25306f78b5bf08949b10ca516f614c (patch) | |
| tree | 5b3a048b960b349f49d5a588d3abae2e6217fbf3 /ext/standard/dl.c | |
| parent | 9470b2016cf941732c3144598eb7db195446d910 (diff) | |
| download | php-git-9ad0d0ca3c25306f78b5bf08949b10ca516f614c.tar.gz | |
replace the stack var by a macro
Diffstat (limited to 'ext/standard/dl.c')
| -rw-r--r-- | ext/standard/dl.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ext/standard/dl.c b/ext/standard/dl.c index 050516639e..5adae805ce 100644 --- a/ext/standard/dl.c +++ b/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)) { |