Separate be_files into be_sync and be_local

The file be_files.c is "split" to be_local.c and be_sync.c in order
to achieve separate handling of sync and local databases.

Some basic clean-up of functions that are only of use for local or
sync databases has been performed and some rough function renaming
in duplicated code has been performed to prevent compilation errors.
However, most of the clean-up and final separation of sync and local
db handling occurs in following patches.

Signed-off-by: Allan McRae <allan@archlinux.org>

8 files changed, 943 insertions, 325 deletions

diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am
index 13759190..bac30389 100644
--- a/lib/libalpm/Makefile.am
+++ b/lib/libalpm/Makefile.am
@@ -25,8 +25,9 @@ libalpm_la_SOURCES = \
 	alpm.h alpm.c \
 	alpm_list.h alpm_list.c \
 	backup.h backup.c \
-	be_files.c \
+	be_local.c \
 	be_package.c \
+	be_sync.c \
 	conflict.h conflict.c \
 	db.h db.c \
 	delta.h delta.c \
diff --git a/lib/libalpm/add.c b/lib/libalpm/add.c
index d76407b9..3e5e8c59 100644
--- a/lib/libalpm/add.c
+++ b/lib/libalpm/add.c
@@ -543,7 +543,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 
 	/* prepare directory for database entries so permission are correct after
 	   changelog/install script installation (FS#12263) */
-	if(_alpm_db_prepare(db, newpkg)) {
+	if(_alpm_local_db_prepare(db, newpkg)) {
 		alpm_logaction("error: could not create database entry %s-%s\n",
 				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
 		pm_errno = PM_ERR_DB_WRITE;
@@ -661,7 +661,7 @@ static int commit_single_pkg(pmpkg_t *newpkg, int pkg_current, int pkg_count,
 	_alpm_log(PM_LOG_DEBUG, "updating database\n");
 	_alpm_log(PM_LOG_DEBUG, "adding database entry '%s'\n", newpkg->name);
 
-	if(_alpm_db_write(db, newpkg, INFRQ_ALL)) {
+	if(_alpm_local_db_write(db, newpkg, INFRQ_ALL)) {
 		_alpm_log(PM_LOG_ERROR, _("could not update database entry %s-%s\n"),
 				alpm_pkg_get_name(newpkg), alpm_pkg_get_version(newpkg));
 		alpm_logaction("error: could not update database entry %s-%s\n",
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_local.c
index 864e58ea..2cd8ae14 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_local.c
@@ -1,5 +1,5 @@
 /*
- *  be_files.c
+ *  be_local.c
  *
  *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
  *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
@@ -287,37 +287,6 @@ int _cache_changelog_close(const pmpkg_t *pkg, void *fp)
 	return( fclose((FILE*)fp) );
 }
 
-/** The sync database operations struct. Get package fields through
- * lazy accessor methods that handle any backend loading and caching
- * logic.
- */
-static struct pkg_operations sync_pkg_ops = {
-	.get_filename    = _cache_get_filename,
-	.get_name        = _cache_get_name,
-	.get_version     = _cache_get_version,
-	.get_desc        = _cache_get_desc,
-	.get_url         = _cache_get_url,
-	.get_builddate   = _cache_get_builddate,
-	.get_installdate = _cache_get_installdate,
-	.get_packager    = _cache_get_packager,
-	.get_md5sum      = _cache_get_md5sum,
-	.get_arch        = _cache_get_arch,
-	.get_size        = _cache_get_size,
-	.get_isize       = _cache_get_isize,
-	.get_reason      = _cache_get_reason,
-	.has_force       = _cache_has_force,
-	.get_licenses    = _cache_get_licenses,
-	.get_groups      = _cache_get_groups,
-	.get_depends     = _cache_get_depends,
-	.get_optdepends  = _cache_get_optdepends,
-	.get_conflicts   = _cache_get_conflicts,
-	.get_provides    = _cache_get_provides,
-	.get_replaces    = _cache_get_replaces,
-	.get_deltas      = _cache_get_deltas,
-	.get_files       = _cache_get_files,
-	.get_backup      = _cache_get_backup,
-};
-
 /** The local database operations struct. Get package fields through
  * lazy accessor methods that handle any backend loading and caching
  * logic.
@@ -353,42 +322,6 @@ static struct pkg_operations local_pkg_ops = {
 	.changelog_close = _cache_changelog_close,
 };
 
-/* create list of directories in db */
-static int dirlist_from_tar(const char *archive, alpm_list_t **dirlist)
-{
-	struct archive *_archive;
-	struct archive_entry *entry;
-
-	if((_archive = archive_read_new()) == NULL)
-		RET_ERR(PM_ERR_LIBARCHIVE, -1);
-
-	archive_read_support_compression_all(_archive);
-	archive_read_support_format_all(_archive);
-
-	if(archive_read_open_filename(_archive, archive,
-				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-		_alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), archive,
-				archive_error_string(_archive));
-		RET_ERR(PM_ERR_PKG_OPEN, -1);
-	}
-
-	while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) {
-		const struct stat *st;
-		const char *entryname; /* the name of the file in the archive */
-
-		st = archive_entry_stat(entry);
-		entryname = archive_entry_pathname(entry);
-
-		if(S_ISDIR(st->st_mode)) {
-			char *name = strdup(entryname);
-			*dirlist = alpm_list_add(*dirlist, name);
-		}
-	}
-	archive_read_finish(_archive);
-
-	*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
-	return(0);
-}
 
 static int is_dir(const char *path, struct dirent *entry)
 {
@@ -407,203 +340,30 @@ static int is_dir(const char *path, struct dirent *entry)
 #endif
 }
 
-/* create list of directories in db */
-static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist)
+pmdb_t *_alpm_db_register_local(void)
 {
-	DIR *dbdir;
-	struct dirent *ent = NULL;
-
-	dbdir = opendir(syncdbpath);
-	if (dbdir != NULL) {
-		while((ent = readdir(dbdir)) != NULL) {
-			char *name = ent->d_name;
-			size_t len;
-			char *entry;
-
-			if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
-				continue;
-			}
-
-			if(!is_dir(syncdbpath, ent)) {
-				continue;
-			}
-
-			len = strlen(name);
-			MALLOC(entry, len + 2, RET_ERR(PM_ERR_MEMORY, -1));
-			strcpy(entry, name);
-			entry[len] = '/';
-			entry[len+1] = '\0';
-			*dirlist = alpm_list_add(*dirlist, entry);
-		}
-		closedir(dbdir);
-	}
-
-	*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
-	return(0);
-}
-
-/* remove old directories from dbdir */
-static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist)
-{
-	alpm_list_t *i;
-	for (i = dirlist; i; i = i->next) {
-		const char *name = i->data;
-		char *dbdir;
-		size_t len = strlen(syncdbpath) + strlen(name) + 2;
-		MALLOC(dbdir, len, RET_ERR(PM_ERR_MEMORY, -1));
-		snprintf(dbdir, len, "%s%s", syncdbpath, name);
-		_alpm_log(PM_LOG_DEBUG, "removing: %s\n", dbdir);
-		if(_alpm_rmrf(dbdir) != 0) {
-			_alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), dbdir);
-			free(dbdir);
-			RET_ERR(PM_ERR_DB_REMOVE, -1);
-		}
-		free(dbdir);
-	}
-	return(0);
-}
-
-/** Update a package database
- *
- * An update of the package database \a db will be attempted. Unless
- * \a force is true, the update will only be performed if the remote
- * database was modified since the last update.
- *
- * A transaction is necessary for this operation, in order to obtain a
- * database lock. During this transaction the front-end will be informed
- * of the download progress of the database via the download callback.
- *
- * Example:
- * @code
- * pmdb_t *db;
- * int result;
- * db = alpm_list_getdata(alpm_option_get_syncdbs());
- * if(alpm_trans_init(0, NULL, NULL, NULL) == 0) {
- *     result = alpm_db_update(0, db);
- *     alpm_trans_release();
- *
- *     if(result > 0) {
- *	       printf("Unable to update database: %s\n", alpm_strerrorlast());
- *     } else if(result < 0) {
- *         printf("Database already up to date\n");
- *     } else {
- *         printf("Database updated\n");
- *     }
- * }
- * @endcode
- *
- * @ingroup alpm_databases
- * @note After a successful update, the \link alpm_db_get_pkgcache()
- * package cache \endlink will be invalidated
- * @param force if true, then forces the update, otherwise update only in case
- * the database isn't up to date
- * @param db pointer to the package database to update
- * @return 0 on success, > 0 on error (pm_errno is set accordingly), < 0 if up
- * to date
- */
-int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
-{
-	char *dbfile, *dbfilepath, *syncpath;
-	const char *dbpath, *syncdbpath;
-	alpm_list_t *newdirlist = NULL, *olddirlist = NULL;
-	alpm_list_t *onlynew = NULL, *onlyold = NULL;
-	size_t len;
-	int ret;
+	pmdb_t *db;
 
 	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));
