projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(INCLUDES): Remove -I../intl.
[gnulib.git]
/
lib
/
closeout.c
diff --git
a/lib/closeout.c
b/lib/closeout.c
index
71151b8
..
0c78b6e
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
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
@@
-43,6
+43,8
@@
extern int errno;
#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
+88,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;