From d2b540022b8df6fe4aa339c6b35cf9f980a9e877 Mon Sep 17 00:00:00 2001 From: Sami Kerola Date: Sat, 26 May 2018 21:36:17 +0100 Subject: more: do not call fileno() for std{in,out,err} streams These file descriptor numbers are well known, use them from unistd.h Signed-off-by: Sami Kerola --- text-utils/more.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'text-utils/more.c') diff --git a/text-utils/more.c b/text-utils/more.c index 225ec2dbe..f7a443b2b 100644 --- a/text-utils/more.c +++ b/text-utils/more.c @@ -769,7 +769,7 @@ static int readch(struct more_control *ctl) unsigned char c; errno = 0; - if (read(fileno(stderr), &c, 1) <= 0) { + if (read(STDERR_FILENO, &c, 1) <= 0) { if (errno != EINTR) end_it(0); else @@ -1762,7 +1762,7 @@ static void chgwinsz(int dummy __attribute__((__unused__))) struct winsize win; signal(SIGWINCH, SIG_IGN); - if (ioctl(fileno(stdout), TIOCGWINSZ, &win) != -1) { + if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) != -1) { if (win.ws_row != 0) { global_ctl->Lpp = win.ws_row; global_ctl->nscroll = global_ctl->Lpp / 2 - 1; @@ -1794,7 +1794,7 @@ static void initterm(struct more_control *ctl) struct winsize win; #ifndef NON_INTERACTIVE_MORE - ctl->no_tty = tcgetattr(fileno(stdout), &ctl->otty); + ctl->no_tty = tcgetattr(STDOUT_FILENO, &ctl->otty); #endif if (!ctl->no_tty) { ctl->docrterase = (ctl->otty.c_cc[VERASE] != 255); @@ -1809,7 +1809,7 @@ static void initterm(struct more_control *ctl) ctl->ul_opt = 0; } else { #ifdef TIOCGWINSZ - if (ioctl(fileno(stdout), TIOCGWINSZ, &win) < 0) { + if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &win) < 0) { #endif ctl->Lpp = tigetnum(TERM_LINES); ctl->Mcol = tigetnum(TERM_COLS); @@ -1886,8 +1886,8 @@ static void initterm(struct more_control *ctl) if ((ctl->shell = getenv("SHELL")) == NULL) ctl->shell = "/bin/sh"; } - ctl->no_intty = tcgetattr(fileno(stdin), &ctl->otty); - tcgetattr(fileno(stderr), &ctl->otty); + ctl->no_intty = tcgetattr(STDIN_FILENO, &ctl->otty); + tcgetattr(STDERR_FILENO, &ctl->otty); ctl->savetty0 = ctl->otty; ctl->hardtabs = (ctl->otty.c_oflag & TABDLY) != TAB3; if (!ctl->no_tty) { -- cgit v1.2.3-55-g7522