diff options
| author | Jindrich Novy <jnovy@redhat.com> | 2009-03-25 17:28:24 +0100 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-04-03 14:06:26 +0300 |
| commit | abc52ddb5e3c6cf0cfb6630b6d6d42f466df05db (patch) | |
| tree | 1c4f3cc659de5b970564451cdc7c7f38b44f247c | |
| parent | dd6f4f039ffefe25ae32d0493499288adc51f33b (diff) | |
| download | rpm-abc52ddb5e3c6cf0cfb6630b6d6d42f466df05db.tar.gz rpm-abc52ddb5e3c6cf0cfb6630b6d6d42f466df05db.tar.bz2 rpm-abc52ddb5e3c6cf0cfb6630b6d6d42f466df05db.zip | |
process the "./" in file paths correctly (rhbz#491388)
(cherry picked from commit 4d31b0433f3f804f81955c32e63c93f31506e8ad)
| -rw-r--r-- | rpmio/rpmfileutil.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/rpmio/rpmfileutil.c b/rpmio/rpmfileutil.c index 92685bc56..060d0c1d7 100644 --- a/rpmio/rpmfileutil.c +++ b/rpmio/rpmfileutil.c @@ -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')) { |