Changeset 2654 for branches

Timestamp:

Mar 18, 2006, 5:27:56 AM (19 years ago)

Author:

bird

Message:

Try put the log file handle above the range of the standard handles.

Location:

branches/libc-0.6/src/emx

Files:

• ChangeLog.LIBC (modified) (1 diff)
• src/lib/sys/logstrict.c (modified) (2 diffs)

branches/libc-0.6/src/emx/ChangeLog.LIBC

@@ -5 +5 @@
 2006-03-17: knut st. osmundsen <bird-gccos2-spam@anduin.net>
     - libc:
+        o Try put the log file handle above the range of the standard handles
         o #71: Fixed incorrect fmutex padding in FILE which cause _fcloseall
          (and perhaps others) to crash. (thanks to froloff)

branches/libc-0.6/src/emx/src/lib/sys/logstrict.c

@@ -218 +218 @@
     /*
      * Open the file.
+     * Make sure the filehandle is above the frequently used range (esp. std handles).
      */
     rc = DosOpen((PCSZ)pszFilename, &pInst->hFile, &ulAction, 0, FILE_NORMAL,
@@ -228 +229 @@
         FS_RESTORE();
         return NULL;
+    }
+    if (pInst->hFile < 10)
+    {
+        int     i;
+        HFILE   ah[10];
+        for (i = 0; i < 10; i++)
+        {
+            ah[i] = -1;
+            rc = DosDupHandle(pInst->hFile, &ah[i]);
+            if (rc)
+                break;
+        }
+        if (i-- > 0)
+        {
+            DosClose(pInst->hFile);
+            pInst->hFile = ah[i];
+            while (i-- > 0)
+                DosClose(ah[i]);
+        }
     }