--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* MODULES.html.sh (File stream based Input/Output):
+	Add fopen-safer, tmpfile-safer; remove stdio-safer.
+	* modules/getusershell (Depends-on): Change stdio-safer to fopen-safer.
+	* modules/fopen-safer, modules/tmpfile-safer: New files.
+	* modules/stdio-safer: Remove.
+
 2006-07-24  Bruno Haible  <bruno@clisp.org>
 
 	* modules/javacomp (Depends-on): Add unistd, javaversion, binary-io,

--- a/MODULES.html.sh
+++ b/MODULES.html.sh
@@ -1932,13 +1932,14 @@
   func_echo "$element"
 
   func_begin_table
-  func_module fpending
+  func_module close-stream
   func_module closeout
-  func_module close-stream
-  func_module stdio-safer
-  func_module stdlib-safer
+  func_module fopen-safer
+  func_module fpending
   func_module getpass
   func_module getpass-gnu
+  func_module stdlib-safer
+  func_module tmpfile-safer
   func_end_table
 
   element="Users and groups"

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* stdio-safer.m4 (gl_FOPEN_SAFER, gl_TMPFILE_SAFER): New macros.
+	(gl_STDIO_SAFER): Remove.
+
 2006-07-24  Bruno Haible  <bruno@clisp.org>
 
 	* tmpdir.m4: New file, from GNU gettext.

--- a/m4/stdio-safer.m4
+++ b/m4/stdio-safer.m4
@@ -1,12 +1,17 @@
-#serial 6
+#serial 7
 dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_STDIO_SAFER],
+AC_DEFUN([gl_FOPEN_SAFER],
 [
-  AC_LIBSOURCES([fopen-safer.c, tmpfile-safer.c, stdio-safer.h, stdio--.h])
+  AC_LIBSOURCES([fopen-safer.c, stdio-safer.h, stdio--.h])
   AC_LIBOBJ([fopen-safer])
+])
+
+AC_DEFUN([gl_TMPFILE_SAFER],
+[
+  AC_LIBSOURCES([tmpfile-safer.c, stdio-safer.h, stdio--.h])
   AC_LIBOBJ([tmpfile-safer])
 ])

new file mode 100644
--- /dev/null
+++ b/modules/fopen-safer
@@ -0,0 +1,25 @@
+Description:
+fopen function that avoids clobbering std{in,out,err}.
+
+Files:
+lib/stdio--.h
+lib/stdio-safer.h
+lib/fopen-safer.c
+m4/stdio-safer.m4
+
+Depends-on:
+unistd-safer
+
+configure.ac:
+gl_FOPEN_SAFER
+
+Makefile.am:
+
+Include:
+"stdio-safer.h"
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert, Jim Meyering

--- a/modules/getusershell
+++ b/modules/getusershell
@@ -6,7 +6,7 @@
 m4/getusershell.m4
 
 Depends-on:
-stdio-safer
+fopen-safer
 xalloc
 
 configure.ac:

deleted file mode 100644
--- a/modules/stdio-safer
+++ /dev/null
@@ -1,27 +0,0 @@
-Description:
-File stream functions that avoid clobbering std{in,out,err}.
-
-Files:
-lib/stdio--.h
-lib/stdio-safer.h
-lib/fopen-safer.c
-lib/tmpfile-safer.c
-m4/stdio-safer.m4
-
-Depends-on:
-binary-io
-unistd-safer
-
-configure.ac:
-gl_STDIO_SAFER
-
-Makefile.am:
-
-Include:
-"stdio-safer.h"
-
-License:
-GPL
-
-Maintainer:
-Paul Eggert, Jim Meyering

new file mode 100644
--- /dev/null
+++ b/modules/tmpfile-safer
@@ -0,0 +1,26 @@
+Description:
+tmpfile function that avoids clobbering std{in,out,err}.
+
+Files:
+lib/stdio--.h
+lib/stdio-safer.h
+lib/tmpfile-safer.c
+m4/stdio-safer.m4
+
+Depends-on:
+binary-io
+unistd-safer
+
+configure.ac:
+gl_TMPFILE_SAFER
+
+Makefile.am:
+
+Include:
+"stdio-safer.h"
+
+License:
+GPL
+
+Maintainer:
+Paul Eggert, Jim Meyering