From 3b0727f5ec728206bf0db669088c9aa9ebb3c829 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 7 Jul 2011 03:30:31 +0200 Subject: [PATCH] systemctl: cache tty value before we open the pager --- src/systemctl.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/systemctl.c b/src/systemctl.c index 556070b..6b4f981 100644 --- a/src/systemctl.c +++ b/src/systemctl.c @@ -122,11 +122,6 @@ static pid_t agent_pid = 0; static int daemon_reload(DBusConnection *bus, char **args, unsigned n); -static void pager_open_if_enabled(void) { - if (!arg_no_pager) - pager_open(); -} - static bool on_tty(void) { static int t = -1; @@ -142,6 +137,13 @@ static bool on_tty(void) { return t; } +static void pager_open_if_enabled(void) { + on_tty(); + + if (!arg_no_pager) + pager_open(); +} + static void spawn_ask_password_agent(void) { pid_t parent; -- 2.7.4