GitHub-Mirror/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2025-10-06 00:13:24 +02:00
Code Issues Releases Wiki Activity

userdbctl: use table to parse --output=

Browse Source
This commit is contained in:
David Tardon
2025-09-26 16:11:17 +02:00
parent a5fada5d5d
commit f29f6b6b7d
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/userdb/userdbctl.c
View File

@@ -26,6 +26,7 @@
#include "pretty-print.h" #include "pretty-print.h"
#include "recurse-dir.h" #include "recurse-dir.h"
#include "socket-util.h" #include "socket-util.h"
#include "string-table.h"
#include "string-util.h" #include "string-util.h"
#include "strv.h" #include "strv.h"
#include "uid-classification.h" #include "uid-classification.h"
@@ -37,14 +38,16 @@
#include "verbs.h" #include "verbs.h"
#include "virt.h" #include "virt.h"
static enum { typedef enum {
OUTPUT_CLASSIC, OUTPUT_CLASSIC,
OUTPUT_TABLE, OUTPUT_TABLE,
OUTPUT_FRIENDLY, OUTPUT_FRIENDLY,
OUTPUT_JSON, OUTPUT_JSON,
_OUTPUT_MAX,
_OUTPUT_INVALID = -EINVAL, _OUTPUT_INVALID = -EINVAL,
} arg_output = _OUTPUT_INVALID; } Output;
static Output arg_output = _OUTPUT_INVALID;
static PagerFlags arg_pager_flags = 0; static PagerFlags arg_pager_flags = 0;
static bool arg_legend = true; static bool arg_legend = true;
static char** arg_services = NULL; static char** arg_services = NULL;
@@ -61,6 +64,15 @@ static sd_json_variant *arg_from_file = NULL;
STATIC_DESTRUCTOR_REGISTER(arg_services, strv_freep); STATIC_DESTRUCTOR_REGISTER(arg_services, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_from_file, sd_json_variant_unrefp); STATIC_DESTRUCTOR_REGISTER(arg_from_file, sd_json_variant_unrefp);
static const char *output_table[_OUTPUT_MAX] = {
[OUTPUT_CLASSIC] = "classic",
[OUTPUT_TABLE] = "table",
[OUTPUT_FRIENDLY] = "friendly",
[OUTPUT_JSON] = "json",
};
DEFINE_PRIVATE_STRING_TABLE_LOOKUP(output, Output);
static const char *user_disposition_to_color(UserDisposition d) { static const char *user_disposition_to_color(UserDisposition d) {
assert(d >= 0); assert(d >= 0);
assert(d < _USER_DISPOSITION_MAX); assert(d < _USER_DISPOSITION_MAX);
@@ -1652,22 +1664,12 @@ static int parse_argv(int argc, char *argv[]) {
break; break;
case ARG_OUTPUT: case ARG_OUTPUT:
if (streq(optarg, "classic")) if (streq(optarg, "help"))
arg_output = OUTPUT_CLASSIC; return DUMP_STRING_TABLE(output, Output, _OUTPUT_MAX);
else if (streq(optarg, "friendly"))
arg_output = OUTPUT_FRIENDLY; arg_output = output_from_string(optarg);
else if (streq(optarg, "json")) if (arg_output < 0)
arg_output = OUTPUT_JSON; return log_error_errno(arg_output, "Invalid --output= mode: %s", optarg);
else if (streq(optarg, "table"))
arg_output = OUTPUT_TABLE;
else if (streq(optarg, "help")) {
puts("classic\n"
"friendly\n"
"json\n"
"table");
return 0;
} else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Invalid --output= mode: %s", optarg);
arg_json_format_flags = arg_output == OUTPUT_JSON ? SD_JSON_FORMAT_PRETTY|SD_JSON_FORMAT_COLOR_AUTO : SD_JSON_FORMAT_OFF; arg_json_format_flags = arg_output == OUTPUT_JSON ? SD_JSON_FORMAT_PRETTY|SD_JSON_FORMAT_COLOR_AUTO : SD_JSON_FORMAT_OFF;
break; break;