thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2013-05-28 10:04:16 +02:00
parent ef264c830e
commit b1d4444988
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/ttyutils.c
View file

@ -20,11 +20,11 @@ int get_terminal_width(void)
const char *cp; const char *cp;
#ifdef TIOCGSIZE #ifdef TIOCGSIZE
if (ioctl (0, TIOCGSIZE, &t_win) == 0) if (ioctl (STDIN_FILENO, TIOCGSIZE, &t_win) == 0)
return t_win.ts_cols; return t_win.ts_cols;
#endif #endif
#ifdef TIOCGWINSZ #ifdef TIOCGWINSZ
if (ioctl (0, TIOCGWINSZ, &w_win) == 0) if (ioctl (STDIN_FILENO, TIOCGWINSZ, &w_win) == 0)
return w_win.ws_col; return w_win.ws_col;
#endif #endif
cp = getenv("COLUMNS"); cp = getenv("COLUMNS");
@ -83,7 +83,7 @@ int main(void)
{ {
const char *path, *name, *num; 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 path: %s\n", path);
fprintf(stderr, "tty name: %s\n", name); fprintf(stderr, "tty name: %s\n", name);
fprintf(stderr, "tty number: %s\n", num); fprintf(stderr, "tty number: %s\n", num);