diff options
author | Ilia Alshanetsky <iliaa@php.net> | 2003-01-28 01:51:26 +0000 |
---|---|---|
committer | Ilia Alshanetsky <iliaa@php.net> | 2003-01-28 01:51:26 +0000 |
commit | 96f815aa74dc34beb85aa49c29696f8de16a6c26 (patch) | |
tree | 672c445e5c71ec8d691af24d0d04bf2f152e0b43 | |
parent | 12e5f25ced5752e31b84fae1bb0fd82ec1ca5eb9 (diff) | |
download | php-git-96f815aa74dc34beb85aa49c29696f8de16a6c26.tar.gz |
MFH (scandir patch).
-rw-r--r-- | configure.in | 4 | ||||
-rw-r--r-- | main/php_ini.c | 8 | ||||
-rw-r--r-- | win32/php4dllts.dsp | 8 | ||||
-rw-r--r-- | win32/readdir.c | 80 | ||||
-rw-r--r-- | win32/readdir.h | 5 |
5 files changed, 14 insertions, 91 deletions
diff --git a/configure.in b/configure.in index fda74cc4ed..e9923d2e50 100644 --- a/configure.in +++ b/configure.in @@ -445,6 +445,7 @@ dnl ------------------------------------------------------------------------- AC_FUNC_VPRINTF AC_CHECK_FUNCS( +alphasort \ asctime_r \ chroot \ ctime_r \ @@ -480,6 +481,7 @@ random \ rand_r \ regcomp \ res_search \ +scandir \ setitimer \ setlocale \ localeconv \ @@ -1093,7 +1095,7 @@ PHP_SUBST(install_targets) PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c) PHP_ADD_SOURCES(main, main.c snprintf.c spprintf.c php_sprintf.c \ - safe_mode.c fopen_wrappers.c alloca.c \ + safe_mode.c fopen_wrappers.c alloca.c php_scandir.c \ php_ini.c SAPI.c rfc1867.c php_content_types.c strlcpy.c \ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \ streams.c network.c php_open_temporary_file.c php_logos.c \ diff --git a/main/php_ini.c b/main/php_ini.c index 75b465456b..747ef5f05f 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -31,12 +31,10 @@ #include "SAPI.h" #include "php_main.h" -#ifdef PHP_WIN32 -#include "readdir.h" -/* this makes no sence, vc6 errors if this declaration is not here */ -extern int alphasort(const struct dirent **a, const struct dirent **b); +#if !HAVE_SCANDIR || !HAVE_ALPHASORT + #include "php_scandir.h" #else -#include "dirent.h" + #include <dirent.h> #endif #ifndef S_ISREG diff --git a/win32/php4dllts.dsp b/win32/php4dllts.dsp index 4bf385b85c..2846da63c4 100644 --- a/win32/php4dllts.dsp +++ b/win32/php4dllts.dsp @@ -210,6 +210,10 @@ SOURCE=..\main\php_open_temporary_file.c # End Source File
# Begin Source File
+SOURCE=..\main\php_scandir.c
+# End Source File
+# Begin Source File
+
SOURCE=..\main\php_ticks.c
# End Source File
# Begin Source File
@@ -342,6 +346,10 @@ SOURCE=..\main\php_output.h # End Source File
# Begin Source File
+SOURCE=..\main\php_scandir.h
+# End Source File
+# Begin Source File
+
SOURCE=..\main\php_regex.h
# End Source File
# Begin Source File
diff --git a/win32/readdir.c b/win32/readdir.c index 78db689b29..e33d19bde5 100644 --- a/win32/readdir.c +++ b/win32/readdir.c @@ -141,83 +141,3 @@ int rewinddir(DIR *dp) return 0; } - -int alphasort(const struct dirent **a, const struct dirent **b) -{ - return strcoll((*a)->d_name,(*b)->d_name); -} - -int scandir(const char *dirname, - struct dirent **namelist[], - int (*selector) (const struct dirent *entry), - int (*compare) (const struct dirent **a, const struct dirent **b)) -{ - DIR *dirp = NULL; - struct dirent **vector = NULL; - struct dirent *dp = NULL; - int vector_size = 0; - - int nfiles = 0; - int fail = 0; - - if (namelist == NULL) - return -1; - - dirp = opendir(dirname); - if (dirp == NULL) - return -1; - - for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) - { - int dsize = 0; - struct dirent *newdp = NULL; - - if (selector && (*selector)(dp) == 0) - continue; - - if (nfiles == vector_size) - { - struct dirent **newv; - if (vector_size == 0) - vector_size = 10; - else - vector_size *= 2; - - newv = (struct dirent **) realloc (vector, vector_size * sizeof (struct dirent *)); - if (newv == NULL) - { - fail = 1; - break; - } - vector = newv; - } - - dsize = sizeof (struct dirent) + ((strlen(dp->d_name) + 1) * sizeof(char)); - newdp = (struct dirent *) malloc(dsize); - - if (newdp == NULL) - { - fail = 1; - break; - } - - vector[nfiles++] = (struct dirent *) memcpy(newdp, dp, dsize); - } - - closedir(dirp); - - if (fail) - { - while (nfiles-- > 0) free(vector[nfiles]); - free(vector); - return -1; - } - - - *namelist = vector; - - if (compare) - qsort (*namelist,nfiles,sizeof (struct dirent *),compare); - - return nfiles; -} diff --git a/win32/readdir.h b/win32/readdir.h index b63015355a..419dc95c24 100644 --- a/win32/readdir.h +++ b/win32/readdir.h @@ -39,10 +39,5 @@ struct dirent *readdir(DIR *); int readdir_r(DIR *, struct dirent *, struct dirent **); int closedir(DIR *); int rewinddir(DIR *); -int scandir(const char *dirname, - struct dirent **namelist[], - int (*selector) (const struct dirent *entry), - int (*compare) (const struct dirent **a, const struct dirent **b)); -int alphasort(const struct dirent **a, const struct dirent **b); #endif /* READDIR_H */ |