summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixFile.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-06 07:59:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-08-06 07:59:01 (GMT)
commit276404432ecf07fa12997ae2aecf6cf8ef0f9714 (patch)
tree9726218d2767be111aba0feda74cd0ac220f4355 /unix/tclUnixFile.c
parent33bcb6e718ec30da522f10e0388743eafab975c7 (diff)
parent22298666ade7c7396ece86e2976309e955e9abd5 (diff)
downloadtcl-276404432ecf07fa12997ae2aecf6cf8ef0f9714.zip
tcl-276404432ecf07fa12997ae2aecf6cf8ef0f9714.tar.gz
tcl-276404432ecf07fa12997ae2aecf6cf8ef0f9714.tar.bz2
merge trunk
Diffstat (limited to 'unix/tclUnixFile.c')
-rw-r--r--unix/tclUnixFile.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index c213050..01fc6fe 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -310,10 +310,9 @@ TclpMatchInDirectory(
if (d == NULL) {
Tcl_DStringFree(&ds);
if (interp != NULL) {
- Tcl_ResetResult(interp);
- Tcl_AppendResult(interp, "couldn't read directory \"",
- Tcl_DStringValue(&dsOrig), "\": ",
- Tcl_PosixError(interp), NULL);
+ Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+ "couldn't read directory \"%s\": %s",
+ Tcl_DStringValue(&dsOrig), Tcl_PosixError(interp)));
}
Tcl_DStringFree(&dsOrig);
Tcl_DecrRefCount(fileNamePtr);
@@ -771,9 +770,9 @@ TclpGetCwd(
#endif
{
if (interp != NULL) {
- Tcl_AppendResult(interp,
- "error getting working directory name: ",
- Tcl_PosixError(interp), NULL);
+ Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+ "error getting working directory name: %s",
+ Tcl_PosixError(interp)));
}
return NULL;
}