Changeset 3394 for trunk/src/kmk/function.c

Timestamp:

Jul 1, 2020, 10:24:52 PM (5 years ago)

Author:

bird

Message:

kmk: Added version sort function: versort, rversort, versortfiles, rversortfiles, qversortfiles, qrversortfiles. Try get the real host version on windows by using RtlGetVersion.

File:

• trunk/src/kmk/function.c (modified) (10 diffs)

trunk/src/kmk/function.c

@@ -90 +90 @@
 #  include "kmkbuiltin/mscfakes.h"
 # endif
+# include "version_compare.h"
 #endif
 
@@ -1766 +1767 @@
 }
 
+#ifdef KMK
+/* Compare strings *S1 and *S2.
+   Return negative if the first is less, positive if it is greater,
+   zero if they are equal.  */
+
+static int
+version_compare_wrapper (const void *v1, const void *v2)
+{
+  const char *s1 = *((char **)v1);
+  const char *s2 = *((char **)v2);
+  return version_compare (s1, s2);
+}
+#endif /* KMK */
 
 /*
@@ -1806 +1820 @@
 
       /* Now sort the list of words.  */
+#ifdef KMK
+      if (funcname[0] == 'v' || funcname[1] == 'v')
+        qsort (words, wordi, sizeof (char *), version_compare_wrapper);
+      else
+        qsort (words, wordi, sizeof (char *), alpha_compare);
+#else
       qsort (words, wordi, sizeof (char *), alpha_compare);
+#endif
 
       /* Now write the sorted list, uniquified.  */
 #ifdef CONFIG_WITH_RSORT
-      if (strcmp (funcname, "rsort"))
+      if (*funcname != 'r')
         {
           /* sort */
@@ -6782 +6803 @@
 
 static char *common_sortfiles (char *o, char **argv, unsigned int style,
-                               int ascending)
+                               int ascending, int version)
 {
   struct nameseq *chain = helper_parse_file_list (argv[0], style, 0);
@@ -6840 +6861 @@
 {
   return common_sortfiles (o, argv, Q_IN_QUOTED | Q_RET_QUOTED | Q_SEP_SPACE,
-                           funcname[0] != 'r');
+                           funcname[0] != 'r',
+                           funcname[0] == 'v' || funcname[1] == 'v');
 }
 
@@ -6851 +6873 @@
 {
   unsigned int const style = helper_file_quoting_style (argv[0], Q_QDEFAULT);
-  return common_sortfiles (o, &argv[1], style, funcname[1] != 'r');
+  return common_sortfiles (o, &argv[1], style, funcname[1] != 'r',
+                           funcname[1] == 'v' || funcname[2] == 'v');
 }
 
@@ -6876 +6899 @@
     {
       PATH_VAR (outbuf);
-      int doneany = 0;
       struct nameseq *chain = helper_parse_file_list (line, style, 0);
 
@@ -7408 +7430 @@
 #ifdef CONFIG_WITH_RSORT
   FT_ENTRY ("rsort",         0,  1,  1,  func_sort),
+# ifdef KMK
+  FT_ENTRY ("rversort",      0,  1,  1,  func_sort),
+# endif
 #endif
   FT_ENTRY ("shell",         0,  1,  1,  func_shell),
   FT_ENTRY ("sort",          0,  1,  1,  func_sort),
+# ifdef KMK
+  FT_ENTRY ("versort",       0,  1,  1,  func_sort),
+# endif
   FT_ENTRY ("strip",         0,  1,  1,  func_strip),
 #ifdef CONFIG_WITH_WHERE_FUNCTION
@@ -7570 +7598 @@
   FT_ENTRY ("foreachfile",   3,  3, 0, func_foreachfile),
   FT_ENTRY ("sortfiles",     0,  1, 1, func_sortfiles),
+  FT_ENTRY ("versortfiles",  0,  1, 1, func_sortfiles),
 # ifdef CONFIG_WITH_RSORT
   FT_ENTRY ("rsortfiles",    0,  1, 1, func_sortfiles),
+  FT_ENTRY ("rversortfiles", 0,  1, 1, func_sortfiles),
 # endif
   /* Function variants with preceding style argument and quoting by default. */
@@ -7580 +7610 @@
   FT_ENTRY ("qforeachfile", 1+3, 1+3, 0, func_q_foreachfile),
   FT_ENTRY ("qsortfiles",   1+0, 1+1, 1, func_q_sortfiles),
+  FT_ENTRY ("qversortfiles",1+0, 1+1, 1, func_q_sortfiles),
 # ifdef CONFIG_WITH_RSORT
   FT_ENTRY ("qrsortfiles",  1+0, 1+1, 1, func_q_sortfiles),
+  FT_ENTRY ("qrversortfiles",1+0,1+1, 1, func_q_sortfiles),
 # endif
   FT_ENTRY ("qabspath",     1+0, 1+1, 1, func_q_abspath),