Changeset 671

Timestamp:

Sep 9, 2003, 1:33:26 PM (22 years ago)

Author:

bird

Message:

#627: Fixed problems related walking LIB.

File:

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

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

@@ -516 +516 @@
 }
 
-/* finds the full path of a library or object file.
+/* Finds the full path of a library or object file.
 
    Object files and libraries will be searched for using the LIB env.var
@@ -529 +529 @@
    if one without the 'lib' prefix was not found. The '.o' and '.a'
    extensions are tried in the last case since otherwise we can find
-   a 'something.a' when 'libsomething.lib' is available.
-*/
+   a 'something.a' when 'libsomething.lib' is available. */
 
 static FILE *find_objlib (char *fullname, const char *name, int is_library)
@@ -537 +536 @@
   FILE *f;
   size_t pathlen, namelen = strlen (name);
-  char *libpath, *x;
+  const char *libpath, *x;
   int i, has_ext = 0, has_path;
 
@@ -553 +552 @@
       if (x)
         for (i = 0; i < 2; i++)
-          if (strcmp (x, exts [is_library][i]) == 0)
+          if (!stricmp (x, exts [is_library][i]))
             {
               has_ext = 1;
@@ -564 +563 @@
   libpath = getenv ("LIB");
   pathlen = 0;
+  if (!has_path)
+    {
+      memcpy(fullname, ".\\", 2);
+      pathlen = 2;
+    }
   do
     {
@@ -575 +579 @@
           char *cur = fullname + pathlen;
 
-          if ((i & 1) && !is_library)
+          if ((i & 1) && (!is_library || has_path))
             continue;
 
@@ -601 +605 @@
               else
                 {
-                  /* Replace forward slashes with backslashes
-                     since Knut likes them :) */
+                  /* Replace forward slashes with backslashes (link386). */
                   while ((fullname = strchr (fullname, '/')) != NULL)
                     *fullname++ = '\\';
@@ -613 +616 @@
         break;
 
-      /* Find where next LIB component ends */
-      x = strchr (libpath, ';');
-      if (!x) x = strchr (libpath, 0);
-      pathlen = x - libpath;
-
-      if (pathlen)
-        {
-          memcpy (fullname, libpath, pathlen);
-          /* Append last slash if it is not there */
-          if (fullname [pathlen - 1] != '/'
-           && fullname [pathlen - 1] != '\\')
-            fullname [pathlen++] = '\\';
-        }
-
-      /* Advance past ';' in LIB */
-      libpath = x + 1;
-    } while (*x);
+      /* Find the next LIB component. 
+         We're skipping empty components. */
+      for (;;)
+        {
+          x = strchr (libpath, ';');
+          if (!x) x = strchr (libpath, 0);
+          pathlen = x - libpath;
+          if (pathlen)
+            {
+              memcpy (fullname, libpath, pathlen);
+              libpath = x + (*x == ';');
+              /* Append last slash if it is not there */
+              if (fullname [pathlen - 1] != '/'
+               && fullname [pathlen - 1] != '\\')
+                fullname [pathlen++] = '\\';
+              break;
+            }
+          if (!*x)
+            break;
+          libpath = x + (*x == ';');
+        } 
+    } while (pathlen);
 
   return NULL;