diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-08 10:57:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-07-08 10:57:11 (GMT) |
| commit | b0ddc613f3eab88958d51c386d3d448b8d0fc100 (patch) | |
| tree | 4fe8a274a2300c18c6843b1249e2b33e343b895f /unix/tclUnixFile.c | |
| parent | 519f757fd50e23dce9baf160bf18b9a6ddb81276 (diff) | |
| parent | 4b87d73b631c0e6b946c1e7a43b9cbb528674b18 (diff) | |
| download | tcl-b0ddc613f3eab88958d51c386d3d448b8d0fc100.zip tcl-b0ddc613f3eab88958d51c386d3d448b8d0fc100.tar.gz tcl-b0ddc613f3eab88958d51c386d3d448b8d0fc100.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix/tclUnixFile.c')
| -rw-r--r-- | unix/tclUnixFile.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c index e676215..c213050 100644 --- a/unix/tclUnixFile.c +++ b/unix/tclUnixFile.c @@ -105,11 +105,11 @@ TclpFindExecutable( while ((*p != ':') && (*p != 0)) { p++; } - Tcl_DStringSetLength(&buffer, 0); + TclDStringClear(&buffer); if (p != name) { Tcl_DStringAppend(&buffer, name, p - name); if (p[-1] != '/') { - Tcl_DStringAppend(&buffer, "/", 1); + TclDStringAppendLiteral(&buffer, "/"); } } name = Tcl_DStringAppend(&buffer, argv0, -1); @@ -174,11 +174,10 @@ TclpFindExecutable( Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&cwd), Tcl_DStringLength(&cwd), &buffer); if (Tcl_DStringValue(&cwd)[Tcl_DStringLength(&cwd) -1] != '/') { - Tcl_DStringAppend(&buffer, "/", 1); + TclDStringAppendLiteral(&buffer, "/"); } Tcl_DStringFree(&cwd); - Tcl_DStringAppend(&buffer, Tcl_DStringValue(&nameString), - Tcl_DStringLength(&nameString)); + TclDStringAppendDString(&buffer, &nameString); Tcl_DStringFree(&nameString); encoding = Tcl_GetEncoding(NULL, NULL); @@ -288,7 +287,7 @@ TclpMatchInDirectory( */ if (dirName[dirLength-1] != '/') { - dirName = Tcl_DStringAppend(&dsOrig, "/", 1); + dirName = TclDStringAppendLiteral(&dsOrig, "/"); dirLength++; } } |