projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(DIRECTORY_SEPARATOR, FILESYSTEM_PREFIX_LEN, ISSLASH): Remove; now in dirname.h.
[gnulib.git]
/
lib
/
closeout.c
diff --git
a/lib/closeout.c
b/lib/closeout.c
index
ac99045
..
bdda59f
100644
(file)
--- a/
lib/closeout.c
+++ b/
lib/closeout.c
@@
-19,9
+19,6
@@
# include <config.h>
#endif
# include <config.h>
#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-
#if ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
#if ENABLE_NLS
# include <libintl.h>
# define _(Text) gettext (Text)
@@
-36,10
+33,6
@@
# define EXIT_FAILURE 1
#endif
# define EXIT_FAILURE 1
#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
#include <stdio.h>
#include <errno.h>
#include <stdio.h>
#include <errno.h>
@@
-47,15
+40,13
@@
extern int errno;
#endif
extern int errno;
#endif
-#ifndef STDOUT_FILENO
-# define STDOUT_FILENO 1
-#endif
-
#include "closeout.h"
#include "error.h"
#include "closeout.h"
#include "error.h"
+#include "quotearg.h"
+#include "__fpending.h"
static int default_exit_status = EXIT_FAILURE;
static int default_exit_status = EXIT_FAILURE;
-static const char *file_name
= NULL
;
+static const char *file_name;
/* Set the value to be used for the exit status when close_stdout is called.
This is useful when it is not convenient to call close_stdout_status,
/* Set the value to be used for the exit status when close_stdout is called.
This is useful when it is not convenient to call close_stdout_status,
@@
-96,29
+87,25
@@
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)
{
void
close_stdout_status (int status)
{
-#ifdef EBADF
- struct stat sbuf;
- if (fstat (STDOUT_FILENO, &sbuf) && errno == EBADF)
- return;
-#endif
+ int e = ferror (stdout) ? 0 : -1;
- if (ferror (stdout))
- {
- if (file_name)
- error (status, 0, _("%s: write error"), file_name);
- else
- error (status, 0, _("write error"));
- }
+ if (__fpending (stdout) == 0)
+ return;
if (fclose (stdout) != 0)
if (fclose (stdout) != 0)
+ e = errno;
+
+ if (0 <= e)
{
{
+ char const *write_error = _("write error");
if (file_name)
if (file_name)
- error (status, e
rrno, _("%s: write error"), file_name
);
+ error (status, e
, "%s: %s", quotearg_colon (file_name), write_error
);
else
else
- error (status, e
rrno, _("write error")
);
+ error (status, e
, "%s", write_error
);
}
}
}
}