Use oa_getenv function.

8 files changed, 17 insertions, 17 deletions

diff --git a/src/graph/Gdraws/Gfun.c b/src/graph/Gdraws/Gfun.c
index db2f4f7f..117ebbda 100644
--- a/src/graph/Gdraws/Gfun.c
+++ b/src/graph/Gdraws/Gfun.c
@@ -692,7 +692,7 @@ PSGlobalInit(void)
 
   /* path specific file names */
 
-  if ((envAXIOM = getenv("DEVE")) != NULL) {  /* get env var AXIOM */
+  if ((envAXIOM = oa_getenv("DEVE")) != NULL) {  /* get env var AXIOM */
 
     psData[headerps].flag = yes;
     sprintf(psData[headerps].filename, "%s%s", envAXIOM, "/Gdraws/PS/header.ps");
@@ -728,7 +728,7 @@ PSGlobalInit(void)
     sprintf(psData[setupps].filename, "%s%s", envAXIOM, "/Gdraws/PS/setup.ps");
     sprintf(psData[endps].filename, "%s%s", envAXIOM, "/Gdraws/PS/end.ps");
   }
-  else if ((envAXIOM = getenv("AXIOM")) != NULL) {
+  else if ((envAXIOM = oa_getenv("AXIOM")) != NULL) {
     psData[headerps].flag = yes;
     sprintf(psData[headerps].filename, "%s%s", envAXIOM,
             "/lib/graph/header.ps");
diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c
index 94cd1015..beb6e602 100644
--- a/src/graph/view2D/main2d.c
+++ b/src/graph/view2D/main2d.c
@@ -163,7 +163,7 @@ main(void)
 
 
   /**** Set up display ****/
-  if ((dsply = XOpenDisplay(getenv("DISPLAY"))) == NULL)
+  if ((dsply = XOpenDisplay(oa_getenv("DISPLAY"))) == NULL)
     fprintf(stderr,"Could not open the display.\n");
   scrn  = DefaultScreen(dsply);
   rtWindow  = RootWindow(dsply,scrn);
@@ -473,20 +473,20 @@ mergeDatabases(void)
   if (XResourceManagerString(dsply) != NULL)
     serverDB = XrmGetStringDatabase(XResourceManagerString(dsply));
   else {
-    (void) strcpy(filename,getenv("HOME"));
+    (void) strcpy(filename,oa_getenv("HOME"));
     (void) strcat(filename,"/.Xdefaults");
     serverDB = XrmGetFileDatabase(filename);
   }
   XrmMergeDatabases(serverDB,&rDB);
-  if ( getenv ("XENVIRONMENT") == NULL) {
+  if ( oa_getenv ("XENVIRONMENT") == NULL) {
     int len;
-    (void) strcpy(filename,getenv("HOME"));
+    (void) strcpy(filename,oa_getenv("HOME"));
     (void) strcat(filename,"/.Xdefaults-");
     len = strlen(filename);
     (void) gethostname(filename+len,1024-len);
   }
   else 
-    (void) strcpy (filename,getenv ("XENVIRONMENT"));
+    (void) strcpy (filename,oa_getenv ("XENVIRONMENT"));
   
   homeDB = XrmGetFileDatabase(filename);
   XrmMergeDatabases(homeDB,&rDB);
diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c
index 8421e35f..4197daf6 100644
--- a/src/graph/view3D/main3d.c
+++ b/src/graph/view3D/main3d.c
@@ -263,7 +263,7 @@ main(void)
   splitPoints = NIL(viewTriple);
 
   /**** Set up display ****/
-  if ((dsply = XOpenDisplay(getenv("DISPLAY"))) == NULL)
+  if ((dsply = XOpenDisplay(oa_getenv("DISPLAY"))) == NULL)
     {fprintf(stderr,"Could not open display.\n");exit (-1);}
   scrn = DefaultScreen(dsply);
   rtWindow = RootWindow(dsply,scrn);
@@ -612,14 +612,14 @@ mergeDatabases(void)
     serverDB = XrmGetStringDatabase(XResourceManagerString(dsply));
   }
   else {
-    (void) strcpy(filename,getenv("HOME"));
+    (void) strcpy(filename,oa_getenv("HOME"));
     (void) strcat(filename,"/.Xdefaults");
     serverDB = XrmGetFileDatabase(filename);
   }
   XrmMergeDatabases(serverDB,&rDB);
-  if ( getenv ("XENVIRONMENT") == NULL) {
+  if ( oa_getenv ("XENVIRONMENT") == NULL) {
     int len;
-    (void) strcpy(filename,getenv("HOME"));
+    (void) strcpy(filename,oa_getenv("HOME"));
     (void) strcat(filename,"/.Xdefaults-");
     len = strlen(filename);
 
@@ -627,7 +627,7 @@ mergeDatabases(void)
 
   }
   else {
-    (void) strcpy (filename,getenv ("XENVIRONMENT"));
+    (void) strcpy (filename,oa_getenv ("XENVIRONMENT"));
   }
   homeDB = XrmGetFileDatabase(filename);
   XrmMergeDatabases(homeDB,&rDB);
diff --git a/src/graph/view3D/testcol.c b/src/graph/view3D/testcol.c
index 9638ad69..b73337e0 100644
--- a/src/graph/view3D/testcol.c
+++ b/src/graph/view3D/testcol.c
@@ -268,7 +268,7 @@ main(void)
   splitPoints = NIL(viewTriple);
 
   /**** Set up display ****/
-  if ((dsply = XOpenDisplay(getenv("DISPLAY"))) == NULL)
+  if ((dsply = XOpenDisplay(oa_getenv("DISPLAY"))) == NULL)
     {fprintf(stderr,"Could not open display.\n");exit (-1);}
   scrn = DefaultScreen(dsply);
   rtWindow = RootWindow(dsply,scrn);
diff --git a/src/graph/viewAlone/spoon2D.c b/src/graph/viewAlone/spoon2D.c
index c50e4ba3..9ad458d8 100644
--- a/src/graph/viewAlone/spoon2D.c
+++ b/src/graph/viewAlone/spoon2D.c
@@ -81,7 +81,7 @@ spoonView2D(void)
     close(pipe1[1]);
     printf("(spoon2D child) start the TwoDimensionalViewport process\n");
     sprintf(errorStr,"%s","(viewAlone) execution of the TwoDimensionalViewport process");
-    sprintf(envAXIOM,"%s",getenv("AXIOM"));
+    sprintf(envAXIOM,"%s",oa_getenv("AXIOM"));
     sprintf(runView,"%s%s",envAXIOM,"/lib/view2D");
     check(execl(runView,runView,NULL));
     fprintf(stderr,"Could not execute view2D! Check that view2D is on your path variable.\n");
diff --git a/src/graph/viewAlone/spoonComp.c b/src/graph/viewAlone/spoonComp.c
index 92902443..3c828a44 100644
--- a/src/graph/viewAlone/spoonComp.c
+++ b/src/graph/viewAlone/spoonComp.c
@@ -83,7 +83,7 @@ spoonView3D(int type)
     
     sprintf(errorStr,"%s",
             "(viewAlone) execution of the ThreeDimensionalViewport process");
-    sprintf(envAXIOM,"%s",getenv("AXIOM"));
+    sprintf(envAXIOM,"%s",oa_getenv("AXIOM"));
     sprintf(runView,"%s%s",envAXIOM,"/lib/view3D");
     check(execl(runView,runView,NULL));
     fprintf(stderr,"Could not execute view3D!\n");
diff --git a/src/graph/viewman/fun2D.c b/src/graph/viewman/fun2D.c
index dd98f836..ed49772f 100644
--- a/src/graph/viewman/fun2D.c
+++ b/src/graph/viewman/fun2D.c
@@ -219,7 +219,7 @@ forkView2D(void)
 #ifdef DEBUG
     fprintf(stderr,"Executing TwoDimensionalViewport process\n");
 #endif
-    sprintf(envAXIOM,"%s",getenv("AXIOM"));
+    sprintf(envAXIOM,"%s",oa_getenv("AXIOM"));
     sprintf(runView,"%s%s",envAXIOM,"/lib/view2D");
     check(execl(runView,runView,NULL));
     fprintf(stderr,"The viewport manager could not execute view2D.\nCheck that view2D is on your PATH.\n");
diff --git a/src/graph/viewman/fun3D.c b/src/graph/viewman/fun3D.c
index f6f4cd23..638641e9 100644
--- a/src/graph/viewman/fun3D.c
+++ b/src/graph/viewman/fun3D.c
@@ -271,7 +271,7 @@ forkView3D(int typeOfViewport)
 #ifdef DEBUG
     fprintf(stderr,"Executing ThreeDimensionalViewport process\n");
 #endif
-    sprintf(envAXIOM,"%s",getenv("AXIOM"));
+    sprintf(envAXIOM,"%s",oa_getenv("AXIOM"));
     sprintf(runView,"%s%s",envAXIOM,"/lib/view3D");
     check(execl(runView,runView,NULL));
     fprintf(stderr,"The viewport manager could not execute view3D.\nCheck that view3D is on your PATH.\n");