* prototype of version_compare, doesn't work yet

5 files changed, 217 insertions, 1 deletions

diff --git a/ext/standard/Makefile.in b/ext/standard/Makefile.in
index 123e4cb110..fdf2b59830 100644
--- a/ext/standard/Makefile.in
+++ b/ext/standard/Makefile.in
@@ -6,7 +6,7 @@ LTLIBRARY_SOURCES=\
 	formatted_print.c fsock.c head.c html.c image.c info.c iptc.c lcg.c \
 	link.c mail.c math.c md5.c metaphone.c microtime.c pack.c pageinfo.c \
         parsedate.c quot_print.c rand.c reg.c soundex.c string.c scanf.c \
-	syslog.c type.c uniqid.c url.c url_scanner.c var.c assert.c \
+	syslog.c type.c uniqid.c url.c url_scanner.c var.c versioning.c assert.c \
 	strnatcmp.c levenshtein.c incomplete_class.c url_scanner_ex.c \
 	ftp_fopen_wrapper.c http_fopen_wrapper.c php_fopen_wrapper.c credits.c
 
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 1e7cf91f40..a0fe897118 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -787,6 +787,9 @@ function_entry basic_functions[] = {
 	PHP_FE(assert,															NULL)
 	PHP_FE(assert_options,													NULL)
 
+    /* functions from versioning.c */
+    PHP_FE(version_compare,													NULL)
+
 	{NULL, NULL, NULL}
 };
 
diff --git a/ext/standard/php_standard.h b/ext/standard/php_standard.h
index 536c13807e..1d0d7fdbab 100644
--- a/ext/standard/php_standard.h
+++ b/ext/standard/php_standard.h
@@ -56,6 +56,7 @@
 #include "php_output.h"
 #include "php_array.h"
 #include "php_assert.h"
+#include "php_versioning.h"
 
 #define phpext_standard_ptr basic_functions_module_ptr
 
