Changeset 6688079 in tol

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

Files:

• tol/init.cpp (modified) (6 diffs)
• tolbase/generic/tolbase.c (modified) (1 diff)
• toltcl/generic/tolsh.c (modified) (1 diff)
• toltcl/generic/toltcl.c (modified) (2 diffs)

tol/init.cpp

@@ -22 +22 @@
 #if defined(_MSC_VER)
 #include <win_tolinc.h>
+#endif
+
+#if HAVE_UNISTD_H
+#include <unistd.h>
 #endif
 
@@ -1545 +1549 @@
     free(mode);
   }
-  InitGrammars(calledProgram);
+
+  const char * ptr = calledProgram;
+  char realPath[1024];
+
+#ifdef HAVE_UNISTD_H
+  ssize_t r = readlink( ptr, realPath, 1024 );
+  if ( r > 0 )
+    {
+    realPath[r] = '\0';
+    ptr = realPath;
+    }
+#endif
+
+  printf( "Inicializando con %s\n", ptr );
+
+  InitGrammars( ptr );
 }
 
@@ -1577 +1596 @@
   bool loadInitProject = true;
   bool loadDefaultPackages = true;
+
+  const char * argv0 = argv[0];
+  char realPath[1024];
+  
+#ifdef HAVE_UNISTD_H
+  ssize_t r = readlink( argv0, realPath, 1024 );
+  if ( r > 0 )
+    {
+    realPath[r] = '\0';
+    argv0 = realPath;
+    }
+#endif
+
   if(!helpMode) {
     BInt i = 1;
@@ -1600 +1632 @@
         else if  (com == 'c')
         {
-          InitGrammars(argv[0]);
+          InitGrammars( argv0 );
           if(initTOL) { LoadInitLibrary(loadInitProject,loadDefaultPackages); }
           Trace(I2("\nCompiling command line argument -c :\n",
@@ -1630 +1662 @@
       else
       {
-        InitGrammars(argv[0]);
+        InitGrammars( argv0 );
         if(initTOL) { LoadInitLibrary(loadInitProject,loadDefaultPackages); }
         if(arg.HasName()) {
@@ -1733 +1765 @@
   if(dialogMode)
   {
-    InitGrammars(argv[0]);
+    InitGrammars( argv0 );
     // unused
     /*aliveObjects_1 =*/ AliveObjects();

tolbase/generic/tolbase.c

@@ -178 +178 @@
     //Tcl_PkgRequire( interp, "TolbaseApp", TOLBASE_VERSION, 1);
 #else
-    const char* exeName = Tcl_GetNameOfExecutable();
-    Tcl_VarEval( interp, "file join",
-                 " [ file dir ", Tcl_GetNameOfExecutable(),
-                 " ] tolbase.tcl", NULL );
+    const char* argv0 = Tcl_GetNameOfExecutable();
+    Tcl_VarEval( interp, "file join ",
+                 "[ file dir [expr {[file type {", argv0, "}] eq {link} ? [file readlink {", argv0, "}] : {", argv0 ,"}} ] ] tolbase.tcl", NULL );
     Tcl_Obj *objPath = Tcl_GetObjResult( interp );
     Tcl_SetStartupScript( Tcl_GetObjResult( interp ), NULL ); 

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);