SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #29184 from keszybz/more-pager

Browse Source 
Use the pager in more places
This commit is contained in:
Mike Yuan
2023-09-15 19:53:58 +08:00
committed by GitHub
parent 5898cef22a 87cc99332e
commit 165947382b
5 changed files with 51 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/standard-options.xml
+13 -1
View File
@@ -3,7 +3,9 @@
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
<!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
<variablelist>
<variablelist
xmlns:xi="http://www.w3.org/2001/XInclude">
<varlistentry id='help'>
<term><option>-h</option></term>
<term><option>--help</option></term>
@@ -29,6 +31,16 @@
</listitem>
</varlistentry>
<varlistentry id='no-pager-255'>
<term><option>--no-pager</option></term>
<listitem>
<para>Do not pipe output into a pager.</para>
<xi:include href="version-info.xml" xpointer="v255"/>
</listitem>
</varlistentry>
<varlistentry id='no-ask-password'>
<term><option>--no-ask-password</option></term>
man/systemd-path.xml
+1
View File
@@ -59,6 +59,7 @@
<xi:include href="version-info.xml" xpointer="v215"/></listitem>
</varlistentry>
<xi:include href="standard-options.xml" xpointer="no-pager-255"/>
<xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" />
</variablelist>
src/boot/bootctl.c
+2
View File
@@ -132,6 +132,8 @@ static int help(int argc, char *argv[], void *userdata) {
_cleanup_free_ char *link = NULL;
int r;
pager_open(arg_pager_flags);
r = terminal_urlify_man("bootctl", "1", &link);
if (r < 0)
return log_oom();
src/import/export.c
+13 -8
View File
@@ -18,6 +18,7 @@
#include "main-func.h"
#include "signal-util.h"
#include "string-util.h"
#include "terminal-util.h"
#include "verbs.h"
static ImportCompressType arg_compress = IMPORT_COMPRESS_UNKNOWN;
@@ -201,16 +202,20 @@ static int export_raw(int argc, char *argv[], void *userdata) {
}
static int help(int argc, char *argv[], void *userdata) {
printf("%s [OPTIONS...] {COMMAND} ...\n\n"
"Export container or virtual machine images.\n\n"
printf("%1$s [OPTIONS...] {COMMAND} ...\n"
"\n%4$sExport container or virtual machine images.%5$s\n"
"\n%2$sCommands:%3$s\n"
" tar NAME [FILE] Export a TAR image\n"
" raw NAME [FILE] Export a RAW image\n"
"\n%2$sOptions:%3$s\n"
" -h --help Show this help\n"
" --version Show package version\n"
" --format=FORMAT Select format\n\n"
"Commands:\n"
" tar NAME [FILE] Export a TAR image\n"
" raw NAME [FILE] Export a RAW image\n",
program_invocation_short_name);
" --format=FORMAT Select format\n\n",
program_invocation_short_name,
ansi_underline(),
ansi_normal(),
ansi_highlight(),
ansi_normal());
return 0;
}
src/path/path.c
+22 -19
View File
@@ -12,10 +12,12 @@
#include "log.h"
#include "macro.h"
#include "main-func.h"
#include "pager.h"
#include "pretty-print.h"
#include "string-util.h"
static const char *arg_suffix = NULL;
PagerFlags arg_pager_flags = 0;
static const char* const path_table[_SD_PATH_MAX] = {
[SD_PATH_TEMPORARY] = "temporary",
@@ -101,11 +103,12 @@ static const char* const path_table[_SD_PATH_MAX] = {
[SD_PATH_SYSTEMD_SEARCH_USER_ENVIRONMENT_GENERATOR] = "systemd-search-user-environment-generator",
};
static int list_homes(void) {
uint64_t i = 0;
static int list_paths(void) {
int r = 0;
for (i = 0; i < ELEMENTSOF(path_table); i++) {
pager_open(arg_pager_flags);
for (size_t i = 0; i < ELEMENTSOF(path_table); i++) {
_cleanup_free_ char *p = NULL;
int q;
@@ -114,7 +117,7 @@ static int list_homes(void) {
log_full_errno(q == -ENXIO ? LOG_DEBUG : LOG_ERR,
q, "Failed to query %s: %m", path_table[i]);
if (q != -ENXIO)
r = q;
RET_GATHER(r, q);
continue;
}
@@ -124,11 +127,10 @@ static int list_homes(void) {
return r;
}
static int print_home(const char *n) {
uint64_t i = 0;
static int print_path(const char *n) {
int r;
for (i = 0; i < ELEMENTSOF(path_table); i++) {
for (size_t i = 0; i < ELEMENTSOF(path_table); i++)
if (streq(path_table[i], n)) {
_cleanup_free_ char *p = NULL;
@@ -139,7 +141,6 @@ static int print_home(const char *n) {
printf("%s\n", p);
return 0;
}
}
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Path %s not known.", n);
@@ -158,6 +159,7 @@ static int help(void) {
" -h --help Show this help\n"
" --version Show package version\n"
" --suffix=SUFFIX Suffix to append to paths\n"
" --no-pager Do not pipe output into a pager\n"
"\nSee the %s for details.\n",
program_invocation_short_name,
link);
@@ -169,12 +171,14 @@ static int parse_argv(int argc, char *argv[]) {
enum {
ARG_VERSION = 0x100,
ARG_SUFFIX,
ARG_NO_PAGER,
};
static const struct option options[] = {
{ "help", no_argument, NULL, 'h' },
{ "version", no_argument, NULL, ARG_VERSION },
{ "suffix", required_argument, NULL, ARG_SUFFIX },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{}
};
@@ -197,6 +201,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_suffix = optarg;
break;
case ARG_NO_PAGER:
arg_pager_flags |= PAGER_DISABLE;
break;
case '?':
return -EINVAL;
@@ -218,18 +226,13 @@ static int run(int argc, char* argv[]) {
if (r <= 0)
return r;
if (argc > optind) {
int i, q;
if (argc > optind)
for (int i = optind; i < argc; i++)
RET_GATHER(r, print_path(argv[i]));
else
r = list_paths();
for (i = optind; i < argc; i++) {
q = print_home(argv[i]);
if (q < 0)
r = q;
}
return r;
} else
return list_homes();
return r;
}
DEFINE_MAIN_FUNCTION(run);