1 files changed, 53 insertions, 19 deletions

diff --git a/lib/libalpm/be_local.c b/lib/libalpm/be_local.c
index 56cf38bb..137da1a8 100644
--- a/lib/libalpm/be_local.c
+++ b/lib/libalpm/be_local.c
@@ -18,8 +18,6 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "config.h"
-
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -28,7 +26,6 @@
 #include <stdint.h> /* intmax_t */
 #include <sys/stat.h>
 #include <dirent.h>
-#include <time.h>
 #include <limits.h> /* PATH_MAX */
 
 /* libalpm */
@@ -69,13 +66,13 @@ static const char *_cache_get_url(alpm_pkg_t *pkg)
 	return pkg->url;
 }
 
-static time_t _cache_get_builddate(alpm_pkg_t *pkg)
+static alpm_time_t _cache_get_builddate(alpm_pkg_t *pkg)
 {
 	LAZY_LOAD(INFRQ_DESC, 0);
 	return pkg->builddate;
 }
 
-static time_t _cache_get_installdate(alpm_pkg_t *pkg)
+static alpm_time_t _cache_get_installdate(alpm_pkg_t *pkg)
 {
 	LAZY_LOAD(INFRQ_DESC, 0);
 	return pkg->installdate;
@@ -405,8 +402,7 @@ static int local_db_populate(alpm_db_t *db)
 		est_count -= 2;
 	}
 
-	/* initialize hash at 50% full */
-	db->pkgcache = _alpm_pkghash_create(est_count * 2);
+	db->pkgcache = _alpm_pkghash_create(est_count);
 	if(db->pkgcache == NULL){
 		closedir(dbdir);
 		RET_ERR(db->handle, ALPM_ERR_MEMORY, -1);
@@ -475,7 +471,8 @@ static int local_db_populate(alpm_db_t *db)
 }
 
 /* Note: the return value must be freed by the caller */
-char *_alpm_local_db_pkgpath(alpm_db_t *db, alpm_pkg_t *info, const char *filename)
+char *_alpm_local_db_pkgpath(alpm_db_t *db, alpm_pkg_t *info,
+		const char *filename)
 {
 	size_t len;
 	char *pkgpath;
@@ -638,10 +635,11 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
 		while(fgets(line, sizeof(line), fp)) {
 			_alpm_strip_newline(line);
 			if(strcmp(line, "%FILES%") == 0) {
-				size_t files_count = 0, files_size = 0;
+				size_t files_count = 0, files_size = 0, len;
 				alpm_file_t *files = NULL;
 
-				while(fgets(line, sizeof(line), fp) && _alpm_strip_newline(line)) {
+				while(fgets(line, sizeof(line), fp) &&
+						(len = _alpm_strip_newline(line))) {
 					if(files_count >= files_size) {
 						size_t old_size = files_size;
 						if(files_size == 0) {
@@ -659,8 +657,14 @@ static int local_db_read(alpm_pkg_t *info, alpm_dbinfrq_t inforeq)
 						memset(files + old_size, 0,
 								sizeof(alpm_file_t) * (files_size - old_size));
 					}
-					STRDUP(files[files_count].name, line, goto error);
-					/* TODO: lstat file, get mode/size */
+					/* since we know the length of the file string already,
+					 * we can do malloc + memcpy rather than strdup */
+					files[files_count].name = malloc(len + 1);
+					if(files[files_count].name == NULL) {
+						ALLOC_FAIL(len);
+						goto error;
+					}
+					memcpy(files[files_count].name, line, len + 1);
 					files_count++;
 				}
 				/* attempt to hand back any memory we don't need */
@@ -794,11 +798,11 @@ int _alpm_local_db_write(alpm_db_t *db, alpm_pkg_t *info, alpm_dbinfrq_t inforeq
 		}
 		if(info->builddate) {
 			fprintf(fp, "%%BUILDDATE%%\n"
-							"%ld\n\n", info->builddate);
+							"%jd\n\n", (intmax_t)info->builddate);
 		}
 		if(info->installdate) {
 			fprintf(fp, "%%INSTALLDATE%%\n"
-							"%ld\n\n", info->installdate);
+							"%jd\n\n", (intmax_t)info->installdate);
 		}
 		if(info->packager) {
 			fprintf(fp, "%%PACKAGER%%\n"
@@ -903,14 +907,44 @@ cleanup:
 int _alpm_local_db_remove(alpm_db_t *db, alpm_pkg_t *info)
 {
 	int ret = 0;
-	char *pkgpath = _alpm_local_db_pkgpath(db, info, NULL);
+	DIR *dirp;
+	struct dirent *dp;
+	char *pkgpath;
+	size_t pkgpath_len;
 
-	/* TODO explicit file removes and then an rmdir? */
-	ret = _alpm_rmrf(pkgpath);
-	free(pkgpath);
-	if(ret != 0) {
+	pkgpath = _alpm_local_db_pkgpath(db, info, NULL);
+	if(!pkgpath) {
+		return -1;
+	}
+	pkgpath_len = strlen(pkgpath);
+
+	dirp = opendir(pkgpath);
+	if(!dirp) {
+		return -1;
+	}
+	/* go through the local DB entry, removing the files within, which we know
+	 * are not nested directories of any kind. */
+	for(dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
+		if(strcmp(dp->d_name, "..") != 0 && strcmp(dp->d_name, ".") != 0) {
+			char name[PATH_MAX];
+			if(pkgpath_len + strlen(dp->d_name) + 2 > PATH_MAX) {
+				/* file path is too long to remove, hmm. */
+				ret = -1;
+			} else {
+				sprintf(name, "%s/%s", pkgpath, dp->d_name);
+				if(unlink(name)) {
+					ret = -1;
+				}
+			}
+		}
+	}
+	closedir(dirp);
+
+	/* after removing all enclosed files, we can remove the directory itself. */
+	if(rmdir(pkgpath)) {
 		ret = -1;
 	}
+	free(pkgpath);
 	return ret;
 }