From 4d42094a64825b8c3ce63bfeb1a26ae5a128a460 Mon Sep 17 00:00:00 2001 From: Daniel Eklöf Date: Tue, 9 Feb 2021 21:07:30 +0100 Subject: client: add -d,--log-level --- client.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 54 insertions(+), 14 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index dead7117..a1b86d30 100644 --- a/client.c +++ b/client.c @@ -17,6 +17,7 @@ #include "client-protocol.h" #include "debug.h" #include "foot-features.h" +#include "util.h" #include "version.h" #include "xmalloc.h" @@ -44,18 +45,19 @@ print_usage(const char *prog_name) printf("Usage: %s [OPTIONS...] [ARGS...]\n", prog_name); printf("\n"); printf("Options:\n"); - printf(" -t,--term=TERM value to set the environment variable TERM to (foot)\n" - " --title=TITLE initial window title (foot)\n" - " -a,--app-id=ID window application ID (foot)\n" - " -w,--window-size-pixels=WIDTHxHEIGHT initial width and height, in pixels\n" - " -W,--window-size-chars=WIDTHxHEIGHT initial width and height, in characters\n" - " --maximized start in maximized mode\n" - " --fullscreen start in fullscreen mode\n" - " --login-shell start shell as a login shell\n" - " -s,--server-socket=PATH path to the server UNIX domain socket (default=$XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock)\n" - " --hold remain open after child process exits\n" - " -l,--log-colorize=[never|always|auto] enable/disable colorization of log output on stderr\n" - " -v,--version show the version number and quit\n"); + printf(" -t,--term=TERM value to set the environment variable TERM to (foot)\n" + " --title=TITLE initial window title (foot)\n" + " -a,--app-id=ID window application ID (foot)\n" + " -w,--window-size-pixels=WIDTHxHEIGHT initial width and height, in pixels\n" + " -W,--window-size-chars=WIDTHxHEIGHT initial width and height, in characters\n" + " --maximized start in maximized mode\n" + " --fullscreen start in fullscreen mode\n" + " --login-shell start shell as a login shell\n" + " -s,--server-socket=PATH path to the server UNIX domain socket (default=$XDG_RUNTIME_DIR/foot-$WAYLAND_DISPLAY.sock)\n" + " --hold remain open after child process exits\n" + " -d,---log-level={info|warning|error} log level (info)\n" + " -l,--log-colorize=[{never|always|auto}] enable/disable colorization of log output on stderr\n" + " -v,--version show the version number and quit\n"); } int @@ -76,6 +78,7 @@ main(int argc, char *const *argv) {"login-shell", no_argument, NULL, 'L'}, {"server-socket", required_argument, NULL, 's'}, {"hold", no_argument, NULL, 'H'}, + {"log-level", required_argument, NULL, 'd'}, {"log-colorize", optional_argument, NULL, 'l'}, {"version", no_argument, NULL, 'v'}, {"help", no_argument, NULL, 'h'}, @@ -89,6 +92,7 @@ main(int argc, char *const *argv) unsigned width = 0; unsigned height = 0; const char *server_socket_path = NULL; + enum log_class log_level = LOG_CLASS_INFO; enum log_colorize log_colorize = LOG_COLORIZE_AUTO; bool login_shell = false; bool maximized = false; @@ -96,7 +100,7 @@ main(int argc, char *const *argv) bool hold = false; while (true) { - int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLs:Hl::vh", longopts, NULL); + int c = getopt_long(argc, argv, "+t:T:a:w:W:mFLs:Hd:l::vh", longopts, NULL); if (c == -1) break; @@ -151,6 +155,42 @@ main(int argc, char *const *argv) hold = true; break; + case 'd': { + static const char *log_level_map[] = { +#if defined(_DEBUG) + [LOG_CLASS_DEBUG] = "debug", +#endif + [LOG_CLASS_INFO] = "info", + [LOG_CLASS_WARNING] = "warning", + [LOG_CLASS_ERROR] = "error", + }; + + bool valid_log_level = false; + for (size_t i = 0; i < ALEN(log_level_map); i++) { + if (strcmp(optarg, log_level_map[i]) == 0) { + log_level = i; + valid_log_level = true; + break; + } + } + + if (!valid_log_level) { + fprintf( + stderr, "-d,--log-level: %s: argument must be one of ", + optarg); + + for (size_t i = 0; i < ALEN(log_level_map); i++) { + fprintf(stderr, "'%s'%s", + log_level_map[i], + i < ALEN(log_level_map) - 1 ? " , " : ""); + } + fprintf(stderr, "\n"); + + return EXIT_FAILURE; + } + break; + } + case 'l': if (optarg == NULL || strcmp(optarg, "auto") == 0) log_colorize = LOG_COLORIZE_AUTO; @@ -180,7 +220,7 @@ main(int argc, char *const *argv) argc -= optind; argv += optind; - log_init(log_colorize, false, LOG_FACILITY_USER, LOG_CLASS_WARNING); + log_init(log_colorize, false, LOG_FACILITY_USER, log_level); /* malloc:ed and needs to be in scope of all goto's */ char *cwd = NULL; -- cgit v1.3 From 5437321f97e21a3fc6fca79fbdf05ca8d6199b35 Mon Sep 17 00:00:00 2001 From: Craig Barnes Date: Thu, 11 Feb 2021 11:08:18 +0000 Subject: main: client: factor out some common code for "--log-level" option --- client.c | 37 ++++++++----------------------------- log.c | 40 ++++++++++++++++++++++++++++++++++++++++ log.h | 3 +++ main.c | 37 ++++++++----------------------------- meson.build | 2 ++ 5 files changed, 61 insertions(+), 58 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index a1b86d30..bf9264ee 100644 --- a/client.c +++ b/client.c @@ -17,6 +17,7 @@ #include "client-protocol.h" #include "debug.h" #include "foot-features.h" +#include "macros.h" #include "util.h" #include "version.h" #include "xmalloc.h" @@ -156,38 +157,16 @@ main(int argc, char *const *argv) break; case 'd': { - static const char *log_level_map[] = { -#if defined(_DEBUG) - [LOG_CLASS_DEBUG] = "debug", -#endif - [LOG_CLASS_INFO] = "info", - [LOG_CLASS_WARNING] = "warning", - [LOG_CLASS_ERROR] = "error", - }; - - bool valid_log_level = false; - for (size_t i = 0; i < ALEN(log_level_map); i++) { - if (strcmp(optarg, log_level_map[i]) == 0) { - log_level = i; - valid_log_level = true; - break; - } - } - - if (!valid_log_level) { + int lvl = log_level_from_string(optarg); + if (unlikely(lvl < 0)) { fprintf( - stderr, "-d,--log-level: %s: argument must be one of ", - optarg); - - for (size_t i = 0; i < ALEN(log_level_map); i++) { - fprintf(stderr, "'%s'%s", - log_level_map[i], - i < ALEN(log_level_map) - 1 ? " , " : ""); - } - fprintf(stderr, "\n"); - + stderr, + "-d,--log-level: %s: argument must be one of %s\n", + optarg, + log_level_string_hint()); return EXIT_FAILURE; } + log_level = lvl; break; } diff --git a/log.c b/log.c index 10ba5346..1c33c723 100644 --- a/log.c +++ b/log.c @@ -10,11 +10,22 @@ #include #include "debug.h" +#include "util.h" +#include "xsnprintf.h" static bool colorize = false; static bool do_syslog = true; static enum log_class log_level = LOG_CLASS_INFO; +static const char log_level_map[][8] = { + [LOG_CLASS_ERROR] = "error", + [LOG_CLASS_WARNING] = "warning", + [LOG_CLASS_INFO] = "info", +#if defined(_DEBUG) + [LOG_CLASS_DEBUG] = "debug", +#endif +}; + void log_init(enum log_colorize _colorize, bool _do_syslog, enum log_facility syslog_facility, enum log_class _log_level) @@ -149,3 +160,32 @@ void log_errno_provided(enum log_class log_class, const char *module, va_end(ap1); va_end(ap2); } + +int +log_level_from_string(const char *str) +{ + if (unlikely(str[0] == '\0')) + return -1; + + for (int i = 0, n = ALEN(log_level_map); i < n; i++) + if (strcmp(str, log_level_map[i]) == 0) + return i; + + return -1; +} + +const char * +log_level_string_hint(void) +{ + static char buf[64]; + if (buf[0] != '\0') + return buf; + + for (size_t i = 0, pos = 0, n = ALEN(log_level_map); i < n; i++) { + const char *entry = log_level_map[i]; + const char *delim = (i + 1 < n) ? ", " : ""; + pos += xsnprintf(buf + pos, sizeof(buf) - pos, "'%s'%s", entry, delim); + } + + return buf; +} diff --git a/log.h b/log.h index 5baddfcd..f0c28d7b 100644 --- a/log.h +++ b/log.h @@ -23,6 +23,9 @@ void log_errno_provided( const char *file, int lineno, int _errno, const char *fmt, ...) PRINTF(6); +int log_level_from_string(const char *str); +const char *log_level_string_hint(void); + #define LOG_ERR(...) \ log_msg(LOG_CLASS_ERROR, LOG_MODULE, __FILE__, __LINE__, __VA_ARGS__) #define LOG_ERRNO(...) \ diff --git a/main.c b/main.c index 4ea6e1fb..0fbf4e8b 100644 --- a/main.c +++ b/main.c @@ -23,6 +23,7 @@ #include "config.h" #include "foot-features.h" #include "fdm.h" +#include "macros.h" #include "reaper.h" #include "render.h" #include "server.h" @@ -310,38 +311,16 @@ main(int argc, char *const *argv) break; case 'd': { - static const char *log_level_map[] = { -#if defined(_DEBUG) - [LOG_CLASS_DEBUG] = "debug", -#endif - [LOG_CLASS_INFO] = "info", - [LOG_CLASS_WARNING] = "warning", - [LOG_CLASS_ERROR] = "error", - }; - - bool valid_log_level = false; - for (size_t i = 0; i < ALEN(log_level_map); i++) { - if (strcmp(optarg, log_level_map[i]) == 0) { - log_level = i; - valid_log_level = true; - break; - } - } - - if (!valid_log_level) { + int lvl = log_level_from_string(optarg); + if (unlikely(lvl < 0)) { fprintf( - stderr, "-d,--log-level: %s: argument must be one of ", - optarg); - - for (size_t i = 0; i < ALEN(log_level_map); i++) { - fprintf(stderr, "'%s'%s", - log_level_map[i], - i < ALEN(log_level_map) - 1 ? " , " : ""); - } - fprintf(stderr, "\n"); - + stderr, + "-d,--log-level: %s: argument must be one of %s\n", + optarg, + log_level_string_hint()); return EXIT_FAILURE; } + log_level = lvl; break; } diff --git a/meson.build b/meson.build index f2e6da2b..85875e7a 100644 --- a/meson.build +++ b/meson.build @@ -196,7 +196,9 @@ executable( 'foot-features.h', 'log.c', 'log.h', 'macros.h', + 'util.h', 'xmalloc.c', 'xmalloc.h', + 'xsnprintf.c', 'xsnprintf.h', version, install: true) -- cgit v1.3