diff options
Diffstat (limited to 'minecctl/misc.c')
| -rw-r--r-- | minecctl/misc.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/minecctl/misc.c b/minecctl/misc.c index 3f5ba50..c8e1d05 100644 --- a/minecctl/misc.c +++ b/minecctl/misc.c @@ -9,8 +9,6 @@ #include "misc.h" #include "minecctl.h" -bool use_colors = false; - /* FIXME: Can be shared */ void set_use_colors() { @@ -34,7 +32,7 @@ void set_use_colors() if (streq(e, "dumb")) return; - use_colors = true; + enable_colors(); } char **strv_copy(char *const *strv) @@ -210,20 +208,23 @@ void free_password(char **password) void __debug(_unused_ enum debug_lvl lvl, const char *fmt, ...) { va_list ap; + const char *color = NULL; - if (use_colors) { - if (lvl & DBG_ERROR) - fprintf(stderr, ANSI_RED); - else if (!(lvl & (DBG_INFO | DBG_VERBOSE))) - fprintf(stderr, ANSI_GREY); - } + + if (lvl & DBG_ERROR) + color = ansi_red; + else if (!(lvl & (DBG_INFO | DBG_VERBOSE))) + color = ansi_grey; + + if (color) + fprintf(stderr, "%s", color); va_start(ap, fmt); vfprintf(stderr, fmt, ap); va_end(ap); - if (use_colors && !(lvl & (DBG_INFO | DBG_VERBOSE))) - fprintf(stderr, ANSI_NORMAL); + if (color) + fprintf(stderr, "%s", ansi_normal); } _noreturn_ void __die(const char *fmt, ...) |