moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

renamed rpmvercmp to versioncmp, added some fixes from isteve@bofh.cz

This commit is contained in:
Judd Vinet 2005-12-26 16:48:37 +00:00
parent 58c9d5d663
commit 6bd15469b1
9 changed files with 84 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libalpm/Makefile.am
View File

@ -15,7 +15,7 @@ TARGETS = md5driver.c \
conflict.c \
deps.c \
provide.c \
rpmvercmp.c \
versioncmp.c \
backup.c \
trans.c \
add.c \

6
lib/libalpm/add.c
View File

@ -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);

4
lib/libalpm/alpm.c
View File

@ -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));
}
/** @} */

10
lib/libalpm/deps.c
View File

@ -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;

2
lib/libalpm/remove.c
View File

@ -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"

4
lib/libalpm/sync.c
View File

@ -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",

102
lib/libalpm/rpmvercmp.c → lib/libalpm/versioncmp.c
View File

@ -1,5 +1,5 @@
/*
* rpmvercmp.c
* versioncmp.c
*
* Copyright (c) 2002-2005 by Judd Vinet <jvinet@zeroflux.org>
*
@ -24,7 +24,7 @@
#include <ctype.h>
#include <string.h>
/* pacman */
#include "rpmvercmp.h"
#include "versioncmp.h"
#ifndef HAVE_STRVERSCMP
/* GNU's strverscmp() function, taken from glibc 2.3.2 sources
@ -140,35 +140,37 @@ static int strverscmp (s1, s2)
#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;
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;
if(!strcmp(a,b)) {
int rc, rv;
if (!strcmp(a,b)) {
return(0);
}
strncpy(str1, a, 64);
str1[63] = 0;
strncpy(str2, b, 64);
str2[63] = 0;
str1 = strdup(a);
ostr1 = str1;
str2 = strdup(b);
ostr2 = str2;
/* lose the release number */
for(one = str1; *one && *one != '-'; one++);
if(one) {
if(*one) {
*one = '\0';
rel1 = ++one;
if (*rel1 == '\0')
rel1 = NULL;
}
for(two = str2; *two && *two != '-'; two++);
if(two) {
if(*two) {
*two = '\0';
rel2 = ++two;
if (*rel2 == '\0')
rel2 = NULL;
}
one = str1;
@ -178,58 +180,82 @@ int rpmvercmp(const char *a, const char *b)
while(*one && !isalnum(*one)) one++;
while(*two && !isalnum(*two)) two++;
ptr1 = one;
ptr2 = two;
str1 = one;
str2 = two;
/* find the next segment for each string */
if(isdigit(*ptr1)) {
if(isdigit(*str1)) {
is1num = 1;
while(*ptr1 && isdigit(*ptr1)) ptr1++;
while(*str1 && isdigit(*str1)) str1++;
} else {
is1num = 0;
while(*ptr1 && isalpha(*ptr1)) ptr1++;
while(*str1 && isalpha(*str1)) str1++;
}
if(isdigit(*ptr2)) {
if(isdigit(*str2)) {
is2num = 1;
while(*ptr2 && isdigit(*ptr2)) ptr2++;
while(*str2 && isdigit(*str2)) str2++;
} else {
is2num = 0;
while(*ptr2 && isalpha(*ptr2)) ptr2++;
while(*str2 && isalpha(*str2)) str2++;
}
oldch1 = *ptr1;
*ptr1 = '\0';
oldch2 = *ptr2;
*ptr2 = '\0';
oldch1 = *str1;
*str1 = '\0';
oldch2 = *str2;
*str2 = '\0';
/* see if we ran out of segments on one string */
if(one == ptr1 && two != ptr2) {
if(one == str1 && two != str2) {
free(ostr1);
free(ostr2);
return(is2num ? -1 : 1);
}
if(one != ptr1 && two == ptr2) {
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) return(1);
if(!is1num && is2num) return(-1);
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) return(rc);
if(rc) {
free(ostr1);
free(ostr2);
return(rc);
}
*ptr1 = oldch1;
*ptr2 = oldch2;
one = ptr1;
two = ptr2;
*str1 = oldch1;
*str2 = oldch2;
one = str1;
two = str2;
}
if((!*one) && (!*two)) {
/* compare release numbers */
if(rel1 && rel2) return(rpmvercmp(rel1, rel2));
return(0);
if(rel1 && rel2) {
rv = versioncmp(rel1, rel2);
free(ostr1);
free(ostr2);
return rv;
} else {
free(ostr1);
free(ostr2);
return(0);
}
}
return(*one ? 1 : -1);

8
lib/libalpm/rpmvercmp.h → lib/libalpm/versioncmp.h
View File

@ -1,5 +1,5 @@
/*
* rpmvercmp.h
* versioncmp.h
*
* Copyright (c) 2002 by Judd Vinet <jvinet@zeroflux.org>
*
@ -18,10 +18,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
* USA.
*/
#ifndef _PM_RPMVERCMP_H
#define _PM_RPMVERCMP_H
#ifndef _PM_VERSIONCMP_H
#define _PM_VERSIONCMP_H
int rpmvercmp(const char *a, const char *b);
int versioncmp(const char *a, const char *b);
#endif

4
src/util/vercmp.c
View File

@ -21,7 +21,7 @@
#include <stdio.h>
#include <string.h>
#include "rpmvercmp.h"
#include "versioncmp.h"
int main(int argc, char *argv[])
{
@ -39,7 +39,7 @@ int main(int argc, char *argv[])
return(0);
}
ret = rpmvercmp(s1, s2);
ret = versioncmp(s1, s2);
printf("%d\n", ret);
return(ret);
}