backport zend_stat usage

Author: NattyNarwhal

win32/glob.c

@@ -161,25 +161,25 @@ struct glob_lim {
 
 struct glob_path_stat {
 	char		*gps_path;
-	struct stat	*gps_stat;
+	zend_stat stat	*gps_stat;
 };
 
 static int	 compare(const void *, const void *);
 static int	 compare_gps(const void *, const void *);
 static int	 g_Ctoc(const Char *, char *, size_t);
-static int	 g_lstat(Char *, struct stat *, glob_t *);
+static int	 g_lstat(Char *, zend_stat *, glob_t *);
 static DIR	*g_opendir(Char *, glob_t *);
 static Char	*g_strchr(const Char *, int);
 static int	 g_strncmp(const Char *, const char *, size_t);
-static int	 g_stat(Char *, struct stat *, glob_t *);
+static int	 g_stat(Char *, zend_stat *, glob_t *);
 static int	 glob0(const Char *, glob_t *, struct glob_lim *);
 static int	 glob1(Char *, Char *, glob_t *, struct glob_lim *);
 static int	 glob2(Char *, Char *, Char *, Char *, Char *, Char *,
 		    glob_t *, struct glob_lim *);
 static int	 glob3(Char *, Char *, Char *, Char *, Char *,
 		    Char *, Char *, glob_t *, struct glob_lim *);
 static int	 globextend(const Char *, glob_t *, struct glob_lim *,
-		    struct stat *);
+		    zend_stat *);
 static const Char *
 		 globtilde(const Char *, Char *, size_t, glob_t *);
 static int	 globexp1(const Char *, glob_t *, struct glob_lim *);
@@ -663,7 +663,7 @@ static int
 glob2(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last,
     Char *pattern, Char *pattern_last, glob_t *pglob, struct glob_lim *limitp)
 {
-	struct stat sb;
+	zend_stat sb;
 	Char *p, *q;
 	int anymeta;
 
@@ -829,13 +829,13 @@ glob3(Char *pathbuf, Char *pathbuf_last, Char *pathend, Char *pathend_last,
  */
 static int
 globextend(const Char *path, glob_t *pglob, struct glob_lim *limitp,
-    struct stat *sb)
+    zend_stat *sb)
 {
 	char **pathv;
 	size_t i, newn, len;
 	char *copy = NULL;
 	const Char *p;
-	struct stat **statv;
+	zend_stat **statv;
 
 	newn = 2 + pglob->gl_pathc + pglob->gl_offs;
 	if (pglob->gl_offs >= SSIZE_MAX ||
@@ -1043,27 +1043,27 @@ g_opendir(Char *str, glob_t *pglob)
 }
 
 static int
-g_lstat(Char *fn, struct stat *sb, glob_t *pglob)
+g_lstat(Char *fn, zend_stat *sb, glob_t *pglob)
 {
 	char buf[PATH_MAX];
 
 	if (g_Ctoc(fn, buf, sizeof(buf)))
 		return(-1);
 	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
 		return((*pglob->gl_lstat)(buf, sb));
-	return(lstat(buf, sb));
+	return(php_sys_lstat(buf, sb));
 }
 
 static int
-g_stat(Char *fn, struct stat *sb, glob_t *pglob)
+g_stat(Char *fn, zend_stat *sb, glob_t *pglob)
 {
 	char buf[PATH_MAX];
 
 	if (g_Ctoc(fn, buf, sizeof(buf)))
 		return(-1);
 	if (pglob->gl_flags & GLOB_ALTDIRFUNC)
 		return((*pglob->gl_stat)(buf, sb));
-	return(stat(buf, sb));
+	return(php_sys_stat(buf, sb));
 }
 
 static Char *

win32/glob.h

@@ -38,22 +38,19 @@
 #ifndef _GLOB_H_
 #define	_GLOB_H_
 
-#include <sys/stat.h>
-
 #ifndef PHP_WIN32
 # include <sys/cdefs.h>
 #endif
 
 #include "Zend/zend_stream.h"
 
-struct stat;
 typedef struct {
 	size_t gl_pathc;	/* Count of total paths so far. */
 	size_t gl_matchc;	/* Count of paths matching pattern. */
 	size_t gl_offs;		/* Reserved at beginning of gl_pathv. */
 	int gl_flags;		/* Copy of flags parameter to glob. */
 	char **gl_pathv;	/* List of paths matching pattern. */
-	struct stat **gl_statv;	/* Stat entries corresponding to gl_pathv */
+	zend_stat **gl_statv;	/* Stat entries corresponding to gl_pathv */
 				/* Copy of errfunc parameter to glob. */
 	int (*gl_errfunc)(const char *, int);
 
@@ -65,8 +62,8 @@ typedef struct {
 	void (*gl_closedir)(void *);
 	struct dirent *(*gl_readdir)(void *);	
 	void *(*gl_opendir)(const char *);
-	int (*gl_lstat)(const char *, struct stat *);
-	int (*gl_stat)(const char *, struct stat *);
+	int (*gl_lstat)(const char *, zend_stat *);
+	int (*gl_stat)(const char *, zend_stat *);
 } glob_t;
 
 #define	GLOB_APPEND	0x0001	/* Append to output from previous call. */