From f2584b67445ca63d3ec8e4a11202a19250434fc8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Fri, 24 Jun 2016 13:58:56 +0200 Subject: [PATCH] improves verbose messages MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I176f5647512f50dce50d6db2de6204b5bc6e4d52 Signed-off-by: José Bollo --- src/verbose.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/verbose.c b/src/verbose.c index 53811c00..a91aeb1f 100644 --- a/src/verbose.c +++ b/src/verbose.c @@ -48,6 +48,12 @@ void verbose_set_name(const char *name, int authority) #else +#include + +static const char *appname; + +static int appauthority; + static const char *prefixes[] = { "<0> EMERGENCY", "<1> ALERT", @@ -61,9 +67,11 @@ static const char *prefixes[] = { void vverbose(int level, const char *file, int line, const char *fmt, va_list args) { - fprintf(stderr, "%s: ", prefixes[LEVEL(level)]); + int tty = isatty(fileno(stderr)); + + fprintf(stderr, "%s: ", prefixes[LEVEL(level)] + (tty ? 4 : 0)); vfprintf(stderr, fmt, args); - if (file != NULL) + if (file != NULL && (!tty || verbosity >5)) fprintf(stderr, " [%s:%d]\n", file, line); else fprintf(stderr, "\n"); @@ -71,7 +79,8 @@ void vverbose(int level, const char *file, int line, const char *fmt, va_list ar void verbose_set_name(const char *name, int authority) { - fprintf(stderr, "%s: application name is '%s' for '%s'\n", prefixes[5], name, authority ? "AUTHORITY" : "USER"); + appname = name; + appauthority = authority; } #endif -- 2.16.6