Changeset 2943

Timestamp:

Jan 8, 2007, 10:09:25 AM (19 years ago)

Author:

bird

Message:

fixed some i/o bugs.

Location:

trunk/libc/src

Files:

• kNIX/filehandles.c (modified) (5 diffs)
• kNIX/os2/kNIXConfig.h (modified) (2 diffs)
• libc/io/read.c (modified) (1 diff)

trunk/libc/src/kNIX/filehandles.c

@@ -583 +583 @@
 
     /*
+     * If it's a request for a native handle, grant it without further ado.
+     */
+    /** @todo need a better way of flagging that it's a native pOps. */
+    if (fh != -1 && pFH->pOps->enmType == enmFH_File)
+    {
+        pFH->fh = fh;
+        return 0;
+    }
+
+    /*
      * Open the NUL device.
      * If we're out of handle space, try increase it.
@@ -1080 +1090 @@
          */
         FS_VAR_SAVE_LOAD();
-        rc2 = DosClose(pFH->fh);
+        int rc2 = DosClose(pFH->fh); (void)rc2;
         FS_RESTORE();
         LIBC_ASSERTM(!rc2, "DosClose(%d) -> rc2=%d (rc=%d)\n", pFH->fh, rc2, rc);
@@ -1360 +1370 @@
     FS_VAR_SAVE_LOAD();
     ULONG fulState;
-    int rc = DosQueryFHState(fh, &fulState);
+    int rc = DosQueryFHState(pFH->fh, &fulState);
     if (!rc)
     {
@@ -1368 +1378 @@
                            == (O_NOINHERIT | (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT)) ),
                      "Inherit flags are out of sync for file hFile %d (%#x)! fulState=%08lx fFlags=%08x\n",
-                     fh, fh, fulState, pFH->fFlags);
+                     pFH->fh, pFH->fh, fulState, pFH->fFlags);
         if (fFlags & (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT))
             fulNewState = fulState | OPEN_FLAGS_NOINHERIT;
@@ -1376 +1386 @@
         {
             fulNewState &= OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT; /* Turn off non-participating bits. */
-            rc = DosSetFHState(fh, fulNewState);
+            rc = DosSetFHState(pFH->fh, fulNewState);
         }
     }

trunk/libc/src/kNIX/os2/kNIXConfig.h

@@ -1 @@
-/* $Id: $ */
+/* $Id$ */
 /** @file
  *
@@ -33 +33 @@
  * selves during allcation.
  */
-#define CFG_KNIX_FH_NATIVE_ALLOCATION  0
+#define CFG_KNIX_FH_NATIVE_ALLOCATION  1
 /** Maximum number of file handles. */
 #define CFG_KNIX_MAX_FHS                10000

trunk/libc/src/libc/io/read.c

@@ -105 +105 @@
     int la;
     size_t i = 0;
-    char *pbDst = (char *)pbDst;
+    char *pbDst = (char *)pvBuf;
     if (    cbToRead > 0
         &&  (la = __lxchg(&pFH->iLookAhead, -1)) != -1)