projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add comment to AC_DEFINE_UNQUOTED use.
[gnulib.git]
/
lib
/
closeout.c
diff --git
a/lib/closeout.c
b/lib/closeout.c
index
ed02a7d
..
71151b8
100644
(file)
--- a/
lib/closeout.c
+++ b/
lib/closeout.c
@@
-33,16
+33,19
@@
# define EXIT_FAILURE 1
#endif
# define EXIT_FAILURE 1
#endif
+#include <stdio.h>
+
#include <errno.h>
#ifndef errno
extern int errno;
#endif
#include <errno.h>
#ifndef errno
extern int errno;
#endif
-#include <stdio.h>
#include "closeout.h"
#include "error.h"
#include "closeout.h"
#include "error.h"
+#include "quotearg.h"
static int default_exit_status = EXIT_FAILURE;
static int default_exit_status = EXIT_FAILURE;
+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,
@@
-53,6
+56,14
@@
close_stdout_set_status (int status)
default_exit_status = status;
}
default_exit_status = status;
}
+/* Set the file name to be reported in the event an error is detected
+ by close_stdout_status. */
+void
+close_stdout_set_file_name (const char *file)
+{
+ file_name = file;
+}
+
/* Close standard output, exiting with status STATUS on failure.
If a program writes *anything* to stdout, that program should `fflush'
stdout and make sure that it succeeds before exiting. Otherwise,
/* Close standard output, exiting with status STATUS on failure.
If a program writes *anything* to stdout, that program should `fflush'
stdout and make sure that it succeeds before exiting. Otherwise,
@@
-78,10
+89,19
@@
close_stdout_set_status (int status)
void
close_stdout_status (int status)
{
void
close_stdout_status (int status)
{
- i
f (ferror (stdout))
- error (status, 0, _("write error"));
+ i
nt e = ferror (stdout) ? 0 : -1;
+
if (fclose (stdout) != 0)
if (fclose (stdout) != 0)
- error (status, errno, _("write error"));
+ e = errno;
+
+ if (0 <= e)
+ {
+ char const *write_error = _("write error");
+ if (file_name)
+ error (status, e, "%s: %s", quotearg_colon (file_name), write_error);
+ else
+ error (status, e, "%s", write_error);
+ }
}
/* Close standard output, exiting with status EXIT_FAILURE on failure. */
}
/* Close standard output, exiting with status EXIT_FAILURE on failure. */