From b8e086f1857f0d7731c64647f81cdf6ee3b463b2 Mon Sep 17 00:00:00 2001 From: johannst Date: Sun, 21 Mar 2021 17:42:07 +0100 Subject: added efmt to write out error messages + ERROR_ON macro --- lib/src/io.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) (limited to 'lib/src/io.c') diff --git a/lib/src/io.c b/lib/src/io.c index efe938b..b5e0dc5 100644 --- a/lib/src/io.c +++ b/lib/src/io.c @@ -16,22 +16,34 @@ #define FD_STDOUT 1 #define FD_STDERR 2 -int pfmt(const char* fmt, ...) { +static int vdfmt(int fd, const char* fmt, va_list ap) { char buf[MAX_PRINTF_LEN]; - - va_list ap; - va_start(ap, fmt); int ret = vfmt(buf, sizeof(buf), fmt, ap); - va_end(ap); if (ret > MAX_PRINTF_LEN - 1) { - syscall3(__NR_write, FD_STDERR, buf, MAX_PRINTF_LEN - 1); + syscall3(__NR_write, fd, buf, MAX_PRINTF_LEN - 1); static const char warn[] = "\npfmt: Message truncated, max length can be configured by defining MAX_PRINTF_LEN\n"; - syscall3(__NR_write, FD_STDOUT, warn, sizeof(warn)); + syscall3(__NR_write, FD_STDERR, warn, sizeof(warn)); return MAX_PRINTF_LEN - 1; } - syscall3(__NR_write, FD_STDOUT, buf, ret); + syscall3(__NR_write, fd, buf, ret); + return ret; +} + +int pfmt(const char* fmt, ...) { + va_list ap; + va_start(ap, fmt); + int ret = vdfmt(FD_STDOUT, fmt, ap); + va_end(ap); + return ret; +} + +int efmt(const char* fmt, ...) { + va_list ap; + va_start(ap, fmt); + int ret = vdfmt(FD_STDERR, fmt, ap); + va_end(ap); return ret; } -- cgit v1.2.3