Changeset 1234

Timestamp:

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

Author:

bird

Message:

Use lazy init of all filehandles but the three standard ones.

File:

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

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

@@ -121 +121 @@
      * Was previously done in init_files() in startup.c.
      *      We need to allocate the handles and initialize them accordingly.
-     * Note! This duplicates a bit of the __ioctl2 functionality for
-     *       reasons of speed.
-     */
+     * Bird Feb 12 2004 9:12pm: We do not have to do more than the first 3 handles.
+     *      Other open files will be automatically added when __libc_FH() is called
+     *      for usage validation in any of LIBC apis.
+     */
+    if (cMaxFHs > 3)
+        cMaxFHs = 3;
     for (i = 0; i < cMaxFHs; i++)
-    {
-        ULONG       fulType;
-        ULONG       fulDevFlags;
-        ULONG       fulMode;
-        unsigned    fLibc;
-
-        /*
-         * Is it in use and if so what kind of handle?
-         */
-        if (    (rc = DosQueryHType((HFILE)i, &fulType, &fulDevFlags)) != NO_ERROR
-            ||  (rc = DosQueryFHState((HFILE)i, &fulMode)) != NO_ERROR)
-        {
-#ifdef DEBUG
-            if (rc != ERROR_INVALID_HANDLE)
-                __asm__("int $3");
-#endif
-            continue;
-        }
-
-        /*
-         * 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;
-        }
-
-        /*
-         * There is some init_streams() dependency on all files to have non
-         * zero flags. Sure, we might change this, but for now keep this in mind
-         * when omitting O_TEXT.
-         * @todo inherit non text files.
-         */
-        fLibc |= O_TEXT;
-
-        /*
-         * 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;
-        }
-
-        /*
-         * Enforce rules on the three standard handles - is this strictly
-         * speaking such a good idea? It's apparently required for the con device
-         * as that is opened as readwrite for all three in OS/2 (to safe SFNs?).
-         * However I think when it's not the console device this might be sort
-         * of rushing to conclusions...
-         */
-        if (i < 2 && (fulDevFlags & 0x3 /* CON or KBD dev */))
-        {
-            if (i == 0)
-                fLibc = (fLibc & ~O_ACCMODE) | O_RDONLY;
-            else
-                fLibc = (fLibc & ~O_ACCMODE) | O_WRONLY;
-        }
-
-        /*
-         * Allocate handle and initialize handle.
-         */
-        rc = __libc_fhAllocate(i, fLibc, sizeof(LIBCFH), NULL, NULL, NULL, 1);
-        if (rc)
-        {
-#ifdef DEBUG
-            __asm__("int $3");
-#endif
-            return -1;
-        }
-    } /* fh init loop */
+        __libc_fh(i);
 
     return 0;