Changeset 311 in kBuild for trunk

Timestamp:

Aug 11, 2005 9:29:40 PM (19 years ago)

Author:

bird

Message:

Must strip trailing slashes in abspath. added tolower and toupper.

Location:

trunk/src/gmake

Files:

• Makefile.kmk (modified) (1 diff)
• function.c (modified) (5 diffs)
• variable.c (modified) (1 diff)

trunk/src/gmake/Makefile.kmk

@@ -20 +20 @@
         CONFIG_NO_DEFAULT_SUFFIX_RULES \
         CONFIG_NO_DEFAULT_VARIABLES \
+        KMK
         
 kmk_SOURCES         = \

trunk/src/gmake/function.c

@@ -1784 +1784 @@
   if (!dest)
       return NULL;
+  {
+  size_t len = strlen(dest);
+  memcpy(apath, dest, len);
+  dest = apath + len;
+  }
+
   (void)end; (void)start; (void)apath_limit;
-  return strcpy(apath, dest);
 
 #elif defined __OS2__
   if (!_fullpath(apath, name, GET_PATH_MAX))
       return NULL;
+  dest = strchr(apath, '\0');
+
   (void)end; (void)start; (void)apath_limit; (void)dest;
-  return apath;
 
 #else /* !WINDOWS32 && !__OS2__ */
@@ -1860 +1866 @@
         }
     }
+#endif /* !WINDOWS32 && !__OS2__ */
 
   /* Unless it is root strip trailing separator.  */
+#ifdef HAVE_DOS_PATHS
+  if (dest > apath + 1 + (apath[0] != '/') && dest[-1] == '/')
+#else
   if (dest > apath + 1 && dest[-1] == '/')
+#endif
     --dest;
 
@@ -1868 +1879 @@
 
   return apath;
-#endif /* !WINDOWS32 */
 }
 
@@ -1946 +1956 @@
  return o;
 }
+
+#ifdef KMK
+static char *
+func_toupper_tolower (char *o, char **argv, const char *funcname)
+{
+  /* Expand the argument.  */
+  char *p = argv[0];
+  while (*p)
+    {
+      /* convert to temporary buffer */
+      char tmp[256];
+      unsigned int i;
+      if (!strcmp(funcname, "toupper"))
+        for (i = 0; i < sizeof(tmp) && tmp[i]; i++, p++)
+          tmp[i] = toupper(*p);
+      else
+        for (i = 0; i < sizeof(tmp) && tmp[i]; i++, p++)
+          tmp[i] = tolower(*p);
+      o = variable_buffer_output (o, tmp, i);
+    }
+
+  return o;
+}
+#endif 
 
 /* Lookup table for builtin functions.
@@ -2001 +2035 @@
   { STRING_SIZE_TUPLE("not"),           0,  1,  1,  func_not},
 #endif
+#ifdef KMK
+  { STRING_SIZE_TUPLE("toupper"),       0,  1,  1,  func_toupper_tolower},
+  { STRING_SIZE_TUPLE("tolower"),       0,  1,  1,  func_toupper_tolower},
+#endif 
 };
 

trunk/src/gmake/variable.c

@@ -681 +681 @@
 
   /* Define KMK_FEATURES to indicate various working KMK features. */
-  (void) define_variable ("KMK_FEATURES", 12, "abspath", o_default, 0);
+  (void) define_variable ("KMK_FEATURES", 12, "abspath toupper tolower", o_default, 0);
 
 #ifdef CONFIG_WITH_KMK_BUILTIN