Changeset c31a71 in git for Singular

Timestamp:

Dec 2, 2021, 3:25:27 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

273a2f1fd6fae79d6cfdd19dacabce628fa15ee6

Parents:

b67904c91e15359f47b0d5e377ffe945a966c8ff

Message:

chg: system("SingularBin") ends with /

Location:

Singular

Files:

• LIB/intprog.lib (modified) (5 diffs)
• LIB/toric.lib (modified) (4 diffs)
• extra.cc (modified) (2 diffs)

Singular/LIB/intprog.lib

@@ -1 +1 @@
 //////////////////////////////////////////////////////////////////////////////
-version="version intprog.lib 4.2.1.0 Nov_2021 "; // $Id$
+version="version intprog.lib 4.2.1.2 Nov_2021 "; // $Id$
 category="Commutative Algebra";
 info="
@@ -96 +96 @@
 
   // call external program
-  int dummy=system("sh",system("SingularBin")+"/solve_IP -alg "+alg+" "+matrixfile+" "+problemfile);
+  int dummy=system("sh",system("SingularBin")+"solve_IP -alg "+alg+" "+matrixfile+" "+problemfile);
 
   // read solution from created file
@@ -259 +259 @@
 
   // call external program
-  int dummy=system("sh",system("SingularBin")+"/solve_IP -alg "+alg+" "+matrixfile+" "+problemfile);
+  int dummy=system("sh",system("SingularBin")+"solve_IP -alg "+alg+" "+matrixfile+" "+problemfile);
 
   // read solution from created file
@@ -406 +406 @@
 
   // call external program
-  int dummy=system("sh",system("SingularBin")+"/solve_IP -alg "+alg+" "+matrixfile+" "+problemfile);
+  int dummy=system("sh",system("SingularBin")+"solve_IP -alg "+alg+" "+matrixfile+" "+problemfile);
 
   // read solution from created file
@@ -552 +552 @@
 
   // call external program
-  int dummy=system("sh",system("SingularBin")+"/solve_IP -alg "+alg+" "+matrixfile+" "+problemfile);
+  int dummy=system("sh",system("SingularBin")+"solve_IP -alg "+alg+" "+matrixfile+" "+problemfile);
 
   // read solution from created file

Singular/LIB/toric.lib

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////
-version="version toric.lib 4.2.1.0 Nov_2021 "; // $Id$
+version="version toric.lib 4.2.1.2 Nov_2021 "; // $Id$
 category="Commutative Algebra";
 info="
@@ -274 +274 @@
 
   // call external program
-  dummy=system("sh",system("SingularBin")+"/toric_ideal -alg "+alg+" "+matrixfile);
+  dummy=system("sh",system("SingularBin")+"toric_ideal -alg "+alg+" "+matrixfile);
   if (dummy!=0) { ERROR("toric_ideal failed with error code "+string(dummy)); }
 
@@ -587 +587 @@
 
   // call external program
-  dummy=system("sh",system("SingularBin")+"/toric_ideal -alg "+alg+" "+matrixfile);
+  dummy=system("sh",system("SingularBin")+"toric_ideal -alg "+alg+" "+matrixfile);
   if (dummy!=0) { ERROR("toric_ideal failed with error code "+string(dummy)); }
 
@@ -1000 +1000 @@
 
   // call external program
-  dummy=system("sh",system("SingularBin")+"/change_cost "+groebnerfile+" "+newcostfile);
+  dummy=system("sh",system("SingularBin")+"change_cost "+groebnerfile+" "+newcostfile);
   if (dummy!=0) { ERROR("change_cost failed with error code "+string(dummy)); }
 

Singular/extra.cc

@@ -663 +663 @@
       if (r == NULL) r="/usr/local";
       int l=strlen(r);
+      /* where to find Singular's programs: */
+      #define SINGULAR_PROCS_DIR "/libexec/singular/MOD"
+      int ll=si_max(strlen(SINGULAR_PROCS_DIR),strlen(LIBEXEC_DIR));
+      char *s=(char*)omAlloc(l+ll+2);
       if ((strstr(r,".libs/..")==NULL)   /*not installed Singular (libtool)*/
       &&(strstr(r,"Singular/..")==NULL)) /*not installed Singular (static)*/
       {
-        /* where to find Singular's programs: */
-        #define SINGULAR_PROCS_DIR "/libexec/singular/MOD"
-        char *s=(char*)omAlloc(l+strlen(SINGULAR_PROCS_DIR)+1);
         strcpy(s,r);
         strcat(s,SINGULAR_PROCS_DIR);
         if (access(s,X_OK)==0)
-          res->data = (void*)s;
+        {
+          strcat(s,"/");
+        }
         else
         {
           /*second try: LIBEXEC_DIR*/
-          omFree(s); s=omStrDup(LIBEXEC_DIR);
+          strcpy(s,LIBEXEC_DIR);
           if (access(s,X_OK)==0)
-            res->data = (void*)s;
+          {
+            strcat(s,"/");
+          }
           else
           {
             s[0]='\0';
-            res->data = (void*)s;
           }
         }
@@ -689 +693 @@
       {
         const char *r=feResource('b');
-        if (r == NULL) r="";
-        res->data = (void*) omStrDup( r );
-      }
+        if (r == NULL)
+        {
+          s[0]='\0';
+        }
+        else
+        {
+          strcpy(s,r);
+          strcat(s,"/");
+        }
+      }
+      res->data = (void*)s;
       return FALSE;
     }