Changeset 3159 for trunk/src/kmk/kmkbuiltin

Timestamp:

Mar 19, 2018, 2:37:13 PM (8 years ago)

Author:

bird

Message:

kmk/win: Some fixes & docs.

Location:

trunk/src/kmk/kmkbuiltin

Files:

• append.c (modified) (1 diff)
• kDepIDB.c (modified) (2 diffs)
• md5sum.c (modified) (3 diffs)
• redirect.c (modified) (3 diffs)

trunk/src/kmk/kmkbuiltin/append.c

@@ -190 +190 @@
 
     /*
-     * Open the output file.
+     * Open the output file, preferrably with close-on-exec.
      */
     iFile = i;
-    pFile = fopen(argv[i], fTruncate ? "w" : "a");
+    pFile = fopen(argv[i],
+                  fTruncate ? "w" KMK_FOPEN_NO_INHERIT_MODE
+                            : "a" KMK_FOPEN_NO_INHERIT_MODE);
     if (!pFile)
         return err(1, "failed to open '%s'", argv[i]);

trunk/src/kmk/kmkbuiltin/kDepIDB.c

@@ -732 +732 @@
                         pOutput = stdout;
                     else
-                        pOutput = fopen(pszOutput, "w");
+                        pOutput = fopen(pszOutput, "w" KMK_FOPEN_NO_INHERIT_MODE);
                     if (!pOutput)
                     {
@@ -812 +812 @@
         else
         {
-            pInput = fopen(argv[i], "rb");
+            pInput = fopen(argv[i], "rb" KMK_FOPEN_NO_INHERIT_MODE);
             if (!pInput)
             {

trunk/src/kmk/kmkbuiltin/md5sum.c

@@ -156 +156 @@
 
     errno = 0;
-    pFile = fopen(pszFilename, fText ? "r" : "rb");
+    pFile = fopen(pszFilename,
+                  fText ? "r"  KMK_FOPEN_NO_INHERIT_MODE
+                        : "rb" KMK_FOPEN_NO_INHERIT_MODE);
     if (!pFile && errno == EINVAL && !fText)
-        pFile = fopen(pszFilename, "r");
+        pFile = fopen(pszFilename, "r" KMK_FOPEN_NO_INHERIT_MODE);
     return pFile;
 
@@ -472 +474 @@
      * Try open the md5.lst file and process it line by line.
      */
-    pFile = fopen(pszFilename, "r");
+    pFile = fopen(pszFilename, "r" KMK_FOPEN_NO_INHERIT_MODE);
     if (pFile)
     {
@@ -837 +839 @@
                 if (pOutput)
                     fclose(pOutput);
-                pOutput = fopen(pszOutput, "w");
+                pOutput = fopen(pszOutput, "w" KMK_FOPEN_NO_INHERIT_MODE);
                 if (!pOutput)
                 {
-                    rc = err(1, "fopen(\"%s\", \"w\") failed", pszOutput);
+                    rc = err(1, "fopen(\"%s\", \"w" KMK_FOPEN_NO_INHERIT_MODE "\") failed", pszOutput);
                     break;
                 }

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -878 +878 @@
              */
             FILE *pWorkingStdErr = NULL;
+# if defined(CONFIG_NEW_WIN_CHILDREN) && defined(KMK)
+            if (cOrders > 0)
+                MkWinChildExclusiveAcquire();
+# endif
             rcExit = kRedirectExecFdOrders(cOrders, paOrders, &pWorkingStdErr);
             if (rcExit == 0)
@@ -890 +894 @@
                 HANDLE  hProcess = (HANDLE)_spawnvpe(_P_NOWAIT, pszExecutable, papszArgs, papszEnvVars);
                 kRedirectRestoreFdOrders(cOrders, paOrders, &pWorkingStdErr);
+# ifdef CONFIG_NEW_WIN_CHILDREN
+                if (cOrders > 0)
+                    MkWinChildExclusiveRelease();
+# endif
                 if ((intptr_t)hProcess != -1)
                 {
@@ -1015 +1023 @@
 #endif /* !KMK */
             }
+#if defined(CONFIG_NEW_WIN_CHILDREN) && defined(KBUILD_OS_WINDOWS) && defined(KMK)
+            else if (cOrders > 0)
+                MkWinChildExclusiveRelease();
+#endif
+
         }