Changeset 16909

Timestamp:

2008-08-20T10:30:21+12:00 (16 years ago)

Author:

davidb

Message:

Switched from using setenv to putenv, as former doesn't appear to be part of Visual Studio whereas latter is. putenv() is a bit more fiddly to work with, as it requires you to keep around the char* used in the call as the char * is live in the environment. Changing the char* has an immediate effect on what is represented in the environment

File:

• gsdl/trunk/common-src/src/lib/gsdltools.cpp (modified) (2 diffs)

gsdl/trunk/common-src/src/lib/gsdltools.cpp

@@ -169 +169 @@
 
 static bool gsdl_setenv_done = false;
+static char* retain_gsdlosc   = NULL;
+static char* retain_gsdlhomec = NULL;
+static char* retain_pathc     = NULL;
 
 bool set_gsdl_env_vars (const text_t& gsdlhome) 
@@ -207 +210 @@
   }  
 
-  // these will be cleaned up in the destructor
-  char* gsdlosc = gsdlos.getcstr();
-  char* gsdlhomec = gsdlhome.getcstr();
-  char* pathc = path.getcstr();
+  text_t putpath     = "PATH=" + path;
+  text_t putgsdlos   = "GSDLOS=" + gsdlos;
+  text_t putgsdlhome = "GSDLHOME=" + gsdlhome;
+
+  retain_gsdlosc   = putgsdlos.getcstr();
+  retain_gsdlhomec = putgsdlhome.getcstr();
+  retain_pathc     = path.getcstr();
   
-  if ((setenv("GSDLOS",gsdlosc,1)!=0) 
-      || (setenv("GSDLHOME",gsdlhomec,1)!=0) 
-      || (setenv("PATH",pathc,1)!=0))
+  if ((putenv(retain_gsdlosc)!=0) || (putenv(retain_gsdlhomec)!=0)  
+  || (putenv(retain_pathc)!=0))
     {
-      perror("Setting Greenstone environment variables");
+      perror("Setting Greenstone environment variables with putenv()");
       return false;
     }
 
-  delete [] gsdlosc;
-  delete [] gsdlhomec;
-  delete [] pathc;
+  // Need to keep memory allocated setgsdlosc, setgsdlhomec or pathc around
+  // (i.e. can't delete them).  This is because putenv() doesn't take
+  // a copy, but places them in the actual environment.  
 
   gsdl_setenv_done = true;