[PATCH 2/3] tempname: use secure_getenv

[Paul Eggert]

* lib/tempname.c (__secure_getenv) [!_LIBC]:
Define to secure_getenv, not getenv.
* modules/tempname (Depends-on):
Add secure_getenv.
---
 ChangeLog        | 6 ++++++
 lib/tempname.c   | 5 +----
 modules/tempname | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2a0b4e2..6639a18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2013-02-04  Paul Eggert  <address@hidden>
 
+       tempname: use secure_getenv
+       * lib/tempname.c (__secure_getenv) [!_LIBC]:
+       Define to secure_getenv, not getenv.
+       * modules/tempname (Depends-on):
+       Add secure_getenv.
+
        secure_getenv: new module
        * MODULES.html.sh (Extra functions based on ANSI C 89):
        Add secure_getenv.
diff --git a/lib/tempname.c b/lib/tempname.c
index c37271b..087b79b 100644
--- a/lib/tempname.c
+++ b/lib/tempname.c
@@ -68,10 +68,7 @@
 # define __mkdir mkdir
 # define __open open
 # define __lxstat64(version, file, buf) lstat (file, buf)
-#endif
-
-#if ! (HAVE___SECURE_GETENV || _LIBC)
-# define __secure_getenv getenv
+# define __secure_getenv secure_getenv
 #endif
 
 #ifdef _LIBC
diff --git a/modules/tempname b/modules/tempname
index b4708d9..7fafd72 100644
--- a/modules/tempname
+++ b/modules/tempname
@@ -11,6 +11,7 @@ extensions
 fcntl-h
 gettimeofday
 lstat
+secure_getenv
 stdint
 sys_stat
 sys_time
-- 
1.7.11.7