Changeset 45 for trunk/src/kmk/main.c

Timestamp:

Apr 3, 2003, 4:23:37 AM (22 years ago)

Author:

bird

Message:

KMK changes..

File:

• trunk/src/kmk/main.c (modified) (6 diffs)

trunk/src/kmk/main.c

@@ -79 +79 @@
  */
 
-#if defined(USE_KLIB) || defined(KMK)
+#if defined(USE_KLIB) //|| defined(KMK)
     #define KLIB_INSTRICT
     #include <kLib/kLib.h>
@@ -533 +533 @@
         char *cp = NULL, *start;
                                         /* avoid faults on read-only strings */
+        #ifndef KMK
         static char syspath[] = _PATH_DEFSYSPATH;
+        #endif
 
 #ifdef RLIMIT_NOFILE
@@ -634 +636 @@
         }
         
+        #ifdef KMK
+        /* @todo figure out how to set object directory! */
+        #else
         /*
          * The object directory location is determined using the
@@ -675 +680 @@
                         objdir = curdir;
         }
+        #endif
 
 #ifdef WANT_ENV_PWD
@@ -794 +800 @@
 
 
+        #ifdef KMK
+        /*
+         * Add current directory tree to system include path all levels up to the root.
+         * ASSUMES that curdir is absolute.
+         */
+        {
+            char *  psz = estrdup(curdir);
+            char *  pszEnd = psz + strlen(psz);
+            while (psz < pszEnd)
+            {
+                Dir_AddDir(sysIncPath, psz);
+
+                /* Trim of the last directory component. */
+                while (pszEnd-- > psz)
+                    if (*pszEnd == '/' || *pszEnd == ':')
+                    {
+                        if (*pszEnd == ':') /*Drive letter means end of story */
+                            pszEnd = psz;
+                        *pszEnd = '\0';
+                        break;
+                    }
+            }
+            efree(psz);
+        }
+
+        #else
         /*
          * If no user-supplied system path was given (through the -m option)
@@ -811 +843 @@
                 }
         }
+        #endif
 
         /*