Changeset 488 for trunk/src/emx/src/emxomf/emxomfld.c

Timestamp:

Jul 31, 2003, 4:45:07 PM (22 years ago)

Author:

bird

Message:

#483: Temporary commit (Again.).

File:

• trunk/src/emx/src/emxomf/emxomfld.c (modified) (5 diffs, 1 prop)

trunk/src/emx/src/emxomf/emxomfld.c

@@ -468 +468 @@
    */
 
-static FILE * find_objlib(char *pszfullname, const char *pszname, 
-                          const char * const *papszexts, int flibhacks)
+static FILE * find_objlib2(char *pszfullname, const char *pszname, const char * const *papszexts, int flibhacks)
 {
   const char *  psz;
@@ -544 +543 @@
             phFile = fopen (pszfullname, "rb");
 
+          if (!flibhacks && phFile)
+            return phFile;
+
           if (phFile)
             {
@@ -556 +558 @@
               } libhdr;
               #pragma pack()
-              if (!flibhacks)
-                return phFile;
               /* For .a libraries we will chech for a valid OMF library header. */
               if (memicmp(pszfullname + strlen(pszfullname) - 2, ".a", 3))
                   return phFile;
-              if (  fread(&libhdr, 1, sizeof(libhdr), phFile) == sizeof(libhdr)
+              if (   fread(&libhdr, 1, sizeof(libhdr), phFile) == sizeof(libhdr)
                   && libhdr.rec_type == LIBHDR
                   && libhdr.flags <= 1 /* ASSUME only first bit is used... */
+                  && !fseek(phFile, 0, SEEK_SET)
                   )
                 {
@@ -581 +582 @@
 
 
+/* Wrapper around find_objlib which fixes the slashes - this looks better imho. */
+
+static FILE * find_objlib(char *pszfullname, const char *pszname, const char * const *papszexts, int flibhacks)
+{
+    FILE * phFile = find_objlib2(pszfullname, pszname, papszexts, flibhacks);
+    while ((pszfullname = strchr(pszfullname, '/')) != NULL)
+        *pszfullname++ = '\\';
+    return phFile;
+}
+
+
+
 /* Weak prelinking for Method 2 Weak support. */
 
@@ -588 +601 @@
   PWLD    pwld;
 
-  pwld = wld_create (0);
+  pwld = wld_create (WLDC_VERBOSE);
   if (pwld)
     {