This commit was manufactured by cvs2svn to create branch 'PHP_4_3'.

3 files changed, 142 insertions, 0 deletions

diff --git a/main/php_scandir.c b/main/php_scandir.c
new file mode 100644
index 0000000000..a467a42bb9
--- /dev/null
+++ b/main/php_scandir.c
@@ -0,0 +1,116 @@
+/* 
+   +----------------------------------------------------------------------+
+   | PHP Version 4                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2003 The PHP Group                                |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 2.02 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available at through the world-wide-web at                           |
+   | http://www.php.net/license/2_02.txt.                                 |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Shane Caraveo <shane@caraveo.com>                            |
+   |         Ilia Alshanetsky <ilia@prohost.org>                          |
+   +----------------------------------------------------------------------+
+ */
+
+#include "php_scandir.h"
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#else
+#include "php_config.h"
+#endif
+
+#ifndef HAVE_SCANDIR
+ #include <sys/types.h>
+
+ #ifdef HAVE_DIRENT_H
+  #include <dirent.h>
+ #endif
+
+ #ifdef PHP_WIN32
+  #include "win32/readdir.h"
+ #endif  
+
+ #include <stdlib.h>
+ #include <search.h>
+#endif
+
+#ifndef HAVE_ALPHASORT
+int alphasort(const struct dirent **a, const struct dirent **b)
+{
+	return strcoll((*a)->d_name,(*b)->d_name);
+}
+#endif
+
+#ifndef HAVE_SCANDIR
+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;
+
+	if (namelist == NULL) {
+		return -1;
+	}
+
+	if (!(dirp = opendir(dirname))) {
+		return -1;
+	}
+
+	while ((dp = readdir(dirp)) != NULL) {
+		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) {
+				return -1;
+			}
+			vector = newv;
+		}
+
+		dsize = sizeof (struct dirent) + ((strlen(dp->d_name) + 1) * sizeof(char));
+		newdp = (struct dirent *) malloc(dsize);
+
+		if (newdp == NULL) {
+			goto fail;
+		}
+
+		vector[nfiles++] = (struct dirent *) memcpy(newdp, dp, dsize);
+	}
+
+	closedir(dirp);
+
+	*namelist = vector;
+
+	if (compare) {
+		qsort (*namelist, nfiles, sizeof(struct dirent *), compare);
+	}
+
+	return nfiles;
+
+fail:
+	while (nfiles-- > 0) {
+		free(vector[nfiles]);
+	}
+	free(vector);
+	return -1;	
+}
+#endif
diff --git a/main/php_scandir.h b/main/php_scandir.h
new file mode 100644
index 0000000000..b7a2b9e78b
--- /dev/null
+++ b/main/php_scandir.h
@@ -0,0 +1,20 @@
+#include <sys/types.h>
+
+#ifdef HAVE_DIRENT_H
+# include <dirent.h>
+#endif
+
+#ifdef PHP_WIN32
+#include "config.w32.h"
+#include "win32/readdir.h"
+#else
+#include "php_config.h"
+#endif
+
+#ifndef HAVE_ALPHASORT 
+int alphasort(const struct dirent **a, const struct dirent **b);
+#endif
+
+#ifndef HAVE_SCANDIR
+int scandir(const char *dirname, struct dirent **namelist[], int (*selector) (const struct dirent *entry), int (*compare) (const struct dirent **a, const struct dirent **b));
+#endif
diff --git a/pear/tests/osguess.php b/pear/tests/osguess.php
new file mode 100644
index 0000000000..b8356a53a8
--- /dev/null
+++ b/pear/tests/osguess.php
@@ -0,0 +1,6 @@
+<?php
+
+include dirname(__FILE__)."/../OS/Guess.php";
+$os =& new OS_Guess;
+print $os->getSignature() . "\n";
+