From: MaartenBrock <MaartenBrock@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sat, 24 Mar 2007 21:24:54 +0000 (+0000)
Subject: * src/SDCCmain.c(parseCmdLine): fixed bug 1677144
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=79e2fd25f9be0b4c58d5da5e1bafeba7d6d568ce;p=fw%2Fsdcc

* src/SDCCmain.c(parseCmdLine): fixed bug 1677144

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

diff --git a/ChangeLog b/ChangeLog
index f95d560d..6fcc7876 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
 	  removed header guard)
 	* .version,
 	* sdcc.spec: bumped version to 2.6.5
+	* src/SDCCmain.c(parseCmdLine): fixed bug 1677144
 
 2007-03-22 Borut Razem <borut.razem AT siol.net>
 
diff --git a/src/SDCCmain.c b/src/SDCCmain.c
index 083ecb12..cb082bb1 100644
--- a/src/SDCCmain.c
+++ b/src/SDCCmain.c
@@ -1405,7 +1405,7 @@ parseCmdLine (int argc, char **argv)
         {
           struct dbuf_s path;
 
-		  if (*dstPath != '\0')
+          if (*dstPath != '\0')
             {
               dbuf_init(&path, 128);
               dbuf_makePath (&path, dstPath, moduleNameBase);
@@ -1422,6 +1422,14 @@ parseCmdLine (int argc, char **argv)
 
           dbuf_init(&file, 128);
 
+          /* get rid of the "."-extension */
+          dbuf_splitFile (s, &file, NULL);
+
+          dbuf_c_str (&file);
+          s = dbuf_detach (&file);
+
+          dbuf_init (&file, 128);
+
           dbuf_splitPath (s, NULL, &file);
 
           if (*dstPath != '\0')
@@ -1490,7 +1498,7 @@ linkEdit (char **envp)
   linkerScriptFileName[0] = 0;
   c = NULL;
 
-  if(port->linker.needLinkerScript)
+  if (port->linker.needLinkerScript)
     {
       char out_fmt;
 
@@ -1510,7 +1518,7 @@ linkEdit (char **envp)
         }
 
       /* first we need to create the <filename>.lnk file */
-      SNPRINTF (linkerScriptFileName, sizeof(scratchFileName),
+      SNPRINTF (linkerScriptFileName, sizeof(linkerScriptFileName),
         "%s.lnk", dstFileName);
       if (!(lnkfile = fopen (linkerScriptFileName, "w")))
         {
@@ -2085,8 +2093,8 @@ preProcess (char **envp)
 
       if (port && port->processor && TARGET_IS_PIC) {
         char proc[512];
-	SNPRINTF(&proc[0], 512, "-DSDCC_PROCESSOR=\"%s\"", port->processor);
-	addSet(&preArgvSet, Safe_strdup(proc));
+        SNPRINTF(&proc[0], 512, "-DSDCC_PROCESSOR=\"%s\"", port->processor);
+        addSet(&preArgvSet, Safe_strdup(proc));
       }
 
       /* standard include path */