Changeset 2796 for branches

Timestamp:

Aug 28, 2006, 3:19:56 AM (19 years ago)

Author:

bird

Message:

Fixed log problem in fork() child. Fixes #119.

Location:

branches/libc-0.6/src/emx

Files:

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

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

@@ -5 +5 @@
 2006-08-27: knut st. osmundsen <[email protected]>
     - libc:
+
         o Corrected DosSetFHState mask. Fixes #118.
         o Implemented the new length modifiers for *scanf. Adjusted the length

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

@@ -62 +62 @@
 #include <machine/param.h>
 #include <InnoTekLIBC/thread.h>
+
 
 #define INCL_BASE
@@ -98 +99 @@
 *******************************************************************************/
 /** Hex digits. */
-static const char gszHexDigits[17] = "0123456789abcdef";
+static const char gszHexDigits[17] = "0123456789abcdef";
 /** Uppercase hex digits. */
-static const char gszHexDigitsUpper[17] = "0123456789ABCDEF";
+static const char       gszHexDigitsUpper[17] = "0123456789ABCDEF";
+/** Pointer to default logger instance. */
+static __LIBC_PLOGINST  gpDefault;
 
 
@@ -116 +119 @@
 static int      __libc_logVSNPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, va_list args);
 static int      __libc_logSNPrintf(char *pszBuffer, size_t cchBuffer, const char *pszFormat, ...) __printflike(3, 4);
+
 
 
@@ -247 +251 @@
             while (i-- > 0)
                 DosClose(ah[i]);
+
+
+
+
+
+
+
+
         }
     }
@@ -263 +275 @@
         int         cch;
 
+
         DosGetInfoBlocks(&pTib, &pPib);
         DosGetDateTime(&dt);
-
         cch = __libc_logSNPrintf(pszMsg, CCHTMPMSGBUFFER,
                                  "Opened log at %04d-%02d-%02d %02d:%02d:%02d.%02d\n"
-                                 "Process ID: %#x (%d) Parent PID: %#x (%d)\n",
+                                 "Process ID: %#x (%d) Parent PID: %#x (%d)\n",
                                  dt.year, dt.month, dt.day, dt.hours, dt.minutes, dt.seconds, dt.hundredths,
-                                 (int)pPib->pib_ulpid, (unsigned)pPib->pib_ulpid, (int)pPib->pib_ulppid, (unsigned)pPib->pib_ulppid);
+                                 (int)pPib->pib_ulpid, (unsigned)pPib->pib_ulpid, (int)pPib->pib_ulppid, (unsigned)pPib->pib_ulppid,
+                                 (int)pPib->pib_ultype);
         DosWrite(pInst->hFile, pszMsg, cch, &cb);
 
+
         cch = __libc_logSNPrintf(pszMsg, CCHTMPMSGBUFFER,
                                  "Exe hmte  : %#x (",
                                  (unsigned)pPib->pib_hmte);
         DosWrite(pInst->hFile, pszMsg, cch, &cb);
-        if (DosQueryModuleName(pPib->pib_hmte, CCHTMPMSGBUFFER, pszMsg))
+        if (DosQueryModuleName(pPib->pib_hmte, CCHTMPMSGBUFFER, pszMsg))
             pszMsg[0] = '\0';
         cch = strlen(pszMsg);
@@ -284 +298 @@
         DosWrite(pInst->hFile, pszMsg, cch, &cb);
 
+
         cch = __libc_logSNPrintf(pszMsg, CCHTMPMSGBUFFER,
                                  "First arg : %s\n"
@@ -292 +307 @@
         cch = strlen(psz);
         DosWrite(pInst->hFile, psz, cch, &cb);
-
-        char    szMod[CCHMAXPATH];
+        DosWrite(pInst->hFile, "\n", 1, &cb);
+
+        /* The current drive and directory. */
+        ULONG ulDisk = 0;
+        ULONG fLogical = 0;
+        if (!DosQueryCurrentDisk(&ulDisk, &fLogical))
+        {
+            cch = __libc_logSNPrintf(pszMsg, CCHTMPMSGBUFFER,
+                                     "Cur dir   : %c:\\",
+                                     (char)ulDisk + ('A' - 1));
+            DosWrite(pInst->hFile, pszMsg, cch, &cb);
+
+            ULONG cchDir = CCHTMPMSGBUFFER - 4;
+            if (DosQueryCurrentDir(ulDisk, (PSZ)pszMsg, &cchDir))
+                pszMsg[0] = '\0';
+            cch = strlen(pszMsg);
+            pszMsg[cch++] = '\n';
+            DosWrite(pInst->hFile, pszMsg, cch, &cb);
+        }
+
+        /* The CRT module. */
+        char    szMod[128];
         ULONG   iObj = ~0;
         ULONG   offObj = ~0;
         HMODULE hmod = ~0;
         if (DosQueryModFromEIP(&hmod, &iObj, sizeof(szMod), &szMod[0], &offObj, (uintptr_t)__libc_logInit))
+
             szMod[0] = '\0';
+
+
         cch = __libc_logSNPrintf(pszMsg, CCHTMPMSGBUFFER,
-                                 "\n"
-                                 "CRT Module: %s hmod=%#lx\n"
+                                 "CRT Module: %s hmod=%#lx (",
+                                 szMod, hmod);
+        DosWrite(pInst->hFile, pszMsg, cch, &cb);
+
+        if (    hmod == NULLHANDLE
+            ||  DosQueryModuleName(hmod, CCHTMPMSGBUFFER - 4, pszMsg))
+            pszMsg[0] = '\0';
+        cch = strlen(pszMsg);
+        pszMsg[cch++] = ')';
+        pszMsg[cch++] = '\n';
+        DosWrite(pInst->hFile, pszMsg, cch, &cb);
+
+        cch = __libc_logSNPrintf(pszMsg, CCHTMPMSGBUFFER,
                                  "__libc_logInit: addr %p iObj=%ld offObj=%#lx\n",
-                                 szMod, hmod, (void *)__libc_logInit, iObj, offObj);
+                                 (void *)__libc_logInit, iObj, offObj);
         DosWrite(pInst->hFile, pszMsg, cch, &cb);
 
-
+        /* column headers */
         cch = __libc_logSNPrintf(pszMsg, CCHTMPMSGBUFFER,
                                  "   Millsecond Timestamp.\n"
@@ -436 +485 @@
 static void *__libc_logDefault(void)
 {
-    /** Pointer to default logger instance. */
-    static __LIBC_PLOGINST  pDefault;
     /** Set if we've already tried to init the log, but failed. */
     static int              fAlreadyTried;
 
-    if (pDefault)
-        return pDefault;
+    if (pDefault)
+        return pDefault;
     else if (!fAlreadyTried)
     {
@@ -501 +548 @@
         __libc_logSNPrintf(szFilename, sizeof(szFilename), "libc_%04x.log", getPid());
         if (__libc_logInit(&DefInst, 0, &DefGrps, szFilename))
-            pDefault = &DefInst;
+            pDefault = &DefInst;
 
         /*
@@ -509 +556 @@
     }
 
-    return pDefault;
+    return pDefault;
 }
 
@@ -2210 +2257 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+