From 39e48531eff4e3c3e3e6d1339ff6085f1e2f69bc Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 5 Apr 2011 11:16:49 -0400 Subject: [PATCH] support the nonstandard err.h interfaces note that unlike the originals, these do not print the program name/argv[0] because we have not saved it anywhere. this could be changed in __libc_start_main if desired. --- include/err.h | 24 ++++++++++++++++++++ src/linux/err.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) create mode 100644 include/err.h create mode 100644 src/linux/err.c diff --git a/include/err.h b/include/err.h new file mode 100644 index 00000000..5e33f9e4 --- /dev/null +++ b/include/err.h @@ -0,0 +1,24 @@ +#ifndef _ERR_H +#define _ERR_H + +#include + +#ifdef __cplusplus +extern "C" { +#endif + +void warn(const char *, ...); +void vwarn(const char *, va_list); +void warnx(const char *, ...); +void vwarnx(const char *, va_list); + +void err(int, const char *, ...); +void verr(int, const char *, va_list); +void errx(int, const char *, ...); +void verrx(int, const char *, va_list); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/src/linux/err.c b/src/linux/err.c new file mode 100644 index 00000000..abc26806 --- /dev/null +++ b/src/linux/err.c @@ -0,0 +1,60 @@ +#include +#include +#include +#include + +void vwarn(const char *fmt, va_list ap) +{ + vfprintf(stderr, fmt, ap); + perror(""); +} + +void vwarnx(const char *fmt, va_list ap) +{ + vfprintf(stderr, fmt, ap); + putc('\n', stderr); +} + +void verr(int status, const char *fmt, va_list ap) +{ + vwarn(fmt, ap); + exit(status); +} + +void verrx(int status, const char *fmt, va_list ap) +{ + vwarnx(fmt, ap); + exit(status); +} + +void warn(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vwarn(fmt, ap); + va_end(ap); +} + +void warnx(const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + vwarnx(fmt, ap); + va_end(ap); +} + +void err(int status, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + verr(status, fmt, ap); + va_end(ap); +} + +void errx(int status, const char *fmt, ...) +{ + va_list ap; + va_start(ap, fmt); + verrx(status, fmt, ap); + va_end(ap); +} -- 2.25.1