Skip to content
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

Use win32 glob implementation on all platforms #18164

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Use win32 glob implementation on all platforms #18164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4338feb
Move glob to main/ from win32/
NattyNarwhal Mar 21, 2025
90ce93f
Enable building with win32 glob on non-windows
NattyNarwhal Mar 21, 2025
4ab5272
Massive first pass at conversion to internal glob
NattyNarwhal Mar 27, 2025
8264628
Fix inclusion of GLOB_ONLYDIR
NattyNarwhal Mar 27, 2025
216fede
Remove HAVE_GLOBs
NattyNarwhal Mar 27, 2025
0280256
We don't need to care about being POSIXly correct for internal glob
NattyNarwhal Mar 27, 2025
338f9ca
Check for reallocarray
NattyNarwhal Mar 27, 2025
143e960
Forgot to move this file from win32/ to main/
NattyNarwhal Mar 27, 2025
a3653bf
Check for issetugid (BSD function)
NattyNarwhal Mar 27, 2025
c4a0046
Allow using the system glob with --enable-system-glob
NattyNarwhal Mar 28, 2025
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
2 changes: 0 additions & 2 deletions Zend/Optimizer/zend_func_infos.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,9 +518,7 @@ static const func_info_t func_infos[] = {
F1("getcwd", MAY_BE_STRING|MAY_BE_FALSE),
F1("readdir", MAY_BE_STRING|MAY_BE_FALSE),
F1("scandir", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
#if defined(HAVE_GLOB)
F1("glob", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING|MAY_BE_FALSE),
#endif
F1("exec", MAY_BE_STRING|MAY_BE_FALSE),
F1("system", MAY_BE_STRING|MAY_BE_FALSE),
F1("escapeshellcmd", MAY_BE_STRING),
Expand Down
14 changes: 14 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,7 @@ AC_CHECK_FUNCS(m4_normalize([
getwd
glob
gmtime_r
issetugid
lchown
localtime_r
memcntl
Expand All @@ -571,6 +572,7 @@ AC_CHECK_FUNCS(m4_normalize([
poll
pthread_jit_write_protect_np
putenv
reallocarray
scandir
setenv
setitimer
Expand All @@ -591,6 +593,17 @@ AC_CHECK_FUNCS(m4_normalize([
vasprintf
]))

PHP_ARG_ENABLE([system-glob],
[whether to use the system glob function],
[AS_HELP_STRING([--enable-system-glob],
[Use the system glob function instead of the PHP provided replacement.])],
[no],
[no])

AS_VAR_IF([PHP_SYSTEM_GLOB], [yes],
[AC_DEFINE([PHP_SYSTEM_GLOB], [1],
[Define to 1 if PHP will use the system glob function instead of php_glob.])])

AC_CHECK_FUNC([inet_ntop],, [AC_MSG_FAILURE([Required inet_ntop not found.])])
AC_CHECK_FUNC([inet_pton],, [AC_MSG_FAILURE([Required inet_pton not found.])])

Expand Down Expand Up @@ -1631,6 +1644,7 @@ PHP_ADD_SOURCES([main], m4_normalize([
php_content_types.c
php_ini_builder.c
php_ini.c
php_glob.c
php_odbc_utils.c
php_open_temporary_file.c
php_scandir.c
Expand Down
30 changes: 8 additions & 22 deletions ext/ffi/ffi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,7 @@
#endif
#endif

#ifdef HAVE_GLOB
#ifdef PHP_WIN32
#include "win32/glob.h"
#else
#include <glob.h>
#endif
#endif
#include "php_glob.h"

#ifndef __BIGGEST_ALIGNMENT__
/* XXX need something better, perhaps with regard to SIMD, etc. */
Expand Down Expand Up @@ -5362,16 +5356,15 @@ ZEND_INI_END()

static zend_result zend_ffi_preload_glob(const char *filename) /* {{{ */
{
#ifdef HAVE_GLOB
glob_t globbuf;
php_glob_t globbuf;
int ret;
unsigned int i;

memset(&globbuf, 0, sizeof(glob_t));
memset(&globbuf, 0, sizeof(globbuf));

ret = glob(filename, 0, NULL, &globbuf);
#ifdef GLOB_NOMATCH
if (ret == GLOB_NOMATCH || !globbuf.gl_pathc) {
ret = php_glob(filename, 0, NULL, &globbuf);
#ifdef PHP_GLOB_NOMATCH
if (ret == PHP_GLOB_NOMATCH || !globbuf.gl_pathc) {
#else
if (!globbuf.gl_pathc) {
#endif
Expand All @@ -5380,20 +5373,13 @@ static zend_result zend_ffi_preload_glob(const char *filename) /* {{{ */
for(i=0 ; i<globbuf.gl_pathc; i++) {
zend_ffi *ffi = zend_ffi_load(globbuf.gl_pathv[i], 1);
if (!ffi) {
globfree(&globbuf);
php_globfree(&globbuf);
return FAILURE;
}
efree(ffi);
}
globfree(&globbuf);
php_globfree(&globbuf);
}
#else
zend_ffi *ffi = zend_ffi_load(filename, 1);
if (!ffi) {
return FAILURE;
}
efree(ffi);
#endif

return SUCCESS;
}
Expand Down
24 changes: 7 additions & 17 deletions ext/opcache/zend_accelerator_blacklist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,7 @@
# define REGEX_MODE (REG_EXTENDED|REG_NOSUB)
#endif

#ifdef HAVE_GLOB
#ifdef PHP_WIN32
#include "win32/glob.h"
#else
#include <glob.h>
#endif
#endif
#include "php_glob.h"

#include "ext/pcre/php_pcre.h"

Expand Down Expand Up @@ -320,16 +314,15 @@ static void zend_accel_blacklist_loadone(zend_blacklist *blacklist, char *filena

void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename)
{
#ifdef HAVE_GLOB
glob_t globbuf;
php_glob_t globbuf;
int ret;
unsigned int i;

memset(&globbuf, 0, sizeof(glob_t));
memset(&globbuf, 0, sizeof(globbuf));

ret = glob(filename, 0, NULL, &globbuf);
#ifdef GLOB_NOMATCH
if (ret == GLOB_NOMATCH || !globbuf.gl_pathc) {
ret = php_glob(filename, 0, NULL, &globbuf);
#ifdef PHP_GLOB_NOMATCH
if (ret == PHP_GLOB_NOMATCH || !globbuf.gl_pathc) {
#else
if (!globbuf.gl_pathc) {
#endif
Expand All @@ -338,11 +331,8 @@ void zend_accel_blacklist_load(zend_blacklist *blacklist, char *filename)
for(i=0 ; i<globbuf.gl_pathc; i++) {
zend_accel_blacklist_loadone(blacklist, globbuf.gl_pathv[i]);
}
globfree(&globbuf);
php_globfree(&globbuf);
}
#else
zend_accel_blacklist_loadone(blacklist, filename);
#endif
zend_accel_blacklist_update_regexp(blacklist);
}

Expand Down
10 changes: 0 additions & 10 deletions ext/spl/spl_directory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ static inline bool spl_intern_is_glob(const spl_filesystem_object *intern)

PHPAPI zend_string *spl_filesystem_object_get_path(const spl_filesystem_object *intern) /* {{{ */
{
#ifdef HAVE_GLOB
if (intern->type == SPL_FS_DIR && spl_intern_is_glob(intern)) {
size_t len = 0;
char *tmp = php_glob_stream_get_path(intern->u.dir.dirp, &len);
Expand All @@ -220,7 +219,6 @@ PHPAPI zend_string *spl_filesystem_object_get_path(const spl_filesystem_object *
}
return zend_string_init(tmp, len, /* persistent */ false);
}
#endif
if (!intern->path) {
return NULL;
}
Expand Down Expand Up @@ -641,14 +639,12 @@ static inline HashTable *spl_filesystem_object_get_debug_info(zend_object *objec
spl_set_private_debug_info_property(spl_ce_SplFileInfo, "fileName", strlen("fileName"), debug_info, &tmp);
}
if (intern->type == SPL_FS_DIR) {
#ifdef HAVE_GLOB
if (spl_intern_is_glob(intern)) {
ZVAL_STR_COPY(&tmp, intern->path);
} else {
ZVAL_FALSE(&tmp);
}
spl_set_private_debug_info_property(spl_ce_DirectoryIterator, "glob", strlen("glob"), debug_info, &tmp);
#endif
if (intern->u.dir.sub_path) {
ZVAL_STR_COPY(&tmp, intern->u.dir.sub_path);
} else {
Expand Down Expand Up @@ -721,13 +717,11 @@ static void spl_filesystem_object_construct(INTERNAL_FUNCTION_PARAMETERS, zend_l

/* spl_filesystem_dir_open() may emit an E_WARNING */
zend_replace_error_handling(EH_THROW, spl_ce_UnexpectedValueException, &error_handling);
#ifdef HAVE_GLOB
if (SPL_HAS_FLAG(ctor_flags, DIT_CTOR_GLOB) && !zend_string_starts_with_literal(path, "glob://")) {
path = zend_strpprintf(0, "glob://%s", ZSTR_VAL(path));
spl_filesystem_dir_open(intern, path);
zend_string_release(path);
} else
#endif
{
spl_filesystem_dir_open(intern, path);

Expand Down Expand Up @@ -1582,7 +1576,6 @@ PHP_METHOD(RecursiveDirectoryIterator, __construct)
}
/* }}} */

#ifdef HAVE_GLOB
/* {{{ Cronstructs a new dir iterator from a glob expression (no glob:// needed). */
PHP_METHOD(GlobIterator, __construct)
{
Expand All @@ -1607,7 +1600,6 @@ PHP_METHOD(GlobIterator, count)
RETURN_LONG(php_glob_stream_get_count(intern->u.dir.dirp, NULL));
}
/* }}} */
#endif /* HAVE_GLOB */

/* {{{ forward declarations to the iterator handlers */
static void spl_filesystem_dir_it_dtor(zend_object_iterator *iter);
Expand Down Expand Up @@ -2782,11 +2774,9 @@ PHP_MINIT_FUNCTION(spl_directory)
spl_filesystem_object_check_handlers.clone_obj = NULL;
spl_filesystem_object_check_handlers.get_method = spl_filesystem_object_get_method_check;

#ifdef HAVE_GLOB
spl_ce_GlobIterator = register_class_GlobIterator(spl_ce_FilesystemIterator, zend_ce_countable);
spl_ce_GlobIterator->create_object = spl_filesystem_object_new;
spl_ce_GlobIterator->default_object_handlers = &spl_filesystem_object_check_handlers;
#endif

spl_ce_SplFileObject = register_class_SplFileObject(spl_ce_SplFileInfo, spl_ce_RecursiveIterator, spl_ce_SeekableIterator);
spl_ce_SplFileObject->default_object_handlers = &spl_filesystem_object_check_handlers;
Expand Down
2 changes: 0 additions & 2 deletions ext/spl/spl_directory.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,13 @@ public function getSubPath(): string {}
public function getSubPathname(): string {}
}

#ifdef HAVE_GLOB
class GlobIterator extends FilesystemIterator implements Countable
{
public function __construct(string $pattern, int $flags = FilesystemIterator::KEY_AS_PATHNAME | FilesystemIterator::CURRENT_AS_FILEINFO) {}

/** @tentative-return-type */
public function count(): int {}
}
#endif

class SplFileObject extends SplFileInfo implements RecursiveIterator, SeekableIterator
{
Expand Down
13 changes: 2 additions & 11 deletions ext/spl/spl_directory_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions ext/standard/basic_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,7 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */

php_register_url_stream_wrapper("php", &php_stream_php_wrapper);
php_register_url_stream_wrapper("file", &php_plain_files_wrapper);
#ifdef HAVE_GLOB
php_register_url_stream_wrapper("glob", &php_glob_stream_wrapper);
#endif
php_register_url_stream_wrapper("data", &php_stream_rfc2397_wrapper);
php_register_url_stream_wrapper("http", &php_stream_http_wrapper);
php_register_url_stream_wrapper("ftp", &php_stream_ftp_wrapper);
Expand Down
2 changes: 0 additions & 2 deletions ext/standard/basic_functions.stub.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2687,13 +2687,11 @@ function readdir($dir_handle = null): string|false {}
*/
function scandir(string $directory, int $sorting_order = SCANDIR_SORT_ASCENDING, $context = null): array|false {}

#ifdef HAVE_GLOB
/**
* @return array<int, string>|false
* @refcount 1
*/
function glob(string $pattern, int $flags = 0): array|false {}
#endif

/* exec.c */

Expand Down
8 changes: 1 addition & 7 deletions ext/standard/basic_functions_arginfo.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading