1 files changed, 90 insertions, 74 deletions

diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
index 9d85a454..ccc8fdbe 100644
--- a/lib/libalpm/be_sync.c
+++ b/lib/libalpm/be_sync.c
@@ -37,6 +37,34 @@
 #include "deps.h"
 #include "dload.h"
 
+static char *get_sync_dir(pmhandle_t *handle)
+{
+	const char *dbpath = alpm_option_get_dbpath(handle);
+	size_t len = strlen(dbpath) + 6;
+	char *syncpath;
+	struct stat buf;
+
+	MALLOC(syncpath, len, RET_ERR(handle, PM_ERR_MEMORY, NULL));
+	sprintf(syncpath, "%s%s", dbpath, "sync/");
+
+	if(stat(syncpath, &buf) != 0) {
+		_alpm_log(handle, PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
+				syncpath);
+		if(_alpm_makepath(syncpath) != 0) {
+			free(syncpath);
+			RET_ERR(handle, PM_ERR_SYSTEM, NULL);
+		}
+	} else if(!S_ISDIR(buf.st_mode)) {
+		_alpm_log(handle, PM_LOG_WARNING, _("removing invalid file: %s\n"), syncpath);
+		if(unlink(syncpath) != 0 || _alpm_makepath(syncpath) != 0) {
+			free(syncpath);
+			RET_ERR(handle, PM_ERR_SYSTEM, NULL);
+		}
+	}
+
+	return syncpath;
+}
+
 /** Update a package database
  *
  * An update of the package database \a db will be attempted. Unless
@@ -79,44 +107,25 @@
 int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
 {
 	char *syncpath;
-	const char *dbpath;
 	alpm_list_t *i;
-	struct stat buf;
-	size_t len;
 	int ret = -1;
 	mode_t oldmask;
+	pmhandle_t *handle;
 	pgp_verify_t check_sig;
 
-	ALPM_LOG_FUNC;
-
 	/* Sanity checks */
-	ASSERT(handle != NULL, RET_ERR(PM_ERR_HANDLE_NULL, -1));
-	ASSERT(db != NULL && db != handle->db_local, RET_ERR(PM_ERR_WRONG_ARGS, -1));
-	ASSERT(db->servers != NULL, RET_ERR(PM_ERR_SERVER_NONE, -1));
-
-	dbpath = alpm_option_get_dbpath();
-	len = strlen(dbpath) + 6;
-	MALLOC(syncpath, len, RET_ERR(PM_ERR_MEMORY, -1));
-	sprintf(syncpath, "%s%s", dbpath, "sync/");
+	ASSERT(db != NULL, return -1);
+	handle = db->handle;
+	ASSERT(db != handle->db_local, RET_ERR(handle, PM_ERR_WRONG_ARGS, -1));
+	ASSERT(db->servers != NULL, RET_ERR(handle, PM_ERR_SERVER_NONE, -1));
 
 	/* make sure we have a sane umask */
 	oldmask = umask(0022);
 
