Changeset 2294 in kBuild for trunk/src/kash/shfile.c

Timestamp:

Feb 28, 2009 8:33:26 AM (16 years ago)

Author:

bird

Message:

kash: more fixes + pipe.

File:

• trunk/src/kash/shfile.c (modified) (4 diffs)

trunk/src/kash/shfile.c

@@ -381 +381 @@
         if (getcwd(buf, sizeof(buf)))
         {
-            pfdtab->cwd = strdup(buf);
+            pfdtab->cwd = sh_strdup(NULL, buf);
             if (!inherit)
             {
@@ -466 +466 @@
 
     shmtx_enter(&pfdtab->mtx, &tmp);
+    TRACE2((NULL, "shfile_fork_win:\n"));
 
     i = pfdtab->size;
@@ -473 +474 @@
         {
             HANDLE hFile = (HANDLE)pfdtab->tab[i].native;
-            DWORD  fFlag = set || !pfdtab->tab[i].cloexec ? HANDLE_FLAG_INHERIT : 0;
+            DWORD  fFlag = (set || !pfdtab->tab[i].cloexec)
+                         ? HANDLE_FLAG_INHERIT : 0;
+            if (set)
+                TRACE2((NULL, "  #%d: native=%#x flags=%#x cloexec=%d fFlag=%#x\n",
+                        i, pfdtab->tab[i].flags, hFile, pfdtab->tab[i].cloexec, fFlag));
+
             if (!SetHandleInformation(hFile, HANDLE_FLAG_INHERIT, fFlag))
             {
@@ -613 +619 @@
 int shfile_pipe(shfdtab *pfdtab, int fds[2])
 {
-#ifdef SH_PURE_STUB_MODE
-    return -1;
+    int rc;
+    int s;
+#ifdef SHFILE_IN_USE
+# if K_OS == K_OS_WINDOWS
+    HANDLE hRead  = INVALID_HANDLE_VALUE;
+    HANDLE hWrite = INVALID_HANDLE_VALUE;
+    SECURITY_ATTRIBUTES SecurityAttributes;
+
+    SecurityAttributes.nLength = sizeof(SecurityAttributes);
+    SecurityAttributes.lpSecurityDescriptor = NULL;
+    SecurityAttributes.bInheritHandle = TRUE;
+
+    if (!CreatePipe(&hRead, &hWrite, &SecurityAttributes, 4096))
+    {
+        fds[0] = shfile_insert(pfdtab, (intptr_t)hRead, O_RDONLY, -1, "shfile_pipe");
+        if (fds[0] != -1)
+        {
+            fds[1] = shfile_insert(pfdtab, (intptr_t)hWrite, O_WRONLY, -1, "shfile_pipe");
+            if (fds[1] != -1)
+                rc = 0;
+        }
+
+# else
+    int native_fds[2];
+    if (!pipe(native_fds))
+    {
+        fds[1] = -1;
+        fds[0] = shfile_insert(pfdtab, native_fds[0], O_RDONLY, -1, "shfile_pipe");
+        if (fds[0] != -1)
+        {
+            fds[1] = shfile_insert(pfdtab, native_fds[1], O_WRONLY, -1, "shfile_pipe");
+            if (fds[1] != -1)
+                rc = 0;
+        }
+# endif
+        s = errno;
+        if (fds[1] == -1)
+        {
+            if (fds[0] != -1)
+            {
+                shmtxtmp tmp;
+                shmtx_enter(&pfdtab->mtx, &tmp);
+                rc = fds[0];
+                pfdtab->tab[rc].fd = -1;
+                pfdtab->tab[rc].flags = 0;
+                pfdtab->tab[rc].native = -1;
+                shmtx_leave(&pfdtab->mtx, &tmp);
+            }
+
+# if K_OS == K_OS_WINDOWS
+            CloseHandle(hRead);
+            CloseHandle(hWrite);
+# else
+            close(native_fds[0]);
+            close(native_fds[1]);
+# endif
+            fds[0] = fds[1] = -1;
+            errno = s;
+            rc = -1;
+        }
+    }
+
+#elif defined(SH_PURE_STUB_MODE)
+    rc = -1;
+    errno = ENOSYS;
 
 #elif defined(SH_STUB_MODE) || defined(SH_FORKED_MODE)
 # ifdef _MSC_VER
-    return _pipe(fds, PIPE_BUF, O_BINARY);
-# else
-    return pipe(fds);
-# endif
-
-#else
-#endif
+    rc = _pipe(fds, PIPE_BUF, O_BINARY);
+# else
+    rc = pipe(fds);
+# endif
+#endif
+
+    TRACE2((NULL, "shfile_pipe() -> %d{%d,%d} [%d]\n", rc, fds[0], fds[1], errno));
+    return rc;
 }