From 7c0a5698ebc2295dc3c1c0c0912684f1794f4afd Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Thu, 28 Aug 2014 00:22:13 -0400 Subject: posix: use STD*_FILENO constants Rather than "magic" numbers, use meaningful constant names provided by unistd.h. --- common/msg.c | 4 ++-- input/pipe.c | 2 +- osdep/terminal-unix.c | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/common/msg.c b/common/msg.c index 1b2960b047..6bde6d481d 100644 --- a/common/msg.c +++ b/common/msg.c @@ -437,8 +437,8 @@ void mp_msg_update_msglevels(struct mpv_global *global) root->use_terminal = opts->use_terminal; root->show_time = opts->msg_time; if (root->use_terminal) { - root->color = opts->msg_color && isatty(fileno(stdout)); - root->termosd = isatty(fileno(stderr)); + root->color = opts->msg_color && isatty(STDOUT_FILENO); + root->termosd = isatty(STDERR_FILENO); } talloc_free(root->msglevels); diff --git a/input/pipe.c b/input/pipe.c index 3740c22168..59f6a64c2b 100644 --- a/input/pipe.c +++ b/input/pipe.c @@ -41,7 +41,7 @@ static void *reader_thread(void *ctx) int fd = -1; bool close_fd = true; if (strcmp(p->filename, "/dev/stdin") == 0) { // mainly for win32 - fd = fileno(stdin); + fd = STDIN_FILENO; close_fd = false; } if (fd < 0) diff --git a/osdep/terminal-unix.c b/osdep/terminal-unix.c index 78fb3d991c..26f288486e 100644 --- a/osdep/terminal-unix.c +++ b/osdep/terminal-unix.c @@ -264,7 +264,7 @@ static void load_termcap(void) static void enable_kx(bool enable) { - if (isatty(1)) { + if (isatty(STDOUT_FILENO)) { char *cmd = enable ? "\033=" : "\033>"; printf("%s", cmd); fflush(stdout); @@ -664,7 +664,7 @@ void terminal_setup_getch(struct input_ctx *ictx) static void do_activate_getch2(void) { - if (getch2_active || !isatty(1)) + if (getch2_active || !isatty(STDOUT_FILENO)) return; enable_kx(true); @@ -798,7 +798,7 @@ void terminal_uninit(void) bool terminal_in_background(void) { - return isatty(2) && tcgetpgrp(2) != getpgrp(); + return isatty(STDERR_FILENO) && tcgetpgrp(STDERR_FILENO) != getpgrp(); } void terminal_get_size(int *w, int *h) @@ -813,7 +813,7 @@ void terminal_get_size(int *w, int *h) int terminal_init(void) { - if (isatty(1)) + if (isatty(STDOUT_FILENO)) load_termcap(); getch2_enable(); return 0; -- cgit v1.2.3