-	/* Verify we are in a transaction.  This is done _mainly_ because we need a DB
-	 * lock - if we update without a db lock, we may kludge some other pacman
-	 * process that _has_ a lock.
-	 */
-	ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
-	ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
-
-	if(!alpm_list_find_ptr(handle->dbs_sync, db)) {
-		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
-	}
-
-	len = strlen(db->treename) + 4;
-	MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1));
-	sprintf(dbfile, "%s.db", db->treename);
-
-	dbpath = alpm_option_get_dbpath();
-	len = strlen(dbpath) + 6;
-	MALLOC(syncpath, len, RET_ERR(PM_ERR_MEMORY, -1));
-	sprintf(syncpath, "%s%s", dbpath, "sync/");
-
-	ret = _alpm_download_single_file(dbfile, db->servers, syncpath, force);
-	free(dbfile);
-	free(syncpath);
-
-	if(ret == 1) {
-		/* files match, do nothing */
-		pm_errno = 0;
-		return(1);
-	} 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());
-		return(-1);
-	}
-
-	syncdbpath = _alpm_db_path(db);
-
-	/* form the path to the db location */
-	len = strlen(dbpath) + strlen(db->treename) + 9;
-	MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1));
-	sprintf(dbfilepath, "%ssync/%s.db", dbpath, db->treename);
-
-	if(force) {
-		/* if forcing update, remove the old dir and extract the db */
-		if(_alpm_rmrf(syncdbpath) != 0) {
-			_alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename);
-			RET_ERR(PM_ERR_DB_REMOVE, -1);
-		} else {
-			_alpm_log(PM_LOG_DEBUG, "database dir %s removed\n", _alpm_db_path(db));
-		}
-	} else {
-		/* if not forcing, only remove and extract what is necessary */
-		ret = dirlist_from_tar(dbfilepath, &newdirlist);
-		if(ret) {
-			goto cleanup;
-		}
-		ret = dirlist_from_fs(syncdbpath, &olddirlist);
-		if(ret) {
-			goto cleanup;
-		}
-
-		alpm_list_diff_sorted(olddirlist, newdirlist, _alpm_str_cmp, &onlyold, &onlynew);
-
-		ret = remove_olddir(syncdbpath, onlyold);
-		if(ret) {
-			goto cleanup;
-		}
+	if(handle->db_local != NULL) {
+		_alpm_log(PM_LOG_WARNING, _("attempt to re-register the 'local' DB\n"));
+		RET_ERR(PM_ERR_DB_NOT_NULL, NULL);
 	}
 
-	/* Cache needs to be rebuilt */
-	_alpm_db_free_pkgcache(db);
-
-	checkdbdir(db);
-	ret = _alpm_unpack(dbfilepath, syncdbpath, onlynew, 0);
-
-cleanup:
-	FREELIST(newdirlist);
-	FREELIST(olddirlist);
-	alpm_list_free(onlynew);
-	alpm_list_free(onlyold);
-
-	free(dbfilepath);
+	_alpm_log(PM_LOG_DEBUG, "registering local database\n");
 
-	if(ret) {
-		RET_ERR(PM_ERR_SYSTEM, -1);
+	db = _alpm_db_new("local", 1);
+	db->ops = &default_db_ops;
+	if(db == NULL) {
+		RET_ERR(PM_ERR_DB_CREATE, NULL);
 	}
 
-	return(0);
+	handle->db_local = db;
+	return(db);
 }
 
+
 int _alpm_db_populate(pmdb_t *db)
 {
 	int count = 0;
@@ -657,13 +417,10 @@ int _alpm_db_populate(pmdb_t *db)
 			_alpm_pkg_free(pkg);
 			continue;
 		}
-		if(db == handle->db_local) {
-			pkg->origin = PKG_FROM_LOCALDB;
-			pkg->ops = &local_pkg_ops;
-		}  else {
-			pkg->origin = PKG_FROM_SYNCDB;
-			pkg->ops = &sync_pkg_ops;
-		}
+
+		pkg->origin = PKG_FROM_LOCALDB;
+		pkg->ops = &local_pkg_ops;
+
 		pkg->origin_data.db = db;
 		/* add to the collection */
 		_alpm_log(PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
@@ -981,7 +738,7 @@ error:
 	return(-1);
 }
 
-int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info)
+int _alpm_local_db_prepare(pmdb_t *db, pmpkg_t *info)
 {
 	mode_t oldmask;
 	int retval = 0;
@@ -1005,7 +762,7 @@ int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info)
 	return(retval);
 }
 
