Changeset f9dc520 in git

Timestamp:

May 19, 2011, 12:48:24 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

2e91854ee11f07858653eb6c3ebda2393a158a47

Parents:

8d1a1ab92a3fa4bf30daf110a860313ccf3ef58c

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-19 12:48:24+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:12+01:00

Message:

ADD: search for dynamic modules within the usual search pathes
ADD: minor improvements to dynamic module loading routines

File:

• libpolys/polys/templates/mod_raw.cc (modified) (2 diffs)

libpolys/polys/templates/mod_raw.cc

@@ -21 +21 @@
 #include <misc/auxiliary.h>
 
-// #include <kernel/mod2.h>
-// #include <Singular/static.h>
+#include <omalloc/omalloc.h>
 
 #include <reporter/reporter.h>
@@ -131 +130 @@
   if (bin_dir != NULL)
   {
-    char path_name[MAXPATHLEN];
-    sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name,
-            DL_TAIL);
-    handle = dynl_open(path_name);
-    if (handle == NULL && ! warn_handle)
-    {
-      Warn("Could not open dynamic library: %s", path_name);
+    const int binary_name_so_length = 3 + strlen(DL_TAIL) + strlen(binary_name) + strlen(DIR_SEPP) + strlen(bin_dir);
+    char* binary_name_so = (char *)omAlloc0( binary_name_so_length * sizeof(char) );
+    snprintf(binary_name_so, binary_name_so_length, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name, DL_TAIL);
+    handle = dynl_open(binary_name_so);
+    omFreeSize((ADDRESS)binary_name_so, binary_name_so_length * sizeof(char) );
+  }
+
+  if (handle == NULL )
+  {
+    const int binary_name_so_length = 3 + strlen(DL_TAIL) + strlen(binary_name);
+    char* binary_name_so = (char *)omAlloc0( binary_name_so_length * sizeof(char) );
+    snprintf(binary_name_so, binary_name_so_length, "%s.%s", binary_name, DL_TAIL);
+
+    char* pp = (char *)omAlloc0( MAXPATHLEN * sizeof(char) );
+    lib_types type = type_of_LIB( binary_name_so, pp );
+    omFreeSize((ADDRESS)binary_name_so, binary_name_so_length * sizeof(char) );
+
+    if( type == LT_ELF || type == LT_HPUX || type == LT_MACH_O )
+      handle = dynl_open(pp);
+
+    omFreeSize((ADDRESS)pp, MAXPATHLEN * sizeof(char) );
+  }
+
+  if (handle == NULL && ! warn_handle)
+  {
+      Warn("Could not find dynamic library: %s.%s", binary_name, DL_TAIL);
       Warn("Error message from system: %s", dynl_error());
       if (msg != NULL) Warn("%s", msg);
       Warn("See the INSTALL section in the Singular manual for details.");
       warn_handle = TRUE;
-    }
-  }
+  }
+
   return  handle;
 }