Changeset 3663 for trunk

Timestamp:

Sep 17, 2010, 1:40:39 AM (15 years ago)

Author:

bird

Message:

libomflib/emxomfar: detect non-OMF objects before adding them to a library.

Location:

trunk/emx/src/libomflib

Files:

• Makefile.kup (added)
• omflibam.c (modified) (2 diffs)

trunk/emx/src/libomflib/omflibam.c

@@ -14 +14 @@
   char name[256];
   char obj_fname[256+4];
-  byte libhdr[1];
+  byte libhdr[4];
   int ret;
 
@@ -26 +26 @@
   /* this may be a library, check so we don't create invalid libraries 
      (#579?) */
-  if (   fread(&libhdr[0], sizeof(libhdr), 1, f) == 1
-      && libhdr[0] == LIBHDR
-      )
+  memset (libhdr, 0, sizeof(libhdr));
+  if (fread (&libhdr[0], 1, sizeof(libhdr), f) >= 1)
     {
-      struct omflib *   src = omflib_open (fname, error);
-      if (!src)
-          return -1;
-      ret = omflib_copy_lib(p, src, error);
-      omflib_close(src, error);
-      return ret;
+       if (libhdr[0] == LIBHDR)
+         {
+           struct omflib *   src = omflib_open (fname, error);
+           if (!src)
+             return -1;
+           ret = omflib_copy_lib (p, src, error);
+           omflib_close (src, error);
+           fclose (f);
+           return ret;
+         }
+       if (libhdr[0] != THEADR)
+         {
+           fclose (f);
+           if (memcmp(libhdr, "\177ELF", 4) == 0) 
+             strcpy (error, "ELF object, use AR instead of EMXOMFAR");
+           else
+             strcpy (error, "not OMF obj");
+           return -1;
+         }
     }
+
   fseek(f, 0, SEEK_SET);