cvs: php4(PHP_4_0_7) /ext/standard basic_functions.c php_versioning.h versioning.c

ssb Wed Oct 10 18:23:17 2001 EDT Added files: (Branch: PHP_4_0_7) /php4/ext/standard php_versioning.h versioning.c Modified files: /php4/ext/standard basic_functions.c Log: MFH: version_compare & friends Index: php4/ext/standard/basic_functions.c diff -u php4/ext/standard/basic_functions.c:1.385.2.1 php4/ext/standard/basic_functions.c:1.385.2.2 --- php4/ext/standard/basic_functions.c:1.385.2.1 Wed Aug 15 19:21:05 2001 +++ php4/ext/standard/basic_functions.c Wed Oct 10 18:23:16 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.385.2.1 2001/08/15 23:21:05 zeev Exp $ */ +/* $Id: basic_functions.c,v 1.385.2.2 2001/10/10 22:23:16 ssb Exp $ */ #include "php.h" #include "php_main.h" @@ -623,8 +623,16 @@ PHP_FALIAS(sizeof, count, NULL) /* functions from assert.c */ - PHP_FE(assert, NULL) - PHP_FE(assert_options, NULL) + PHP_FE(assert, NULL) + PHP_FE(assert_options, NULL) + + /* functions from versioning.c */ + PHP_FE(version_compare, NULL) + PHP_FE(version_lt, NULL) + PHP_FE(version_le, NULL) + PHP_FE(version_gt, NULL) + PHP_FE(version_ge, NULL) + PHP_FE(version_eq, NULL) {NULL, NULL, NULL} }; Index: php4/ext/standard/php_versioning.h +++ php4/ext/standard/php_versioning.h /* +----------------------------------------------------------------------+ | 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: php_versioning.h,v 1.1 2001/10/05 23:56:19 ssb Exp $ */ #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 Index: php4/ext/standard/versioning.c +++ php4/ext/standard/versioning.c /* +----------------------------------------------------------------------+ | 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: versioning.c,v 1.1 2001/10/05 23:56:19 ssb Exp $ */ #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: */