1 files changed, 66 insertions, 90 deletions

diff --git a/lib/libalpm/diskspace.c b/lib/libalpm/diskspace.c
index 066107d7..b28b88ab 100644
--- a/lib/libalpm/diskspace.c
+++ b/lib/libalpm/diskspace.c
@@ -39,10 +39,6 @@
 #include <sys/types.h>
 #endif
 
-/* libarchive */
-#include <archive.h>
-#include <archive_entry.h>
-
 /* libalpm */
 #include "diskspace.h"
 #include "alpm_list.h"
@@ -56,10 +52,10 @@ static int mount_point_cmp(const void *p1, const void *p2)
 	const alpm_mountpoint_t *mp1 = p1;
 	const alpm_mountpoint_t *mp2 = p2;
 	/* the negation will sort all mountpoints before their parent */
-	return(-strcmp(mp1->mount_dir, mp2->mount_dir));
+	return -strcmp(mp1->mount_dir, mp2->mount_dir);
 }
 
-static alpm_list_t *mount_point_list(void)
+static alpm_list_t *mount_point_list(alpm_handle_t *handle)
 {
 	alpm_list_t *mount_points = NULL, *ptr;
 	alpm_mountpoint_t *mp;
@@ -71,23 +67,23 @@ static alpm_list_t *mount_point_list(void)
 
 	fp = setmntent(MOUNTED, "r");
 
-	if (fp == NULL) {
-		return(NULL);
+	if(fp == NULL) {
+		return NULL;
 	}
 
 	while((mnt = getmntent(fp))) {
 		if(!mnt) {
-			_alpm_log(PM_LOG_WARNING, _("could not get filesystem information\n"));
+			_alpm_log(handle, ALPM_LOG_WARNING, _("could not get filesystem information\n"));
 			continue;
 		}
 		if(statvfs(mnt->mnt_dir, &fsp) != 0) {
-			_alpm_log(PM_LOG_WARNING,
+			_alpm_log(handle, ALPM_LOG_WARNING,
 					_("could not get filesystem information for %s: %s\n"),
 					mnt->mnt_dir, strerror(errno));
 			continue;
 		}
 
-		CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL));
+		CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(handle, ALPM_ERR_MEMORY, NULL));
 		mp->mount_dir = strdup(mnt->mnt_dir);
 		mp->mount_dir_len = strlen(mp->mount_dir);
 		memcpy(&(mp->fsp), &fsp, sizeof(struct statvfs));
@@ -103,12 +99,12 @@ static alpm_list_t *mount_point_list(void)
 
 	entries = getmntinfo(&fsp, MNT_NOWAIT);
 
-	if (entries < 0) {
-		return(NULL);
+	if(entries < 0) {
+		return NULL;
 	}
 
 	for(; entries-- > 0; fsp++) {
-		CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(PM_ERR_MEMORY, NULL));
+		CALLOC(mp, 1, sizeof(alpm_mountpoint_t), RET_ERR(ALPM_ERR_MEMORY, NULL));
 		mp->mount_dir = strdup(fsp->f_mntonname);
 		mp->mount_dir_len = strlen(mp->mount_dir);
 		memcpy(&(mp->fsp), fsp, sizeof(FSSTATSTYPE));
@@ -126,9 +122,9 @@ static alpm_list_t *mount_point_list(void)
 			mount_point_cmp);
 	for(ptr = mount_points; ptr != NULL; ptr = ptr->next) {
 		mp = ptr->data;
-		_alpm_log(PM_LOG_DEBUG, "mountpoint: %s\n", mp->mount_dir);
+		_alpm_log(handle, ALPM_LOG_DEBUG, "mountpoint: %s\n", mp->mount_dir);
 	}
-	return(mount_points);
+	return mount_points;
 }
 
 static alpm_mountpoint_t *match_mount_point(const alpm_list_t *mount_points,
@@ -140,25 +136,30 @@ static alpm_mountpoint_t *match_mount_point(const alpm_list_t *mount_points,
 		alpm_mountpoint_t *data = mp->data;
 
 		if(strncmp(data->mount_dir, real_path, data->mount_dir_len) == 0) {
-			return(data);
+			return data;
 		}
 	}
 
 	/* should not get here... */
-	return(NULL);
+	return NULL;
 }
 
