summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2013-05-28 10:04:16 +0200
committerKarel Zak2013-05-28 12:10:29 +0200
commitb1d44449886c20ecaa9777f5ec0de71ff09a837c (patch)
tree3a7882a0a4b6b1ba52ac65ebab2bae47d6c96a32
parentagetty: allow full control on CLOCAL flag (diff)
downloadkernel-qcow2-util-linux-b1d44449886c20ecaa9777f5ec0de71ff09a837c.tar.gz
kernel-qcow2-util-linux-b1d44449886c20ecaa9777f5ec0de71ff09a837c.tar.xz
kernel-qcow2-util-linux-b1d44449886c20ecaa9777f5ec0de71ff09a837c.zip
lib/tty: fix get_terminal_name() usage, cleanup code
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--lib/ttyutils.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ttyutils.c b/lib/ttyutils.c
index 76113a6d6..ea551e26c 100644
--- 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);