Changeset 171 in Sophya for trunk/SophyaPI/PIext/piacmd.cc

Timestamp:

Dec 21, 1998, 9:49:55 AM (27 years ago)

Author:

ercodmgr

Message:

Adaptation a PDynLinkMgr Reza 21/12/98

File:

• trunk/SophyaPI/PIext/piacmd.cc (modified) (8 diffs)

trunk/SophyaPI/PIext/piacmd.cc

@@ -2 +2 @@
 #include <stdlib.h>
 #include <math.h>
-
-#include <dlfcn.h>
 
 #include <iostream.h>
@@ -42 +40 @@
 else { mObjMgr = new NamedObjMgr;  mOmg = true; }
 mImgApp = app;
-char* varenv;
-TmpDir = "";
-if ( (varenv=getenv("PEIDA_TMP")) != NULL )  TmpDir = varenv; 
-else if ( (varenv=getenv("TMPDIR")) != NULL )  TmpDir = varenv; 
-int l = TmpDir.length();
-if ( (l>0) && (TmpDir[l-1] != '/') )  TmpDir += '/';
 system("cp history.pic hisold.pic");
 hist.open("history.pic");
 trace = false;   timing = false;
 gltimer = NULL;
-dlhandle = NULL;
+dynlink = NULL;
 }
 
@@ -605 +597 @@
                           string& func4, string& func5)
 {
-string fnamesol = TmpDir + "spiup.so"; 
 string cmd;
 int rc;
 
-if (dlhandle) dlclose(dlhandle);    dlhandle = NULL;
+if (dynlink) delete dynlink;    dynlink = NULL;
 usfmap.clear();
-cmd = "cp " + fnameso + " " + fnamesol;
-rc = system(cmd.c_str());
-if (rc != 0)  { cerr << "PIACmd::LinkUserFuncs() Error system(" << cmd << ") Rc= " << rc << endl; return(1); }
-
-dlhandle =  dlopen(fnamesol.c_str(), RTLD_NOW);
-if (dlhandle == NULL) { 
-  string sn = fnamesol; 
+
+dynlink = new PDynLinkMgr(fnameso, true);
+if (dynlink == NULL) { 
+  string sn = fnameso; 
   cerr << "PIACmd/LinkUserFuncs_Erreur: Erreur ouverture SO " << sn << endl; 
   sn = dlerror();
@@ -630 +618 @@
 if ((func1.length() < 1) || (func1 == "-") || (func1 == ".") )  goto fin;
 // f = (DlUserProcFunction)  dlsym(dlhandle, func1.c_str());
-f = (DlFunction)  dlsym(dlhandle, func1.c_str());
+f = dynlink->GetFunction(func1);
 if (f) { nok++;  usfmap[func1] = f; }
 else cerr << "PIACmd/LinkUserFuncs_Erreur: Erreur linking " << func1 << endl;
@@ -636 +624 @@
 if ((func2.length() < 1) || (func2 == "-") || (func2 == ".") )  goto fin;
 // f = (DlUserProcFunction)  dlsym(dlhandle, func2.c_str());
-f = (DlFunction)  dlsym(dlhandle, func2.c_str());
+f = dynlink->GetFunction(func2);
 if (f) { nok++;  usfmap[func2] = f; }
 else cerr << "PIACmd/LinkUserFuncs_Erreur: Erreur linking " << func2 << endl;
@@ -642 +630 @@
 if ((func3.length() < 1) || (func3 == "-") || (func3 == ".") )  goto fin;
 // f = (DlUserProcFunction)  dlsym(dlhandle, func3.c_str());
-f = (DlFunction)  dlsym(dlhandle, func3.c_str());
+f = dynlink->GetFunction(func3);
 if (f) { nok++;  usfmap[func3] = f; }
 else cerr << "PIACmd/LinkUserFuncs_Erreur: Erreur linking " << func3 << endl;
@@ -648 +636 @@
 if ((func4.length() < 1) || (func4 == "-") || (func4 == ".") )  goto fin;
 // f = (DlUserProcFunction)  dlsym(dlhandle, func4.c_str());
-f = (DlFunction)  dlsym(dlhandle, func4.c_str());
+f = dynlink->GetFunction(func4);
 if (f) { nok++;  usfmap[func4] = f; }
 else cerr << "PIACmd/LinkUserFuncs_Erreur: Erreur linking " << func4 << endl;
@@ -654 +642 @@
 if ((func5.length() < 1) || (func5 == "-") || (func5 == ".") )  goto fin;
 // f = (DlUserProcFunction)  dlsym(dlhandle, func5.c_str());
-f = (DlFunction)  dlsym(dlhandle, func5.c_str());
+f = dynlink->GetFunction(func5);
 if (f) { nok++;  usfmap[func5] = f; }
 else cerr << "PIACmd/LinkUserFuncs_Erreur: Erreur linking " << func5 << endl;
 
 fin:
-if (nok < 1) { dlclose(dlhandle);    dlhandle = NULL; return(3); }
+if (nok < 1) { if (dynlink) delete dynlink;    dynlink = NULL;  return(3); }
 else return(0);
 }