diff --git a/ext/standard/php_versioning.h b/ext/standard/php_versioning.h
new file mode 100644
index 0000000000..f25a80e504
--- /dev/null
+++ b/ext/standard/php_versioning.h
@@ -0,0 +1,31 @@
+/* 
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2001 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.               |
+   +----------------------------------------------------------------------+
+   | Authors: Stig Sæther Bakken <ssb@fast.no>                            |
+   |                                                                      |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#ifndef PHP_VERSIONING_H
+#define PHP_VERSIONING_H
+
+#include "ext/standard/basic_functions.h"
+
+PHPAPI char *php_canonicalize_version(const char *);
+PHPAPI int php_version_compare(const char *, const char *);
+PHP_FUNCTION(version_compare);
+
+#endif
diff --git a/ext/standard/versioning.c b/ext/standard/versioning.c
new file mode 100644
index 0000000000..6d56e760ea
--- /dev/null
+++ b/ext/standard/versioning.c
@@ -0,0 +1,181 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP version 4.0                                                      |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997, 1998, 1999, 2000, 2001 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.               |
+   +----------------------------------------------------------------------+
+   | Authors: Stig Sæther Bakken <ssb@fast.no>                            |
+   |                                                                      |
+   +----------------------------------------------------------------------+
+ */
+
+/* $Id$ */
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include "php.h"
+#include "php_versioning.h"
+
+PHPAPI char *
+php_canonicalize_version(const char *version)
+{
+    int len = strlen(version), in_number = 0;
+    char *buf = emalloc(len * 2 + 1), *q, lp, lq;
+    const char *p;
+
+    if (len == 0) {
+        *buf = '\0';
+        return buf;
+    }
+
+    p = version;
+    q = buf;
+    *q++ = lp = *p++;
+    lq = '\0';
+    while (*p) {
+/*  s/[-_+]/./g;
+ *  s/([^\d\.])([^\D\.])/$1.$2/g;
+ *  s/([^\D\.])([^\d\.])/$1.$2/g;
+ */
+#define isdigdot(x) (isdigit(x)||(x)=='.')
+#define isspecialver(x) ((x)=='-'||(x)=='_'||(x)=='+')
+
+        lq = *(q - 1);
+        if ((isdigdot(*p) != isdigdot(lp) || isspecialver(*p)) &&
+            (lq != '.' && *p != '.')) {
+            lq = *q;
+            *q++ = '.';
+        }
+        *q++ = lp = *p++;
+    }
+    *q++ = '\0';
+    return buf;
+}
+
+static int
+compare_special_version_forms(const char *form1, const char *form2)
+{
+	int i, found1 = -1, found2 = -1;
+	char **pp;
+	static char *special_forms[] = {
+		"dev",
+		"a",
+		"b",
+		"RC",
+		"#N#",
+		"pl",
+		NULL
+	};
+
+	for (pp = special_forms, i = 0; *pp != NULL; pp++, i++) {
+		if (strcmp(form1, *pp) == 0) {
+			found1 = i;
+			break;
+		}
+	}
+	for (pp = special_forms, i = 0; *pp != NULL; pp++, i++) {
+		if (strcmp(form2, *pp) == 0) {
+			found2 = i;
+			break;
+		}
+	}
+	return abs(found1 - found2);
+}
+
+PHPAPI int
+php_version_compare(const char *orig_ver1, const char *orig_ver2)
+{
+	char *ver1 = php_canonicalize_version(orig_ver1);
+	char *ver2 = php_canonicalize_version(orig_ver2);
+	char *p1, *p2, *n1, *n2;
+	long l1, l2;
+	int compare = 0;
+
+	p1 = n1 = ver1;
+	p2 = n2 = ver2;
+	while (*p1 && *p2 && n1 && n2) {
+		if ((n1 = strchr(p1, '.')) != NULL) {
+			*n1 = '\0';
+		}
+		if ((n2 = strchr(p2, '.')) != NULL) {
+			*n2 = '\0';
+		}
+		if (isdigit(*p1) && isdigit(*p2)) {
+			/* compare element numerically */
+			l1 = strtol(p1, NULL, 10);
+			l2 = strtol(p2, NULL, 10);
+			compare = abs(l1 - l2);
+		} else if (!isdigit(*p1) && !isdigit(*p2)) {
+			/* compare element names */
+			compare = compare_special_version_forms(p1, p2);
+		} else {
+			/* mix of names and numbers */
+			if (isdigit(*p1)) {
+				compare = compare_special_version_forms("#N#", p2);
+			} else {
+				compare = compare_special_version_forms(p1, "#N#");
+			}
+		}
+		if (compare != 0) {
+			break;
+		}
+		if (n1 != NULL) {
+			p1 = n1 + 1;
+		}
+		if (n2 != NULL) {
+			p2 = n2 + 1;
+		}
+	}
+	if (compare == 0) {
+		if (n1 != NULL) {
+			if (isdigit(*n1)) {
+				compare = 1;
+			} else {
+				compare = compare_special_version_forms(n1, "#N#");
+			}
+		} else if (n2 != NULL) {
+			if (isdigit(*n2)) {
+				compare = -1;
+			} else {
+				compare = compare_special_version_forms("#N", n2);
+			}
+		}
+	}
+	efree(ver1);
+	efree(ver2);
+	return compare;
+}
+
+/* {{{ proto int version_compare(string ver1, string ver2) */
+
+PHP_FUNCTION(version_compare)
+{
+    zval **v1, **v2;
+
+	if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &v1, &v2) == FAILURE) {
+		WRONG_PARAM_COUNT;
+	}
+	convert_to_string_ex(v1);
+	convert_to_string_ex(v2);
+	RETURN_LONG(php_version_compare(Z_STRVAL_PP(v1), Z_STRVAL_PP(v2)));
+}
+
+/* }}} */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ */