Changeset 96c5cb in git for libpolys

Timestamp:

Jun 21, 2013, 7:26:52 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

00efe139bd160effd51e7ad222f0894fdb70f0ce

Parents:

95330f405fec0ba5de9b3943ba3ff73c15feda4e

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-06-21 19:26:52+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2013-06-21 19:28:09+02:00

Message:

chg: search p_Procs in %P and %b/MOD, report last try on failure

File:

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

libpolys/polys/mod_raw.cc

@@ -60 +60 @@
 {
   void* handle = NULL;
-  const char* bin_dir = feGetResource('b');
-  if (bin_dir != NULL)
-  {
-    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);
+  const char* proc_dir = feGetResource('P');
+  char* binary_name_so=NULL;
+  if (proc_dir != NULL)
+  {
+    const int binary_name_so_length = 3 + strlen(DL_TAIL) + strlen(binary_name) + strlen(DIR_SEPP) + strlen(proc_dir);
+    binary_name_so = (char *)omAlloc0( binary_name_so_length * sizeof(char) );
+    snprintf(binary_name_so, binary_name_so_length, "%s%s%s%s", proc_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);
+  }
+
+  if (handle == NULL ) // bin_dir must always be !=NULL
+  {
+    const char* bin_dir = feGetResource('b');
+    if (binary_name_so!=NULL) omFree(binary_name_so);
+    const int binary_name_so_length = 6 + strlen(DL_TAIL) 
+               + strlen(binary_name)
+               +strlen(DIR_SEPP)*2
+               +strlen(bin_dir);
+    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,"MOD",DIR_SEPP,binary_name, DL_TAIL);
     handle = dynl_open(binary_name_so);
 
-    omFree((ADDRESS)binary_name_so );
   }
 
   if (handle == NULL && ! warn_handle)
   {
-      Warn("Could not find dynamic library: %s%s", binary_name, DL_TAIL);
+      Warn("Could not find dynamic library: %s%s (tried %s)",
+              binary_name, DL_TAIL,binary_name_so);
       Warn("Error message from system: %s", dynl_error());
       if (msg != NULL) Warn("%s", msg);
@@ -88 +93 @@
       warn_handle = TRUE;
   }
+  omfree((ADDRESS)binary_name_so );
 
   return  handle;