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

Don't follow symlinks with -Qo.

Browse Source 
Fixes FS#9473 and the issue reported there :
http://www.archlinux.org/pipermail/pacman-dev/2008-February/011061.html

Only the dirname should be resolved, not the basename.

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Chantry Xavier 2008-02-06 00:29:49 +01:00 committed by Dan McGee
parent 7d7a337912
commit b29838c825
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/pacman/query.c
View File

@ -70,6 +70,7 @@ static int query_fileowner(alpm_list_t *targets)
int found = 0; int found = 0;
char *filename = alpm_list_getdata(t); char *filename = alpm_list_getdata(t);
char *bname; char *bname;
char *dname;
char *rpath; char *rpath;
struct stat buf; struct stat buf;
alpm_list_t *i, *j; alpm_list_t *i, *j;
@ -88,10 +89,14 @@ static int query_fileowner(alpm_list_t *targets)
} }
bname = mbasename(filename); bname = mbasename(filename);
dname = mdirname(filename);
rpath = resolve_path(dname);
free(dname);
if(!(rpath = resolve_path(filename))) { if(!rpath) {
fprintf(stderr, _("error: cannot determine real path for '%s': %s\n"), fprintf(stderr, _("error: cannot determine real path for '%s': %s\n"),
filename, strerror(errno)); filename, strerror(errno));
free(rpath);
ret++; ret++;
continue; continue;
} }
@ -100,7 +105,7 @@ static int query_fileowner(alpm_list_t *targets)
pmpkg_t *info = alpm_list_getdata(i); pmpkg_t *info = alpm_list_getdata(i);
for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) { for(j = alpm_pkg_get_files(info); j && !found; j = alpm_list_next(j)) {
char path[PATH_MAX], *ppath; char path[PATH_MAX], *ppath, *pdname;
snprintf(path, PATH_MAX, "%s%s", snprintf(path, PATH_MAX, "%s%s",
alpm_option_get_root(), (const char *)alpm_list_getdata(j)); alpm_option_get_root(), (const char *)alpm_list_getdata(j));
@ -109,10 +114,12 @@ static int query_fileowner(alpm_list_t *targets)
continue; continue;
} }
ppath = resolve_path(path); pdname = mdirname(path);
ppath = resolve_path(pdname);
free(pdname);
if(ppath && strcmp(ppath, rpath) == 0) { if(ppath && strcmp(ppath, rpath) == 0) {
printf(_("%s is owned by %s %s\n"), rpath, printf(_("%s is owned by %s %s\n"), filename,
alpm_pkg_get_name(info), alpm_pkg_get_version(info)); alpm_pkg_get_name(info), alpm_pkg_get_version(info));
found = 1; found = 1;
} }