Changeset 1758 for zzufTweet

Timestamp:

Feb 24, 2007, 5:20:42 PM (13 years ago)

Author:

Sam Hocevar

Message:

• Minor win32 cosmetic updates.

File:

• zzuf/trunk/src/zzuf.c (modified) (8 diffs)

zzuf/trunk/src/zzuf.c

@@ -536 +536 @@
 static void spawn_children(struct opts *opts)
 {
-    int fd[3][2];
+    int pipes[3][2];
     int64_t now = _zz_time();
     pid_t pid;
@@ -563 +563 @@
         int ret;
 #if defined HAVE_PIPE
-        ret = pipe(fd[j]);
+        ret = pipe(pipes[j]);
 #elif defined HAVE__PIPE
-        ret = _pipe(fd[j], 256, _O_BINARY);
+        ret = _pipe(pipes[j], 512, _O_BINARY | O_NOINHERIT);
 #endif
         if(ret < 0)
@@ -574 +574 @@
     }
 
-    pid = run_process(opts, fd);
+    pid = run_process(opts, pipes);
     if(pid < 0)
         return;
@@ -583 +583 @@
     for(j = 0; j < 3; j++)
     {
-        close(fd[j][1]);
-        opts->child[i].fd[j] = fd[j][0];
+        close(pipes[j][1]);
+        opts->child[i].fd[j] = pipes[j][0];
     }
     opts->child[i].bytes = 0;
@@ -756 +756 @@
         if(!ZZUF_FD_ISSET(opts->child[i].fd[j], &fdset))
             continue;
+fprintf(stderr, "data on fd %i for process %i\n", j, i);
 
         ret = read(opts->child[i].fd[j], buf, BUFSIZ - 1);
@@ -833 +834 @@
 #endif
 
-static int run_process(struct opts *opts, int fd[][2])
+static int run_process(struct opts *opts, int pipes[][2])
 {
     char buf[64];
@@ -874 +875 @@
     for(j = 3; j--; )
     {
-        close(fd[j][0]);
-        if(fd[j][1] != files[j])
-        {
-            dup2(fd[j][1], files[j]);
-            close(fd[j][1]);
+        close(pipes[j][0]);
+        if(pipes[j][1] != files[j])
+        {
+            dup2(pipes[j][1], files[j]);
+            close(pipes[j][1]);
         }
     }
@@ -935 +936 @@
     memset(&sinfo, 0, sizeof(sinfo));
     sinfo.cb = sizeof(sinfo);
-    DuplicateHandle(pid, (HANDLE)_get_osfhandle(fd[0][1]), pid,
+    DuplicateHandle(pid, (HANDLE)_get_osfhandle(pipes[0][1]), pid,
         /* FIXME */ &sinfo.hStdInput, 0, TRUE, DUPLICATE_SAME_ACCESS);
-    DuplicateHandle(pid, (HANDLE)_get_osfhandle(fd[1][1]), pid,
+    DuplicateHandle(pid, (HANDLE)_get_osfhandle(pipes[1][1]), pid,
                     &sinfo.hStdError, 0, TRUE, DUPLICATE_SAME_ACCESS);
-    DuplicateHandle(pid, (HANDLE)_get_osfhandle(fd[2][1]), pid,
+    DuplicateHandle(pid, (HANDLE)_get_osfhandle(pipes[2][1]), pid,
                     &sinfo.hStdOutput, 0, TRUE, DUPLICATE_SAME_ACCESS);
     sinfo.dwFlags = STARTF_USESTDHANDLES;