filevercmp: handle simple~ and numbered.~3~ backup suffixes

* lib/filevercmp.c: Handle simple~ and numbered.~3~ backup suffixes.
* tests/test-filevercmp.c: Add tests for backup suffixes.
Reported by Sven Joachim.

diff --git a/ChangeLog b/ChangeLog
index 5dcebf9287c809b152d910881b510f7c11c13406..4c55ee78367d0a9ab7c9748a81dc6866082defa1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-24  Kamil Dudka  <kdudka@redhat.com>
+
+       filevercmp: handle simple~ and numbered.~3~ backup suffixes
+       * lib/filevercmp.c: Handle simple~ and numbered.~3~ backup suffixes.
+       * tests/test-filevercmp.c: Add tests for backup suffixes.
+
 2009-03-24  Simon Josefsson  <simon@josefsson.org>
 
        * modules/stdlib (Depends-on): Add stdint, needed when defining

diff --git a/lib/filevercmp.c b/lib/filevercmp.c
index 7b40c98f7bff874f50b2b097749efe6447975d02..99c07db9cc83398fc0b2b14c661f29db9e73c4fc 100644 (file)
--- a/lib/filevercmp.c
+++ b/lib/filevercmp.c
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
    Copyright (C) 2001 Anthony Towns <aj@azure.humbug.org.au>
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #include <limits.h>
 
 /* Match a file suffix defined by this regular expression:
-   /(\.[A-Za-z][A-Za-z0-9]*)*$/
+   /(\.[A-Za-z~][A-Za-z0-9~]*)*$/
    Scan the string *STR and return a pointer to the matching suffix, or
    NULL if not found.  Upon return, *STR points to terminating NUL.  */
 static const char *
@@ -40,7 +40,7 @@ match_suffix (const char **str)
       if (read_alpha)
         {
           read_alpha = false;
-          if (!c_isalpha (**str))
+          if (!c_isalpha (**str) && '~' != **str)
             match = NULL;
         }
       else if ('.' == **str)
@@ -49,7 +49,7 @@ match_suffix (const char **str)
           if (!match)
             match = *str;
         }
-      else if (!c_isalnum (**str))
+      else if (!c_isalnum (**str) && '~' != **str)
         match = NULL;
       (*str)++;
     }

diff --git a/lib/filevercmp.h b/lib/filevercmp.h
index 569b4d033f1a3800f62cd6985334e0ef102a7e9a..f3d78f0cdc81e55dc6c69991491c302709bd3051 100644 (file)
--- a/lib/filevercmp.h
+++ b/lib/filevercmp.h
@@ -1,7 +1,7 @@
 /*
    Copyright (C) 1995 Ian Jackson <iwj10@cus.cam.ac.uk>
    Copyright (C) 2001 Anthony Towns <aj@azure.humbug.org.au>
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@
    It returns number >0 for S1 > S2, 0 for S1 == S2 and number <0 for S1 < S2.
 
    This function compares strings, in a way that if VER1 and VER2 are version
-   numbers and PREFIX and SUFFIX (SUFFIX defined as (\.[A-Za-z][A-Za-z0-9]*)*)
+   numbers and PREFIX and SUFFIX (SUFFIX defined as (\.[A-Za-z~][A-Za-z0-9~]*)*)
    are strings then VER1 < VER2 implies filevercmp (PREFIX VER1 SUFFIX,
    PREFIX VER2 SUFFIX) < 0.
 

diff --git a/tests/test-filevercmp.c b/tests/test-filevercmp.c
index fe54dc2f15771f88476b877362cac55dd1e16107..9933b8a424e8a418f38873cd6edaf2a7ef13a93c 100644 (file)
--- a/tests/test-filevercmp.c
+++ b/tests/test-filevercmp.c
@@ -1,5 +1,5 @@
 /* Test of filevercmp() function.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2009 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -45,10 +45,17 @@ static const char *const examples[] =
   ".b",
   "a~",
   "a",
+  "a.b~",
+  "a.b",
+  "a.bc~",
+  "a.bc",
   "b~",
   "b",
   "gcc-c++-10.fc9.tar.gz",
+  "gcc-c++-10.fc9.tar.gz.~1~",
+  "gcc-c++-10.fc9.tar.gz.~2~",
   "gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2",
+  "gcc-c++-10.8.12-0.7rc2.fc9.tar.bz2.~1~",
   "glibc-2-0.1.beta1.fc10.rpm",
   "glibc-common-5-0.2.beta2.fc9.ebuild",
   "glibc-common-5-0.2b.deb",