X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcloseout.c;h=90606f246da85fd27033f8395edb051e2f0f4e90;hb=71567e27643fb214a4d371ff2c95000736cb7b83;hp=71151b84ea64d0b36911f1da336a68085dc4f8de;hpb=b6c5ffd21355e4fb7f9f61ca206f57fa08bd7678;p=gnulib.git

diff --git a/lib/closeout.c b/lib/closeout.c
index 71151b84e..90606f246 100644
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -1,5 +1,5 @@
 /* closeout.c - close standard output
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
    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
@@ -19,13 +19,6 @@
 # include <config.h>
 #endif
 
-#if ENABLE_NLS
-# include <libintl.h>
-# define _(Text) gettext (Text)
-#else
-# define _(Text) Text
-#endif
-
 #if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
@@ -40,9 +33,14 @@
 extern int errno;
 #endif
 
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
 #include "closeout.h"
 #include "error.h"
 #include "quotearg.h"
+#include "unlocked-io.h"
+#include "__fpending.h"
 
 static int default_exit_status = EXIT_FAILURE;
 static const char *file_name;
@@ -86,11 +84,17 @@ close_stdout_set_file_name (const char *file)
    It's important to detect such failures and exit nonzero because many
    tools (most notably `make' and other build-management systems) depend
    on being able to detect failure in other tools via their exit status.  */
+
 void
 close_stdout_status (int status)
 {
   int e = ferror (stdout) ? 0 : -1;
 
+  /* If the stream's error bit is clear and there is nothing to flush,
+     then return right away.  */
+  if (e && __fpending (stdout) == 0)
+    return;
+
   if (fclose (stdout) != 0)
     e = errno;