summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixFile.c
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2015-08-27 11:48:03 (GMT)
committerdgp <dgp@users.sourceforge.net>2015-08-27 11:48:03 (GMT)
commit2d51c843bb0836ecdb6f1acc08ba6b8754491205 (patch)
tree846a0302bd00e43df73e18bd4ba1fc508162a177 /unix/tclUnixFile.c
parent65644eeb87cb55253126bba237afb569d3fe6f4a (diff)
parent4b8109368625d2b5d9c74f7f2375925b57860efa (diff)
downloadtcl-2d51c843bb0836ecdb6f1acc08ba6b8754491205.zip
tcl-2d51c843bb0836ecdb6f1acc08ba6b8754491205.tar.gz
tcl-2d51c843bb0836ecdb6f1acc08ba6b8754491205.tar.bz2
merge 8.5
Diffstat (limited to 'unix/tclUnixFile.c')
-rw-r--r--unix/tclUnixFile.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index c5f75a7..0a2099c 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -155,6 +155,11 @@ TclpFindExecutable(
goto done;
}
+ if (TclpGetCwd(NULL, &cwd) == NULL) {
+ TclSetObjNameOfExecutable(Tcl_NewObj(), NULL);
+ goto done;
+ }
+
/*
* The name is relative to the current working directory. First strip off
* a leading "./", if any, then add the full path name of the current
@@ -168,8 +173,6 @@ TclpFindExecutable(
Tcl_DStringInit(&nameString);
Tcl_DStringAppend(&nameString, name, -1);
- TclpGetCwd(NULL, &cwd);
-
Tcl_DStringFree(&buffer);
Tcl_UtfToExternalDString(NULL, Tcl_DStringValue(&cwd),
Tcl_DStringLength(&cwd), &buffer);