moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-22 15:58:50 -05:00
Code Issues Releases Wiki Activity

query_fileowner: remove useless path variable

Browse Source 
We no longer need it for resolving package files and using it to
resolve root is unnecessary as alpm does that for us.

Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Andrew Gregory 2013-06-19 01:23:19 -04:00 committed by Allan McRae
parent de7ccedbe7
commit b36b87656e
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/pacman/query.c
View File

@ -136,8 +136,8 @@ cleanup:
static int query_fileowner(alpm_list_t *targets) static int query_fileowner(alpm_list_t *targets)
{ {
int ret = 0; int ret = 0;
char path[PATH_MAX]; const char *root = alpm_option_get_root(config->handle);
size_t rootlen; size_t rootlen = strlen(root);
alpm_list_t *t; alpm_list_t *t;
alpm_db_t *db_local; alpm_db_t *db_local;
alpm_list_t *packages; alpm_list_t *packages;
@ -148,30 +148,6 @@ static int query_fileowner(alpm_list_t *targets)
return 1; return 1;
} }
/* Set up our root path buffer. We only need to copy the location of root in
* once, then we can just overwrite whatever file was there on the previous
* iteration. */
/* resolve root now so any symlinks in it will only have to be resolved once */
if(!realpath(alpm_option_get_root(config->handle), path)) {
pm_printf(ALPM_LOG_ERROR, _("cannot determine real path for '%s': %s\n"),
path, strerror(errno));
return 1;
}
/* make sure there's enough room to append the package file to path */
rootlen = strlen(path);
if(rootlen + 2 > PATH_MAX) {
pm_printf(ALPM_LOG_ERROR, _("path too long: %s%s\n"), path, "");
return 1;
}
/* append trailing '/' removed by realpath */
if(path[rootlen - 1] != '/') {
path[rootlen++] = '/';
path[rootlen] = '\0';
}
db_local = alpm_get_localdb(config->handle); db_local = alpm_get_localdb(config->handle);
packages = alpm_db_get_pkgcache(db_local); packages = alpm_db_get_pkgcache(db_local);
@ -214,7 +190,7 @@ static int query_fileowner(alpm_list_t *targets)
goto targcleanup; goto targcleanup;
} }
if(strncmp(rpath, path, rootlen) != 0) { if(strncmp(rpath, root, rootlen) != 0) {
/* file is outside root, we know nothing can own it */ /* file is outside root, we know nothing can own it */
pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), filename); pm_printf(ALPM_LOG_ERROR, _("No package owns %s\n"), filename);
goto targcleanup; goto targcleanup;