dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 15:10:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: pipe journalctl help output into a pager

Browse Source 
journalctl help output might run off the screen, so be consistent
as other systemd tools do and pipe it into a pager.
This commit is contained in:
Djalal Harouni
2013-12-12 00:22:48 +01:00
committed by Zbigniew Jędrzejewski-Szmek
parent 05b92756f7
commit faf5077f89
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/journal/journalctl.c
View File

@@ -114,8 +114,18 @@ typedef struct boot_id_t {
uint64_t last;
} boot_id_t;
static void pager_open_if_enabled(void) {
if (arg_no_pager)
return;
pager_open(arg_pager_end);
}
static int help(void) {
pager_open_if_enabled();
printf("%s [OPTIONS...] [MATCHES...]\n\n"
"Query the journal.\n\n"
"Flags:\n"
@@ -1647,8 +1657,8 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
if (!arg_no_pager && !arg_follow)
pager_open(arg_pager_end);
if (!arg_follow)
pager_open_if_enabled();
if (!arg_quiet) {
usec_t start, end;