Changeset 917

Timestamp:

Jan 2, 2004, 3:24:00 AM (22 years ago)

Author:

bird

Message:

Added support for .dll's as libs.

File:

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

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

@@ -653 +653 @@
 
 
+/* Converts the file indicated by pf & pszFilename to omf closing f and
+   updating filename with the new (temporary filename). A successful
+   return from the function returns a pointe to the filestream for the
+   converted file. On failure NULL is returned, f is closed adn filename
+   is undefined. */
+
+static FILE *lx_to_omf (FILE *pf, char *pszFilename)
+{
+    int         rc;
+    char *      pszNewFile;
+    name_list  *pName;
+
+    fclose(pf);                         /* don't need this! */
+
+    if (opt_t)
+      fprintf(stderr, "emxomfld: info: converting %s %s to an OMF import lib.\n",
+             "lib", pszFilename);
+
+    /*
+     * Make temporary file.
+     */
+    pName = xmalloc(sizeof(name_list));
+    pName->name = pszNewFile = xmalloc(_MAX_PATH);
+    if (make_tempfile(pszNewFile, "ldconv", ".lib"))
+    {
+        free(pszNewFile);
+        return NULL;
+    }
+
+    /*
+     * Do the conversion.
+     */
+    rc = spawnlp(P_WAIT, "emximp.exe", "emximp.exe",
+                 "-o", pszNewFile, pszFilename, NULL);
+    if (!rc)
+    {
+        /* open the file */
+        pf = fopen(pszNewFile, "rb");
+        if (pf)
+        {
+            /* add to auto delete list for removal on exit(). */
+            pName->next = conv_list;
+            conv_list = pName;
+
+            strcpy(pszFilename, pszNewFile);
+
+            if (opt_t)
+              fprintf(stderr, "emxomfld: info: convert result '%s'.\n",
+                      pszFilename);
+            return pf;
+        }
+        remove(pszNewFile);
+    }
+    free(pszNewFile);
+    free(pName);
+
+    fprintf (stderr, "emxomfld: a.out to omf conversion failed for '%s'.\n",
+             pszFilename);
+    exit (2);
+    return NULL;
+}
+
+
+
 /* Finds the full path of a OMF library or object file.
 
@@ -671 +735 @@
    a 'something.a' when 'libsomething.lib' is available.
 
+   We support linking with DLLs if they have a path as we're not yet ready
+   to start searching for them or anything of that kind of real UNIXy
+   behaviour.
+
    Returns pointer to file stream and FULLNAME set to it's name on success.
    Returns NULL and FULLNAME a copy of NAME on failure.
@@ -681 +749 @@
   size_t pathlen, namelen = strlen (name);
   const char *libpath, *x;
-  int i, has_ext = 0, has_path;
+  int i, has_ext = 0, is_dll = 0, has_path;
 
   /* Check if the file name has a path. If it has, we won't check the
@@ -687 +755 @@
   has_path = (strpbrk (name, ":/\\") != NULL);
   if (has_path)
-    has_ext = 1;
+    {
+      has_ext = 1;
+      x = strrchr (name, '.');
+      if (x && !stricmp(x, ".dll"))
+        is_dll = 1;
+    }
   else
     {
@@ -747 +820 @@
               if (autoconvert_flag && !check_omf (f))
                 f = aout_to_omf (f, fullname, is_library);
+              else if (autoconvert_flag && is_dll && is_library)
+                f = lx_to_omf (f, fullname);
 
               if (is_library && !check_omf_library (f) /* not sure if this makes sense */)
@@ -1209 +1284 @@
            a.out files (to simplify their make files). */
 
-        else if (stricmp (ext, ".lib") == 0 || stricmp (ext, ".a") == 0)
+        else if (stricmp (ext, ".lib") == 0 || stricmp (ext, ".a") == 0 || stricmp (ext, ".dll") == 0)
           add_name_list (&add_lib_fnames, optarg);