moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-11 03:54:59 -05:00
Code Issues Releases Wiki Activity

Fix broken resolve_path function

Browse Source 
Removed some unneeded path munging so that our relative
paths resolve properly.  This closes FS#7068

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
This commit is contained in:
Aaron Griffin 2007-05-18 01:20:49 -05:00
parent 9d9ac66bb2
commit 1ef27e97a1
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/pacman/query.c
View File

@ -43,16 +43,7 @@ extern pmdb_t *db_local;
static char *resolve_path(const char* file) static char *resolve_path(const char* file)
{ {
char *copy, *p, *str = NULL; char *str = NULL;
if(!(copy = strdup(file))) {
return(NULL);
}
if((p = strrchr(copy, '/')) == NULL) {
return(copy);
} else {
*p = '\0'; ++p;
str = calloc(PATH_MAX+1, sizeof(char)); str = calloc(PATH_MAX+1, sizeof(char));
if(!str) { if(!str) {
@ -64,11 +55,6 @@ static char *resolve_path(const char* file)
return(NULL); return(NULL);
} }
str[strlen(str)] = '/';
strcat(str, p);
}
free(copy);
return(str); return(str);
} }
@ -115,7 +101,7 @@ static void query_fileowner(pmdb_t *db, char *filename)
ppath = resolve_path(path); ppath = resolve_path(path);
if(ppath && strcmp(ppath, rpath) == 0) { if(ppath && strcmp(ppath, rpath) == 0) {
printf(_("%s is owned by %s %s\n"), filename, alpm_pkg_get_name(info), alpm_pkg_get_version(info)); printf(_("%s is owned by %s %s\n"), rpath, alpm_pkg_get_name(info), alpm_pkg_get_version(info));
found = 1; found = 1;
} }