- fix: "/path/foo.../bar" was losing a dot (#123844).

CVS patchset: 7287
CVS date: 2004/06/01 13:58:57

diff --git a/CHANGES b/CHANGES
index ad63d4e..8ddef27 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,7 @@
 4.3.1 -> 4.3.2:
        - use /etc/selinux/targeted/contexts/files/file_contexts for now.
        - disable file contexts into package metadata during build.
+       - fix: "/path/foo.../bar" was losing a dot (#123844).
 
 4.3 -> 4.3.1:
        - fix: don't add leading space to %* argv expansion (#119059).

diff --git a/rpmio/macro.c b/rpmio/macro.c
index 22bc1c6..94970b0 100644 (file)
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -2184,7 +2184,7 @@ char *rpmCleanPath(char * path)
                /*@switchbreak@*/ break;
            }
            /* Trim embedded ./ , trailing /. */
-           if ((t[-1] == '/' && s[1] == '\0') || (t != path && s[1] == '/')) {
+           if ((t[-1] == '/' && s[1] == '\0') || (t > path && t[-1] == '/' && s[1] == '/')) {
                s++;
                continue;
            }