summaryrefslogtreecommitdiffstats
path: root/unix/tclAppInit.c
diff options
context:
space:
mode:
authorhypnotoad <yoda@etoyoc.com>2014-09-03 20:32:08 (GMT)
committerhypnotoad <yoda@etoyoc.com>2014-09-03 20:32:08 (GMT)
commit55a3852cc239fae1a240b94f46fe5d77e96849cc (patch)
tree12821c60596972be615881c5d94d2a12cb1ca50b /unix/tclAppInit.c
parent6f873dc1c6749e06d5f732d49e1b327ef6a8cefa (diff)
parenta4a3d764f5bc4047858e2a14a54d26c55b1cf0c0 (diff)
downloadtcl-55a3852cc239fae1a240b94f46fe5d77e96849cc.zip
tcl-55a3852cc239fae1a240b94f46fe5d77e96849cc.tar.gz
tcl-55a3852cc239fae1a240b94f46fe5d77e96849cc.tar.bz2
Merging in changes from Tcl
Reduced the code necessary to bootstrap a shell to a single C call. Reduced the number of new stub entries to 1 Fixed a Makefile goof that was preventing kits from running properly.
Diffstat (limited to 'unix/tclAppInit.c')
-rw-r--r--unix/tclAppInit.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index cdfff59..95dc38e 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -108,28 +108,7 @@ int
Tcl_AppInit(
Tcl_Interp *interp) /* Interpreter for application. */
{
- CONST char *cp=Tcl_GetNameOfExecutable();
- /* We have to initialize the virtual filesystem before calling
- ** Tcl_Init(). Otherwise, Tcl_Init() will not be able to find
- ** its startup script files.
- */
- Tcl_Zvfs_Init(interp);
- if(!Tcl_Zvfs_Mount(interp, cp, "/zvfs")) {
- Tcl_Obj *vfsinitscript=Tcl_NewStringObj("/zvfs/main.tcl",-1);
- Tcl_Obj *vfstcllib=Tcl_NewStringObj("/zvfs/tcl8.6",-1);
-
- Tcl_IncrRefCount(vfsinitscript);
- Tcl_IncrRefCount(vfstcllib);
-
- if(Tcl_FSAccess(vfsinitscript,F_OK)==0) {
- Tcl_SetStartupScript(vfsinitscript,NULL);
- }
- if(Tcl_FSAccess(vfstcllib,F_OK)==0) {
- Tcl_SetVar2(interp, "env", "TCL_LIBRARY", Tcl_GetString(vfstcllib), TCL_GLOBAL_ONLY);
- }
- Tcl_DecrRefCount(vfsinitscript);
- Tcl_DecrRefCount(vfstcllib);
- }
+ Tcl_Zvfs_Boot(interp);
if ((Tcl_Init)(interp) == TCL_ERROR) {
return TCL_ERROR;