Replace remaining calls to getenv() with fl_getenv().

... except in driver code that uses Fl_System_Driver::getenv().

Todo: Check if all remaining calls of getenv() in driver code are correct
or might use ::getenv() to avoid one calling level for optimization.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12492 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 19 insertions, 6 deletions

diff --git a/src/Fl_File_Icon2.cxx b/src/Fl_File_Icon2.cxx
index 3bd0b9189..9022423b0 100644
--- a/src/Fl_File_Icon2.cxx
+++ b/src/Fl_File_Icon2.cxx
@@ -6,6 +6,7 @@
 // KDE icon code donated by Maarten De Boer.
 //
 // Copyright 1999-2010 by Michael Sweet.
+// Copyright 2011-2017 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -653,7 +654,7 @@ Fl_File_Icon::load_system_icons(void) {
 
     if (!kdedir) {
       // Figure out where KDE is installed...
-      if ((kdedir = getenv("KDEDIR")) == NULL) {
+      if ((kdedir = fl_getenv("KDEDIR")) == NULL) {
         if (!fl_access("/opt/kde", F_OK)) kdedir = "/opt/kde";
 	else if (!fl_access("/usr/local/share/mimelnk", F_OK)) kdedir = "/usr/local";
         else kdedir = "/usr";
diff --git a/src/fl_utf8.cxx b/src/fl_utf8.cxx
index afd5c6005..0a79e5867 100644
--- a/src/fl_utf8.cxx
+++ b/src/fl_utf8.cxx
@@ -5,7 +5,7 @@
 //
 // Author: Jean-Marc Lienher ( http://oksid.ch )
 // Copyright 2000-2010 by O'ksi'D.
-// Copyright 2016 by Bill Spitzak and others.
+// Copyright 2016-2017 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -286,13 +286,25 @@ char * fl_utf2mbcs(const char *s)
 /** Cross-platform function to get environment variables with a UTF-8 encoded
   name or value.
 
-  This function is especially useful under the MSWindows platform where
+  This function is especially useful under the Windows platform where
   non-ASCII environment variables are encoded as wide characters.
   The returned value of the variable is encoded in UTF-8 as well.
 
-  On platforms other than MSWindows this function calls getenv directly.
+  On platforms other than Windows this function calls getenv directly.
   The return value is returned as-is.
 
+  The return value is a pointer to an implementation defined buffer:
+    - an internal buffer that is (re)allocated as needed (Windows) or
+    - the string in the environment itself (Unix, Linux, MaOS) or
+    - any other implementation (other platforms).
+  This string must be considered read-only and must not be freed by the caller.
+
+  If the resultant string is to be used later it must be copied to a safe
+  place. The next call to fl_getenv() or any other environment changes may
+  overwrite the string.
+
+  \note This function is not thread-safe.
+
   \param[in] v the UTF-8 encoded environment variable
   \return  the environment variable in UTF-8 encoding, or NULL in case of error.
 */
diff --git a/src/print_panel.cxx b/src/print_panel.cxx
index 18bc2982c..4508c9c23 100644
--- a/src/print_panel.cxx
+++ b/src/print_panel.cxx
@@ -3,7 +3,7 @@
 //
 // Print panel for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2010 by Bill Spitzak and others.
+// Copyright 1998-2017 by Bill Spitzak and others.
 //
 // This library is free software. Distribution and use rights are outlined in
 // the file "COPYING" which should have been included with this file.  If this
@@ -565,7 +565,7 @@ printing_style print_load() { // return whether SystemV or BSD printing style is
       }
     }
     fclose(lpstat);
-    p = getenv("PRINTER"); // get name of default printer
+    p = fl_getenv("PRINTER"); // get name of default printer
     if (p == NULL) p = (char*)"lp";
     strcpy(defname, p);
   }