alpm_filelist: remove resolved_path

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 11 insertions, 214 deletions

diff --git a/lib/libalpm/filelist.c b/lib/libalpm/filelist.c
index 697dd23b..f8db9a33 100644
--- a/lib/libalpm/filelist.c
+++ b/lib/libalpm/filelist.c
@@ -25,199 +25,6 @@
 #include "filelist.h"
 #include "util.h"
 
-/** Helper function for comparing strings when sorting */
-static int _alpm_filelist_strcmp(const void *s1, const void *s2)
-{
-	return strcmp(*(char **)s1, *(char **)s2);
-}
-
-/* TODO make sure callers check the return value so we can bail on errors.
- * For now we soldier on as best we can, skipping paths that are too long to
- * resolve and using the original filenames on memory errors.  */
-/**
- * @brief Resolves a symlink and its children.
- *
- * @attention Pre-condition: files must be sorted!
- *
- * @param files filelist to resolve
- * @param i pointer to the index in files to start processing, will point to
- * the last file processed on return
- * @param path absolute path for the symlink being resolved
- * @param root_len length of the root portion of path
- * @param resolving is file \i in \files a symlink that needs to be resolved
- *
- * @return 0 on success, -1 on error
- */
-int _alpm_filelist_resolve_link(alpm_filelist_t *files, size_t *i,
-		char *path, size_t root_len, int resolving)
-{
-	char *causal_dir = NULL; /* symlink being resolved */
-	char *filename_r = NULL; /* resolved filename */
-	size_t causal_dir_len = 0, causal_dir_r_len = 0;
-
-	if(resolving) {
-		/* deal with the symlink being resolved */
-		MALLOC(filename_r, PATH_MAX, goto error);
-		causal_dir = files->files[*i].name;
-		causal_dir_len = strlen(causal_dir);
-		if(realpath(path, filename_r) == NULL) {
-			files->resolved_path[*i] = causal_dir;
-			FREE(filename_r);
-			return -1;
-		}
-		causal_dir_r_len = strlen(filename_r + root_len) + 1;
-		if(causal_dir_r_len >= PATH_MAX) {
-			files->resolved_path[*i] = causal_dir;
-			FREE(filename_r);
-			return -1;
-		}
-		/* remove root_r from filename_r */
-		memmove(filename_r, filename_r + root_len, causal_dir_r_len);
-		filename_r[causal_dir_r_len - 1] = '/';
-		filename_r[causal_dir_r_len] = '\0';
-		STRDUP(files->resolved_path[*i], filename_r, goto error);
-		(*i)++;
-	}
-
-	for(; *i < files->count; (*i)++) {
-		char *filename = files->files[*i].name;
-		size_t filename_len = strlen(filename);
-		size_t filename_r_len = filename_len;
-		struct stat sbuf;
-		int exists;
-
-		if(resolving) {
-			if(filename_len < causal_dir_len || strncmp(filename, causal_dir, causal_dir_len) != 0) {
-				/* not inside causal_dir anymore */
-				break;
-			}
-
-			filename_r_len = filename_len + causal_dir_r_len - causal_dir_len;
-			if(filename_r_len >= PATH_MAX) {
-				/* resolved path is too long */
-				files->resolved_path[*i] = filename;
-				continue;
-			}
-
-			strcpy(filename_r + causal_dir_r_len, filename + causal_dir_len);
-		}
-
-		/* deal with files and paths too long to resolve*/
-		if(filename[filename_len - 1] != '/' || root_len + filename_r_len >= PATH_MAX) {
-			if(resolving) {
-				STRDUP(files->resolved_path[*i], filename_r, goto error);
-			} else {
-				files->resolved_path[*i] = filename;
-			}
-			continue;
-		}
-
-		/* construct absolute path and stat() */
-		strcpy(path + root_len, resolving ? filename_r : filename);
-		exists = !_alpm_lstat(path, &sbuf);
-
-		/* deal with symlinks */
-		if(exists && S_ISLNK(sbuf.st_mode)) {
-			_alpm_filelist_resolve_link(files, i, path, root_len, 1);
-			continue;
-		}
-
-		/* deal with normal directories */
-		if(resolving) {
-			STRDUP(files->resolved_path[*i], filename_r, goto error);
-		} else {
-			files->resolved_path[*i] = filename;
-		}
-
-		/* deal with children of non-existent directories to reduce lstat() calls */
-		if(!exists) {
-			for((*i)++; *i < files->count; (*i)++) {
-				char *f = files->files[*i].name;
-				size_t f_len = strlen(f);
-				size_t f_r_len;
-
-				if(f_len < filename_len || strncmp(f, filename, filename_len) != 0) {
-					/* not inside the non-existent dir anymore */
-					break;
-				}
-
-				f_r_len = f_len + causal_dir_r_len - causal_dir_len;
-				if(resolving && f_r_len <= PATH_MAX) {
-					strcpy(filename_r + causal_dir_r_len, f + causal_dir_len);
-					STRDUP(files->resolved_path[*i], filename_r, goto error);
-				} else {
-					files->resolved_path[*i] = f;
-				}
-			}
-			(*i)--;
-		}
-	}
-	(*i)--;
-
-	FREE(filename_r);
-
-	return 0;
-
-error:
-	FREE(filename_r);
-	/* out of memory, set remaining files to their original names */
-	for(; *i < files->count; (*i)++) {
-		files->resolved_path[*i] = files->files[*i].name;
-	}
-	(*i)--;
-	return -1;
-}
-
-/**
- * @brief Takes a file list and resolves all directory paths according to the
- * filesystem
- *
- * @attention Pre-condition: files must be sorted!
- *
- * @note A symlink and directory at the same path in two difference packages
- * causes a conflict so the filepath can not change as packages get installed
- *
- * @param handle the context handle
- * @param files list of files to resolve
- *
- * @return 0 on success, -1 on error
- */
-int _alpm_filelist_resolve(alpm_handle_t *handle, alpm_filelist_t *files)
-{
-	char path[PATH_MAX];
-	size_t root_len, i = 0;
-	int ret = 0;
-
-	if(!files || files->resolved_path) {
-		return 0;
-	}
-
-	CALLOC(files->resolved_path, files->count, sizeof(char *), return -1);
-
-	/* not much point in going on if we can't even resolve root */
-	if(realpath(handle->root, path) == NULL){
-		return -1;
-	}
-	root_len = strlen(path);
-	if(root_len + 1 >= PATH_MAX) {
-		return -1;
-	}
-	/* append '/' if root is not "/" */
-	if(path[root_len - 1] != '/') {
-		path[root_len] = '/';
-		root_len++;
-		path[root_len] = '\0';
-	}
-
-	ret = _alpm_filelist_resolve_link(files, &i, path, root_len, 0);
-
-	qsort(files->resolved_path, files->count, sizeof(char *),
-			_alpm_filelist_strcmp);
-
-	return ret;
-}
-
-
 /* Returns the difference of the provided two lists of files.
  * Pre-condition: both lists are sorted!
  * When done, free the list but NOT the contained data.
@@ -229,8 +36,8 @@ alpm_list_t *_alpm_filelist_difference(alpm_filelist_t *filesA,
 	size_t ctrA = 0, ctrB = 0;
 
 	while(ctrA < filesA->count && ctrB < filesB->count) {
-		char *strA = filesA->resolved_path[ctrA];
-		char *strB = filesB->resolved_path[ctrB];
+		char *strA = filesA->files[ctrA].name;
+		char *strB = filesB->files[ctrB].name;
 
 		int cmp = strcmp(strA, strB);
 		if(cmp < 0) {
@@ -247,7 +54,7 @@ alpm_list_t *_alpm_filelist_difference(alpm_filelist_t *filesA,
 
 	/* ensure we have completely emptied pA */
 	while(ctrA < filesA->count) {
-		ret = alpm_list_add(ret, filesA->resolved_path[ctrA]);
+		ret = alpm_list_add(ret, filesA->files[ctrA].name);
 		ctrA++;
 	}
 
