Changeset 4a600df in tol

Timestamp:

Jun 19, 2015, 11:07:45 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

2bec99e

Parents:

64eb621

Message:

Refs #1851
Se modifica LoadDynLib de modo que el directorio utilizado por defecto para la carga de la librería sea su propio directorio y no el directorio de trabajo actual en ese momento (cwd).

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

File:

• tol/LoadDynLib/LoadDynLib.cpp (modified) (5 diffs)

tol/LoadDynLib/LoadDynLib.cpp

@@ -82 +82 @@
   "(Text libraryPath [, Text libraryName])",
   I2("Link a dynamic library without TOL built-in functions.",
-     "Enlaca una librería dinámica sin funciones TOL nativas."),
+     "Enlaza una librería dinámica sin funciones TOL nativas."),
      BOperClassify::Statistic_);
   void BDatLoadDynLib::CalcContens()
@@ -98 +98 @@
   BUserNameBlock* unb = NULL;
 
+  // se cambia el directorio de trabajo (cwd) inicial
+  BText currentDir = BDir::GetCurrent();
+  BDir::ChangeCurrent(GetFilePath(libraryPath));
+
   lt_dlhandle handleLib;
 
   // abro la DynLib
   handleLib = lt_dlopen( libraryPath );
+  
+  // se retorna al directorio de trabajo (cwd) inicial
+  BDir::ChangeCurrent(currentDir);
+
   if ( !handleLib ) 
   {
@@ -125 +133 @@
     "(Text libraryPath [, Text libraryName])",
     I2("Returns a NameBlock that contains methods and members written "
-    "in C + + in a precompiled library for dynamic linking. Once "
+    "in C++ in a precompiled library for dynamic linking. Once "
     "loaded Nameblock is nothing particular and can be used like "
     "any other object created with language TOL. See more details on ",
@@ -153 +161 @@
 //Std(BText("\nTRACE BLoadDynLib::Evaluator 1 libraryPath=")+libraryPath);
 //Std(BText("\nTRACE BLoadDynLib::Evaluator 2 libraryName=")+libraryName);
+
   BUserNameBlock* unb = NULL;
+
+  // se cambia el directorio de trabajo (cwd) inicial
+  BText currentDir = BDir::GetCurrent();
+  BDir::ChangeCurrent(GetFilePath(libraryPath));
 
   lt_dlhandle handleLib;
@@ -159 +172 @@
   // abro la DynLib
   handleLib = lt_dlopen( libraryPath );
+
+  // se retorna al directorio de trabajo (cwd) inicial
+  BDir::ChangeCurrent(currentDir);
+
   if ( !handleLib ) 
   {