omftools: correct OMF tools to properly handle multiple THEADR record…

…s per module
open-watcom · Oct 8, 2024 · c2b5b23 · c2b5b23
1 parent 9f7d55a
commit c2b5b23
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/bld/omftools/c/objfind.c b/bld/omftools/c/objfind.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -62,10 +62,12 @@ static bool ProcFileModRef( FILE *fp )
     char        *module_name;
     bool        ok;
     int         rc;
+    bool        first;
 
     page_len = 0;
     ReadRecInit();
     module_name = NULL;
+    first = true;
     ok = true;
     while( ok ) {
         offset = ftell( fp );
@@ -77,12 +79,15 @@ static bool ProcFileModRef( FILE *fp )
         }
         switch( RecHdr[0] & ~1 ) {
         case CMD_THEADR:
-            if( module_name != NULL )
-                free( module_name );
-            GetName();
-            NameTerm();
-            module_name = malloc( strlen( NamePtr ) + 1 );
-            strcpy( module_name, NamePtr );
+            if( first ) {
+                if( module_name != NULL )
+                    free( module_name );
+                GetName();
+                NameTerm();
+                module_name = malloc( strlen( NamePtr ) + 1 );
+                strcpy( module_name, NamePtr );
+                first = false;
+            }
             break;
         case CMD_MODEND:
             if( page_len != 0 ) {
@@ -92,6 +97,7 @@ static bool ProcFileModRef( FILE *fp )
                     fseek( fp, offset, SEEK_CUR );
                 }
             }
+            first = true;
             break;
         case CMD_PUBDEF:
             if( module_name == NULL )

diff --git a/bld/omftools/c/objlist.c b/bld/omftools/c/objlist.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2020 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2024 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -55,9 +55,11 @@ static bool ProcFile( FILE *fp )
     unsigned_32 offset;
     bool        ok;
     int         rc;
+    bool        first;
 
     page_len = 0;
     ReadRecInit();
+    first = true;
     ok = true;
     while( ok ) {
         offset = ftell( fp );
@@ -69,9 +71,12 @@ static bool ProcFile( FILE *fp )
         }
         switch( RecHdr[0] & ~1 ) {
         case CMD_THEADR:
-            GetName();
-            NameTerm();
-            printf( "%s\n", NamePtr );
+            if( first ) {
+                GetName();
+                NameTerm();
+                printf( "%s\n", NamePtr );
+                first = false;
+            }
             break;
         case CMD_MODEND:
             if( page_len != 0 ) {
@@ -81,6 +86,7 @@ static bool ProcFile( FILE *fp )
                     fseek( fp, offset, SEEK_CUR );
                 }
             }
+            first = true;
             break;
         case LIB_HEADER_REC:
             if( RecHdr[0] & 1 ) {