Changeset 465

Timestamp:

Jul 28, 2003, 8:02:41 PM (22 years ago)

Author:

bird

Message:

#579?: Detect if the file is a library and take appropriate actions.

Location:

trunk/src/emx/src

Files:

• lib/omflib/omflibam.c (modified) (2 diffs, 1 prop)
• libomflib/omflibam.c (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/omflib/omflibam.c

@@ -14 +14 @@
   char name[256];
   char obj_fname[256+4];
+  byte libhdr[1];
   int ret;
 
@@ -22 +23 @@
   if (f == NULL)
     return omflib_set_error (error);
+
+  /* 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
+      )
+    {
+      struct omflib *   src = omflib_open (fname, error);
+      if (!src)
+          return -1;
+      ret = omflib_copy_lib(p, src, error);
+      omflib_close(src, error);
+      return ret;
+    }
+  fseek(f, 0, SEEK_SET);
+
   ret = omflib_copy_module (p, p->f, NULL, f, name, error);
   fclose (f);

trunk/src/emx/src/libomflib/omflibam.c

@@ -14 +14 @@
   char name[256];
   char obj_fname[256+4];
+  byte libhdr[1];
   int ret;
 
@@ -22 +23 @@
   if (f == NULL)
     return omflib_set_error (error);
+
+  /* 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
+      )
+    {
+      struct omflib *   src = omflib_open (fname, error);
+      if (!src)
+          return -1;
+      ret = omflib_copy_lib(p, src, error);
+      omflib_close(src, error);
+      return ret;
+    }
+  fseek(f, 0, SEEK_SET);
+
   ret = omflib_copy_module (p, p->f, NULL, f, name, error);
   fclose (f);