bar: Use tcgetwinsize() from POSIX 2024 if available

tavianator · Jul 28, 2024 · 7780379 · 7780379
1 parent 26f3c37
commit 7780379
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/build/has/tcgetwinsize.c b/build/has/tcgetwinsize.c
@@ -0,0 +1,9 @@
+// Copyright © Tavian Barnes <[email protected]>
+// SPDX-License-Identifier: 0BSD
+
+#include <termios.h>
+
+int main(void) {
+	struct winsize ws;
+	return tcgetwinsize(0, &ws);
+}
diff --git a/build/header.mk b/build/header.mk
@@ -51,6 +51,7 @@ HEADERS := \
     gen/has/strerror-r-posix.h \
     gen/has/string-to-flags.h \
     gen/has/strtofflags.h \
+    gen/has/tcgetwinsize.h \
     gen/has/timegm.h \
     gen/has/tm-gmtoff.h \
     gen/has/uselocale.h

diff --git 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);