summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-08-25 14:07:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-08-25 14:07:11 (GMT)
commit4e778d0112fb867161ef4b24103c493e73ce757b (patch)
tree198d06f68805ded1e3198b14e62243835ab9b1ed /unix
parent50a8e5953a346e641c8c8b10fe1bb5010f26c1dc (diff)
parent5d964e0e6cf53fdbfb627ec0846131dae369f644 (diff)
downloadtcl-4e778d0112fb867161ef4b24103c493e73ce757b.zip
tcl-4e778d0112fb867161ef4b24103c493e73ce757b.tar.gz
tcl-4e778d0112fb867161ef4b24103c493e73ce757b.tar.bz2
merge trunk
Diffstat (limited to 'unix')
-rw-r--r--unix/tclUnixFile.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 2cb0027..7ffbf8d 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);