filevercmp: fix regression

diff --git a/ChangeLog b/ChangeLog
index e4c9bf696b1ae7e6b13ba9502796fcd6ebeefe1a..0e45e71dcea216cd7dfd3dc93be6ae1c4e9a0b83 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-09  Kamil Dudka  <kdudka@redhat.com>
+
+       Fix regression in 'filevercmp' module. Thanks Sven Joachim
+       for reporting it.
+       * lib/filevercmp.c: Special handle for "", "." and "..".
+       * tests/test-filevercmp.c: Enlarge the set suite.
+
 2009-04-07  Jim Meyering  <meyering@redhat.com>
 
        useless-if-before-free: show how to remove braced useless free, too

diff --git a/lib/filevercmp.c b/lib/filevercmp.c
index 99c07db9cc83398fc0b2b14c661f29db9e73c4fc..caa4891c9c4045021a43b38db5727f9cb97c53b0 100644 (file)
--- a/lib/filevercmp.c
+++ b/lib/filevercmp.c
@@ -135,14 +135,19 @@ filevercmp (const char *s1, const char *s2)
   if (simple_cmp == 0)
     return 0;
 
-  /* handle hidden files */
-  while (*s1 == '.' || *s2 == '.')
-    {
-      if (*s1 != *s2)
-       return *s1 - *s2;
-      s1++;
-      s2++;
-    }
+  /* special handle for "", "." and ".." */
+  if (!*s1)
+    return -1;
+  if (!*s2)
+    return 1;
+  if (0 == strcmp (".", s1))
+    return -1;
+  if (0 == strcmp (".", s2))
+    return 1;
+  if (0 == strcmp ("..", s1))
+    return -1;
+  if (0 == strcmp ("..", s2))
+    return 1;
 
   /* "cut" file suffixes */
   s1_pos = s1;

diff --git a/tests/test-filevercmp.c b/tests/test-filevercmp.c
index 9933b8a424e8a418f38873cd6edaf2a7ef13a93c..700e182777338026f5ffb8a6cc0f78ce4db9d0b1 100644 (file)
--- a/tests/test-filevercmp.c
+++ b/tests/test-filevercmp.c
@@ -37,6 +37,7 @@
 /* set of well sorted examples */
 static const char *const examples[] =
 {
+  "",
   ".",
   "..",
   ".a~",
@@ -73,6 +74,7 @@ static const char *const examples[] =
   "nss_ldap-1.0-0.1a.tar.gz",
   "nss_ldap-10beta1.fc8.tar.gz",
   "nss_ldap-10.11.8.6.20040204cvs.fc10.ebuild",
+  "#.b#",
   NULL
 };