summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2024-07-28 11:01:58 -0400
committerTavian Barnes <tavianator@tavianator.com>2024-07-28 11:01:58 -0400
commit7780379b27b868fe240d7ec1ceb6902280029731 (patch)
tree3ea332341aaa9756162688a0faafe96bbfedc9fa /src
parent26f3c379c1603ebdc35d1653b677b9e22685fd81 (diff)
downloadbfs-7780379b27b868fe240d7ec1ceb6902280029731.tar.xz
bar: Use tcgetwinsize() from POSIX 2024 if available
Diffstat (limited to 'src')
-rw-r--r--src/bar.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/bar.c b/src/bar.c
index 64706a8..d1fd6c1 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <string.h>
#include <sys/ioctl.h>
+#include <termios.h>
struct bfs_bar {
int fd;
@@ -28,10 +29,16 @@ struct bfs_bar {
/** Get the terminal size, if possible. */
static int bfs_bar_getsize(struct bfs_bar *bar) {
-#ifdef TIOCGWINSZ
+#if BFS_HAS_TCGETWINSIZE || defined(TIOCGWINSZ)
struct winsize ws;
- if (ioctl(bar->fd, TIOCGWINSZ, &ws) != 0) {
- return -1;
+
+# if BFS_HAS_TCGETWINSIZE
+ int ret = tcgetwinsize(bar->fd, &ws);
+# else
+ int ret = ioctl(bar->fd, TIOCGWINSZ, &ws);
+# endif
+ if (ret != 0) {
+ return ret;
}
store(&bar->width, ws.ws_col, relaxed);