Changeset 2298 for trunk/src/kash/shfile.c

Timestamp:

Mar 1, 2009, 6:18:30 AM (16 years ago)

Author:

bird

Message:

kash: no return indicators that works for both gcc and msc (not pretty, but wtf).

File:

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

trunk/src/kash/shfile.c

@@ -625 +625 @@
     SecurityAttributes.bInheritHandle = TRUE;
 
-    if (!CreatePipe(&hRead, &hWrite, &SecurityAttributes, 4096))
+    fds[1] = fds[0] = -1;
+    if (CreatePipe(&hRead, &hWrite, &SecurityAttributes, 4096))
     {
         fds[0] = shfile_insert(pfdtab, (intptr_t)hRead, O_RDONLY, -1, "shfile_pipe");
@@ -637 +638 @@
 # else
     int native_fds[2];
+
+    fds[1] = fds[0] = -1;
     if (!pipe(native_fds))
     {
-        fds[1] = -1;
         fds[0] = shfile_insert(pfdtab, native_fds[0], O_RDONLY, -1, "shfile_pipe");
         if (fds[0] != -1)
@@ -673 +675 @@
             rc = -1;
         }
+    }
+    else
+    {
+# if K_OS == K_OS_WINDOWS
+        errno = shfile_dos2errno(GetLastError());
+# endif
+        rc = -1;
     }