diff options
author | Lennart Poettering <lennart@poettering.net> | 2021-11-23 10:37:03 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2021-11-23 22:40:15 +0100 |
commit | 3131c24bd61ee25a63494594e1cfb02ae5382e58 (patch) | |
tree | 9e854e901ac88ad8f5c97fa92678cd1e54d21af3 | |
parent | 98503c6d0cae795be89efd74ccab821729c2143a (diff) | |
download | systemd-3131c24bd61ee25a63494594e1cfb02ae5382e58.tar.gz |
pretty-print: add helper for quickly outputting red/green cross/check marks
Compound constructors FTW!
-rw-r--r-- | src/shared/pretty-print.h | 23 | ||||
-rw-r--r-- | src/test/test-pretty-print.c | 14 |
2 files changed, 37 insertions, 0 deletions
diff --git a/src/shared/pretty-print.h b/src/shared/pretty-print.h index 4619f4e4d7..45644da67d 100644 --- a/src/shared/pretty-print.h +++ b/src/shared/pretty-print.h @@ -1,6 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #pragma once +#include "glyph-util.h" +#include "terminal-util.h" + void print_separator(void); int file_url_from_path(const char *path, char **ret); @@ -17,3 +20,23 @@ typedef enum CatFlags { int cat_files(const char *file, char **dropins, CatFlags flags); int conf_files_cat(const char *root, const char *name); + +#define RED_CROSS_MARK_MAX (STRLEN(ANSI_HIGHLIGHT_RED) + STRLEN("✗") + STRLEN(ANSI_NORMAL) + 1) +#define GREEN_CHECK_MARK_MAX (STRLEN(ANSI_HIGHLIGHT_GREEN) + STRLEN("✓") + STRLEN(ANSI_NORMAL) + 1) + +static inline const char *red_cross_mark_internal(char buffer[static RED_CROSS_MARK_MAX]) { + assert(buffer); + assert_se(stpcpy(stpcpy(stpcpy(buffer, ansi_highlight_red()), special_glyph(SPECIAL_GLYPH_CROSS_MARK)), ansi_normal()) < buffer + RED_CROSS_MARK_MAX); + return buffer; +} + +static inline const char *green_check_mark_internal(char buffer[static GREEN_CHECK_MARK_MAX]) { + assert(buffer); + assert_se(stpcpy(stpcpy(stpcpy(buffer, ansi_highlight_green()), special_glyph(SPECIAL_GLYPH_CHECK_MARK)), ansi_normal()) < buffer + GREEN_CHECK_MARK_MAX); + return buffer; +} + +#define RED_CROSS_MARK() red_cross_mark_internal((char[RED_CROSS_MARK_MAX]) {}) +#define GREEN_CHECK_MARK() green_check_mark_internal((char[GREEN_CHECK_MARK_MAX]) {}) + +#define COLOR_MARK_BOOL(b) ((b) ? GREEN_CHECK_MARK() : RED_CROSS_MARK()) diff --git a/src/test/test-pretty-print.c b/src/test/test-pretty-print.c index dbae34e73e..4620d39bb6 100644 --- a/src/test/test-pretty-print.c +++ b/src/test/test-pretty-print.c @@ -31,11 +31,25 @@ static void test_cat_files(void) { assert_se(cat_files("/etc/fstab", STRV_MAKE("/etc/fstab", "/etc/fstab"), 0) == 0); } +static void test_red_green_cross_check_mark(void) { + bool b = false; + + printf("yeah: <%s>\n", GREEN_CHECK_MARK()); + printf("nay: <%s>\n", RED_CROSS_MARK()); + + printf("%s → %s → %s → %s\n", + COLOR_MARK_BOOL(b), + COLOR_MARK_BOOL(!b), + COLOR_MARK_BOOL(!!b), + COLOR_MARK_BOOL(!!!b)); +} + int main(int argc, char *argv[]) { test_setup_logging(LOG_INFO); test_terminal_urlify(); test_cat_files(); + test_red_green_cross_check_mark(); print_separator(); |