From 7780379b27b868fe240d7ec1ceb6902280029731 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Sun, 28 Jul 2024 11:01:58 -0400
Subject: bar: Use tcgetwinsize() from POSIX 2024 if available

---
 src/bar.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

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);
-- 
cgit v1.2.3