From: bernhardheld <bernhardheld@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Tue, 11 Nov 2003 13:43:02 +0000 (+0000)
Subject: * src/SDCCmain.c (linkEdit): fix #834252
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=07dd7f91962b50745858e1af0c354b9b6d4c8d6c;p=fw%2Fsdcc

* src/SDCCmain.c (linkEdit): fix #834252


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3011 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/ChangeLog b/ChangeLog
index 52acb65e..5c771112 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-11 Bernhard Held <bernhard@bernhardheld.de>
+
+        * src/SDCCmain.c (linkEdit): "fix" #834252
+
 2003-11-11 Erik Petrich <epetrich@ivorytower.norman.ok.us>
 
 	* src/SDCCast.c (removePostIncDecOps, removePreIncDecOps),
diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index 1ea4e2d9..bf48bba6 100644
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -1616,6 +1616,7 @@ linkEdit (char **envp)
       strncatz (scratchFileName,
 		options.out_fmt ? ".S19" : ".ihx",
 		sizeof(scratchFileName));
+      unlink (fullDstFileName);
       rename (scratchFileName, fullDstFileName);
 
       strncpyz (buffer, fullDstFileName, sizeof(buffer));
@@ -1630,11 +1631,13 @@ linkEdit (char **envp)
       strncatz (scratchFileName, ".map", sizeof(scratchFileName));
       *q = 0;
       strncatz(buffer, ".map", sizeof(buffer));
+      unlink (buffer);
       rename (scratchFileName, buffer);
       *p = 0;
       strncatz (scratchFileName, ".mem", sizeof(scratchFileName));
       *q = 0;
       strncatz(buffer, ".mem", sizeof(buffer));
+      unlink (buffer);
       rename (scratchFileName, buffer);
       if (options.debug)
         {
@@ -1642,10 +1645,12 @@ linkEdit (char **envp)
           strncatz (scratchFileName, ".cdb", sizeof(scratchFileName));
           *q = 0;
           strncatz(buffer, ".cdb", sizeof(buffer));
+          unlink (buffer);
           rename (scratchFileName, buffer);
           /* and the OMF file without extension: */
           *p = 0;
           *q = 0;
+          unlink (buffer);
           rename (scratchFileName, buffer);
         }
     }
@@ -1697,6 +1702,7 @@ assemble (char **envp)
         strncatz (scratchFileName, 
 		  port->linker.rel_ext,
 		  sizeof(scratchFileName));
+        unlink (fullDstFileName);
         rename (scratchFileName, fullDstFileName);
     }
 }