Changeset 3551 for trunk/src

Timestamp:

Jan 29, 2022, 3:57:33 AM (3 years ago)

Author:

bird

Message:

lib/version_compare.c: Corrected sorting of 'vcc/v14.2/' and 'vcc/v14.2.11.9/' so that the former is sorted before the latter, as one would expect when soring a $(wildcard ) listing.

Location:

trunk/src/lib

Files:

• Makefile.kmk (modified) (1 diff)
• version_compare.c (modified) (2 diffs)

trunk/src/lib/Makefile.kmk

@@ -100 +100 @@
 tstkFsCache_NOINST = 1
 
+PROGRAMS += tstVersionCompare
+tstVersionCompare_TEMPLATE = BIN
+tstVersionCompare_SOURCES = version_compare.c
+tstVersionCompare_DEFS = TEST
+tstVersionCompare_NOINST = 1
+
 include $(FILE_KBUILD_SUB_FOOTER)
 

trunk/src/lib/version_compare.c

@@ -116 +116 @@
     if (ch2 == '~')
         return 1;
-    if (ch1 == '\0')
+    if (ch1 == '\0' || ch1 == '/') /* treat '/' similar to '\0' to deal with the v14.2/ vs v14.2.11.9/ case.  */
         return -1;
-    if (ch2 == '\0')
+    if (ch2 == '\0' || ch2 == '/')
         return 1;
     if (isdigit(ch1))
@@ -251 +251 @@
         { +1, "1.2.3r4567890", "1.2.3rc1" },
         { +1, "1.2.3r4567890", "1.2.3RC1" },
+        { -1, "/tools/win.amd64/vcc/v14.2/Tools", "/tools/win.amd64/vcc/v14.2.11.9/Tools" },
+        { -1, "/tools/win.amd64/vcc/v14.2/Tools", "/tools/win.amd64/vcc/v14.211.9/Tools" },
+        { -1, "/tools/win.amd64/vcc/v14.2/Tools", "/tools/win.amd64/vcc/v14.2r2/Tools" },
+        { -1, "/tools/win.amd64/vcc/v14.2/Tools", "/tools/win.amd64/vcc/v14.2-r2/Tools" },
     };
     unsigned cErrors = 0;