-int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
+int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
 {
 	FILE *fp = NULL;
 	char path[PATH_MAX];
@@ -1204,7 +961,7 @@ cleanup:
 	return(retval);
 }
 
-int _alpm_db_remove(pmdb_t *db, pmpkg_t *info)
+int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info)
 {
 	int ret = 0;
 	char *pkgpath = NULL;
diff --git a/lib/libalpm/be_sync.c b/lib/libalpm/be_sync.c
new file mode 100644
index 00000000..a38e91a7
--- /dev/null
+++ b/lib/libalpm/be_sync.c
@@ -0,0 +1,906 @@
+/*
+ *  be_sync.c
+ *
+ *  Copyright (c) 2006-2010 Pacman Development Team <pacman-dev@archlinux.org>
+ *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <errno.h>
+#include <dirent.h>
+#include <ctype.h>
+
+/* libarchive */
+#include <archive.h>
+#include <archive_entry.h>
+
+/* libalpm */
+#include "util.h"
+#include "log.h"
+#include "alpm.h"
+#include "alpm_list.h"
+#include "package.h"
+#include "handle.h"
+#include "delta.h"
+#include "deps.h"
+#include "dload.h"
+
+
+#define LAZY_LOAD(info, errret) \
+	do { \
+		ALPM_LOG_FUNC; \
+		ASSERT(handle != NULL, return(errret)); \
+		ASSERT(pkg != NULL, return(errret)); \
+		if(pkg->origin != PKG_FROM_FILE && !(pkg->infolevel & info)) { \
+			_alpm_db_read(pkg->origin_data.db, pkg, info); \
+		} \
+	} while(0)
+
+
+/* Cache-specific accessor functions. These implementations allow for lazy
+ * loading by the files backend when a data member is actually needed
+ * rather than loading all pieces of information when the package is first
+ * initialized.
+ */
+
+const char *_sync_cache_get_filename(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->filename;
+}
+
+const char *_sync_cache_get_name(pmpkg_t *pkg)
+{
+	ASSERT(pkg != NULL, return(NULL));
+	return pkg->name;
+}
+
+static const char *_sync_cache_get_version(pmpkg_t *pkg)
+{
+	ASSERT(pkg != NULL, return(NULL));
+	return pkg->version;
+}
+
+static const char *_sync_cache_get_desc(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->desc;
+}
+
+const char *_sync_cache_get_url(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->url;
+}
+
+time_t _sync_cache_get_builddate(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, 0);
+	return pkg->builddate;
+}
+
+time_t _sync_cache_get_installdate(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, 0);
+	return pkg->installdate;
+}
+
+const char *_sync_cache_get_packager(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->packager;
+}
+
+const char *_sync_cache_get_md5sum(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->md5sum;
+}
+
+const char *_sync_cache_get_arch(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->arch;
+}
+
+off_t _sync_cache_get_size(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, -1);
+	return pkg->size;
+}
+
+off_t _sync_cache_get_isize(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, -1);
+	return pkg->isize;
+}
+
+pmpkgreason_t _sync_cache_get_reason(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, -1);
+	return pkg->reason;
+}
+
+alpm_list_t *_sync_cache_get_licenses(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->licenses;
+}
+
+alpm_list_t *_sync_cache_get_groups(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->groups;
+}
+
+int _sync_cache_has_force(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, -1);
+	return pkg->force;
+}
+
+alpm_list_t *_sync_cache_get_depends(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DEPENDS, NULL);
+	return pkg->depends;
+}
+
+alpm_list_t *_sync_cache_get_optdepends(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DEPENDS, NULL);
+	return pkg->optdepends;
+}
+
+alpm_list_t *_sync_cache_get_conflicts(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DEPENDS, NULL);
+	return pkg->conflicts;
+}
+
+alpm_list_t *_sync_cache_get_provides(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DEPENDS, NULL);
+	return pkg->provides;
+}
+
+alpm_list_t *_sync_cache_get_replaces(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DESC, NULL);
+	return pkg->replaces;
+}
+
+alpm_list_t *_sync_cache_get_deltas(pmpkg_t *pkg)
+{
+	LAZY_LOAD(INFRQ_DELTAS, NULL);
+	return pkg->deltas;
+}
+
+alpm_list_t *_sync_cache_get_files(pmpkg_t *pkg)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, return(NULL));
+	ASSERT(pkg != NULL, return(NULL));
+
+	if(pkg->origin == PKG_FROM_LOCALDB
+		 && !(pkg->infolevel & INFRQ_FILES)) {
+		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_FILES);
+	}
+	return pkg->files;
+}
+
+alpm_list_t *_sync_cache_get_backup(pmpkg_t *pkg)
+{
+	ALPM_LOG_FUNC;
+
+	/* Sanity checks */
+	ASSERT(handle != NULL, return(NULL));
+	ASSERT(pkg != NULL, return(NULL));
+
+	if(pkg->origin == PKG_FROM_LOCALDB
+		 && !(pkg->infolevel & INFRQ_FILES)) {
+		_alpm_db_read(pkg->origin_data.db, pkg, INFRQ_FILES);
+	}
+	return pkg->backup;
+}
+
+/** The sync database operations struct. Get package fields through
+ * lazy accessor methods that handle any backend loading and caching
+ * logic.
+ */
+static struct pkg_operations sync_pkg_ops = {
+	.get_filename    = _sync_cache_get_filename,
+	.get_name        = _sync_cache_get_name,
+	.get_version     = _sync_cache_get_version,
+	.get_desc        = _sync_cache_get_desc,
+	.get_url         = _sync_cache_get_url,
+	.get_builddate   = _sync_cache_get_builddate,
+	.get_installdate = _sync_cache_get_installdate,
+	.get_packager    = _sync_cache_get_packager,
+	.get_md5sum      = _sync_cache_get_md5sum,
+	.get_arch        = _sync_cache_get_arch,
+	.get_size        = _sync_cache_get_size,
+	.get_isize       = _sync_cache_get_isize,
+	.get_reason      = _sync_cache_get_reason,
+	.has_force       = _sync_cache_has_force,
+	.get_licenses    = _sync_cache_get_licenses,
+	.get_groups      = _sync_cache_get_groups,
+	.get_depends     = _sync_cache_get_depends,
+	.get_optdepends  = _sync_cache_get_optdepends,
+	.get_conflicts   = _sync_cache_get_conflicts,
+	.get_provides    = _sync_cache_get_provides,
+	.get_replaces    = _sync_cache_get_replaces,
+	.get_deltas      = _sync_cache_get_deltas,
+	.get_files       = _sync_cache_get_files,
+	.get_backup      = _sync_cache_get_backup,
+};
+
+pmdb_t *_alpm_db_register_sync(const char *treename)
+{
+	pmdb_t *db;
+	alpm_list_t *i;
+
+	ALPM_LOG_FUNC;
+
+	for(i = handle->dbs_sync; i; i = i->next) {
+		pmdb_t *sdb = i->data;
+		if(strcmp(treename, sdb->treename) == 0) {
+			_alpm_log(PM_LOG_DEBUG, "attempt to re-register the '%s' database, using existing\n", sdb->treename);
+			return sdb;
+		}
+	}
+
+	_alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename);
+
+	db = _alpm_db_new(treename, 0);
+	db->ops = &default_db_ops;
+	if(db == NULL) {
+		RET_ERR(PM_ERR_DB_CREATE, NULL);
+	}
+
+	handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
+	return(db);
+}
+
+/* create list of directories in db */
+static int dirlist_from_tar(const char *archive, alpm_list_t **dirlist)
+{
+	struct archive *_archive;
+	struct archive_entry *entry;
+
+	if((_archive = archive_read_new()) == NULL)
+		RET_ERR(PM_ERR_LIBARCHIVE, -1);
+
+	archive_read_support_compression_all(_archive);
+	archive_read_support_format_all(_archive);
+
+	if(archive_read_open_filename(_archive, archive,
+				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
+		_alpm_log(PM_LOG_ERROR, _("could not open %s: %s\n"), archive,
+				archive_error_string(_archive));
+		RET_ERR(PM_ERR_PKG_OPEN, -1);
+	}
+
+	while(archive_read_next_header(_archive, &entry) == ARCHIVE_OK) {
+		const struct stat *st;
+		const char *entryname; /* the name of the file in the archive */
+
+		st = archive_entry_stat(entry);
+		entryname = archive_entry_pathname(entry);
+
+		if(S_ISDIR(st->st_mode)) {
+			char *name = strdup(entryname);
+			*dirlist = alpm_list_add(*dirlist, name);
+		}
+	}
+	archive_read_finish(_archive);
+
+	*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
+	return(0);
+}
+
+static int is_dir(const char *path, struct dirent *entry)
+{
+#ifdef DT_DIR
+	return(entry->d_type == DT_DIR);
+#else
+	char buffer[PATH_MAX];
+	snprintf(buffer, PATH_MAX, "%s/%s", path, entry->d_name);
+
+	struct stat sbuf;
+	if (!stat(buffer, &sbuf)) {
+		return(S_ISDIR(sbuf.st_mode));
+	}
+
+	return(0);
+#endif
+}
+
+/* create list of directories in db */
+static int dirlist_from_fs(const char *syncdbpath, alpm_list_t **dirlist)
+{
+	DIR *dbdir;
+	struct dirent *ent = NULL;
+
+	dbdir = opendir(syncdbpath);
+	if (dbdir != NULL) {
+		while((ent = readdir(dbdir)) != NULL) {
+			char *name = ent->d_name;
+			size_t len;
+			char *entry;
+
+			if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
+				continue;
+			}
+
+			if(!is_dir(syncdbpath, ent)) {
+				continue;
+			}
+
+			len = strlen(name);
+			MALLOC(entry, len + 2, RET_ERR(PM_ERR_MEMORY, -1));
+			strcpy(entry, name);
+			entry[len] = '/';
+			entry[len+1] = '\0';
+			*dirlist = alpm_list_add(*dirlist, entry);
+		}
+		closedir(dbdir);
+	}
+
+	*dirlist = alpm_list_msort(*dirlist, alpm_list_count(*dirlist), _alpm_str_cmp);
+	return(0);
+}
+
+/* remove old directories from dbdir */
+static int remove_olddir(const char *syncdbpath, alpm_list_t *dirlist)
+{
+	alpm_list_t *i;
+	for (i = dirlist; i; i = i->next) {
+		const char *name = i->data;
+		char *dbdir;
+		size_t len = strlen(syncdbpath) + strlen(name) + 2;
+		MALLOC(dbdir, len, RET_ERR(PM_ERR_MEMORY, -1));
+		snprintf(dbdir, len, "%s%s", syncdbpath, name);
+		_alpm_log(PM_LOG_DEBUG, "removing: %s\n", dbdir);
+		if(_alpm_rmrf(dbdir) != 0) {
+			_alpm_log(PM_LOG_ERROR, _("could not remove database directory %s\n"), dbdir);
+			free(dbdir);
+			RET_ERR(PM_ERR_DB_REMOVE, -1);
+		}
+		free(dbdir);
+	}
+	return(0);
+}
+
+/** Update a package database
+ *
+ * An update of the package database \a db will be attempted. Unless
+ * \a force is true, the update will only be performed if the remote
+ * database was modified since the last update.
+ *
+ * A transaction is necessary for this operation, in order to obtain a
+ * database lock. During this transaction the front-end will be informed
+ * of the download progress of the database via the download callback.
+ *
+ * Example:
+ * @code
+ * pmdb_t *db;
+ * int result;
+ * db = alpm_list_getdata(alpm_option_get_syncdbs());
+ * if(alpm_trans_init(0, NULL, NULL, NULL) == 0) {
+ *     result = alpm_db_update(0, db);
+ *     alpm_trans_release();
+ *
+ *     if(result > 0) {
+ *	       printf("Unable to update database: %s\n", alpm_strerrorlast());
+ *     } else if(result < 0) {
+ *         printf("Database already up to date\n");
+ *     } else {
+ *         printf("Database updated\n");
+ *     }
+ * }
+ * @endcode
+ *
+ * @ingroup alpm_databases
+ * @note After a successful update, the \link alpm_db_get_pkgcache()
+ * package cache \endlink will be invalidated
+ * @param force if true, then forces the update, otherwise update only in case
+ * the database isn't up to date
+ * @param db pointer to the package database to update
+ * @return 0 on success, > 0 on error (pm_errno is set accordingly), < 0 if up
+ * to date
+ */
+int SYMEXPORT alpm_db_update(int force, pmdb_t *db)
+{
+	char *dbfile, *dbfilepath, *syncpath;
+	const char *dbpath, *syncdbpath;
+	alpm_list_t *newdirlist = NULL, *olddirlist = NULL;
+	alpm_list_t *onlynew = NULL, *onlyold = NULL;
+	size_t len;
+	int ret;
+
+	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));
+	/* Verify we are in a transaction.  This is done _mainly_ because we need a DB
+	 * lock - if we update without a db lock, we may kludge some other pacman
+	 * process that _has_ a lock.
+	 */
+	ASSERT(handle->trans != NULL, RET_ERR(PM_ERR_TRANS_NULL, -1));
+	ASSERT(handle->trans->state == STATE_INITIALIZED, RET_ERR(PM_ERR_TRANS_NOT_INITIALIZED, -1));
+
+	if(!alpm_list_find_ptr(handle->dbs_sync, db)) {
+		RET_ERR(PM_ERR_DB_NOT_FOUND, -1);
+	}
+
+	len = strlen(db->treename) + 4;
+	MALLOC(dbfile, len, RET_ERR(PM_ERR_MEMORY, -1));
+	sprintf(dbfile, "%s.db", db->treename);
+
+	dbpath = alpm_option_get_dbpath();
+	len = strlen(dbpath) + 6;
+	MALLOC(syncpath, len, RET_ERR(PM_ERR_MEMORY, -1));
+	sprintf(syncpath, "%s%s", dbpath, "sync/");
+
+	ret = _alpm_download_single_file(dbfile, db->servers, syncpath, force);
+	free(dbfile);
+	free(syncpath);
+
+	if(ret == 1) {
+		/* files match, do nothing */
+		pm_errno = 0;
+		return(1);
+	} 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());
+		return(-1);
+	}
+
+	syncdbpath = _alpm_db_path(db);
+
+	/* form the path to the db location */
+	len = strlen(dbpath) + strlen(db->treename) + 9;
+	MALLOC(dbfilepath, len, RET_ERR(PM_ERR_MEMORY, -1));
+	sprintf(dbfilepath, "%ssync/%s.db", dbpath, db->treename);
+
+	if(force) {
+		/* if forcing update, remove the old dir and extract the db */
+		if(_alpm_rmrf(syncdbpath) != 0) {
+			_alpm_log(PM_LOG_ERROR, _("could not remove database %s\n"), db->treename);
+			RET_ERR(PM_ERR_DB_REMOVE, -1);
+		} else {
+			_alpm_log(PM_LOG_DEBUG, "database dir %s removed\n", _alpm_db_path(db));
+		}
+	} else {
+		/* if not forcing, only remove and extract what is necessary */
+		ret = dirlist_from_tar(dbfilepath, &newdirlist);
+		if(ret) {
+			goto cleanup;
+		}
+		ret = dirlist_from_fs(syncdbpath, &olddirlist);
+		if(ret) {
+			goto cleanup;
+		}
+
+		alpm_list_diff_sorted(olddirlist, newdirlist, _alpm_str_cmp, &onlyold, &onlynew);
+
+		ret = remove_olddir(syncdbpath, onlyold);
+		if(ret) {
+			goto cleanup;
+		}
+	}
+
+	/* Cache needs to be rebuilt */
+	_alpm_db_free_pkgcache(db);
+
+	checkdbdir(db);
+	ret = _alpm_unpack(dbfilepath, syncdbpath, onlynew, 0);
+
+cleanup:
+	FREELIST(newdirlist);
+	FREELIST(olddirlist);
+	alpm_list_free(onlynew);
+	alpm_list_free(onlyold);
+
+	free(dbfilepath);
+
+	if(ret) {
+		RET_ERR(PM_ERR_SYSTEM, -1);
+	}
+
+	return(0);
+}
+
+
+int _alpm_sync_db_populate(pmdb_t *db)
+{
+	int count = 0;
+	struct dirent *ent = NULL;
+	const char *dbpath;
+	DIR *dbdir;
+
+	ALPM_LOG_FUNC;
+
+	ASSERT(db != NULL, RET_ERR(PM_ERR_DB_NULL, -1));
+
+	dbpath = _alpm_db_path(db);
+	dbdir = opendir(dbpath);
+	if(dbdir == NULL) {
+		return(0);
+	}
+	while((ent = readdir(dbdir)) != NULL) {
+		const char *name = ent->d_name;
+		pmpkg_t *pkg;
+
+		if(strcmp(name, ".") == 0 || strcmp(name, "..") == 0) {
+			continue;
+		}
+		if(!is_dir(dbpath, ent)) {
+			continue;
+		}
+
+		pkg = _alpm_pkg_new();
+		if(pkg == NULL) {
+			closedir(dbdir);
+			return(-1);
+		}
+		/* split the db entry name */
+		if(splitname(name, pkg) != 0) {
+			_alpm_log(PM_LOG_ERROR, _("invalid name for database entry '%s'\n"),
+					name);
+			_alpm_pkg_free(pkg);
+			continue;
+		}
+
+		/* duplicated database entries are not allowed */
+		if(_alpm_pkg_find(db->pkgcache, pkg->name)) {
+			_alpm_log(PM_LOG_ERROR, _("duplicated database entry '%s'\n"), pkg->name);
+			_alpm_pkg_free(pkg);
+			continue;
+		}
+
+		/* explicitly read with only 'BASE' data, accessors will handle the rest */
+		if(_alpm_db_read(db, pkg, INFRQ_BASE) == -1) {
+			_alpm_log(PM_LOG_ERROR, _("corrupted database entry '%s'\n"), name);
+			_alpm_pkg_free(pkg);
+			continue;
+		}
+
+		pkg->origin = PKG_FROM_SYNCDB;
+		pkg->ops = &sync_pkg_ops;
+
+		pkg->origin_data.db = db;
+		/* add to the collection */
+		_alpm_log(PM_LOG_FUNCTION, "adding '%s' to package cache for db '%s'\n",
+				pkg->name, db->treename);
+		db->pkgcache = alpm_list_add(db->pkgcache, pkg);
+		count++;
+	}
+
+	closedir(dbdir);
+	db->pkgcache = alpm_list_msort(db->pkgcache, count, _alpm_pkg_cmp);
+	return(count);
+}
+
+int _alpm_sync_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
+{
+	FILE *fp = NULL;
+	char path[PATH_MAX];
+	char line[1024];
+	char *pkgpath = NULL;
+
+	ALPM_LOG_FUNC;
+
+	if(db == NULL) {
+		RET_ERR(PM_ERR_DB_NULL, -1);
+	}
+
+	if(info == NULL || info->name == NULL || info->version == NULL) {
+		_alpm_log(PM_LOG_DEBUG, "invalid package entry provided to _alpm_db_read, skipping\n");
+		return(-1);
+	}
+
+	if(info->origin == PKG_FROM_FILE) {
+		_alpm_log(PM_LOG_DEBUG, "request to read database info for a file-based package '%s', skipping...\n", info->name);
+		return(-1);
+	}
+
+	/* bitmask logic here:
+	 * infolevel: 00001111
+	 * inforeq:   00010100
+	 * & result:  00000100
+	 * == to inforeq? nope, we need to load more info. */
+	if((info->infolevel & inforeq) == inforeq) {
+		/* already loaded this info, do nothing */
+		return(0);
+	}
+	_alpm_log(PM_LOG_FUNCTION, "loading package data for %s : level=0x%x\n",
+			info->name, inforeq);
+
+	/* clear out 'line', to be certain - and to make valgrind happy */
+	memset(line, 0, sizeof(line));
+
+	pkgpath = get_pkgpath(db, info);
+
+	if(access(pkgpath, F_OK)) {
+		/* directory doesn't exist or can't be opened */
+		_alpm_log(PM_LOG_DEBUG, "cannot find '%s-%s' in db '%s'\n",
+				info->name, info->version, db->treename);
+		goto error;
+	}
+
+	/* DESC */
+	if(inforeq & INFRQ_DESC) {
+		snprintf(path, PATH_MAX, "%sdesc", pkgpath);
+		if((fp = fopen(path, "r")) == NULL) {
+			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
+			goto error;
+		}
+		while(!feof(fp)) {
+			if(fgets(line, sizeof(line), fp) == NULL) {
+				break;
+			}
+			_alpm_strtrim(line);
+			if(strcmp(line, "%NAME%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				if(strcmp(_alpm_strtrim(line), info->name) != 0) {
+					_alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: name "
+								"mismatch on package %s\n"), db->treename, info->name);
+				}
+			} else if(strcmp(line, "%VERSION%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				if(strcmp(_alpm_strtrim(line), info->version) != 0) {
+					_alpm_log(PM_LOG_ERROR, _("%s database is inconsistent: version "
+								"mismatch on package %s\n"), db->treename, info->name);
+				}
+			} else if(strcmp(line, "%FILENAME%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				STRDUP(info->filename, _alpm_strtrim(line), goto error);
+			} else if(strcmp(line, "%DESC%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				STRDUP(info->desc, _alpm_strtrim(line), goto error);
+			} else if(strcmp(line, "%GROUPS%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					char *linedup;
+					STRDUP(linedup, _alpm_strtrim(line), goto error);
+					info->groups = alpm_list_add(info->groups, linedup);
+				}
+			} else if(strcmp(line, "%URL%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				STRDUP(info->url, _alpm_strtrim(line), goto error);
+			} else if(strcmp(line, "%LICENSE%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					char *linedup;
+					STRDUP(linedup, _alpm_strtrim(line), goto error);
+					info->licenses = alpm_list_add(info->licenses, linedup);
+				}
+			} else if(strcmp(line, "%ARCH%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				STRDUP(info->arch, _alpm_strtrim(line), goto error);
+			} else if(strcmp(line, "%BUILDDATE%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				_alpm_strtrim(line);
+
+				char first = tolower((unsigned char)line[0]);
+				if(first > 'a' && first < 'z') {
+					struct tm tmp_tm = {0}; /* initialize to null in case of failure */
+					setlocale(LC_TIME, "C");
+					strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm);
+					info->builddate = mktime(&tmp_tm);
+					setlocale(LC_TIME, "");
+				} else {
+					info->builddate = atol(line);
+				}
+			} else if(strcmp(line, "%INSTALLDATE%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				_alpm_strtrim(line);
+
+				char first = tolower((unsigned char)line[0]);
+				if(first > 'a' && first < 'z') {
+					struct tm tmp_tm = {0}; /* initialize to null in case of failure */
+					setlocale(LC_TIME, "C");
+					strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm);
+					info->installdate = mktime(&tmp_tm);
+					setlocale(LC_TIME, "");
+				} else {
+					info->installdate = atol(line);
+				}
+			} else if(strcmp(line, "%PACKAGER%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				STRDUP(info->packager, _alpm_strtrim(line), goto error);
+			} else if(strcmp(line, "%REASON%") == 0) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				info->reason = (pmpkgreason_t)atol(_alpm_strtrim(line));
+			} else if(strcmp(line, "%SIZE%") == 0 || strcmp(line, "%CSIZE%") == 0) {
+				/* NOTE: the CSIZE and SIZE fields both share the "size" field
+				 *       in the pkginfo_t struct.  This can be done b/c CSIZE
+				 *       is currently only used in sync databases, and SIZE is
+				 *       only used in local databases.
+				 */
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				info->size = atol(_alpm_strtrim(line));
+				/* also store this value to isize if isize is unset */
+				if(info->isize == 0) {
+					info->isize = info->size;
+				}
+			} else if(strcmp(line, "%ISIZE%") == 0) {
+				/* ISIZE (installed size) tag only appears in sync repositories,
+				 * not the local one. */
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				info->isize = atol(_alpm_strtrim(line));
+			} else if(strcmp(line, "%MD5SUM%") == 0) {
+				/* MD5SUM tag only appears in sync repositories,
+				 * not the local one. */
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					goto error;
+				}
+				STRDUP(info->md5sum, _alpm_strtrim(line), goto error);
+			} else if(strcmp(line, "%REPLACES%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					char *linedup;
+					STRDUP(linedup, _alpm_strtrim(line), goto error);
+					info->replaces = alpm_list_add(info->replaces, linedup);
+				}
+			} else if(strcmp(line, "%FORCE%") == 0) {
+				info->force = 1;
+			}
+		}
+		fclose(fp);
+		fp = NULL;
+	}
+
+	/* FILES */
+	if(inforeq & INFRQ_FILES) {
+		snprintf(path, PATH_MAX, "%sfiles", pkgpath);
+		if((fp = fopen(path, "r")) == NULL) {
+			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
+			goto error;
+		}
+		while(fgets(line, sizeof(line), fp)) {
+			_alpm_strtrim(line);
+			if(strcmp(line, "%FILES%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					char *linedup;
+					STRDUP(linedup, _alpm_strtrim(line), goto error);
+					info->files = alpm_list_add(info->files, linedup);
+				}
+			} else if(strcmp(line, "%BACKUP%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					char *linedup;
+					STRDUP(linedup, _alpm_strtrim(line), goto error);
+					info->backup = alpm_list_add(info->backup, linedup);
+				}
+			}
+		}
+		fclose(fp);
+		fp = NULL;
+	}
+
+	/* DEPENDS */
+	if(inforeq & INFRQ_DEPENDS) {
+		snprintf(path, PATH_MAX, "%sdepends", pkgpath);
+		if((fp = fopen(path, "r")) == NULL) {
+			_alpm_log(PM_LOG_ERROR, _("could not open file %s: %s\n"), path, strerror(errno));
+			goto error;
+		}
+		while(!feof(fp)) {
+			if(fgets(line, sizeof(line), fp) == NULL) {
+				break;
+			}
+			_alpm_strtrim(line);
+			if(strcmp(line, "%DEPENDS%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line));
+					info->depends = alpm_list_add(info->depends, dep);
+				}
+			} else if(strcmp(line, "%OPTDEPENDS%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					char *linedup;
+					STRDUP(linedup, _alpm_strtrim(line), goto error);
+					info->optdepends = alpm_list_add(info->optdepends, linedup);
+				}
+			} else if(strcmp(line, "%CONFLICTS%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					char *linedup;
+					STRDUP(linedup, _alpm_strtrim(line), goto error);
+					info->conflicts = alpm_list_add(info->conflicts, linedup);
+				}
+			} else if(strcmp(line, "%PROVIDES%") == 0) {
+				while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+					char *linedup;
+					STRDUP(linedup, _alpm_strtrim(line), goto error);
+					info->provides = alpm_list_add(info->provides, linedup);
+				}
+			}
+		}
+		fclose(fp);
+		fp = NULL;
+	}
+
+	/* DELTAS */
+	if(inforeq & INFRQ_DELTAS) {
+		snprintf(path, PATH_MAX, "%sdeltas", pkgpath);
+		if((fp = fopen(path, "r"))) {
+			while(!feof(fp)) {
+				if(fgets(line, sizeof(line), fp) == NULL) {
+					break;
+				}
+				_alpm_strtrim(line);
+				if(strcmp(line, "%DELTAS%") == 0) {
+					while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
+						pmdelta_t *delta = _alpm_delta_parse(line);
+						if(delta) {
+							info->deltas = alpm_list_add(info->deltas, delta);
+						}
+					}
+				}
+			}
+			fclose(fp);
+			fp = NULL;
+		}
+	}
+
+	/* INSTALL */
+	if(inforeq & INFRQ_SCRIPTLET) {
+		snprintf(path, PATH_MAX, "%sinstall", pkgpath);
+		if(access(path, F_OK) == 0) {
+			info->scriptlet = 1;
+		}
+	}
+
+	/* internal */
+	info->infolevel |= inforeq;
+
+	free(pkgpath);
+	return(0);
+
+error:
+	free(pkgpath);
+	if(fp) {
+		fclose(fp);
+	}
+	return(-1);
+}
+
+/* vim: set ts=2 sw=2 noet: */
diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index ac3b9ccb..68e9ba7b 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -43,6 +43,7 @@
 #include "package.h"
 #include "group.h"
 