-	if(stat(syncpath, &buf) != 0) {
-		_alpm_log(PM_LOG_DEBUG, "database dir '%s' does not exist, creating it\n",
-				syncpath);
-		if(_alpm_makepath(syncpath) != 0) {
-			free(syncpath);
-			RET_ERR(PM_ERR_SYSTEM, -1);
-		}
-	} else if(!S_ISDIR(buf.st_mode)) {
-		_alpm_log(PM_LOG_WARNING, _("removing invalid file: %s\n"), syncpath);
-		if(unlink(syncpath) != 0 || _alpm_makepath(syncpath) != 0) {
-			free(syncpath);
-			RET_ERR(PM_ERR_SYSTEM, -1);
-		}
+	syncpath = get_sync_dir(handle);
+	if(!syncpath) {
+		return -1;
 	}
-
 	check_sig = _alpm_db_get_sigverify_level(db);
 
 	for(i = db->servers; i; i = i->next) {
@@ -127,10 +136,10 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
 
 		/* print server + filename into a buffer (leave space for .sig) */
 		len = strlen(server) + strlen(db->treename) + 9;
-		CALLOC(fileurl, len, sizeof(char), RET_ERR(PM_ERR_MEMORY, -1));
+		CALLOC(fileurl, len, sizeof(char), RET_ERR(handle, PM_ERR_MEMORY, -1));
 		snprintf(fileurl, len, "%s/%s.db", server, db->treename);
 
-		ret = _alpm_download(fileurl, syncpath, force, 0, 0);
+		ret = _alpm_download(handle, fileurl, syncpath, force, 0, 0);
 
 		if(ret == 0 && (check_sig == PM_PGP_VERIFY_ALWAYS ||
 					check_sig == PM_PGP_VERIFY_OPTIONAL)) {
@@ -138,7 +147,7 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
 			/* if we downloaded a DB, we want the .sig from the same server */
 			snprintf(fileurl, len, "%s/%s.db.sig", server, db->treename);
 
-			sig_ret = _alpm_download(fileurl, syncpath, 1, 0, errors_ok);
+			sig_ret = _alpm_download(handle, fileurl, syncpath, 1, 0, errors_ok);
 			/* errors_ok suppresses error messages, but not the return code */
 			sig_ret = errors_ok ? 0 : sig_ret;
 		}
@@ -151,11 +160,12 @@ int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
 
 	if(ret == 1) {
 		/* files match, do nothing */
-		pm_errno = 0;
+		handle->pm_errno = 0;
 		goto cleanup;
 	} else if(ret == -1) {
 		/* pm_errno was set by the download code */
-		_alpm_log(PM_LOG_DEBUG, "failed to sync db: %s\n", alpm_strerrorlast());
+		_alpm_log(handle, PM_LOG_DEBUG, "failed to sync db: %s\n",
+				alpm_strerror(handle->pm_errno));
 		goto cleanup;
 	}
 
@@ -242,12 +252,8 @@ static int sync_db_populate(pmdb_t *db)
 	struct archive_entry *entry;
 	pmpkg_t *pkg = NULL;
 
-	ALPM_LOG_FUNC;
-
-	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
-
 	if((archive = archive_read_new()) == NULL) {
-		RET_ERR(PM_ERR_LIBARCHIVE, -1);
+		RET_ERR(db->handle, PM_ERR_LIBARCHIVE, -1);
 	}
 
 	archive_read_support_compression_all(archive);
@@ -259,24 +265,24 @@ static int sync_db_populate(pmdb_t *db)
 		return -1;
 	}
 
-	_alpm_log(PM_LOG_DEBUG, "opening database archive %s\n", dbpath);
+	_alpm_log(db->handle, PM_LOG_DEBUG, "opening database archive %s\n", dbpath);
 
 	if(archive_read_open_filename(archive, dbpath,
 				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-		_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), dbpath,
+		_alpm_log(db->handle, PM_LOG_ERROR, _("could not open file %s: %s\n"), dbpath,
 				archive_error_string(archive));
 		archive_read_finish(archive);
-		RET_ERR(PM_ERR_DB_OPEN, -1);
+		RET_ERR(db->handle, PM_ERR_DB_OPEN, -1);
 	}
 	if(stat(dbpath, &buf) != 0) {
-		RET_ERR(PM_ERR_DB_OPEN, -1);
+		RET_ERR(db->handle, PM_ERR_DB_OPEN, -1);
 	}
 	est_count = estimate_package_count(&buf, archive);
 
 	/* initialize hash at 66% full */
 	db->pkgcache = _alpm_pkghash_create(est_count * 3 / 2);
 	if(db->pkgcache == NULL) {
-		RET_ERR(PM_ERR_MEMORY, -1);
+		RET_ERR(db->handle, PM_ERR_MEMORY, -1);
 	}
 
 	while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
@@ -290,37 +296,47 @@ static int sync_db_populate(pmdb_t *db)
 			pkg = _alpm_pkg_new();
 			if(pkg == NULL) {
 				archive_read_finish(archive);
-				RET_ERR(PM_ERR_MEMORY, -1);
+				RET_ERR(db->handle, PM_ERR_MEMORY, -1);
 			}
 
 			name = archive_entry_pathname(entry);
 
 			if(_alpm_splitname(name, pkg) != 0) {
-				_alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'\n"),
+				_alpm_log(db->handle, PM_LOG_ERROR, _("invalid name for database entry '%s'\n"),
 						name);
 				_alpm_pkg_free(pkg);
+				pkg = NULL;
 				continue;
 			}
 
 			/* duplicated database entries are not allowed */
 			if(_alpm_pkghash_find(db->pkgcache, pkg->name)) {
-				_alpm_log(PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name);
+				_alpm_log(db->handle, PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name);
 				_alpm_pkg_free(pkg);
+				pkg = NULL;
 				continue;
 			}
 
 			pkg->origin = PKG_FROM_SYNCDB;
-			pkg->ops = &default_pkg_ops;
 			pkg->origin_data.db = db;
+			pkg->ops = &default_pkg_ops;
+			pkg->handle = db->handle;
 
 			/* add to the collection */
-			_alpm_log(PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
+			_alpm_log(db->handle, PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
 					pkg->name, db->treename);
 			db->pkgcache = _alpm_pkghash_add(db->pkgcache, pkg);
 			count++;
 		} else {
 			/* we have desc, depends or deltas - parse it */
-			sync_db_read(db, archive, entry, pkg);
+			if(sync_db_read(db, archive, entry, pkg) != 0) {
+				_alpm_log(db->handle, PM_LOG_ERROR,
+						_("could not parse package '%s' description file from db '%s'\n"),
+						pkg->name, db->treename);
+				_alpm_pkg_free(pkg);
+				pkg = NULL;
+				continue;
+			}
 		}
 	}
 
