From c2e77cd005ca1d4dde3169b73b9557720d7f1deb Mon Sep 17 00:00:00 2001 From: Andrew Wood Date: Sun, 6 Aug 2023 20:31:02 +0100 Subject: [PATCH] Replaced AC_HEADER_TIOCGWINSZ and always just include sys/ioctl.h if it is available - GH#74. --- autoconf/configure.in | 2 +- autoconf/header.in | 6 +++--- doc/NEWS.md | 1 + src/nls/de.po | 20 ++++++++++---------- src/nls/fr.po | 20 ++++++++++---------- src/nls/pl.po | 20 ++++++++++---------- src/nls/pt.po | 20 ++++++++++---------- src/nls/pv.pot | 20 ++++++++++---------- src/pv/display.c | 8 +++++++- 9 files changed, 62 insertions(+), 55 deletions(-) diff --git a/autoconf/configure.in b/autoconf/configure.in index 34219ce..a14e1fa 100644 --- a/autoconf/configure.in +++ b/autoconf/configure.in @@ -33,7 +33,6 @@ AC_USE_SYSTEM_EXTENSIONS AC_C_CONST AC_HEADER_STDBOOL AC_SYS_LARGEFILE -AC_HEADER_TIOCGWINSZ AC_CHECK_FUNCS(getopt_long getopt) AC_CHECK_HEADERS(getopt.h) AC_CHECK_FUNCS(memcpy basename vsnprintf strlcat) @@ -42,6 +41,7 @@ AC_CHECK_FUNCS(fpathconf sysconf posix_memalign) AC_CHECK_HEADERS(limits.h) AC_CHECK_HEADERS(wctype.h) AC_CHECK_HEADERS(termios.h) +AC_CHECK_HEADERS(sys/ioctl.h) AC_ARG_ENABLE(debugging, [ --enable-debugging compile with debugging support], diff --git a/autoconf/header.in b/autoconf/header.in index 426b16e..cdce1ec 100644 --- a/autoconf/header.in +++ b/autoconf/header.in @@ -15,9 +15,6 @@ /* Enable native language support */ #undef ENABLE_NLS -/* Define to 1 if `TIOCGWINSZ' requires . */ -#undef GWINSZ_IN_SYS_IOCTL - /* Define to 1 if you have the `basename' function. */ #undef HAVE_BASENAME @@ -96,6 +93,9 @@ /* Define to 1 if you have the `sysconf' function. */ #undef HAVE_SYSCONF +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IOCTL_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_IPC_H diff --git a/doc/NEWS.md b/doc/NEWS.md index 7782cd2..5547b39 100644 --- a/doc/NEWS.md +++ b/doc/NEWS.md @@ -2,6 +2,7 @@ * cleanup: added a test for terminal width detection to "`make test`" * cleanup: added a test to "`make test`" to ensure that "`make install`" installs everything expected + * cleanup: replaced *AC_HEADER_TIOCGWINSZ* with *AC_CHECK_HEADERS(sys/ioctl.h)* for better MacOS compatibility ([GH#74](https://github.com/a-j-wood/pv/issues/74)) 1.7.24 - 30 July 2023 diff --git a/src/nls/de.po b/src/nls/de.po index d335e1a..899f803 100644 --- a/src/nls/de.po +++ b/src/nls/de.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-30 19:07+0100\n" +"POT-Creation-Date: 2023-08-06 20:22+0100\n" "Content-Type: text/plain; charset=UTF-8\n" "Date: 1999-06-01 15:18:29+0100\n" "From: Andrew Wood \n" @@ -79,7 +79,7 @@ msgstr "konnte den Fehler nicht überwinden" msgid "skipped past read error" msgstr "über den Lesefehler hinaus verschoben" -#: src/pv/transfer.c:461 src/pv/display.c:660 +#: src/pv/transfer.c:461 src/pv/display.c:666 msgid "B" msgstr "B" @@ -87,7 +87,7 @@ msgstr "B" msgid "write failed" msgstr "write-Aufruf fehlgeschlagen" -#: src/pv/transfer.c:736 src/pv/display.c:594 +#: src/pv/transfer.c:736 src/pv/display.c:600 msgid "buffer allocation failed" msgstr "Puffer konnte nicht allokiert werden" @@ -123,31 +123,31 @@ msgstr "" msgid "none" msgstr "" -#: src/pv/display.c:159 +#: src/pv/display.c:165 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:164 +#: src/pv/display.c:170 msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:656 +#: src/pv/display.c:662 msgid "b" msgstr "" -#: src/pv/display.c:711 src/pv/display.c:722 +#: src/pv/display.c:717 src/pv/display.c:728 msgid "b/s" msgstr "" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "/s" msgstr "" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "B/s" msgstr "" -#: src/pv/display.c:762 src/pv/display.c:766 src/pv/display.c:825 +#: src/pv/display.c:768 src/pv/display.c:772 src/pv/display.c:831 msgid "ETA" msgstr "ETA" diff --git a/src/nls/fr.po b/src/nls/fr.po index f7bdd3e..d5e80bf 100644 --- a/src/nls/fr.po +++ b/src/nls/fr.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-30 19:07+0100\n" +"POT-Creation-Date: 2023-08-06 20:22+0100\n" "Content-Type: text/plain; charset=UTF-8\n" "Date: 1999-06-01 15:18:29+0100\n" "From: Andrew Wood \n" @@ -79,7 +79,7 @@ msgstr "n'a pas réussi à dépasser l'erreur" msgid "skipped past read error" msgstr "erreur de lecture dépassée" -#: src/pv/transfer.c:461 src/pv/display.c:660 +#: src/pv/transfer.c:461 src/pv/display.c:666 msgid "B" msgstr "O" @@ -87,7 +87,7 @@ msgstr "O" msgid "write failed" msgstr "l'écriture a échoué" -#: src/pv/transfer.c:736 src/pv/display.c:594 +#: src/pv/transfer.c:736 src/pv/display.c:600 msgid "buffer allocation failed" msgstr "l'allocation de mémoire tampon a échoué" @@ -123,31 +123,31 @@ msgstr "" msgid "none" msgstr "" -#: src/pv/display.c:159 +#: src/pv/display.c:165 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:164 +#: src/pv/display.c:170 msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:656 +#: src/pv/display.c:662 msgid "b" msgstr "" -#: src/pv/display.c:711 src/pv/display.c:722 +#: src/pv/display.c:717 src/pv/display.c:728 msgid "b/s" msgstr "" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "/s" msgstr "/s" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "B/s" msgstr "O/s" -#: src/pv/display.c:762 src/pv/display.c:766 src/pv/display.c:825 +#: src/pv/display.c:768 src/pv/display.c:772 src/pv/display.c:831 msgid "ETA" msgstr "ETA" diff --git a/src/nls/pl.po b/src/nls/pl.po index 85a2bec..70773d3 100644 --- a/src/nls/pl.po +++ b/src/nls/pl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-30 19:07+0100\n" +"POT-Creation-Date: 2023-08-06 20:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -77,7 +77,7 @@ msgstr "" msgid "skipped past read error" msgstr "" -#: src/pv/transfer.c:461 src/pv/display.c:660 +#: src/pv/transfer.c:461 src/pv/display.c:666 msgid "B" msgstr "B" @@ -85,7 +85,7 @@ msgstr "B" msgid "write failed" msgstr "błąd zapisu" -#: src/pv/transfer.c:736 src/pv/display.c:594 +#: src/pv/transfer.c:736 src/pv/display.c:600 msgid "buffer allocation failed" msgstr "nie udało się zaalokować bufora" @@ -121,31 +121,31 @@ msgstr "" msgid "none" msgstr "" -#: src/pv/display.c:159 +#: src/pv/display.c:165 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:164 +#: src/pv/display.c:170 msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:656 +#: src/pv/display.c:662 msgid "b" msgstr "" -#: src/pv/display.c:711 src/pv/display.c:722 +#: src/pv/display.c:717 src/pv/display.c:728 msgid "b/s" msgstr "" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "/s" msgstr "/s" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "B/s" msgstr "B/s" -#: src/pv/display.c:762 src/pv/display.c:766 src/pv/display.c:825 +#: src/pv/display.c:768 src/pv/display.c:772 src/pv/display.c:831 msgid "ETA" msgstr "ETA" diff --git a/src/nls/pt.po b/src/nls/pt.po index 8c06ace..97707cd 100644 --- a/src/nls/pt.po +++ b/src/nls/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-30 19:07+0100\n" +"POT-Creation-Date: 2023-08-06 20:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -75,7 +75,7 @@ msgstr "não pode ir além do erro" msgid "skipped past read error" msgstr "ignorado erro de leitura" -#: src/pv/transfer.c:461 src/pv/display.c:660 +#: src/pv/transfer.c:461 src/pv/display.c:666 msgid "B" msgstr "" @@ -83,7 +83,7 @@ msgstr "" msgid "write failed" msgstr "erro de gravação" -#: src/pv/transfer.c:736 src/pv/display.c:594 +#: src/pv/transfer.c:736 src/pv/display.c:600 msgid "buffer allocation failed" msgstr "erro alocando o buffer" @@ -119,31 +119,31 @@ msgstr "" msgid "none" msgstr "" -#: src/pv/display.c:159 +#: src/pv/display.c:165 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:164 +#: src/pv/display.c:170 msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:656 +#: src/pv/display.c:662 msgid "b" msgstr "" -#: src/pv/display.c:711 src/pv/display.c:722 +#: src/pv/display.c:717 src/pv/display.c:728 msgid "b/s" msgstr "" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "/s" msgstr "" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "B/s" msgstr "B/s" -#: src/pv/display.c:762 src/pv/display.c:766 src/pv/display.c:825 +#: src/pv/display.c:768 src/pv/display.c:772 src/pv/display.c:831 msgid "ETA" msgstr "ETA" diff --git a/src/nls/pv.pot b/src/nls/pv.pot index 1620180..5b7d885 100644 --- a/src/nls/pv.pot +++ b/src/nls/pv.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-07-30 19:07+0100\n" +"POT-Creation-Date: 2023-08-06 20:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -77,7 +77,7 @@ msgstr "" msgid "skipped past read error" msgstr "" -#: src/pv/transfer.c:461 src/pv/display.c:660 +#: src/pv/transfer.c:461 src/pv/display.c:666 msgid "B" msgstr "" @@ -85,7 +85,7 @@ msgstr "" msgid "write failed" msgstr "" -#: src/pv/transfer.c:736 src/pv/display.c:594 +#: src/pv/transfer.c:736 src/pv/display.c:600 msgid "buffer allocation failed" msgstr "" @@ -121,31 +121,31 @@ msgstr "" msgid "none" msgstr "" -#: src/pv/display.c:159 +#: src/pv/display.c:165 msgid "yzafpnum kMGTPEZY" msgstr "" -#: src/pv/display.c:164 +#: src/pv/display.c:170 msgid "yzafpnum KMGTPEZY" msgstr "" -#: src/pv/display.c:656 +#: src/pv/display.c:662 msgid "b" msgstr "" -#: src/pv/display.c:711 src/pv/display.c:722 +#: src/pv/display.c:717 src/pv/display.c:728 msgid "b/s" msgstr "" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "/s" msgstr "" -#: src/pv/display.c:714 src/pv/display.c:726 +#: src/pv/display.c:720 src/pv/display.c:732 msgid "B/s" msgstr "" -#: src/pv/display.c:762 src/pv/display.c:766 src/pv/display.c:825 +#: src/pv/display.c:768 src/pv/display.c:772 src/pv/display.c:831 msgid "ETA" msgstr "" diff --git a/src/pv/display.c b/src/pv/display.c index 1249d07..be33873 100644 --- a/src/pv/display.c +++ b/src/pv/display.c @@ -23,7 +23,13 @@ #include #endif -#ifdef GWINSZ_IN_SYS_IOCTL +/* + * We need sys/ioctl.h for ioctl() regardless of whether TIOCGWINSZ is + * defined in termios.h, so we no longer use AC_HEADER_TIOCGWINSZ in + * configure.in, and just include both header files if they are available. + * (GH#74, 2023-08-06) + */ +#ifdef HAVE_SYS_IOCTL_H #include #endif