X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fclose-stream.c;h=8819b58095df490d8786696439b8ee871fd886c9;hb=96924181b7f9eb0c8b0585467fc3cb2da2766a4f;hp=d7551d67ff0c51fe933a9ff3ec37dbc619c92416;hpb=bd749957dc8e1129c765445de6cc98aa5a8b8a74;p=gnulib.git
diff --git a/lib/close-stream.c b/lib/close-stream.c
index d7551d67f..8819b5809 100644
--- a/lib/close-stream.c
+++ b/lib/close-stream.c
@@ -1,12 +1,11 @@
/* Close a stream, with nicer error checking than fclose's.
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2004, 2006 Free
- Software Foundation, Inc.
+ Copyright (C) 1998-2002, 2004, 2006-2011 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,19 +13,16 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "close-stream.h"
#include
#include
-#include "__fpending.h"
+#include "fpending.h"
#if USE_UNLOCKED_IO
# include "unlocked-io.h"
@@ -36,6 +32,10 @@
otherwise. A failure might set errno to 0 if the error number
cannot be determined.
+ A failure with errno set to EPIPE may or may not indicate an error
+ situation worth signaling to the user. See the documentation of the
+ close_stdout_set_ignore_EPIPE function for details.
+
If a program writes *anything* to STREAM, that program should close
STREAM and make sure that it succeeds before exiting. Otherwise,
suppose that you go to the extreme of checking the return status
@@ -55,9 +55,9 @@
int
close_stream (FILE *stream)
{
- bool some_pending = (__fpending (stream) != 0);
- bool prev_fail = (ferror (stream) != 0);
- bool fclose_fail = (fclose (stream) != 0);
+ const bool some_pending = (__fpending (stream) != 0);
+ const bool prev_fail = (ferror (stream) != 0);
+ const bool fclose_fail = (fclose (stream) != 0);
/* Return an error indication if there was a previous failure or if
fclose failed, with one exception: ignore an fclose failure if
@@ -70,7 +70,7 @@ close_stream (FILE *stream)
if (prev_fail || (fclose_fail && (some_pending || errno != EBADF)))
{
if (! fclose_fail)
- errno = 0;
+ errno = 0;
return EOF;
}