lib/tty: fix get_terminal_name() usage, cleanup code

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/lib/ttyutils.c b/lib/ttyutils.c
index 76113a6d6c39f936a86abd2bf2e9722c76ae212b..ea551e26c811771f5a12f5dc7495444bac2eadd9 100644 (file)
--- a/lib/ttyutils.c
+++ b/lib/ttyutils.c
@@ -20,11 +20,11 @@ int get_terminal_width(void)
         const char     *cp;
 
 #ifdef TIOCGSIZE
-       if (ioctl (0, TIOCGSIZE, &t_win) == 0)
+       if (ioctl (STDIN_FILENO, TIOCGSIZE, &t_win) == 0)
                return t_win.ts_cols;
 #endif
 #ifdef TIOCGWINSZ
-       if (ioctl (0, TIOCGWINSZ, &w_win) == 0)
+       if (ioctl (STDIN_FILENO, TIOCGWINSZ, &w_win) == 0)
                return w_win.ws_col;
 #endif
         cp = getenv("COLUMNS");
@@ -83,7 +83,7 @@ int main(void)
 {
        const char *path, *name, *num;
 
-       if (get_terminal_name(&path, &name, &num) == 0) {
+       if (get_terminal_name(STDERR_FILENO, &path, &name, &num) == 0) {
                fprintf(stderr, "tty path:   %s\n", path);
                fprintf(stderr, "tty name:   %s\n", name);
                fprintf(stderr, "tty number: %s\n", num);