Massive first pass at conversion to internal glob

Have not tested yet. the big things are:

- Should be invisible to userland PHP code.
- A lot of :%s/GLOB_/PHP_GLOB_/g; the diff can be noisy as a result,
  especially in comments.
- Prefixes everything with PHP_ to avoid conflicts with system glob in
  case it gets included transitively.
- A lot of weird shared definitions that were sprawled out to other
  headers are now included in php_glob.h.
- A lot of (but not yet all cases) of HAVE_GLOB are removed, since we
  can always fall back to php_glob.
- Using the system glob is not wired up yet; it'll need more shim
  ifdefs for each flag type than just glob_t/glob/globfree defs.

Author: NattyNarwhal

ext/ffi/ffi.c

@@ -5356,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
@@ -5374,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;
 }

ext/opcache/zend_accelerator_blacklist.c

@@ -314,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
@@ -332,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);
 }
 

ext/standard/dir.c

@@ -338,7 +338,6 @@ PHP_FUNCTION(readdir)
 }
 /* }}} */
 
-#ifdef HAVE_GLOB
 /* {{{ Find pathnames matching a pattern */
 PHP_FUNCTION(glob)
 {
@@ -351,7 +350,7 @@ PHP_FUNCTION(glob)
 	char *pattern = NULL;
 	size_t pattern_len;
 	zend_long flags = 0;
-	glob_t globbuf;
+	php_glob_t globbuf;
 	size_t n;
 	int ret;
 	bool basedir_limit = 0;
@@ -368,7 +367,7 @@ PHP_FUNCTION(glob)
 		RETURN_FALSE;
 	}
 
