summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdejong <mdejong>2003-10-04 18:59:26 (GMT)
committermdejong <mdejong>2003-10-04 18:59:26 (GMT)
commitce5f8d3fdff40fbd42079a7d4c6acf2671e42c62 (patch)
treeddd839b3e2a046023a9e359d7ad1c7e8ab623ab0
parentf6514cb20593a23726967be44adf8f2176e18185 (diff)
downloadtcl-ce5f8d3fdff40fbd42079a7d4c6acf2671e42c62.zip
tcl-ce5f8d3fdff40fbd42079a7d4c6acf2671e42c62.tar.gz
tcl-ce5f8d3fdff40fbd42079a7d4c6acf2671e42c62.tar.bz2
* win/tclWinPipe.c: fixed a bug in BuildCommandLine.
This bug built a command line with a missing space between tclpipe.dll and the following arguments. It caused error in Windows 98 when exec command.com (e.g. dir) [Bug 789040]
-rw-r--r--ChangeLog7
-rw-r--r--win/tclWinPipe.c5
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 798c208..71beb68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-04 Chengye Mao <chengye.geo@yahoo.com>
+
+ * win/tclWinPipe.c: fixed a bug in BuildCommandLine.
+ This bug built a command line with a missing space between
+ tclpipe.dll and the following arguments. It caused error
+ in Windows 98 when exec command.com (e.g. dir) [Bug 789040]
+
2003-10-03 Don Porter <dgp@users.sourceforge.net>
* generic/tclBasic.c: Fixed error in ref count management of command
diff --git a/win/tclWinPipe.c b/win/tclWinPipe.c
index 1fc5fa1..a21d29c 100644
--- a/win/tclWinPipe.c
+++ b/win/tclWinPipe.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclWinPipe.c,v 1.33.2.3 2003/09/28 10:29:52 davygrvy Exp $
+ * RCS: @(#) $Id: tclWinPipe.c,v 1.33.2.4 2003/10/04 18:59:27 mdejong Exp $
*/
#include "tclWinInt.h"
@@ -1577,9 +1577,10 @@ BuildCommandLine(
arg = executable;
} else {
arg = argv[i];
- Tcl_DStringAppend(&ds, " ", 1);
}
+ if(Tcl_DStringLength(&ds) > 0) Tcl_DStringAppend(&ds, " ", 1);
+
quote = 0;
if (arg[0] == '\0') {
quote = 1;