Changeset 490da83 in tol for tol/contrib/cint/tolCint.cpp

Timestamp:

Jan 18, 2011, 10:48:14 AM (16 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

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

Children:

fc77a9b

Parents:

a3ef643

Message:

Fixes #1056
Initializing libltdl
Checking result of lt_dlsym due to lt_dlopen seems to return invalid an pointer when archive is not found

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

File:

• tol/contrib/cint/tolCint.cpp (modified) (3 diffs)

tol/contrib/cint/tolCint.cpp

@@ -31 +31 @@
 #include <tol/tol_bsetgra.h>
 #include <ltdl.h>
+
+static int  lt_dlinit_ =  -1;
 
 typedef void      (*G__scratch_all_t)        (void);
@@ -68 +70 @@
 //--------------------------------------------------------------------
 {
+  if(lt_dlinit_) 
+  { lt_dlinit_ = lt_dlinit(); }
   BText libraryName = "libcint";  
   BText libraryPath = "";
@@ -76 +80 @@
   #endif 
 
-  lt_dlhandle handleLib;
+  lt_dlhandle handleLib=0;
 
   // abro la DynLib
   handleLib = lt_dlopen( libraryPath );
+  BText reason( lt_dlerror( ) );
   if ( !handleLib ) 
   {
   //Std(BText("\nTRACE BLoadDynLib::Evaluator 3 lt_dlerror='")+lt_dlerror()+"'");
-    BText reason( lt_dlerror( ) );
     Warning(BText("[Cint_dynamic_linkage(\"")+libraryPath+"\")]"+" \n"
     "  lt_dlopen error:'"+reason+"'");
     return(false);
   } 
+  G__init_cint_ptr = reinterpret_cast<G__init_cint_t>( lt_dlsym( handleLib, "G__init_cint" ) );
+  if(!G__init_cint_ptr)
+  {
+    Warning(BText("[Cint_dynamic_linkage(\"")+libraryPath+"\")]"+" \n"
+    "  lt_dlopen error:'"+reason+"'");
+    return(false);     
+  }
   G__scratch_all_ptr = reinterpret_cast<G__scratch_all_t>( lt_dlsym( handleLib, "G__scratch_all" ) );
   G__lasterror_filename_ptr = reinterpret_cast<G__lasterror_filename_t>( lt_dlsym( handleLib, "G__lasterror_filename" ) );
   G__lasterror_linenum_ptr = reinterpret_cast<G__lasterror_linenum_t>( lt_dlsym( handleLib, "G__lasterror_linenum" ) );
-  G__init_cint_ptr = reinterpret_cast<G__init_cint_t>( lt_dlsym( handleLib, "G__init_cint" ) );
   G__set_errmsgcallback_ptr = reinterpret_cast<G__set_errmsgcallback_t>( lt_dlsym( handleLib, "G__set_errmsgcallback" ) );
   G__setautoconsole_ptr = reinterpret_cast<G__setautoconsole_t>( lt_dlsym( handleLib, "G__setautoconsole" ) );