Changeset 3163 in kBuild for trunk/src

Timestamp:

Mar 20, 2018 3:28:01 AM (7 years ago)

Author:

bird

Message:

kmk_redirect: cleanup

File:

• trunk/src/kmk/kmkbuiltin/redirect.c (modified) (21 diffs)

trunk/src/kmk/kmkbuiltin/redirect.c

@@ -105 +105 @@
 # define ONLY_TARGET_STANDARD_HANDLES
 #endif
-
-
-
-#if defined(_MSC_VER)
-
-
-/** Used by safeCloseFd. */
-static void __cdecl ignore_invalid_parameter(const wchar_t *a, const wchar_t *b, const wchar_t *c, unsigned d, uintptr_t e)
-{
-}
-
-#endif /* _MSC_VER */
-
-#if 0 /* unused */
-/**
- * Safely works around MS CRT's pedantic close() function.
- *
- * @param   fd      The file handle.
- */
-static void safeCloseFd(int fd)
-{
-#ifdef _MSC_VER
-    _invalid_parameter_handler pfnOld = _get_invalid_parameter_handler();
-    _set_invalid_parameter_handler(ignore_invalid_parameter);
-    close(fd);
-    _set_invalid_parameter_handler(pfnOld);
-#else
-    close(fd);
-#endif
-}
-#endif /* unused */
 
 
@@ -231 +200 @@
 #ifdef _MSC_VER
 
+/** Used by mscGetOsHandle. */
+static void __cdecl ignore_invalid_parameter(const wchar_t *a, const wchar_t *b, const wchar_t *c, unsigned d, uintptr_t e)
+{
+}
+
 /**
  * Safe way of getting the OS handle of a file descriptor without triggering
@@ -375 +349 @@
 static KBOOL kRedirectHasConflict(int fd, unsigned cOrders, REDIRECTORDERS *paOrders)
 {
+#ifdef ONLY_TARGET_STANDARD_HANDLES
+    if (fd >= 3)
+        return K_TRUE;
+#else
     while (cOrders-- > 0)
         if (paOrders[cOrders].fdTarget == fd)
             return K_TRUE;
+#endif
     return K_FALSE;
 }
@@ -434 +413 @@
     if (!kRedirectHasConflict(fdOpened, cOrders, paOrders))
     {
+#ifndef KBUILD_OS_WINDOWS
         if (fdOpened != fdTarget)
             return fdOpened;
-#ifndef _MSC_VER /* Stupid, stupid MSVCRT!  No friggin way of making a handle inheritable (or not). */
 # ifndef USE_FD_CLOEXEC
         if (fcntl(fdOpened, F_SETFD, 0) != -1)
 # endif
+#endif
             return fdOpened;
-#endif
     }
 
@@ -454 +433 @@
         if (fdOpened >= 0)
         {
+            if (!kRedirectHasConflict(fdOpened, cOrders, paOrders))
+            {
 #ifndef KBUILD_OS_WINDOWS
-            if (   !kRedirectHasConflict(fdOpened, cOrders, paOrders)
-# ifdef _MSC_VER
-                && fdOpened != fdTarget
-# endif
-                )
-#endif
-            {
-#ifndef _MSC_VER
 # ifdef USE_FD_CLOEXEC
                 if (   fdOpened == fdTarget
@@ -550 +523 @@
      * First, check if there's actually handle here that needs saving.
      */
-# ifdef KBUILD_OS_WINDOWS
-    HANDLE hToSave = mscGetOsHandle(fdToSave);
-    if (hToSave != INVALID_HANDLE_VALUE)
-    {
-        pToSave->fSaved = _setmode(fdToSave, _O_BINARY);
-        if (pToSave->fSaved != _O_BINARY)
-            _setmode(fdToSave, pToSave->fSaved);
-        if (!mscIsNativeHandleInheritable(hToSave))
-            pToSave->fSaved |= _O_NOINHERIT;
-    }
-    if (hToSave != INVALID_HANDLE_VALUE)
-# else
     pToSave->fSaved = fcntl(pToSave->fdTarget, F_GETFD, 0);
     if (pToSave->fSaved != -1)
-# endif
     {
         /*
          * Try up to 32 times to get a duplicate descriptor that doesn't conflict.
          */
-# ifdef KBUILD_OS_WINDOWS
-        HANDLE hCurProc = GetCurrentProcess();
-# endif
         int aFdTries[32];
         int cTries = 0;
@@ -578 +535 @@
             /* Duplicate the handle (windows makes this complicated). */
             int fdDup;
-# ifdef KBUILD_OS_WINDOWS
-            HANDLE hDup = INVALID_HANDLE_VALUE;
-            if (!DuplicateHandle(hCurProc, hToSave, hCurProc, &hDup, 0 /* DesiredAccess */,
-                                FALSE /*fInherit*/, DUPLICATE_SAME_ACCESS))
-            {
-                fprintf(*ppWorkingStdErr, "%s: DuplicateHandle(%#x) failed: %u\n", g_progname, hToSave, GetLastError());
-                break;
-            }
-            fdDup = _open_osfhandle((intptr_t)hDup, pToSave->fSaved | _O_NOINHERIT);
-            if (fdDup == -1)
-            {
-                fprintf(*ppWorkingStdErr, "%s: _open_osfhandle(%#x) failed: %u\n", g_progname, hDup, strerror(errno));
-                CloseHandle(hDup);
-                break;
-            }
-# else
             fdDup = dup(fdToSave);
             if (fdDup == -1)
@@ -600 +541 @@
                 break;
             }
-#endif
             /* Is the duplicate usable? */
             if (!kRedirectHasConflict(fdDup, cOrders, paOrders))
@@ -662 +602 @@
             KBOOL fRestoreStdErr = *ppWorkingStdErr != stderr
                                  && paOrders[i].fdSaved == fileno(*ppWorkingStdErr);
-
-#ifdef KBUILD_OS_WINDOWS
-            if (mscDup3(paOrders[i].fdSaved, paOrders[i].fdTarget, paOrders[i].fSaved, *ppWorkingStdErr) != -1)
-#else
             if (dup2(paOrders[i].fdSaved, paOrders[i].fdTarget) != -1)
-#endif
             {
                 close(paOrders[i].fdSaved);
@@ -678 +613 @@
                 }
             }
-#ifndef KBUILD_OS_WINDOWS
             else
                 fprintf(*ppWorkingStdErr, "%s: dup2(%d,%d) failed: %s\n",
                         g_progname, paOrders[i].fdSaved, paOrders[i].fdTarget, strerror(errno));
-#endif
-        }
-
-#ifndef KBUILD_OS_WINDOWS
+        }
+
         if (paOrders[i].fSaved != -1)
         {
@@ -694 +626 @@
                         g_progname, paOrders[i].fdTarget, paOrders[i].fSaved & FD_CLOEXEC ? "FD_CLOEXEC" : "0", strerror(errno));
         }
