folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

process the "./" in file paths correctly (rhbz#491388)

This commit is contained in:
Jindrich Novy 2009-03-25 17:28:24 +01:00
parent 5f445d7e8f
commit 4d31b0433f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rpmio/rpmfileutil.c
View File

@ -426,10 +426,18 @@ char *rpmCleanPath(char * path)
if (begin && s[1] == '\0') {
break;
}
/* Trim embedded ./ , trailing /. */
if ((t[-1] == '/' && s[1] == '\0') || (t > path && t[-1] == '/' && s[1] == '/')) {
s++;
continue;
/* Handle the ./ cases */
if (t > path && t[-1] == '/') {
/* Trim embedded ./ */
if (s[1] == '/') {
s+=2;
continue;
}
/* Trim trailing /. */
if (s[1] == '\0') {
s++;
continue;
}
}
/* Trim embedded /../ and trailing /.. */
if (!begin && t > path && t[-1] == '/' && s[1] == '.' && (s[2] == '/' || s[2] == '\0')) {