.

2 files changed, 26 insertions, 11 deletions

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 38e43daa2..5a25ac3b7 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,16 @@
+2004-11-14  Jim Meyering  <jim@meyering.net>
+
+	* closeout.c (close_stdout): Don't fail just because stdout was
+	closed initially, since some programs don't write to stdout in the
+	normal course of operation (other than --version and --help), and
+	we don't want this function to make e.g. `cp 1 2 >&-' fail.
+	But do fail if it was closed and someone has tried to write to it.
+	E.g., printf 'foo' >&-
+
+	* __fpending.c, __fpending.h: Restore these files.
+	They're useful after all.
+	* Makefile.am (libfetish_a_SOURCES): Add __fpending.h.
+
 2004-11-11  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* getopt.c, getopt1.c, getopt_.h, getopt_int.h:
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 5fa0a489b..68ae3882a 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -42,12 +42,12 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = lib
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	ChangeLog TODO alloca.c asnprintf.c asprintf.c atexit.c \
-	calloc.c chown.c dirfd.c dup2.c error.c error.h euidaccess.c \
-	fchdir-stub.c fchown-stub.c fileblocks.c fnmatch.c free.c \
-	fsusage.c ftruncate.c getcwd.c getdate.c getgroups.c \
-	gethostname.c getline.c getloadavg.c getndelim2.c getopt.c \
-	getopt1.c getpass.c gettimeofday.c getusershell.c \
+	ChangeLog TODO __fpending.c alloca.c asnprintf.c asprintf.c \
+	atexit.c calloc.c chown.c dirfd.c dup2.c error.c error.h \
+	euidaccess.c fchdir-stub.c fchown-stub.c fileblocks.c \
+	fnmatch.c free.c fsusage.c ftruncate.c getcwd.c getdate.c \
+	getgroups.c gethostname.c getline.c getloadavg.c getndelim2.c \
+	getopt.c getopt1.c getpass.c gettimeofday.c getusershell.c \
 	group-member.c lchown.c lstat.c malloc.c memchr.c memcmp.c \
 	memcpy.c memmove.c memrchr.c memset.c mkdir.c mkstemp.c \
 	mktime.c mountlist.c nanosleep.c obstack.c obstack.h \
@@ -78,8 +78,9 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/afs.m4 \
 	$(top_srcdir)/m4/extensions.m4 $(top_srcdir)/m4/fcntl-safer.m4 \
 	$(top_srcdir)/m4/file-type.m4 $(top_srcdir)/m4/fileblocks.m4 \
 	$(top_srcdir)/m4/filemode.m4 $(top_srcdir)/m4/fnmatch.m4 \
-	$(top_srcdir)/m4/free.m4 $(top_srcdir)/m4/fstypename.m4 \
-	$(top_srcdir)/m4/fsusage.m4 $(top_srcdir)/m4/ftruncate.m4 \
+	$(top_srcdir)/m4/fpending.m4 $(top_srcdir)/m4/free.m4 \
+	$(top_srcdir)/m4/fstypename.m4 $(top_srcdir)/m4/fsusage.m4 \
+	$(top_srcdir)/m4/ftruncate.m4 \
 	$(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \
 	$(top_srcdir)/m4/getdate.m4 $(top_srcdir)/m4/getgroups.m4 \
 	$(top_srcdir)/m4/gethostname.m4 $(top_srcdir)/m4/getline.m4 \
@@ -340,9 +341,9 @@ noinst_LIBRARIES = libfetish.a
 AM_CPPFLAGS = -I.. -I$(srcdir)
 libfetish_a_SOURCES = acl.h acl.c getdate.h getdate.y posixtm.c \
 	posixtm.h posixver.c posixver.h strftime.c strftime.h hash.c \
-	hash.h hash-pjw.c hash-pjw.h allocsa.c allocsa.h argmatch.c \
-	argmatch.h backupfile.c backupfile.h basename.c c-strtod.c \
-	c-strtod.h c-strtold.c canon-host.c canonicalize.c \
+	hash.h hash-pjw.c hash-pjw.h __fpending.h allocsa.c allocsa.h \
+	argmatch.c argmatch.h backupfile.c backupfile.h basename.c \
+	c-strtod.c c-strtod.h c-strtold.c canon-host.c canonicalize.c \
 	canonicalize.h cloexec.c cloexec.h closeout.c closeout.h \
 	cycle-check.c cycle-check.h dev-ino.h diacrit.c diacrit.h \
 	dirname.c dirname.h dirfd.h dup-safer.c euidaccess.h exclude.c \
@@ -436,6 +437,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/__fpending.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/alloca.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/asnprintf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/asprintf.Po@am__quote@