-	if ((GLOB_AVAILABLE_FLAGS & flags) != flags) {
+	if ((PHP_GLOB_AVAILABLE_FLAGS & flags) != flags) {
 		php_error_docref(NULL, E_WARNING, "At least one of the passed flags is invalid or not supported on this platform");
 		RETURN_FALSE;
 	}
@@ -392,14 +391,14 @@ PHP_FUNCTION(glob)
 #endif
 
 
-	memset(&globbuf, 0, sizeof(glob_t));
+	memset(&globbuf, 0, sizeof(globbuf));
 	globbuf.gl_offs = 0;
-	if (0 != (ret = glob(pattern, flags & GLOB_FLAGMASK, NULL, &globbuf))) {
-#ifdef GLOB_NOMATCH
-		if (GLOB_NOMATCH == ret) {
+	if (0 != (ret = php_glob(pattern, flags & PHP_GLOB_FLAGMASK, NULL, &globbuf))) {
+#ifdef PHP_GLOB_NOMATCH
+		if (PHP_GLOB_NOMATCH == ret) {
 			/* Some glob implementation simply return no data if no matches
-			   were found, others return the GLOB_NOMATCH error code.
-			   We don't want to treat GLOB_NOMATCH as an error condition
+			   were found, others return the PHP_GLOB_NOMATCH error code.
+			   We don't want to treat PHP_GLOB_NOMATCH as an error condition
 			   so that PHP glob() behaves the same on both types of
 			   implementations and so that 'foreach (glob() as ...'
 			   can be used for simple glob() calls without further error
@@ -413,7 +412,7 @@ PHP_FUNCTION(glob)
 
 	/* now catch the FreeBSD style of "no matches" */
 	if (!globbuf.gl_pathc || !globbuf.gl_pathv) {
-#ifdef GLOB_NOMATCH
+#ifdef PHP_GLOB_NOMATCH
 no_results:
 #endif
 		array_init(return_value);
@@ -428,15 +427,15 @@ PHP_FUNCTION(glob)
 				continue;
 			}
 		}
-		/* we need to do this every time since GLOB_ONLYDIR does not guarantee that
+		/* we need to do this every time since PHP_GLOB_ONLYDIR does not guarantee that
 		 * all directories will be filtered. GNU libc documentation states the
 		 * following:
 		 * If the information about the type of the file is easily available
 		 * non-directories will be rejected but no extra work will be done to
 		 * determine the information for each file. I.e., the caller must still be
 		 * able to filter directories out.
 		 */
-		if (flags & GLOB_ONLYDIR) {
+		if (flags & PHP_GLOB_ONLYDIR) {
 			zend_stat_t s = {0};
 
 			if (0 != VCWD_STAT(globbuf.gl_pathv[n], &s)) {
@@ -451,15 +450,14 @@ PHP_FUNCTION(glob)
 		zend_hash_next_index_insert_new(Z_ARRVAL_P(return_value), &tmp);
 	}
 
-	globfree(&globbuf);
+	php_globfree(&globbuf);
 
 	if (basedir_limit && !zend_hash_num_elements(Z_ARRVAL_P(return_value))) {
 		zend_array_destroy(Z_ARR_P(return_value));
 		RETURN_FALSE;
 	}
 }
 /* }}} */
-#endif
 
 /* {{{ List files & directories inside the specified path */
 PHP_FUNCTION(scandir)

ext/standard/dir.stub.php

@@ -13,64 +13,62 @@
  */
 const PATH_SEPARATOR = UNKNOWN;
 
-#ifdef HAVE_GLOB
-#if (defined(GLOB_BRACE) && GLOB_BRACE != 0)
+#if (defined(PHP_GLOB_BRACE) && PHP_GLOB_BRACE != 0)
 /**
  * @var int
- * @cvalue GLOB_BRACE
+ * @cvalue PHP_GLOB_BRACE
  */
 const GLOB_BRACE = UNKNOWN;
 #endif
-#if (defined(GLOB_ERR) && GLOB_ERR != 0)
+#if (defined(PHP_GLOB_ERR) && PHP_GLOB_ERR != 0)
 /**
  * @var int
- * @cvalue GLOB_ERR
+ * @cvalue PHP_GLOB_ERR
  */
 const GLOB_ERR = UNKNOWN;
 #endif
-#if (defined(GLOB_MARK) && GLOB_MARK != 0)
+#if (defined(PHP_GLOB_MARK) && PHP_GLOB_MARK != 0)
 /**
  * @var int
- * @cvalue GLOB_MARK
+ * @cvalue PHP_GLOB_MARK
  */
 const GLOB_MARK = UNKNOWN;
 #endif
-#if (defined(GLOB_NOCHECK) && GLOB_NOCHECK != 0)
+#if (defined(PHP_GLOB_NOCHECK) && PHP_GLOB_NOCHECK != 0)
 /**
  * @var int
- * @cvalue GLOB_NOCHECK
+ * @cvalue PHP_GLOB_NOCHECK
  */
 const GLOB_NOCHECK = UNKNOWN;
 #endif
-#if (defined(GLOB_NOESCAPE) && GLOB_NOESCAPE != 0)
+#if (defined(PHP_GLOB_NOESCAPE) && PHP_GLOB_NOESCAPE != 0)
 /**
  * @var int
- * @cvalue GLOB_NOESCAPE
+ * @cvalue PHP_GLOB_NOESCAPE
  */
 const GLOB_NOESCAPE = UNKNOWN;
 #endif
-#if (defined(GLOB_NOSORT) && GLOB_NOSORT != 0)
+#if (defined(PHP_GLOB_NOSORT) && PHP_GLOB_NOSORT != 0)
 /**
  * @var int
- * @cvalue GLOB_NOSORT
+ * @cvalue PHP_GLOB_NOSORT
  */
 const GLOB_NOSORT = UNKNOWN;
 #endif
-#ifdef GLOB_ONLYDIR
+#ifdef PHP_GLOB_ONLYDIR
 /**
  * @var int
- * @cvalue GLOB_ONLYDIR
+ * @cvalue PHP_GLOB_ONLYDIR
  */
 const GLOB_ONLYDIR = UNKNOWN;
 #endif
-#ifdef GLOB_AVAILABLE_FLAGS
+#ifdef PHP_GLOB_AVAILABLE_FLAGS
 /**
  * @var int
- * @cvalue GLOB_AVAILABLE_FLAGS
+ * @cvalue PHP_GLOB_AVAILABLE_FLAGS
  */
 const GLOB_AVAILABLE_FLAGS = UNKNOWN;
 #endif
-#endif
 /**
  * @var int
  * @cvalue PHP_SCANDIR_SORT_ASCENDING

ext/standard/dir_arginfo.h

@@ -19,45 +19,6 @@
 
 #include "php_glob.h"
 
-#ifdef HAVE_GLOB
-
-#ifndef GLOB_BRACE
-#define GLOB_BRACE 0
-#endif
-
-#ifndef GLOB_ERR
-#define GLOB_ERR 0
-#endif
-
-#ifndef GLOB_MARK
-#define GLOB_MARK 0
-#endif
-
-#ifndef GLOB_NOCHECK
-#define GLOB_NOCHECK 0
-#endif
-
-#ifndef GLOB_NOESCAPE
-#define GLOB_NOESCAPE 0
-#endif
-
-#ifndef GLOB_NOSORT
-#define GLOB_NOSORT 0
-#endif
-
-#ifndef GLOB_ONLYDIR
-#define GLOB_ONLYDIR (1<<30)
-#define GLOB_EMULATE_ONLYDIR
-#define GLOB_FLAGMASK (~GLOB_ONLYDIR)
-#else
-#define GLOB_FLAGMASK (~0)
-#endif
-
-/* This is used for checking validity of passed flags (passing invalid flags causes segfault in glob()!! */
-#define GLOB_AVAILABLE_FLAGS (0 | GLOB_BRACE | GLOB_MARK | GLOB_NOSORT | GLOB_NOCHECK | GLOB_NOESCAPE | GLOB_ERR | GLOB_ONLYDIR)
-
-#endif /* HAVE_GLOB */
-
 char dirsep_str[2], pathsep_str[2];
 
 #endif /* PHP_DIR_INT_H */