@@ -328,7 +344,7 @@ static int sync_db_populate(pmdb_t *db)
 		db->pkgcache->list = alpm_list_msort(db->pkgcache->list, (size_t)count, _alpm_pkg_cmp);
 	}
 	archive_read_finish(archive);
-	_alpm_log(PM_LOG_DEBUG, "added %d packages to package cache for db '%s'\n",
+	_alpm_log(db->handle, PM_LOG_DEBUG, "added %d packages to package cache for db '%s'\n",
 			count, db->treename);
 
 	return count;
@@ -355,26 +371,19 @@ static int sync_db_populate(pmdb_t *db)
 static int sync_db_read(pmdb_t *db, struct archive *archive,
 		struct archive_entry *entry, pmpkg_t *likely_pkg)
 {
-	const char *entryname = NULL, *filename;
+	const char *entryname, *filename;
 	char *pkgname, *p, *q;
 	pmpkg_t *pkg;
 	struct archive_read_buffer buf;
 
-	ALPM_LOG_FUNC;
-
-	if(db == NULL) {
-		RET_ERR(PM_ERR_DB_NULL, -1);
-	}
-
-	if(entry != NULL) {
-		entryname = archive_entry_pathname(entry);
-	}
+	entryname = archive_entry_pathname(entry);
 	if(entryname == NULL) {
-		_alpm_log(PM_LOG_DEBUG, "invalid archive entry provided to _alpm_sync_db_read, skipping\n");
+		_alpm_log(db->handle, PM_LOG_DEBUG,
+				"invalid archive entry provided to _alpm_sync_db_read, skipping\n");
 		return -1;
 	}
 
-	_alpm_log(PM_LOG_FUNCTION, "loading package data from archive entry %s\n",
+	_alpm_log(db->handle, PM_LOG_FUNCTION, "loading package data from archive entry %s\n",
 			entryname);
 
 	memset(&buf, 0, sizeof(buf));
@@ -382,7 +391,7 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
 	buf.max_line_size = 512 * 1024;
 
 	/* get package and db file names */
-	STRDUP(pkgname, entryname, RET_ERR(PM_ERR_MEMORY, -1));
+	STRDUP(pkgname, entryname, RET_ERR(db->handle, PM_ERR_MEMORY, -1));
 	p = pkgname + strlen(pkgname);
 	for(q = --p; *q && *q != '/'; q--);
 	filename = q + 1;
@@ -395,31 +404,32 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
 		pkg = likely_pkg;
 	} else {
 		if(db->pkgcache == NULL) {
-			RET_ERR(PM_ERR_MEMORY, -1);
+			RET_ERR(db->handle, PM_ERR_MEMORY, -1);
 		}
 		pkg = _alpm_pkghash_find(db->pkgcache, pkgname);
 	}
 	if(pkg == NULL) {
-		_alpm_log(PM_LOG_DEBUG, "package %s not found in %s sync database",
+		_alpm_log(db->handle, PM_LOG_DEBUG, "package %s not found in %s sync database",
 					pkgname, db->treename);
 		return -1;
 	}
 
 	if(strcmp(filename, "desc") == 0 || strcmp(filename, "depends") == 0
 			|| strcmp(filename, "deltas") == 0) {
-		while(_alpm_archive_fgets(archive, &buf) == ARCHIVE_OK) {
+		int ret;
+		while((ret = _alpm_archive_fgets(archive, &buf)) == ARCHIVE_OK) {
 			char *line = _alpm_strtrim(buf.line);
 
 			if(strcmp(line, "%NAME%") == 0) {
 				READ_NEXT(line);
 				if(strcmp(line, pkg->name) != 0) {
-					_alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name "
+					_alpm_log(db->handle, PM_LOG_ERROR, _("%s database is inconsistent: name "
 								"mismatch on package %s\n"), db->treename, pkg->name);
 				}
 			} else if(strcmp(line, "%VERSION%") == 0) {
 				READ_NEXT(line);
 				if(strcmp(line, pkg->version) != 0) {
-					_alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version "
+					_alpm_log(db->handle, PM_LOG_ERROR, _("%s database is inconsistent: version "
 								"mismatch on package %s\n"), db->treename, pkg->name);
 				}
 			} else if(strcmp(line, "%FILENAME%") == 0) {
@@ -484,17 +494,23 @@ static int sync_db_read(pmdb_t *db, struct archive *archive,
 				}
 			}
 		}
+		if(ret != ARCHIVE_EOF) {
+			goto error;
+		}
 	} else if(strcmp(filename, "files") == 0) {
 		/* currently do nothing with this file */
 	} else {
 		/* unknown database file */
-		_alpm_log(PM_LOG_DEBUG, "unknown database file: %s\n", filename);
+		_alpm_log(db->handle, PM_LOG_DEBUG, "unknown database file: %s\n", filename);
 	}
 
-error:
 	FREE(pkgname);
-	/* TODO: return 0 always? */
 	return 0;
+
+error:
+	_alpm_log(db->handle, PM_LOG_DEBUG, "error parsing database file: %s\n", filename);
+	FREE(pkgname);
+	return -1;
 }
 
 static int sync_db_version(pmdb_t UNUSED *db)
@@ -508,18 +524,18 @@ struct db_operations sync_db_ops = {
 	.version          = sync_db_version,
 };
 
-pmdb_t *_alpm_db_register_sync(const char *treename)
+pmdb_t *_alpm_db_register_sync(pmhandle_t *handle, const char *treename)
 {
 	pmdb_t *db;
 
-	ALPM_LOG_FUNC;
-	_alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename);
+	_alpm_log(handle, PM_LOG_DEBUG, "registering sync database '%s'\n", treename);
 
 	db = _alpm_db_new(treename, 0);
 	if(db == NULL) {
-		RET_ERR(PM_ERR_DB_CREATE, NULL);
+		RET_ERR(handle, PM_ERR_DB_CREATE, NULL);
 	}
 	db->ops = &sync_db_ops;
+	db->handle = handle;
 
 	handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
 	return db;