Use oa_getenv function.

9 files changed, 17 insertions, 17 deletions

diff --git a/src/hyper/addfile.c b/src/hyper/addfile.c
index 7b6121b5..7fcbeae3 100644
--- a/src/hyper/addfile.c
+++ b/src/hyper/addfile.c
@@ -149,11 +149,11 @@ build_ht_filename(char *fname, char *aname, char *name)
         return oa_access_file_for_read(fname);
     }
     else {/** If not I am going to have to append path names to it **/
-        HTPATH = (char *) getenv("HTPATH");
+        HTPATH = oa_getenv("HTPATH");
         if (HTPATH == NULL) {
         /** The user does not have a HTPATH, so I will use the the directory
         $AXIOM/share/hypertex/pages/ as the default path ***/
-          char *spad = (char *) getenv("AXIOM");
+          char *spad = oa_getenv("AXIOM");
           if (spad == NULL) {
             fprintf(stderr,
             "ht_file_open:Cannot find ht data base: setenv HTPATH or AXIOM\n");
@@ -257,9 +257,9 @@ db_file_open(char *db_file)
      */
 /*    fprintf(stderr,"addfile:db_file_open: entered db_file=%s\n",db_file);*/
     if (gDatabasePath == NULL) {
-        gDatabasePath = (char *) getenv("HTPATH");
+        gDatabasePath = oa_getenv("HTPATH");
         if (gDatabasePath == NULL) {
-            spad = (char *) getenv("AXIOM");
+            spad = oa_getenv("AXIOM");
             if (spad == NULL) {
 /*                fprintf(stderr,
                    "addfile:db_file_open: Cannot find ht data base path:\n");*/
diff --git a/src/hyper/extent2.c b/src/hyper/extent2.c
index ced4156b..a315fd11 100644
--- a/src/hyper/extent2.c
+++ b/src/hyper/extent2.c
@@ -840,7 +840,7 @@ insert_bitmap_file(TextNode * node)
     if (node->image.pm == 0) {
         if (
         ((image = (ImageStruct *) hash_find(&gImageHashTable, filename)) == NULL)
-            || (getenv("HTCACHE"))) {
+            || (oa_getenv("HTCACHE"))) {
 
             /*
              * read the bitmap if not already in memory or if the environment
diff --git a/src/hyper/htadd.c b/src/hyper/htadd.c
index 4e122e45..62f7cd7c 100644
--- a/src/hyper/htadd.c
+++ b/src/hyper/htadd.c
@@ -185,7 +185,7 @@ build_db_filename(short flag, char *db_dir, char *dbfilename)
 
 
     if (flag & System) {
-        SPAD = (char *) getenv("AXIOM");
+        SPAD = oa_getenv("AXIOM");
         if (SPAD == NULL) {
             fprintf(stderr,
                     "build_db_filename: cannot find system root directory\n");
diff --git a/src/hyper/htinp.c b/src/hyper/htinp.c
index 49520641..c1970572 100644
--- a/src/hyper/htinp.c
+++ b/src/hyper/htinp.c
@@ -434,7 +434,7 @@ send_command(char *command,int com_type)
         FILE *f;
         char name[512], str[512]/*, *c*/;
 
-        sprintf(name, "/tmp/hyper%s.input", getenv("SPADNUM"));
+        sprintf(name, "/tmp/hyper%s.input", oa_getenv("SPADNUM"));
         f = fopen(name, "w");
         if (f == NULL) {
             fprintf(stderr, "Can't open temporary input file %s\n", name);
diff --git a/src/hyper/initx.c b/src/hyper/initx.c
index d2464652..2a4eef9a 100644
--- a/src/hyper/initx.c
+++ b/src/hyper/initx.c
@@ -964,23 +964,23 @@ mergeDatabases(void)
         serverDB = XrmGetStringDatabase(XResourceManagerString(gXDisplay));
     }
     else {
-        (void) strcpy(filename, getenv("HOME"));
+        (void) strcpy(filename, oa_getenv("HOME"));
         (void) strcat(filename, "/.Xdefaults");
 /*        fprintf(stderr,"initx:mergeDatabases:XrmGetFileDatase\n");*/
         serverDB = XrmGetFileDatabase(filename);
     }
 /*    fprintf(stderr,"initx:mergeDatabases:XrmMergeDatabases 2\n");*/
     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"));
     }
 /*    fprintf(stderr,"initx:mergeDatabases:filename=%s\n",filename);*/
     homeDB = XrmGetFileDatabase(filename);
diff --git a/src/hyper/lex.c b/src/hyper/lex.c
index 0db4a7ee..0142fd25 100644
--- a/src/hyper/lex.c
+++ b/src/hyper/lex.c
@@ -249,8 +249,8 @@ parser_init(void)
 void
 init_scanner(void)
 {
-    if (getenv("HTASCII")) {
-        useAscii = (strcmp(getenv("HTASCII"), "yes") == 0);
+    if (oa_getenv("HTASCII")) {
+        useAscii = (strcmp(oa_getenv("HTASCII"), "yes") == 0);
     }
     else {
         if(gTtFontIs850==1) useAscii = 0;
diff --git a/src/hyper/parse-types.c b/src/hyper/parse-types.c
index 986df978..44227441 100644
--- a/src/hyper/parse-types.c
+++ b/src/hyper/parse-types.c
@@ -612,7 +612,7 @@ parse_env(TextNode *node)
 
     get_expected_token(openaxiom_Lbrace_token);
     get_expected_token(openaxiom_Word_token);
-    env = getenv(token.id);
+    env = oa_getenv(token.id);
 
     if (env == NULL) {
         /** The environment variable was not found **/
diff --git a/src/hyper/spadint.c b/src/hyper/spadint.c
index 9541350c..fb1189ab 100644
--- a/src/hyper/spadint.c
+++ b/src/hyper/spadint.c
@@ -134,7 +134,7 @@ send_pile(openaxiom_sio *sock,char * str)
     FILE *f;
     char name[512], command[512];
 
-    sprintf(name, "/tmp/hyper%s.input", getenv("SPADNUM"));
+    sprintf(name, "/tmp/hyper%s.input", oa_getenv("SPADNUM"));
     f = fopen(name, "w");
     if (f == NULL) {
         fprintf(stderr, "Can't open temporary input file %s\n", name);
@@ -211,7 +211,7 @@ start_user_buffer(HyperDocPage *page)
     char complfile[250];
     int ret_val;
 
-    SPAD = (char *) getenv("AXIOM");
+    SPAD = (char *) oa_getenv("AXIOM");
     if (SPAD == NULL) {
         sprintf(SPAD, "/spad/mnt/rios");
     }
diff --git a/src/hyper/titlebar.c b/src/hyper/titlebar.c
index 0768ba8c..2da6716e 100644
--- a/src/hyper/titlebar.c
+++ b/src/hyper/titlebar.c
@@ -307,7 +307,7 @@ readTitleBarImages(void)
     char filename[128];
     char *axiomEnvVar = NULL;
 
-    axiomEnvVar = getenv("AXIOM");
+    axiomEnvVar = oa_getenv("AXIOM");
 
     if (axiomEnvVar)
         sprintf(filename, "%s/share/hypertex/bitmaps/%s", axiomEnvVar, tw1file);