* support/scripts/sdcc.nsi: fixed Error: unterminated string parsing

  line at sdcc.nsi:153
* sdcc/debugger/mcs51/simi.c: argsToCmdLine() fixes

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

diff --git a/ChangeLog b/ChangeLog
index 3f7175c34a8712819057cd019a5a7309842f2245..f2b7699de3ad7f96092f1e6c41bfb6c84f31ab41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-06 Borut Razem <borut.razem AT siol.net>
+
+       * support/scripts/sdcc.nsi: fixed Error: unterminated string parsing
+         line at sdcc.nsi:153
+       * sdcc/debugger/mcs51/simi.c: argsToCmdLine() fixes
+
 2006-09-05 Borut Razem <borut.razem AT siol.net>
 
        * configure.in, configure: support for winsock2

diff --git a/debugger/mcs51/simi.c b/debugger/mcs51/simi.c
index a9e67b7234b3b57c42ffc78532f7b90e5812c35b..0fae5ea5750062cf109e75b86bc6f105ff1270ab 100644 (file)
--- a/debugger/mcs51/simi.c
+++ b/debugger/mcs51/simi.c
@@ -175,13 +175,13 @@ char *argsToCmdLine(char **args, int nargs)
         if (0 < nargs)
             ++argLen;
 
-        if (argLen >= cmdLen)
+        if (cmdPos + argLen >= cmdLen)
         {
             do
             {
                 cmdLen += cmdLen;
             }
-            while (argLen >= cmdLen);
+            while (cmdPos + argLen >= cmdLen);
             cmd = Safe_realloc(cmd, cmdLen);
         }
 
@@ -204,6 +204,8 @@ char *argsToCmdLine(char **args, int nargs)
             cmd[cmdPos++] = '"';
     }
 
+    cmd[cmdPos] = '\0'
+
     return cmd;
 }
 

diff --git a/support/scripts/sdcc.nsi b/support/scripts/sdcc.nsi
index 0cf7c9faa30d2b74ceac8507bef7da6bbe10d5f5..05c119aa6298eb78f0e605d93d0e528580714d52 100644 (file)
--- a/support/scripts/sdcc.nsi
+++ b/support/scripts/sdcc.nsi
@@ -150,9 +150,9 @@ Section "SDCC application files"
   File "${SDCC_ROOT}\bin\link-z80.exe"
   File "${SDCC_ROOT}\bin\makebin.exe"
   File "${SDCC_ROOT}\bin\packihx.exe"
-  File "${SDCC_ROOT}\bin\sdcc.exe
-  File "${SDCC_ROOT}\bin\sdcclib.exe
-  File "${SDCC_ROOT}\bin\sdcpp.exe
+  File "${SDCC_ROOT}\bin\sdcc.exe"
+  File "${SDCC_ROOT}\bin\sdcclib.exe"
+  File "${SDCC_ROOT}\bin\sdcpp.exe"
 SectionEnd
 
 Section "ucSim application files"