#include "id128-print.h"
#include "main-func.h"
#include "pretty-print.h"
+#include "terminal-util.h"
#include "util.h"
#include "verbs.h"
-static bool arg_pretty = false;
-static sd_id128_t arg_app = {};
+static Id128PrettyPrintMode arg_mode = ID128_PRINT_ID128;
+static sd_id128_t arg_app = SD_ID128_NULL;
static int verb_new(int argc, char **argv, void *userdata) {
- return id128_print_new(arg_pretty);
+ return id128_print_new(arg_mode);
}
static int verb_machine_id(int argc, char **argv, void *userdata) {
return log_error_errno(r, "Failed to get %smachine-ID: %m",
sd_id128_is_null(arg_app) ? "" : "app-specific ");
- return id128_pretty_print(id, arg_pretty);
+ return id128_pretty_print(id, arg_mode);
}
static int verb_boot_id(int argc, char **argv, void *userdata) {
return log_error_errno(r, "Failed to get %sboot-ID: %m",
sd_id128_is_null(arg_app) ? "" : "app-specific ");
- return id128_pretty_print(id, arg_pretty);
+ return id128_pretty_print(id, arg_mode);
}
static int verb_invocation_id(int argc, char **argv, void *userdata) {
if (r < 0)
return log_error_errno(r, "Failed to get invocation-ID: %m");
- return id128_pretty_print(id, arg_pretty);
+ return id128_pretty_print(id, arg_mode);
}
static int help(void) {
if (r < 0)
return log_oom();
- printf("%s [OPTIONS...] {COMMAND}\n\n"
- "Generate and print id128 strings.\n\n"
- " -h --help Show this help\n"
- " -p --pretty Generate samples of program code\n"
- " -a --app-specific=ID Generate app-specific IDs\n"
+ printf("%s [OPTIONS...] COMMAND\n\n"
+ "%sGenerate and print 128bit identifiers.%s\n"
"\nCommands:\n"
" new Generate a new id128 string\n"
" machine-id Print the ID of current machine\n"
" boot-id Print the ID of current boot\n"
" invocation-id Print the ID of current invocation\n"
" help Show this help\n"
+ "\nOptions:\n"
+ " -h --help Show this help\n"
+ " -p --pretty Generate samples of program code\n"
+ " -a --app-specific=ID Generate app-specific IDs\n"
+ " -u --uuid Output in UUID format\n"
"\nSee the %s for details.\n"
, program_invocation_short_name
+ , ansi_highlight(), ansi_normal()
, link
);
{ "version", no_argument, NULL, ARG_VERSION },
{ "pretty", no_argument, NULL, 'p' },
{ "app-specific", required_argument, NULL, 'a' },
+ { "uuid", no_argument, NULL, 'u' },
{},
};
assert(argc >= 0);
assert(argv);
- while ((c = getopt_long(argc, argv, "hpa:", options, NULL)) >= 0)
+ while ((c = getopt_long(argc, argv, "hpa:u", options, NULL)) >= 0)
switch (c) {
case 'h':
return version();
case 'p':
- arg_pretty = true;
+ arg_mode = ID128_PRINT_PRETTY;
break;
case 'a':
return log_error_errno(r, "Failed to parse \"%s\" as application-ID: %m", optarg);
break;
+ case 'u':
+ arg_mode = ID128_PRINT_UUID;
+ break;
+
case '?':
return -EINVAL;
#include "pretty-print.h"
#include "terminal-util.h"
-int id128_pretty_print(sd_id128_t id, bool pretty) {
- unsigned i;
+int id128_pretty_print(sd_id128_t id, Id128PrettyPrintMode mode) {
_cleanup_free_ char *man_link = NULL, *mod_link = NULL;
const char *on, *off;
+ unsigned i;
+
+ assert(mode >= 0);
+ assert(mode < _ID128_PRETTY_PRINT_MODE_MAX);
- if (!pretty) {
+ if (mode == ID128_PRINT_ID128) {
printf(SD_ID128_FORMAT_STR "\n",
SD_ID128_FORMAT_VAL(id));
return 0;
+ } else if (mode == ID128_PRINT_UUID) {
+ printf(SD_ID128_UUID_FORMAT_STR "\n",
+ SD_ID128_FORMAT_VAL(id));
+ return 0;
}
on = ansi_highlight();
"As UUID:\n"
"%s" SD_ID128_UUID_FORMAT_STR "%s\n\n"
"As %s macro:\n"
- "%s#define MESSAGE_XYZ SD_ID128_MAKE(",
+ "%s#define XYZ SD_ID128_MAKE(",
on, SD_ID128_FORMAT_VAL(id), off,
on, SD_ID128_FORMAT_VAL(id), off,
man_link,
printf("As Python constant:\n"
">>> import %s\n"
- ">>> %sMESSAGE_XYZ = uuid.UUID('" SD_ID128_FORMAT_STR "')%s\n",
+ ">>> %sXYZ = uuid.UUID('" SD_ID128_FORMAT_STR "')%s\n",
mod_link,
on, SD_ID128_FORMAT_VAL(id), off);
return 0;
}
-int id128_print_new(bool pretty) {
+int id128_print_new(Id128PrettyPrintMode mode) {
sd_id128_t id;
int r;
if (r < 0)
return log_error_errno(r, "Failed to generate ID: %m");
- return id128_pretty_print(id, pretty);
+ return id128_pretty_print(id, mode);
}