projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[gnulib.git]
/
lib
/
closeout.c
diff --git
a/lib/closeout.c
b/lib/closeout.c
index
71151b8
..
90606f2
100644
(file)
--- a/
lib/closeout.c
+++ b/
lib/closeout.c
@@
-1,5
+1,5
@@
/* closeout.c - close standard output
/* 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
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
# 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
#if HAVE_STDLIB_H
# include <stdlib.h>
#endif
@@
-40,9
+33,14
@@
extern int errno;
#endif
extern int errno;
#endif
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
#include "closeout.h"
#include "error.h"
#include "quotearg.h"
#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;
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. */
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;
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;
if (fclose (stdout) != 0)
e = errno;