From b28236b5d096f190b3d1d9724bfa871029729831 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 25 Jul 2006 06:20:19 +0000 Subject: [PATCH] * 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. * m4/stdio-safer.m4 (gl_FOPEN_SAFER, gl_TMPFILE_SAFER): New macros. (gl_STDIO_SAFER): Remove. --- ChangeLog | 8 ++++++++ MODULES.html.sh | 9 +++++---- m4/ChangeLog | 5 +++++ m4/stdio-safer.m4 | 11 ++++++++--- modules/fopen-safer | 25 +++++++++++++++++++++++++ modules/getusershell | 2 +- modules/{stdio-safer => tmpfile-safer} | 5 ++--- 7 files changed, 54 insertions(+), 11 deletions(-) create mode 100644 modules/fopen-safer rename modules/{stdio-safer => tmpfile-safer} (71%) diff --git a/ChangeLog b/ChangeLog index d73dd7e910..26f9c6c9ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-07-24 Paul Eggert + + * 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 * modules/javacomp (Depends-on): Add unistd, javaversion, binary-io, diff --git a/MODULES.html.sh b/MODULES.html.sh index 9ba8ed083a..2ba6e96586 100755 --- a/MODULES.html.sh +++ b/MODULES.html.sh @@ -1932,13 +1932,14 @@ func_all_modules () func_echo "$element" func_begin_table - func_module fpending - func_module closeout func_module close-stream - func_module stdio-safer - func_module stdlib-safer + func_module closeout + 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" diff --git a/m4/ChangeLog b/m4/ChangeLog index d60b6bcb9b..5ca96cb391 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2006-07-24 Paul Eggert + + * stdio-safer.m4 (gl_FOPEN_SAFER, gl_TMPFILE_SAFER): New macros. + (gl_STDIO_SAFER): Remove. + 2006-07-24 Bruno Haible * tmpdir.m4: New file, from GNU gettext. diff --git a/m4/stdio-safer.m4 b/m4/stdio-safer.m4 index b51a3c80fe..40be1ad474 100644 --- 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]) ]) diff --git a/modules/fopen-safer b/modules/fopen-safer new file mode 100644 index 0000000000..137332e92b --- /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 diff --git a/modules/getusershell b/modules/getusershell index 0ebcac04b4..8b64506152 100644 --- a/modules/getusershell +++ b/modules/getusershell @@ -6,7 +6,7 @@ lib/getusershell.c m4/getusershell.m4 Depends-on: -stdio-safer +fopen-safer xalloc configure.ac: diff --git a/modules/stdio-safer b/modules/tmpfile-safer similarity index 71% rename from modules/stdio-safer rename to modules/tmpfile-safer index edbb67fd50..c81906332f 100644 --- a/modules/stdio-safer +++ b/modules/tmpfile-safer @@ -1,10 +1,9 @@ Description: -File stream functions that avoid clobbering std{in,out,err}. +tmpfile function that avoids 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 @@ -13,7 +12,7 @@ binary-io unistd-safer configure.ac: -gl_STDIO_SAFER +gl_TMPFILE_SAFER Makefile.am: -- 2.30.2