From 4577605121fa441e5a28c32ce2c33be4c48df89b Mon Sep 17 00:00:00 2001
From: Rob Landley <rob@landley.net>
Date: Sun, 14 Jan 2018 23:15:01 -0600
Subject: Switch xgettty() -> tty_fd() (returning -1 instead of erroring out if
none).
---
lib/interestingtimes.c | 4 ++--
lib/lib.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
(limited to 'lib')
diff --git a/lib/interestingtimes.c b/lib/interestingtimes.c
index f028f5e9..073a67dd 100644
--- a/lib/interestingtimes.c
+++ b/lib/interestingtimes.c
@@ -5,13 +5,13 @@
#include "toys.h"
-int xgettty(void)
+int tty_fd(void)
{
int i, j;
for (i = 0; i<3; i++) if (isatty(j = (i+1)%3)) return j;
- return xopen("/dev/tty", O_RDWR);
+ return notstdio(open("/dev/tty", O_RDWR));
}
// Quick and dirty query size of terminal, doesn't do ANSI probe fallback.
diff --git a/lib/lib.h b/lib/lib.h
index 5dd629d2..94662983 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -274,7 +274,7 @@ int draw_trim_esc(char *str, int padto, int width, char *escmore,
int draw_trim(char *str, int padto, int width);
// interestingtimes.c
-int xgettty(void);
+int tty_fd(void);
int terminal_size(unsigned *xx, unsigned *yy);
int terminal_probesize(unsigned *xx, unsigned *yy);
int scan_key_getsize(char *scratch, int miliwait, unsigned *xx, unsigned *yy);
--
cgit v1.2.3