Changeset a00aa7 in git for Singular/extra.cc

Timestamp:

Nov 10, 2021, 2:54:38 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

8ad2935b9f03ca7820942e4018d26497779d34e5

Parents:

314f6db51fc43d6de9f441fe21423a1b4513303d

Message:

move setting PATH to system("sh",..)

File:

• Singular/extra.cc (modified) (5 diffs)

Singular/extra.cc

@@ -14 +14 @@
 #include "misc/sirandom.h"
 #include "resources/omFindExec.h"
+
+#ifdef AIX_4
+#ifndef HAVE_PUTENV
+#define HAVE_PUTENV 1
+#endif
+#endif
+
+#if defined(HPUX_10) || defined(HPUX_9)
+#ifndef HAVE_SETENV
+extern "C" int setenv(const char *name, const char *value, int overwrite);
+#endif
+#endif
 
 #ifdef HAVE_CCLUSTER
@@ -481 +493 @@
         return TRUE;
       }
+      #if defined(HAVE_SETENV) || defined(HAVE_PUTENV)
+      char* path = feResource('p');
+      char *oldpath= getenv("PATH");
+      if (oldpath!=NULL) oldpath=omStrDup(oldpath);
+      #ifdef HAVE_PUTENV
+      if (path != NULL)
+      {
+        char *s=(char *)malloc(strlen(path)+6);
+                      sprintf(s,"PATH=%s",path);
+                      putenv(s);
+      }
+      #else
+      if (path != NULL) setenv("PATH", path, 1);
+      #endif
+      #endif
+
       res->rtyp=INT_CMD;
       if (h==NULL) res->data = (void *)(long) system("sh");
@@ -487 +515 @@
       else
         WerrorS("string expected");
+
+      #if defined(HAVE_SETENV) || defined(HAVE_PUTENV)
+      #ifdef HAVE_PUTENV
+      if (oldpath != NULL)
+      {
+        char *s=(char *)malloc(strlen(oldpath)+6);
+                      sprintf(s,"PATH=%s",oldpath);
+                      putenv(s);
+                      omFree(oldpath);
+      }
+      #else
+      if (oldpath != NULL)
+      {
+        setenv("PATH", oldpath, 1);
+        omFree(oldpath);
+      }
+      #endif
+      #endif
       return FALSE;
     }
@@ -3235 +3281 @@
           if (strcmp(s,"FLINT_P")==0) { if (d) On(SW_USE_FL_GCD_P); else Off(SW_USE_FL_GCD_P); } else
           if (strcmp(s,"FLINT_0")==0) { if (d) On(SW_USE_FL_GCD_0); else Off(SW_USE_FL_GCD_0); } else
-        #endif  
+        #endif
           if (strcmp(s,"EZGCD")==0) { if (d) On(SW_USE_EZGCD); else Off(SW_USE_EZGCD); } else
           if (strcmp(s,"EZGCD_P")==0) { if (d) On(SW_USE_EZGCD_P); else Off(SW_USE_EZGCD_P); } else
@@ -3740 +3786 @@
     if(strcmp(sys_cmd,"ccluster")==0)
     {
-      if ((currRing!=NULL) 
+      if ((currRing!=NULL)
       && (rField_is_Q(currRing) || rField_is_R(currRing) || rField_is_long_R(currRing)))
       {