diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-14 20:09:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 20:09:39 +0100 |
| commit | 042cad5737917e6964ddddba72b8fcc0cb890877 (patch) | |
| tree | 7085fa0272983217e94d5ce8f84cd5056d6ece31 /src/login | |
| parent | 3dafa6bc7636451e49565f6260c531c0304285f6 (diff) | |
| parent | 84afbbcf242aef2a7ff5449be84a98e315cd4b10 (diff) | |
| download | systemd-042cad5737917e6964ddddba72b8fcc0cb890877.tar.gz systemd-042cad5737917e6964ddddba72b8fcc0cb890877.tar.bz2 systemd-042cad5737917e6964ddddba72b8fcc0cb890877.zip | |
Merge pull request #10753 from keszybz/pager-no-interrupt
Add mode in journalctl where ^C is handled by the pager
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/inhibit.c | 6 | ||||
| -rw-r--r-- | src/login/loginctl.c | 18 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 8fe64b9184..22fee49a2b 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -26,7 +26,7 @@ static const char* arg_what = "idle:sleep:shutdown"; static const char* arg_who = NULL; static const char* arg_why = "Unknown reason"; static const char* arg_mode = NULL; -static bool arg_no_pager = false; +static PagerFlags arg_pager_flags = 0; static bool arg_legend = true; static enum { @@ -68,7 +68,7 @@ static int print_inhibitors(sd_bus *bus) { _cleanup_(table_unrefp) Table *table = NULL; int r; - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); r = sd_bus_call_method( bus, @@ -241,7 +241,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_NO_PAGER: - arg_no_pager = true; + arg_pager_flags |= PAGER_DISABLE; break; case ARG_NO_LEGEND: diff --git a/src/login/loginctl.c b/src/login/loginctl.c index 2a3289951a..d6250253d6 100644 --- a/src/login/loginctl.c +++ b/src/login/loginctl.c @@ -38,7 +38,7 @@ static char **arg_property = NULL; static bool arg_all = false; static bool arg_value = false; static bool arg_full = false; -static bool arg_no_pager = false; +static PagerFlags arg_pager_flags = 0; static bool arg_legend = true; static const char *arg_kill_who = NULL; static int arg_signal = SIGTERM; @@ -122,7 +122,7 @@ static int list_sessions(int argc, char *argv[], void *userdata) { assert(bus); assert(argv); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); r = sd_bus_call_method( bus, @@ -203,7 +203,7 @@ static int list_users(int argc, char *argv[], void *userdata) { assert(bus); assert(argv); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); r = sd_bus_call_method( bus, @@ -260,7 +260,7 @@ static int list_seats(int argc, char *argv[], void *userdata) { assert(bus); assert(argv); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); r = sd_bus_call_method( bus, @@ -836,7 +836,7 @@ static int show_session(int argc, char *argv[], void *userdata) { properties = !strstr(argv[0], "status"); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); if (argc <= 1) { const char *session, *p = "/org/freedesktop/login1/session/self"; @@ -885,7 +885,7 @@ static int show_user(int argc, char *argv[], void *userdata) { properties = !strstr(argv[0], "status"); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); if (argc <= 1) { /* If not argument is specified inspect the manager @@ -943,7 +943,7 @@ static int show_seat(int argc, char *argv[], void *userdata) { properties = !strstr(argv[0], "status"); - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); if (argc <= 1) { /* If not argument is specified inspect the manager @@ -1284,7 +1284,7 @@ static int help(int argc, char *argv[], void *userdata) { _cleanup_free_ char *link = NULL; int r; - (void) pager_open(arg_no_pager, false); + (void) pager_open(arg_pager_flags); r = terminal_urlify_man("loginctl", "1", &link); if (r < 0) @@ -1435,7 +1435,7 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_NO_PAGER: - arg_no_pager = true; + arg_pager_flags |= PAGER_DISABLE; break; case ARG_NO_LEGEND: |