Changeset 6688079 in tol for toltcl

Timestamp:

Mar 14, 2016, 12:49:45 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

c6181a1

Parents:

6755180

Message:

fixes #1920, se corrige tambien en tolcon, tolbase, tolsh

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@7244 be4846ae-f051-483a-831f-b64e7d08527f

Location:

toltcl/generic

Files:

• tolsh.c (modified) (1 diff)
• toltcl.c (modified) (2 diffs)

toltcl/generic/tolsh.c

@@ -60 +60 @@
 #if defined(WIN32)
   SetupDllSearchPath( argv0 );
+  Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
+               " [file dir [file dir {", argv0,
+               "} ] ] lib ]", NULL );
+#else
+  Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
+               " [file dir [file dir [expr {[file type {", argv0, "}] eq {link} ? [file readlink {", argv0, "}] : {", argv0 ,"}} ] ] ] lib ]", NULL );
 #endif   
-  Tcl_VarEval( interp, "lappend", " auto_path", " [file join",
-               " [file dir [file dir ", argv0,
-               " ] ] lib ]", NULL );
   if ( !Tcl_PkgRequire( interp, "TolshApp", TOLTCL_VERSION, 1) )
     {

toltcl/generic/toltcl.c

@@ -217 +217 @@
   int lang;
   char* vmode;
+  const char *argv0 = Tcl_GetNameOfExecutable();
+
   if (objc > 3) {
     Tcl_AppendResult(interp, "wrong # args: should be \"",
@@ -246 +248 @@
      */
     
+    Tcl_VarEval( 
     InitTolKernel(Tcl_GetNameOfExecutable(), lang, vmode&&vmode[0]?vmode:NULL);