Changeset 539 for trunk/src/emx

Timestamp:

Aug 6, 2003, 1:28:35 PM (22 years ago)

Author:

bird

Message:

Works.

File:

• trunk/src/emx/src/emxomf/weakld.c (modified) (4 diffs, 1 prop)

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

@@ -3003 +3003 @@
             char        szTmp[1024];
             int         cch;
-            unsigned    iMDLine;
             PWLDSYM     pSymInt = NULL;
             PWLDSYM     pSymExp;
@@ -3023 +3022 @@
 
             /* Copy line from org to new so we're up to date. */
-            iMDLine = _md_get_linenumber(pMD);
-            while (pParam->iLine < iMDLine)
+            while (pParam->iLine + 1 < pStmt->line_number)
             {
                 if (!fgets(szTmp, 512 /* this is the size _md_* uses */, pParam->phOrgFile))
@@ -3031 +3029 @@
                     strcpy(szTmp, ";read error");
                 }
-
-                if (++pParam->iLine >= iMDLine) /* skip last line. */
-                    break;
+                pParam->iLine++;
                 if (fputs(szTmp, pParam->phNewFile) < 0)
                     return wldErr(pParam->pWld, "Write error.");
             }
 
-            /* if the internal symbol is weak, replace it with the right $w$. */
+            /* Set the correct $w$ internal symbol. */
             if (pSymInt && (pSymInt->fFlags & WLDSF_WEAK))
                 cch = sprintf(szTmp, "  \"%s\" = \"%s\"", pStmt->export.entryname, pSymInt->pszWeakName);
@@ -3057 +3053 @@
             if (fputs(szTmp, pParam->phNewFile) < 0)
                 return wldErr(pParam->pWld, "Write error.");
+            
+            /* skip line */
+            pParam->iLine++;
+            fgets(szTmp, 512 /* this is the size _md_* uses */, pParam->phOrgFile);
             break;
         }