+
 struct db_operations default_db_ops = {
 	.populate         = _alpm_db_populate,
 	.unregister       = _alpm_db_unregister,
@@ -362,7 +363,7 @@ int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t
 	/* set reason (in pkgcache) */
 	pkg->reason = reason;
 	/* write DESC */
-	if(_alpm_db_write(db, pkg, INFRQ_DESC)) {
+	if(_alpm_local_db_write(db, pkg, INFRQ_DESC)) {
 		return(-1);
 	}
 
@@ -371,7 +372,7 @@ int SYMEXPORT alpm_db_set_pkgreason(pmdb_t *db, const char *name, pmpkgreason_t
 
 /** @} */
 
-static pmdb_t *_alpm_db_new(const char *treename, int is_local)
+pmdb_t *_alpm_db_new(const char *treename, int is_local)
 {
 	pmdb_t *db;
 
@@ -513,56 +514,6 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles)
 	return(ret);
 }
 
-pmdb_t *_alpm_db_register_local(void)
-{
-	pmdb_t *db;
-
-	ALPM_LOG_FUNC;
-
-	if(handle->db_local != NULL) {
-		_alpm_log(PM_LOG_WARNING, _("attempt to re-register the 'local' DB\n"));
-		RET_ERR(PM_ERR_DB_NOT_NULL, NULL);
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "registering local database\n");
-
-	db = _alpm_db_new("local", 1);
-	db->ops = &default_db_ops;
-	if(db == NULL) {
-		RET_ERR(PM_ERR_DB_CREATE, NULL);
-	}
-
-	handle->db_local = db;
-	return(db);
-}
-
-pmdb_t *_alpm_db_register_sync(const char *treename)
-{
-	pmdb_t *db;
-	alpm_list_t *i;
-
-	ALPM_LOG_FUNC;
-
-	for(i = handle->dbs_sync; i; i = i->next) {
-		pmdb_t *sdb = i->data;
-		if(strcmp(treename, sdb->treename) == 0) {
-			_alpm_log(PM_LOG_DEBUG, "attempt to re-register the '%s' database, using existing\n", sdb->treename);
-			return sdb;
-		}
-	}
-
-	_alpm_log(PM_LOG_DEBUG, "registering sync database '%s'\n", treename);
-
-	db = _alpm_db_new(treename, 0);
-	db->ops = &default_db_ops;
-	if(db == NULL) {
-		RET_ERR(PM_ERR_DB_CREATE, NULL);
-	}
-
-	handle->dbs_sync = alpm_list_add(handle->dbs_sync, db);
-	return(db);
-}
-
 /* Returns a new package cache from db.
  * It frees the cache if it already exists.
  */
diff --git a/lib/libalpm/db.h b/lib/libalpm/db.h
index f4559fe9..8adbc5d1 100644
--- a/lib/libalpm/db.h
+++ b/lib/libalpm/db.h
@@ -70,13 +70,15 @@ alpm_list_t *_alpm_db_search(pmdb_t *db, const alpm_list_t *needles);
 pmdb_t *_alpm_db_register_local(void);
 pmdb_t *_alpm_db_register_sync(const char *treename);
 void _alpm_db_unregister(pmdb_t *db);
+pmdb_t *_alpm_db_new(const char *treename, int is_local);
 
 /* be.c, backend specific calls */
 int _alpm_db_populate(pmdb_t *db);
 int _alpm_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
-int _alpm_db_prepare(pmdb_t *db, pmpkg_t *info);
-int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
-int _alpm_db_remove(pmdb_t *db, pmpkg_t *info);
+
+int _alpm_local_db_prepare(pmdb_t *db, pmpkg_t *info);
+int _alpm_local_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq);
+int _alpm_local_db_remove(pmdb_t *db, pmpkg_t *info);
 
 /* cache bullshit */
 /* packages */
diff --git a/lib/libalpm/po/POTFILES.in b/lib/libalpm/po/POTFILES.in
index 475cf4b4..65637977 100644
--- a/lib/libalpm/po/POTFILES.in
+++ b/lib/libalpm/po/POTFILES.in
@@ -6,8 +6,9 @@ lib/libalpm/add.c
 lib/libalpm/alpm.c
 #lib/libalpm/alpm_list.c
 lib/libalpm/backup.c
-lib/libalpm/be_files.c
+lib/libalpm/be_local.c
 lib/libalpm/be_package.c
+lib/libalpm/be_sync.c
 lib/libalpm/cache.c
 lib/libalpm/conflict.c
 lib/libalpm/db.c
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 8cbbd761..b53d85a6 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -347,7 +347,7 @@ int _alpm_upgraderemove_package(pmpkg_t *oldpkg, pmpkg_t *newpkg, pmtrans_t *tra
 	/* remove the package from the database */
 	_alpm_log(PM_LOG_DEBUG, "updating database\n");
 	_alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname);
-	if(_alpm_db_remove(handle->db_local, oldpkg) == -1) {
+	if(_alpm_local_db_remove(handle->db_local, oldpkg) == -1) {
 		_alpm_log(PM_LOG_ERROR, _("could not remove database entry %s-%s\n"),
 				pkgname, alpm_pkg_get_version(oldpkg));
 	}
@@ -442,7 +442,7 @@ int _alpm_remove_packages(pmtrans_t *trans, pmdb_t *db)
 		/* remove the package from the database */
 		_alpm_log(PM_LOG_DEBUG, "updating database\n");
 		_alpm_log(PM_LOG_DEBUG, "removing database entry '%s'\n", pkgname);
-		if(_alpm_db_remove(db, info) == -1) {
+		if(_alpm_local_db_remove(db, info) == -1) {
 			_alpm_log(PM_LOG_ERROR, _("could not remove database entry %s-%s\n"),
 			          pkgname, alpm_pkg_get_version(info));
 		}