bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Unify filelist operation functions in conflict checking

Browse source 
We had two functions that were oh so similar but slightly different. We
can combine them and add some conditional operation stuff to decide what
to return.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-03-30 20:20:16 -05:00
parent d3d18a42d2
commit 3089c833ff
1 changed files with 25 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
lib/libalpm/conflict.c
View file

@ -212,11 +212,17 @@ alpm_list_t SYMEXPORT *alpm_checkconflicts(alpm_list_t *pkglist) {
return _alpm_innerconflicts(pkglist); return _alpm_innerconflicts(pkglist);
} }
/* Returns a alpm_list_t* of file conflicts. static const int DIFFERENCE = 0;
* Hooray for set-intersects! static const int INTERSECT = 1;
* Pre-condition: both lists are sorted! /* Returns a set operation on the provided two lists of files.
* Pre-condition: both lists are sorted!
*
* Operations:
* DIFFERENCE - a difference operation is performed. filesA - filesB.
* INTERSECT - an intersection operation is performed. filesA & filesB.
*/ */
static alpm_list_t *chk_fileconflicts(alpm_list_t *filesA, alpm_list_t *filesB) static alpm_list_t *filelist_operation(alpm_list_t *filesA, alpm_list_t *filesB,
int operation)
{ {
alpm_list_t *ret = NULL; alpm_list_t *ret = NULL;
alpm_list_t *pA = filesA, *pB = filesB; alpm_list_t *pA = filesA, *pB = filesB;
@ -224,7 +230,7 @@ static alpm_list_t *chk_fileconflicts(alpm_list_t *filesA, alpm_list_t *filesB)
while(pA && pB) { while(pA && pB) {
const char *strA = pA->data; const char *strA = pA->data;
const char *strB = pB->data; const char *strB = pB->data;
/* skip directories, we don't care about dir conflicts */ /* skip directories, we don't care about them */
if(strA[strlen(strA)-1] == '/') { if(strA[strlen(strA)-1] == '/') {
pA = pA->next; pA = pA->next;
} else if(strB[strlen(strB)-1] == '/') { } else if(strB[strlen(strB)-1] == '/') {
@ -232,59 +238,26 @@ static alpm_list_t *chk_fileconflicts(alpm_list_t *filesA, alpm_list_t *filesB)
} else { } else {
int cmp = strcmp(strA, strB); int cmp = strcmp(strA, strB);
if(cmp < 0) { if(cmp < 0) {
/* item only in filesA, ignore it */ if(operation == DIFFERENCE) {
/* item only in filesA, qualifies as a difference */
ret = alpm_list_add(ret, strdup(strA));
}
pA = pA->next; pA = pA->next;
} else if(cmp > 0) { } else if(cmp > 0) {
/* item only in filesB, ignore it */
pB = pB->next; pB = pB->next;
} else { } else {
/* item in both, record it */ if(operation == INTERSECT) {
ret = alpm_list_add(ret, strdup(strA)); /* item in both, qualifies as an intersect */
ret = alpm_list_add(ret, strdup(strA));
}
pA = pA->next; pA = pA->next;
pB = pB->next; pB = pB->next;
} }
} }
} }
return ret; /* if doing a difference, ensure we have completely emptied pA */
} while(operation == DIFFERENCE && pA) {
/* Returns a alpm_list_t* of files that are in filesA but *NOT* in filesB
* This is an 'A minus B' set operation
* Pre-condition: both lists are sorted!
*/
static alpm_list_t *chk_filedifference(alpm_list_t *filesA, alpm_list_t *filesB)
{
alpm_list_t *ret = NULL;
alpm_list_t *pA = filesA, *pB = filesB;
/* if both filesA and filesB have entries, do this loop */
while(pA && pB) {
const char *strA = pA->data;
const char *strB = pB->data;
/* skip directories, we don't care about dir conflicts */
if(strA[strlen(strA)-1] == '/') {
pA = pA->next;
} else if(strB[strlen(strB)-1] == '/') {
pB = pB->next;
} else {
int cmp = strcmp(strA, strB);
if(cmp < 0) {
/* item only in filesA, record it */
ret = alpm_list_add(ret, strdup(strA));
pA = pA->next;
} else if(cmp > 0) {
/* item only in fileB, but this means nothing */
pB = pB->next;
} else {
/* item in both, ignore it */
pA = pA->next;
pB = pB->next;
}
}
}
/* ensure we have completely emptied pA */
while(pA) {
const char *strA = pA->data; const char *strA = pA->data;
/* skip directories */ /* skip directories */
if(strA[strlen(strA)-1] != '/') { if(strA[strlen(strA)-1] != '/') {
@ -419,7 +392,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
if(!p2) { if(!p2) {
continue; continue;
} }
tmpfiles = chk_fileconflicts(alpm_pkg_get_files(p1), alpm_pkg_get_files(p2)); tmpfiles = filelist_operation( alpm_pkg_get_files(p1),
alpm_pkg_get_files(p2), INTERSECT);
if(tmpfiles) { if(tmpfiles) {
for(k = tmpfiles; k; k = k->next) { for(k = tmpfiles; k; k = k->next) {
@ -444,8 +418,8 @@ alpm_list_t *_alpm_db_find_fileconflicts(pmdb_t *db, pmtrans_t *trans,
* is not currently installed, then simply stat the whole filelist */ * is not currently installed, then simply stat the whole filelist */
if(dbpkg) { if(dbpkg) {
/* older ver of package currently installed */ /* older ver of package currently installed */
tmpfiles = chk_filedifference(alpm_pkg_get_files(p1), tmpfiles = filelist_operation(alpm_pkg_get_files(p1),
alpm_pkg_get_files(dbpkg)); alpm_pkg_get_files(dbpkg), DIFFERENCE);
} else { } else {
/* no version of package currently installed */ /* no version of package currently installed */
tmpfiles = alpm_list_strdup(alpm_pkg_get_files(p1)); tmpfiles = alpm_list_strdup(alpm_pkg_get_files(p1));