#include "string-util.h"
#include "strv.h"
-static bool arg_cat_config = false;
+static CatFlags arg_cat_flags = CAT_CONFIG_OFF;
static PagerFlags arg_pager_flags = 0;
static bool arg_unregister = false;
return r;
}
+static int cat_config(char **files) {
+ pager_open(arg_pager_flags);
+
+ return cat_files(NULL, files, arg_cat_flags);
+}
+
static int help(void) {
_cleanup_free_ char *link = NULL;
int r;
" -h --help Show this help\n"
" --version Show package version\n"
" --cat-config Show configuration files\n"
+ " --tldr Show non-comment parts of configuration\n"
" --no-pager Do not pipe output into a pager\n"
" --unregister Unregister all existing entries\n"
"\nSee the %s for details.\n",
enum {
ARG_VERSION = 0x100,
ARG_CAT_CONFIG,
+ ARG_TLDR,
ARG_NO_PAGER,
ARG_UNREGISTER,
};
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "cat-config", no_argument, NULL, ARG_CAT_CONFIG },
+ { "tldr", no_argument, NULL, ARG_TLDR },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{ "unregister", no_argument, NULL, ARG_UNREGISTER },
{}
return version();
case ARG_CAT_CONFIG:
- arg_cat_config = true;
+ arg_cat_flags = CAT_CONFIG_ON;
+ break;
+
+ case ARG_TLDR:
+ arg_cat_flags = CAT_TLDR;
break;
case ARG_NO_PAGER:
assert_not_reached();
}
- if ((arg_unregister || arg_cat_config) && argc > optind)
+ if ((arg_unregister || arg_cat_flags != CAT_CONFIG_OFF) && argc > optind)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
- "Positional arguments are not allowed with --cat-config or --unregister");
+ "Positional arguments are not allowed with --cat-config/--tldr or --unregister.");
return 1;
}
if (r < 0)
return log_error_errno(r, "Failed to enumerate binfmt.d files: %m");
- if (arg_cat_config) {
- pager_open(arg_pager_flags);
-
- return cat_files(NULL, files, 0);
- }
+ if (arg_cat_flags != CAT_CONFIG_OFF)
+ return cat_config(files);
r = binfmt_mounted_warn();
if (r <= 0)