* support/Util/MySystem.c (merge_command): quick fix for Linux segfault with \"cmd...

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

diff --git a/ChangeLog b/ChangeLog
index 82a60cebebb99e9e68fc916bef75373d28d3141c..6877a7df92f6a15c4ff168488e045f1a231d506d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-06-18  Bernhard Held <bernhard@bernhardheld.de>
+
+       * support/Util/MySystem.c (merge_command): quick fix for Linux segfault with \"cmd\" arg
+
 2003-06-15  Borut Razem <borut.razem@siol.net>
 
        * support/cpp2/sdcc.h: HAVE_DOS_BASED_FILE_SYSTEM defined for _WIN23

diff --git a/support/Util/MySystem.c b/support/Util/MySystem.c
index 307149bd267c26ca27b716f30111c3ebff0e8bce..7017ad1e02b4d3118c5df669c3bbc0f34725b744 100644 (file)
--- a/support/Util/MySystem.c
+++ b/support/Util/MySystem.c
@@ -237,7 +237,7 @@ merge_command(const char *command, const char *params)
 {
   /* allocate extra space for 2x'"', ' ' and '\0' */
   char *cmd_line = (char *)Safe_alloc(strlen(command) + strlen(params) + 4);
-  sprintf(cmd_line, "\"%s\" %s", command, params);
+  sprintf(cmd_line, "%s %s", command, params);
 
   return cmd_line;
 }
@@ -251,10 +251,6 @@ static int
 has_path(const char *path)
 {
   if (strrchr(path, DIR_SEPARATOR_CHAR) == NULL)
-#ifdef _WIN32
-    /* try *nix dir separator on WIN32 */
-    if (strrchr(path, UNIX_DIR_SEPARATOR_CHAR) == NULL)
-#endif
       return 0;
 
   return 1;