-static int calculate_removed_size(const alpm_list_t *mount_points,
-		pmpkg_t *pkg)
+static int calculate_removed_size(alpm_handle_t *handle,
+		const alpm_list_t *mount_points, alpm_pkg_t *pkg)
 {
-	alpm_list_t *file;
+	size_t i;
+	alpm_filelist_t *filelist = alpm_pkg_get_files(pkg);
+
+	if(!filelist->count) {
+		return 0;
+	}
 
-	alpm_list_t *files = alpm_pkg_get_files(pkg);
-	for(file = files; file; file = file->next) {
+	for(i = 0; i < filelist->count; i++) {
+		const alpm_file_t *file = filelist->files + i;
 		alpm_mountpoint_t *mp;
 		struct stat st;
 		char path[PATH_MAX];
-		const char *filename = file->data;
+		const char *filename = file->name;
 
 		snprintf(path, PATH_MAX, "%s%s", handle->root, filename);
 		_alpm_lstat(path, &st);
@@ -171,7 +172,7 @@ static int calculate_removed_size(const alpm_list_t *mount_points,
 
 		mp = match_mount_point(mount_points, path);
 		if(mp == NULL) {
-			_alpm_log(PM_LOG_WARNING,
+			_alpm_log(handle, ALPM_LOG_WARNING,
 					_("could not determine mount point for file %s\n"), filename);
 			continue;
 		}
@@ -182,129 +183,104 @@ static int calculate_removed_size(const alpm_list_t *mount_points,
 		mp->used |= USED_REMOVE;
 	}
 
-	return(0);
+	return 0;
 }
 
-static int calculate_installed_size(const alpm_list_t *mount_points,
-		pmpkg_t *pkg)
+static int calculate_installed_size(alpm_handle_t *handle,
+		const alpm_list_t *mount_points, alpm_pkg_t *pkg)
 {
-	int ret=0;
-	struct archive *archive;
-	struct archive_entry *entry;
-
-	if ((archive = archive_read_new()) == NULL) {
-		pm_errno = PM_ERR_LIBARCHIVE;
-		ret = -1;
-		goto cleanup;
-	}
-
-	archive_read_support_compression_all(archive);
-	archive_read_support_format_all(archive);
+	size_t i;
+	alpm_filelist_t *filelist = alpm_pkg_get_files(pkg);
 
-	if(archive_read_open_filename(archive, pkg->origin_data.file,
-				ARCHIVE_DEFAULT_BYTES_PER_BLOCK) != ARCHIVE_OK) {
-		pm_errno = PM_ERR_PKG_OPEN;
-		ret = -1;
-		goto cleanup;
+	if(!filelist->count) {
+		return 0;
 	}
 
-	while(archive_read_next_header(archive, &entry) == ARCHIVE_OK) {
+	for(i = 0; i < filelist->count; i++) {
+		const alpm_file_t *file = filelist->files + i;
 		alpm_mountpoint_t *mp;
-		const char *filename;
-		mode_t mode;
 		char path[PATH_MAX];
-
-		filename = archive_entry_pathname(entry);
-		mode = archive_entry_mode(entry);
+		const char *filename = file->name;
 
 		/* libarchive reports these as zero size anyways */
 		/* NOTE: if we do start accounting for directory size, a dir matching a
 		 * mountpoint needs to be attributed to the parent, not the mountpoint. */
-		if(S_ISDIR(mode) || S_ISLNK(mode)) {
+		if(S_ISDIR(file->mode) || S_ISLNK(file->mode)) {
 			continue;
 		}
 
 		/* approximate space requirements for db entries */
 		if(filename[0] == '.') {
-			filename = alpm_option_get_dbpath();
+			filename = alpm_option_get_dbpath(handle);
 		}
 
 		snprintf(path, PATH_MAX, "%s%s", handle->root, filename);
 
 		mp = match_mount_point(mount_points, path);
 		if(mp == NULL) {
-			_alpm_log(PM_LOG_WARNING,
+			_alpm_log(handle, ALPM_LOG_WARNING,
 					_("could not determine mount point for file %s\n"), filename);
 			continue;
 		}
 
 		/* the addition of (divisor - 1) performs ceil() with integer division */
 		mp->blocks_needed +=
-			(archive_entry_size(entry) + mp->fsp.f_bsize - 1l) / mp->fsp.f_bsize;
+			(file->size + mp->fsp.f_bsize - 1l) / mp->fsp.f_bsize;
 		mp->used |= USED_INSTALL;
-
-		if(archive_read_data_skip(archive)) {
-			_alpm_log(PM_LOG_ERROR, _("error while reading package %s: %s\n"),
-					pkg->name, archive_error_string(archive));
-			pm_errno = PM_ERR_LIBARCHIVE;
-			break;
-		}
 	}
 
-	archive_read_finish(archive);
-
-cleanup:
-	return(ret);
+	return 0;
 }
 
-int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
+int _alpm_check_diskspace(alpm_handle_t *handle)
 {
 	alpm_list_t *mount_points, *i;
 	alpm_mountpoint_t *root_mp;
 	size_t replaces = 0, current = 0, numtargs;
-	int abort = 0;
+	int error = 0;
 	alpm_list_t *targ;
+	alpm_trans_t *trans = handle->trans;
 
 	numtargs = alpm_list_count(trans->add);
-	mount_points = mount_point_list();
+	mount_points = mount_point_list(handle);
 	if(mount_points == NULL) {
-		_alpm_log(PM_LOG_ERROR, _("could not determine filesystem mount points\n"));
-		return(-1);
+		_alpm_log(handle, ALPM_LOG_ERROR, _("could not determine filesystem mount points\n"));
+		return -1;
 	}
 	root_mp = match_mount_point(mount_points, handle->root);
 	if(root_mp == NULL) {
-		_alpm_log(PM_LOG_ERROR, _("could not determine root mount point %s\n"),
+		_alpm_log(handle, ALPM_LOG_ERROR, _("could not determine root mount point %s\n"),
 				handle->root);
-		return(-1);
+		return -1;
 	}
 
 	replaces = alpm_list_count(trans->remove);
 	if(replaces) {
 		numtargs += replaces;
 		for(targ = trans->remove; targ; targ = targ->next, current++) {
-			pmpkg_t *local_pkg;
+			alpm_pkg_t *local_pkg;
 			int percent = (current * 100) / numtargs;
-			PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
+			PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
 					numtargs, current);
 
 			local_pkg = targ->data;
-			calculate_removed_size(mount_points, local_pkg);
+			calculate_removed_size(handle, mount_points, local_pkg);
 		}
 	}
 
 	for(targ = trans->add; targ; targ = targ->next, current++) {
-		pmpkg_t *pkg, *local_pkg;
+		alpm_pkg_t *pkg, *local_pkg;
 		int percent = (current * 100) / numtargs;
-		PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
+		PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", percent,
 				numtargs, current);
 
 		pkg = targ->data;
 		/* is this package already installed? */
-		local_pkg = _alpm_db_get_pkgfromcache(db_local, pkg->name);
+		local_pkg = _alpm_db_get_pkgfromcache(handle->db_local, pkg->name);
 		if(local_pkg) {
-			calculate_removed_size(mount_points, local_pkg);
+			calculate_removed_size(handle, mount_points, local_pkg);
 		}
-		calculate_installed_size(mount_points, pkg);
+		calculate_installed_size(handle, mount_points, pkg);
 
 		for(i = mount_points; i; i = alpm_list_next(i)) {
 			alpm_mountpoint_t *data = i->data;
@@ -314,30 +290,30 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
 		}
 	}
 
-	PROGRESS(trans, PM_TRANS_PROGRESS_DISKSPACE_START, "", 100,
+	PROGRESS(trans, ALPM_TRANS_PROGRESS_DISKSPACE_START, "", 100,
 			numtargs, current);
 
 	for(i = mount_points; i; i = alpm_list_next(i)) {
 		alpm_mountpoint_t *data = i->data;
 		if(data->used && data->read_only) {
-			_alpm_log(PM_LOG_ERROR, _("Partition %s is mounted read only\n"),
+			_alpm_log(handle, ALPM_LOG_ERROR, _("Partition %s is mounted read only\n"),
 					data->mount_dir);
-			abort = 1;
+			error = 1;
 		} else if(data->used & USED_INSTALL) {
 			/* cushion is roughly min(5% capacity, 20MiB) */
 			long fivepc = ((long)data->fsp.f_blocks / 20) + 1;
 			long twentymb = (20 * 1024 * 1024 / (long)data->fsp.f_bsize) + 1;
 			long cushion = fivepc < twentymb ? fivepc : twentymb;
 
-			_alpm_log(PM_LOG_DEBUG, "partition %s, needed %ld, cushion %ld, free %ld\n",
+			_alpm_log(handle, ALPM_LOG_DEBUG, "partition %s, needed %ld, cushion %ld, free %ld\n",
 					data->mount_dir, data->max_blocks_needed, cushion,
 					(unsigned long)data->fsp.f_bfree);
 			if(data->max_blocks_needed + cushion >= 0 &&
 			   (unsigned long)(data->max_blocks_needed + cushion) > data->fsp.f_bfree) {
-				_alpm_log(PM_LOG_ERROR, _("Partition %s too full: %ld blocks needed, %ld blocks free\n"),
+				_alpm_log(handle, ALPM_LOG_ERROR, _("Partition %s too full: %ld blocks needed, %ld blocks free\n"),
 						data->mount_dir, data->max_blocks_needed + cushion,
 						(unsigned long)data->fsp.f_bfree);
-				abort = 1;
+				error = 1;
 			}
 		}
 	}
@@ -348,11 +324,11 @@ int _alpm_check_diskspace(pmtrans_t *trans, pmdb_t *db_local)
 	}
 	FREELIST(mount_points);
 
-	if(abort) {
-		RET_ERR(PM_ERR_DISK_SPACE, -1);
+	if(error) {
+		RET_ERR(handle, ALPM_ERR_DISK_SPACE, -1);
 	}
 
-	return(0);
+	return 0;
 }
 
 /* vim: set ts=2 sw=2 noet: */