-#endif
     }
     errno = iSavedErrno;
@@ -728 +659 @@
                     if (paOrders[j].fdTarget == fdTarget)
                         break;
-# ifdef _MSC_VER
-                if (j >= cOrders && !mscIsInheritable(fdTarget))
-                    rcExit = 0;
-# else
                 if (j >= cOrders)
                 {
@@ -751 +678 @@
                         fprintf(*ppWorkingStdErr, "%s: fcntl(%d,F_GETFD,0) failed: %s\n", g_progname, fdTarget, strerror(errno));
                 }
-# endif
                 else
                     rcExit = kRedirectSaveHandle(&paOrders[i], cOrders, paOrders, ppWorkingStdErr);
@@ -794 +720 @@
 
 #endif /* !USE_POSIX_SPAWN */
-
 #ifdef KBUILD_OS_WINDOWS
 
@@ -1121 +1046 @@
     return rc;
 }
+
 #endif /* KBUILD_OS_WINDOWS */
 
@@ -1225 +1151 @@
              */
             FILE *pWorkingStdErr = NULL;
-#  if defined(CONFIG_NEW_WIN_CHILDREN) && defined(KMK)
-            if (cOrders > 0)
-                MkWinChildExclusiveAcquire();
-#  endif
             rcExit = kRedirectExecFdOrders(cOrders, paOrders, &pWorkingStdErr);
             if (rcExit == 0)
@@ -1237 +1159 @@
                  * We're spawning from within kmk.
                  */
-# if defined(KBUILD_OS_WINDOWS)
+# ifdef KBUILD_OS_WINDOWS
                 /* Windows is slightly complicated due to handles and winchildren.c. */
-#  if 1
                 HANDLE hProcess = INVALID_HANDLE_VALUE;
                 rcExit = kRedirectCreateProcessWindows(pszExecutable, cArgs, papszArgs, papszEnvVars, pszCwd,
                                                        cOrders, paOrders, &hProcess);
                 if (rcExit == 0)
-#  else
-                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)
-# endif
                 {
 #  ifndef CONFIG_NEW_WIN_CHILDREN
@@ -1289 +1201 @@
                     }
                 }
-#  if 0
-                else
-                    rcExit = err(10, "_spawnvpe(%s) failed", pszExecutable);
-#  endif
 
 # elif defined(KBUILD_OS_OS2)
@@ -1343 +1251 @@
                 }
 
-#elif defined(KBUILD_OS_WINDOWS) || defined(KBUILD_OS_OS2)
+#elif defined(KBUILD_OS_OS2)
                 errno  = 0;
-#  if defined(KBUILD_OS_WINDOWS)
-                rcExit = (int)_spawnvpe(_P_WAIT, pszExecutable, papszArgs, papszEnvVars);
-#  else
                 rcExit = (int)_spawnvpe(P_WAIT, pszExecutable, papszArgs, papszEnvVars);
-#  endif
                 kRedirectRestoreFdOrders(cOrders, paOrders, &pWorkingStdErr);
                 if (rcExit != -1 || errno == 0)
@@ -1393 +1297 @@
                 else
                     rcExit = errx(10, "posix_spawnp(%s) failed: %s", pszExecutable, strerror(rcExit));
-
 # endif
 #endif /* !KMK */
             }
-#if defined(CONFIG_NEW_WIN_CHILDREN) && defined(KBUILD_OS_WINDOWS) && defined(KMK) && 0
-            else if (cOrders > 0)
-                MkWinChildExclusiveRelease();
-#endif
-
-        }
-
+        }
+
+#ifndef KBUILD_OS_WINDOWS
         /*
          * Restore the current directory.
@@ -1412 +1311 @@
                 warn("Failed to restore directory to '%s'", pszSavedCwd);
         }
+#endif
     }
 #ifdef _MSC_VER