Changeset 4664

Timestamp:

10/05/10 02:16:54 (3 years ago)

Author:

sam

Message:

Inherit stdin/stdout/stderr in the child process under Win32.

Location:

zzuf/trunk/src

Files:

• libzzuf/lib-win32.c (modified) (1 diff)
• myfork.c (modified) (5 diffs)
• zzuf.c (modified) (2 diffs)

zzuf/trunk/src/libzzuf/lib-win32.c

@@ -65 +65 @@
            HANDLE hTemplateFile)
 {
-    fprintf(stderr, "CreateFileA(%s)\n", lpFileName);
-    return ORIG(CreateFileA)(lpFileName, dwDesiredAccess, dwShareMode,
-                             lpSecurityAttributes, dwCreationDisposition,
-                             dwFlagsAndAttributes, hTemplateFile);
+    HANDLE ret;
+    ret = ORIG(CreateFileA)(lpFileName, dwDesiredAccess, dwShareMode,
+                            lpSecurityAttributes, dwCreationDisposition,
+                            dwFlagsAndAttributes, hTemplateFile);
+    debug("%s(\"%s\", %x, %x, ..., %x, %x, ...) = [%i]",
+          __func__, lpFileName, dwDesiredAccess, dwShareMode,
+          dwCreationDisposition, dwFlagsAndAttributes, (int)ret); \
+    return ret;
 }
 #endif

zzuf/trunk/src/myfork.c

@@ -34 +34 @@
 #   include <tlhelp32.h>
 #endif
+#if defined HAVE_IO_H
+#   include <io.h>
+#endif
 #include <string.h>
 #include <fcntl.h> /* for O_BINARY */
@@ -73 +76 @@
 
 #if defined HAVE_WINDOWS_H
+#   define PARENT_FD(x) ((x) ? 0 : 1)
+#   define CHILD_FD(x) ((x) ? 1 : 0)
+#else
+#   define PARENT_FD(x) 0
+#   define CHILD_FD(x) 1
+#endif
+
+#if defined HAVE_WINDOWS_H
 static void rep32(uint8_t *buf, void *addr);
 static int dll_inject(PROCESS_INFORMATION *, char const *);
@@ -91 +102 @@
         ret = pipe(pipes[i]);
 #elif defined HAVE__PIPE
+        int tmp;
+        /* The pipe is created with NOINHERIT otherwise both parts are
+         * inherited. We then duplicate the part we want. */
         ret = _pipe(pipes[i], 512, _O_BINARY | O_NOINHERIT);
+        tmp = _dup(pipes[i][CHILD_FD(i)]);
+        close(pipes[i][CHILD_FD(i)]);
+        pipes[i][CHILD_FD(i)] = tmp;
 #endif
         if(ret < 0)
@@ -111 +128 @@
     for(i = 0; i < 3; i++)
     {
-        close(pipes[i][1]);
-        child->fd[i] = pipes[i][0];
+        close(pipes[i][CHILD_FD(i)]);
+        child->fd[i] = pipes[i][PARENT_FD(i)];
     }
 
@@ -259 +276 @@
     memset(&sinfo, 0, sizeof(sinfo));
     sinfo.cb = sizeof(sinfo);
-#if 0
-    DuplicateHandle(pid, (HANDLE)_get_osfhandle(pipes[0][1]), pid,
-        /* FIXME */ &sinfo.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
-    DuplicateHandle(pid, (HANDLE)_get_osfhandle(pipes[1][1]), pid,
-                    &sinfo.hStdError, 0, TRUE, DUPLICATE_SAME_ACCESS);
-    DuplicateHandle(pid, (HANDLE)_get_osfhandle(pipes[2][1]), pid,
-                    &sinfo.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
+
+    sinfo.hStdInput = (HANDLE)_get_osfhandle(pipes[0][CHILD_FD(0)]);
+    sinfo.hStdOutput = (HANDLE)_get_osfhandle(pipes[1][CHILD_FD(1)]);
+    sinfo.hStdError = (HANDLE)_get_osfhandle(pipes[2][CHILD_FD(2)]);
     sinfo.dwFlags = STARTF_USESTDHANDLES;
-#endif
-    ret = CreateProcess(NULL, child->newargv[0], NULL, NULL, FALSE,
+    ret = CreateProcess(NULL, child->newargv[0], NULL, NULL, TRUE,
                         CREATE_SUSPENDED, NULL, NULL, &sinfo, &pinfo);
     if(!ret)

zzuf/trunk/src/zzuf.c

@@ -939 +939 @@
             continue;
 
-        for(j = 0; j < 3; j++)
+        for(j = 1; j < 3; j++)
             ZZUF_FD_SET(opts->child[i].fd[j], &fdset, maxfd);
     }
@@ -945 +945 @@
     tv.tv_usec = 1000;
 
+#if _WIN32
+    for(i = 0; i < opts->maxchild; i++)
+        for (j = 1; j < 3; j++)
+        {
+            char tmpbuf[1025];
+            int tmp = _read(opts->child[i].fd[j], tmpbuf, 1024);
+            if (tmp > 0)
+            {
+                tmpbuf[tmp] = 0;
+                fprintf(stderr, "read %i bytes on fd %i: \"%s\"\n", tmp, j, tmpbuf);
+            }
+        }
+#endif
+
+    errno = 0;
     ret = select(maxfd + 1, &fdset, NULL, NULL, &tv);
     if(ret < 0 && errno)