shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

inhibit: use pager for systemd-inhibit --list

Browse Source
This commit is contained in:
David Tardon 2018-05-17 15:45:37 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent a78388e1cb
commit f3c9133c50
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
man/systemd-inhibit.xml
View File

@ -131,6 +131,7 @@
acquiring one.</para></listitem> acquiring one.</para></listitem>
</varlistentry> </varlistentry>
<xi:include href="standard-options.xml" xpointer="no-pager" />
<xi:include href="standard-options.xml" xpointer="help" /> <xi:include href="standard-options.xml" xpointer="help" />
<xi:include href="standard-options.xml" xpointer="version" /> <xi:include href="standard-options.xml" xpointer="version" />
</variablelist> </variablelist>
@ -155,6 +156,8 @@
doing so.</para> doing so.</para>
</refsect1> </refsect1>
<xi:include href="less-variables.xml" />
<refsect1> <refsect1>
<title>See Also</title> <title>See Also</title>
<para> <para>

12
src/login/inhibit.c
View File

@ -18,6 +18,7 @@
#include "bus-util.h" #include "bus-util.h"
#include "fd-util.h" #include "fd-util.h"
#include "format-util.h" #include "format-util.h"
#include "pager.h"
#include "process-util.h" #include "process-util.h"
#include "signal-util.h" #include "signal-util.h"
#include "strv.h" #include "strv.h"
@ -28,6 +29,7 @@ static const char* arg_what = "idle:sleep:shutdown";
static const char* arg_who = NULL; static const char* arg_who = NULL;
static const char* arg_why = "Unknown reason"; static const char* arg_why = "Unknown reason";
static const char* arg_mode = NULL; static const char* arg_mode = NULL;
static bool arg_no_pager = false;
static enum { static enum {
ACTION_INHIBIT, ACTION_INHIBIT,
@ -69,6 +71,8 @@ static int print_inhibitors(sd_bus *bus, sd_bus_error *error) {
unsigned n = 0; unsigned n = 0;
int r; int r;
(void) pager_open(arg_no_pager, false);
r = sd_bus_call_method( r = sd_bus_call_method(
bus, bus,
"org.freedesktop.login1", "org.freedesktop.login1",
@ -121,6 +125,7 @@ static void help(void) {
"Execute a process while inhibiting shutdown/sleep/idle.\n\n" "Execute a process while inhibiting shutdown/sleep/idle.\n\n"
" -h --help Show this help\n" " -h --help Show this help\n"
" --version Show package version\n" " --version Show package version\n"
" --no-pager Do not pipe output into a pager\n"
" --what=WHAT Operations to inhibit, colon separated list of:\n" " --what=WHAT Operations to inhibit, colon separated list of:\n"
" shutdown, sleep, idle, handle-power-key,\n" " shutdown, sleep, idle, handle-power-key,\n"
" handle-suspend-key, handle-hibernate-key,\n" " handle-suspend-key, handle-hibernate-key,\n"
@ -141,6 +146,7 @@ static int parse_argv(int argc, char *argv[]) {
ARG_WHY, ARG_WHY,
ARG_MODE, ARG_MODE,
ARG_LIST, ARG_LIST,
ARG_NO_PAGER,
}; };
static const struct option options[] = { static const struct option options[] = {
@ -151,6 +157,7 @@ static int parse_argv(int argc, char *argv[]) {
{ "why", required_argument, NULL, ARG_WHY }, { "why", required_argument, NULL, ARG_WHY },
{ "mode", required_argument, NULL, ARG_MODE }, { "mode", required_argument, NULL, ARG_MODE },
{ "list", no_argument, NULL, ARG_LIST }, { "list", no_argument, NULL, ARG_LIST },
{ "no-pager", no_argument, NULL, ARG_NO_PAGER },
{} {}
}; };
@ -190,6 +197,10 @@ static int parse_argv(int argc, char *argv[]) {
arg_action = ACTION_LIST; arg_action = ACTION_LIST;
break; break;
case ARG_NO_PAGER:
arg_no_pager = true;
break;
case '?': case '?':
return -EINVAL; return -EINVAL;
@ -231,6 +242,7 @@ int main(int argc, char *argv[]) {
if (arg_action == ACTION_LIST) { if (arg_action == ACTION_LIST) {
r = print_inhibitors(bus, &error); r = print_inhibitors(bus, &error);
pager_close();
if (r < 0) { if (r < 0) {
log_error("Failed to list inhibitors: %s", bus_error_message(&error, -r)); log_error("Failed to list inhibitors: %s", bus_error_message(&error, -r));
return EXIT_FAILURE; return EXIT_FAILURE;