From 6bd15469b1febef5d061905b0f7d8f69bf96a08f Mon Sep 17 00:00:00 2001 From: Judd Vinet Date: Mon, 26 Dec 2005 16:48:37 +0000 Subject: renamed rpmvercmp to versioncmp, added some fixes from isteve@bofh.cz --- lib/libalpm/Makefile.am | 2 +- lib/libalpm/add.c | 6 +- lib/libalpm/alpm.c | 4 +- lib/libalpm/deps.c | 10 +- lib/libalpm/remove.c | 2 +- lib/libalpm/rpmvercmp.c | 238 ------------------------------------------ lib/libalpm/rpmvercmp.h | 28 ----- lib/libalpm/sync.c | 4 +- lib/libalpm/versioncmp.c | 264 +++++++++++++++++++++++++++++++++++++++++++++++ lib/libalpm/versioncmp.h | 28 +++++ 10 files changed, 306 insertions(+), 280 deletions(-) delete mode 100644 lib/libalpm/rpmvercmp.c delete mode 100644 lib/libalpm/rpmvercmp.h create mode 100644 lib/libalpm/versioncmp.c create mode 100644 lib/libalpm/versioncmp.h (limited to 'lib') diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index bc49af26..42b9b80c 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -15,7 +15,7 @@ TARGETS = md5driver.c \ conflict.c \ deps.c \ provide.c \ - rpmvercmp.c \ + versioncmp.c \ backup.c \ trans.c \ add.c \ diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c index 689172c5..e382fa14 100644 --- a/lib/libalpm/add.c +++ b/lib/libalpm/add.c @@ -35,7 +35,7 @@ #include "error.h" #include "list.h" #include "cache.h" -#include "rpmvercmp.h" +#include "versioncmp.h" #include "md5.h" #include "log.h" #include "backup.h" @@ -137,7 +137,7 @@ int add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) if(trans->flags & PM_TRANS_FLAG_FRESHEN) { /* only upgrade/install this package if it is already installed and at a lesser version */ dummy = db_get_pkgfromcache(db, pkgname); - if(dummy == NULL || rpmvercmp(dummy->version, pkgver) >= 0) { + if(dummy == NULL || versioncmp(dummy->version, pkgver) >= 0) { pm_errno = PM_ERR_PKG_CANT_FRESH; goto error; } @@ -149,7 +149,7 @@ int add_loadtarget(pmtrans_t *trans, pmdb_t *db, char *name) for(i = trans->packages; i; i = i->next) { pmpkg_t *pkg = i->data; if(strcmp(pkg->name, pkgname) == 0) { - if(rpmvercmp(pkg->version, pkgver) < 0) { + if(versioncmp(pkg->version, pkgver) < 0) { _alpm_log(PM_LOG_WARNING, "replacing older version of %s %s by %s in target list", pkg->name, pkg->version, pkgver); FREEPKG(i->data); i->data = pkg_load(name); diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 3afe0301..510d898e 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -34,7 +34,7 @@ /* pacman */ #include "log.h" #include "error.h" -#include "rpmvercmp.h" +#include "versioncmp.h" #include "md5.h" #include "list.h" #include "package.h" @@ -479,7 +479,7 @@ int alpm_pkg_free(pmpkg_t *pkg) int alpm_pkg_vercmp(const char *ver1, const char *ver2) { - return(rpmvercmp(ver1, ver2)); + return(versioncmp(ver1, ver2)); } /** @} */ diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c index e794ae52..87d97053 100644 --- a/lib/libalpm/deps.c +++ b/lib/libalpm/deps.c @@ -32,7 +32,7 @@ #include "cache.h" #include "provide.h" #include "deps.h" -#include "rpmvercmp.h" +#include "versioncmp.h" #include "handle.h" extern pmhandle_t *handle; @@ -193,7 +193,7 @@ PMList *checkdeps(pmdb_t *db, unsigned char op, PMList *packages) for(ptr = ver; *ptr != '-'; ptr++); *ptr = '\0'; } - cmp = rpmvercmp(ver, depend.version); + cmp = versioncmp(ver, depend.version); switch(depend.mod) { case PM_DEP_MOD_EQ: found = (cmp == 0); break; case PM_DEP_MOD_GE: found = (cmp >= 0); break; @@ -330,7 +330,7 @@ PMList *checkdeps(pmdb_t *db, unsigned char op, PMList *packages) for(ptr = ver; *ptr != '-'; ptr++); *ptr = '\0'; } - cmp = rpmvercmp(ver, depend.version); + cmp = versioncmp(ver, depend.version); switch(depend.mod) { case PM_DEP_MOD_EQ: found = (cmp == 0); break; case PM_DEP_MOD_GE: found = (cmp >= 0); break; @@ -358,7 +358,7 @@ PMList *checkdeps(pmdb_t *db, unsigned char op, PMList *packages) for(ptr = ver; *ptr != '-'; ptr++); *ptr = '\0'; } - cmp = rpmvercmp(ver, depend.version); + cmp = versioncmp(ver, depend.version); switch(depend.mod) { case PM_DEP_MOD_EQ: found = (cmp == 0); break; case PM_DEP_MOD_GE: found = (cmp >= 0); break; @@ -387,7 +387,7 @@ PMList *checkdeps(pmdb_t *db, unsigned char op, PMList *packages) for(ptr = ver; *ptr != '-'; ptr++); *ptr = '\0'; } - cmp = rpmvercmp(ver, depend.version); + cmp = versioncmp(ver, depend.version); switch(depend.mod) { case PM_DEP_MOD_EQ: found = (cmp == 0); break; case PM_DEP_MOD_GE: found = (cmp >= 0); break; diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c index 0e335906..47350bd6 100644 --- a/lib/libalpm/remove.c +++ b/lib/libalpm/remove.c @@ -33,7 +33,7 @@ /* pacman */ #include "util.h" #include "error.h" -#include "rpmvercmp.h" +#include "versioncmp.h" #include "md5.h" #include "log.h" #include "backup.h" diff --git a/lib/libalpm/rpmvercmp.c b/lib/libalpm/rpmvercmp.c deleted file mode 100644 index 4667083e..00000000 --- a/lib/libalpm/rpmvercmp.c +++ /dev/null @@ -1,238 +0,0 @@ -/* - * rpmvercmp.c - * - * Copyright (c) 2002-2005 by Judd Vinet - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ - -#include "config.h" -#include -#include -#include -/* pacman */ -#include "rpmvercmp.h" - -#ifndef HAVE_STRVERSCMP -/* GNU's strverscmp() function, taken from glibc 2.3.2 sources - */ - -/* Compare strings while treating digits characters numerically. - Copyright (C) 1997, 2002 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Jean-François Bignolles , 1997. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -/* states: S_N: normal, S_I: comparing integral part, S_F: comparing - fractionnal parts, S_Z: idem but with leading Zeroes only */ -#define S_N 0x0 -#define S_I 0x4 -#define S_F 0x8 -#define S_Z 0xC - -/* result_type: CMP: return diff; LEN: compare using len_diff/diff */ -#define CMP 2 -#define LEN 3 - -/* Compare S1 and S2 as strings holding indices/version numbers, - returning less than, equal to or greater than zero if S1 is less than, - equal to or greater than S2 (for more info, see the texinfo doc). -*/ - -static int strverscmp (s1, s2) - const char *s1; - const char *s2; -{ - const unsigned char *p1 = (const unsigned char *) s1; - const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - int state; - int diff; - - /* Symbol(s) 0 [1-9] others (padding) - Transition (10) 0 (01) d (00) x (11) - */ - static const unsigned int next_state[] = - { - /* state x d 0 - */ - /* S_N */ S_N, S_I, S_Z, S_N, - /* S_I */ S_N, S_I, S_I, S_I, - /* S_F */ S_N, S_F, S_F, S_F, - /* S_Z */ S_N, S_F, S_Z, S_Z - }; - - static const int result_type[] = - { - /* state x/x x/d x/0 x/- d/x d/d d/0 d/- - 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ - - /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_I */ CMP, -1, -1, CMP, +1, LEN, LEN, CMP, - +1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, - /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, - CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, - /* S_Z */ CMP, +1, +1, CMP, -1, CMP, CMP, CMP, - -1, CMP, CMP, CMP - }; - - if (p1 == p2) - return 0; - - c1 = *p1++; - c2 = *p2++; - /* Hint: '0' is a digit too. */ - state = S_N | ((c1 == '0') + (isdigit (c1) != 0)); - - while ((diff = c1 - c2) == 0 && c1 != '\0') - { - state = next_state[state]; - c1 = *p1++; - c2 = *p2++; - state |= (c1 == '0') + (isdigit (c1) != 0); - } - - state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))]; - - switch (state) - { - case CMP: - return diff; - - case LEN: - while (isdigit (*p1++)) - if (!isdigit (*p2++)) - return 1; - - return isdigit (*p2) ? -1 : diff; - - default: - return state; - } -} - -#endif - -/* this function was taken from rpm 4.0.4 and rewritten */ -int rpmvercmp(const char *a, const char *b) -{ - char str1[64], str2[64]; - char *ptr1, *ptr2; - char *one, *two; - char *rel1 = NULL, *rel2 = NULL; - char oldch1, oldch2; - int is1num, is2num; - int rc; - - if(!strcmp(a,b)) { - return(0); - } - - strncpy(str1, a, 64); - str1[63] = 0; - strncpy(str2, b, 64); - str2[63] = 0; - - /* lose the release number */ - for(one = str1; *one && *one != '-'; one++); - if(one) { - *one = '\0'; - rel1 = ++one; - } - for(two = str2; *two && *two != '-'; two++); - if(two) { - *two = '\0'; - rel2 = ++two; - } - - one = str1; - two = str2; - - while(*one || *two) { - while(*one && !isalnum(*one)) one++; - while(*two && !isalnum(*two)) two++; - - ptr1 = one; - ptr2 = two; - - /* find the next segment for each string */ - if(isdigit(*ptr1)) { - is1num = 1; - while(*ptr1 && isdigit(*ptr1)) ptr1++; - } else { - is1num = 0; - while(*ptr1 && isalpha(*ptr1)) ptr1++; - } - if(isdigit(*ptr2)) { - is2num = 1; - while(*ptr2 && isdigit(*ptr2)) ptr2++; - } else { - is2num = 0; - while(*ptr2 && isalpha(*ptr2)) ptr2++; - } - - oldch1 = *ptr1; - *ptr1 = '\0'; - oldch2 = *ptr2; - *ptr2 = '\0'; - - /* see if we ran out of segments on one string */ - if(one == ptr1 && two != ptr2) { - return(is2num ? -1 : 1); - } - if(one != ptr1 && two == ptr2) { - return(is1num ? 1 : -1); - } - - /* see if we have a type mismatch (ie, one is alpha and one is digits) */ - if(is1num && !is2num) return(1); - if(!is1num && is2num) return(-1); - - if(is1num) while(*one == '0') one++; - if(is2num) while(*two == '0') two++; - - rc = strverscmp(one, two); - if(rc) return(rc); - - *ptr1 = oldch1; - *ptr2 = oldch2; - one = ptr1; - two = ptr2; - } - - if((!*one) && (!*two)) { - /* compare release numbers */ - if(rel1 && rel2) return(rpmvercmp(rel1, rel2)); - return(0); - } - - return(*one ? 1 : -1); -} - -/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/rpmvercmp.h b/lib/libalpm/rpmvercmp.h deleted file mode 100644 index e88d5c97..00000000 --- a/lib/libalpm/rpmvercmp.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * rpmvercmp.h - * - * Copyright (c) 2002 by Judd Vinet - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - * USA. - */ -#ifndef _PM_RPMVERCMP_H -#define _PM_RPMVERCMP_H - -int rpmvercmp(const char *a, const char *b); - -#endif - -/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 7e36fd11..9facd95f 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -40,7 +40,7 @@ #include "deps.h" #include "trans.h" #include "sync.h" -#include "rpmvercmp.h" +#include "versioncmp.h" #include "handle.h" #include "alpm.h" @@ -214,7 +214,7 @@ int sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, PMList *dbs_sync) } /* compare versions and see if we need to upgrade */ - cmp = rpmvercmp(local->version, spkg->version); + cmp = versioncmp(local->version, spkg->version); if(cmp > 0 && !spkg->force) { /* local version is newer */ _alpm_log(PM_LOG_FLOW1, "%s-%s: local version is newer", diff --git a/lib/libalpm/versioncmp.c b/lib/libalpm/versioncmp.c new file mode 100644 index 00000000..bbcfb60a --- /dev/null +++ b/lib/libalpm/versioncmp.c @@ -0,0 +1,264 @@ +/* + * versioncmp.c + * + * Copyright (c) 2002-2005 by Judd Vinet + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include "config.h" +#include +#include +#include +/* pacman */ +#include "versioncmp.h" + +#ifndef HAVE_STRVERSCMP +/* GNU's strverscmp() function, taken from glibc 2.3.2 sources + */ + +/* Compare strings while treating digits characters numerically. + Copyright (C) 1997, 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Jean-François Bignolles , 1997. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* states: S_N: normal, S_I: comparing integral part, S_F: comparing + fractionnal parts, S_Z: idem but with leading Zeroes only */ +#define S_N 0x0 +#define S_I 0x4 +#define S_F 0x8 +#define S_Z 0xC + +/* result_type: CMP: return diff; LEN: compare using len_diff/diff */ +#define CMP 2 +#define LEN 3 + +/* Compare S1 and S2 as strings holding indices/version numbers, + returning less than, equal to or greater than zero if S1 is less than, + equal to or greater than S2 (for more info, see the texinfo doc). +*/ + +static int strverscmp (s1, s2) + const char *s1; + const char *s2; +{ + const unsigned char *p1 = (const unsigned char *) s1; + const unsigned char *p2 = (const unsigned char *) s2; + unsigned char c1, c2; + int state; + int diff; + + /* Symbol(s) 0 [1-9] others (padding) + Transition (10) 0 (01) d (00) x (11) - */ + static const unsigned int next_state[] = + { + /* state x d 0 - */ + /* S_N */ S_N, S_I, S_Z, S_N, + /* S_I */ S_N, S_I, S_I, S_I, + /* S_F */ S_N, S_F, S_F, S_F, + /* S_Z */ S_N, S_F, S_Z, S_Z + }; + + static const int result_type[] = + { + /* state x/x x/d x/0 x/- d/x d/d d/0 d/- + 0/x 0/d 0/0 0/- -/x -/d -/0 -/- */ + + /* S_N */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, + CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, + /* S_I */ CMP, -1, -1, CMP, +1, LEN, LEN, CMP, + +1, LEN, LEN, CMP, CMP, CMP, CMP, CMP, + /* S_F */ CMP, CMP, CMP, CMP, CMP, LEN, CMP, CMP, + CMP, CMP, CMP, CMP, CMP, CMP, CMP, CMP, + /* S_Z */ CMP, +1, +1, CMP, -1, CMP, CMP, CMP, + -1, CMP, CMP, CMP + }; + + if (p1 == p2) + return 0; + + c1 = *p1++; + c2 = *p2++; + /* Hint: '0' is a digit too. */ + state = S_N | ((c1 == '0') + (isdigit (c1) != 0)); + + while ((diff = c1 - c2) == 0 && c1 != '\0') + { + state = next_state[state]; + c1 = *p1++; + c2 = *p2++; + state |= (c1 == '0') + (isdigit (c1) != 0); + } + + state = result_type[state << 2 | (((c2 == '0') + (isdigit (c2) != 0)))]; + + switch (state) + { + case CMP: + return diff; + + case LEN: + while (isdigit (*p1++)) + if (!isdigit (*p2++)) + return 1; + + return isdigit (*p2) ? -1 : diff; + + default: + return state; + } +} + +#endif + +/* this function was taken from rpm 4.0.4 and rewritten */ +int versioncmp(const char *a, const char *b) { + char *str1, *ostr1, *str2, *ostr2; + char *one, *two; + char *rel1 = NULL, *rel2 = NULL; + char oldch1, oldch2; + int is1num, is2num; + int rc, rv; + + if (!strcmp(a,b)) { + return(0); + } + + str1 = strdup(a); + ostr1 = str1; + str2 = strdup(b); + ostr2 = str2; + + /* lose the release number */ + for(one = str1; *one && *one != '-'; one++); + if(*one) { + *one = '\0'; + rel1 = ++one; + if (*rel1 == '\0') + rel1 = NULL; + } + for(two = str2; *two && *two != '-'; two++); + if(*two) { + *two = '\0'; + rel2 = ++two; + if (*rel2 == '\0') + rel2 = NULL; + } + + one = str1; + two = str2; + + while(*one || *two) { + while(*one && !isalnum(*one)) one++; + while(*two && !isalnum(*two)) two++; + + str1 = one; + str2 = two; + + /* find the next segment for each string */ + if(isdigit(*str1)) { + is1num = 1; + while(*str1 && isdigit(*str1)) str1++; + } else { + is1num = 0; + while(*str1 && isalpha(*str1)) str1++; + } + if(isdigit(*str2)) { + is2num = 1; + while(*str2 && isdigit(*str2)) str2++; + } else { + is2num = 0; + while(*str2 && isalpha(*str2)) str2++; + } + + oldch1 = *str1; + *str1 = '\0'; + oldch2 = *str2; + *str2 = '\0'; + + /* see if we ran out of segments on one string */ + if(one == str1 && two != str2) { + free(ostr1); + free(ostr2); + return(is2num ? -1 : 1); + } + if(one != str1 && two == str2) { + free(ostr1); + free(ostr2); + return(is1num ? 1 : -1); + } + + /* see if we have a type mismatch (ie, one is alpha and one is digits) */ + if(is1num && !is2num) { + free(ostr1); + free(ostr2); + return(1); + } + if(!is1num && is2num) { + free(ostr1); + free(ostr2); + return(-1); + } + + if(is1num) while(*one == '0') one++; + if(is2num) while(*two == '0') two++; + + rc = strverscmp(one, two); + if(rc) { + free(ostr1); + free(ostr2); + return(rc); + } + + *str1 = oldch1; + *str2 = oldch2; + one = str1; + two = str2; + } + + if((!*one) && (!*two)) { + /* compare release numbers */ + if(rel1 && rel2) { + rv = versioncmp(rel1, rel2); + free(ostr1); + free(ostr2); + return rv; + } else { + free(ostr1); + free(ostr2); + return(0); + } + } + + return(*one ? 1 : -1); +} + +/* vim: set ts=2 sw=2 noet: */ diff --git a/lib/libalpm/versioncmp.h b/lib/libalpm/versioncmp.h new file mode 100644 index 00000000..78f553a1 --- /dev/null +++ b/lib/libalpm/versioncmp.h @@ -0,0 +1,28 @@ +/* + * versioncmp.h + * + * Copyright (c) 2002 by Judd Vinet + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ +#ifndef _PM_VERSIONCMP_H +#define _PM_VERSIONCMP_H + +int versioncmp(const char *a, const char *b); + +#endif + +/* vim: set ts=2 sw=2 noet: */ -- cgit v1.2.3