Changeset 3fa147 in git

Timestamp:

Jun 24, 2013, 1:38:03 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

76cb29329cf9c597efb9f374ef85102e852c4ee4

Parents:

00efe139bd160effd51e7ad222f0894fdb70f0ce

Message:

fix: path for p_Procs: now relativ to %b

Files:

• libpolys/polys/mod_raw.cc (modified) (1 diff)
• resources/feResource.cc (modified) (1 diff)

libpolys/polys/mod_raw.cc

@@ -60 +60 @@
 {
   void* handle = NULL;
-  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);
-  }
-
-  if (handle == NULL ) // bin_dir must always be !=NULL
+
+  // try %b/MOD first
   {
     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) 
+    const int binary_name_so_length = 6 + strlen(DL_TAIL)
                + strlen(binary_name)
                +strlen(DIR_SEPP)*2
-               +strlen(bin_dir);
+               +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);
+    snprintf(binary_name_so, binary_name_so_length, "%s%s%s%s%s%s", bin_dir, DIR_SEPP,"MOD",DIR_SEPP,binary_name, DL_TAIL);
     handle = dynl_open(binary_name_so);
 
+  }
+
+  // try P_PROCS_DIR (%P)
+  if (handle == NULL)
+  {
+    const char* proc_dir = feGetResource('P');
+    if (proc_dir != NULL)
+    {
+      if (binary_name_so!=NULL) omFree(binary_name_so);
+      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);
+    }
   }
 

resources/feResource.cc

@@ -81 +81 @@
   {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "",                  (char *)""},
   // should be changed to %b/../libexec/singular/pProcs/:
-  {"ProcDir",   'P',    feResDir,   "SINGULAR_PROCS_DIR",   "%d/libexec/singular/MOD/",                  (char *)""},
+  {"ProcDir",   'P',    feResDir,   "SINGULAR_PROCS_DIR",   "%r/libexec/singular/MOD/",                  (char *)""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
   {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share/",          (char *)""},