@@ -269,17 +76,17 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA,
 		char *strA, *strB;
 
 		isdirA = 0;
-		strA = filesA->resolved_path[ctrA];
+		strA = filesA->files[ctrA].name;
 		if(strA[strlen(strA)-1] == '/') {
 			isdirA = 1;
-			strA = strndup(filesA->resolved_path[ctrA], strlen(strA)-1);
+			strA = strndup(strA, strlen(strA)-1);
 		}
 
 		isdirB = 0;
-		strB = filesB->resolved_path[ctrB];
+		strB = filesB->files[ctrB].name;
 		if(strB[strlen(strB)-1] == '/') {
 			isdirB = 1;
-			strB = strndup(filesB->resolved_path[ctrB], strlen(strB)-1);
+			strB = strndup(strB, strlen(strB)-1);
 		}
 
 		cmp = strcmp(strA, strB);
@@ -297,7 +104,7 @@ alpm_list_t *_alpm_filelist_intersection(alpm_filelist_t *filesA,
 
 			/* when not directories, item in both qualifies as an intersect */
 			if(! (isdirA && isdirB)) {
-				ret = alpm_list_add(ret, filesA->resolved_path[ctrA]);
+				ret = alpm_list_add(ret, filesA->files[ctrA].name);
 			}
 			ctrA++;
 			ctrB++;
@@ -323,11 +130,10 @@ int _alpm_files_cmp(const void *f1, const void *f2)
 	return strcmp(file1->name, file2->name);
 }
 
-
-char SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist,
+alpm_file_t SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist,
 		const char *path)
 {
-	alpm_file_t key, *match;
+	alpm_file_t key;
 
 	if(!filelist) {
 		return NULL;
@@ -335,17 +141,8 @@ char SYMEXPORT *alpm_filelist_contains(alpm_filelist_t *filelist,
 
 	key.name = (char *)path;
 
-	match = bsearch(&key, filelist->files, filelist->count,
+	return bsearch(&key, filelist->files, filelist->count,
 			sizeof(alpm_file_t), _alpm_files_cmp);
-
-	if(match) {
-		return match->name;
-	} else if(filelist->resolved_path) {
-		return bsearch(&path, filelist->resolved_path, filelist->count,
-				sizeof(char *), _alpm_filelist_strcmp);
-	} else {
-		return NULL;
-	}
 }
 
 /* vim: set ts=2 sw=2 noet: */