Changeset 524

Timestamp:

Aug 4, 2003, 8:24:20 PM (22 years ago)

Author:

bird

Message:

bugfixes.

Location:

trunk/src/emx/src/emxomf

Files:

• emxomfld.c (modified) (2 diffs, 1 prop)
• weakld.c (modified) (9 diffs, 1 prop)

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

@@ -825 +825 @@
       /* add argument to argument vector. */
       if (!(argi % 32))
-        argv = xrealloc(argv, argi + 32);
+        argv = xrealloc(argv, argi + 32 + 1);
       argv[argi++] = xstrdup(psz);
 
@@ -831 +831 @@
       psz = psz2;                           
     }
+  argv[argi] = NULL;
 
   /* Spawn process. */

trunk/src/emx/src/emxomf/weakld.c

@@ -1447 +1447 @@
         /*
          * We'll simply return existing symbol when:
-         *      1. adding a UNDEF where a PUBLIC or COMM exists.
+         *      1. adding a UNDEF where a PUBLIC, COMM, !WEAK UNDEF or IMPORT exists.
          *      2. adding a WKEXT where a PUBLIC or COMM exists.
          *      3. adding a WKEXT where a UNDEF which isn't UNCERTAIN exists.
@@ -1455 +1455 @@
         if ( (     /* 1 */
                 (fFlags & WLDSF_TYPEMASK) == WLDSF_UNDEF
-             && ((pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_PUBLIC || (pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_COMM
-                 || (pSym->fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == WLDSF_UNDEF)
+             && ((pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_PUBLIC || (pSym->fFlags & WLDSF_TYPEMASK) == WLDSF_COMM 
+                 || (pSym->fFlags & (WLDSF_TYPEMASK | WLDSF_WEAK)) == WLDSF_UNDEF || (pSym->fFlags & (WLDSF_TYPEMASK)) == WLDSF_IMPORT)
             ) || ( /* 2 */
                 (fFlags & WLDSF_TYPEMASK) == WLDSF_WKEXT
@@ -1591 +1591 @@
 
     /* Add the strings we'll need them very soon */
-    pszImpMod = strpool_addnu(pWld->pStrMisc, pachModName, cchModName);
+    if (cchModName > 0)
+        pszImpMod = strpool_addnu(pWld->pStrMisc, pachModName, cchModName);
+    else
+        pszImpMod = strpool_addu(pWld->pStrMisc, pachModName);
     pszImpName = NULL;
     if (!uOrdinal)
     {
-        if (!pachImpName || cchImpName == 0 )
+        /* If no imp name, we'll use the name we know it as. */
+        if (!pachImpName || cchImpName == 0 || !*pachImpName)
         {
             pachImpName = pachName;
             cchImpName = cchName;
         }
-        pszImpName = strpool_addn(pWld->pStrMisc, pachImpName, cchImpName);
+        if (cchImpName > 0)
+            pszImpName = strpool_addn(pWld->pStrMisc, pachImpName, cchImpName);
+        else
+            pszImpName = strpool_add(pWld->pStrMisc, pachImpName);
     }
 
@@ -1690 +1697 @@
 
     /* set default name */
-    if (!pachIntName || !cchIntName)
-    {
-        pachExpName = pachIntName;
-        cchExpName = cchIntName;
+    if (!pachIntName || !cchIntName || !*pachIntName)
+    {
+        pachIntName = pachExpName;
+        cchIntName = cchExpName;
     }
 
@@ -1878 +1885 @@
      */
     pSym = symAdd(pWld, pMod, WLDSF_COMM | (fLibSearch ? WLDSF_LIBSEARCH : 0),
-                  pachName, cchName, NULL);
+                  pachName, cchName, &eAction);
     if (!pSym)
         return NULL;
@@ -1891 +1898 @@
 
         case WLDSA_UP:
+            if ((pSym->fFlags & (WLDSF_TYPEMASK)) != WLDSF_COMM)
+                break;
+            /* fallthru */
         case WLDSA_OLD:
             /* merge size */
@@ -1897 +1907 @@
             if (pSym->u.comm.cb < cbElement)
                 pSym->u.comm.cb = cbElement;
-            pSym = NULL;
             break;
 
@@ -2314 +2323 @@
 int     wldDestroy(PWLD pWld)
 {
+    PWLDMOD     pObj;
+    PWLDLIB     pLib;
+
     if (!pWld)
         return 0;
     if (pWld->fFlags & WLDC_VERBOSE)
         fprintf(stderr, "weakld: info: destroying linker instance\n");
+
+    /* free mods */
+    for (pObj = pWld->pObjs; pObj;)
+    {
+        void *pv = pObj;   
+        pObj = pObj->pNext;
+        free(pv);
+    }
+    for (pObj = pWld->pDef; pObj;)
+    {
+        void *pv = pObj;   
+        pObj = pObj->pNext;
+        free(pv);
+    }
+
+    /* free libs */
+    for (pLib = pWld->pLibs; pLib;)
+    {
+        void *pv = pLib;   
+        pLib = pLib->pNext;
+        free(pv);
+    }
 
     /* members and finally the instance structure. */
@@ -2446 +2480 @@
                 uOrdinal = pStmt->import.ordinal;
             pSym = symAddImport(pParam->pWld, pParam->pMod, 0,
-                                pStmt->import.entryname, -1,
+                                pStmt->import.entryname[0] ? pStmt->import.entryname : pStmt->import.internalname, -1,
                                 pStmt->import.internalname, -1,
                                 pStmt->import.modulename, -1,