From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 7 Sep 2010 08:30:50 +0000 (+0200)
Subject: systemctl: use on_tty() helper everywhere
X-Git-Tag: v11~147
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=ef639c5f9e9ed397424b50b14e2160993c7841d1;ds=sidebyside

systemctl: use on_tty() helper everywhere
---

diff --git a/src/systemctl.c b/src/systemctl.c
index 1f93bc974..ff6f86a0d 100644
--- a/src/systemctl.c
+++ b/src/systemctl.c
@@ -337,7 +337,7 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
 
         qsort(unit_infos, c, sizeof(struct unit_info), compare_unit_info);
 
-        if (isatty(STDOUT_FILENO)) {
+        if (on_tty()) {
                 if (columns() >= 80+12 || arg_full)
                         printf("%-25s %-6s %-12s %-18s %-15s %s\n", "UNIT", "LOAD", "ACTIVE", "SUB", "JOB", "DESCRIPTION");
                 else
@@ -400,7 +400,7 @@ static int list_units(DBusConnection *bus, char **args, unsigned n) {
                 }
         }
 
-        if (isatty(STDOUT_FILENO)) {
+        if (on_tty()) {
 
                 printf("\nLOAD   = Reflects whether the unit definition was properly loaded.\n"
                        "ACTIVE = The high-level unit activation state, i.e. generalization of SUB.\n"