Changeset 303 for trunk/src

Timestamp:

Aug 11, 2005, 10:13:33 PM (20 years ago)

Author:

bird

Message:

fixed abspath on win32 and os/2 (latter is untested).

Location:

trunk/src/gmake

Files:

• function.c (modified) (3 diffs)
• variable.c (modified) (1 diff)

trunk/src/gmake/function.c

@@ -29 +29 @@
 #include "amiga.h"
 #endif
+
+#ifdef WINDOWS32
+#include "pathstuff.h"
+#endif 
 
 
@@ -1776 +1780 @@
     return NULL;
 
+#ifdef WINDOWS32
+  dest = w32ify((char *)name, 1);
+  if (!dest)
+      return NULL;
+  (void)end; (void)start; (void)apath_limit;
+  return strcpy(apath, dest);
+
+#elif defined __OS2__
+  if (!_fullpath(apath, name, GET_PATH_MAX))
+      return NULL;
+  (void)end; (void)start; (void)apath_limit; (void)dest;
+  return apath;
+
+#else /* !WINDOWS32 && !__OS2__ */
   apath_limit = apath + GET_PATH_MAX;
 
+#ifdef HAVE_DOS_PATHS /* bird added this */
+  if (isalpha(name[0]) && name[1] == ':')
+    {
+      /* drive spec */
+      apath[0] = toupper(name[0]);
+      apath[1] = ':';
+      apath[2] = '/';
+      name += 2;
+    }
+  else
+#endif /* HAVE_DOS_PATHS */
   if (name[0] != '/')
     {
@@ -1839 +1868 @@
 
   return apath;
+#endif /* !WINDOWS32 */
 }
 

trunk/src/gmake/variable.c

@@ -679 +679 @@
   /* Define KMK_VERSION to indicate kMk. */
   (void) define_variable ("KMK_VERSION", 11, buf, o_default, 0);
+
+  /* Define KMK_FEATURES to indicate various working KMK features. */
+  (void) define_variable ("KMK_FEATURES", 12, "abspath", o_default, 0);
 
 #ifdef CONFIG_WITH_KMK_BUILTIN