# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1360038857 28800
# Node ID 087501e891d9bde6f1eb04f54c9565af1ecb7346
# Parent  e67939626bf8eeb8ac82a732e42554f21ef9c1f9
tmpdir: use secure_getenv

* lib/tmpdir.c (__secure_getenv) [!LIBC]:
Define to secure_getenv, not getenv.
* m4/tmpdir.m4 (gt_TMPDIR): Don't check for __secure_getenv,
as that's now secure_getenv's job.
* modules/tmpdir (Depends-on): Add secure_getenv.

diff -r e67939626bf8 -r 087501e891d9 ChangeLog
--- a/ChangeLog	Mon Feb 04 18:36:06 2013 -0800
+++ b/ChangeLog	Mon Feb 04 20:34:17 2013 -0800
@@ -1,5 +1,12 @@
 2013-02-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+	tmpdir: use secure_getenv
+	* lib/tmpdir.c (__secure_getenv) [!LIBC]:
+	Define to secure_getenv, not getenv.
+	* m4/tmpdir.m4 (gt_TMPDIR): Don't check for __secure_getenv,
+	as that's now secure_getenv's job.
+	* modules/tmpdir (Depends-on): Add secure_getenv.
+
 	tempname: use secure_getenv
 	* lib/tempname.c (__secure_getenv) [!_LIBC]:
 	Define to secure_getenv, not getenv.
diff -r e67939626bf8 -r 087501e891d9 lib/tmpdir.c
--- a/lib/tmpdir.c	Mon Feb 04 18:36:06 2013 -0800
+++ b/lib/tmpdir.c	Mon Feb 04 20:34:17 2013 -0800
@@ -53,13 +53,10 @@
 # define struct_stat64 struct stat64
 #else
 # define struct_stat64 struct stat
+# define __secure_getenv secure_getenv
 # define __xstat64(version, path, buf) stat (path, buf)
 #endif
 
-#if ! (HAVE___SECURE_GETENV || _LIBC)
-# define __secure_getenv getenv
-#endif
-
 /* Pathname support.
    ISSLASH(C)           tests whether C is a directory separator character.
  */
diff -r e67939626bf8 -r 087501e891d9 m4/tmpdir.m4
--- a/m4/tmpdir.m4	Mon Feb 04 18:36:06 2013 -0800
+++ b/m4/tmpdir.m4	Mon Feb 04 20:34:17 2013 -0800
@@ -1,4 +1,4 @@
-# tmpdir.m4 serial 3
+# tmpdir.m4 serial 4
 dnl Copyright (C) 2001-2002, 2006, 2009-2013 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -6,7 +6,4 @@
 
 # Prerequisites for lib/tmpdir.c
 
-AC_DEFUN([gt_TMPDIR],
-[
-  AC_CHECK_FUNCS([__secure_getenv])
-])
+AC_DEFUN([gt_TMPDIR], [:])
diff -r e67939626bf8 -r 087501e891d9 modules/tmpdir
--- a/modules/tmpdir	Mon Feb 04 18:36:06 2013 -0800
+++ b/modules/tmpdir	Mon Feb 04 20:34:17 2013 -0800
@@ -7,6 +7,7 @@
 m4/tmpdir.m4
 
 Depends-on:
+secure_getenv
 stdbool
 sys_stat
 pathmax
@@ -25,4 +26,3 @@
 
 Maintainer:
 Bruno Haible
-