Changeset 2916 for trunk/src/kmk

Timestamp:

Sep 15, 2016, 1:41:42 PM (9 years ago)

Author:

bird

Message:

fixes

Location:

trunk/src/kmk

Files:

• kmkbuiltin/redirect.c (modified) (4 diffs)
• main.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -387 +387 @@
     int         aFdTries[32];
     int         cTries;
+    int         fdOpened;
+
+#ifdef KBUILD_OS_WINDOWS
+    if (strcmp(pszFilename, "/dev/null") == 0)
+        pszFilename = "nul";
+#endif
 
     /* Open it first. */
-    int fdOpened = open(pszFilename, fOpen | fNoInherit, fMode);
+    fdOpened = open(pszFilename, fOpen | fNoInherit, fMode);
     if (fdOpened < 0)
-        return err(9, "open(%s,%#x,) failed", pszFilename, fOpen);
+        return err(-1, "open(%s,%#x,) failed", pszFilename, fOpen);
 
     /* Check for conflicts. */
@@ -434 +440 @@
         else
         {
-            err(9, "open(%s,%#x,) #%u failed", pszFilename, cTries + 1, fOpen);
+            err(-1, "open(%s,%#x,) #%u failed", pszFilename, cTries + 1, fOpen);
             break;
         }
@@ -444 +450 @@
      */
     if (fdOpened >= 0)
-        errx(9, "failed to find a conflict free file descriptor for '%s'!", pszFilename);
+        errx(-1, "failed to find a conflict free file descriptor for '%s'!", pszFilename);
 
     while (cTries-- > 0)
@@ -1580 +1586 @@
 #endif
                 }
+                else
+                    rcExit = 9;
             }
         }

trunk/src/kmk/main.c

@@ -920 +920 @@
 
 #ifdef WINDOWS32
+# ifndef KMK
 /*
  * HANDLE runtime exceptions by avoiding a requestor on the GUI. Capture
@@ -994 +995 @@
 #endif
 }
+# endif /* !KMK */
 
 /*
@@ -1381 +1383 @@
 
 # ifndef ELECTRIC_HEAP /* Drop this because it prevents JIT debugging. */
+#  ifndef KMK /* Don't want none of this crap. */
   SetUnhandledExceptionFilter(handle_runtime_exceptions);
+#  endif
 # endif /* !ELECTRIC_HEAP */