Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=8c431463caa929e0ba565c519dc7905eaedfee13

commit 8c431463caa929e0ba565c519dc7905eaedfee13
Author: Michel Hermier <[email protected]>
Date:   Thu Oct 31 13:49:00 2013 +0100

libpacman: Use _pacman_db_rewind instead of inlined version, and plug a typo 
while at it.

diff --git a/lib/libpacman/be_files.c b/lib/libpacman/be_files.c
index b90fefb..73f29a4 100644
--- a/lib/libpacman/be_files.c
+++ b/lib/libpacman/be_files.c
@@ -243,9 +243,11 @@ pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target, 
unsigned int inforeq)
}

if(target != NULL) {
+               // Search from start
+               _pacman_db_rewind(db);
+
/* search for a specific package (by name only) */
if (islocal(db)) {
-                       rewinddir(db->handle);
while(!found && (ent = readdir(db->handle)) != NULL) {
if(!strcmp(ent->d_name, ".") || !strcmp(ent->d_name, "..")) {
continue;
@@ -269,9 +271,6 @@ pmpkg_t *_pacman_db_scan(pmdb_t *db, const char *target, 
unsigned int inforeq)
}
}
} else {
-                       // seek to start
-                       _pacman_db_rewind(db->handle);
-
while (!found && archive_read_next_header(db->handle, &entry) == ARCHIVE_OK) {
// make sure it's a directory
const char *pathname = archive_entry_pathname(entry);
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to