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

Timestamp:

Mar 18, 2003, 4:58:49 AM (22 years ago)

Author:

bird

Message:

emx is kind of working again...

File:

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

trunk/src/kmk/main.c

@@ -322 +322 @@
                 }
                 case 'E':
-                        p = malloc(strlen(optarg) + 1);
-                        if (!p)
-                                Punt("make: cannot allocate memory.");
+                        p = emalloc(strlen(optarg) + 1);
                         (void)strcpy(p, optarg);
                         (void)Lst_AtEnd(envFirstVars, (ClientData)p);
@@ -845 +843 @@
 #ifdef POSIX
                 #ifdef USE_KLIB
-                kEnvSet("MAKEFLAGS", p);
+                kEnvSet("MAKEFLAGS", p, TRUE);
                 #else
                 setenv("MAKEFLAGS", p, 1);
@@ -851 +849 @@
 #else
                 #ifdef USE_KLIB
-                kEnvSet("MAKE", p);
+                kEnvSet("MAKE", p, TRUE);
                 #else
                 setenv("MAKE", p, 1);
@@ -887 +885 @@
                         path = cp + 1;
                 } while (savec == ':');
-                (void)free((Address)vpath);
+                (void)efree((Address)vpath);
         }
 
@@ -908 +906 @@
                         char *value;
                         if (expandVars) {
-                                p1 = malloc(strlen((char *)Lst_Datum(ln)) + 1 + 3);
-                                if (!p1)
-                                        Punt("make: cannot allocate memory.");
+                                p1 = emalloc(strlen((char *)Lst_Datum(ln)) + 1 + 3);
                                 /* This sprintf is safe, because of the malloc above */
                                 (void)sprintf(p1, "${%s}", (char *)Lst_Datum(ln));
@@ -920 +916 @@
                         printf("%s\n", value ? value : "");
                         if (p1)
-                                free(p1);
+                                efree(p1);
                 }
         }
@@ -961 +957 @@
         Lst_Destroy(variables, NOFREE);
         Lst_Destroy(makefiles, NOFREE);
-        Lst_Destroy(create, (void (*) __P((ClientData))) free);
+        Lst_Destroy(create, (void (*) __P((ClientData))) efree);
 
         /* print the graph now it's been processed if the user requested it */
@@ -1093 +1089 @@
      * Fork
      */
+#ifdef __EMX__
+    switch (cpid = fork()) {
+#else
     switch (cpid = vfork()) {
+#endif
     case 0:
         /*
@@ -1108 +1108 @@
         (void) close(fds[1]);
 
+        #ifdef OS2
+        {
+            const char *psz = getenv("COMSPEC");
+            if (!psz)
+                psz = getenv("OS2_SHELL");
+            if (!psz)
+                psz = "c:\\os2\\cmd.exe";
+            (void) execv(psz, args);
+        }
+        #else
         (void) execv("/bin/sh", args);
+        #endif
         _exit(1);
         /*NOTREACHED*/
@@ -1378 +1389 @@
 
 /*
+ * efree --
+ *      efree, no change.
+ */
+void
+efree(ptr)
+      void *ptr;
+{
+    if (ptr)
+        free(ptr);
+}
+
+/*
  * enomem --
  *      die when out of memory.
@@ -1397 +1420 @@
         struct stat st;
 
+#ifdef __EMX__
+        if (stat(file, &st) == -1)
+#else
         if (lstat(file, &st) == -1)
+#endif
                 return -1;