Changeset 209 for trunk/src/helpers/exeh.c

Timestamp:

Aug 19, 2002, 11:23:17 PM (23 years ago)

Author:

umoeller

Message:

Dialog formatter rewrite.

File:

• trunk/src/helpers/exeh.c (modified) (16 diffs)

trunk/src/helpers/exeh.c

@@ -176 +176 @@
  *@@changed V0.9.16 (2001-12-08) [umoeller]: speed optimizations, changed some return codes
  *@@changed V0.9.16 (2002-01-04) [umoeller]: added fixes for COM, BAT, CMD extensions
+ *@@changed V0.9.21 (2002-08-18) [umoeller]: this was completely broken for files without extensions (os2krnl)
  */
 
@@ -193 +194 @@
 
     if (!ppExec)
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     if (!(pExec = (PEXECUTABLE)malloc(sizeof(EXECUTABLE))))
-        return (ERROR_NOT_ENOUGH_MEMORY);
+        return ERROR_NOT_ENOUGH_MEMORY;
 
     memset(pExec, 0, sizeof(EXECUTABLE));
@@ -202 +203 @@
     // check some of the default extensions
     // V0.9.16 (2002-01-04) [umoeller]
-    if (pExt = doshGetExtension(pcszExecutable))
+    if (!(pExt = doshGetExtension(pcszExecutable)))
     {
+        // has no extension: then open file!
+        // fixed V0.9.21 (2002-08-18) [umoeller]
+        fOpenFile = TRUE;
+    }
+    else
+    {
+        // has extension:
         if (!stricmp(pExt, "COM"))
         {
@@ -508 +516 @@
 /*
  *@@ ParseBldLevel:
- *      called from exehQueryBldLevel to parse
- *      the BLDLEVEL string.
- *
- *      On entry, caller has copied the string into
- *      pExec->pszDescription. The string is
- *      null-terminated.
- *
- *      The BLDLEVEL string comes in two flavors.
+ *      called from exehQueryBldLevel to parse the BLDLEVEL string.
+ *
+ *      On entry, caller has copied the string into pExec->pszDescription.
+ *      The string is null-terminated.
+ *
+ *      The BLDLEVEL string comes in at least two basic flavors.
  *
  *      --  The standard format is:
@@ -524 +530 @@
  *          need to have them.
  *
- *      --  However, there is an extended version
- *          in that the DESCRIPTION field is split
- *          up even more. The marker for this seems
- *          to be that the description starts out
- *          with "##1##".
+ *      --  However, there is an extended version in that the DESCRIPTION field
+ *          is split up even more.
+ *
+ *          I have seen two subformats for this.
+ *
+ *          --  DANIS506.ADD and some IBM programs have a marker that seems
+ *              to be that the description starts out with "##1##".
  *
  +              ##1## DATETIME BUILDMACHINE:ASD:LANG:CTRY:REVISION:UNKNOWN:FIXPAK@@DESCRIPTION
  *
- *          The problem is that the DATETIME field comes
- *          in several flavors. IBM uses things like
- *
- +              "Thu Nov 30 15:30:37 2000 BWBLD228"
- *
- *          while DANIS506.ADD has
- *
- +              "15.12.2000 18:22:57      Nachtigall"
- *
- *          Looks like the date/time string is standardized
- *          to have 24 characters then.
+ *              The problem is that the DATETIME field comes
+ *              in several flavors. IBM uses things like
+ *
+ +                  "Thu Nov 30 15:30:37 2000 BWBLD228"
+ *
+ *              while DANIS506.ADD has
+ *
+ +                  "15.12.2000 18:22:57      Nachtigall"
+ *
+ *              Looks like the date/time string is standardized to have 24 characters then.
+ *
+ *          --  IBM TCP/IP executables (try INETD.EXE) have something yet different on.
+ *              We now try to parse that format as well, even though bldlevel.exe can't
+ *              handle it. (Isn't that utility from IBM too?)
+ *
+ *              Here's what I get for inetd.exe:
+ *
+ +              ##built 09:16:27 Mon Sep 17 2001 -- On AURORA43;0.1@@ TCP/IP for OS/2: INETD
  *
  *@@added V0.9.12 (2001-05-18) [umoeller]
  *@@changed V0.9.12 (2001-05-19) [umoeller]: added extended BLDLEVEL support
+ *@@changed V0.9.21 (2002-08-18) [umoeller]: added support for IBM TCP/IP format
+ *@@changed V0.9.21 (2002-08-18) [umoeller]: fixed DANIS506 format when an extended field had only one character
  */
 
@@ -555 +572 @@
 
     // @#VENDOR:VERSION#@ DESCRIPTION
-    // but skip the first byte, which has the string length
     if (    (pStartOfVendor = strstr(pExec->pszDescription, "@#"))
          && (pStartOfInfo = strstr(pStartOfVendor + 2, "#@"))
@@ -569 +585 @@
 
         // now check if we have extended DESCRIPTION V0.9.12 (2001-05-19) [umoeller]
-        if (    (strlen(pStartOfInfo) > 6)
-             && (!memcmp(pStartOfInfo, "##1##", 5))
-           )
+        if (strlen(pStartOfInfo) > 6)
         {
-            // yes: parse that beast
-            const char *p = pStartOfInfo + 5;
-
-            // get build date/time
-            if (strlen(p) > 24)
+            if (!memcmp(pStartOfInfo, "##1##", 5))
             {
-                // date/time seems to be fixed 24 chars in length
-                if (pExec->pszBuildDateTime = (PSZ)malloc(25))
-                {
-                    memcpy(pExec->pszBuildDateTime,
+                // DANIS506.ADD format:
+                // "##1## 2.7.2002 19:32:34        Nachtigall::::6::@@..."
+
+                // parse that beast
+                PCSZ p = pStartOfInfo + 5;
+
+                // get build date/time
+                if (strlen(p) > 24)
+                {
+                    // skip leading and trailing spaces
+                    // V0.9.21 (2002-08-18) [umoeller]
+                    PCSZ pStartOfDT = p,
+                         pEndOfDT = p + 24;
+                                // date/time seems to be fixed 24 chars in length
+
+                    while (*pStartOfDT == ' ')
+                        ++pStartOfDT;
+
+                    while (    (*pEndOfDT == ' ')
+                            && (pEndOfDT > pStartOfDT)
+                          )
+                        --pEndOfDT;
+
+                    pExec->pszBuildDateTime = strhSubstr(pStartOfDT, pEndOfDT + 1);
+
+                    /* memcpy(pExec->pszBuildDateTime,
                            p,
                            24);
                     pExec->pszBuildDateTime[24] = '\0';
-
+                    */
+
+                    // date/time seems to be fixed 24 chars in length
                     p += 24;
 
@@ -613 +647 @@
                              ul++)
                         {
-                            BOOL fStop = FALSE;
-                            const char *pNextColon = strchr(p, ':'),
-                                       *pDoubleAt = strstr(p, "@@");
+                            BOOL    fStop = FALSE;
+                            PCSZ    pNextColon = strchr(p, ':'),
+                                    pDoubleAt = strstr(p, "@@");
                             if (!pNextColon)
                             {
@@ -635 +669 @@
                                )
                             {
-                                if (pNextColon > p + 1)
+                                // if (pNextColon > p + 1)
+                                        // fixed V0.9.21 (2002-08-18) [umoeller]
+                                        // this failed on fields like "revision"
+                                        // which only had one character
+                                if (pNextColon > p)
                                     *(papsz[ul]) = strhSubstr(p, pNextColon);
                             }
@@ -648 +686 @@
                     }
                 }
+
+                if (pStartOfInfo = strstr(p,
+                                          "@@"))
+                    pStartOfInfo += 2;
+            } // end if (!memcmp(pStartOfInfo, "##1##", 5))
+            else if (!memcmp(pStartOfInfo, "##built", 7))
+            {
+                // IBM TCP/IP format:
+                // V0.9.21 (2002-08-18) [umoeller]
+
+                // ##built 09:16:27 Mon Sep 17 2001 -- On AURORA43;0.1@@ TCP/IP for OS/2: INETD
+
+                PCSZ    p = pStartOfInfo + 7,
+                        p2,
+                        p3;
+
+                if (p3 = strchr(p, ';'))
+                {
+                    while (*p == ' ')
+                        ++p;
+
+                    // ##built 09:16:27 Mon Sep 17 2001 -- On AURORA43;0.1@@ TCP/IP for OS/2: INETD
+                    //         ^ p                                    ^ p3
+                    //                                 ^ p2
+
+                    if (    (p2 = strstr(p, " -- On "))
+                         && (p2 < p3)
+                       )
+                    {
+                        pExec->pszBuildMachine = strhSubstr(p2 + 7, p3);
+                        pExec->pszBuildDateTime = strhSubstr(p, p2);
+                    }
+                    else
+                        pExec->pszBuildDateTime = strhSubstr(p, p3);
+
+                    p = p3 + 1;
+                }
+
+                if (pStartOfInfo = strstr(p,
+                                          "@@"))
+                {
+                    if (pStartOfInfo > p3)
+                    {
+                        // p3 points to this "0.1" string; I assume this is
+                        // a "revision.fixpak" format since inetver reports
+                        // four digits with this revision
+                        PCSZ p4;
+                        if (    (p4 = strchr(p3, '.'))
+                             && (p4 < pStartOfInfo)
+                           )
+                        {
+                            pExec->pszRevision = strhSubstr(p3 + 1, p4);
+                            pExec->pszFixpak = strhSubstr(p4 + 1, pStartOfInfo);
+                        }
+                        else
+                            pExec->pszRevision = strhSubstr(p3 + 1, pStartOfInfo);
+                    }
+
+                    pStartOfInfo += 2;
+                }
             }
-
-            pStartOfInfo = strstr(p,
-                                  "@@");
-            if (pStartOfInfo)
-                pStartOfInfo += 2;
         }
 
@@ -666 +759 @@
             // skip leading spaces in info string
             while (*pStartOfInfo == ' ')
-                pStartOfInfo++;
+                ++pStartOfInfo;
+
             if (*pStartOfInfo)  // V0.9.9 (2001-04-04) [umoeller]
                 // and copy until end of string
@@ -2142 +2236 @@
 static APIRET ExpandIterdata1(char *pabTarget,         // out: page data (pagesize as in lx spec)
                               int cbTarget,            // in: sizeof *pabTarget (pagesize as in lx spec)
-                              const char *pabSource,   // in: compressed source data in EXEPACK:1 format
+                              PCSZ pabSource,   // in: compressed source data in EXEPACK:1 format
                               int cbSource)            // in: sizeof *pabSource
 {
@@ -2205 +2299 @@
  */
 
-static void memcpyw(char *pch1, const char *pch2, size_t cch)
+static void memcpyw(char *pch1, PCSZ pch2, size_t cch)
 {
     /*
@@ -2239 +2333 @@
  */
 
-static void memcpyb(char *pch1, const char *pch2, size_t cch)
+static void memcpyb(char *pch1, PCSZ pch2, size_t cch)
 {
     /*
@@ -2276 +2370 @@
 static APIRET ExpandIterdata2(char *pachPage,              // out: page data (pagesize as in lx spec)
                               int cchPage,                 // in: sizeof *pachPage (pagesize as in lx spec)
-                              const char *pachSrcPage,     // in: compressed source data in EXEPACK:1 format
+                              PCSZ pachSrcPage,     // in: compressed source data in EXEPACK:1 format
                               int cchSrcPage)              // in: size of source buf
 {
@@ -3182 +3276 @@
 }
 
+