From 9f035a4d8a924dad4a6e8306844d6831bf7676fd Mon Sep 17 00:00:00 2001 From: jbj Date: Tue, 1 Jun 2004 13:58:57 +0000 Subject: [PATCH] - fix: "/path/foo.../bar" was losing a dot (#123844). CVS patchset: 7287 CVS date: 2004/06/01 13:58:57 --- CHANGES | 1 + rpmio/macro.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index ad63d4e..8ddef27 100644 --- 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 --- 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; } -- 2.7.4