Hook error() and error_at_line() if available.

They are used by some GNU programs to display error messages.
This commit is contained in:
Simon Ruderich
2013-06-05 23:57:05 +02:00
parent b140cc0a82
commit 7f9856c5da
7 changed files with 156 additions and 1 deletions

View File

@@ -30,6 +30,10 @@
#include <string.h>
#include <unistd.h>
#ifdef HAVE_ERROR_H
# include <error.h>
#endif
/* Conflicting declaration in glibc. */
#undef fwrite_unlocked
@@ -231,6 +235,74 @@ HOOK_FILE1(int, puts_unlocked, stdout,
HOOK_VOID1(void, perror, STDERR_FILENO,
const char *, s)
/* error(3) */
#ifdef HAVE_ERROR_H
static void error_vararg(int status, int errnum,
const char *filename, unsigned int linenum,
const char *format, va_list ap) {
static const char *last_filename;
static unsigned int last_linenum;
/* Skip this error message if requested and if there was already an error
* in the same file/line. */
if (error_one_per_line
&& filename != NULL && linenum != 0
&& filename == last_filename && linenum == last_linenum) {
return;
}
last_filename = filename;
last_linenum = linenum;
error_message_count++;
fflush(stdout);
if (error_print_progname) {
error_print_progname();
} else {
fprintf(stderr, "%s:", program_invocation_name);
}
if (filename != NULL && linenum != 0) {
fprintf(stderr, "%s:%u:", filename, linenum);
if (error_print_progname) {
fprintf(stderr, " ");
}
}
if (!error_print_progname) {
fprintf(stderr, " ");
}
vfprintf(stderr, format, ap);
if (errnum != 0) {
fprintf(stderr, ": %s", strerror(errnum));
}
fprintf(stderr, "\n");
if (status != 0) {
exit(status);
}
}
void error_at_line(int status, int errnum,
const char *filename, unsigned int linenum,
const char *format, ...) {
va_list ap;
va_start(ap, format);
error_vararg(status, errnum, filename, linenum, format, ap);
va_end(ap);
}
void error(int status, int errnum, const char *format, ...) {
va_list ap;
va_start(ap, format);
error_vararg(status, errnum, NULL, 0, format, ap);
va_end(ap);
}
#endif
/* Hook functions which duplicate file descriptors to track them. */