Changeset 1233

Timestamp:

Feb 12, 2004, 9:12:42 PM (22 years ago)

Author:

bird

Message:

fixed libc_FH() and libc_FHClose potential trouble when someone increased the max fh number.

File:

• trunk/src/emx/src/lib/sys/filehandles.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/sys/filehandles.c

@@ -64 +64 @@
 static int __libc_fhMoreHandles(unsigned cMin);
 static int __libc_fhAllocate(int fh, unsigned fFlags, int cb, PLIBCFHOPS pOps, PLIBCFH *ppFH, int *pfh, int fOwnSem);
+static PLIBCFH __libc_fh(int fh);
 
 
@@ -630 +631 @@
      * Validate input.
      */
-    if (    (fh < 0 && fh >= gcFHs)
-        ||  !gpapFHs[fh])
-    {
-        _fmutex_release(&gmtx);
+    if (!__libc_fh(fh))
+    {
 #ifdef DEBUG
         __asm__("int $3");
 #endif
+        _fmutex_release(&gmtx);
         errno = EBADF;
         return -1;
@@ -657 +657 @@
     {
         int rc2;
+
         /*
          * Close the OS/2 handle and remove the handle from the array
@@ -702 +703 @@
  * @returns NULL on failure.
  * @param   fh  Handle to lookup.
+ * @remark  Must own the mutex.
+ * @internal
+ */
+static PLIBCFH __libc_fh(int fh)
+{
+    PLIBCFH pFH = NULL;
+
+    /*
+     * Someone might have opened this externally after
+     * growing the filehandle range.
+     */
+    if (fh >= gcFHs && fh < 0x10000)
+    {
+        LONG    lDelta = 0;
+        ULONG   cCur = 0;
+        if (!DosSetRelMaxFH(&lDelta, &cCur))
+            cCur = gcFHs;
+        if (gcFHs != cCur)
+            __libc_fhMoreHandles(cCur);
+    }
+
+    /*
+     * Validate file handle range.
+     */
+    if (fh >= 0 && fh < gcFHs)
+    {
+        pFH = gpapFHs[fh];
+        if (!pFH)
+        {
+            /*
+             * Try import the handle.
+             */
+            ULONG       rc;
+            ULONG       fulType;
+            ULONG       fulDevFlags;
+            ULONG       fulMode;
+            unsigned    fLibc;
+
+            /*
+             * Is it in use and if so what kind of handle?
+             */
+            if (    (rc = DosQueryHType((HFILE)fh, &fulType, &fulDevFlags)) != NO_ERROR
+                ||  (rc = DosQueryFHState((HFILE)fh, &fulMode)) != NO_ERROR)
+            {
+                errno = EBADF;
+                return NULL;
+            }
+
+            /*
+             * Determin initial flags.
+             */
+            switch (fulType & 0xff)
+            {
+                default: /* paranoia */
+                case HANDTYPE_FILE:
+                    fLibc = F_FILE;
+                    break;
+                case HANDTYPE_DEVICE:
+                    fLibc = F_DEV;
+                    /* @todo inherit O_NDELAY */
+                    break;
+                case HANDTYPE_PIPE:
+                    fLibc = F_PIPE;
+                    break;
+            }
+
+            /*
+             * Read write flags.
+             */
+            switch (fulMode & (OPEN_ACCESS_READONLY | OPEN_ACCESS_WRITEONLY | OPEN_ACCESS_READWRITE))
+            {
+                case OPEN_ACCESS_READONLY:      fLibc |= O_RDONLY; break;
+                case OPEN_ACCESS_WRITEONLY:     fLibc |= O_WRONLY; break;
+                default: /* paranoia */
+                case OPEN_ACCESS_READWRITE:     fLibc |= O_RDWR; break;
+            }
+
+            /*
+             * Textflag.
+             */
+            if (!_fmode_bin)
+                fLibc |= O_TEXT;
+
+
+            /*
+             * Allocate a new handle for this filehandle.
+             */
+            rc = __libc_fhAllocate(fh, fLibc, sizeof(LIBCFH), NULL, &pFH, NULL, 1);
+            if (rc)
+                pFH = NULL;
+        }
+    }
+    else /* out of range: can't possibly be open. */
+        errno = EBADF;
+
+    return pFH;
+}
+
+/**
+ * Get the LIBC handle structure corresponding to a filehandle.
+ *
+ * @returns Pointer to handle structure on success.
+ * @returns NULL on failure.
+ * @param   fh  Handle to lookup.
  */
 PLIBCFH __libc_FH(int fh)
 {
-    PLIBCFH pFH = NULL;
+    PLIBCFH pFH;
 
     /** @todo shared access */
-    if (!_fmutex_request(&gmtx, 0))
-    {
-        if (fh >= 0 && fh < gcFHs)
-        {
-            pFH = gpapFHs[fh];
-            if (!pFH)
-            {
-                /*
-                 * Try import the handle.
-                 */
-                ULONG       rc;
-                ULONG       fulType;
-                ULONG       fulDevFlags;
-                ULONG       fulMode;
-                unsigned    fLibc;
-
-                /*
-                 * Is it in use and if so what kind of handle?
-                 */
-                if (    (rc = DosQueryHType((HFILE)fh, &fulType, &fulDevFlags)) != NO_ERROR
-                    ||  (rc = DosQueryFHState((HFILE)fh, &fulMode)) != NO_ERROR)
-                {
-                    errno = EBADF;
-                    _fmutex_release(&gmtx);
-                    return NULL;
-                }
-
-                /*
-                 * Determin initial flags.
-                 */
-                switch (fulType & 0xff)
-                {
-                    default: /* paranoia */
-                    case HANDTYPE_FILE:
-                        fLibc = F_FILE;
-                        break;
-                    case HANDTYPE_DEVICE:
-                        fLibc = F_DEV;
-                        /* @todo inherit O_NDELAY */
-                        break;
-                    case HANDTYPE_PIPE:
-                        fLibc = F_PIPE;
-                        break;
-                }
-
-                /*
-                 * Read write flags.
-                 */
-                switch (fulMode & (OPEN_ACCESS_READONLY | OPEN_ACCESS_WRITEONLY | OPEN_ACCESS_READWRITE))
-                {
-                    case OPEN_ACCESS_READONLY:      fLibc |= O_RDONLY; break;
-                    case OPEN_ACCESS_WRITEONLY:     fLibc |= O_WRONLY; break;
-                    default: /* paranoia */
-                    case OPEN_ACCESS_READWRITE:     fLibc |= O_RDWR; break;
-                }
-
-                /*
-                 * Textflag.
-                 */
-                if (!_fmode_bin)
-                    fLibc |= O_TEXT;
-
-
-                /*
-                 * Allocate a new handle for this filehandle.
-                 */
-                rc = __libc_fhAllocate(fh, fLibc, sizeof(LIBCFH), NULL, &pFH, NULL, 1);
-                if (rc)
-                    pFH = NULL;
-            }
-        }
-
-        _fmutex_release(&gmtx);
-    }
-
+    if (_fmutex_request(&gmtx, 0))
+        return NULL;
+
+    pFH = __libc_fh(fh);
+
+    _fmutex_release(&gmtx);
     return pFH;
 }