CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-17 09:05:50 +02:00
Code Issues Projects Releases Wiki Activity

(get_win_size): Take a FILENO parameter rather than

Browse Source 
trying to get a size from both stdin and stdout.
Update callers.
Use STDIN_FILENO and STDOUT_FILENO instead of literal 0, 1.
This commit is contained in:
Jim Meyering
1996-11-24 18:06:35 +00:00
parent a992c841ae
commit 161db26bd1
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/stty.c
View File

@@ -1192,12 +1192,19 @@ set_speed (enum speed_setting type, const char *arg, struct termios *mode)
#ifdef TIOCGWINSZ
static int
get_win_size (int fileno, struct winsize *win)
{
int err = ioctl (fileno, TIOCGWINSZ, (char *) win);
return err;
}
static void
set_window_size (int rows, int cols)
{
struct winsize win;
if (ioctl (0, TIOCGWINSZ, (char *) &win))
if (get_win_size (STDIN_FILENO, &win))
{
if (errno != EINVAL)
error (1, errno, _("standard input"));
@@ -1241,16 +1248,16 @@ set_window_size (int rows, int cols)
win.ws_row = 1;
win.ws_col = 1;
if (ioctl (0, TIOCSWINSZ, (char *) &win))
if (ioctl (STDIN_FILENO, TIOCSWINSZ, (char *) &win))
error (1, errno, _("standard input"));
if (ioctl (0, TIOCSSIZE, (char *) &ttysz))
if (ioctl (STDIN_FILENO, TIOCSSIZE, (char *) &ttysz))
error (1, errno, _("standard input"));
return;
}
# endif
if (ioctl (0, TIOCSWINSZ, (char *) &win))
if (ioctl (STDIN_FILENO, TIOCSWINSZ, (char *) &win))
error (1, errno, _("standard input"));
}
@@ -1259,7 +1266,7 @@ display_window_size (int fancy)
{
struct winsize win;
if (ioctl (0, TIOCGWINSZ, (char *) &win))
if (get_win_size (STDIN_FILENO, &win))
{
if (errno != EINVAL)
error (1, errno, _("standard input"));
@@ -1288,7 +1295,7 @@ screen_columns (void)
(but it works for ptys).
It can also fail on any system when stdout isn't a tty.
In case of any failure, just use the default. */
if (ioctl (1, TIOCGWINSZ, (char *) &win) == 0 && win.ws_col > 0)
if (get_win_size (STDOUT_FILENO, &win) == 0 && win.ws_col > 0)
return win.ws_col;
#endif
/* FIXME: use xstrtol */