Update to latest rra-c-util upstream version

Julien-Elie · Julien-Elie · commit a719bbb65cf8 · 2025-09-13T07:51:57.000+02:00
diff --git a/include/inn/buffer.h b/include/inn/buffer.h
@@ -16,7 +16,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2014-2015, 2022 Russ Allbery <eagle@eyrie.org>
+ * Copyright 2014-2015, 2022, 2025 Russ Allbery <eagle@eyrie.org>
  * Copyright 2011-2012
  *     The Board of Trustees of the Leland Stanford Junior University
  * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
@@ -125,20 +125,23 @@ bool buffer_find_string(struct buffer *, const char *, size_t start,
  * error or after any successful read.  Returns -1 on an error reading from
  * the file descriptor and sets errno.
  */
-ssize_t buffer_read(struct buffer *, int fd) __attribute__((__nonnull__));
+ssize_t buffer_read(struct buffer *, int fd)
+    __attribute__((__fd_arg_read__(2), __nonnull__));
 
 /*
  * Read from a file descriptor into a buffer until end of file is reached.
  * Returns true on success and false (setting errno) on error.
  */
-bool buffer_read_all(struct buffer *, int fd) __attribute__((__nonnull__));
+bool buffer_read_all(struct buffer *, int fd)
+    __attribute__((__fd_arg_read__(2), __nonnull__));
 
 /*
  * Read the contents of a file into a buffer.  This should be used instead of
  * buffer_read_all when fstat can be called on the file descriptor.  Returns
  * true on success and false (setting errno) on error.
  */
-bool buffer_read_file(struct buffer *, int fd) __attribute__((__nonnull__));
+bool buffer_read_file(struct buffer *, int fd)
+    __attribute__((__fd_arg_read__(2), __nonnull__));
 
 END_DECLS
 
diff --git a/include/inn/xwrite.h b/include/inn/xwrite.h
@@ -5,6 +5,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
+ * Copyright 2025 Russ Allbery <eagle@eyrie.org>
  * Copyright 2008, 2010, 2013
  *     The Board of Trustees of the Leland Stanford Junior University
  * Copyright 2004-2006 Internet Systems Consortium, Inc. ("ISC")
@@ -46,11 +47,11 @@ BEGIN_DECLS
  * writes and EINTR/EAGAIN errors.
  */
 ssize_t xpwrite(int fd, const void *buffer, size_t size, off_t offset)
-    __attribute__((__nonnull__));
+    __attribute__((__fd_arg_write__(1), __nonnull__));
 ssize_t xwrite(int fd, const void *buffer, size_t size)
-    __attribute__((__nonnull__));
+    __attribute__((__fd_arg_write__(1), __nonnull__));
 ssize_t xwritev(int fd, const struct iovec *iov, int iovcnt)
-    __attribute__((__nonnull__));
+    __attribute__((__fd_arg_write__(1), __nonnull__));
 
 END_DECLS
 
diff --git a/include/portable/macros.h b/include/portable/macros.h
@@ -5,7 +5,7 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2015, 2022 Russ Allbery <eagle@eyrie.org>
+ * Copyright 2015, 2022, 2025 Russ Allbery <eagle@eyrie.org>
  * Copyright 2008, 2011-2012
  *     The Board of Trustees of the Leland Stanford Junior University
  *
@@ -32,11 +32,7 @@
 #endif
 
 /*
- * We use __alloc_size__, but it was only available in fairly recent versions
- * of GCC.  Suppress warnings about the unknown attribute if GCC is too old.
- * We know that we're GCC at this point, so we can use the GCC variadic macro
- * extension, which will still work with versions of GCC too old to have C99
- * variadic macro support.
+ * __alloc_size__ was introduced in GCC 4.3.
  */
 #if !defined(__attribute__) && !defined(__alloc_size__)
 #    if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)) \
@@ -46,8 +42,20 @@
 #endif
 
 /*
- * Suppress the argument to __malloc__ in Clang (not supported in at least
- * version 13) and GCC versions prior to 11.
+ * __fd_arg__ and company were introduced in GCC 13 and is not supported in
+ * Clang 19.
+ */
+#if !defined(__attribute__) && !defined(__fd_arg__)
+#    if __GNUC__ < 13 && !defined(__clang__)
+#        define __fd_arg__(arg)       /* empty */
+#        define __fd_arg_read__(arg)  /* empty */
+#        define __fd_arg_write__(arg) /* empty */
+#    endif
+#endif
+
+/*
+ * Suppress the argument to __malloc__ in Clang and in GCC versions prior to
+ * 11.
  */
 #if !defined(__attribute__) && !defined(__malloc__)
 #    if defined(__clang__) || __GNUC__ < 11
@@ -57,17 +65,17 @@
 
 /*
  * LLVM and Clang pretend to be GCC but don't support all of the __attribute__
- * settings that GCC does.  For them, suppress warnings about unknown
- * attributes on declarations.  This unfortunately will affect the entire
+ * settings that GCC does. For them, suppress warnings about unknown
+ * attributes on declarations. This unfortunately will affect the entire
  * compilation context, but there's no push and pop available.
  */
 #if !defined(__attribute__) && (defined(__llvm__) || defined(__clang__))
 #    pragma GCC diagnostic ignored "-Wattributes"
 #endif
 
 /*
- * BEGIN_DECLS is used at the beginning of declarations so that C++
- * compilers don't mangle their names.  END_DECLS is used at the end.
+ * BEGIN_DECLS is used at the beginning of declarations so that C++ compilers
+ * don't mangle their names. END_DECLS is used at the end.
  */
 #undef BEGIN_DECLS
 #undef END_DECLS
diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
@@ -20,7 +20,8 @@
  * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
  *
  * Written by Russ Allbery <eagle@eyrie.org>
- * Copyright 2003-2005, 2016-2017, 2019-2020 Russ Allbery <eagle@eyrie.org>
+ * Copyright 2003-2005, 2016-2017, 2019-2020, 2025
+ *     Russ Allbery <eagle@eyrie.org>
  * Copyright 2015 Julien ÉLIE <julien@trigofacile.com>
  * Copyright 2008, 2011, 2013-2014
  *     The Board of Trustees of the Leland Stanford Junior University
@@ -121,13 +122,6 @@ static const char *const gai_errors[] = {
     "Supplied buffer too small",        /* 10 EAI_OVERFLOW */
 };
 
-/* Macro to set the len attribute of sockaddr_in. */
-#if HAVE_STRUCT_SOCKADDR_SA_LEN
-#    define sin_set_length(s) ((s)->sin_len = sizeof(struct sockaddr_in))
-#else
-#    define sin_set_length(s) /* empty */
-#endif
-
 /*
  * Used for iterating through arrays.  ARRAY_SIZE returns the number of
  * elements in the array (useful for a < upper bound in a for loop).
@@ -230,7 +224,9 @@ gai_addrinfo_new(int socktype, const char *canonical, struct in_addr addr,
     sin->sin_family = AF_INET;
     sin->sin_addr = addr;
     sin->sin_port = htons(port);
-    sin_set_length(sin);
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
+    sin->sin_len = sizeof(struct sockaddr_in);
+#endif
     ai->ai_addr = (struct sockaddr *) sin;
     ai->ai_addrlen = sizeof(struct sockaddr_in);
     return ai;
diff --git a/m4/cc-flags.m4 b/m4/cc-flags.m4
@@ -8,7 +8,7 @@ dnl
 dnl The canonical version of this file is maintained in the rra-c-util
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
-dnl Copyright 2016-2024 Russ Allbery <eagle@eyrie.org>
+dnl Copyright 2016-2025 Russ Allbery <eagle@eyrie.org>
 dnl Copyright 2006, 2009, 2016
 dnl     by Internet Systems Consortium, Inc. ("ISC")
 dnl
diff --git a/m4/sqlite3.m4 b/m4/sqlite3.m4
@@ -6,17 +6,17 @@ dnl --with-sqlite3-include configure options to specify non-standard paths to
 dnl the SQLite v3 libraries or header files.
 dnl
 dnl Provides the macro INN_LIB_SQLITE3 and sets the substitution variables
-dnl SQLITE3_CPPFLAGS, SQLITE3_LDFLAGS, and SQLITE3_LIBS.  Also provides
+dnl SQLITE3_CPPFLAGS, SQLITE3_LDFLAGS, and SQLITE3_LIBS. Also provides
 dnl INN_LIB_SQLITE3_SWITCH to set CPPFLAGS, LDFLAGS, and LIBS to include the
 dnl SQLite library, saving the current values first, and
 dnl INN_LIB_SQLITE3_RESTORE to restore those settings to before the last
-dnl INN_LIB_SQLITE3_SWITCH.  Defines HAVE_SQLITE3 and sets inn_use_SQLITE3 to
+dnl INN_LIB_SQLITE3_SWITCH. Defines HAVE_SQLITE3 and sets inn_use_SQLITE3 to
 dnl true.
 dnl
 dnl Provides the INN_LIB_SQLITE3_OPTIONAL macro, which should be used if
-dnl SQLite support is optional.  This macro will still always set the
+dnl SQLite support is optional. This macro will still always set the
 dnl substitution variables, but they'll be empty if the SQLite library is not
-dnl found or if --without-sqlite3 is given.  Defines HAVE_SQLITE3 and sets
+dnl found or if --without-sqlite3 is given. Defines HAVE_SQLITE3 and sets
 dnl inn_use_SQLITE3 to true if the SQLite library is found and
 dnl --without-sqlite3 is not given.
 dnl
@@ -27,7 +27,7 @@ dnl The canonical version of this file is maintained in the rra-c-util
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle@eyrie.org>
-dnl Copyright 2020, 2022 Russ Allbery <eagle@eyrie.org>
+dnl Copyright 2020, 2022, 2025 Russ Allbery <eagle@eyrie.org>
 dnl Copyright 2014
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
@@ -38,7 +38,7 @@ dnl
 dnl SPDX-License-Identifier: FSFULLR
 
 dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to
-dnl versions that include the SQLite 3 flags.  Used as a wrapper, with
+dnl versions that include the SQLite 3 flags. Used as a wrapper, with
 dnl INN_LIB_SQLITE3_RESTORE, around tests.
 AC_DEFUN([INN_LIB_SQLITE3_SWITCH], [INN_LIB_HELPER_SWITCH([SQLITE3])])
 
diff --git a/m4/systemd.m4 b/m4/systemd.m4
@@ -7,8 +7,8 @@ dnl to use to control whether to install unit files.
 dnl
 dnl Provides the INN_LIB_SYSTEMD_DAEMON_OPTIONAL macro, which sets
 dnl SYSTEMD_CFLAGS and SYSTEMD_LIBS substitution variables if libsystemd is
-dnl available and defines HAVE_SD_NOTIFY.  Adds sd-daemon.c to LIBOBJS if
-dnl libsystemd is not available.  pkg-config support for libsystemd-daemon is
+dnl available and defines HAVE_SD_NOTIFY. Adds sd-daemon.c to LIBOBJS if
+dnl libsystemd is not available. pkg-config support for libsystemd-daemon is
 dnl required for it to be detected.
 dnl
 dnl Depends on the Autoconf macros that come with pkg-config.
@@ -17,7 +17,7 @@ dnl The canonical version of this file is maintained in the rra-c-util
 dnl package, available at <https://www.eyrie.org/~eagle/software/rra-c-util/>.
 dnl
 dnl Written by Russ Allbery <eagle@eyrie.org>
-dnl Copyright 2015, 2021, 2022 Russ Allbery <eagle@eyrie.org>
+dnl Copyright 2015, 2021, 2022, 2025 Russ Allbery <eagle@eyrie.org>
 dnl Copyright 2013-2014
 dnl     The Board of Trustees of the Leland Stanford Junior University
 dnl
@@ -28,10 +28,10 @@ dnl
 dnl SPDX-License-Identifier: FSFULLR
 
 dnl Determine the systemd system unit directory, along with a configure flag
-dnl to override, and sets @systemdsystemunitdir@.  Provides the Automake
+dnl to override, and sets @systemdsystemunitdir@. Provides the Automake
 dnl HAVE_SYSTEMD Automake conditional.
 AC_DEFUN([INN_WITH_SYSTEMD_UNITDIR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+[PKG_PROG_PKG_CONFIG([], [PKG_CONFIG=false])
  AS_IF([test x"$PKG_CONFIG" = x], [PKG_CONFIG=false])
  AC_ARG_WITH([systemdsystemunitdir],
     [AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
@@ -45,12 +45,14 @@ AC_DEFUN([INN_WITH_SYSTEMD_UNITDIR],
         && test x"$with_systemdsystemunitdir" != xno])])
 
 dnl Check for libsystemd or libsystemd-daemon and define SYSTEMD_{CFLAGS,LIBS}
-dnl if it is available.  This is called INN_LIB_SYSTEMD_DAEMON_OPTIONAL since
+dnl if it is available. This is called INN_LIB_SYSTEMD_DAEMON_OPTIONAL since
 dnl it was originally written when libsystemd-daemon was separate, and only
-dnl checks for that library.  It may eventually make sense to retire this in
+dnl checks for that library. It may eventually make sense to retire this in
 dnl favor of a simple INN_LIB_SYSTEMD_OPTIONAL that isn't backward-compatible.
 AC_DEFUN([INN_LIB_SYSTEMD_DAEMON_OPTIONAL],
-[PKG_CHECK_EXISTS([libsystemd],
+[PKG_PROG_PKG_CONFIG([], [PKG_CONFIG=false])
+ AS_IF([test x"$PKG_CONFIG" = x], [PKG_CONFIG=false])
+ PKG_CHECK_EXISTS([libsystemd],
     [PKG_CHECK_MODULES([SYSTEMD], [libsystemd])
      AC_DEFINE([HAVE_SD_NOTIFY], 1, [Define if sd_notify is available.])],
     [PKG_CHECK_EXISTS([libsystemd-daemon],
diff --git a/support/getc-tap-harness b/support/getc-tap-harness
@@ -2,6 +2,11 @@
 
 ##  Synchronize INN files maintained in c-tap-harness with upstream.
 ##
+##  Initial version written in September 2014 by Julien ÉLIE.
+##
+##  Various bug fixes, code and documentation improvements since then
+##  in 2014-2016, 2018, 2021, 2022, 2024, 2025.
+##
 ##  This script downloads the latest version of the files maintained
 ##  in the C TAP Harness package that INN uses for its test driver suite.
 ##  These files are available at
diff --git a/support/getrra-c-util b/support/getrra-c-util
@@ -2,6 +2,11 @@
 
 ##  Synchronize INN files maintained in rra-c-util with upstream.
 ##
+##  Initial version written in November 2013 by Julien ÉLIE.
+##
+##  Various bug fixes, code and documentation improvements since then
+##  in 2014-2018, 2020-2025.
+##
 ##  This script downloads the latest version of the files maintained
 ##  in the rra-c-util package that INN uses for most of its utility and
 ##  portability functions.  These files are available at
@@ -83,7 +88,7 @@ AC_DEFUN([_INN_LIB_SQLITE3_INTERNAL],\
     [AS_IF([test x"$1" = xtrue],\
         [AC_MSG_ERROR([cannot find usable SQLite v3 library])])])])\
 ' \
-                    -e '49,69d' \
+                    -e '49,71d' \
                     ${TEMP}
             fi
         elif [ "$2" = "include/inn" ] || [ "$2" = "include/portable" ] \
