Changeset 2172 for trunk/src

Timestamp:

Dec 31, 2008, 1:03:02 AM (17 years ago)

Author:

bird

Message:

kmk: Added $(root ) to help out with checking for absolute paths on Windows and OS/2.

Location:

trunk/src/kmk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.kmk (modified) (1 diff)
• function.c (modified) (2 diffs)
• tests/scripts/functions/root (added)
• variable.c (modified) (3 diffs)

trunk/src/kmk/Makefile.am

@@ -145 +145 @@
         -DCONFIG_WITH_STRING_FUNCTIONS \
         -DCONFIG_WITH_LOOP_FUNCTIONS \
+        -DCONFIG_WITH_ROOT_FUNC \
         -DCONFIG_PRETTY_COMMAND_PRINTING \
         -DCONFIG_WITH_PRINT_STATS_SWITCH \

trunk/src/kmk/Makefile.kmk

@@ -171 +171 @@
         CONFIG_WITH_STRING_FUNCTIONS \
         CONFIG_WITH_LOOP_FUNCTIONS \
+        CONFIG_WITH_ROOT_FUNC \
         CONFIG_PRETTY_COMMAND_PRINTING \
         CONFIG_WITH_PRINT_STATS_SWITCH \

trunk/src/kmk/function.c

@@ -808 +808 @@
 }
 
+#ifdef CONFIG_WITH_ROOT_FUNC
+/*
+ $(root path)
+
+ This is mainly for dealing with drive letters and UNC paths on Windows
+ and OS/2.
+ */
+static char *
+func_root (char *o, char **argv, const char *funcname UNUSED)
+{
+  const char  *paths = argv[0] ? argv[0] : "";
+  int          doneany = 0;
+  const char  *p;
+  unsigned int len;
+
+  while ((p = find_next_token (&paths, &len)) != 0)
+    {
+      const char *p2 = p;
+
+#ifdef HAVE_DOS_PATHS
+      if (   len >= 2
+          && p2[1] == ':'
+          && (   (p2[0] >= 'A' && p2[0] <= 'Z')
+              || (p2[0] >= 'a' && p2[0] <= 'z')))
+        {
+          p2 += 2;
+          len -= 2;
+        }
+      else if (len >= 4 && IS_PATHSEP(p2[0]) && IS_PATHSEP(p2[1])
+               && !IS_PATHSEP(p2[2]))
+        {
+          /* Min recognized UNC: "//./" - find the next slash
+             Typical root: "//srv/shr/" */
+          /* XXX: Check if //./ needs special handling. */
+
+          p2 += 3;
+          len -= 3;
+          while (len > 0 && !IS_PATHSEP(*p2))
+            p2++, len--;
+
+          if (len && IS_PATHSEP(p2[0]) && (len == 1 || !IS_PATHSEP(p2[1])))
+            {
+              p2++;
+              len--;
+
+              if (len) /* optional share */
+                while (len > 0 && !IS_PATHSEP(*p2))
+                  p2++, len--;
+            }
+          else
+            p2 = NULL;
+        }
+      else if (IS_PATHSEP(*p2))
+        {
+          p2++;
+          len--;
+        }
+      else
+        p2 = NULL;
+
+#elif defined (VMS) || defined (AMGIA)
+      /* XXX: VMS and AMGIA */
+      fatal (NILF, _("$(root ) is not implemented on this platform"));
+#else
+      if (IS_PATHSEP(*p2))
+        {
+          p2++;
+          len--;
+        }
+      else
+        p2 = NULL;
+#endif
+      if (p2 != NULL)
+        {
+          /* Include all subsequent path seperators. */
+
+          while (len > 0 && IS_PATHSEP(*p2))
+            p2++, len--;
+          o = variable_buffer_output (o, p, p2 - p);
+          o = variable_buffer_output (o, " ", 1);
+          doneany = 1;
+        }
+    }
+
+  if (doneany)
+    /* Kill last space.  */
+    --o;
+
+  return o;
+}
+#endif /* CONFIG_WITH_ROOT_FUNC */
+
 static char *
 func_addsuffix_addprefix (char *o, char **argv, const char *funcname)
@@ -4971 +5063 @@
   { STRING_SIZE_TUPLE("dir"),           0,  1,  1,  func_basename_dir},
   { STRING_SIZE_TUPLE("notdir"),        0,  1,  1,  func_notdir_suffix},
+#ifdef CONFIG_WITH_ROOT_FUNC
+  { STRING_SIZE_TUPLE("root"),          0,  1,  1,  func_root},
+#endif
   { STRING_SIZE_TUPLE("subst"),         3,  3,  1,  func_subst},
   { STRING_SIZE_TUPLE("suffix"),        0,  1,  1,  func_notdir_suffix},

trunk/src/kmk/variable.c

@@ -1207 +1207 @@
   && defined (CONFIG_WITH_PRINTF) \
   && defined (CONFIG_WITH_LOOP_FUNCTIONS) \
+  && defined (CONFIG_WITH_ROOT_FUNC) \
   && defined (CONFIG_WITH_STRING_FUNCTIONS) \
   && defined (KMK_HELPERS)
@@ -1232 +1233 @@
                           " printf"
                           " for while"
+                          " root"
                           " length insert pos lastpos substr translate"
                           " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one kb-exp-tmpl "
@@ -1301 +1303 @@
   strcat (buf, " for while");
 #  endif
+#  if defined (CONFIG_WITH_ROOT_FUNC)
+  strcat (buf, " root");
+#  endif
 #  if defined (CONFIG_WITH_STRING_FUNCTIONS)
   strcat (buf, " length insert pos lastpos substr translate");