X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=report.c;h=b6101e406d7550c1b0be70c87a303344aea8e7cb;hb=40fe452223b5cc0ff5dbae0efa8551d7e96c1a5c;hp=5d9abb73a8332bb48d0fc13dc4afd54494869016;hpb=414a380974f78d0bb62ca953398bf1f54b28a58d;p=~andy%2Ffetchmail diff --git a/report.c b/report.c index 5d9abb73..b6101e40 100644 --- a/report.c +++ b/report.c @@ -16,24 +16,11 @@ #include #include #include -#if defined(HAVE_SYSLOG) #include -#endif -#include "i18n.h" +#include "gettext.h" #include "fetchmail.h" -#if defined(HAVE_VPRINTF) || defined(HAVE_DOPRNT) || defined(_LIBC) || defined(HAVE_STDARG_H) -# if HAVE_STDARG_H -# include -# define VA_START(args, lastarg) va_start(args, lastarg) -# else -# include -# define VA_START(args, lastarg) va_start(args) -# endif -#else -# define va_alist a1, a2, a3, a4, a5, a6, a7, a8 -# define va_dcl char *a1, *a2, *a3, *a4, *a5, *a6, *a7, *a8; -#endif +#include #define MALLOC(n) xmalloc(n) #define REALLOC(n,s) xrealloc(n,s) @@ -48,42 +35,11 @@ static int partial_suppress_tag = 0; static unsigned unbuffered; static unsigned int use_syslog; -#ifdef _LIBC -/* In the GNU C library, there is a predefined variable for this. */ - -# define program_name program_invocation_name -# include - -#else - -# if !HAVE_STRERROR && !defined(strerror) -char *strerror (int errnum) -{ - extern char *sys_errlist[]; - extern int sys_nerr; - - if (errnum > 0 && errnum <= sys_nerr) - return sys_errlist[errnum]; - return GT_("Unknown system error"); -} -# endif /* HAVE_STRERROR */ -#endif /* _LIBC */ - /* Print the program name and error message MESSAGE, which is a printf-style format string with optional args. */ -/* VARARGS */ -void -#ifdef HAVE_STDARG_H -report (FILE *errfp, const char *message, ...) -#else -report (FILE *errfp, message, va_alist) - const char *message; - va_dcl -#endif +void report(FILE *errfp, const char *message, ...) { -#ifdef VA_START va_list args; -#endif /* If a partially built message exists, print it now so it's not lost. */ if (partial_message_size_used != 0) @@ -92,14 +48,11 @@ report (FILE *errfp, message, va_alist) report (errfp, GT_("%s (log message incomplete)\n"), partial_message); } -#if defined(HAVE_SYSLOG) if (use_syslog) { int priority; -#ifdef VA_START - VA_START (args, message); -#endif + va_start (args, message); priority = (errfp == stderr) ? LOG_ERR : LOG_INFO; #ifdef HAVE_VSYSLOG @@ -118,12 +71,9 @@ report (FILE *errfp, message, va_alist) } #endif -#ifdef VA_START va_end(args); -#endif } else /* i. e. not using syslog */ -#endif { if ( *message == '\n' ) { @@ -134,17 +84,9 @@ report (FILE *errfp, message, va_alist) fprintf (errfp, "%s: ", program_name); partial_suppress_tag = 0; -#ifdef VA_START - VA_START (args, message); -# if defined(HAVE_VPRINTF) || defined(_LIBC) + va_start (args, message); vfprintf (errfp, message, args); -# else - _doprnt (message, args, errfp); -# endif va_end (args); -#else - fprintf (errfp, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif fflush (errfp); } } @@ -168,12 +110,10 @@ void report_init(int mode /** 0: regular output, 1: unbuffered output, -1: syslo use_syslog = FALSE; break; -#ifdef HAVE_SYSLOG case -1: /* syslogd */ unbuffered = FALSE; use_syslog = TRUE; break; -#endif /* HAVE_SYSLOG */ } } @@ -203,7 +143,6 @@ static void rep_ensuresize(void) { } } -#ifdef HAVE_STDARG_H static void report_vbuild(const char *message, va_list args) { int n; @@ -232,50 +171,16 @@ static void report_vbuild(const char *message, va_list args) partial_message = (char *)REALLOC (partial_message, partial_message_size); } } -#endif -void -#ifdef HAVE_STDARG_H -report_build (FILE *errfp, const char *message, ...) -#else -report_build (FILE *errfp, message, va_alist) - const char *message; - va_dcl -#endif +void report_build (FILE *errfp, const char *message, ...) { -#ifdef VA_START va_list args; -#else - int n; -#endif rep_ensuresize(); -#if defined(VA_START) - VA_START(args, message); + va_start(args, message); report_vbuild(message, args); va_end(args); -#else - for ( ; ; ) - { - n = snprintf (partial_message + partial_message_size_used, - partial_message_size - partial_message_size_used, - message, a1, a2, a3, a4, a5, a6, a7, a8); - - /* output error, f. i. EILSEQ */ - if (n < 0) break; - - if (n >= 0 - && (unsigned)n < partial_message_size - partial_message_size_used) - { - partial_message_size_used += n; - break; - } - - partial_message_size += 2048; - partial_message = REALLOC (partial_message, partial_message_size); - } -#endif if (unbuffered && partial_message_size_used != 0) { @@ -299,28 +204,15 @@ void report_flush(FILE *errfp) be empty.) The completed report message is then printed (and reset to empty.) */ /* VARARGS */ -void -#ifdef HAVE_STDARG_H -report_complete (FILE *errfp, const char *message, ...) -#else -report_complete (FILE *errfp, message, va_alist) - const char *message; - va_dcl -#endif +void report_complete (FILE *errfp, const char *message, ...) { -#ifdef VA_START va_list args; -#endif rep_ensuresize(); -#if defined(VA_START) - VA_START(args, message); + va_start(args, message); report_vbuild(message, args); va_end(args); -#else - report_build(errfp, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif /* Finally... print it. */ partial_message_size_used = 0; @@ -339,22 +231,10 @@ report_complete (FILE *errfp, message, va_alist) static int error_one_per_line; /* If errnum is nonzero, print its corresponding system error message. */ -void -#ifdef HAVE_STDARG_H -report_at_line (FILE *errfp, int errnum, const char *file_name, +void report_at_line (FILE *errfp, int errnum, const char *file_name, unsigned int line_number, const char *message, ...) -#else -report_at_line (FILE *errfp, errnum, file_name, line_number, message, va_alist) - int errnum; - const char *file_name; - unsigned int line_number; - const char *message; - va_dcl -#endif { -#ifdef VA_START va_list args; -#endif if (error_one_per_line) { @@ -381,17 +261,9 @@ report_at_line (FILE *errfp, errnum, file_name, line_number, message, va_alist) if (file_name != NULL) fprintf (errfp, "%s:%u: ", file_name, line_number); -#ifdef VA_START - VA_START (args, message); -# if defined(HAVE_VPRINTF) || defined(_LIBC) + va_start (args, message); vfprintf (errfp, message, args); -# else - _doprnt (message, args, errfp); -# endif va_end (args); -#else - fprintf (errfp, message, a1, a2, a3, a4, a5, a6, a7, a8); -#endif if (errnum) fprintf (errfp, ": %s", strerror (errnum));