moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-21 23:38:49 -05:00
Code Issues Releases Wiki Activity

Bring back db_scan() modifications from pacman 2.9.1

Browse Source 
(to cope with .lastupdate files in the db path)
This commit is contained in:
Aurelien Foret 2005-03-16 21:49:18 +00:00
parent e1eff42fe1
commit ad4ab9e50c
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/libalpm/db.c
View File

@ -105,7 +105,7 @@ int db_update(char *root, char *dbpath, char *treename, char *archive)
/* remove the old dir */ /* remove the old dir */
/* ORE - do we want to include alpm.h and use the log mechanism from db.c? /* ORE - do we want to include alpm.h and use the log mechanism from db.c?
_alpm_log(PM_LOG_FLOW2, "removing %s (if it exists)\n", ldir);*/ _alpm_log(PM_LOG_FLOW2, "removing %s (if it exists)\n", ldir);*/
/* ORE /* ORE
We should only rmrf the database content, and not the top directory, in case We should only rmrf the database content, and not the top directory, in case
a (DIR *) structure is associated with it (i.e a call to db_open). */ a (DIR *) structure is associated with it (i.e a call to db_open). */
_alpm_rmrf(ldir); _alpm_rmrf(ldir);
@ -141,6 +141,8 @@ void db_rewind(pmdb_t *db)
pmpkg_t *db_scan(pmdb_t *db, char *target, unsigned int inforeq) pmpkg_t *db_scan(pmdb_t *db, char *target, unsigned int inforeq)
{ {
struct dirent *ent = NULL; struct dirent *ent = NULL;
struct stat sbuf;
char path[PATH_MAX];
char name[256]; char name[256];
char *ptr = NULL; char *ptr = NULL;
int ret, found = 0; int ret, found = 0;
@ -158,6 +160,11 @@ pmpkg_t *db_scan(pmdb_t *db, char *target, unsigned int inforeq)
continue; continue;
} }
strncpy(name, ent->d_name, 255); strncpy(name, ent->d_name, 255);
/* stat the entry, make sure it's a directory */
snprintf(path, PATH_MAX, "%s/%s", db->path, name);
if(stat(path, &sbuf) || !S_ISDIR(sbuf.st_mode)) {
continue;
}
/* truncate the string at the second-to-last hyphen, */ /* truncate the string at the second-to-last hyphen, */
/* which will give us the package name */ /* which will give us the package name */
if((ptr = rindex(name, '-'))) { if((ptr = rindex(name, '-'))) {
@ -175,20 +182,20 @@ pmpkg_t *db_scan(pmdb_t *db, char *target, unsigned int inforeq)
} }
} else { } else {
/* normal iteration */ /* normal iteration */
ent = readdir(db->dir); int isdir = 0;
if(ent == NULL) { while(!isdir) {
return(NULL);
}
if(!strcmp(ent->d_name, ".")) {
ent = readdir(db->dir); ent = readdir(db->dir);
if(ent == NULL) { if(ent == NULL) {
return(NULL); return(NULL);
} }
} /* stat the entry, make sure it's a directory */
if(!strcmp(ent->d_name, "..")) { snprintf(path, PATH_MAX, "%s/%s", db->path, ent->d_name);
ent = readdir(db->dir); if(!stat(path, &sbuf) && S_ISDIR(sbuf.st_mode)) {
if(ent == NULL) { isdir = 1;
return(NULL); }
if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) {
isdir = 0;
continue;
} }
} }
} }
@ -669,7 +676,7 @@ PMList *db_find_conflicts(pmdb_t *db, PMList *targets, char *root)
} }
if(!ok) { if(!ok) {
MALLOC(str, 512); MALLOC(str, 512);
snprintf(str, 512, "%s: exists in filesystem", path); snprintf(str, 512, "%s: %s: exists in filesystem", p->name, path);
conflicts = pm_list_add(conflicts, str); conflicts = pm_list_add(conflicts, str);
} }
} }