From: Jim Meyering <jim@meyering.net>
Date: Tue, 23 Sep 2003 21:57:13 +0000 (+0000)
Subject: (close_output_file): Don't report bogus errno value
X-Git-Tag: v5.1.0~547
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93bf700a948f87b7c243b5ac1ffb06f30fb377be;p=thirdparty%2Fcoreutils.git

(close_output_file): Don't report bogus errno value
after ferror discovers an output error.  We don't know the proper
errno value, since it might have been caused by any of a whole
bunch of calls, and it might have been trashed in the meantime.
Fixing this problem will require much more extensive changes;
in the meantime just say "write error".
---

diff --git a/src/csplit.c b/src/csplit.c
index 07fd2d321b..5b15cac310 100644
--- a/src/csplit.c
+++ b/src/csplit.c
@@ -986,9 +986,15 @@ close_output_file (void)
 {
   if (output_stream)
     {
-      if (ferror (output_stream) || fclose (output_stream) == EOF)
+      if (ferror (output_stream))
 	{
-	  error (0, errno, _("write error for `%s'"), output_filename);
+	  error (0, 0, _("write error for `%s'"), output_filename);
+	  output_stream = NULL;
+	  cleanup_fatal ();
+	}
+      if (fclose (output_stream) != 0)
+	{
+	  error (0, errno, "%s", output_filename);
 	  output_stream = NULL;
 	  cleanup_fatal ();
 	}