Use oa_getenv function.

4 files changed, 7 insertions, 7 deletions

diff --git a/src/lib/cfuns-c.c b/src/lib/cfuns-c.c
index 88a24d47..ff5b5966 100644
--- a/src/lib/cfuns-c.c
+++ b/src/lib/cfuns-c.c
@@ -82,7 +82,7 @@ addtopath(char *dir)
 {
     char *path, *newpath;
 
-    path = getenv("PATH");
+    path = oa_getenv("PATH");
     if (path == NULL)
         return -1;
 
@@ -312,7 +312,7 @@ copyEnvValue(char *varName, char *buffer)
 {
     char *s;
 
-    s = getenv(varName);
+    s = oa_getenv(varName);
     if (s == NULL)
         return 0;
     strcpy(buffer, s);
diff --git a/src/lib/cursor.c b/src/lib/cursor.c
index 4038133d..c63f738d 100644
--- a/src/lib/cursor.c
+++ b/src/lib/cursor.c
@@ -61,7 +61,7 @@ Cursor_shape(int shape)
     struct hftgetid hftgid;
     char *termVal;
 
-    termVal = (char *) getenv("TERM");
+    termVal = oa_getenv("TERM");
     if (strcmp("hft", termVal) && strncmp("aixterm", termVal, 7))
         return;
 
diff --git a/src/lib/fnct_key.c b/src/lib/fnct_key.c
index e130ad81..29b5ab55 100644
--- a/src/lib/fnct_key.c
+++ b/src/lib/fnct_key.c
@@ -108,7 +108,7 @@ define_function_keys(void)
     for (key = 0; key < 13; key++)
         (function_key[key]).str = NULL;
     /** see if the user has a .clef file       ***/
-    HOME = getenv("HOME");
+    HOME = oa_getenv("HOME");
     sprintf(path, "%s/.clef", HOME);
     if ((fd = open(path, O_RDONLY)) == -1) {
         return;
diff --git a/src/lib/sockio-c.c b/src/lib/sockio-c.c
index bec55d9a..c53d3981 100644
--- a/src/lib/sockio-c.c
+++ b/src/lib/sockio-c.c
@@ -1099,7 +1099,7 @@ make_server_name(char *name, const char* base)
     sprintf(name, "%s%d", base, spad_server_number);
     return 0;
   }
-  num = getenv("SPADNUM");
+  num = oa_getenv("SPADNUM");
   if (num == NULL) {
 /*    fprintf(stderr,
       "\n(AXIOM Sockets) The AXIOM server number is undefined.\n");
@@ -1170,7 +1170,7 @@ open_server(const char* server_name)
     FD_SET(server[1].socket, &server_mask);
     listen(server[1].socket, 5);
   }
-  s = getenv("SPADSERVER");
+  s = oa_getenv("SPADSERVER");
   if (s == NULL) {
 /*    fprintf(stderr, "Not a spad server system\n"); */
     return -1;
@@ -1226,7 +1226,7 @@ sock_accept_connection(int purpose)
 {
   fd_set rd;
   int ret_val, i, p;
-  if (getenv("SPADNUM") == NULL) return -1;
+  if (oa_getenv("SPADNUM") == NULL) return -1;
   while (1) {
     rd = server_mask;
     ret_val = sselect(FD_SETSIZE, (fd_set *)&rd, (fd_set *)0, (fd_set *)0, NULL);