Changeset 2376 for trunk/src

Timestamp:

Jan 13, 2010, 2:45:49 AM (16 years ago)

Author:

bird

Message:

kash: Fixed some file handle inheritance issues on windows. piping to the native sort.exe works now.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (1 diff)
• shfile.c (modified) (7 diffs)
• shinstance.c (modified) (2 diffs)
• show.c (modified) (1 diff)
• tstDump.c (added)

trunk/src/kash/Makefile.kmk

@@ -191 +191 @@
 endif
 
+#
+# For debugging file handle inheritance on Windows.
+#
+if "$(KBUILD_TARGET)" == win && 0
+PROGRAMS += tstDump
+tstDump_TEMPLATE = BIN
+tstDump_SOURCES = tstDump.c
+endif
+
 # Include the sub-makefile.
 include $(PATH_SUB_CURRENT)/tests/Makefile.kmk

trunk/src/kash/shfile.c

@@ -548 +548 @@
                         if (hFile != INVALID_HANDLE_VALUE)
                         {
-                            int fd2 = shfile_insert(pfdtab, (intptr_t)hFile, aStdHandles[i].fFlags, 0, i, "shtab_init");
+                            DWORD       dwType  = GetFileType(hFile);
+                            unsigned    fFlags  = aStdHandles[i].fFlags;
+                            unsigned    fFlags2;
+                            int         fd2;
+                            if (dwType == FILE_TYPE_CHAR)
+                                fFlags2 = SHFILE_FLAGS_TTY;
+                            else if (dwType == FILE_TYPE_PIPE)
+                                fFlags2 = SHFILE_FLAGS_PIPE;
+                            else
+                                fFlags2 = SHFILE_FLAGS_FILE;
+                            fd2 = shfile_insert(pfdtab, (intptr_t)hFile, fFlags, fFlags2, i, "shtab_init");
                             assert(fd2 == i); (void)fd2;
                             if (fd2 != i)
@@ -588 +598 @@
 
     shmtx_enter(&pfdtab->mtx, &tmp);
-    TRACE2((NULL, "shfile_fork_win:\n"));
+    TRACE2((NULL, "shfile_fork_win: set=%d\n", set));
 
     i = pfdtab->size;
@@ -598 +608 @@
             if (set)
                 TRACE2((NULL, "  #%d: native=%#x oflags=%#x shflags=%#x\n",
-                        i, pfdtab->tab[i].oflags, pfdtab->tab[i].shflags, hFile));
+                        i, hFile, pfdtab->tab[i].oflags, pfdtab->tab[i].shflags));
             if (!SetHandleInformation(hFile, HANDLE_FLAG_INHERIT, fFlag))
             {
@@ -612 +622 @@
         {
             if (    pfdtab->size > i
-                &&  pfdtab->tab[i].fd == 0)
+                &&  pfdtab->tab[i].fd == i)
                 hndls[i] = pfdtab->tab[i].native;
             else
                 hndls[i] = (intptr_t)INVALID_HANDLE_VALUE;
+            TRACE2((NULL, "shfile_fork_win: i=%d size=%d fd=%d native=%d hndls[%d]=%p\n",
+                    i, pfdtab->size, pfdtab->tab[i].fd, pfdtab->tab[i].native, i, hndls[i]));
         }
     }
@@ -644 +656 @@
 
     shmtx_enter(&pfdtab->mtx, &tmp);
-    TRACE2((NULL, "shfile_fork_win:\n"));
+    TRACE2((NULL, "shfile_exec_win: prepare=%p\n", prepare));
 
     count  = pfdtab->size < (0x10000-4) / (1 + sizeof(HANDLE))
            ? pfdtab->size
            : (0x10000-4) / (1 + sizeof(HANDLE));
-    while (count > 3 && pfdtab->tab[count].fd == -1)
+    while (count > 3 && pfdtab->tab[count - 1].fd == -1)
         count--;
 
@@ -669 +681 @@
                 HANDLE hFile = (HANDLE)pfdtab->tab[i].native;
                 TRACE2((NULL, "  #%d: native=%#x oflags=%#x shflags=%#x\n",
-                        i, pfdtab->tab[i].oflags, pfdtab->tab[i].shflags, hFile));
+                        i, hFile, pfdtab->tab[i].oflags, pfdtab->tab[i].shflags));
 
                 if (!SetHandleInformation(hFile, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT))
@@ -697 +709 @@
         for (i = 0; i < 3; i++)
         {
-            if (    count > i
-                &&  pfdtab->tab[i].fd == 0)
+            if (    i < count
+                &&  pfdtab->tab[i].fd == i)
                 hndls[i] = pfdtab->tab[i].native;
             else
                 hndls[i] = (intptr_t)INVALID_HANDLE_VALUE;
+            TRACE2((NULL, "shfile_exec_win: i=%d count=%d fd=%d native=%d hndls[%d]=\n",
+                    i, count, pfdtab->tab[i].fd, pfdtab->tab[i].native, i, hndls[i]));
         }
 

trunk/src/kash/shinstance.c

@@ -899 +899 @@
 #if K_OS == K_OS_WINDOWS //&& defined(SH_FORKED_MODE)
     pid = shfork_do_it(psh);
+    if (pid == 0)
+        shthread_set_shell(psh);
 
 #elif defined(SH_FORKED_MODE)
@@ -1141 +1143 @@
 
         /* File handles. */
+        StrtInfo.dwFlags   |= STARTF_USESTDHANDLES;
         StrtInfo.lpReserved2 = shfile_exec_win(&psh->fdtab, 1 /* prepare */, &StrtInfo.cbReserved2, hndls);
         StrtInfo.hStdInput  = (HANDLE)hndls[0];

trunk/src/kash/show.c

@@ -273 +273 @@
 # define TRY_GET_PSH_OR_RETURN(psh)  \
         if (!(psh)) { \
-                psh = shthread_get_shell(); \
-                if (!psh) \
+                (psh) = shthread_get_shell(); \
+                if (!(psh)) \
                         return; \
         } else do { } while (0)