picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

systemctl: spawn pager only for commands that generates long output

This commit is contained in:
Lennart Poettering 2011-01-04 01:04:20 +01:00
parent 1888c9074a
commit ec14911e0d
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/systemctl.c
View File

@ -113,6 +113,7 @@ static bool private_bus = false;
static pid_t pager_pid = 0;
static int daemon_reload(DBusConnection *bus, char **args, unsigned n);
static void pager_open(void);
static bool on_tty(void) {
static int t = -1;
@ -421,6 +422,8 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
assert(bus);
pager_open();
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
@ -767,6 +770,8 @@ static int list_jobs(DBusConnection *bus, char **args, unsigned n) {
assert(bus);
pager_open();
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
@ -2477,6 +2482,9 @@ static int show(DBusConnection *bus, char **args, unsigned n) {
show_properties = !streq(args[0], "status");
if (show_properties)
pager_open();
if (show_properties && n <= 1) {
/* If not argument is specified inspect the manager
* itself */
@ -2860,6 +2868,8 @@ static int dump(DBusConnection *bus, char **args, unsigned n) {
dbus_error_init(&error);
pager_open();
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
@ -3222,6 +3232,8 @@ static int show_enviroment(DBusConnection *bus, char **args, unsigned n) {
dbus_error_init(&error);
pager_open();
if (!(m = dbus_message_new_method_call(
"org.freedesktop.systemd1",
"/org/freedesktop/systemd1",
@ -5370,8 +5382,6 @@ int main(int argc, char*argv[]) {
goto finish;
}
pager_open();
/* /sbin/runlevel doesn't need to communicate via D-Bus, so
* let's shortcut this */
if (arg_action == ACTION_RUNLEVEL) {