706 files changed, 59632 insertions, 21331 deletions

diff --git a/.clang-format b/.clang-format
index ca411edd..0ff68114 100644
--- a/.clang-format
+++ b/.clang-format
@@ -4,7 +4,7 @@ TabWidth: 4
 AllowShortIfStatementsOnASingleLine: false
 BreakBeforeBraces: Attach
 AlignConsecutiveMacros: true
-ColumnLimit: 140
+ColumnLimit: 100
 IndentPPDirectives: AfterHash
 SortIncludes: Never
 AllowShortEnumsOnASingleLine: false
diff --git a/.github/monitoring-plugins.spec b/.github/monitoring-plugins.spec
index 64ee34f2..e3465227 100644
--- a/.github/monitoring-plugins.spec
+++ b/.github/monitoring-plugins.spec
@@ -88,6 +88,9 @@ BuildRequires: postgresql-devel
 # check_radius
 BuildRequires: radcli-devel
 
+# check_snmp
+BuildRequires: net-snmp-devel
+
 %description
 Common files for Monitoring Plugins
 
@@ -191,7 +194,6 @@ Requires: %{name}-nt
 Requires: %{name}-ntp
 Requires: %{name}-ntp_peer
 Requires: %{name}-ntp_time
-Requires: %{name}-nwstat
 Requires: %{name}-oracle
 Requires: %{name}-pgsql
 Requires: %{name}-ping
@@ -650,32 +652,6 @@ Provides check_nagios of the Monitoring Plugins.
 
 
 
-# check_nt
-%package nt
-Summary:  Monitoring Plugins - check_nt
-Requires: %{name} = %{version}-%{release}
-
-%description nt
-Provides check_nt of the Monitoring Plugins.
-
-%files nt
-%{plugindir}/check_nt
-
-
-
-# check_ntp
-%package ntp
-Summary:  Monitoring Plugins - check_ntp
-Requires: %{name} = %{version}-%{release}
-
-%description ntp
-Provides check_ntp of the Monitoring Plugins.
-
-%files ntp
-%{plugindir}/check_ntp
-
-
-
 # check_ntp_peer
 %package ntp_peer
 Summary:  Monitoring Plugins - check_ntp_peer
@@ -702,19 +678,6 @@ Provides check_ntp_time of the Monitoring Plugins.
 
 
 
-# check_nwstat
-%package nwstat
-Summary:  Monitoring Plugins - check_nwstat
-Requires: %{name} = %{version}-%{release}
-
-%description nwstat
-Provides check_nwstat of the Monitoring Plugins.
-
-%files nwstat
-%{plugindir}/check_nwstat
-
-
-
 # check_oracle
 %package oracle
 Summary:  Monitoring Plugins - check_oracle
@@ -959,3 +922,7 @@ Provides check_wave of the Monitoring Plugins.
 
 %files wave
 %{plugindir}/check_wave
+
+%changelog
+* Wed Oct 20 2011 John Doe <jdoe@example.com> 0.8.18.1-0.1
+- Initial RPM release
diff --git a/.github/os_detect.sh b/.github/os_detect.sh
index ee9c145d..3c5956de 100644
--- a/.github/os_detect.sh
+++ b/.github/os_detect.sh
@@ -1,10 +1,17 @@
 #!/bin/sh -e
+
+. /etc/os-release
+
 # workaround for really bare-bones Archlinux containers:
 if [ -x "$(command -v pacman)" ]; then
     pacman --noconfirm -Sy
     pacman --noconfirm -S grep gawk sed
 fi
 
+if [ ${ID} == "fedora" -a ${VERSION_ID} -gt 41 ]; then
+    dnf install -y gawk
+fi
+
 os_release_file=
 if [ -s "/etc/os-release" ]; then
   os_release_file="/etc/os-release"
@@ -15,4 +22,7 @@ else
   return 1
 fi
 export distro_id=$(grep '^ID=' $os_release_file|awk -F = '{print $2}'|sed 's/\"//g')
+export version_id=$(grep '^VERSION_ID=' $os_release_file|awk -F = '{print $2}'|sed 's/\"//g')
 export platform_id=$(grep '^PLATFORM_ID=' /etc/os-release|awk -F = '{print $2}'|sed 's/\"//g'| cut -d":" -f2)
+# Fedora dropped PLATFORM_ID: https://fedoraproject.org/wiki/Changes/Drop_PLATFORM_ID?#Drop_PLATFORM_ID
+if [ -z $platform_id ]; then export platform_id=$(echo ${distro_id:0:1}${version_id}); fi
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index f7b6cf9f..cffe98c5 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -24,6 +24,7 @@ apt-get -y install perl \
         libpq-dev \
         libradcli-dev \
         libnet-snmp-perl \
+        libsnmp-dev \
         procps \
         libdbi0-dev \
         libdbd-sqlite3 \
@@ -111,6 +112,8 @@ mkdir -p /var/lib/snmp/mib_indexes
 sed -e 's/^agentaddress.*/agentaddress 127.0.0.1/' -i /etc/snmp/snmpd.conf
 service snmpd start
 
+sed 's/^mibs ://' -i /etc/snmp/snmp.conf
+
 # start cron, will be used by check_nagios
 cron
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index c402e0cf..bd1037f4 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,6 +13,7 @@
 name: "CodeQL"
 
 on:
+  workflow_dispatch: {}
   push:
     branches: [master]
   pull_request:
@@ -40,11 +41,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3
+        uses: github/codeql-action/init@v4
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -56,9 +57,20 @@ jobs:
         run: |
           sudo apt update
           sudo apt-get install -y --no-install-recommends m4 gettext automake autoconf make build-essential
-          sudo apt-get install -y --no-install-recommends perl autotools-dev libdbi-dev libldap2-dev libpq-dev \
-                                                          libmysqlclient-dev libradcli-dev libkrb5-dev libdbi0-dev \
-                                                          libdbd-sqlite3 libssl-dev libcurl4-openssl-dev liburiparser-dev
+          sudo apt-get install -y --no-install-recommends perl \
+            autotools-dev \
+            libdbi-dev \
+            libldap2-dev \
+            libpq-dev \
+            libmysqlclient-dev \
+            libradcli-dev \
+            libkrb5-dev \
+            libdbi0-dev \
+            libdbd-sqlite3 \
+            libssl-dev \
+            libcurl4-openssl-dev \
+            liburiparser-dev \
+            libsnmp-dev
 
       - name: Configure build
         run: |
@@ -70,4 +82,4 @@ jobs:
           make
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3
+        uses: github/codeql-action/analyze@v4
diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml
index 72f7c7eb..f19cc920 100644
--- a/.github/workflows/spellcheck.yml
+++ b/.github/workflows/spellcheck.yml
@@ -2,6 +2,7 @@
 name: Spellcheck
 
 on:
+  workflow_dispatch: {}
   # Run for pushes on any branch
   push:
     branches:
@@ -17,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
       - name: Codespell
         uses: codespell-project/actions-codespell@v2
         with:
diff --git a/.github/workflows/test-next.yml b/.github/workflows/test-next.yml
index 81240759..a7e9b9d6 100644
--- a/.github/workflows/test-next.yml
+++ b/.github/workflows/test-next.yml
@@ -2,7 +2,13 @@
 name: Tests Debian:Testing and Fedora:Rawhide
 
 on:
-  workflow_dispatch: {}
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        type: boolean
+        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
+        required: false
+        default: false
   push:
     branches-ignore:
       - '*'
@@ -24,7 +30,10 @@ jobs:
             prepare: .github/prepare_debian.sh
     steps:
       - name: Git clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+      - name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
       - name: Run the tests on ${{ matrix.distro }}
         run: |
           docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
@@ -38,7 +47,7 @@ jobs:
               ${{ matrix.distro }} \
               /bin/sh -c '${{ matrix.prepare }} && \
                 tools/setup && \
-                ./configure --enable-libtap  --with-ipv6=no && \
+                ./configure --enable-libtap && \
                 make && \
                 make test && \
                 make dist && \
@@ -59,7 +68,10 @@ jobs:
           - {"distro": "fedora:rawhide", "build": ".github/mock.sh"}
     steps:
       - name: Git clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+      - name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
       - name: Run the tests on ${{ matrix.distro }}
         run: |
           docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 77ca6585..5a0b2943 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,6 +2,13 @@
 name: Tests
 
 on:
+  workflow_dispatch:
+    inputs:
+      debug_enabled:
+        type: boolean
+        description: 'Run the build with tmate debugging enabled (https://github.com/marketplace/actions/debugging-with-tmate)'
+        required: false
+        default: false
   push:
     branches:
       - '*'
@@ -21,7 +28,10 @@ jobs:
             prepare: .github/prepare_debian.sh
     steps:
       - name: Git clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+      - name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
       - name: Run the tests on ${{ matrix.distro }}
         run: |
           docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
@@ -35,7 +45,7 @@ jobs:
               ${{ matrix.distro }} \
               /bin/sh -c '${{ matrix.prepare }} && \
                 tools/setup && \
-                ./configure --enable-libtap  --with-ipv6=no && \
+                ./configure --enable-libtap && \
                 make && \
                 make test && \
                 make dist && \
@@ -59,7 +69,10 @@ jobs:
 #          - {"distro": "oraclelinux:9", "build": ".github/mock.sh"}
     steps:
       - name: Git clone repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+      - name: Setup tmate session, see https://github.com/marketplace/actions/debugging-with-tmate
+        uses: mxschmitt/action-tmate@v3
+        if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
       - name: Run the tests on ${{ matrix.distro }}
         run: |
           docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 tmp-vol
diff --git a/.gitignore b/.gitignore
index f9cb37e4..d0115b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,7 +114,6 @@ NP-VERSION-FILE
 /lib/tests/Makefile.in
 /lib/tests/test_base64
 /lib/tests/test_cmd
-/lib/tests/test_disk
 /lib/tests/test_tcp
 /lib/tests/test_utils
 /lib/tests/utils_base.Po
@@ -153,6 +152,8 @@ NP-VERSION-FILE
 /plugins/check_dbi
 /plugins/check_dig
 /plugins/check_disk
+plugins/check_disk.d/.deps/
+plugins/check_disk.d/.dirstamp
 /plugins/check_dns
 /plugins/check_dummy
 /plugins/check_fping
@@ -173,11 +174,8 @@ NP-VERSION-FILE
 /plugins/check_netsaint
 /plugins/check_nntp
 /plugins/check_nntps
-/plugins/check_nt
-/plugins/check_ntp
 /plugins/check_ntp_peer
 /plugins/check_ntp_time
-/plugins/check_nwstat
 /plugins/check_pgsql
 /plugins/check_ping
 /plugins/check_pop
@@ -197,6 +195,8 @@ NP-VERSION-FILE
 /plugins/check_udp
 /plugins/check_ups
 /plugins/check_users
+/plugins/check_users.d/.deps
+/plugins/check_users.d/.dirstamp
 /plugins/check_vsz
 /plugins/config.h
 /plugins/config.h.in
@@ -222,7 +222,7 @@ NP-VERSION-FILE
 /plugins/tests/Makefile
 /plugins/tests/Makefile.in
 /plugins/tests/test_utils
-/plugins/tests/test_disk
+/plugins/tests/test_check_disk
 /plugins/tests/test_check_swap
 /plugins/tests/.deps
 /plugins/tests/.dirstamp
@@ -231,6 +231,14 @@ NP-VERSION-FILE
 /plugins/check_swap.d/.deps
 /plugins/check_swap.d/.dirstamp
 
+# /plugins/check_snmp.d
+/plugins/check_snmp.d/.deps
+/plugins/check_snmp.d/.dirstamp
+
+# /plugins/check_curl.d
+/plugins/check_curl.d/.deps
+/plugins/check_curl.d/.dirstamp
+
 # /plugins-root/
 /plugins-root/.deps
 /plugins-root/.libs
@@ -239,6 +247,8 @@ NP-VERSION-FILE
 /plugins-root/check_dhcp
 /plugins-root/check_icmp
 /plugins-root/pst3
+/plugins-root/check_icmp.d/.dirstamp
+/plugins-root/check_icmp.d/.deps
 
 # /plugins-scripts/
 /plugins-scripts/Makefile
diff --git a/REQUIREMENTS b/REQUIREMENTS
index f3b1c01d..8f1befbd 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -26,7 +26,7 @@ check_curl:
           other SSL implementations are currently not supported
         - uriparser 0.7.5 or later
           https://uriparser.github.io/
-      
+
 check_fping:
         - Requires the fping utility distributed with SATAN.  Either
           download and install SATAN or grab the fping program from
@@ -87,20 +87,12 @@ check_ifstatus/check_ifoperstatus
         - Requires Net::SNMP perl module
           http://www.perl.com/CPAN/modules/by-authors/id/D/DT/DTOWN/
 
-check_nwstat:
-        - Requires MRTGEXT NLM for Novell Servers
-          http://forge.novell.com/modules/xfmod/project/?mrtgext
-
-check_nt:
-        - Requires NSClient to run on the NT server to monitor
-          http://nsclient.ready2run.nl/
-
 check_ups:
         - Requires Network UPS Tools (>= 1.4) to run on the server to monitor
           http://www.networkupstools.org/
 
 check_ide_smart:
-        - Uses the Linux specific SMART interface [http://smartlinux.sourceforge.net/smart/index.php]. 
+        - Uses the Linux specific SMART interface [http://smartlinux.sourceforge.net/smart/index.php].
 
 OS Specific Issues
 ------------------
diff --git a/THANKS.in b/THANKS.in
index 66397ad1..5dbb1b39 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -426,3 +426,4 @@ Eunice Remoquillo
 Louis Sautier
 Sven Hartge
 Alvar Penning
+Michael Jeanson
diff --git a/configure.ac b/configure.ac
index 204fc6e3..abd90413 100644
--- a/configure.ac
+++ b/configure.ac
@@ -181,10 +181,10 @@ fi
 
 # Finally, define tests if we use libtap
 if test "$enable_libtap" = "yes" ; then
-        EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
+        EXTRA_TEST="test_utils test_tcp test_cmd test_base64"
         AC_SUBST(EXTRA_TEST)
 
-        EXTRA_PLUGIN_TESTS="tests/test_check_swap"
+        EXTRA_PLUGIN_TESTS="tests/test_check_swap tests/test_check_disk"
         AC_SUBST(EXTRA_PLUGIN_TESTS)
 fi
 
@@ -205,32 +205,46 @@ fi
 dnl Check for PostgreSQL libraries
 _SAVEDLIBS="$LIBS"
 _SAVEDCPPFLAGS="$CPPFLAGS"
+case $host in
+        *openbsd*)
+                _CRYPTLIB="crypto"
+                ;;
+        *)
+                _CRYPTLIB="crypt"
+esac
+
 AC_ARG_WITH(pgsql,
         ACX_HELP_STRING([--with-pgsql=DIR],
                 [sets path to pgsql installation]),
         PGSQL=$withval,)
 AC_CHECK_LIB(crypt,main)
-if test "$ac_cv_lib_crypt_main" = "yes" -a "x$PGSQL" != "xno"; then
+AC_CHECK_LIB(crypto,main)
+if test \( "$ac_cv_lib_crypt_main" = "yes" -o "$ac_cv_lib_crypto_main" = "yes" \) -a "x$PGSQL" != "xno"; then
   if test -n "$PGSQL"; then
     LDFLAGS="$LDFLAGS -L$PGSQL/lib"
     CPPFLAGS="$CPPFLAGS -I$PGSQL/include"
   fi
-  AC_CHECK_LIB(pq,PQsetdbLogin,,,-lcrypt)
+  AC_CHECK_LIB(pq,PQsetdbLogin,,,"-l$_CRYPTLIB")
   if test "$ac_cv_lib_pq_PQsetdbLogin" = "yes"; then
     AC_CHECK_HEADERS(pgsql/libpq-fe.h)
     AC_CHECK_HEADERS(postgresql/libpq-fe.h)
     AC_CHECK_HEADERS(libpq-fe.h)
     if [[ -n "$PGSQL" -a "$ac_cv_header_libpq_fe_h" = "yes" ]]; then
-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
+      PGLIBS="-L$PGSQL/lib -lpq -l$_CRYPTLIB"
       PGINCLUDE="-I$PGSQL/include"
     elif test  "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then
-      PGLIBS="-lpq -lcrypt"
+      PGLIBS="-lpq -l$_CRYPTLIB"
       PGINCLUDE="-I/usr/include/pgsql"
     elif test  "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then
-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
-      PGINCLUDE="-I/usr/include/postgresql"
+      PGLIBS="-L$PGSQL/lib -lpq -l$_CRYPTLIB"
+      case $host in
+        *openbsd*)
+          PGINCLUDE="-I$PGSQL/include/postgresql" ;;
+        *)
+          PGINCLUDE="-I/usr/include/postgresql"
+      esac
     elif test  "$ac_cv_header_libpq_fe_h" = "yes"; then
-      PGLIBS="-L$PGSQL/lib -lpq -lcrypt"
+      PGLIBS="-L$PGSQL/lib -lpq -l$_CRYPTLIB"
       PGINCLUDE="-I$PGSQL/include"
     fi
     if test -z "$PGINCLUDE"; then
@@ -796,7 +810,7 @@ elif ps axwo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu etime comm args'"
-        ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n"
+        ac_cv_ps_format="%s %u %d %d %d %d %f %s %s %n"
         ac_cv_ps_cols=10
         AC_MSG_RESULT([$ac_cv_ps_command])
 
@@ -1470,17 +1484,6 @@ AC_ARG_WITH(snmpgetnext_command,
 AS_IF([test -n "$PATH_TO_SNMPGET"], [
         AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
         EXTRAS="$EXTRAS check_hpjd"
-
-        dnl PATH_TO_SNMPGETNEXT is used unconditionally in check_snmp:
-        dnl
-        dnl   https://github.com/nagios-plugins/nagios-plugins/issues/788
-        dnl
-        AS_IF([test -n "$PATH_TO_SNMPGETNEXT"], [
-                AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
-                EXTRAS="$EXTRAS check_snmp\$(EXEEXT)"
-        ], [
-                AC_MSG_WARN([Get snmpgetnext from https://net-snmp.sourceforge.io/ to build the check_snmp plugin])
-        ])
 ], [
         AC_MSG_WARN([Get snmpget from https://net-snmp.sourceforge.io/ to build the check_hpjd and check_snmp plugins])
 ])
@@ -1493,6 +1496,16 @@ else
         AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins])
 fi
 
+dnl Check whether DES encryption is available (might not on RHEL)
+AC_COMPILE_IFELSE(
+        [AC_LANG_PROGRAM(
+                [[#include <net-snmp/net-snmp-config.h>
+                #include <net-snmp/net-snmp-includes.h>]], [[oid *foo = usmDESPrivProtocol;]]
+        )],
+        [AC_DEFINE(HAVE_USM_DES_PRIV_PROTOCOL,1,Define whether we have DES Privacy Protocol)],
+        []
+)
+
 AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat)
 AC_PATH_PROG(PATH_TO_QSTAT,qstat)
 AC_ARG_WITH(qstat_command,
@@ -1519,21 +1532,47 @@ then
 fi
 
 AC_PATH_PROG(PATH_TO_FPING,fping)
-AC_PATH_PROG(PATH_TO_FPING6,fping6)
 
 AC_ARG_WITH(fping_command,
             ACX_HELP_STRING([--with-fping-command=PATH],
                             [Path to fping command]), PATH_TO_FPING=$withval)
-AC_ARG_WITH(fping6_command,
-            ACX_HELP_STRING([--with-fping6-command=PATH],
-                            [Path to fping6 command]), PATH_TO_FPING6=$withval)
-
-if test -n "$PATH_TO_FPING"
-then
+if test -n "$PATH_TO_FPING"; then
         AC_DEFINE_UNQUOTED(PATH_TO_FPING,"$PATH_TO_FPING",[path to fping])
         EXTRAS="$EXTRAS check_fping\$(EXEEXT)"
-        if test x"$with_ipv6" != xno && test -n "$PATH_TO_FPING6"; then
-                AC_DEFINE_UNQUOTED(PATH_TO_FPING6,"$PATH_TO_FPING6",[path to fping6])
+
+        if test -z "$($PATH_TO_FPING --version)"  ; then
+                AC_MSG_NOTICE([failed to get version of fping])
+        else
+                FPING_MAJOR_VERSION="$($PATH_TO_FPING --version | sed 's/.*fping: Version //' | sed 's/\..*//')"
+                FPING_MINOR_VERSION="$($PATH_TO_FPING --version | sed 's/.*fping: Version //' | sed 's/.*\.//')"
+
+                if test $FPING_MAJOR_VERSION -eq 5 ; then
+                        if test $FPING_MINOR_VERSION -ge 3 ; then
+                                AC_DEFINE(FPING_VERSION_5_3_OR_HIGHER, "true", [fping is of version 5.3 or higher])
+                                AC_MSG_NOTICE([fping is of version 5.3 or higher])
+                                AC_DEFINE(FPING_VERSION_5_2_OR_HIGHER, "true", [fping is of version 5.2 or higher])
+                                AC_MSG_NOTICE([fping is of version 5.2 or higher])
+                        elif test $FPING_MINOR_VERSION -ge 2 ; then
+                                AC_DEFINE(FPING_VERSION_5_2_OR_HIGHER, "true", [fping is of version 5.2 or higher])
+                                AC_MSG_NOTICE([fping is of version 5.2 or higher])
+                        else
+                                AC_MSG_NOTICE([fping is of a version lower then 5.2])
+                        fi
+
+                elif $FPING_MAJOR_VERSION > 5 ; then
+                        AC_DEFINE(FPING_VERSION_5_2_OR_HIGHER, "true", [fping is of version 5.2 or higher])
+                        AC_MSG_NOTICE([fping is of version 5.2 or higher])
+                        AC_DEFINE(FPING_VERSION_5_3_OR_HIGHER, "true", [fping is of version 5.2 or higher])
+                        AC_MSG_NOTICE([fping is of version 5.3 or higher])
+                fi
+
+                if test "`fping --version | sed 's/.*fping: Version //'`" =  "5.2" ; then
+                        AC_DEFINE(FPING_VERSION, "5.2", [the version of fping available])
+                        AC_MSG_NOTICE([fping version: 5.2])
+                elif test "`fping --version | sed 's/.*fping: Version //'`" =  "5.3"; then
+                        AC_DEFINE(FPING_VERSION, "5.3", [the version of fping available])
+                        AC_MSG_NOTICE([fping version: 5.3])
+                fi
         fi
 else
         AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin])
@@ -1807,11 +1846,6 @@ if test -n "$PATH_TO_APTGET" ; then
 fi
 
 
-if test -f $srcdir/plugins/check_nt.c ; then
-  EXTRAS="$EXTRAS check_nt\$(EXEEXT)"
-fi
-
-
 dnl used in check_dhcp
 AC_CHECK_HEADERS(sys/sockio.h)
 
diff --git a/gl/Makefile.am b/gl/Makefile.am
index df988b37..f462fdb7 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2024 Free Software Foundation, Inc.
+# Copyright (C) 2002-2025 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -80,9 +80,9 @@ AM_CFLAGS =
 noinst_LIBRARIES += libgnu.a
 
 libgnu_a_SOURCES =
-libgnu_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS)
-libgnu_a_LIBADD = $(gl_LIBOBJS)
-libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
+libgnu_a_CFLAGS = $(AM_CFLAGS) $(GL_CFLAG_GNULIB_WARNINGS) $(GL_CFLAG_ALLOW_WARNINGS)
+libgnu_a_LIBADD = $(gl_libgnu_LIBOBJS)
+libgnu_a_DEPENDENCIES = $(gl_libgnu_LIBOBJS)
 EXTRA_libgnu_a_SOURCES =
 
 ## begin gnulib module absolute-header
@@ -116,9 +116,10 @@ EXTRA_DIST += alloca.in.h
 
 ## end   gnulib module alloca-opt
 
-## begin gnulib module arpa_inet
+## begin gnulib module arpa_inet-h
 
 BUILT_SOURCES += arpa/inet.h
+libgnu_a_SOURCES += arpa_inet.c
 
 # We need the following in order to create <arpa/inet.h> when the system
 # doesn't have one.
@@ -135,8 +136,12 @@ arpa/inet.h: arpa_inet.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON
               -e 's/@''GNULIB_INET_NTOP''@/$(GL_GNULIB_INET_NTOP)/g' \
               -e 's/@''GNULIB_INET_PTON''@/$(GL_GNULIB_INET_PTON)/g' \
               -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
+              -e 's|@''HAVE_DECL_HTONL''@|$(HAVE_DECL_HTONL)|g' \
+              -e 's|@''HAVE_DECL_HTONS''@|$(HAVE_DECL_HTONS)|g' \
               -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \
               -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \
+              -e 's|@''HAVE_DECL_NTOHL''@|$(HAVE_DECL_NTOHL)|g' \
+              -e 's|@''HAVE_DECL_NTOHS''@|$(HAVE_DECL_NTOHS)|g' \
               -e 's|@''REPLACE_INET_NTOP''@|$(REPLACE_INET_NTOP)|g' \
               -e 's|@''REPLACE_INET_PTON''@|$(REPLACE_INET_PTON)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
@@ -149,7 +154,7 @@ MOSTLYCLEANDIRS += arpa
 
 EXTRA_DIST += arpa_inet.in.h
 
-## end   gnulib module arpa_inet
+## end   gnulib module arpa_inet-h
 
 ## begin gnulib module assert-h
 
@@ -221,6 +226,7 @@ if GL_GENERATE_BYTESWAP_H
 byteswap.h: byteswap.in.h $(top_builddir)/config.status
         $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/byteswap.in.h
         $(AM_V_at)mv $@-t $@
+libgnu_a_SOURCES += byteswap.c
 else
 byteswap.h: $(top_builddir)/config.status
         rm -f $@
@@ -231,6 +237,122 @@ EXTRA_DIST += byteswap.in.h
 
 ## end   gnulib module byteswap
 
+## begin gnulib module c-ctype
+
+libgnu_a_SOURCES += c-ctype.h c-ctype.c
+
+## end   gnulib module c-ctype
+
+## begin gnulib module c32isalnum
+
+libgnu_a_SOURCES += c32isalnum.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isalnum
+
+## begin gnulib module c32isalpha
+
+libgnu_a_SOURCES += c32isalpha.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isalpha
+
+## begin gnulib module c32isblank
+
+libgnu_a_SOURCES += c32isblank.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isblank
+
+## begin gnulib module c32iscntrl
+
+libgnu_a_SOURCES += c32iscntrl.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32iscntrl
+
+## begin gnulib module c32isdigit
+
+libgnu_a_SOURCES += c32isdigit.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isdigit
+
+## begin gnulib module c32isgraph
+
+libgnu_a_SOURCES += c32isgraph.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isgraph
+
+## begin gnulib module c32islower
+
+libgnu_a_SOURCES += c32islower.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32islower
+
+## begin gnulib module c32isprint
+
+libgnu_a_SOURCES += c32isprint.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isprint
+
+## begin gnulib module c32ispunct
+
+libgnu_a_SOURCES += c32ispunct.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32ispunct
+
+## begin gnulib module c32isspace
+
+libgnu_a_SOURCES += c32isspace.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isspace
+
+## begin gnulib module c32isupper
+
+libgnu_a_SOURCES += c32isupper.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isupper
+
+## begin gnulib module c32isxdigit
+
+libgnu_a_SOURCES += c32isxdigit.c
+
+EXTRA_DIST += c32is-impl.h
+
+## end   gnulib module c32isxdigit
+
+## begin gnulib module c32tolower
+
+libgnu_a_SOURCES += c32tolower.c
+
+EXTRA_DIST += c32to-impl.h
+
+## end   gnulib module c32tolower
+
+## begin gnulib module c32width
+
+libgnu_a_SOURCES += c32width.c
+
+## end   gnulib module c32width
+
 ## begin gnulib module calloc-gnu
 
 
@@ -313,7 +435,7 @@ endif
 
 ## end   gnulib module dup2
 
-## begin gnulib module errno
+## begin gnulib module errno-h
 
 BUILT_SOURCES += $(ERRNO_H)
 
@@ -343,7 +465,7 @@ MOSTLYCLEANFILES += errno.h errno.h-t
 
 EXTRA_DIST += errno.in.h
 
-## end   gnulib module errno
+## end   gnulib module errno-h
 
 ## begin gnulib module error
 
@@ -455,7 +577,7 @@ EXTRA_DIST += filename.h
 
 ## end   gnulib module filename
 
-## begin gnulib module float
+## begin gnulib module float-h
 
 BUILT_SOURCES += $(FLOAT_H)
 
@@ -487,7 +609,7 @@ endif
 
 EXTRA_DIST += float.in.h
 
-## end   gnulib module float
+## end   gnulib module float-h
 
 ## begin gnulib module floorf
 
@@ -563,6 +685,16 @@ EXTRA_DIST += stdio-impl.h
 
 ## end   gnulib module fseeko
 
+## begin gnulib module fseterr
+
+if GL_COND_OBJ_FSETERR
+libgnu_a_SOURCES += fseterr.c
+endif
+
+EXTRA_DIST += fseterr.h stdio-impl.h
+
+## end   gnulib module fseterr
+
 ## begin gnulib module fstat
 
 if GL_COND_OBJ_FSTAT
@@ -807,6 +939,14 @@ endif
 
 ## end   gnulib module inet_ntop
 
+## begin gnulib module inet_pton
+
+if GL_COND_OBJ_INET_PTON
+libgnu_a_SOURCES += inet_pton.c
+endif
+
+## end   gnulib module inet_pton
+
 ## begin gnulib module intprops
 
 
@@ -814,7 +954,7 @@ EXTRA_DIST += intprops-internal.h intprops.h
 
 ## end   gnulib module intprops
 
-## begin gnulib module inttypes-incomplete
+## begin gnulib module inttypes-h-incomplete
 
 BUILT_SOURCES += inttypes.h
 
@@ -855,7 +995,7 @@ MOSTLYCLEANFILES += inttypes.h inttypes.h-t
 
 EXTRA_DIST += inttypes.in.h
 
-## end   gnulib module inttypes-incomplete
+## end   gnulib module inttypes-h-incomplete
 
 ## begin gnulib module iswblank
 
@@ -899,7 +1039,7 @@ endif
 
 ## end   gnulib module iswxdigit
 
-## begin gnulib module langinfo
+## begin gnulib module langinfo-h
 
 BUILT_SOURCES += langinfo.h
 
@@ -917,6 +1057,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
               -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
               -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
               -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \
+              -e 's|@''HAVE_LANGINFO_ABALTMON''@|$(HAVE_LANGINFO_ABALTMON)|g' \
               -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
               -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
               -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
@@ -929,7 +1070,7 @@ MOSTLYCLEANFILES += langinfo.h langinfo.h-t
 
 EXTRA_DIST += langinfo.in.h
 
-## end   gnulib module langinfo
+## end   gnulib module langinfo-h
 
 ## begin gnulib module libc-config
 
@@ -972,7 +1113,7 @@ EXTRA_DIST += localcharset.h
 
 ## end   gnulib module localcharset
 
-## begin gnulib module locale
+## begin gnulib module locale-h
 
 BUILT_SOURCES += locale.h
 
@@ -985,20 +1126,28 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
+              -e 's|@''HAVE_LOCALE_T''@|$(HAVE_LOCALE_T)|g' \
+              -e 's|@''HAVE_WINDOWS_LOCALE_T''@|$(HAVE_WINDOWS_LOCALE_T)|g' \
               -e 's/@''GNULIB_LOCALECONV''@/$(GL_GNULIB_LOCALECONV)/g' \
               -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \
               -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \
+              -e 's/@''GNULIB_NEWLOCALE''@/$(GL_GNULIB_NEWLOCALE)/g' \
               -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \
+              -e 's/@''GNULIB_FREELOCALE''@/$(GL_GNULIB_FREELOCALE)/g' \
+              -e 's/@''GNULIB_GETLOCALENAME_L''@/$(GL_GNULIB_GETLOCALENAME_L)/g' \
+              -e 's/@''GNULIB_GETLOCALENAME_L_UNSAFE''@/$(GL_GNULIB_GETLOCALENAME_L_UNSAFE)/g' \
               -e 's/@''GNULIB_LOCALENAME_UNSAFE''@/$(GL_GNULIB_LOCALENAME_UNSAFE)/g' \
               -e 's|@''HAVE_NEWLOCALE''@|$(HAVE_NEWLOCALE)|g' \
               -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
               -e 's|@''HAVE_FREELOCALE''@|$(HAVE_FREELOCALE)|g' \
+              -e 's|@''HAVE_GETLOCALENAME_L''@|$(HAVE_GETLOCALENAME_L)|g' \
               -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
               -e 's|@''REPLACE_LOCALECONV''@|$(REPLACE_LOCALECONV)|g' \
               -e 's|@''REPLACE_SETLOCALE''@|$(REPLACE_SETLOCALE)|g' \
               -e 's|@''REPLACE_NEWLOCALE''@|$(REPLACE_NEWLOCALE)|g' \
               -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
               -e 's|@''REPLACE_FREELOCALE''@|$(REPLACE_FREELOCALE)|g' \
+              -e 's|@''REPLACE_GETLOCALENAME_L''@|$(REPLACE_GETLOCALENAME_L)|g' \
               -e 's|@''REPLACE_STRUCT_LCONV''@|$(REPLACE_STRUCT_LCONV)|g' \
               -e 's|@''LOCALENAME_ENHANCE_LOCALE_FUNCS''@|$(LOCALENAME_ENHANCE_LOCALE_FUNCS)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
@@ -1010,7 +1159,7 @@ MOSTLYCLEANFILES += locale.h locale.h-t
 
 EXTRA_DIST += locale.in.h
 
-## end   gnulib module locale
+## end   gnulib module locale-h
 
 ## begin gnulib module localeconv
 
@@ -1034,6 +1183,14 @@ endif
 
 ## end   gnulib module lseek
 
+## begin gnulib module lstat
+
+if GL_COND_OBJ_LSTAT
+libgnu_a_SOURCES += lstat.c
+endif
+
+## end   gnulib module lstat
+
 ## begin gnulib module malloc-gnu
 
 
@@ -1060,7 +1217,7 @@ EXTRA_DIST += malloca.h
 
 ## end   gnulib module malloca
 
-## begin gnulib module math
+## begin gnulib module math-h
 
 BUILT_SOURCES += math.h
 libgnu_a_SOURCES += math.c
@@ -1150,6 +1307,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_LOGB''@/$(GL_GNULIB_LOGB)/g' \
               -e 's/@''GNULIB_LOGBF''@/$(GL_GNULIB_LOGBF)/g' \
               -e 's/@''GNULIB_LOGBL''@/$(GL_GNULIB_LOGBL)/g' \
+              -e 's/@''GNULIB_LOGP1''@/$(GL_GNULIB_LOGP1)/g' \
+              -e 's/@''GNULIB_LOGP1F''@/$(GL_GNULIB_LOGP1F)/g' \
+              -e 's/@''GNULIB_LOGP1L''@/$(GL_GNULIB_LOGP1L)/g' \
               -e 's/@''GNULIB_MODF''@/$(GL_GNULIB_MODF)/g' \
               -e 's/@''GNULIB_MODFF''@/$(GL_GNULIB_MODFF)/g' \
               -e 's/@''GNULIB_MODFL''@/$(GL_GNULIB_MODFL)/g' \
@@ -1243,6 +1403,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_LOG1PL''@|$(HAVE_LOG1PL)|g' \
               -e 's|@''HAVE_LOGBF''@|$(HAVE_LOGBF)|g' \
               -e 's|@''HAVE_LOGBL''@|$(HAVE_LOGBL)|g' \
+              -e 's|@''HAVE_LOGP1''@|$(HAVE_LOGP1)|g' \
+              -e 's|@''HAVE_LOGP1F''@|$(HAVE_LOGP1F)|g' \
+              -e 's|@''HAVE_LOGP1L''@|$(HAVE_LOGP1L)|g' \
               -e 's|@''HAVE_MODFF''@|$(HAVE_MODFF)|g' \
               -e 's|@''HAVE_MODFL''@|$(HAVE_MODFL)|g' \
               -e 's|@''HAVE_POWF''@|$(HAVE_POWF)|g' \
@@ -1389,6 +1552,7 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_SIGNBIT_USING_BUILTINS''@|$(REPLACE_SIGNBIT_USING_BUILTINS)|g' \
               -e 's|@''REPLACE_SINF''@|$(REPLACE_SINF)|g' \
               -e 's|@''REPLACE_SINHF''@|$(REPLACE_SINHF)|g' \
+              -e 's|@''REPLACE_SINL''@|$(REPLACE_SINL)|g' \
               -e 's|@''REPLACE_SQRTF''@|$(REPLACE_SQRTF)|g' \
               -e 's|@''REPLACE_SQRTL''@|$(REPLACE_SQRTL)|g' \
               -e 's|@''REPLACE_TANF''@|$(REPLACE_TANF)|g' \
@@ -1412,7 +1576,33 @@ MOSTLYCLEANFILES += math.h math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5 mat
 
 EXTRA_DIST += math.in.h
 
-## end   gnulib module math
+## end   gnulib module math-h
+
+## begin gnulib module mbchar
+
+libgnu_a_SOURCES += mbchar.c
+
+EXTRA_DIST += mbchar.h
+
+## end   gnulib module mbchar
+
+## begin gnulib module mbiterf
+
+libgnu_a_SOURCES += mbiterf.h mbiterf.c
+
+## end   gnulib module mbiterf
+
+## begin gnulib module mbrtoc32
+
+if GL_COND_OBJ_MBRTOC32
+libgnu_a_SOURCES += mbrtoc32.c
+endif
+
+EXTRA_DIST += lc-charset-dispatch.c lc-charset-dispatch.h mbrtowc-impl-utf8.h mbrtowc-impl.h mbtowc-lock.c mbtowc-lock.h windows-initguard.h
+
+EXTRA_libgnu_a_SOURCES += lc-charset-dispatch.c mbtowc-lock.c
+
+## end   gnulib module mbrtoc32
 
 ## begin gnulib module mbrtowc
 
@@ -1434,6 +1624,12 @@ endif
 
 ## end   gnulib module mbsinit
 
+## begin gnulib module mbsnlen
+
+libgnu_a_SOURCES += mbsnlen.c
+
+## end   gnulib module mbsnlen
+
 ## begin gnulib module mbszero
 
 libgnu_a_SOURCES += mbszero.c
@@ -1486,9 +1682,7 @@ EXTRA_libgnu_a_SOURCES += mktime.c
 
 ## begin gnulib module mountlist
 
-if GL_COND_OBJ_MOUNTLIST
 libgnu_a_SOURCES += mountlist.c
-endif
 
 EXTRA_DIST += mountlist.h
 
@@ -1514,7 +1708,7 @@ EXTRA_DIST += msvc-nothrow.h
 
 ## end   gnulib module msvc-nothrow
 
-## begin gnulib module netdb
+## begin gnulib module netdb-h
 
 BUILT_SOURCES += netdb.h
 
@@ -1545,9 +1739,9 @@ MOSTLYCLEANFILES += netdb.h netdb.h-t
 
 EXTRA_DIST += netdb.in.h
 
-## end   gnulib module netdb
+## end   gnulib module netdb-h
 
-## begin gnulib module netinet_in
+## begin gnulib module netinet_in-h
 
 BUILT_SOURCES += $(NETINET_IN_H)
 
@@ -1574,7 +1768,7 @@ MOSTLYCLEANDIRS += netinet
 
 EXTRA_DIST += netinet_in.in.h
 
-## end   gnulib module netinet_in
+## end   gnulib module netinet_in-h
 
 ## begin gnulib module nl_langinfo
 
@@ -1589,6 +1783,12 @@ EXTRA_DIST += windows-initguard.h
 
 ## end   gnulib module nl_langinfo
 
+## begin gnulib module once
+
+libgnu_a_SOURCES += glthread/once.h glthread/once.c
+
+## end   gnulib module once
+
 ## begin gnulib module open
 
 if GL_COND_OBJ_OPEN
@@ -1604,21 +1804,168 @@ EXTRA_DIST += pathmax.h
 
 ## end   gnulib module pathmax
 
-## begin gnulib module realloc-gnu
+## begin gnulib module pthread-h
 
+BUILT_SOURCES += pthread.h
+
+# We need the following in order to create <pthread.h> when the system
+# doesn't have one that works with the given compiler.
+pthread.h: pthread.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''GUARD_PREFIX''@|GL|g' \
+              -e 's|@''HAVE_PTHREAD_H''@|$(HAVE_PTHREAD_H)|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+              -e 's|@''NEXT_PTHREAD_H''@|$(NEXT_PTHREAD_H)|g' \
+              -e 's/@''GNULIB_PTHREAD_THREAD''@/$(GL_GNULIB_PTHREAD_THREAD)/g' \
+              -e 's/@''GNULIB_PTHREAD_ONCE''@/$(GL_GNULIB_PTHREAD_ONCE)/g' \
+              -e 's/@''GNULIB_PTHREAD_MUTEX''@/$(GL_GNULIB_PTHREAD_MUTEX)/g' \
+              -e 's/@''GNULIB_PTHREAD_RWLOCK''@/$(GL_GNULIB_PTHREAD_RWLOCK)/g' \
+              -e 's/@''GNULIB_PTHREAD_COND''@/$(GL_GNULIB_PTHREAD_COND)/g' \
+              -e 's/@''GNULIB_PTHREAD_TSS''@/$(GL_GNULIB_PTHREAD_TSS)/g' \
+              -e 's/@''GNULIB_PTHREAD_SPIN''@/$(GL_GNULIB_PTHREAD_SPIN)/g' \
+              -e 's/@''GNULIB_PTHREAD_MUTEX_TIMEDLOCK''@/$(GL_GNULIB_PTHREAD_MUTEX_TIMEDLOCK)/g' \
+              -e 's|@''HAVE_PTHREAD_T''@|$(HAVE_PTHREAD_T)|g' \
+              -e 's|@''HAVE_PTHREAD_SPINLOCK_T''@|$(HAVE_PTHREAD_SPINLOCK_T)|g' \
+              -e 's|@''HAVE_PTHREAD_CREATE_DETACHED''@|$(HAVE_PTHREAD_CREATE_DETACHED)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEX_RECURSIVE''@|$(HAVE_PTHREAD_MUTEX_RECURSIVE)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEX_ROBUST''@|$(HAVE_PTHREAD_MUTEX_ROBUST)|g' \
+              -e 's|@''HAVE_PTHREAD_PROCESS_SHARED''@|$(HAVE_PTHREAD_PROCESS_SHARED)|g' \
+              -e 's|@''HAVE_PTHREAD_CREATE''@|$(HAVE_PTHREAD_CREATE)|g' \
+              -e 's|@''HAVE_PTHREAD_ATTR_INIT''@|$(HAVE_PTHREAD_ATTR_INIT)|g' \
+              -e 's|@''HAVE_PTHREAD_ATTR_GETDETACHSTATE''@|$(HAVE_PTHREAD_ATTR_GETDETACHSTATE)|g' \
+              -e 's|@''HAVE_PTHREAD_ATTR_SETDETACHSTATE''@|$(HAVE_PTHREAD_ATTR_SETDETACHSTATE)|g' \
+              -e 's|@''HAVE_PTHREAD_ATTR_DESTROY''@|$(HAVE_PTHREAD_ATTR_DESTROY)|g' \
+              -e 's|@''HAVE_PTHREAD_SELF''@|$(HAVE_PTHREAD_SELF)|g' \
+              -e 's|@''HAVE_PTHREAD_EQUAL''@|$(HAVE_PTHREAD_EQUAL)|g' \
+              -e 's|@''HAVE_PTHREAD_DETACH''@|$(HAVE_PTHREAD_DETACH)|g' \
+              -e 's|@''HAVE_PTHREAD_JOIN''@|$(HAVE_PTHREAD_JOIN)|g' \
+              -e 's|@''HAVE_PTHREAD_EXIT''@|$(HAVE_PTHREAD_EXIT)|g' \
+              < $(srcdir)/pthread.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_PTHREAD_ONCE''@|$(HAVE_PTHREAD_ONCE)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEX_INIT''@|$(HAVE_PTHREAD_MUTEX_INIT)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEXATTR_INIT''@|$(HAVE_PTHREAD_MUTEXATTR_INIT)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETTYPE''@|$(HAVE_PTHREAD_MUTEXATTR_GETTYPE)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETTYPE''@|$(HAVE_PTHREAD_MUTEXATTR_SETTYPE)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEXATTR_GETROBUST''@|$(HAVE_PTHREAD_MUTEXATTR_GETROBUST)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEXATTR_SETROBUST''@|$(HAVE_PTHREAD_MUTEXATTR_SETROBUST)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEXATTR_DESTROY''@|$(HAVE_PTHREAD_MUTEXATTR_DESTROY)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEX_LOCK''@|$(HAVE_PTHREAD_MUTEX_LOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEX_TRYLOCK''@|$(HAVE_PTHREAD_MUTEX_TRYLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEX_TIMEDLOCK''@|$(HAVE_PTHREAD_MUTEX_TIMEDLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEX_UNLOCK''@|$(HAVE_PTHREAD_MUTEX_UNLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_MUTEX_DESTROY''@|$(HAVE_PTHREAD_MUTEX_DESTROY)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_INIT''@|$(HAVE_PTHREAD_RWLOCK_INIT)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCKATTR_INIT''@|$(HAVE_PTHREAD_RWLOCKATTR_INIT)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCKATTR_DESTROY''@|$(HAVE_PTHREAD_RWLOCKATTR_DESTROY)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_RDLOCK''@|$(HAVE_PTHREAD_RWLOCK_RDLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_WRLOCK''@|$(HAVE_PTHREAD_RWLOCK_WRLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_TRYRDLOCK''@|$(HAVE_PTHREAD_RWLOCK_TRYRDLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_TRYWRLOCK''@|$(HAVE_PTHREAD_RWLOCK_TRYWRLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|$(HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|$(HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_UNLOCK''@|$(HAVE_PTHREAD_RWLOCK_UNLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_RWLOCK_DESTROY''@|$(HAVE_PTHREAD_RWLOCK_DESTROY)|g' \
+              -e 's|@''HAVE_PTHREAD_COND_INIT''@|$(HAVE_PTHREAD_COND_INIT)|g' \
+              -e 's|@''HAVE_PTHREAD_CONDATTR_INIT''@|$(HAVE_PTHREAD_CONDATTR_INIT)|g' \
+              -e 's|@''HAVE_PTHREAD_CONDATTR_DESTROY''@|$(HAVE_PTHREAD_CONDATTR_DESTROY)|g' \
+              -e 's|@''HAVE_PTHREAD_COND_WAIT''@|$(HAVE_PTHREAD_COND_WAIT)|g' \
+              -e 's|@''HAVE_PTHREAD_COND_TIMEDWAIT''@|$(HAVE_PTHREAD_COND_TIMEDWAIT)|g' \
+              -e 's|@''HAVE_PTHREAD_COND_SIGNAL''@|$(HAVE_PTHREAD_COND_SIGNAL)|g' \
+              -e 's|@''HAVE_PTHREAD_COND_BROADCAST''@|$(HAVE_PTHREAD_COND_BROADCAST)|g' \
+              -e 's|@''HAVE_PTHREAD_COND_DESTROY''@|$(HAVE_PTHREAD_COND_DESTROY)|g' \
+              -e 's|@''HAVE_PTHREAD_KEY_CREATE''@|$(HAVE_PTHREAD_KEY_CREATE)|g' \
+              -e 's|@''HAVE_PTHREAD_SETSPECIFIC''@|$(HAVE_PTHREAD_SETSPECIFIC)|g' \
+              -e 's|@''HAVE_PTHREAD_GETSPECIFIC''@|$(HAVE_PTHREAD_GETSPECIFIC)|g' \
+              -e 's|@''HAVE_PTHREAD_KEY_DELETE''@|$(HAVE_PTHREAD_KEY_DELETE)|g' \
+              -e 's|@''HAVE_PTHREAD_SPIN_INIT''@|$(HAVE_PTHREAD_SPIN_INIT)|g' \
+              -e 's|@''HAVE_PTHREAD_SPIN_LOCK''@|$(HAVE_PTHREAD_SPIN_LOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_SPIN_TRYLOCK''@|$(HAVE_PTHREAD_SPIN_TRYLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_SPIN_UNLOCK''@|$(HAVE_PTHREAD_SPIN_UNLOCK)|g' \
+              -e 's|@''HAVE_PTHREAD_SPIN_DESTROY''@|$(HAVE_PTHREAD_SPIN_DESTROY)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_PTHREAD_CREATE''@|$(REPLACE_PTHREAD_CREATE)|g' \
+              -e 's|@''REPLACE_PTHREAD_ATTR_INIT''@|$(REPLACE_PTHREAD_ATTR_INIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_ATTR_GETDETACHSTATE''@|$(REPLACE_PTHREAD_ATTR_GETDETACHSTATE)|g' \
+              -e 's|@''REPLACE_PTHREAD_ATTR_SETDETACHSTATE''@|$(REPLACE_PTHREAD_ATTR_SETDETACHSTATE)|g' \
+              -e 's|@''REPLACE_PTHREAD_ATTR_DESTROY''@|$(REPLACE_PTHREAD_ATTR_DESTROY)|g' \
+              -e 's|@''REPLACE_PTHREAD_SELF''@|$(REPLACE_PTHREAD_SELF)|g' \
+              -e 's|@''REPLACE_PTHREAD_EQUAL''@|$(REPLACE_PTHREAD_EQUAL)|g' \
+              -e 's|@''REPLACE_PTHREAD_DETACH''@|$(REPLACE_PTHREAD_DETACH)|g' \
+              -e 's|@''REPLACE_PTHREAD_JOIN''@|$(REPLACE_PTHREAD_JOIN)|g' \
+              -e 's|@''REPLACE_PTHREAD_EXIT''@|$(REPLACE_PTHREAD_EXIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_ONCE''@|$(REPLACE_PTHREAD_ONCE)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEX_INIT''@|$(REPLACE_PTHREAD_MUTEX_INIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEXATTR_INIT''@|$(REPLACE_PTHREAD_MUTEXATTR_INIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETTYPE''@|$(REPLACE_PTHREAD_MUTEXATTR_GETTYPE)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETTYPE''@|$(REPLACE_PTHREAD_MUTEXATTR_SETTYPE)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEXATTR_GETROBUST''@|$(REPLACE_PTHREAD_MUTEXATTR_GETROBUST)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEXATTR_SETROBUST''@|$(REPLACE_PTHREAD_MUTEXATTR_SETROBUST)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEXATTR_DESTROY''@|$(REPLACE_PTHREAD_MUTEXATTR_DESTROY)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEX_LOCK''@|$(REPLACE_PTHREAD_MUTEX_LOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEX_TRYLOCK''@|$(REPLACE_PTHREAD_MUTEX_TRYLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEX_TIMEDLOCK''@|$(REPLACE_PTHREAD_MUTEX_TIMEDLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEX_UNLOCK''@|$(REPLACE_PTHREAD_MUTEX_UNLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_MUTEX_DESTROY''@|$(REPLACE_PTHREAD_MUTEX_DESTROY)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_INIT''@|$(REPLACE_PTHREAD_RWLOCK_INIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_INIT''@|$(REPLACE_PTHREAD_RWLOCKATTR_INIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCKATTR_DESTROY''@|$(REPLACE_PTHREAD_RWLOCKATTR_DESTROY)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_RDLOCK''@|$(REPLACE_PTHREAD_RWLOCK_RDLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_WRLOCK''@|$(REPLACE_PTHREAD_RWLOCK_WRLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYRDLOCK''@|$(REPLACE_PTHREAD_RWLOCK_TRYRDLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_TRYWRLOCK''@|$(REPLACE_PTHREAD_RWLOCK_TRYWRLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK''@|$(REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK''@|$(REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_UNLOCK''@|$(REPLACE_PTHREAD_RWLOCK_UNLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_RWLOCK_DESTROY''@|$(REPLACE_PTHREAD_RWLOCK_DESTROY)|g' \
+              < $@-t2 > $@-t3
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_PTHREAD_COND_INIT''@|$(REPLACE_PTHREAD_COND_INIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_CONDATTR_INIT''@|$(REPLACE_PTHREAD_CONDATTR_INIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_CONDATTR_DESTROY''@|$(REPLACE_PTHREAD_CONDATTR_DESTROY)|g' \
+              -e 's|@''REPLACE_PTHREAD_COND_WAIT''@|$(REPLACE_PTHREAD_COND_WAIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_COND_TIMEDWAIT''@|$(REPLACE_PTHREAD_COND_TIMEDWAIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_COND_SIGNAL''@|$(REPLACE_PTHREAD_COND_SIGNAL)|g' \
+              -e 's|@''REPLACE_PTHREAD_COND_BROADCAST''@|$(REPLACE_PTHREAD_COND_BROADCAST)|g' \
+              -e 's|@''REPLACE_PTHREAD_COND_DESTROY''@|$(REPLACE_PTHREAD_COND_DESTROY)|g' \
+              -e 's|@''REPLACE_PTHREAD_KEY_CREATE''@|$(REPLACE_PTHREAD_KEY_CREATE)|g' \
+              -e 's|@''REPLACE_PTHREAD_SETSPECIFIC''@|$(REPLACE_PTHREAD_SETSPECIFIC)|g' \
+              -e 's|@''REPLACE_PTHREAD_GETSPECIFIC''@|$(REPLACE_PTHREAD_GETSPECIFIC)|g' \
+              -e 's|@''REPLACE_PTHREAD_KEY_DELETE''@|$(REPLACE_PTHREAD_KEY_DELETE)|g' \
+              -e 's|@''REPLACE_PTHREAD_SPIN_INIT''@|$(REPLACE_PTHREAD_SPIN_INIT)|g' \
+              -e 's|@''REPLACE_PTHREAD_SPIN_LOCK''@|$(REPLACE_PTHREAD_SPIN_LOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_SPIN_TRYLOCK''@|$(REPLACE_PTHREAD_SPIN_TRYLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_SPIN_UNLOCK''@|$(REPLACE_PTHREAD_SPIN_UNLOCK)|g' \
+              -e 's|@''REPLACE_PTHREAD_SPIN_DESTROY''@|$(REPLACE_PTHREAD_SPIN_DESTROY)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _Noreturn/r $(_NORETURN_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+              < $@-t3 > $@-t4
+        $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+        $(AM_V_at)mv $@-t4 $@
+MOSTLYCLEANFILES += pthread.h pthread.h-t1 pthread.h-t2 pthread.h-t3 pthread.h-t4
 
-EXTRA_DIST += realloc.c
+EXTRA_DIST += pthread.in.h
 
-EXTRA_libgnu_a_SOURCES += realloc.c
+## end   gnulib module pthread-h
 
-## end   gnulib module realloc-gnu
+## begin gnulib module pthread-once
 
-## begin gnulib module realloc-posix
+if GL_COND_OBJ_PTHREAD_ONCE
+libgnu_a_SOURCES += pthread-once.c
+endif
 
+## end   gnulib module pthread-once
 
-EXTRA_DIST += realloc.c
+## begin gnulib module realloc-posix
 
-EXTRA_libgnu_a_SOURCES += realloc.c
+if GL_COND_OBJ_REALLOC_POSIX
+libgnu_a_SOURCES += realloc.c
+endif
 
 ## end   gnulib module realloc-posix
 
@@ -1642,6 +1989,35 @@ EXTRA_libgnu_a_SOURCES += regcomp.c regex_internal.c regexec.c
 
 ## end   gnulib module regex
 
+## begin gnulib module sched-h
+
+BUILT_SOURCES += sched.h
+
+# We need the following in order to create a replacement for <sched.h> when
+# the system doesn't have one.
+sched.h: sched.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+        $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''GUARD_PREFIX''@|GL|g' \
+              -e 's|@''HAVE_SCHED_H''@|$(HAVE_SCHED_H)|g' \
+              -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+              -e 's|@''NEXT_SCHED_H''@|$(NEXT_SCHED_H)|g' \
+              -e 's|@''HAVE_STRUCT_SCHED_PARAM''@|$(HAVE_STRUCT_SCHED_PARAM)|g' \
+              -e 's/@''GNULIB_SCHED_YIELD''@/$(GL_GNULIB_SCHED_YIELD)/g' \
+              -e 's|@''HAVE_SCHED_YIELD''@|$(HAVE_SCHED_YIELD)|g' \
+              -e 's|@''REPLACE_SCHED_YIELD''@|$(REPLACE_SCHED_YIELD)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+              $(srcdir)/sched.in.h > $@-t
+        $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += sched.h sched.h-t
+
+EXTRA_DIST += sched.in.h
+
+## end   gnulib module sched-h
+
 ## begin gnulib module setenv
 
 if GL_COND_OBJ_SETENV
@@ -1760,7 +2136,7 @@ EXTRA_DIST += stat-time.h
 
 ## end   gnulib module stat-time
 
-## begin gnulib module stdckdint
+## begin gnulib module stdckdint-h
 
 BUILT_SOURCES += $(STDCKDINT_H)
 
@@ -1769,6 +2145,15 @@ BUILT_SOURCES += $(STDCKDINT_H)
 if GL_GENERATE_STDCKDINT_H
 stdckdint.h: stdckdint.in.h $(top_builddir)/config.status
         $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''GUARD_PREFIX''@|GL|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+              -e 's|@''NEXT_STDCKDINT_H''@|$(NEXT_STDCKDINT_H)|g' \
+              -e 's|@''HAVE_C_STDCKDINT_H''@|$(HAVE_C_STDCKDINT_H)|g' \
+              -e 's|@''HAVE_WORKING_C_STDCKDINT_H''@|$(HAVE_WORKING_C_STDCKDINT_H)|g' \
+              -e 's|@''HAVE_CXX_STDCKDINT_H''@|$(HAVE_CXX_STDCKDINT_H)|g' \
+              -e 's|@''HAVE_WORKING_CXX_STDCKDINT_H''@|$(HAVE_WORKING_CXX_STDCKDINT_H)|g' \
           $(srcdir)/stdckdint.in.h > $@-t
         $(AM_V_at)mv $@-t $@
 else
@@ -1779,9 +2164,9 @@ MOSTLYCLEANFILES += stdckdint.h stdckdint.h-t
 
 EXTRA_DIST += intprops-internal.h stdckdint.in.h
 
-## end   gnulib module stdckdint
+## end   gnulib module stdckdint-h
 
-## begin gnulib module stddef
+## begin gnulib module stddef-h
 
 BUILT_SOURCES += $(STDDEF_H)
 
@@ -1795,9 +2180,11 @@ stddef.h: stddef.in.h $(top_builddir)/config.status
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
-              -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
-              -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+              -e 's|@''NULLPTR_T_NEEDS_STDDEF''@|$(NULLPTR_T_NEEDS_STDDEF)|g' \
+              -e 's|@''STDDEF_NOT_IDEMPOTENT''@|$(STDDEF_NOT_IDEMPOTENT)|g' \
               -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+              -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
+              -e 's|@''HAVE_C_UNREACHABLE''@|$(HAVE_C_UNREACHABLE)|g' \
               $(srcdir)/stddef.in.h > $@-t
         $(AM_V_at)mv $@-t $@
 else
@@ -1808,9 +2195,9 @@ MOSTLYCLEANFILES += stddef.h stddef.h-t
 
 EXTRA_DIST += stddef.in.h
 
-## end   gnulib module stddef
+## end   gnulib module stddef-h
 
-## begin gnulib module stdint
+## begin gnulib module stdint-h
 
 BUILT_SOURCES += $(STDINT_H)
 
@@ -1856,9 +2243,9 @@ MOSTLYCLEANFILES += stdint.h stdint.h-t
 
 EXTRA_DIST += stdint.in.h
 
-## end   gnulib module stdint
+## end   gnulib module stdint-h
 
-## begin gnulib module stdio
+## begin gnulib module stdio-h
 
 BUILT_SOURCES += stdio.h
 
@@ -1872,6 +2259,7 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
               -e 's/@''GNULIB_DPRINTF''@/$(GL_GNULIB_DPRINTF)/g' \
+              -e 's/@''GNULIB_DZPRINTF''@/$(GL_GNULIB_DZPRINTF)/g' \
               -e 's/@''GNULIB_FCLOSE''@/$(GL_GNULIB_FCLOSE)/g' \
               -e 's/@''GNULIB_FDOPEN''@/$(GL_GNULIB_FDOPEN)/g' \
               -e 's/@''GNULIB_FFLUSH''@/$(GL_GNULIB_FFLUSH)/g' \
@@ -1892,12 +2280,14 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_FTELL''@/$(GL_GNULIB_FTELL)/g' \
               -e 's/@''GNULIB_FTELLO''@/$(GL_GNULIB_FTELLO)/g' \
               -e 's/@''GNULIB_FWRITE''@/$(GL_GNULIB_FWRITE)/g' \
+              -e 's/@''GNULIB_FZPRINTF''@/$(GL_GNULIB_FZPRINTF)/g' \
               -e 's/@''GNULIB_GETC''@/$(GL_GNULIB_GETC)/g' \
               -e 's/@''GNULIB_GETCHAR''@/$(GL_GNULIB_GETCHAR)/g' \
               -e 's/@''GNULIB_GETDELIM''@/$(GL_GNULIB_GETDELIM)/g' \
               -e 's/@''GNULIB_GETLINE''@/$(GL_GNULIB_GETLINE)/g' \
               -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GL_GNULIB_OBSTACK_PRINTF)/g' \
               -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GL_GNULIB_OBSTACK_PRINTF_POSIX)/g' \
+              -e 's/@''GNULIB_OBSTACK_ZPRINTF''@/$(GL_GNULIB_OBSTACK_ZPRINTF)/g' \
               -e 's/@''GNULIB_PCLOSE''@/$(GL_GNULIB_PCLOSE)/g' \
               -e 's/@''GNULIB_PERROR''@/$(GL_GNULIB_PERROR)/g' \
               -e 's/@''GNULIB_POPEN''@/$(GL_GNULIB_POPEN)/g' \
@@ -1911,20 +2301,29 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_RENAMEAT''@/$(GL_GNULIB_RENAMEAT)/g' \
               -e 's/@''GNULIB_SCANF''@/$(GL_GNULIB_SCANF)/g' \
               -e 's/@''GNULIB_SNPRINTF''@/$(GL_GNULIB_SNPRINTF)/g' \
+              -e 's/@''GNULIB_SNZPRINTF''@/$(GL_GNULIB_SNZPRINTF)/g' \
               -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GL_GNULIB_SPRINTF_POSIX)/g' \
               -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GL_GNULIB_STDIO_H_NONBLOCKING)/g' \
               -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GL_GNULIB_STDIO_H_SIGPIPE)/g' \
+              -e 's/@''GNULIB_SZPRINTF''@/$(GL_GNULIB_SZPRINTF)/g' \
               -e 's/@''GNULIB_TMPFILE''@/$(GL_GNULIB_TMPFILE)/g' \
               -e 's/@''GNULIB_VASPRINTF''@/$(GL_GNULIB_VASPRINTF)/g' \
+              -e 's/@''GNULIB_VASZPRINTF''@/$(GL_GNULIB_VASZPRINTF)/g' \
               -e 's/@''GNULIB_VDPRINTF''@/$(GL_GNULIB_VDPRINTF)/g' \
+              -e 's/@''GNULIB_VDZPRINTF''@/$(GL_GNULIB_VDZPRINTF)/g' \
               -e 's/@''GNULIB_VFPRINTF''@/$(GL_GNULIB_VFPRINTF)/g' \
               -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GL_GNULIB_VFPRINTF_POSIX)/g' \
+              -e 's/@''GNULIB_VFZPRINTF''@/$(GL_GNULIB_VFZPRINTF)/g' \
               -e 's/@''GNULIB_VFSCANF''@/$(GL_GNULIB_VFSCANF)/g' \
               -e 's/@''GNULIB_VSCANF''@/$(GL_GNULIB_VSCANF)/g' \
               -e 's/@''GNULIB_VPRINTF''@/$(GL_GNULIB_VPRINTF)/g' \
               -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GL_GNULIB_VPRINTF_POSIX)/g' \
               -e 's/@''GNULIB_VSNPRINTF''@/$(GL_GNULIB_VSNPRINTF)/g' \
+              -e 's/@''GNULIB_VSNZPRINTF''@/$(GL_GNULIB_VSNZPRINTF)/g' \
               -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GL_GNULIB_VSPRINTF_POSIX)/g' \
+              -e 's/@''GNULIB_VSZPRINTF''@/$(GL_GNULIB_VSZPRINTF)/g' \
+              -e 's/@''GNULIB_VZPRINTF''@/$(GL_GNULIB_VZPRINTF)/g' \
+              -e 's/@''GNULIB_ZPRINTF''@/$(GL_GNULIB_ZPRINTF)/g' \
               -e 's/@''GNULIB_MDA_FCLOSEALL''@/$(GL_GNULIB_MDA_FCLOSEALL)/g' \
               -e 's/@''GNULIB_MDA_FDOPEN''@/$(GL_GNULIB_MDA_FDOPEN)/g' \
               -e 's/@''GNULIB_MDA_FILENO''@/$(GL_GNULIB_MDA_FILENO)/g' \
@@ -1996,6 +2395,9 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
         $(AM_V_at)mv $@-t3 $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t1 stdio.h-t2 stdio.h-t3
 
+if GL_COND_OBJ_STDIO_CONSOLESAFE
+libgnu_a_SOURCES += stdio-consolesafe.c
+endif
 if GL_COND_OBJ_STDIO_READ
 libgnu_a_SOURCES += stdio-read.c
 endif
@@ -2005,14 +2407,13 @@ endif
 
 EXTRA_DIST += stdio.in.h
 
-## end   gnulib module stdio
+## end   gnulib module stdio-h
 
-## begin gnulib module stdlib
+## begin gnulib module stdlib-h
 
 BUILT_SOURCES += stdlib.h
+libgnu_a_SOURCES += stdlib.c
 
-# We need the following in order to create <stdlib.h> when the system
-# doesn't have one that works with the given compiler.
 stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
   $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
         $(gl_V_at)$(SED_HEADER_STDOUT) \
@@ -2022,6 +2423,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
               -e 's/@''GNULIB__EXIT''@/$(GL_GNULIB__EXIT)/g' \
+              -e 's/@''GNULIB_ABORT_DEBUG''@/$(GL_GNULIB_ABORT_DEBUG)/g' \
               -e 's/@''GNULIB_ALIGNED_ALLOC''@/$(GL_GNULIB_ALIGNED_ALLOC)/g' \
               -e 's/@''GNULIB_ATOLL''@/$(GL_GNULIB_ATOLL)/g' \
               -e 's/@''GNULIB_CALLOC_GNU''@/$(GL_GNULIB_CALLOC_GNU)/g' \
@@ -2050,13 +2452,13 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_RAND''@/$(GL_GNULIB_RAND)/g' \
               -e 's/@''GNULIB_RANDOM''@/$(GL_GNULIB_RANDOM)/g' \
               -e 's/@''GNULIB_RANDOM_R''@/$(GL_GNULIB_RANDOM_R)/g' \
-              -e 's/@''GNULIB_REALLOC_GNU''@/$(GL_GNULIB_REALLOC_GNU)/g' \
               -e 's/@''GNULIB_REALLOC_POSIX''@/$(GL_GNULIB_REALLOC_POSIX)/g' \
               -e 's/@''GNULIB_REALLOCARRAY''@/$(GL_GNULIB_REALLOCARRAY)/g' \
               -e 's/@''GNULIB_REALPATH''@/$(GL_GNULIB_REALPATH)/g' \
               -e 's/@''GNULIB_RPMATCH''@/$(GL_GNULIB_RPMATCH)/g' \
               -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \
               -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \
+              -e 's/@''GNULIB_STACK_TRACE''@/$(GL_GNULIB_STACK_TRACE)/g' \
               -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \
               -e 's/@''GNULIB_STRTOF''@/$(GL_GNULIB_STRTOF)/g' \
               -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \
@@ -2124,6 +2526,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               < $@-t1 > $@-t2
         $(AM_V_at)sed \
               -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|g' \
+              -e 's|@''REPLACE_ABORT''@|$(REPLACE_ABORT)|g' \
               -e 's|@''REPLACE_ALIGNED_ALLOC''@|$(REPLACE_ALIGNED_ALLOC)|g' \
               -e 's|@''REPLACE_CALLOC_FOR_CALLOC_GNU''@|$(REPLACE_CALLOC_FOR_CALLOC_GNU)|g' \
               -e 's|@''REPLACE_CALLOC_FOR_CALLOC_POSIX''@|$(REPLACE_CALLOC_FOR_CALLOC_POSIX)|g' \
@@ -2150,7 +2553,6 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''REPLACE_RAND''@|$(REPLACE_RAND)|g' \
               -e 's|@''REPLACE_RANDOM''@|$(REPLACE_RANDOM)|g' \
               -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \
-              -e 's|@''REPLACE_REALLOC_FOR_REALLOC_GNU''@|$(REPLACE_REALLOC_FOR_REALLOC_GNU)|g' \
               -e 's|@''REPLACE_REALLOC_FOR_REALLOC_POSIX''@|$(REPLACE_REALLOC_FOR_REALLOC_POSIX)|g' \
               -e 's|@''REPLACE_REALLOCARRAY''@|$(REPLACE_REALLOCARRAY)|g' \
               -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
@@ -2165,6 +2567,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''REPLACE_STRTOULL''@|$(REPLACE_STRTOULL)|g' \
               -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
               -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \
+              -e 's|@''CAN_PRINT_STACK_TRACE''@|$(CAN_PRINT_STACK_TRACE)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _Noreturn/r $(_NORETURN_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
@@ -2176,18 +2579,15 @@ MOSTLYCLEANFILES += stdlib.h stdlib.h-t1 stdlib.h-t2 stdlib.h-t3
 
 EXTRA_DIST += stdlib.in.h
 
-## end   gnulib module stdlib
+## end   gnulib module stdlib-h
 
-## begin gnulib module strcase
+## begin gnulib module strcasecmp
 
 if GL_COND_OBJ_STRCASECMP
 libgnu_a_SOURCES += strcasecmp.c
 endif
-if GL_COND_OBJ_STRNCASECMP
-libgnu_a_SOURCES += strncasecmp.c
-endif
 
-## end   gnulib module strcase
+## end   gnulib module strcasecmp
 
 ## begin gnulib module strcasestr
 
@@ -2232,7 +2632,7 @@ EXTRA_DIST += strerror-override.h
 
 ## end   gnulib module strerror-override
 
-## begin gnulib module string
+## begin gnulib module string-h
 
 BUILT_SOURCES += string.h
 
@@ -2262,6 +2662,8 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_MBSSPN''@/$(GL_GNULIB_MBSSPN)/g' \
               -e 's/@''GNULIB_MBSSEP''@/$(GL_GNULIB_MBSSEP)/g' \
               -e 's/@''GNULIB_MBSTOK_R''@/$(GL_GNULIB_MBSTOK_R)/g' \
+              -e 's/@''GNULIB_MBS_ENDSWITH''@/$(GL_GNULIB_MBS_ENDSWITH)/g' \
+              -e 's/@''GNULIB_MBS_STARTSWITH''@/$(GL_GNULIB_MBS_STARTSWITH)/g' \
               -e 's/@''GNULIB_MEMCHR''@/$(GL_GNULIB_MEMCHR)/g' \
               -e 's/@''GNULIB_MEMMEM''@/$(GL_GNULIB_MEMMEM)/g' \
               -e 's/@''GNULIB_MEMPCPY''@/$(GL_GNULIB_MEMPCPY)/g' \
@@ -2273,6 +2675,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_STRCHRNUL''@/$(GL_GNULIB_STRCHRNUL)/g' \
               -e 's/@''GNULIB_STRDUP''@/$(GL_GNULIB_STRDUP)/g' \
               -e 's/@''GNULIB_STRNCAT''@/$(GL_GNULIB_STRNCAT)/g' \
+              -e 's/@''GNULIB_STRNCPY''@/$(GL_GNULIB_STRNCPY)/g' \
               -e 's/@''GNULIB_STRNDUP''@/$(GL_GNULIB_STRNDUP)/g' \
               -e 's/@''GNULIB_STRNLEN''@/$(GL_GNULIB_STRNLEN)/g' \
               -e 's/@''GNULIB_STRPBRK''@/$(GL_GNULIB_STRPBRK)/g' \
@@ -2280,8 +2683,11 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_STRSTR''@/$(GL_GNULIB_STRSTR)/g' \
               -e 's/@''GNULIB_STRCASESTR''@/$(GL_GNULIB_STRCASESTR)/g' \
               -e 's/@''GNULIB_STRTOK_R''@/$(GL_GNULIB_STRTOK_R)/g' \
+              -e 's/@''GNULIB_STR_ENDSWITH''@/$(GL_GNULIB_STR_ENDSWITH)/g' \
+              -e 's/@''GNULIB_STR_STARTSWITH''@/$(GL_GNULIB_STR_STARTSWITH)/g' \
               -e 's/@''GNULIB_STRERROR''@/$(GL_GNULIB_STRERROR)/g' \
               -e 's/@''GNULIB_STRERROR_R''@/$(GL_GNULIB_STRERROR_R)/g' \
+              -e 's/@''GNULIB_STRERROR_L''@/$(GL_GNULIB_STRERROR_L)/g' \
               -e 's/@''GNULIB_STRERRORNAME_NP''@/$(GL_GNULIB_STRERRORNAME_NP)/g' \
               -e 's/@''GNULIB_SIGABBREV_NP''@/$(GL_GNULIB_SIGABBREV_NP)/g' \
               -e 's/@''GNULIB_SIGDESCR_NP''@/$(GL_GNULIB_SIGDESCR_NP)/g' \
@@ -2312,6 +2718,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
               -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
               -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \
+              -e 's|@''HAVE_STRERROR_L''@|$(HAVE_STRERROR_L)|g' \
               -e 's|@''HAVE_STRERRORNAME_NP''@|$(HAVE_STRERRORNAME_NP)|g' \
               -e 's|@''HAVE_SIGABBREV_NP''@|$(HAVE_SIGABBREV_NP)|g' \
               -e 's|@''HAVE_SIGDESCR_NP''@|$(HAVE_SIGDESCR_NP)|g' \
@@ -2328,6 +2735,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
               -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
               -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
+              -e 's|@''REPLACE_STRNCPY''@|$(REPLACE_STRNCPY)|g' \
               -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
               -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \
               -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
@@ -2335,6 +2743,7 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
               -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
               -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
+              -e 's|@''REPLACE_STRERROR_L''@|$(REPLACE_STRERROR_L)|g' \
               -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \
               -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
               -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \
@@ -2349,9 +2758,9 @@ MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2
 
 EXTRA_DIST += string.in.h
 
-## end   gnulib module string
+## end   gnulib module string-h
 
-## begin gnulib module strings
+## begin gnulib module strings-h
 
 BUILT_SOURCES += strings.h
 
@@ -2366,9 +2775,20 @@ strings.h: strings.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_STRINGS_H''@|$(NEXT_STRINGS_H)|g' \
               -e 's/@''GNULIB_FFS''@/$(GL_GNULIB_FFS)/g' \
+              -e 's/@''GNULIB_STRCASECMP''@/$(GL_GNULIB_STRCASECMP)/g' \
+              -e 's/@''GNULIB_STRCASECMP_L''@/$(GL_GNULIB_STRCASECMP_L)/g' \
+              -e 's/@''GNULIB_STRNCASECMP''@/$(GL_GNULIB_STRNCASECMP)/g' \
+              -e 's/@''GNULIB_STRNCASECMP_L''@/$(GL_GNULIB_STRNCASECMP_L)/g' \
               -e 's|@''HAVE_FFS''@|$(HAVE_FFS)|g' \
               -e 's|@''HAVE_STRCASECMP''@|$(HAVE_STRCASECMP)|g' \
+              -e 's|@''HAVE_STRCASECMP_L''@|$(HAVE_STRCASECMP_L)|g' \
+              -e 's|@''HAVE_STRNCASECMP''@|$(HAVE_STRNCASECMP)|g' \
+              -e 's|@''HAVE_STRNCASECMP_L''@|$(HAVE_STRNCASECMP_L)|g' \
               -e 's|@''HAVE_DECL_STRNCASECMP''@|$(HAVE_DECL_STRNCASECMP)|g' \
+              -e 's|@''REPLACE_STRCASECMP''@|$(REPLACE_STRCASECMP)|g' \
+              -e 's|@''REPLACE_STRCASECMP_L''@|$(REPLACE_STRCASECMP_L)|g' \
+              -e 's|@''REPLACE_STRNCASECMP''@|$(REPLACE_STRNCASECMP)|g' \
+              -e 's|@''REPLACE_STRNCASECMP_L''@|$(REPLACE_STRNCASECMP_L)|g' \
               -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
               -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
@@ -2378,7 +2798,23 @@ MOSTLYCLEANFILES += strings.h strings.h-t
 
 EXTRA_DIST += strings.in.h
 
-## end   gnulib module strings
+## end   gnulib module strings-h
+
+## begin gnulib module strncasecmp
+
+if GL_COND_OBJ_STRNCASECMP
+libgnu_a_SOURCES += strncasecmp.c
+endif
+
+## end   gnulib module strncasecmp
+
+## begin gnulib module strncpy
+
+if GL_COND_OBJ_STRNCPY
+libgnu_a_SOURCES += strncpy.c
+endif
+
+## end   gnulib module strncpy
 
 ## begin gnulib module strsep
 
@@ -2397,7 +2833,7 @@ EXTRA_libgnu_a_SOURCES += strstr.c
 
 ## end   gnulib module strstr-simple
 
-## begin gnulib module sys_socket
+## begin gnulib module sys_socket-h
 
 BUILT_SOURCES += sys/socket.h
 libgnu_a_SOURCES += sys_socket.c
@@ -2445,9 +2881,9 @@ MOSTLYCLEANDIRS += sys
 
 EXTRA_DIST += sys_socket.in.h
 
-## end   gnulib module sys_socket
+## end   gnulib module sys_socket-h
 
-## begin gnulib module sys_stat
+## begin gnulib module sys_stat-h
 
 BUILT_SOURCES += sys/stat.h
 
@@ -2518,9 +2954,9 @@ MOSTLYCLEANDIRS += sys
 
 EXTRA_DIST += sys_stat.in.h
 
-## end   gnulib module sys_stat
+## end   gnulib module sys_stat-h
 
-## begin gnulib module sys_types
+## begin gnulib module sys_types-h
 
 BUILT_SOURCES += sys/types.h
 
@@ -2535,16 +2971,20 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status
               -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
               -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
               -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
+              -e 's|@''HAVE_OFF64_T''@|$(HAVE_OFF64_T)|g' \
               -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
+              -e 's|@''HAVE_BLKSIZE_T''@|$(HAVE_BLKSIZE_T)|g' \
+              -e 's|@''HAVE_BLKCNT_T''@|$(HAVE_BLKCNT_T)|g' \
               $(srcdir)/sys_types.in.h > $@-t
         $(AM_V_at)mv $@-t $@
 MOSTLYCLEANFILES += sys/types.h sys/types.h-t
+MOSTLYCLEANDIRS += sys
 
 EXTRA_DIST += sys_types.in.h
 
-## end   gnulib module sys_types
+## end   gnulib module sys_types-h
 
-## begin gnulib module sys_uio
+## begin gnulib module sys_uio-h
 
 BUILT_SOURCES += sys/uio.h
 
@@ -2566,7 +3006,7 @@ MOSTLYCLEANDIRS += sys
 
 EXTRA_DIST += sys_uio.in.h
 
-## end   gnulib module sys_uio
+## end   gnulib module sys_uio-h
 
 ## begin gnulib module threadlib
 
@@ -2599,6 +3039,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GL_GNULIB_TIMESPEC_GETRES)/g' \
               -e 's/@''GNULIB_TIME_R''@/$(GL_GNULIB_TIME_R)/g' \
               -e 's/@''GNULIB_TIME_RZ''@/$(GL_GNULIB_TIME_RZ)/g' \
+              -e 's/@''GNULIB_TZNAME''@/$(GL_GNULIB_TZNAME)/g' \
               -e 's/@''GNULIB_TZSET''@/$(GL_GNULIB_TZSET)/g' \
               -e 's/@''GNULIB_MDA_TZSET''@/$(GL_GNULIB_MDA_TZSET)/g' \
               -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \
@@ -2608,11 +3049,14 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_TIMESPEC_GET''@|$(HAVE_TIMESPEC_GET)|g' \
               -e 's|@''HAVE_TIMESPEC_GETRES''@|$(HAVE_TIMESPEC_GETRES)|g' \
               -e 's|@''HAVE_TIMEZONE_T''@|$(HAVE_TIMEZONE_T)|g' \
+              -e 's|@''HAVE_TZALLOC''@|$(HAVE_TZALLOC)|g' \
               -e 's|@''REPLACE_CTIME''@|$(REPLACE_CTIME)|g' \
               -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \
               -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \
               -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
+              -e 's|@''REPLACE_LOCALTIME_RZ''@|$(REPLACE_LOCALTIME_RZ)|g' \
               -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
+              -e 's|@''REPLACE_MKTIME_Z''@|$(REPLACE_MKTIME_Z)|g' \
               -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
               -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \
               -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \
@@ -2654,7 +3098,412 @@ EXTRA_DIST += mktime-internal.h
 
 ## end   gnulib module timegm
 
-## begin gnulib module unistd
+## begin gnulib module uchar-h
+
+BUILT_SOURCES += uchar.h
+
+uchar.h: uchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''GUARD_PREFIX''@|GL|g' \
+              -e 's/@''HAVE_UCHAR_H''@/$(HAVE_UCHAR_H)/g' \
+              -e 's/@''CXX_HAVE_UCHAR_H''@/$(CXX_HAVE_UCHAR_H)/g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
+              -e 's|@''NEXT_UCHAR_H''@|$(NEXT_UCHAR_H)|g' \
+              -e 's|@''CXX_HAS_CHAR8_TYPE''@|$(CXX_HAS_CHAR8_TYPE)|g' \
+              -e 's|@''CXX_HAS_UCHAR_TYPES''@|$(CXX_HAS_UCHAR_TYPES)|g' \
+              -e 's|@''SMALL_WCHAR_T''@|$(SMALL_WCHAR_T)|g' \
+              -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR8_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR8_T)|g' \
+              -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR16_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR16_T)|g' \
+              -e 's|@''GNULIBHEADERS_OVERRIDE_CHAR32_T''@|$(GNULIBHEADERS_OVERRIDE_CHAR32_T)|g' \
+              -e 's/@''GNULIB_BTOC32''@/$(GL_GNULIB_BTOC32)/g' \
+              -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \
+              -e 's/@''GNULIB_C32ISALNUM''@/$(GL_GNULIB_C32ISALNUM)/g' \
+              -e 's/@''GNULIB_C32ISALPHA''@/$(GL_GNULIB_C32ISALPHA)/g' \
+              -e 's/@''GNULIB_C32ISBLANK''@/$(GL_GNULIB_C32ISBLANK)/g' \
+              -e 's/@''GNULIB_C32ISCNTRL''@/$(GL_GNULIB_C32ISCNTRL)/g' \
+              -e 's/@''GNULIB_C32ISDIGIT''@/$(GL_GNULIB_C32ISDIGIT)/g' \
+              -e 's/@''GNULIB_C32ISGRAPH''@/$(GL_GNULIB_C32ISGRAPH)/g' \
+              -e 's/@''GNULIB_C32ISLOWER''@/$(GL_GNULIB_C32ISLOWER)/g' \
+              -e 's/@''GNULIB_C32ISPRINT''@/$(GL_GNULIB_C32ISPRINT)/g' \
+              -e 's/@''GNULIB_C32ISPUNCT''@/$(GL_GNULIB_C32ISPUNCT)/g' \
+              -e 's/@''GNULIB_C32ISSPACE''@/$(GL_GNULIB_C32ISSPACE)/g' \
+              -e 's/@''GNULIB_C32ISUPPER''@/$(GL_GNULIB_C32ISUPPER)/g' \
+              -e 's/@''GNULIB_C32ISXDIGIT''@/$(GL_GNULIB_C32ISXDIGIT)/g' \
+              -e 's/@''GNULIB_C32TOLOWER''@/$(GL_GNULIB_C32TOLOWER)/g' \
+              -e 's/@''GNULIB_C32TOUPPER''@/$(GL_GNULIB_C32TOUPPER)/g' \
+              -e 's/@''GNULIB_C32WIDTH''@/$(GL_GNULIB_C32WIDTH)/g' \
+              -e 's/@''GNULIB_C32RTOMB''@/$(GL_GNULIB_C32RTOMB)/g' \
+              -e 's/@''GNULIB_C32SNRTOMBS''@/$(GL_GNULIB_C32SNRTOMBS)/g' \
+              -e 's/@''GNULIB_C32SRTOMBS''@/$(GL_GNULIB_C32SRTOMBS)/g' \
+              -e 's/@''GNULIB_C32STOMBS''@/$(GL_GNULIB_C32STOMBS)/g' \
+              -e 's/@''GNULIB_C32SWIDTH''@/$(GL_GNULIB_C32SWIDTH)/g' \
+              -e 's/@''GNULIB_C32TOB''@/$(GL_GNULIB_C32TOB)/g' \
+              -e 's/@''GNULIB_C32_APPLY_MAPPING''@/$(GL_GNULIB_C32_APPLY_MAPPING)/g' \
+              -e 's/@''GNULIB_C32_APPLY_TYPE_TEST''@/$(GL_GNULIB_C32_APPLY_TYPE_TEST)/g' \
+              -e 's/@''GNULIB_C32_GET_MAPPING''@/$(GL_GNULIB_C32_GET_MAPPING)/g' \
+              -e 's/@''GNULIB_C32_GET_TYPE_TEST''@/$(GL_GNULIB_C32_GET_TYPE_TEST)/g' \
+              -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \
+              -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \
+              -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \
+              -e 's/@''GNULIB_MBRTOC16''@/$(GL_GNULIB_MBRTOC16)/g' \
+              -e 's/@''GNULIB_MBRTOC32''@/$(GL_GNULIB_MBRTOC32)/g' \
+              -e 's/@''GNULIB_MBSNRTOC32S''@/$(GL_GNULIB_MBSNRTOC32S)/g' \
+              -e 's/@''GNULIB_MBSNRTOWCS''@/$(GL_GNULIB_MBSNRTOWCS)/g' \
+              -e 's/@''GNULIB_MBSRTOC32S''@/$(GL_GNULIB_MBSRTOC32S)/g' \
+              -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \
+              -e 's/@''GNULIB_MBSTOC32S''@/$(GL_GNULIB_MBSTOC32S)/g' \
+              -e 's/@''GNULIB_TOWCTRANS''@/$(GL_GNULIB_TOWCTRANS)/g' \
+              -e 's/@''GNULIB_WCSNRTOMBS''@/$(GL_GNULIB_WCSNRTOMBS)/g' \
+              -e 's/@''GNULIB_WCSRTOMBS''@/$(GL_GNULIB_WCSRTOMBS)/g' \
+              -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \
+              -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \
+              -e 's/@''GNULIB_WCTRANS''@/$(GL_GNULIB_WCTRANS)/g' \
+              -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \
+              -e 's/@''GNULIB_WCWIDTH''@/$(GL_GNULIB_WCWIDTH)/g' \
+              -e 's|@''HAVE_C32RTOMB''@|$(HAVE_C32RTOMB)|g' \
+              -e 's|@''HAVE_MBRTOC16''@|$(HAVE_MBRTOC16)|g' \
+              -e 's|@''HAVE_MBRTOC32''@|$(HAVE_MBRTOC32)|g' \
+              -e 's|@''REPLACE_C32RTOMB''@|$(REPLACE_C32RTOMB)|g' \
+              -e 's|@''REPLACE_MBRTOC16''@|$(REPLACE_MBRTOC16)|g' \
+              -e 's|@''REPLACE_MBRTOC32''@|$(REPLACE_MBRTOC32)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+              $(srcdir)/uchar.in.h > $@-t
+        $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += uchar.h uchar.h-t
+
+EXTRA_DIST += uchar.in.h
+
+## end   gnulib module uchar-h
+
+## begin gnulib module unicase/base
+
+BUILT_SOURCES += $(LIBUNISTRING_UNICASE_H)
+
+unicase.h: unicase.in.h
+        $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \
+              -e 's/@''GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE''@/$(GL_GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE''@/$(GL_GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE)/g' \
+              $(srcdir)/unicase.in.h > $@-t
+        $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += unicase.h unicase.h-t
+
+EXTRA_DIST += unicase.in.h
+
+## end   gnulib module unicase/base
+
+## begin gnulib module unicase/tolower
+
+if LIBUNISTRING_COMPILE_UNICASE_TOLOWER
+libgnu_a_SOURCES += unicase/tolower.c
+endif
+
+EXTRA_DIST += unicase/simple-mapping.h unicase/tolower.h
+
+## end   gnulib module unicase/tolower
+
+## begin gnulib module unictype/base
+
+BUILT_SOURCES += $(LIBUNISTRING_UNICTYPE_H)
+
+unictype.h: unictype.in.h
+        $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE)/g' \
+              < $(srcdir)/unictype.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE)/g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE)/g' \
+              < $@-t2 > $@-t3
+        $(AM_V_at)sed \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE''@/$(GL_GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE)/g' \
+              < $@-t3 > $@-t4
+        $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+        $(AM_V_at)mv $@-t4 $@
+MOSTLYCLEANFILES += unictype.h unictype.h-t1 unictype.h-t2 unictype.h-t3 unictype.h-t4
+
+EXTRA_DIST += unictype.in.h
+
+## end   gnulib module unictype/base
+
+## begin gnulib module unictype/ctype-alnum
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALNUM
+libgnu_a_SOURCES += unictype/ctype_alnum.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_alnum.h
+
+## end   gnulib module unictype/ctype-alnum
+
+## begin gnulib module unictype/ctype-alpha
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_ALPHA
+libgnu_a_SOURCES += unictype/ctype_alpha.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_alpha.h
+
+## end   gnulib module unictype/ctype-alpha
+
+## begin gnulib module unictype/ctype-blank
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_BLANK
+libgnu_a_SOURCES += unictype/ctype_blank.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_blank.h
+
+## end   gnulib module unictype/ctype-blank
+
+## begin gnulib module unictype/ctype-cntrl
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_CNTRL
+libgnu_a_SOURCES += unictype/ctype_cntrl.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_cntrl.h
+
+## end   gnulib module unictype/ctype-cntrl
+
+## begin gnulib module unictype/ctype-digit
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_DIGIT
+libgnu_a_SOURCES += unictype/ctype_digit.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_digit.h
+
+## end   gnulib module unictype/ctype-digit
+
+## begin gnulib module unictype/ctype-graph
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_GRAPH
+libgnu_a_SOURCES += unictype/ctype_graph.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_graph.h
+
+## end   gnulib module unictype/ctype-graph
+
+## begin gnulib module unictype/ctype-lower
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_LOWER
+libgnu_a_SOURCES += unictype/ctype_lower.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_lower.h
+
+## end   gnulib module unictype/ctype-lower
+
+## begin gnulib module unictype/ctype-print
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PRINT
+libgnu_a_SOURCES += unictype/ctype_print.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_print.h
+
+## end   gnulib module unictype/ctype-print
+
+## begin gnulib module unictype/ctype-punct
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_PUNCT
+libgnu_a_SOURCES += unictype/ctype_punct.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_punct.h
+
+## end   gnulib module unictype/ctype-punct
+
+## begin gnulib module unictype/ctype-space
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_SPACE
+libgnu_a_SOURCES += unictype/ctype_space.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_space.h
+
+## end   gnulib module unictype/ctype-space
+
+## begin gnulib module unictype/ctype-upper
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_UPPER
+libgnu_a_SOURCES += unictype/ctype_upper.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_upper.h
+
+## end   gnulib module unictype/ctype-upper
+
+## begin gnulib module unictype/ctype-xdigit
+
+if LIBUNISTRING_COMPILE_UNICTYPE_CTYPE_XDIGIT
+libgnu_a_SOURCES += unictype/ctype_xdigit.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h unictype/ctype_xdigit.h
+
+## end   gnulib module unictype/ctype-xdigit
+
+## begin gnulib module uninorm/base
+
+BUILT_SOURCES += $(LIBUNISTRING_UNINORM_H)
+
+uninorm.h: uninorm.in.h
+        $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''HAVE_UNISTRING_WOE32DLL_H''@|$(HAVE_UNISTRING_WOE32DLL_H)|g' \
+              -e 's/@''GNULIB_UNINORM_NFD_DLL_VARIABLE''@/$(GL_GNULIB_UNINORM_NFD_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNINORM_NFC_DLL_VARIABLE''@/$(GL_GNULIB_UNINORM_NFC_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNINORM_NFKD_DLL_VARIABLE''@/$(GL_GNULIB_UNINORM_NFKD_DLL_VARIABLE)/g' \
+              -e 's/@''GNULIB_UNINORM_NFKC_DLL_VARIABLE''@/$(GL_GNULIB_UNINORM_NFKC_DLL_VARIABLE)/g' \
+              $(srcdir)/uninorm.in.h > $@-t
+        $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += uninorm.h uninorm.h-t
+
+EXTRA_DIST += uninorm.in.h
+
+## end   gnulib module uninorm/base
+
+## begin gnulib module unistd-h
 
 BUILT_SOURCES += unistd.h
 libgnu_a_SOURCES += unistd.c
@@ -2830,11 +3679,13 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \
               -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \
               -e 's|@''REPLACE_GETENTROPY''@|$(REPLACE_GETENTROPY)|g' \
+              -e 's|@''REPLACE_GETLOGIN''@|$(REPLACE_GETLOGIN)|g' \
               -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \
               -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
               -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
               -e 's|@''REPLACE_GETPASS''@|$(REPLACE_GETPASS)|g' \
               -e 's|@''REPLACE_GETPASS_FOR_GETPASS_GNU''@|$(REPLACE_GETPASS_FOR_GETPASS_GNU)|g' \
+              -e 's|@''REPLACE_GETUSERSHELL''@|$(REPLACE_GETUSERSHELL)|g' \
               -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \
               -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
               -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
@@ -2870,7 +3721,43 @@ MOSTLYCLEANFILES += unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 unistd.h-t4
 
 EXTRA_DIST += unistd.in.h
 
-## end   gnulib module unistd
+## end   gnulib module unistd-h
+
+## begin gnulib module unitypes-h
+
+BUILT_SOURCES += $(LIBUNISTRING_UNITYPES_H)
+
+unitypes.h: unitypes.in.h
+        $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/unitypes.in.h
+        $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += unitypes.h unitypes.h-t
+
+EXTRA_DIST += unitypes.in.h
+
+## end   gnulib module unitypes-h
+
+## begin gnulib module uniwidth/base
+
+BUILT_SOURCES += $(LIBUNISTRING_UNIWIDTH_H)
+
+uniwidth.h: uniwidth.in.h
+        $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/uniwidth.in.h
+        $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += uniwidth.h uniwidth.h-t
+
+EXTRA_DIST += localcharset.h uniwidth.in.h
+
+## end   gnulib module uniwidth/base
+
+## begin gnulib module uniwidth/width
+
+if LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH
+libgnu_a_SOURCES += uniwidth/width.c
+endif
+
+EXTRA_DIST += unictype/bitmap.h uniwidth/cjk.h uniwidth/width0.h uniwidth/width2.h
+
+## end   gnulib module uniwidth/width
 
 ## begin gnulib module unlocked-io-internal
 
@@ -2921,7 +3808,13 @@ EXTRA_libgnu_a_SOURCES += vsnprintf.c
 
 ## end   gnulib module vsnprintf
 
-## begin gnulib module wchar
+## begin gnulib module vsnzprintf
+
+libgnu_a_SOURCES += vsnzprintf.c
+
+## end   gnulib module vsnzprintf
+
+## begin gnulib module wchar-h
 
 BUILT_SOURCES += wchar.h
 
@@ -3046,6 +3939,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
               -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
               -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \
+              -e 's|@''REPLACE_WCSNCAT''@|$(REPLACE_WCSNCAT)|g' \
               -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \
               -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \
               -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \
@@ -3061,7 +3955,7 @@ MOSTLYCLEANFILES += wchar.h wchar.h-t1 wchar.h-t2 wchar.h-t3
 
 EXTRA_DIST += wchar.in.h
 
-## end   gnulib module wchar
+## end   gnulib module wchar-h
 
 ## begin gnulib module wcrtomb
 
@@ -3130,6 +4024,14 @@ EXTRA_DIST += wctype.in.h
 
 ## end   gnulib module wctype-h
 
+## begin gnulib module wcwidth
+
+if GL_COND_OBJ_WCWIDTH
+libgnu_a_SOURCES += wcwidth.c
+endif
+
+## end   gnulib module wcwidth
+
 ## begin gnulib module windows-mutex
 
 if GL_COND_OBJ_WINDOWS_MUTEX
@@ -3209,5 +4111,5 @@ mostlyclean-local: mostlyclean-generic
         :
 distclean-local: distclean-gnulib-libobjs
 distclean-gnulib-libobjs:
-        -rm -f @gl_LIBOBJDEPS@
+        -rm -f @gl_libgnu_LIBOBJDEPS@
 maintainer-clean-local: distclean-gnulib-libobjs
diff --git a/gl/_Noreturn.h b/gl/_Noreturn.h
index 7326bd47..d42f15ee 100644
--- a/gl/_Noreturn.h
+++ b/gl/_Noreturn.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that a function does not return.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -14,33 +14,26 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* The _Noreturn keyword of C11.
+   Do not use [[noreturn]], because with it the syntax
+     extern _Noreturn void func (...);
+   would not be valid; such a declaration would be valid only with 'extern'
+   and '_Noreturn' swapped, or without the 'extern' keyword.  However, some
+   AIX system header files and several gnulib header files use precisely
+   this syntax with 'extern'.  So even though C23 deprecates _Noreturn,
+   it is currently more portable to prefer it to [[noreturn]].
+
+   Also, do not try to work around LLVM bug 59792 (clang 15 or earlier).
+   This rare bug can be worked around by compiling with 'clang -D_Noreturn=',
+   though the workaround may generate many false-alarm warnings.  */
 #ifndef _Noreturn
-# if (defined __cplusplus \
-      && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
-          || (defined _MSC_VER && 1900 <= _MSC_VER)) \
-      && 0)
-    /* [[noreturn]] is not practically usable, because with it the syntax
-         extern _Noreturn void func (...);
-       would not be valid; such a declaration would only be valid with 'extern'
-       and '_Noreturn' swapped, or without the 'extern' keyword.  However, some
-       AIX system header files and several gnulib header files use precisely
-       this syntax with 'extern'.  */
-#  define _Noreturn [[noreturn]]
-# elif (defined __clang__ && __clang_major__ < 16 \
-        && defined _GL_WORK_AROUND_LLVM_BUG_59792)
-   /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around
-      that rare LLVM bug, though you may get many false-alarm warnings.  */
-#  define _Noreturn
-# elif ((!defined __cplusplus || defined __clang__) \
-        && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
-            || (!defined __STRICT_ANSI__ \
-                && (4 < __GNUC__ + (7 <= __GNUC_MINOR__) \
-                    || (defined __apple_build_version__ \
-                        ? 6000000 <= __apple_build_version__ \
-                        : 3 < __clang_major__ + (5 <= __clang_minor__))))))
+# if ((!defined __cplusplus || defined __clang__) \
+      && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0)))
    /* _Noreturn works as-is.  */
 # elif (2 < __GNUC__ + (8 <= __GNUC_MINOR__) || defined __clang__ \
         || 0x5110 <= __SUNPRO_C)
+   /* Prefer __attribute__ ((__noreturn__)) to plain _Noreturn even if the
+      latter works, as 'gcc -std=gnu99 -Wpedantic' warns about _Noreturn.  */
 #  define _Noreturn __attribute__ ((__noreturn__))
 # elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0)
 #  define _Noreturn __declspec (noreturn)
diff --git a/gl/af_alg.c b/gl/af_alg.c
index 6fd08c28..cfa96954 100644
--- a/gl/af_alg.c
+++ b/gl/af_alg.c
@@ -1,5 +1,5 @@
 /* af_alg.c - Compute message digests from file streams and buffers.
-   Copyright (C) 2018-2024 Free Software Foundation, Inc.
+   Copyright (C) 2018-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/af_alg.h b/gl/af_alg.h
index ed933e12..236659bc 100644
--- a/gl/af_alg.h
+++ b/gl/af_alg.h
@@ -1,5 +1,5 @@
 /* af_alg.h - Compute message digests from file streams and buffers.
-   Copyright (C) 2018-2024 Free Software Foundation, Inc.
+   Copyright (C) 2018-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/alloca.in.h b/gl/alloca.in.h
index 6aa47df8..afb00caf 100644
--- a/gl/alloca.in.h
+++ b/gl/alloca.in.h
@@ -1,6 +1,6 @@
 /* Memory allocation on the stack.
 
-   Copyright (C) 1995, 1999, 2001-2004, 2006-2024 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2025 Free Software Foundation,
    Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/arg-nonnull.h b/gl/arg-nonnull.h
index 46c711ca..747bb413 100644
--- a/gl/arg-nonnull.h
+++ b/gl/arg-nonnull.h
@@ -1,5 +1,5 @@
 /* A C macro for declaring that specific arguments must not be NULL.
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
diff --git a/gl/arpa_inet.c b/gl/arpa_inet.c
new file mode 100644
index 00000000..fae7c241
--- /dev/null
+++ b/gl/arpa_inet.c
@@ -0,0 +1,21 @@
+/* Inline functions for <arpa/inet.h>.
+
+   Copyright (C) 2024-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define _GL_ARPA_INET_INLINE _GL_EXTERN_INLINE
+#include <arpa/inet.h>
diff --git a/gl/arpa_inet.in.h b/gl/arpa_inet.in.h
index 523a448c..d7417bfd 100644
--- a/gl/arpa_inet.in.h
+++ b/gl/arpa_inet.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <arpa/inet.h>.
 
-   Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -60,6 +60,53 @@
 # include <ws2tcpip.h>
 #endif
 
+#if !(@HAVE_DECL_HTONL@ || @HAVE_DECL_HTONS@ || @HAVE_DECL_NTOHL@ || @HAVE_DECL_NTOHS@)
+# include <endian.h>
+#endif
+
+_GL_INLINE_HEADER_BEGIN
+#ifndef _GL_ARPA_INET_INLINE
+# define _GL_ARPA_INET_INLINE _GL_INLINE
+#endif
+
+
+/* Host to network byte order. */
+
+#if !@HAVE_DECL_HTONS@
+_GL_ARPA_INET_INLINE uint16_t
+htons (uint16_t value)
+{
+  return htobe16 (value);
+}
+#endif
+
+#if !@HAVE_DECL_HTONL@
+_GL_ARPA_INET_INLINE uint32_t
+htonl (uint32_t value)
+{
+  return htobe32 (value);
+}
+#endif
+
+/* Network to host byte order.  */
+
+#if !@HAVE_DECL_NTOHS@
+_GL_ARPA_INET_INLINE uint16_t
+ntohs (uint16_t value)
+{
+  return htobe16 (value);
+}
+#endif
+
+#if !@HAVE_DECL_NTOHL@
+_GL_ARPA_INET_INLINE uint32_t
+ntohl (uint32_t value)
+{
+  return htobe32 (value);
+}
+#endif
+
+
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -90,7 +137,7 @@
 #  endif
 _GL_FUNCDECL_RPL (inet_ntop, const char *,
                   (int af, const void *restrict src,
-                   char *restrict dst, socklen_t cnt)
+                   char *restrict dst, socklen_t cnt),
                   _GL_ARG_NONNULL ((2, 3)));
 _GL_CXXALIAS_RPL (inet_ntop, const char *,
                   (int af, const void *restrict src,
@@ -99,7 +146,7 @@ _GL_CXXALIAS_RPL (inet_ntop, const char *,
 #  if !@HAVE_DECL_INET_NTOP@
 _GL_FUNCDECL_SYS (inet_ntop, const char *,
                   (int af, const void *restrict src,
-                   char *restrict dst, socklen_t cnt)
+                   char *restrict dst, socklen_t cnt),
                   _GL_ARG_NONNULL ((2, 3)));
 #  endif
 /* Need to cast, because on NonStop Kernel, the fourth parameter is
@@ -126,14 +173,14 @@ _GL_WARN_ON_USE (inet_ntop, "inet_ntop is unportable - "
 #   define inet_pton rpl_inet_pton
 #  endif
 _GL_FUNCDECL_RPL (inet_pton, int,
-                  (int af, const char *restrict src, void *restrict dst)
+                  (int af, const char *restrict src, void *restrict dst),
                   _GL_ARG_NONNULL ((2, 3)));
 _GL_CXXALIAS_RPL (inet_pton, int,
                   (int af, const char *restrict src, void *restrict dst));
 # else
 #  if !@HAVE_DECL_INET_PTON@
 _GL_FUNCDECL_SYS (inet_pton, int,
-                  (int af, const char *restrict src, void *restrict dst)
+                  (int af, const char *restrict src, void *restrict dst),
                   _GL_ARG_NONNULL ((2, 3)));
 #  endif
 _GL_CXXALIAS_SYS (inet_pton, int,
@@ -150,6 +197,7 @@ _GL_WARN_ON_USE (inet_pton, "inet_pton is unportable - "
 # endif
 #endif
 
+_GL_INLINE_HEADER_END
 
 #endif /* _@GUARD_PREFIX@_ARPA_INET_H */
 #endif /* _@GUARD_PREFIX@_ARPA_INET_H */
diff --git a/gl/asnprintf.c b/gl/asnprintf.c
index a6c09bc2..0488b6be 100644
--- a/gl/asnprintf.c
+++ b/gl/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/asprintf.c b/gl/asprintf.c
index b0c33478..336700be 100644
--- a/gl/asprintf.c
+++ b/gl/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2024 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2025 Free Software Foundation,
    Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/assert.in.h b/gl/assert.in.h
index 6e4995e1..87339abc 100644
--- a/gl/assert.in.h
+++ b/gl/assert.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <assert.h>
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/attribute.h b/gl/attribute.h
index 710341ba..c85412d9 100644
--- a/gl/attribute.h
+++ b/gl/attribute.h
@@ -1,6 +1,6 @@
 /* ATTRIBUTE_* macros for using attributes in GCC and similar compilers
 
-   Copyright 2020-2024 Free Software Foundation, Inc.
+   Copyright 2020-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,12 +20,50 @@
 /* Provide public ATTRIBUTE_* names for the private _GL_ATTRIBUTE_*
    macros used within Gnulib.  */
 
-/* These attributes can be placed in two ways:
-     - At the start of a declaration (i.e. even before storage-class
-       specifiers!); then they apply to all entities that are declared
-       by the declaration.
-     - Immediately after the name of an entity being declared by the
-       declaration; then they apply to that entity only.  */
+/* The placement of these attributes depends on the kind of declaration
+   and, in some cases, also on the programming language (C vs. C++).
+
+   In function declarations and function definitions:
+
+     * ATTRIBUTE_NOTHROW must come after the parameter list.
+
+     * The macros
+         ATTRIBUTE_CONST
+         ATTRIBUTE_PURE
+         DEPRECATED
+         MAYBE_UNUSED
+         NODISCARD
+         REPRODUCIBLE
+         UNSEQUENCED
+       must come before the return type, and more precisely:
+         - In a function declaration/definition without a storage-class
+           specifier: at the beginning of the declaration/definition.
+         - In a function declaration/definition with a storage-class
+           specifier:
+             - In C: before the storage-class specifier.
+             - In C++: between the storage-class specifier and the return type.
+
+     * The other macros can be placed
+         - Either
+             - In a function declaration/definition without a storage-class
+               specifier: at the beginning of the declaration/definition.
+             - In a function declaration/definition with a storage-class
+               specifier: between the storage-class specifier and the return
+               type.
+        - Or, in a function declaration:
+          after the parameter list,
+            ∙ but after ATTRIBUTE_NOTHROW if present.
+
+   In other declarations, such as variable declarations:
+
+     * Either
+         - In C: before the storage-class specifier.
+         - In C++: between the storage-class specifier and the return type.
+       Then they apply to all entities that are declared by the declaration.
+
+     * Or immediately after the name of an entity being declared by the
+       declaration.  Then they apply to that entity only.
+ */
 
 #ifndef _GL_ATTRIBUTE_H
 #define _GL_ATTRIBUTE_H
@@ -48,9 +86,10 @@
    _GL_ATTRIBUTE_FALLTHROUGH, _GL_ATTRIBUTE_FORMAT, _GL_ATTRIBUTE_LEAF,
    _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_MAY_ALIAS, _GL_ATTRIBUTE_MAYBE_UNUSED,
    _GL_ATTRIBUTE_NODISCARD, _GL_ATTRIBUTE_NOINLINE, _GL_ATTRIBUTE_NONNULL,
-   _GL_ATTRIBUTE_NONSTRING, _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PACKED,
-   _GL_ATTRIBUTE_PURE, _GL_ATTRIBUTE_RETURNS_NONNULL,
-   _GL_ATTRIBUTE_SENTINEL.  */
+   _GL_ATTRIBUTE_NONNULL_IF_NONZERO, _GL_ATTRIBUTE_NONSTRING,
+   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PACKED, _GL_ATTRIBUTE_PURE,
+   _GL_ATTRIBUTE_REPRODUCIBLE, _GL_ATTRIBUTE_RETURNS_NONNULL,
+   _GL_ATTRIBUTE_SENTINEL, _GL_ATTRIBUTE_UNSEQUENCED.  */
 #if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
@@ -88,7 +127,7 @@
    is the size of the returned memory block.
    ATTRIBUTE_ALLOC_SIZE ((M, N)) - Multiply the Mth and Nth arguments
    to determine the size of the returned memory block.  */
-/* Applies to: function, pointer to function, function types.  */
+/* Applies to: functions, pointer to functions, function types.  */
 #define ATTRIBUTE_ALLOC_SIZE(args) _GL_ATTRIBUTE_ALLOC_SIZE (args)
 
 /* ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers
@@ -132,6 +171,12 @@
 /* Applies to: functions.  */
 #define ATTRIBUTE_NONNULL(args) _GL_ATTRIBUTE_NONNULL (args)
 
+/* ATTRIBUTE_NONNULL_IF_NONZERO (NP, NI) - Argument NP (a pointer)
+   must not be NULL if the argument NI (an integer) is != 0.  */
+/* Applies to: functions.  */
+#define ATTRIBUTE_NONNULL_IF_NONZERO(np, ni) _GL_ATTRIBUTE_NONNULL_IF_NONZERO (np, ni)
+
+
 /* The function's return value is a non-NULL pointer.  */
 /* Applies to: functions.  */
 #define ATTRIBUTE_RETURNS_NONNULL _GL_ATTRIBUTE_RETURNS_NONNULL
@@ -170,7 +215,7 @@
 /* Attributes regarding debugging information emitted by the compiler.  */
 
 /* Omit the function from stack traces when debugging.  */
-/* Applies to: function.  */
+/* Applies to: functions.  */
 #define ATTRIBUTE_ARTIFICIAL _GL_ATTRIBUTE_ARTIFICIAL
 
 /* Make the entity visible to debuggers etc., even with '-fwhole-program'.  */
@@ -192,25 +237,68 @@
 
 /* Always inline the function, and report an error if the compiler
    cannot inline.  */
-/* Applies to: function.  */
+/* Applies to: functions.  */
 #define ATTRIBUTE_ALWAYS_INLINE _GL_ATTRIBUTE_ALWAYS_INLINE
 
-/* It is OK for a compiler to omit duplicate calls with the same arguments.
+/* It is OK for a compiler to move calls to the function and to omit
+   calls to the function if another call has the same arguments or the
+   result is not used.
    This attribute is safe for a function that neither depends on
-   nor affects observable state, and always returns exactly once -
-   e.g., does not loop forever, and does not call longjmp.
-   (This attribute is stricter than ATTRIBUTE_PURE.)  */
+   nor affects state, and always returns exactly once -
+   e.g., does not raise an exception, call longjmp, or loop forever.
+   (This attribute is stricter than ATTRIBUTE_PURE because the
+   function cannot observe state.  It is stricter than UNSEQUENCED
+   because the function must return exactly once and cannot depend on
+   state addressed by its arguments.)  */
 /* Applies to: functions.  */
 #define ATTRIBUTE_CONST _GL_ATTRIBUTE_CONST
 
-/* It is OK for a compiler to omit duplicate calls with the same
-   arguments if observable state is not changed between calls.
-   This attribute is safe for a function that does not affect
-   observable state, and always returns exactly once.
-   (This attribute is looser than ATTRIBUTE_CONST.)  */
+/* It is OK for a compiler to move calls to the function and to omit duplicate
+   calls to the function with the same arguments, so long as the state
+   addressed by its arguments is the same.
+   This attribute is safe for a function that is effectless, idempotent,
+   stateless, and independent; see ISO C 23 § 6.7.12.7 for a definition of
+   these terms.
+   (This attribute is stricter than REPRODUCIBLE because the function
+   must be stateless and independent.  It is looser than ATTRIBUTE_CONST
+   because the function need not return exactly once and can depend
+   on state addressed by its arguments.)
+   See also <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2956.htm> and
+   <https://stackoverflow.com/questions/76847905/>.
+   ATTENTION! Efforts are underway to change the meaning of this attribute.
+   See <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3424.htm>.  */
+/* Applies to: functions, pointer to functions, function type.  */
+#define UNSEQUENCED _GL_ATTRIBUTE_UNSEQUENCED
+
+/* It is OK for a compiler to move calls to the function and to omit
+   calls to the function if another call has the same arguments or the
+   result is not used, and if observable state is the same.
+   This attribute is safe for a function that does not affect observable state
+   and always returns exactly once.
+   (This attribute is looser than ATTRIBUTE_CONST because the function
+   can depend on observable state.  It is stricter than REPRODUCIBLE
+   because the function must return exactly once and cannot affect
+   state addressed by its arguments.)  */
 /* Applies to: functions.  */
 #define ATTRIBUTE_PURE _GL_ATTRIBUTE_PURE
 
+/* It is OK for a compiler to move calls to the function and to omit duplicate
+   calls to the function with the same arguments, so long as the state
+   addressed by its arguments is the same and is updated in time for
+   the rest of the program.
+   This attribute is safe for a function that is effectless and idempotent; see
+   ISO C 23 § 6.7.12.7 for a definition of these terms.
+   (This attribute is looser than UNSEQUENCED because the function need
+   not be stateless and idempotent.  It is looser than ATTRIBUTE_PURE
+   because the function need not return exactly once and can affect
+   state addressed by its arguments.)
+   See also <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2956.htm> and
+   <https://stackoverflow.com/questions/76847905/>.
+   ATTENTION! Efforts are underway to change the meaning of this attribute.
+   See <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3424.htm>.  */
+/* Applies to: functions, pointer to functions, function type.  */
+#define REPRODUCIBLE _GL_ATTRIBUTE_REPRODUCIBLE
+
 /* The function is rarely executed.  */
 /* Applies to: functions.  */
 #define ATTRIBUTE_COLD _GL_ATTRIBUTE_COLD
diff --git a/gl/base64.c b/gl/base64.c
index c8b3b76b..8a0edd4a 100644
--- a/gl/base64.c
+++ b/gl/base64.c
@@ -1,5 +1,5 @@
 /* base64.c -- Encode binary data using printable characters.
-   Copyright (C) 1999-2001, 2004-2006, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2004-2006, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -48,7 +48,7 @@
 /* Get imalloc. */
 #include <ialloc.h>
 
-#include <intprops.h>
+#include <stdckdint.h>
 
 #include <string.h>
 
@@ -59,7 +59,7 @@ to_uchar (char ch)
   return ch;
 }
 
-static const char b64c[64] =
+static const char b64c[64] _GL_ATTRIBUTE_NONSTRING =
   "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 /* Base64 encode IN array of size INLEN into OUT array. OUT needs
@@ -148,7 +148,7 @@ base64_encode_alloc (const char *in, idx_t inlen, char **out)
      Treat negative INLEN as overflow, for better compatibility with
      pre-2021-08-27 API, which used size_t.  */
   idx_t in_over_3 = inlen / 3 + (inlen % 3 != 0), outlen;
-  if (! INT_MULTIPLY_OK (in_over_3, 4, &outlen) || inlen < 0)
+  if (ckd_mul (&outlen, in_over_3, 4) || inlen < 0)
     {
       *out = NULL;
       return 0;
diff --git a/gl/base64.h b/gl/base64.h
index 7691f6c4..cdafdac9 100644
--- a/gl/base64.h
+++ b/gl/base64.h
@@ -1,5 +1,5 @@
 /* base64.h -- Encode binary data using printable characters.
-   Copyright (C) 2004-2006, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2004-2006, 2009-2025 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This file is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 #include <idx.h>
 
 /* Pacify GCC in isubase64.  */
-#if defined __GNUC__ && 4 < __GNUC__ + (3 <= __GNUC_MINOR__)
+#if 4 < __GNUC__ + (3 <= __GNUC_MINOR__) && !defined __clang__
 # pragma GCC diagnostic ignored "-Wtype-limits"
 #endif
 
diff --git a/gl/basename-lgpl.c b/gl/basename-lgpl.c
index 256f8460..2aecb0dd 100644
--- a/gl/basename-lgpl.c
+++ b/gl/basename-lgpl.c
@@ -1,6 +1,6 @@
 /* basename.c -- return the last element in a file name
 
-   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2024 Free Software
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/basename-lgpl.h b/gl/basename-lgpl.h
index 2a56be98..120bd1cf 100644
--- a/gl/basename-lgpl.h
+++ b/gl/basename-lgpl.h
@@ -1,6 +1,6 @@
 /* Extract the last component (base name) of a file name.
 
-   Copyright (C) 1998, 2001, 2003-2006, 2009-2024 Free Software Foundation,
+   Copyright (C) 1998, 2001, 2003-2006, 2009-2025 Free Software Foundation,
    Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/basename.c b/gl/basename.c
index c5a6bdc9..9d2852d4 100644
--- a/gl/basename.c
+++ b/gl/basename.c
@@ -1,6 +1,6 @@
 /* basename.c -- return the last element in a file name
 
-   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2024 Free Software
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2025 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gl/btowc.c b/gl/btowc.c
index 8bf21aa6..891347de 100644
--- a/gl/btowc.c
+++ b/gl/btowc.c
@@ -1,5 +1,5 @@
 /* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/byteswap.c b/gl/byteswap.c
new file mode 100644
index 00000000..97f7fc9e
--- /dev/null
+++ b/gl/byteswap.c
@@ -0,0 +1,21 @@
+/* Inline functions for <byteswap.h>.
+
+   Copyright 2024-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define _GL_BYTESWAP_INLINE _GL_EXTERN_INLINE
+#include <byteswap.h>
diff --git a/gl/byteswap.in.h b/gl/byteswap.in.h
index 8e49efad..6b4fbabf 100644
--- a/gl/byteswap.in.h
+++ b/gl/byteswap.in.h
@@ -1,5 +1,5 @@
 /* byteswap.h - Byte swapping
-   Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2025 Free Software Foundation, Inc.
    Written by Oskar Liljeblad <oskar@osk.mine.nu>, 2005.
 
    This file is free software: you can redistribute it and/or modify
@@ -16,29 +16,103 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GL_BYTESWAP_H
-#define _GL_BYTESWAP_H
+#define _GL_BYTESWAP_H 1
+
+/* This file uses _GL_INLINE.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* Define this now, rather than after including stdint.h, in case
+   stdint.h recursively includes us.  This is for Gnulib endian.h.  */
+#ifndef _GL_BYTESWAP_INLINE
+# define _GL_BYTESWAP_INLINE _GL_INLINE
+#endif
+
+#include <stdint.h>
+
+_GL_INLINE_HEADER_BEGIN
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
+# define _GL_BYTESWAP_HAS_BUILTIN_BSWAP16 true
+#elif defined __has_builtin
+# if __has_builtin (__builtin_bswap16)
+#  define _GL_BYTESWAP_HAS_BUILTIN_BSWAP16 true
+# endif
+#endif
+
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+# define _GL_BYTESWAP_HAS_BUILTIN_BSWAP32 true
+# define _GL_BYTESWAP_HAS_BUILTIN_BSWAP64 true
+#elif defined __has_builtin
+# if __has_builtin (__builtin_bswap32)
+#  define _GL_BYTESWAP_HAS_BUILTIN_BSWAP32 true
+# endif
+# if __has_builtin (__builtin_bswap64)
+#  define _GL_BYTESWAP_HAS_BUILTIN_BSWAP64 true
+# endif
+#endif
 
 /* Given an unsigned 16-bit argument X, return the value corresponding to
    X with reversed byte order.  */
-#define bswap_16(x) ((((x) & 0x00FF) << 8) | \
-                     (((x) & 0xFF00) >> 8))
+_GL_BYTESWAP_INLINE uint_least16_t
+bswap_16 (uint_least16_t x)
+{
+#ifdef _GL_BYTESWAP_HAS_BUILTIN_BSWAP16
+  return __builtin_bswap16 (x);
+#else
+  uint_fast16_t mask = 0xff;
+  return (  (x & mask << 8 * 1) >> 8 * 1
+          | (x & mask << 8 * 0) << 8 * 1);
+#endif
+}
 
 /* Given an unsigned 32-bit argument X, return the value corresponding to
    X with reversed byte order.  */
-#define bswap_32(x) ((((x) & 0x000000FF) << 24) | \
-                     (((x) & 0x0000FF00) << 8) | \
-                     (((x) & 0x00FF0000) >> 8) | \
-                     (((x) & 0xFF000000) >> 24))
+_GL_BYTESWAP_INLINE uint_least32_t
+bswap_32 (uint_least32_t x)
+{
+#ifdef _GL_BYTESWAP_HAS_BUILTIN_BSWAP32
+  return __builtin_bswap32 (x);
+#else
+  uint_fast32_t mask = 0xff;
+  return (  (x & mask << 8 * 3) >> 8 * 3
+          | (x & mask << 8 * 2) >> 8 * 1
+          | (x & mask << 8 * 1) << 8 * 1
+          | (x & mask << 8 * 0) << 8 * 3);
+#endif
+}
 
+#ifdef UINT_LEAST64_MAX
 /* Given an unsigned 64-bit argument X, return the value corresponding to
    X with reversed byte order.  */
-#define bswap_64(x) ((((x) & 0x00000000000000FFULL) << 56) | \
-                     (((x) & 0x000000000000FF00ULL) << 40) | \
-                     (((x) & 0x0000000000FF0000ULL) << 24) | \
-                     (((x) & 0x00000000FF000000ULL) << 8) | \
-                     (((x) & 0x000000FF00000000ULL) >> 8) | \
-                     (((x) & 0x0000FF0000000000ULL) >> 24) | \
-                     (((x) & 0x00FF000000000000ULL) >> 40) | \
-                     (((x) & 0xFF00000000000000ULL) >> 56))
+_GL_BYTESWAP_INLINE uint_least64_t
+bswap_64 (uint_least64_t x)
+{
+# ifdef _GL_BYTESWAP_HAS_BUILTIN_BSWAP64
+  return __builtin_bswap64 (x);
+# else
+  uint_fast64_t mask = 0xff;
+  return (  (x & mask << 8 * 7) >> 8 * 7
+          | (x & mask << 8 * 6) >> 8 * 5
+          | (x & mask << 8 * 5) >> 8 * 3
+          | (x & mask << 8 * 4) >> 8 * 1
+          | (x & mask << 8 * 3) << 8 * 1
+          | (x & mask << 8 * 2) << 8 * 3
+          | (x & mask << 8 * 1) << 8 * 5
+          | (x & mask << 8 * 0) << 8 * 7);
+# endif
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+_GL_INLINE_HEADER_END
 
 #endif /* _GL_BYTESWAP_H */
diff --git a/gl/c++defs.h b/gl/c++defs.h
index eb66967b..df98a5ae 100644
--- a/gl/c++defs.h
+++ b/gl/c++defs.h
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -93,11 +93,27 @@
 # define _GL_EXTERN_C extern
 #endif
 
-/* _GL_FUNCDECL_RPL (func, rettype, parameters_and_attributes);
+/* _GL_EXTERN_C_FUNC declaration;
+   performs the declaration of a function with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C_FUNC extern "C"
+#else
+/* In C mode, omit the 'extern' keyword, because attributes in bracket syntax
+   are not allowed between 'extern' and the return type (see gnulib-common.m4).
+ */
+# define _GL_EXTERN_C_FUNC
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters, [attributes]);
    declares a replacement function, named rpl_func, with the given prototype,
    consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...),
                                   _GL_ARG_NONNULL ((1)));
 
    Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front
@@ -106,20 +122,24 @@
      [[...]] extern "C" <declaration>;
    is invalid syntax in C++.)
  */
-#define _GL_FUNCDECL_RPL(func,rettype,parameters_and_attributes) \
-  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
-#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters_and_attributes) \
-  _GL_EXTERN_C rettype rpl_func parameters_and_attributes
+#define _GL_FUNCDECL_RPL(func,rettype,parameters,...) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters, __VA_ARGS__)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
 
-/* _GL_FUNCDECL_SYS (func, rettype, parameters_and_attributes);
+/* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
    declares the system function, named func, with the given prototype,
    consisting of return type, parameters, and attributes.
-   Example:
-     _GL_FUNCDECL_SYS (open, int, (const char *filename, int flags, ...)
-                                  _GL_ARG_NONNULL ((1)));
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
  */
-#define _GL_FUNCDECL_SYS(func,rettype,parameters_and_attributes) \
-  _GL_EXTERN_C rettype func parameters_and_attributes
+#define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype func parameters
 
 /* _GL_CXXALIAS_RPL (func, rettype, parameters);
    declares a C++ alias called GNULIB_NAMESPACE::func
@@ -297,7 +317,7 @@
     _GL_WARN_ON_USE (func, \
                      "The symbol ::" #func " refers to the system function. " \
                      "Use " #namespace "::" #func " instead.")
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+# elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
 #  define _GL_CXXALIASWARN_2(func,namespace) \
      extern __typeof__ (func) func
 # else
diff --git a/gl/c-ctype.c b/gl/c-ctype.c
new file mode 100644
index 00000000..ecf2c083
--- /dev/null
+++ b/gl/c-ctype.c
@@ -0,0 +1,21 @@
+/* Character handling in C locale.
+
+   Copyright (C) 2003-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define C_CTYPE_INLINE _GL_EXTERN_INLINE
+#include "c-ctype.h"
diff --git a/gl/c-ctype.h b/gl/c-ctype.h
new file mode 100644
index 00000000..39063142
--- /dev/null
+++ b/gl/c-ctype.h
@@ -0,0 +1,366 @@
+/* Character handling in C locale.
+
+   These functions work like the corresponding functions in <ctype.h>,
+   except that they have the C (POSIX) locale hardwired, whereas the
+   <ctype.h> functions' behaviour depends on the current locale set via
+   setlocale.
+
+   Copyright (C) 2000-2003, 2006, 2008-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef C_CTYPE_H
+#define C_CTYPE_H
+
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+_GL_INLINE_HEADER_BEGIN
+#ifndef C_CTYPE_INLINE
+# define C_CTYPE_INLINE _GL_INLINE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* The functions defined in this file assume the "C" locale and a character
+   set without diacritics (ASCII-US or EBCDIC-US or something like that).
+   Even if the "C" locale on a particular system is an extension of the ASCII
+   character set (like on BeOS, where it is UTF-8, or on AmigaOS, where it
+   is ISO-8859-1), the functions in this file recognize only the ASCII
+   characters.  */
+
+
+#if (' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+    && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
+    && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
+    && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
+    && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
+    && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
+    && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
+    && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
+    && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
+    && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
+    && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
+    && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
+    && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
+    && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
+    && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
+    && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
+    && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
+    && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
+    && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
+    && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
+    && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
+    && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
+    && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)
+/* The character set is ASCII or one of its variants or extensions, not EBCDIC.
+   Testing the value of '\n' and '\r' is not relevant.  */
+# define C_CTYPE_ASCII 1
+#elif ! (' ' == '\x40' && '0' == '\xf0'                     \
+         && 'A' == '\xc1' && 'J' == '\xd1' && 'S' == '\xe2' \
+         && 'a' == '\x81' && 'j' == '\x91' && 's' == '\xa2')
+# error "Only ASCII and EBCDIC are supported"
+#endif
+
+#if 'A' < 0
+# error "EBCDIC and char is signed -- not supported"
+#endif
+
+/* Cases for control characters.  */
+
+#define _C_CTYPE_CNTRL \
+   case '\a': case '\b': case '\f': case '\n': \
+   case '\r': case '\t': case '\v': \
+   _C_CTYPE_OTHER_CNTRL
+
+/* ASCII control characters other than those with \-letter escapes.  */
+
+#if C_CTYPE_ASCII
+# define _C_CTYPE_OTHER_CNTRL \
+    case '\x00': case '\x01': case '\x02': case '\x03': \
+    case '\x04': case '\x05': case '\x06': case '\x0e': \
+    case '\x0f': case '\x10': case '\x11': case '\x12': \
+    case '\x13': case '\x14': case '\x15': case '\x16': \
+    case '\x17': case '\x18': case '\x19': case '\x1a': \
+    case '\x1b': case '\x1c': case '\x1d': case '\x1e': \
+    case '\x1f': case '\x7f'
+#else
+   /* Use EBCDIC code page 1047's assignments for ASCII control chars;
+      assume all EBCDIC code pages agree about these assignments.  */
+# define _C_CTYPE_OTHER_CNTRL \
+    case '\x00': case '\x01': case '\x02': case '\x03': \
+    case '\x07': case '\x0e': case '\x0f': case '\x10': \
+    case '\x11': case '\x12': case '\x13': case '\x18': \
+    case '\x19': case '\x1c': case '\x1d': case '\x1e': \
+    case '\x1f': case '\x26': case '\x27': case '\x2d': \
+    case '\x2e': case '\x32': case '\x37': case '\x3c': \
+    case '\x3d': case '\x3f'
+#endif
+
+/* Cases for lowercase hex letters, and lowercase letters, all offset by N.  */
+
+#define _C_CTYPE_LOWER_A_THRU_F_N(N) \
+   case 'a' + (N): case 'b' + (N): case 'c' + (N): case 'd' + (N): \
+   case 'e' + (N): case 'f' + (N)
+#define _C_CTYPE_LOWER_N(N) \
+   _C_CTYPE_LOWER_A_THRU_F_N(N): \
+   case 'g' + (N): case 'h' + (N): case 'i' + (N): case 'j' + (N): \
+   case 'k' + (N): case 'l' + (N): case 'm' + (N): case 'n' + (N): \
+   case 'o' + (N): case 'p' + (N): case 'q' + (N): case 'r' + (N): \
+   case 's' + (N): case 't' + (N): case 'u' + (N): case 'v' + (N): \
+   case 'w' + (N): case 'x' + (N): case 'y' + (N): case 'z' + (N)
+
+/* Cases for hex letters, digits, lower, punct, and upper.  */
+
+#define _C_CTYPE_A_THRU_F \
+   _C_CTYPE_LOWER_A_THRU_F_N (0): \
+   _C_CTYPE_LOWER_A_THRU_F_N ('A' - 'a')
+#define _C_CTYPE_DIGIT                     \
+   case '0': case '1': case '2': case '3': \
+   case '4': case '5': case '6': case '7': \
+   case '8': case '9'
+#define _C_CTYPE_LOWER _C_CTYPE_LOWER_N (0)
+#define _C_CTYPE_PUNCT \
+   case '!': case '"': case '#': case '$':  \
+   case '%': case '&': case '\'': case '(': \
+   case ')': case '*': case '+': case ',':  \
+   case '-': case '.': case '/': case ':':  \
+   case ';': case '<': case '=': case '>':  \
+   case '?': case '@': case '[': case '\\': \
+   case ']': case '^': case '_': case '`':  \
+   case '{': case '|': case '}': case '~'
+#define _C_CTYPE_UPPER _C_CTYPE_LOWER_N ('A' - 'a')
+
+
+/* Function definitions.  */
+
+/* Unlike the functions in <ctype.h>, which require an argument in the range
+   of the 'unsigned char' type, the functions here operate on values that are
+   in the 'unsigned char' range or in the 'char' range.  In other words,
+   when you have a 'char' value, you need to cast it before using it as
+   argument to a <ctype.h> function:
+
+         const char *s = ...;
+         if (isalpha ((unsigned char) *s)) ...
+
+   but you don't need to cast it for the functions defined in this file:
+
+         const char *s = ...;
+         if (c_isalpha (*s)) ...
+ */
+
+C_CTYPE_INLINE bool
+c_isalnum (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_DIGIT:
+    _C_CTYPE_LOWER:
+    _C_CTYPE_UPPER:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_isalpha (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_LOWER:
+    _C_CTYPE_UPPER:
+      return true;
+    default:
+      return false;
+    }
+}
+
+/* The function isascii is not locale dependent.
+   Its use in EBCDIC is questionable. */
+C_CTYPE_INLINE bool
+c_isascii (int c)
+{
+  switch (c)
+    {
+    case ' ':
+    _C_CTYPE_CNTRL:
+    _C_CTYPE_DIGIT:
+    _C_CTYPE_LOWER:
+    _C_CTYPE_PUNCT:
+    _C_CTYPE_UPPER:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_isblank (int c)
+{
+  return c == ' ' || c == '\t';
+}
+
+C_CTYPE_INLINE bool
+c_iscntrl (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_CNTRL:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_isdigit (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_DIGIT:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_isgraph (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_DIGIT:
+    _C_CTYPE_LOWER:
+    _C_CTYPE_PUNCT:
+    _C_CTYPE_UPPER:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_islower (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_LOWER:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_isprint (int c)
+{
+  switch (c)
+    {
+    case ' ':
+    _C_CTYPE_DIGIT:
+    _C_CTYPE_LOWER:
+    _C_CTYPE_PUNCT:
+    _C_CTYPE_UPPER:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_ispunct (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_PUNCT:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_isspace (int c)
+{
+  switch (c)
+    {
+    case ' ': case '\t': case '\n': case '\v': case '\f': case '\r':
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_isupper (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_UPPER:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE bool
+c_isxdigit (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_DIGIT:
+    _C_CTYPE_A_THRU_F:
+      return true;
+    default:
+      return false;
+    }
+}
+
+C_CTYPE_INLINE int
+c_tolower (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_UPPER:
+      return c - 'A' + 'a';
+    default:
+      return c;
+    }
+}
+
+C_CTYPE_INLINE int
+c_toupper (int c)
+{
+  switch (c)
+    {
+    _C_CTYPE_LOWER:
+      return c - 'a' + 'A';
+    default:
+      return c;
+    }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+_GL_INLINE_HEADER_END
+
+#endif /* C_CTYPE_H */
diff --git a/gl/c32is-impl.h b/gl/c32is-impl.h
new file mode 100644
index 00000000..8366035d
--- /dev/null
+++ b/gl/c32is-impl.h
@@ -0,0 +1,105 @@
+/* Test whether a 32-bit wide character belongs to a specific character class.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2020.  */
+
+#include <wchar.h>
+#include <wctype.h>
+
+#ifdef __CYGWIN__
+# include <cygwin/version.h>
+#endif
+
+#if GNULIB_defined_mbstate_t
+# include "localcharset.h"
+# include "streq.h"
+#endif
+
+#if GL_CHAR32_T_IS_UNICODE
+# include "lc-charset-unicode.h"
+#endif
+
+#include "unictype.h"
+
+#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t
+_GL_EXTERN_INLINE
+#endif
+int
+FUNC (wint_t wc)
+{
+  /* The char32_t encoding of a multibyte character is defined by the way
+     mbrtoc32() is defined.  */
+
+#if GNULIB_defined_mbstate_t            /* AIX, IRIX */
+  /* mbrtoc32() is defined on top of mbtowc() for the non-UTF-8 locales
+     and directly for the UTF-8 locales.  */
+  if (wc != WEOF)
+    {
+      const char *encoding = locale_charset ();
+      if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+        return UCS_FUNC (wc);
+      else
+        return WCHAR_FUNC (wc);
+    }
+  else
+    return 0;
+
+#elif HAVE_WORKING_MBRTOC32 && HAVE_WORKING_C32RTOMB /* glibc, Android */
+  /* mbrtoc32() is essentially defined by the system libc.  */
+
+# if _GL_WCHAR_T_IS_UCS4
+  /* The char32_t encoding of a multibyte character is known to be the same as
+     the wchar_t encoding.  */
+  return WCHAR_FUNC (wc);
+# else
+  /* The char32_t encoding of a multibyte character is known to be UCS-4,
+     different from the wchar_t encoding.  */
+  if (wc != WEOF)
+    return UCS_FUNC (wc);
+  else
+    return 0;
+# endif
+
+#elif _GL_SMALL_WCHAR_T                 /* Cygwin, mingw, MSVC */
+  /* The wchar_t encoding is UTF-16.
+     The char32_t encoding is UCS-4.  */
+
+# if defined __CYGWIN__ && CYGWIN_VERSION_DLL_MAJOR >= 1007
+  /* As an extension to POSIX, the iswalnum() function of Cygwin >= 1.7
+     supports also wc arguments outside the Unicode BMP, that is, outside
+     the 'wchar_t' range.  See
+     <https://lists.gnu.org/archive/html/bug-gnulib/2011-02/msg00019.html>
+     = <https://cygwin.com/ml/cygwin/2011-02/msg00044.html>.  */
+  return WCHAR_FUNC (wc);
+# else
+  if (wc == WEOF || wc == (wchar_t) wc)
+    /* wc is in the range for the isw* functions.  */
+    return WCHAR_FUNC (wc);
+  else
+    return UCS_FUNC (wc);
+# endif
+
+#else /* macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Minix, Android */
+  /* char32_t and wchar_t are equivalent.  */
+  static_assert (sizeof (char32_t) == sizeof (wchar_t));
+
+# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
+  return UCS_FUNC (wc);
+# else
+  return WCHAR_FUNC (wc);
+# endif
+#endif
+}
diff --git a/gl/c32isalnum.c b/gl/c32isalnum.c
new file mode 100644
index 00000000..7d0ebcf5
--- /dev/null
+++ b/gl/c32isalnum.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being alphanumeric.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISALNUM
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isalnum
+#define WCHAR_FUNC iswalnum
+#define UCS_FUNC uc_is_alnum
+#include "c32is-impl.h"
diff --git a/gl/c32isalpha.c b/gl/c32isalpha.c
new file mode 100644
index 00000000..308fd76a
--- /dev/null
+++ b/gl/c32isalpha.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being alphabetic.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISALPHA
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isalpha
+#define WCHAR_FUNC iswalpha
+#define UCS_FUNC uc_is_alpha
+#include "c32is-impl.h"
diff --git a/gl/c32isblank.c b/gl/c32isblank.c
new file mode 100644
index 00000000..1a03c2db
--- /dev/null
+++ b/gl/c32isblank.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being blank.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISBLANK
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isblank
+#define WCHAR_FUNC iswblank
+#define UCS_FUNC uc_is_blank
+#include "c32is-impl.h"
diff --git a/gl/c32iscntrl.c b/gl/c32iscntrl.c
new file mode 100644
index 00000000..1d004087
--- /dev/null
+++ b/gl/c32iscntrl.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being a control character.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISCNTRL
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32iscntrl
+#define WCHAR_FUNC iswcntrl
+#define UCS_FUNC uc_is_cntrl
+#include "c32is-impl.h"
diff --git a/gl/c32isdigit.c b/gl/c32isdigit.c
new file mode 100644
index 00000000..7d3bda81
--- /dev/null
+++ b/gl/c32isdigit.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being a digit.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISDIGIT
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isdigit
+#define WCHAR_FUNC iswdigit
+#define UCS_FUNC uc_is_digit
+#include "c32is-impl.h"
diff --git a/gl/c32isgraph.c b/gl/c32isgraph.c
new file mode 100644
index 00000000..8b68ae39
--- /dev/null
+++ b/gl/c32isgraph.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being graphic.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISGRAPH
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isgraph
+#define WCHAR_FUNC iswgraph
+#define UCS_FUNC uc_is_graph
+#include "c32is-impl.h"
diff --git a/gl/c32islower.c b/gl/c32islower.c
new file mode 100644
index 00000000..1ce08cf4
--- /dev/null
+++ b/gl/c32islower.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being lowercase.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISLOWER
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32islower
+#define WCHAR_FUNC iswlower
+#define UCS_FUNC uc_is_lower
+#include "c32is-impl.h"
diff --git a/gl/c32isprint.c b/gl/c32isprint.c
new file mode 100644
index 00000000..d47ce1f8
--- /dev/null
+++ b/gl/c32isprint.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being printable.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISPRINT
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isprint
+#define WCHAR_FUNC iswprint
+#define UCS_FUNC uc_is_print
+#include "c32is-impl.h"
diff --git a/gl/c32ispunct.c b/gl/c32ispunct.c
new file mode 100644
index 00000000..41ac3d70
--- /dev/null
+++ b/gl/c32ispunct.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being a punctuation or symbol character.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISPUNCT
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32ispunct
+#define WCHAR_FUNC iswpunct
+#define UCS_FUNC uc_is_punct
+#include "c32is-impl.h"
diff --git a/gl/c32isspace.c b/gl/c32isspace.c
new file mode 100644
index 00000000..2393142b
--- /dev/null
+++ b/gl/c32isspace.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being white-space.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISSPACE
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isspace
+#define WCHAR_FUNC iswspace
+#define UCS_FUNC uc_is_space
+#include "c32is-impl.h"
diff --git a/gl/c32isupper.c b/gl/c32isupper.c
new file mode 100644
index 00000000..bfe4a148
--- /dev/null
+++ b/gl/c32isupper.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being uppercase.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISUPPER
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isupper
+#define WCHAR_FUNC iswupper
+#define UCS_FUNC uc_is_upper
+#include "c32is-impl.h"
diff --git a/gl/c32isxdigit.c b/gl/c32isxdigit.c
new file mode 100644
index 00000000..b38d7f1f
--- /dev/null
+++ b/gl/c32isxdigit.c
@@ -0,0 +1,26 @@
+/* Test 32-bit wide character for being a hexadecimal digit.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32ISXDIGIT
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32isxdigit
+#define WCHAR_FUNC iswxdigit
+#define UCS_FUNC uc_is_xdigit
+#include "c32is-impl.h"
diff --git a/gl/c32to-impl.h b/gl/c32to-impl.h
new file mode 100644
index 00000000..a63a25b6
--- /dev/null
+++ b/gl/c32to-impl.h
@@ -0,0 +1,103 @@
+/* Case mapping of a 32-bit wide character.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2023.  */
+
+#include <wchar.h>
+#include <wctype.h>
+
+#if GNULIB_defined_mbstate_t
+# include "localcharset.h"
+# include "streq.h"
+#endif
+
+#if GL_CHAR32_T_IS_UNICODE
+# include "lc-charset-unicode.h"
+#endif
+
+#include "unicase.h"
+
+#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t
+_GL_EXTERN_INLINE
+#endif
+wint_t
+FUNC (wint_t wc)
+{
+  /* The char32_t encoding of a multibyte character is defined by the way
+     mbrtoc32() is defined.  */
+
+#if GNULIB_defined_mbstate_t            /* AIX, IRIX */
+  /* mbrtoc32() is defined on top of mbtowc() for the non-UTF-8 locales
+     and directly for the UTF-8 locales.  */
+  if (wc != WEOF)
+    {
+      const char *encoding = locale_charset ();
+      if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+        return UCS_FUNC (wc);
+      else
+        return WCHAR_FUNC (wc);
+    }
+  else
+    return wc;
+
+#elif HAVE_WORKING_MBRTOC32 && HAVE_WORKING_C32RTOMB /* glibc, Android */
+  /* mbrtoc32() is essentially defined by the system libc.  */
+
+# if _GL_WCHAR_T_IS_UCS4
+  /* The char32_t encoding of a multibyte character is known to be the same as
+     the wchar_t encoding.  */
+  return WCHAR_FUNC (wc);
+# else
+  /* The char32_t encoding of a multibyte character is known to be UCS-4,
+     different from the wchar_t encoding.  */
+  if (wc != WEOF)
+    return UCS_FUNC (wc);
+  else
+    return wc;
+# endif
+
+#elif _GL_SMALL_WCHAR_T                 /* Cygwin, mingw, MSVC */
+  /* The wchar_t encoding is UTF-16.
+     The char32_t encoding is UCS-4.  */
+
+# if defined _WIN32 && !defined __CYGWIN__
+  /* On native Windows, in the UTF-8 locale, towlower and towupper are
+     lacking (at least) the mappings for ISO-8859-1 characters, such as
+     0x00C9 <-> 0x00E9.  Since it is expensive to test whether the locale
+     encoding is UTF-8, ignore the system's WCHAR_FUNC altogether.  */
+  if (wc != WEOF)
+    return UCS_FUNC (wc);
+  else
+    return wc;
+# else
+  if (wc == WEOF || wc == (wchar_t) wc)
+    /* wc is in the range for the tow* functions.  */
+    return WCHAR_FUNC (wc);
+  else
+    return UCS_FUNC (wc);
+# endif
+
+#else /* macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Minix, Android */
+  /* char32_t and wchar_t are equivalent.  */
+  static_assert (sizeof (char32_t) == sizeof (wchar_t));
+
+# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
+  return UCS_FUNC (wc);
+# else
+  return WCHAR_FUNC (wc);
+# endif
+#endif
+}
diff --git a/gl/c32tolower.c b/gl/c32tolower.c
new file mode 100644
index 00000000..a0b0523f
--- /dev/null
+++ b/gl/c32tolower.c
@@ -0,0 +1,26 @@
+/* Map a 32-bit wide character to lowercase.
+   Copyright (C) 2023-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define IN_C32TOLOWER
+/* Specification.  */
+#include <uchar.h>
+
+#define FUNC c32tolower
+#define WCHAR_FUNC towlower
+#define UCS_FUNC uc_tolower
+#include "c32to-impl.h"
diff --git a/gl/c32width.c b/gl/c32width.c
new file mode 100644
index 00000000..442a432c
--- /dev/null
+++ b/gl/c32width.c
@@ -0,0 +1,102 @@
+/* Determine the number of screen columns needed for a 32-bit wide character.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2023.  */
+
+#include <config.h>
+
+#define IN_C32WIDTH
+/* Specification.  */
+#include <uchar.h>
+
+#include <wchar.h>
+
+#ifdef __CYGWIN__
+# include <cygwin/version.h>
+#endif
+
+#if GNULIB_defined_mbstate_t
+# include "streq.h"
+#endif
+
+#include "localcharset.h"
+
+#if GL_CHAR32_T_IS_UNICODE
+# include "lc-charset-unicode.h"
+#endif
+
+#include "uniwidth.h"
+
+#if _GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t
+_GL_EXTERN_INLINE
+#endif
+int
+c32width (char32_t wc)
+{
+  /* The char32_t encoding of a multibyte character is defined by the way
+     mbrtoc32() is defined.  */
+
+#if GNULIB_defined_mbstate_t            /* AIX, IRIX */
+  /* mbrtoc32() is defined on top of mbtowc() for the non-UTF-8 locales
+     and directly for the UTF-8 locales.  */
+  const char *encoding = locale_charset ();
+  if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+    return uc_width (wc, encoding);
+  else
+    return wcwidth (wc);
+
+#elif HAVE_WORKING_MBRTOC32 && HAVE_WORKING_C32RTOMB /* glibc, Android */
+  /* mbrtoc32() is essentially defined by the system libc.  */
+
+# if _GL_WCHAR_T_IS_UCS4
+  /* The char32_t encoding of a multibyte character is known to be the same as
+     the wchar_t encoding.  */
+  return wcwidth (wc);
+# else
+  /* The char32_t encoding of a multibyte character is known to be UCS-4,
+     different from the wchar_t encoding.  */
+  return uc_width (wc, locale_charset ());
+# endif
+
+#elif _GL_SMALL_WCHAR_T                 /* Cygwin, mingw, MSVC */
+  /* The wchar_t encoding is UTF-16.
+     The char32_t encoding is UCS-4.  */
+
+# if defined __CYGWIN__ && CYGWIN_VERSION_DLL_MAJOR >= 1007 && 0
+  /* As an extension to POSIX, the wcwidth() function of Cygwin >= 1.7
+     supports also wc arguments outside the Unicode BMP, that is, outside
+     the 'wchar_t' range.  See
+     <https://www.cygwin.com/cgit/newlib-cygwin/commit/?id=098a75dc51caa98f369d98a9809d773bc45329aa>.
+     But the resulting values for these characters are not of good quality.  */
+  return wcwidth (wc);
+# else
+  if (wc == (wchar_t) wc)
+    /* wc is in the range for the wcwidth function.  */
+    return wcwidth (wc);
+  else
+    return uc_width (wc, locale_charset ());
+# endif
+
+#else /* macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Minix, Android */
+  /* char32_t and wchar_t are equivalent.  */
+  static_assert (sizeof (char32_t) == sizeof (wchar_t));
+
+# if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
+  return uc_width (wc, locale_charset ());
+# endif
+  return wcwidth (wc);
+#endif
+}
diff --git a/gl/calloc.c b/gl/calloc.c
index 81dfd3ef..5258c5de 100644
--- a/gl/calloc.c
+++ b/gl/calloc.c
@@ -1,6 +1,6 @@
 /* calloc() function that is glibc compatible.
    This wrapper function is required at least on Tru64 UNIX 5.1 and mingw.
-   Copyright (C) 2004-2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2004-2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -17,17 +17,15 @@
 
 /* written by Jim Meyering and Bruno Haible */
 
+/* Ensure that we call the system's calloc() below.  */
+#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 /* Specification.  */
 #include <stdlib.h>
 
 #include <errno.h>
-
-#include "xalloc-oversized.h"
-
-/* Call the system's calloc below.  */
-#undef calloc
+#include <stdckdint.h>
 
 /* Allocate and zero-fill an NxS-byte block of memory from the heap,
    even if N or S is zero.  */
@@ -35,14 +33,19 @@
 void *
 rpl_calloc (size_t n, size_t s)
 {
+#if !HAVE_MALLOC_0_NONNULL
   if (n == 0 || s == 0)
     n = s = 1;
+#endif
 
-  if (xalloc_oversized (n, s))
+#if !HAVE_MALLOC_PTRDIFF
+  ptrdiff_t signed_n;
+  if (ckd_mul (&signed_n, n, s))
     {
       errno = ENOMEM;
       return NULL;
     }
+#endif
 
   void *result = calloc (n, s);
 
diff --git a/gl/cdefs.h b/gl/cdefs.h
index d38382ad..dce5739d 100644
--- a/gl/cdefs.h
+++ b/gl/cdefs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2024 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2025 Free Software Foundation, Inc.
    Copyright The GNU Toolchain Authors.
    This file is part of the GNU C Library.
 
@@ -83,7 +83,7 @@
 #  define __NTH(fct)    __attribute__ ((__nothrow__ __LEAF)) fct
 #  define __NTHNL(fct)  __attribute__ ((__nothrow__)) fct
 # else
-#  if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major >= 4)
+#  if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major__ >= 4)
 #   if __cplusplus >= 201103L
 #    define __THROW     noexcept (true)
 #   else
@@ -277,10 +277,10 @@
 */
 #endif
 
-/* GCC and clang have various useful declarations that can be made with
-   the '__attribute__' syntax.  All of the ways we use this do fine if
-   they are omitted for compilers that don't understand it.  */
-#if !(defined __GNUC__ || defined __clang__)
+/* GCC, clang, and compatible compilers have various useful declarations
+   that can be made with the '__attribute__' syntax.  All of the ways we use
+   this do fine if they are omitted for compilers that don't understand it.  */
+#if !(defined __GNUC__ || defined __clang__ || defined __TINYC__)
 # define __attribute__(xyz)     /* Ignore */
 #endif
 
@@ -482,7 +482,7 @@
    run in pedantic mode if the uses are carefully marked using the
    `__extension__' keyword.  But this is not generally available before
    version 2.8.  */
-#if !(__GNUC_PREREQ (2,8) || defined __clang__)
+#if ! (__GNUC_PREREQ (2,8) || defined __clang__ || 0x5150 <= __SUNPRO_C)
 # define __extension__          /* Ignore */
 #endif
 
@@ -497,7 +497,7 @@
 # endif
 #endif
 
-/* ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
+/* ISO C99 also allows declaring arrays as non-overlapping.  The syntax is
      array_name[restrict]
    GCC 3.1 and clang support this.
    This syntax is not usable in C++ mode.  */
diff --git a/gl/cloexec.c b/gl/cloexec.c
index cdb0d740..8ab5591f 100644
--- a/gl/cloexec.c
+++ b/gl/cloexec.c
@@ -1,6 +1,6 @@
 /* cloexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 1991, 2004-2006, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2004-2006, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/cloexec.h b/gl/cloexec.h
index a7944d6d..0eb9fa09 100644
--- a/gl/cloexec.h
+++ b/gl/cloexec.h
@@ -1,6 +1,6 @@
 /* cloexec.c - set or clear the close-on-exec descriptor flag
 
-   Copyright (C) 2004, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/close.c b/gl/close.c
index 830fd820..3bcfc479 100644
--- a/gl/close.c
+++ b/gl/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/dirname-lgpl.c b/gl/dirname-lgpl.c
index 8333c0eb..9e0ec565 100644
--- a/gl/dirname-lgpl.c
+++ b/gl/dirname-lgpl.c
@@ -1,6 +1,6 @@
 /* dirname.c -- return all but the last element in a file name
 
-   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2024 Free Software
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/dirname.c b/gl/dirname.c
index 393ec1b4..e747fcaf 100644
--- a/gl/dirname.c
+++ b/gl/dirname.c
@@ -1,6 +1,6 @@
 /* dirname.c -- return all but the last element in a file name
 
-   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2024 Free Software
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2025 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
diff --git a/gl/dirname.h b/gl/dirname.h
index 33935ba9..d4d03f66 100644
--- a/gl/dirname.h
+++ b/gl/dirname.h
@@ -1,6 +1,6 @@
 /* Take file names apart into directory and base names.
 
-   Copyright (C) 1998, 2001, 2003-2006, 2009-2024 Free Software Foundation,
+   Copyright (C) 1998, 2001, 2003-2006, 2009-2025 Free Software Foundation,
    Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/dup2.c b/gl/dup2.c
index 916e113d..69b37196 100644
--- a/gl/dup2.c
+++ b/gl/dup2.c
@@ -1,6 +1,6 @@
 /* Duplicate an open file descriptor to a specified file descriptor.
 
-   Copyright (C) 1999, 2004-2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/dynarray.h b/gl/dynarray.h
index 8940e81b..74471ea2 100644
--- a/gl/dynarray.h
+++ b/gl/dynarray.h
@@ -1,5 +1,5 @@
 /* Type-safe arrays which grow dynamically.
-   Copyright 2021-2024 Free Software Foundation, Inc.
+   Copyright 2021-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/errno.in.h b/gl/errno.in.h
index aa658e62..ba5dd371 100644
--- a/gl/errno.in.h
+++ b/gl/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -133,7 +133,7 @@
 
 /* These are intentionally the same values as the WSA* error numbers, defined
    in <winsock2.h>.  */
-#  define ESOCKTNOSUPPORT 10044  /* not required by POSIX */
+#  define ESOCKTNOSUPPORT 10044
 #  define EPFNOSUPPORT    10046  /* not required by POSIX */
 #  define ESHUTDOWN       10058  /* not required by POSIX */
 #  define ETOOMANYREFS    10059  /* not required by POSIX */
@@ -270,10 +270,17 @@
 #  define GNULIB_defined_ENOTRECOVERABLE 1
 # endif
 
+/* On LynxOS, the macro EILSEQ is not defined.  */
 # ifndef EILSEQ
 #  define EILSEQ 2015
 #  define GNULIB_defined_EILSEQ 1
 # endif
 
+/* On Haiku, the macro ESOCKTNOSUPPORT is not defined.  */
+# ifndef ESOCKTNOSUPPORT
+#  define ESOCKTNOSUPPORT 2016
+#  define GNULIB_defined_ESOCKTNOSUPPORT 1
+# endif
+
 #endif /* _@GUARD_PREFIX@_ERRNO_H */
 #endif /* _@GUARD_PREFIX@_ERRNO_H */
diff --git a/gl/error.c b/gl/error.c
index c53dfeb6..9231c79c 100644
--- a/gl/error.c
+++ b/gl/error.c
@@ -1,25 +1,32 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 1990-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
-   This file is free software: you can redistribute it and/or modify
-   it under the terms of the GNU Lesser General Public License as
-   published by the Free Software Foundation; either version 2.1 of the
-   License, or (at your option) any later version.
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-   This file is distributed in the hope that it will be useful,
+   The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU Lesser General Public License for more details.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU Lesser General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 
 #if !_LIBC
 # include <config.h>
 # define _GL_NO_INLINE_ERROR
+# define __error_internal(status, err, fmt, args, flags) \
+                  verror (status, err, fmt, args)
+# define __error_at_line_internal(status, err, file, line, fmt, args, flags) \
+                  verror_at_line (status, err, file, line, fmt, args)
+# define error_tail(status, err, fmt, args, flags) \
+        error_tail (status, err, fmt, args)
 #endif
 
 #include <error.h>
@@ -31,7 +38,7 @@
 
 #if !_LIBC && ENABLE_NLS
 # include "gettext.h"
-# define _(msgid) gettext (msgid)
+# define _(msgid) dgettext ("gnulib", msgid)
 #endif
 
 #ifdef _LIBC
@@ -85,7 +92,7 @@ extern void __error_at_line (int status, int errnum, const char *file_name,
 # undef putc
 # define putc(c, fp) _IO_putc (c, fp)
 
-# include <bits/libc-lock.h>
+# include <libc-lock.h>
 
 #else /* not _LIBC */
 
@@ -123,6 +130,13 @@ int strerror_r (int errnum, char *buf, size_t buflen);
 # if GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r
 #  define __strerror_r strerror_r
 # endif /* GNULIB_STRERROR_R_POSIX || HAVE_STRERROR_R || defined strerror_r */
+
+# if GNULIB_defined_verror
+#  undef verror
+# endif
+# if GNULIB_defined_verror_at_line
+#  undef verror_at_line
+# endif
 #endif  /* not _LIBC */
 
 #if !_LIBC
@@ -151,8 +165,8 @@ flush_stdout (void)
 #if !_LIBC
   int stdout_fd;
 
-# if GNULIB_FREOPEN_SAFER
-  /* Use of gnulib's freopen-safer module normally ensures that
+# if GNULIB_FREOPEN_SAFER || GNULIB_XSTDOPEN
+  /* Gnulib's freopen-safer and/or xstdopen modules normally ensure that
        fileno (stdout) == 1
      whenever stdout is open.  */
   stdout_fd = STDOUT_FILENO;
@@ -183,7 +197,7 @@ print_errno_message (int errnum)
   if (__strerror_r (errnum, errbuf, sizeof errbuf) == 0)
     s = errbuf;
   else
-    s = 0;
+    s = NULL;
 # endif
 #else
   s = strerror (errnum);
@@ -202,75 +216,18 @@ print_errno_message (int errnum)
 }
 
 static void _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0) _GL_ARG_NONNULL ((3))
-error_tail (int status, int errnum, const char *message, va_list args)
+error_tail (int status, int errnum, const char *message, va_list args,
+            unsigned int mode_flags)
 {
 #if _LIBC
-  if (_IO_fwide (stderr, 0) > 0)
-    {
-      size_t len = strlen (message) + 1;
-      wchar_t *wmessage = NULL;
-      mbstate_t st;
-      size_t res;
-      const char *tmp;
-      bool use_malloc = false;
-
-      while (1)
-        {
-          if (__libc_use_alloca (len * sizeof (wchar_t)))
-            wmessage = (wchar_t *) alloca (len * sizeof (wchar_t));
-          else
-            {
-              if (!use_malloc)
-                wmessage = NULL;
-
-              wchar_t *p = (wchar_t *) realloc (wmessage,
-                                                len * sizeof (wchar_t));
-              if (p == NULL)
-                {
-                  free (wmessage);
-                  fputws_unlocked (L"out of memory\n", stderr);
-                  return;
-                }
-              wmessage = p;
-              use_malloc = true;
-            }
-
-          memset (&st, '\0', sizeof (st));
-          tmp = message;
-
-          res = mbsrtowcs (wmessage, &tmp, len, &st);
-          if (res != len)
-            break;
-
-          if (__builtin_expect (len >= SIZE_MAX / sizeof (wchar_t) / 2, 0))
-            {
-              /* This really should not happen if everything is fine.  */
-              res = (size_t) -1;
-              break;
-            }
-
-          len *= 2;
-        }
-
-      if (res == (size_t) -1)
-        {
-          /* The string cannot be converted.  */
-          if (use_malloc)
-            {
-              free (wmessage);
-              use_malloc = false;
-            }
-          wmessage = (wchar_t *) L"???";
-        }
-
-      __vfwprintf (stderr, wmessage, args);
-
-      if (use_malloc)
-        free (wmessage);
-    }
-  else
+  int ret = __vfxprintf (stderr, message, args, mode_flags);
+  if (ret < 0 && errno == ENOMEM && _IO_fwide (stderr, 0) > 0)
+    /* Leave a trace in case the heap allocation of the message string
+       failed.  */
+    fputws_unlocked (L"out of memory\n", stderr);
+#else
+  vfprintf (stderr, message, args);
 #endif
-    vfprintf (stderr, message, args);
 
   ++error_message_count;
   if (errnum)
@@ -291,16 +248,14 @@ error_tail (int status, int errnum, const char *message, va_list args)
    If ERRNUM is nonzero, print its corresponding system error message.
    Exit with status STATUS if it is nonzero.  */
 void
-error (int status, int errnum, const char *message, ...)
+__error_internal (int status, int errnum, const char *message,
+                  va_list args, unsigned int mode_flags)
 {
-  va_list args;
-
-#if defined _LIBC && defined __libc_ptf_call
+#if defined _LIBC
   /* We do not want this call to be cut short by a thread
      cancellation.  Therefore disable cancellation for now.  */
   int state = PTHREAD_CANCEL_ENABLE;
-  __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
-                   0);
+  __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
 #endif
 
   flush_stdout ();
@@ -318,28 +273,32 @@ error (int status, int errnum, const char *message, ...)
 #endif
     }
 
-  va_start (args, message);
-  error_tail (status, errnum, message, args);
-  va_end (args);
+  error_tail (status, errnum, message, args, mode_flags);
 
 #ifdef _LIBC
   _IO_funlockfile (stderr);
-# ifdef __libc_ptf_call
-  __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
-# endif
+  __pthread_setcancelstate (state, NULL);
 #endif
 }
+
+void
+error (int status, int errnum, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  __error_internal (status, errnum, message, ap, 0);
+  va_end (ap);
+}
 
 /* Sometimes we want to have at most one error per line.  This
    variable controls whether this mode is selected or not.  */
 int error_one_per_line;
 
 void
-error_at_line (int status, int errnum, const char *file_name,
-               unsigned int line_number, const char *message, ...)
+__error_at_line_internal (int status, int errnum, const char *file_name,
+                          unsigned int line_number, const char *message,
+                          va_list args, unsigned int mode_flags)
 {
-  va_list args;
-
   if (error_one_per_line)
     {
       static const char *old_file_name;
@@ -358,12 +317,11 @@ error_at_line (int status, int errnum, const char *file_name,
       old_line_number = line_number;
     }
 
-#if defined _LIBC && defined __libc_ptf_call
+#if defined _LIBC
   /* We do not want this call to be cut short by a thread
      cancellation.  Therefore disable cancellation for now.  */
   int state = PTHREAD_CANCEL_ENABLE;
-  __libc_ptf_call (pthread_setcancelstate, (PTHREAD_CANCEL_DISABLE, &state),
-                   0);
+  __pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &state);
 #endif
 
   flush_stdout ();
@@ -389,18 +347,25 @@ error_at_line (int status, int errnum, const char *file_name,
            file_name, line_number);
 #endif
 
-  va_start (args, message);
-  error_tail (status, errnum, message, args);
-  va_end (args);
+  error_tail (status, errnum, message, args, mode_flags);
 
 #ifdef _LIBC
   _IO_funlockfile (stderr);
-# ifdef __libc_ptf_call
-  __libc_ptf_call (pthread_setcancelstate, (state, NULL), 0);
-# endif
+  __pthread_setcancelstate (state, NULL);
 #endif
 }
 
+void
+error_at_line (int status, int errnum, const char *file_name,
+               unsigned int line_number, const char *message, ...)
+{
+  va_list ap;
+  va_start (ap, message);
+  __error_at_line_internal (status, errnum, file_name, line_number,
+                            message, ap, 0);
+  va_end (ap);
+}
+
 #ifdef _LIBC
 /* Make the weak alias.  */
 # undef error
diff --git a/gl/error.in.h b/gl/error.in.h
index 51f8cafd..6c512ec8 100644
--- a/gl/error.in.h
+++ b/gl/error.in.h
@@ -1,5 +1,5 @@
 /* Declarations for error-reporting functions.
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2024 Free Software Foundation,
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2025 Free Software Foundation,
    Inc.
    This file is part of the GNU C Library.
 
@@ -23,20 +23,23 @@
    or error_at_line(...) invocations.  */
 
 /* The include_next requires a split double-inclusion guard.  */
-#if @HAVE_ERROR_H@
+#if @HAVE_ERROR_H@ && !defined __MINGW32__
 # @INCLUDE_NEXT@ @NEXT_ERROR_H@
 #endif
 
 #ifndef _@GUARD_PREFIX@_ERROR_H
 #define _@GUARD_PREFIX@_ERROR_H
 
-/* This file uses _GL_ATTRIBUTE_ALWAYS_INLINE, _GL_ATTRIBUTE_FORMAT,
-  _GL_ATTRIBUTE_MAYBE_UNUSED.  */
+/* This file uses _GL_ATTRIBUTE_ALWAYS_INLINE, _GL_ATTRIBUTE_COLD,
+   _GL_ATTRIBUTE_FORMAT, _GL_ATTRIBUTE_MAYBE_UNUSED.  */
 #if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
 
-/* Get 'unreachable'.  */
+/* Get va_list.  */
+#include <stdarg.h>
+
+/* Get 'gl_unreachable'.  */
 #include <stddef.h>
 
 /* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM.  */
@@ -54,11 +57,11 @@
    It evaluates its arguments only once.
    Test case: Compile copy-file.c with "gcc -Wimplicit-fallthrough".  */
 #if defined __GNUC__ || defined __clang__
-/* Use 'unreachable' to tell the compiler when the function call does not
+/* Use 'gl_unreachable' to tell the compiler when the function call does not
    return.  */
 # define __gl_error_call1(function, status, ...) \
     ((function) (status, __VA_ARGS__), \
-     (status) != 0 ? unreachable () : (void) 0)
+     (status) != 0 ? gl_unreachable () : (void) 0)
 /* If STATUS is a not a constant, the function call may or may not return;
    therefore -Wimplicit-fallthrough will produce a warning.  Use a compound
    statement in order to evaluate STATUS only once.
@@ -92,7 +95,8 @@ extern "C" {
 #  define error rpl_error
 # endif
 _GL_FUNCDECL_RPL (error, void,
-                  (int __status, int __errnum, const char *__format, ...)
+                  (int __status, int __errnum, const char *__format, ...),
+                  _GL_ATTRIBUTE_COLD
                   _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4)));
 _GL_CXXALIAS_RPL (error, void,
                   (int __status, int __errnum, const char *__format, ...));
@@ -104,7 +108,8 @@ _GL_CXXALIAS_RPL (error, void,
 #else
 # if ! @HAVE_ERROR@
 _GL_FUNCDECL_SYS (error, void,
-                  (int __status, int __errnum, const char *__format, ...)
+                  (int __status, int __errnum, const char *__format, ...),
+                  _GL_ATTRIBUTE_COLD
                   _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4)));
 # endif
 _GL_CXXALIAS_SYS (error, void,
@@ -117,7 +122,7 @@ _GL_CXXALIAS_SYS (error, void,
 #    pragma GCC diagnostic ignored "-Wattributes"
 _GL_ATTRIBUTE_MAYBE_UNUSED
 static void
-_GL_ATTRIBUTE_ALWAYS_INLINE
+_GL_ATTRIBUTE_ALWAYS_INLINE _GL_ATTRIBUTE_COLD
 _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))
 _gl_inline_error (int __status, int __errnum, const char *__format, ...)
 {
@@ -147,7 +152,8 @@ _GL_CXXALIASWARN (error);
 # endif
 _GL_FUNCDECL_RPL (error_at_line, void,
                   (int __status, int __errnum, const char *__filename,
-                   unsigned int __lineno, const char *__format, ...)
+                   unsigned int __lineno, const char *__format, ...),
+                  _GL_ATTRIBUTE_COLD
                   _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6)));
 _GL_CXXALIAS_RPL (error_at_line, void,
                   (int __status, int __errnum, const char *__filename,
@@ -161,7 +167,8 @@ _GL_CXXALIAS_RPL (error_at_line, void,
 # if ! @HAVE_ERROR_AT_LINE@
 _GL_FUNCDECL_SYS (error_at_line, void,
                   (int __status, int __errnum, const char *__filename,
-                   unsigned int __lineno, const char *__format, ...)
+                   unsigned int __lineno, const char *__format, ...),
+                  _GL_ATTRIBUTE_COLD
                   _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6)));
 # endif
 _GL_CXXALIAS_SYS (error_at_line, void,
@@ -175,7 +182,7 @@ _GL_CXXALIAS_SYS (error_at_line, void,
 #    pragma GCC diagnostic ignored "-Wattributes"
 _GL_ATTRIBUTE_MAYBE_UNUSED
 static void
-_GL_ATTRIBUTE_ALWAYS_INLINE
+_GL_ATTRIBUTE_ALWAYS_INLINE _GL_ATTRIBUTE_COLD
 _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6))
 _gl_inline_error_at_line (int __status, int __errnum, const char *__filename,
                           unsigned int __lineno, const char *__format, ...)
@@ -196,6 +203,44 @@ _gl_inline_error_at_line (int __status, int __errnum, const char *__filename,
 #endif
 _GL_CXXALIASWARN (error_at_line);
 
+/* Print a message with 'vfprintf (stderr, FORMAT, ARGS)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.
+   Use the globals error_print_progname and error_message_count similarly
+   to error().  */
+
+extern void verror (int __status, int __errnum, const char *__format,
+                    va_list __args)
+     _GL_ATTRIBUTE_COLD
+     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 0));
+#ifndef _GL_NO_INLINE_ERROR
+# ifndef verror
+#  define verror(status, ...) \
+     __gl_error_call (verror, status, __VA_ARGS__)
+#  define GNULIB_defined_verror 1
+# endif
+#endif
+
+/* Print a message with 'vfprintf (stderr, FORMAT, ARGS)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.
+   If FNAME is not NULL, prepend the message with "FNAME:LINENO:".
+   Use the globals error_print_progname, error_message_count, and
+   error_one_per_line similarly to error_at_line().  */
+
+extern void verror_at_line (int __status, int __errnum, const char *__fname,
+                            unsigned int __lineno, const char *__format,
+                            va_list __args)
+     _GL_ATTRIBUTE_COLD
+     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 5, 0));
+#ifdef _GL_NO_INLINE_ERROR
+# ifndef verror_at_line
+#  define verror_at_line(status, ...) \
+     __gl_error_call (verror_at_line, status, __VA_ARGS__)
+#  define GNULIB_defined_verror_at_line 1
+# endif
+#endif
+
 /* If NULL, error will flush stdout, then print on stderr the program
    name, a colon and a space.  Otherwise, error will call this
    function without parameters instead.  */
diff --git a/gl/exitfail.c b/gl/exitfail.c
index 8a5962e8..5b37c10b 100644
--- a/gl/exitfail.c
+++ b/gl/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002-2003, 2005-2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/exitfail.h b/gl/exitfail.h
index fa264b5c..9d6b1528 100644
--- a/gl/exitfail.h
+++ b/gl/exitfail.h
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/fcntl.c b/gl/fcntl.c
index 7cd3a0f9..ecb18e50 100644
--- a/gl/fcntl.c
+++ b/gl/fcntl.c
@@ -1,6 +1,6 @@
 /* Provide file descriptor control.
 
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -29,8 +29,7 @@
 #include <unistd.h>
 
 #ifdef __KLIBC__
-# define INCL_DOS
-# include <os2.h>
+# include <emx/io.h>
 #endif
 
 #if defined _WIN32 && ! defined __CYGWIN__
@@ -562,7 +561,8 @@ klibc_fcntl (int fd, int action, /* arg */...)
   if (result == -1 && (errno == EPERM || errno == ENOTSUP)
       && !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode))
     {
-      ULONG ulMode;
+      PLIBCFH pFH;
+      unsigned fFlags;
 
       switch (action)
         {
@@ -574,34 +574,41 @@ klibc_fcntl (int fd, int action, /* arg */...)
           result = dup2 (fd, arg);
           break;
 
-        /* Using underlying APIs is right ? */
         case F_GETFD:
-          if (DosQueryFHState (fd, &ulMode))
-            break;
+          pFH = __libc_FH (fd);
+          if (!pFH)
+            {
+              errno = EBADF;
+              break;
+            }
 
-          result = (ulMode & OPEN_FLAGS_NOINHERIT) ? FD_CLOEXEC : 0;
+          result = (pFH->fFlags & ((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT )
+                                   | O_NOINHERIT)) ? FD_CLOEXEC : 0;
           break;
 
         case F_SETFD:
           if (arg & ~FD_CLOEXEC)
             break;
 
-          if (DosQueryFHState (fd, &ulMode))
-            break;
+          pFH = __libc_FH (fd);
+          if (!pFH)
+            {
+              errno = EBADF;
+              break;
+            }
 
+          fFlags = pFH->fFlags;
           if (arg & FD_CLOEXEC)
-            ulMode |= OPEN_FLAGS_NOINHERIT;
+            fFlags |= (FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT;
           else
-            ulMode &= ~OPEN_FLAGS_NOINHERIT;
-
-          /* Filter supported flags.  */
-          ulMode &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR
-                     | OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT);
+            fFlags &= ~((FD_CLOEXEC << __LIBC_FH_FDFLAGS_SHIFT) | O_NOINHERIT);
 
-          if (DosSetFHState (fd, ulMode))
-            break;
-
-          result = 0;
+          result = __libc_FHSetFlags (pFH, fd, fFlags);
+          if (result < 0)
+            {
+              errno = -result;
+              result = -1;
+            }
           break;
 
         case F_GETFL:
diff --git a/gl/fcntl.in.h b/gl/fcntl.in.h
index eea3b954..c5068ed4 100644
--- a/gl/fcntl.in.h
+++ b/gl/fcntl.in.h
@@ -1,6 +1,6 @@
 /* Like <fcntl.h>, but with non-working flags defined to 0.
 
-   Copyright (C) 2006-2024 Free Software Foundation, Inc.
+   Copyright (C) 2006-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -22,8 +22,12 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined __need_system_fcntl_h
-/* Special invocation convention.  */
+#if defined __need_system_fcntl_h || defined _@GUARD_PREFIX@_ALREADY_INCLUDING_FCNTL_H
+/* Special invocation convention:
+   - On Haiku we have a sequence of nested includes
+       <fcntl.h> -> <unistd.h> -> <fcntl.h>
+     In this situation, GNULIB_defined_O_NONBLOCK gets defined before the
+     system's definition of O_NONBLOCK is processed.  */
 
 /* Needed before <sys/stat.h>.
    May also define off_t to a 64-bit type on native Windows.  */
@@ -50,8 +54,11 @@
 
 #ifndef _@GUARD_PREFIX@_FCNTL_H
 
+#define _@GUARD_PREFIX@_ALREADY_INCLUDING_FCNTL_H
+
 /* Needed before <sys/stat.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
+   May also define off_t to a 64-bit type on native Windows.
+   Also defines off64_t on macOS, NetBSD, OpenBSD, MSVC, Cygwin, Haiku.  */
 #include <sys/types.h>
 /* On some systems other than glibc, <sys/stat.h> is a prerequisite of
    <fcntl.h>.  On glibc systems, we would like to avoid namespace pollution.
@@ -71,6 +78,8 @@
 # include <io.h>
 #endif
 
+#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_FCNTL_H
+
 #ifndef _@GUARD_PREFIX@_FCNTL_H
 #define _@GUARD_PREFIX@_FCNTL_H
 
@@ -99,7 +108,7 @@
 #   undef creat
 #   define creat rpl_creat
 #  endif
-_GL_FUNCDECL_RPL (creat, int, (const char *filename, mode_t mode)
+_GL_FUNCDECL_RPL (creat, int, (const char *filename, mode_t mode),
                              _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (creat, int, (const char *filename, mode_t mode));
 # elif defined _WIN32 && !defined __CYGWIN__
@@ -140,14 +149,14 @@ _GL_CXXALIASWARN (creat);
 #   undef fcntl
 #   define fcntl rpl_fcntl
 #  endif
-_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...));
+_GL_FUNCDECL_RPL (fcntl, int, (int fd, int action, ...), );
 _GL_CXXALIAS_RPL (fcntl, int, (int fd, int action, ...));
 #  if !GNULIB_defined_rpl_fcntl
 #   define GNULIB_defined_rpl_fcntl 1
 #  endif
 # else
 #  if !@HAVE_FCNTL@
-_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...));
+_GL_FUNCDECL_SYS (fcntl, int, (int fd, int action, ...), );
 #   if !GNULIB_defined_fcntl
 #    define GNULIB_defined_fcntl 1
 #   endif
@@ -169,7 +178,7 @@ _GL_WARN_ON_USE (fcntl, "fcntl is not always POSIX compliant - "
 #   undef open
 #   define open rpl_open
 #  endif
-_GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...)
+_GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...),
                              _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
 # elif defined _WIN32 && !defined __CYGWIN__
@@ -200,7 +209,9 @@ _GL_WARN_ON_USE (open, "open is not always POSIX compliant - "
 #   undef open
 #   define open _open
 #  endif
-_GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...));
+/* Need to cast, because in MSVC the parameter list of _open as a C++ function
+   is (const char *, int, int = 0).  */
+_GL_CXXALIAS_MDA_CAST (open, int, (const char *filename, int flags, ...));
 # else
 _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
 # endif
@@ -216,14 +227,14 @@ _GL_CXXALIASWARN (open);
 #   define openat rpl_openat
 #  endif
 _GL_FUNCDECL_RPL (openat, int,
-                  (int fd, char const *file, int flags, /* mode_t mode */ ...)
+                  (int fd, char const *file, int flags, /* mode_t mode */ ...),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (openat, int,
                   (int fd, char const *file, int flags, /* mode_t mode */ ...));
 # else
 #  if !@HAVE_OPENAT@
 _GL_FUNCDECL_SYS (openat, int,
-                  (int fd, char const *file, int flags, /* mode_t mode */ ...)
+                  (int fd, char const *file, int flags, /* mode_t mode */ ...),
                   _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (openat, int,
@@ -304,7 +315,7 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
 #endif
 
 #ifndef O_DIRECTORY
-# define O_DIRECTORY 0
+# define O_DIRECTORY 0x20000000 /* Try to not collide with system O_* flags.  */
 #endif
 
 #ifndef O_DSYNC
@@ -368,8 +379,12 @@ _GL_WARN_ON_USE (openat, "openat is not portable - "
 # define O_RSYNC 0
 #endif
 
+#if defined O_SEARCH && defined O_PATH && O_SEARCH == O_PATH
+# undef O_SEARCH /* musl mistakenly #defines O_SEARCH to O_PATH.  */
+#endif
+
 #ifndef O_SEARCH
-# define O_SEARCH O_RDONLY /* This is often close enough in older systems.  */
+# define O_SEARCH O_RDONLY /* Often close enough in non-POSIX systems.  */
 #endif
 
 #ifndef O_SYNC
diff --git a/gl/fd-hook.c b/gl/fd-hook.c
index 75bbe49c..4a5014eb 100644
--- a/gl/fd-hook.c
+++ b/gl/fd-hook.c
@@ -1,5 +1,5 @@
 /* Hook for making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/fd-hook.h b/gl/fd-hook.h
index 2150460b..a960eaf3 100644
--- a/gl/fd-hook.h
+++ b/gl/fd-hook.h
@@ -1,5 +1,5 @@
 /* Hook for making file descriptor functions close(), ioctl() extensible.
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/fflush.c b/gl/fflush.c
index 36cc14d1..d8619082 100644
--- a/gl/fflush.c
+++ b/gl/fflush.c
@@ -1,5 +1,5 @@
 /* fflush.c -- allow flushing input streams
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -33,12 +33,15 @@
 
 #if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
 /* GNU libc, BeOS, Haiku, Linux libc5 */
+# if !defined __HAIKU__
+#  define fp_ fp
+# endif
 
 /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
 static void
 clear_ungetc_buffer_preserving_position (FILE *fp)
 {
-  if (fp->_flags & _IO_IN_BACKUP)
+  if (fp_->_flags & _IO_IN_BACKUP)
     /* _IO_free_backup_area is a bit complicated.  Simply call fseek.  */
     fseeko (fp, 0, SEEK_CUR);
 }
@@ -50,7 +53,7 @@ static void
 clear_ungetc_buffer (FILE *fp)
 {
 # if defined __sferror || defined __DragonFly__ || defined __ANDROID__
-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+  /* FreeBSD, NetBSD, OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
   if (HASUB (fp))
     {
       fp_->_p += fp_->_r;
@@ -75,7 +78,7 @@ clear_ungetc_buffer (FILE *fp)
 /* GNU libc, BeOS, Haiku, Linux libc5 */
 
 # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
-/* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+/* FreeBSD, NetBSD, OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
 
 static int
 disable_seek_optimization (FILE *fp)
@@ -98,7 +101,7 @@ update_fpos_cache (_GL_ATTRIBUTE_MAYBE_UNUSED FILE *fp,
                    _GL_ATTRIBUTE_MAYBE_UNUSED off_t pos)
 {
 #  if defined __sferror || defined __DragonFly__ || defined __ANDROID__
-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+  /* FreeBSD, NetBSD, OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
 #   if defined __CYGWIN__ || defined __ANDROID__
   /* fp_->_offset is typed as an integer.  */
   fp_->_offset = pos;
@@ -203,7 +206,7 @@ rpl_fflush (FILE *stream)
     }
 
 # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
-    /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+    /* FreeBSD, NetBSD, OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
 
     {
       /* Disable seek optimization for the next fseeko call.  This tells the
diff --git a/gl/filename.h b/gl/filename.h
index 4f0f0fbc..e353363e 100644
--- a/gl/filename.h
+++ b/gl/filename.h
@@ -1,5 +1,5 @@
 /* Basic filename support macros.
-   Copyright (C) 2001-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/float+.h b/gl/float+.h
index 104f477f..37381146 100644
--- a/gl/float+.h
+++ b/gl/float+.h
@@ -1,5 +1,5 @@
 /* Supplemental information about the floating-point formats.
-   Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2007.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/float.c b/gl/float.c
index a9ea40b0..780a0d1c 100644
--- a/gl/float.c
+++ b/gl/float.c
@@ -1,5 +1,5 @@
 /* Auxiliary definitions for <float.h>.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
@@ -20,14 +20,101 @@
 /* Specification.  */
 #include <float.h>
 
-#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
+#if GNULIB_defined_long_double_union
+# if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
 const union gl_long_double_union gl_LDBL_MAX =
-  { { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL } };
-#elif defined __i386__
+  { { DBL_MAX, DBL_MAX / 0x1p53 } };
+# elif defined __i386__
 const union gl_long_double_union gl_LDBL_MAX =
   { { 0xFFFFFFFF, 0xFFFFFFFF, 32766 } };
-#else
+# endif
+# if defined __i386__ && (defined __FreeBSD__ || defined __DragonFly__)
+/* We can't even simply evaluate the formula (LDBL_MIN / 9223372036854775808.0L)
+   at run time, because it would require BEGIN_LONG_DOUBLE_ROUNDING /
+   END_LONG_DOUBLE_ROUNDING invocations.  It simpler to just write down the
+   representation of LDBL_TRUE_MIN, based on
+   <https://en.wikipedia.org/wiki/Extended_precision#x86_extended_precision_format>.  */
+const union gl_long_double_union gl_LDBL_TRUE_MIN =
+  { { 0x00000001, 0x00000000, 0 } };
+# endif
+#endif
+
+#if GNULIB_defined_FLT_SNAN
+/* Define like memory_positive_SNaNf(), see signed-snan.h and snan.h,
+   or like setpayloadsigf() with an arbitrary payload.  */
+gl_FLT_SNAN_t gl_FLT_SNAN =
+# if FLT_MANT_DIG == 24
+#  if defined __hppa || (defined __mips__ && !MIPS_NAN2008_FLOAT) || defined __sh__
+  /* sign bit: 0, 8 exponent bits: all 1, next bit: 1, payload: 0b10...0 */
+  { { 0x7FE00000U } }
+#  else
+  /* sign bit: 0, 8 exponent bits: all 1, next bit: 0, payload: 0b10...0 */
+  { { 0x7FA00000U } }
+#  endif
+# endif
+  ;
+#endif
+
+#if GNULIB_defined_DBL_SNAN
+/* Define like memory_positive_SNaNd(), see signed-snan.h and snan.h,
+   or like setpayloadsig() with an arbitrary payload.  */
+gl_DBL_SNAN_t gl_DBL_SNAN =
+# if DBL_MANT_DIG == 53
+#  if defined __hppa || (defined __mips__ && !MIPS_NAN2008_FLOAT) || defined __sh__
+  /* sign bit: 0, 11 exponent bits: all 1, next bit: 1, payload: 0b10...0 */
+  { { 0x7FFC000000000000ULL } }
+#  else
+  /* sign bit: 0, 11 exponent bits: all 1, next bit: 0, payload: 0b10...0 */
+  { { 0x7FF4000000000000ULL } }
+#  endif
+# endif
+  ;
+#endif
+
+#if GNULIB_defined_LDBL_SNAN
+# ifdef WORDS_BIGENDIAN
+#  define TWO(hi,lo) { hi, lo }
+# else
+#  define TWO(hi,lo) { lo, hi }
+# endif
+/* Define like memory_positive_SNaNl(), see signed-snan.h and snan.h,
+   or like setpayloadsigl() with an arbitrary payload.  */
+gl_LDBL_SNAN_t gl_LDBL_SNAN =
+# if LDBL_MANT_DIG == 53 /* on arm, hppa, mips, sh, but also MSVC */
+#  if defined __hppa || (defined __mips__ && !MIPS_NAN2008_FLOAT) || defined __sh__
+  /* sign bit: 0, 11 exponent bits: all 1, next bit: 1, payload: 0b10...0 */
+  { { 0x7FFC000000000000ULL } }
+#  else
+  /* sign bit: 0, 11 exponent bits: all 1, next bit: 0, payload: 0b10...0 */
+  { { 0x7FF4000000000000ULL } }
+#  endif
+# elif LDBL_MANT_DIG == 64 /* on i386, x86_64, ia64, m68k */
+#  if defined __m68k__
+  /* sign bit: 0, 15 exponent bits: all 1, 16 gap bits: all 0,
+     always=1 bit: 1, next bit: 0, payload: 0b10...0 */
+  { { 0x7FFF0000ULL, 0xA0000000ULL, 0x00000000ULL } }
+#  else
+  /* sign bit: 0, 15 exponent bits: all 1, always=1 bit: 1, next bit: 0, payload: 0b10...0
+     (see <https://en.wikipedia.org/wiki/Extended_precision#x86_extended_precision_format>) */
+  { TWO (0x00007FFFULL, 0xA000000000000000ULL) }
+#  endif
+# elif LDBL_MANT_DIG == 106 /* on powerpc, powerpc64, powerpc64le */
+  /* most-significant double:
+     sign bit: 0, 11 exponent bits: all 1, next bit: 0, payload: 0b10...0,
+     least-significant double: 0.0 */
+  { { 0x7FF4000000000000ULL, 0ULL } }
+# elif LDBL_MANT_DIG == 113 /* on alpha, arm64, loongarch64, mips64, riscv64, s390x, sparc64 */
+#  if (defined __mips__ && !MIPS_NAN2008_FLOAT)
+  /* sign bit: 0, 15 exponent bits: all 1, next bit: 1, payload: 0b10...0 */
+  { TWO (0x7FFFC00000000000ULL, 0ULL) }
+#  else
+  /* sign bit: 0, 15 exponent bits: all 1, next bit: 0, payload: 0b10...0 */
+  { TWO (0x7FFF400000000000ULL, 0ULL) }
+#  endif
+# endif
+  ;
+#endif
+
 /* This declaration is solely to ensure that after preprocessing
    this file is never empty.  */
 typedef int dummy;
-#endif
diff --git a/gl/float.in.h b/gl/float.in.h
index 73e8d406..d75a06e7 100644
--- a/gl/float.in.h
+++ b/gl/float.in.h
@@ -1,6 +1,6 @@
 /* A correct <float.h>.
 
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -28,6 +28,8 @@
 #ifndef _@GUARD_PREFIX@_FLOAT_H
 #define _@GUARD_PREFIX@_FLOAT_H
 
+/* ============================ ISO C99 support ============================ */
+
 /* 'long double' properties.  */
 
 #if defined __i386__ && (defined __BEOS__ || defined __OpenBSD__)
@@ -111,44 +113,38 @@ extern const union gl_long_double_union gl_LDBL_MAX;
 # define LDBL_MAX_10_EXP 4932
 #endif
 
-/* On AIX 7.1 with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX are
-   wrong.
-   On Linux/PowerPC with gcc 4.4, the value of LDBL_MAX is wrong.  */
-#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__
+/* On PowerPC with gcc 15 when using __ibm128 long double, the value of
+   LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX, and LDBL_NORM_MAX are wrong.  */
+#if (defined _ARCH_PPC && LDBL_MANT_DIG == 106 \
+     && defined __GNUC__)
 # undef LDBL_MIN_EXP
 # define LDBL_MIN_EXP DBL_MIN_EXP
 # undef LDBL_MIN_10_EXP
 # define LDBL_MIN_10_EXP DBL_MIN_10_EXP
 # undef LDBL_MIN
 # define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
-#endif
-#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
 # undef LDBL_MAX
-/* LDBL_MAX is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xFFFFFFFF }.
-   It is not easy to define:
-     #define LDBL_MAX 1.79769313486231580793728971405302307166e308L
-   is too small, whereas
-     #define LDBL_MAX 1.79769313486231580793728971405302307167e308L
-   is too large.  Apparently a bug in GCC decimal-to-binary conversion.
-   Also, I can't get values larger than
-     #define LDBL63 ((long double) (1ULL << 63))
-     #define LDBL882 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL945 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL1008 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
-     #define LDBL_MAX (LDBL1008 * 65535.0L + LDBL945 * (long double) 9223372036821221375ULL + LDBL882 * (long double) 4611686018427387904ULL)
-   which is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xF8000000 }.
-   So, define it like this through a reference to an external variable
+/* LDBL_MAX is 2**1024 - 2**918, represented as: { 0x7FEFFFFF, 0xFFFFFFFF,
+                                                   0x7C9FFFFF, 0xFFFFFFFF }.
+
+   Do not write it as a constant expression, as GCC would likely treat
+   that as infinity due to the vagaries of this platform's funky arithmetic.
+   Instead, define it through a reference to an external variable.
+   Like the following, but using a union to avoid type mismatches:
 
-     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL };
+     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / 0x1p53 };
      extern const long double LDBL_MAX;
 
-   or through a pointer cast
+   The following alternative would not work as well when GCC is optimizing:
 
-     #define LDBL_MAX \
-       (*(const long double *) (double[]) { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL })
+     #define LDBL_MAX (*(long double const *) (double[])
+                       { DBL_MAX, DBL_MAX / 0x1p53 })
 
-   Unfortunately, this is not a constant expression, and the latter expression
-   does not work well when GCC is optimizing..  */
+   The following alternative would require GCC 6 or later:
+
+     #define LDBL_MAX __builtin_pack_longdouble (DBL_MAX, DBL_MAX / 0x1p53)
+
+   Unfortunately none of the alternatives are constant expressions.  */
 # if !GNULIB_defined_long_double_union
 union gl_long_double_union
   {
@@ -159,6 +155,8 @@ union gl_long_double_union
 # endif
 extern const union gl_long_double_union gl_LDBL_MAX;
 # define LDBL_MAX (gl_LDBL_MAX.ld)
+# undef LDBL_NORM_MAX
+# define LDBL_NORM_MAX LDBL_MAX
 #endif
 
 /* On IRIX 6.5, with cc, the value of LDBL_MANT_DIG is wrong.
@@ -179,6 +177,175 @@ extern const union gl_long_double_union gl_LDBL_MAX;
 # endif
 #endif
 
+/* On PowerPC platforms, 'long double' has a double-double representation.
+   Up to ISO C 17, this was outside the scope of ISO C because it can represent
+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits>, such as
+   1.0L + 4.94065645841246544176568792868221e-324L = 1 + 2^-1074; see
+   ISO C 17 § 5.2.4.2.2.(3).
+   In ISO C 23, wording has been included that makes this 'long double'
+   representation compliant; see ISO C 23 § 5.2.5.3.3.(8)-(9).  In this setting,
+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits> are
+   called "unnormalized".  And since LDBL_EPSILON must be normalized (per
+   ISO C 23 § 5.2.5.3.3.(33)), it must be 2^-105.  */
+#if defined __powerpc__ && LDBL_MANT_DIG == 106
+# undef LDBL_EPSILON
+# define LDBL_EPSILON 2.46519032881566189191165176650870696773e-32L /* 2^-105 */
+#endif
+
+/* ============================ ISO C11 support ============================ */
+
+/* 'float' properties */
+
+#ifndef FLT_HAS_SUBNORM
+# define FLT_HAS_SUBNORM 1
+#endif
+#ifndef FLT_DECIMAL_DIG
+/* FLT_MANT_DIG = 24 => FLT_DECIMAL_DIG = 9 */
+# define FLT_DECIMAL_DIG ((int)(FLT_MANT_DIG * 0.3010299956639812 + 2))
+#endif
+#if defined _AIX && !defined __GNUC__
+/* On AIX, the value of FLT_TRUE_MIN in /usr/include/float.h is a 'double',
+   not a 'float'.  */
+# undef FLT_TRUE_MIN
+#endif
+#ifndef FLT_TRUE_MIN
+/* FLT_MIN / 2^(FLT_MANT_DIG-1) */
+# define FLT_TRUE_MIN (FLT_MIN / 8388608.0f)
+#endif
+
+/* 'double' properties */
+
+#ifndef DBL_HAS_SUBNORM
+# define DBL_HAS_SUBNORM 1
+#endif
+#ifndef DBL_DECIMAL_DIG
+/* DBL_MANT_DIG = 53 => DBL_DECIMAL_DIG = 17 */
+# define DBL_DECIMAL_DIG ((int)(DBL_MANT_DIG * 0.3010299956639812 + 2))
+#endif
+#ifndef DBL_TRUE_MIN
+/* DBL_MIN / 2^(DBL_MANT_DIG-1) */
+# define DBL_TRUE_MIN (DBL_MIN / 4503599627370496.0)
+#endif
+
+/* 'long double' properties */
+
+#ifndef LDBL_HAS_SUBNORM
+# define LDBL_HAS_SUBNORM 1
+#endif
+#ifndef LDBL_DECIMAL_DIG
+/* LDBL_MANT_DIG = 53 => LDBL_DECIMAL_DIG = 17 */
+/* LDBL_MANT_DIG = 64 => LDBL_DECIMAL_DIG = 21 */
+/* LDBL_MANT_DIG = 106 => LDBL_DECIMAL_DIG = 33 */
+/* LDBL_MANT_DIG = 113 => LDBL_DECIMAL_DIG = 36 */
+# define LDBL_DECIMAL_DIG ((int)(LDBL_MANT_DIG * 0.3010299956639812 + 2))
+#endif
+#ifndef LDBL_TRUE_MIN
+/* LDBL_MIN / 2^(LDBL_MANT_DIG-1) */
+# if LDBL_MANT_DIG == 53
+#  define LDBL_TRUE_MIN (LDBL_MIN / 4503599627370496.0L)
+# elif LDBL_MANT_DIG == 64
+#  if defined __i386__ && (defined __FreeBSD__ || defined __DragonFly__)
+/* Work around FreeBSD/x86 problem mentioned above.  */
+extern const union gl_long_double_union gl_LDBL_TRUE_MIN;
+#   define LDBL_TRUE_MIN (gl_LDBL_TRUE_MIN.ld)
+#  else
+#   define LDBL_TRUE_MIN (LDBL_MIN / 9223372036854775808.0L)
+#  endif
+# elif LDBL_MANT_DIG == 106
+#  define LDBL_TRUE_MIN (LDBL_MIN / 40564819207303340847894502572032.0L)
+# elif LDBL_MANT_DIG == 113
+#  define LDBL_TRUE_MIN (LDBL_MIN / 5192296858534827628530496329220096.0L)
+# endif
+#endif
+
+/* ============================ ISO C23 support ============================ */
+
+/* 'float' properties */
+
+#ifndef FLT_IS_IEC_60559
+# if defined __m68k__
+#  define FLT_IS_IEC_60559 0
+# else
+#  define FLT_IS_IEC_60559 1
+# endif
+#endif
+#ifndef FLT_NORM_MAX
+# define FLT_NORM_MAX FLT_MAX
+#endif
+#ifndef FLT_SNAN
+/* For sh, beware of <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111814>.  */
+# if ((__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__) && !defined __sh__
+#  define FLT_SNAN __builtin_nansf ("")
+# else
+typedef union { unsigned int word[1]; float value; } gl_FLT_SNAN_t;
+extern gl_FLT_SNAN_t gl_FLT_SNAN;
+#  define FLT_SNAN (gl_FLT_SNAN.value)
+#  define GNULIB_defined_FLT_SNAN 1
+# endif
+#endif
+
+/* 'double' properties */
+
+#ifndef DBL_IS_IEC_60559
+# if defined __m68k__
+#  define DBL_IS_IEC_60559 0
+# else
+#  define DBL_IS_IEC_60559 1
+# endif
+#endif
+#ifndef DBL_NORM_MAX
+# define DBL_NORM_MAX DBL_MAX
+#endif
+#ifndef DBL_SNAN
+/* For sh, beware of <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111814>.  */
+# if ((__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__) && !defined __sh__
+#  define DBL_SNAN __builtin_nans ("")
+# else
+typedef union { unsigned long long word[1]; double value; } gl_DBL_SNAN_t;
+extern gl_DBL_SNAN_t gl_DBL_SNAN;
+#  define DBL_SNAN (gl_DBL_SNAN.value)
+#  define GNULIB_defined_DBL_SNAN 1
+# endif
+#endif
+
+/* 'long double' properties */
+
+#ifndef LDBL_IS_IEC_60559
+# if defined __m68k__
+#  define LDBL_IS_IEC_60559 0
+# elif LDBL_MANT_DIG == 53 || LDBL_MANT_DIG == 113
+#  define LDBL_IS_IEC_60559 1
+# else
+#  define LDBL_IS_IEC_60559 0
+# endif
+#endif
+#ifndef LDBL_NORM_MAX
+# ifdef __LDBL_NORM_MAX__
+#  define LDBL_NORM_MAX __LDBL_NORM_MAX__
+# else
+#  define LDBL_NORM_MAX LDBL_MAX
+# endif
+#endif
+#ifndef LDBL_SNAN
+/* For sh, beware of <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111814>.  */
+# if ((__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__) && !defined __sh__
+#  define LDBL_SNAN __builtin_nansl ("")
+# else
+#  if LDBL_MANT_DIG == 53
+typedef union { unsigned long long word[1]; long double value; } gl_LDBL_SNAN_t;
+#  elif defined __m68k__
+typedef union { unsigned int word[3]; long double value; } gl_LDBL_SNAN_t;
+#  else
+typedef union { unsigned long long word[2]; long double value; } gl_LDBL_SNAN_t;
+#  endif
+extern gl_LDBL_SNAN_t gl_LDBL_SNAN;
+#  define LDBL_SNAN (gl_LDBL_SNAN.value)
+#  define GNULIB_defined_LDBL_SNAN 1
+# endif
+#endif
+
+/* ================================= Other ================================= */
+
 #if @REPLACE_ITOLD@
 /* Pull in a function that fixes the 'int' to 'long double' conversion
    of glibc 2.7.  */
diff --git a/gl/floor.c b/gl/floor.c
index 392f2044..4d7fecae 100644
--- a/gl/floor.c
+++ b/gl/floor.c
@@ -1,5 +1,5 @@
 /* Round towards negative infinity.
-   Copyright (C) 2007, 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/floorf.c b/gl/floorf.c
index f9785d0c..d210c297 100644
--- a/gl/floorf.c
+++ b/gl/floorf.c
@@ -1,5 +1,5 @@
 /* Round towards negative infinity.
-   Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/fopen.c b/gl/fopen.c
index d3b57a98..41587d2c 100644
--- a/gl/fopen.c
+++ b/gl/fopen.c
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -19,12 +19,12 @@
 /* If the user's config.h happens to include <stdio.h>, let it include only
    the system's <stdio.h> here, so that orig_fopen doesn't recurse to
    rpl_fopen.  */
-#define _GL_ALREADY_INCLUDING_STDIO_H
+#define _GL_SKIP_GNULIB_STDIO_H
 #include <config.h>
 
 /* Get the original definition of fopen.  It might be defined as a macro.  */
 #include <stdio.h>
-#undef _GL_ALREADY_INCLUDING_STDIO_H
+#undef _GL_SKIP_GNULIB_STDIO_H
 
 static FILE *
 orig_fopen (const char *filename, const char *mode)
diff --git a/gl/fpurge.c b/gl/fpurge.c
index 52a3dcef..0b69da3f 100644
--- a/gl/fpurge.c
+++ b/gl/fpurge.c
@@ -1,5 +1,5 @@
 /* Flushing buffers of a FILE stream.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -37,7 +37,7 @@ fpurge (FILE *fp)
   /* The __fpurge function does not have a return value.  */
   return 0;
 
-#elif HAVE_FPURGE                   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin >= 1.7 */
+#elif HAVE_FPURGE                   /* FreeBSD, NetBSD, 2.0 <= OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin >= 1.7 */
 
   /* Call the system's fpurge function.  */
 # undef fpurge
@@ -46,7 +46,7 @@ fpurge (FILE *fp)
 # endif
   int result = fpurge (fp);
 # if defined __sferror || defined __DragonFly__ || defined __ANDROID__
-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+  /* FreeBSD, NetBSD, OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
   if (result == 0)
     /* Correct the invariants that fpurge broke.
        <stdio.h> on BSD systems says:
@@ -76,7 +76,7 @@ fpurge (FILE *fp)
     }
   return 0;
 # elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+  /* FreeBSD, NetBSD, OpenBSD < 2.0, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
   fp_->_p = fp_->_bf._base;
   fp_->_r = 0;
   fp_->_w = ((fp_->_flags & (__SLBF | __SNBF | __SRD)) == 0 /* fully buffered and not currently reading? */
diff --git a/gl/freading.c b/gl/freading.c
index c80d9aa8..6a60d6b3 100644
--- a/gl/freading.c
+++ b/gl/freading.c
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -25,6 +25,10 @@
    <https://sourceware.org/bugzilla/show_bug.cgi?id=4359>  */
 #if !(HAVE___FREADING && (!defined __GLIBC__ || defined __UCLIBC__ || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 7)))
 
+/* This code is not compiled on systems that have a working __freading function,
+   namely glibc >= 2.7, OpenBSD >= 7.6, Solaris >= 7, UnixWare >= 7.1.4.MP4,
+   Cygwin >= 1.7.34, Android API >= 28, musl libc, Haiku >= hrev58760.  */
+
 bool
 freading (FILE *fp)
 {
@@ -37,7 +41,7 @@ freading (FILE *fp)
           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
               && fp->_IO_read_base != NULL));
 # elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */
+  /* FreeBSD, NetBSD, OpenBSD < 7.6, DragonFly, Mac OS X, Cygwin < 1.7.34, Minix 3, Android */
   return (fp_->_flags & __SRD) != 0;
 # elif defined __EMX__               /* emx+gcc */
   return (fp->_flags & _IOREAD) != 0;
diff --git a/gl/freading.h b/gl/freading.h
index 943354f5..405a651e 100644
--- a/gl/freading.h
+++ b/gl/freading.h
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/free.c b/gl/free.c
index 2f0c40ba..98ceafd7 100644
--- a/gl/free.c
+++ b/gl/free.c
@@ -1,6 +1,6 @@
 /* Make free() preserve errno.
 
-   Copyright (C) 2003, 2006, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/fseek.c b/gl/fseek.c
index cebc1749..a5857650 100644
--- a/gl/fseek.c
+++ b/gl/fseek.c
@@ -1,5 +1,5 @@
 /* An fseek() function that, together with fflush(), is POSIX compliant.
-   Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/fseeko.c b/gl/fseeko.c
index 2c3b053a..ecd2f83a 100644
--- a/gl/fseeko.c
+++ b/gl/fseeko.c
@@ -1,5 +1,5 @@
 /* An fseeko() function that, together with fflush(), is POSIX compliant.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -48,12 +48,15 @@ fseeko (FILE *fp, off_t offset, int whence)
 
   /* These tests are based on fpurge.c.  */
 #if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+# if !defined __HAIKU__
+#  define fp_ fp
+# endif
   /* GNU libc, BeOS, Haiku, Linux libc5 */
-  if (fp->_IO_read_end == fp->_IO_read_ptr
-      && fp->_IO_write_ptr == fp->_IO_write_base
-      && fp->_IO_save_base == NULL)
+  if (fp_->_IO_read_end == fp_->_IO_read_ptr
+      && fp_->_IO_write_ptr == fp_->_IO_write_base
+      && fp_->_IO_save_base == NULL)
 #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-  /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+  /* FreeBSD, NetBSD, OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
 # if defined __SL64 && defined __SCLE /* Cygwin */
   if ((fp->_flags & __SL64) == 0)
     {
@@ -101,6 +104,9 @@ fseeko (FILE *fp, off_t offset, int whence)
 #elif defined EPLAN9                /* Plan9 */
   if (fp->rp == fp->buf
       && fp->wp == fp->buf)
+#elif defined __OpenBSD__ && !defined __sferror /* OpenBSD >= 7.8 */
+  /* fseeko and fflush work as advertised.  */
+  if (0)
 #elif FUNC_FFLUSH_STDIN < 0 && 200809 <= _POSIX_VERSION
   /* Cross-compiling to some other system advertising conformance to
      POSIX.1-2008 or later.  Assume fseeko and fflush work as advertised.
@@ -118,7 +124,7 @@ fseeko (FILE *fp, off_t offset, int whence)
       if (pos == -1)
         {
 #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
-          /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+          /* FreeBSD, NetBSD, OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
           fp_->_flags &= ~__SOFF;
 #endif
           return -1;
@@ -126,10 +132,10 @@ fseeko (FILE *fp, off_t offset, int whence)
 
 #if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
       /* GNU libc, BeOS, Haiku, Linux libc5 */
-      fp->_flags &= ~_IO_EOF_SEEN;
-      fp->_offset = pos;
+      fp_->_flags &= ~_IO_EOF_SEEN;
+      fp_->_offset = pos;
 #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-      /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+      /* FreeBSD, NetBSD, OpenBSD <= 7.7, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
 # if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix
       /* fp_->_offset is typed as an integer.  */
       fp_->_offset = pos;
diff --git a/gl/fseterr.c b/gl/fseterr.c
new file mode 100644
index 00000000..a01ef2af
--- /dev/null
+++ b/gl/fseterr.c
@@ -0,0 +1,84 @@
+/* Set the error indicator of a stream.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "fseterr.h"
+
+#include <errno.h>
+
+#include "stdio-impl.h"
+
+/* This file is not used on systems that have the __fseterr function,
+   namely OpenBSD >= 7.6, musl libc, Haiku >= hrev58760.  */
+
+void
+fseterr (FILE *fp)
+{
+  /* Most systems provide FILE as a struct and the necessary bitmask in
+     <stdio.h>, because they need it for implementing getc() and putc() as
+     fast macros.  */
+#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
+  /* GNU libc, BeOS, Haiku, Linux libc5 */
+  fp->_flags |= _IO_ERR_SEEN;
+#elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+  /* FreeBSD, NetBSD, OpenBSD < 7.6, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+  fp_->_flags |= __SERR;
+#elif defined __EMX__               /* emx+gcc */
+  fp->_flags |= _IOERR;
+#elif defined __minix               /* Minix */
+  fp->_flags |= _IOERR;
+#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, UnixWare, mingw, MSVC, NonStop Kernel, OpenVMS */
+  fp_->_flag |= _IOERR;
+#elif defined __UCLIBC__            /* uClibc */
+  fp->__modeflags |= __FLAG_ERROR;
+#elif defined __QNX__               /* QNX */
+  fp->_Mode |= 0x200 /* _MERR */;
+#elif defined __MINT__              /* Atari FreeMiNT */
+  fp->__error = 1;
+#elif defined EPLAN9                /* Plan9 */
+  if (fp->state != 0 /* CLOSED */)
+    fp->state = 5 /* ERR */;
+#elif 0                             /* unknown  */
+  /* Portable fallback, based on an idea by Rich Felker.
+     Wow! 6 system calls for something that is just a bit operation!
+     Not activated on any system, because there is no way to repair FP when
+     the sequence of system calls fails, and library code should not call
+     abort().  */
+  int saved_errno;
+  int fd;
+  int fd2;
+
+  saved_errno = errno;
+  fflush (fp);
+  fd = fileno (fp);
+  fd2 = dup (fd);
+  if (fd2 >= 0)
+    {
+      close (fd);
+      fputc ('\0', fp); /* This should set the error indicator.  */
+      fflush (fp);      /* Or this.  */
+      if (dup2 (fd2, fd) < 0)
+        /* Whee... we botched the stream and now cannot restore it!  */
+        abort ();
+      close (fd2);
+    }
+  errno = saved_errno;
+#else
+ #error "Please port gnulib fseterr.c to your platform! Look at the definitions of ferror and clearerr on your system, then report this to bug-gnulib."
+#endif
+}
diff --git a/gl/fseterr.h b/gl/fseterr.h
new file mode 100644
index 00000000..57c30ef3
--- /dev/null
+++ b/gl/fseterr.h
@@ -0,0 +1,55 @@
+/* Set the error indicator of a stream.
+   Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _FSETERR_H
+#define _FSETERR_H
+
+/* This file uses HAVE___FSETERR.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+#include <stdio.h>
+
+/* Set the error indicator of the stream FP.
+   The "error indicator" is set when an I/O operation on the stream fails, and
+   is cleared (together with the "end-of-file" indicator) by clearerr (FP).  */
+
+#if HAVE___FSETERR /* musl libc */
+
+/* Haiku has __fseterr but does not declare it.  */
+# if defined __HAIKU__
+extern void __fseterr (FILE *fp);
+# endif
+
+# include <stdio_ext.h>
+# define fseterr(fp) __fseterr (fp)
+
+#else
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+extern void fseterr (FILE *fp);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+#endif /* _FSETERR_H */
diff --git a/gl/fstat.c b/gl/fstat.c
index 205d5aab..200e672e 100644
--- a/gl/fstat.c
+++ b/gl/fstat.c
@@ -1,5 +1,5 @@
 /* fstat() replacement.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/fsusage.c b/gl/fsusage.c
index 97d0eef7..e26bda88 100644
--- a/gl/fsusage.c
+++ b/gl/fsusage.c
@@ -1,6 +1,6 @@
 /* fsusage.c -- return space usage of mounted file systems
 
-   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2024 Free Software
+   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/fsusage.h b/gl/fsusage.h
index da878590..00d9067e 100644
--- a/gl/fsusage.h
+++ b/gl/fsusage.h
@@ -1,6 +1,6 @@
 /* fsusage.h -- declarations for file system space usage info
 
-   Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2024 Free Software
+   Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/ftell.c b/gl/ftell.c
index 21cab439..96648d5a 100644
--- a/gl/ftell.c
+++ b/gl/ftell.c
@@ -1,5 +1,5 @@
 /* An ftell() function that works around platform bugs.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/ftello.c b/gl/ftello.c
index 64119aab..b0a20bf3 100644
--- a/gl/ftello.c
+++ b/gl/ftello.c
@@ -1,5 +1,5 @@
 /* An ftello() function that works around platform bugs.
-   Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,7 +20,7 @@
 #include <stdio.h>
 
 #include <errno.h>
-#include "intprops.h"
+#include <stdckdint.h>
 
 /* Get lseek.  */
 #include <unistd.h>
@@ -34,7 +34,10 @@ ftello (FILE *fp)
 # undef ftell
 # define ftello ftell
 #endif
-#if _GL_WINDOWS_64_BIT_OFF_T
+#if (defined _WIN32 && !defined __CYGWIN__) \
+    /* We need to test _FILE_OFFSET_BITS for mingw-w64 */   \
+    /* and _GL_WINDOWS_64_BIT_OFF_T for MSVC.  */           \
+    && (_FILE_OFFSET_BITS == 64 || _GL_WINDOWS_64_BIT_OFF_T)
 # undef ftello
 # if HAVE__FTELLI64 /* msvc, mingw64 */
 #  define ftello _ftelli64
@@ -97,7 +100,7 @@ ftello (FILE *fp)
 
       /* Compute pos + buffered, with overflow check.  */
       off_t sum;
-      if (! INT_ADD_OK (pos, buffered, &sum))
+      if (ckd_add (&sum, pos, buffered))
         {
           errno = EOVERFLOW;
           return -1;
diff --git a/gl/gai_strerror.c b/gl/gai_strerror.c
index 37092e29..9c5f1419 100644
--- a/gl/gai_strerror.c
+++ b/gl/gai_strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2024 Free Software
+/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2025 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Philip Blundell <pjb27@cam.ac.uk>, 1997.
@@ -27,8 +27,8 @@
 # include <libintl.h>
 #else
 # include "gettext.h"
-# define _(String) gettext (String)
-# define N_(String) String
+# define _(msgid) dgettext ("gnulib", msgid)
+# define N_(msgid) msgid
 #endif
 
 #if HAVE_DECL_GAI_STRERROR
diff --git a/gl/getaddrinfo.c b/gl/getaddrinfo.c
index bf5d61f3..a8c45c21 100644
--- a/gl/getaddrinfo.c
+++ b/gl/getaddrinfo.c
@@ -1,5 +1,5 @@
 /* Get address information (partial implementation).
-   Copyright (C) 1997, 2001-2002, 2004-2024 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2002, 2004-2025 Free Software Foundation, Inc.
    Contributed by Simon Josefsson <simon@josefsson.org>.
 
    This file is free software: you can redistribute it and/or modify
@@ -40,8 +40,8 @@
 #include <stdio.h>
 
 #include "gettext.h"
-#define _(String) gettext (String)
-#define N_(String) String
+#define _(msgid) dgettext ("gnulib", msgid)
+#define N_(msgid) msgid
 
 /* BeOS has AF_INET, but not PF_INET.  */
 #ifndef PF_INET
@@ -54,7 +54,7 @@
 
 #if HAVE_GETADDRINFO
 
-/* Override with cdecl calling convention.  */
+/* Override with cdecl calling convention and mingw fix.  */
 
 int
 getaddrinfo (const char *restrict nodename,
@@ -63,6 +63,10 @@ getaddrinfo (const char *restrict nodename,
              struct addrinfo **restrict res)
 # undef getaddrinfo
 {
+  if (hints && (hints->ai_flags & AI_NUMERICSERV) != 0
+      && servname && !(*servname >= '0' && *servname <= '9'))
+    return EAI_NONAME;
+
   return getaddrinfo (nodename, servname, hints, res);
 }
 
@@ -169,16 +173,43 @@ validate_family (int family)
 {
   /* FIXME: Support more families. */
 # if HAVE_IPV4
-     if (family == PF_INET)
-       return true;
+   if (family == PF_INET)
+     return true;
 # endif
 # if HAVE_IPV6
-     if (family == PF_INET6)
-       return true;
+   if (family == PF_INET6)
+     return true;
 # endif
-     if (family == PF_UNSPEC)
-       return true;
-     return false;
+   if (family == PF_UNSPEC)
+     return true;
+   return false;
+}
+
+static bool
+is_numeric_host (const char *host, int family)
+{
+# if HAVE_IPV4
+  if (family == PF_INET || family == PF_UNSPEC)
+    {
+      /* glibc supports IPv4 addresses in numbers-and-dots notation, that is,
+         also hexadecimal and octal number formats and formats that don't
+         require all four bytes to be explicitly written, via inet_aton().
+         But POSIX doesn't require support for these legacy formats.  Therefore
+         we are free to use inet_pton() instead of inet_aton().  */
+      struct in_addr addr;
+      if (inet_pton (AF_INET, host, &addr))
+        return true;
+    }
+# endif
+# if HAVE_IPV6
+  if (family == PF_INET6 || family == PF_UNSPEC)
+    {
+      struct in6_addr addr;
+      if (inet_pton (AF_INET6, host, &addr))
+        return true;
+    }
+# endif
+  return false;
 }
 
 /* Translate name of a service location and/or a service name to set of
@@ -210,10 +241,17 @@ getaddrinfo (const char *restrict nodename,
 
 # ifdef WINDOWS_NATIVE
   if (use_win32_p ())
-    return getaddrinfo_ptr (nodename, servname, hints, res);
+    {
+      if (hints && (hints->ai_flags & AI_NUMERICSERV) != 0
+          && servname && !(*servname >= '0' && *servname <= '9'))
+        return EAI_NONAME;
+      return getaddrinfo_ptr (nodename, servname, hints, res);
+    }
 # endif
 
-  if (hints && (hints->ai_flags & ~(AI_CANONNAME|AI_PASSIVE)))
+  if (hints
+      && (hints->ai_flags
+          & ~(AI_CANONNAME | AI_PASSIVE | AI_NUMERICHOST | AI_NUMERICSERV)))
     /* FIXME: Support more flags. */
     return EAI_BADFLAGS;
 
@@ -225,12 +263,18 @@ getaddrinfo (const char *restrict nodename,
     /* FIXME: Support other socktype. */
     return EAI_SOCKTYPE; /* FIXME: Better return code? */
 
-  if (!nodename)
+  if (nodename != NULL)
+    {
+      if (hints && (hints->ai_flags & AI_NUMERICHOST) != 0
+          && !is_numeric_host (nodename, hints->ai_family))
+        return EAI_NONAME;
+    }
+  else
     {
       if (!(hints->ai_flags & AI_PASSIVE))
         return EAI_NONAME;
 
-# ifdef HAVE_IPV6
+# if HAVE_IPV6
       nodename = (hints->ai_family == AF_INET6) ? "::" : "0.0.0.0";
 # else
       nodename = "0.0.0.0";
diff --git a/gl/getdelim.c b/gl/getdelim.c
index 58063b15..2576d376 100644
--- a/gl/getdelim.c
+++ b/gl/getdelim.c
@@ -1,5 +1,5 @@
 /* getdelim.c --- Implementation of replacement getdelim function.
-   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2024 Free Software
+   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/getdtablesize.c b/gl/getdtablesize.c
index 762c100b..b98fbb70 100644
--- a/gl/getdtablesize.c
+++ b/gl/getdtablesize.c
@@ -1,5 +1,5 @@
 /* getdtablesize() function: Return maximum possible file descriptor value + 1.
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/gethostname.c b/gl/gethostname.c
index c075b6df..8f0ceafc 100644
--- a/gl/gethostname.c
+++ b/gl/gethostname.c
@@ -1,6 +1,6 @@
 /* gethostname emulation for SysV and POSIX.1.
 
-   Copyright (C) 1992, 2003, 2006, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2003, 2006, 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/getline.c b/gl/getline.c
index 2d03b646..0921dd95 100644
--- a/gl/getline.c
+++ b/gl/getline.c
@@ -1,5 +1,5 @@
 /* getline.c --- Implementation of replacement getline function.
-   Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/getloadavg.c b/gl/getloadavg.c
index c940e4c7..752ec1f5 100644
--- a/gl/getloadavg.c
+++ b/gl/getloadavg.c
@@ -1,6 +1,6 @@
 /* Get the system load averages.
 
-   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2024 Free Software
+   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2025 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
@@ -47,8 +47,6 @@
    N_NAME_POINTER               The nlist n_name element is a pointer,
                                 not an array.
    HAVE_STRUCT_NLIST_N_UN_N_NAME 'n_un.n_name' is member of 'struct nlist'.
-   LINUX_LDAV_FILE              [__linux__, __ANDROID__, __CYGWIN__]: File
-                                containing load averages.
 
    Specific system predefines this file uses, aside from setting
    default values if not emacs:
@@ -65,8 +63,7 @@
    UMAX4_3
    VMS
    _WIN32                       Native Windows (possibly also defined on Cygwin)
-   __linux__, __ANDROID__       Linux: assumes /proc file system mounted.
-                                Support from Michael K. Johnson.
+   __linux__, __ANDROID__       Linux: assumes sysinfo() call.
    __CYGWIN__                   Cygwin emulates linux /proc/loadavg.
    __NetBSD__                   NetBSD: assumes /kern file system mounted.
 
@@ -108,10 +105,10 @@
 # endif
 
 /* Same issues as for NeXT apply to the HURD-based GNU system.  */
-# ifdef __GNU__
+# if defined __gnu_hurd__ || defined NeXT
 #  undef BSD
 #  undef FSCALE
-# endif /* __GNU__ */
+# endif /* __gnu_hurd__ || NeXT */
 
 /* Set values that are different from the defaults, which are
    set a little farther down with #ifndef.  */
@@ -143,7 +140,7 @@
 #  define SUNOS_5
 # endif
 
-# if defined (__osf__) && (defined (__alpha) || defined (__alpha__))
+# if defined (__osf__) && defined (__alpha)
 #  define OSF_ALPHA
 #  include <sys/mbuf.h>
 #  include <sys/socket.h>
@@ -312,8 +309,7 @@
 #  endif
 # endif
 
-# if defined (__GNU__) && !defined (NeXT)
-/* Note that NeXT Openstep defines __GNU__ even though it should not.  */
+# if defined __gnu_hurd__ && !defined NeXT
 /* GNU system acts much like NeXT, for load average purposes,
    but not exactly.  */
 #  define NeXT
@@ -358,6 +354,11 @@
 #  include <sys/dg_sys_info.h>
 # endif
 
+# if defined __linux__ || defined __ANDROID__
+#  include <sys/param.h>
+#  include <sys/sysinfo.h>
+# endif
+
 # if (defined __linux__ || defined __ANDROID__ \
       || defined __CYGWIN__ || defined SUNOS_5 \
       || (defined LOAD_AVE_TYPE && ! defined __VMS))
@@ -498,20 +499,33 @@ getloadavg (double loadavg[], int nelem)
   }
 # endif
 
-# if !defined (LDAV_DONE) && (defined __linux__ || defined __ANDROID__ || defined __CYGWIN__)
-                                      /* Linux without glibc, Android, Cygwin */
+# if (!defined LDAV_DONE \
+      && (defined __ANDROID__ ? 13 <= __ANDROID_API__ : defined __linux__))
+                    /* non-Android Linux without glibc, Android 3.2+, Cygwin */
 #  define LDAV_DONE
 #  undef LOAD_AVE_TYPE
 
-#  ifndef LINUX_LDAV_FILE
-#   define LINUX_LDAV_FILE "/proc/loadavg"
-#  endif
+  {
+    struct sysinfo info;
+    if (sysinfo (&info) < 0)
+      return -1;
+    loadavg[0] = info.loads[0] / (double)(1U << SI_LOAD_SHIFT);
+    loadavg[1] = info.loads[1] / (double)(1U << SI_LOAD_SHIFT);
+    loadavg[2] = info.loads[2] / (double)(1U << SI_LOAD_SHIFT);
+    elem = 3;
+  }
+# endif /* __ANDROID__ ? 13 <= __ANDROID_API__ : __linux__ */
+
+# if !defined (LDAV_DONE) && defined __CYGWIN__
+                                      /* Cygwin */
+#  define LDAV_DONE
+#  undef LOAD_AVE_TYPE
 
   char ldavgbuf[3 * (INT_STRLEN_BOUND (int) + sizeof ".00 ")];
   char const *ptr = ldavgbuf;
   int fd, count, saved_errno;
 
-  fd = open (LINUX_LDAV_FILE, O_RDONLY | O_CLOEXEC);
+  fd = open ("/proc/loadavg", O_RDONLY | O_CLOEXEC);
   if (fd == -1)
     return -1;
   count = read (fd, ldavgbuf, sizeof ldavgbuf - 1);
@@ -554,7 +568,7 @@ getloadavg (double loadavg[], int nelem)
 
   return elem;
 
-# endif /* __linux__ || __ANDROID__ || __CYGWIN__ */
+# endif /* __CYGWIN__ */
 
 # if !defined (LDAV_DONE) && defined (__NetBSD__)          /* NetBSD < 0.9 */
 #  define LDAV_DONE
diff --git a/gl/getopt-cdefs.in.h b/gl/getopt-cdefs.in.h
index a1d304d4..3a5d06be 100644
--- a/gl/getopt-cdefs.in.h
+++ b/gl/getopt-cdefs.in.h
@@ -1,5 +1,5 @@
 /* getopt-on-non-glibc compatibility macros.
-   Copyright (C) 1989-2024 Free Software Foundation, Inc.
+   Copyright (C) 1989-2025 Free Software Foundation, Inc.
    This file is part of gnulib.
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
@@ -46,10 +46,14 @@
 # endif
 #endif
 
+#if defined __clang__
+  /* clang really only groks GNU C 4.2, regardless of its value of __GNUC__.  */
+# undef __GNUC_PREREQ
+# define __GNUC_PREREQ(maj, min) ((maj) < 4 + ((min) <= 2))
+#endif
 #ifndef __GNUC_PREREQ
-# if defined __GNUC__ && defined __GNUC_VERSION__
-# define __GNUC_PREREQ(maj, min) \
-        ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
+# if defined __GNUC__ && defined __GNUC_MINOR__
+#  define __GNUC_PREREQ(maj, min) ((maj) < __GNUC__ + ((min) <= __GNUC_MINOR__))
 # else
 #  define __GNUC_PREREQ(maj, min) 0
 # endif
diff --git a/gl/getopt-core.h b/gl/getopt-core.h
index 12d09a25..51ac213d 100644
--- a/gl/getopt-core.h
+++ b/gl/getopt-core.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt (basic, portable features only).
-   Copyright (C) 1989-2024 Free Software Foundation, Inc.
+   Copyright (C) 1989-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff --git a/gl/getopt-ext.h b/gl/getopt-ext.h
index e4b499d4..92b66a3b 100644
--- a/gl/getopt-ext.h
+++ b/gl/getopt-ext.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt (GNU extensions).
-   Copyright (C) 1989-2024 Free Software Foundation, Inc.
+   Copyright (C) 1989-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff --git a/gl/getopt-pfx-core.h b/gl/getopt-pfx-core.h
index 78b7816a..7c5ea094 100644
--- a/gl/getopt-pfx-core.h
+++ b/gl/getopt-pfx-core.h
@@ -1,5 +1,5 @@
 /* getopt (basic, portable features) gnulib wrapper header.
-   Copyright (C) 1989-2024 Free Software Foundation, Inc.
+   Copyright (C) 1989-2025 Free Software Foundation, Inc.
    This file is part of gnulib.
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
@@ -31,6 +31,16 @@
    functions and variables.  Renaming avoids problems with some
    compilers and linkers.  */
 #ifdef __GETOPT_PREFIX
+
+/* Include platform-dependent header files that may declare getopt() and
+   friends.  */
+# if defined _AIX || defined __hpux || defined __sun || defined __QNX__
+#  include <stdio.h>
+# endif
+# if defined MUSL_LIBC || (defined __FreeBSD__ || defined __DragonFly__) || defined __NetBSD__ || defined __OpenBSD__ || (defined __APPLE__ && defined __MACH__) || defined _AIX || defined __sun || defined __minix || defined __HAIKU__
+#  include <unistd.h>
+# endif
+
 # ifndef __GETOPT_ID
 #  define __GETOPT_CONCAT(x, y) x ## y
 #  define __GETOPT_XCONCAT(x, y) __GETOPT_CONCAT (x, y)
diff --git a/gl/getopt-pfx-ext.h b/gl/getopt-pfx-ext.h
index f001c11e..a61c68c7 100644
--- a/gl/getopt-pfx-ext.h
+++ b/gl/getopt-pfx-ext.h
@@ -1,5 +1,5 @@
 /* getopt (GNU extensions) gnulib wrapper header.
-   Copyright (C) 1989-2024 Free Software Foundation, Inc.
+   Copyright (C) 1989-2025 Free Software Foundation, Inc.
    This file is part of gnulib.
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library.
@@ -38,11 +38,9 @@
 # endif
 # undef getopt_long
 # undef getopt_long_only
-# undef option
 # undef _getopt_internal
 # define getopt_long __GETOPT_ID (getopt_long)
 # define getopt_long_only __GETOPT_ID (getopt_long_only)
-# define option __GETOPT_ID (option)
 # define _getopt_internal __GETOPT_ID (getopt_internal)
 
 /* The system's getopt.h may have already included getopt-ext.h to
diff --git a/gl/getopt.c b/gl/getopt.c
index f66f119e..6b155e6c 100644
--- a/gl/getopt.c
+++ b/gl/getopt.c
@@ -1,5 +1,5 @@
 /* Getopt for GNU.
-   Copyright (C) 1987-2024 Free Software Foundation, Inc.
+   Copyright (C) 1987-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
@@ -42,7 +42,7 @@
 # define funlockfile(fp) _IO_funlockfile (fp)
 #else
 # include "gettext.h"
-# define _(msgid) gettext (msgid)
+# define _(msgid) dgettext ("gnulib", msgid)
 /* When used standalone, flockfile and funlockfile might not be
    available.  */
 # if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \
@@ -723,7 +723,7 @@ _getopt_internal (int argc, char **argv, const char *optstring,
   return result;
 }
 
-/* glibc gets a LSB-compliant getopt and a POSIX-complaint __posix_getopt.
+/* glibc gets a LSB-compliant getopt and a POSIX-compliant __posix_getopt.
    Standalone applications just get a POSIX-compliant getopt.
    POSIX and LSB both require these functions to take 'char *const *argv'
    even though this is incorrect (because of the permutation).  */
@@ -732,7 +732,7 @@ _getopt_internal (int argc, char **argv, const char *optstring,
   NAME (int argc, char *const *argv, const char *optstring)     \
   {                                                             \
     return _getopt_internal (argc, (char **)argv, optstring,    \
-                             0, 0, 0, POSIXLY_CORRECT);         \
+                             NULL, NULL, 0, POSIXLY_CORRECT);   \
   }
 
 #ifdef _LIBC
diff --git a/gl/getopt.in.h b/gl/getopt.in.h
index c2411a75..4a87a2d5 100644
--- a/gl/getopt.in.h
+++ b/gl/getopt.in.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-2024 Free Software Foundation, Inc.
+   Copyright (C) 1989-2025 Free Software Foundation, Inc.
    This file is part of gnulib.
    Unlike most of the getopt implementation, it is NOT shared
    with the GNU C Library, which supplies a different version of
@@ -30,7 +30,12 @@
    <getopt.h>; our definitions will be present soon enough.  */
 #if @HAVE_GETOPT_H@
 # define _GL_SYSTEM_GETOPT
+/* Rename the system's 'struct option' to 'struct sys_option',
+   so that we don't have to rename ours to 'struct rpl_option'
+   (which would cause significant trouble in C++ mode).  */
+# define option sys_option
 # @INCLUDE_NEXT@ @NEXT_GETOPT_H@
+# undef option
 # undef _GL_SYSTEM_GETOPT
 #endif
 
diff --git a/gl/getopt1.c b/gl/getopt1.c
index c42d29f8..c8566845 100644
--- a/gl/getopt1.c
+++ b/gl/getopt1.c
@@ -1,5 +1,5 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
-   Copyright (C) 1987-2024 Free Software Foundation, Inc.
+   Copyright (C) 1987-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff --git a/gl/getopt_int.h b/gl/getopt_int.h
index c00c0b69..94c1945c 100644
--- a/gl/getopt_int.h
+++ b/gl/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-2024 Free Software Foundation, Inc.
+   Copyright (C) 1989-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library and is also part of gnulib.
    Patches to this file should be submitted to both projects.
 
diff --git a/gl/getprogname.c b/gl/getprogname.c
index 392a9a2f..4fe7c90d 100644
--- a/gl/getprogname.c
+++ b/gl/getprogname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2016-2024 Free Software Foundation, Inc.
+   Copyright (C) 2016-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gl/getprogname.h b/gl/getprogname.h
index bee1c1a2..ee9bb286 100644
--- a/gl/getprogname.h
+++ b/gl/getprogname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2016-2024 Free Software Foundation, Inc.
+   Copyright (C) 2016-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
diff --git a/gl/gettext.h b/gl/gettext.h
index 39d5ae4d..0650abc9 100644
--- a/gl/gettext.h
+++ b/gl/gettext.h
@@ -1,6 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2024 Free Software
-   Foundation, Inc.
+   Copyright (C) 1995-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -18,6 +17,7 @@
 #ifndef _LIBGETTEXT_H
 #define _LIBGETTEXT_H 1
 
+
 /* NLS can be disabled through the configure --disable-nls option
    or through "#define ENABLE NLS 0" before including this file.  */
 #if defined ENABLE_NLS && ENABLE_NLS
@@ -45,32 +45,90 @@
    as well because people using "gettext.h" will not include <libintl.h>,
    and also including <libintl.h> would fail on SunOS 4, whereas <locale.h>
    is OK.  */
-#if defined(__sun)
-# include <locale.h>
-#endif
+# if defined(__sun)
+#  include <locale.h>
+# endif
 
 /* Many header files from the libstdc++ coming with g++ 3.3 or newer include
    <libintl.h>, which chokes if dcgettext is defined as a macro.  So include
    it now, to make later inclusions of <libintl.h> a NOP.  */
-#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
-# include <cstdlib>
-# if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
-#  include <libintl.h>
+# if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3)
+#  include <cstdlib>
+#  if (__GLIBC__ >= 2 && !defined __UCLIBC__) || _GLIBCXX_HAVE_LIBINTL_H
+#   include <libintl.h>
+#  endif
 # endif
-#endif
 
-/* Disabled NLS.
-   The casts to 'const char *' serve the purpose of producing warnings
-   for invalid uses of the value returned from these functions.
-   On pre-ANSI systems without 'const', the config.h file is supposed to
-   contain "#define const".  */
-# undef gettext
-# define gettext(Msgid) ((const char *) (Msgid))
-# undef dgettext
-# define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
-# undef dcgettext
-# define dcgettext(Domainname, Msgid, Category) \
-    ((void) (Category), dgettext (Domainname, Msgid))
+/* Disabled NLS.  */
+# if defined __GNUC__ && !defined __clang__ && !defined __cplusplus
+/* Use inline functions, to avoid warnings
+     warning: format not a string literal and no format arguments
+   that don't occur with enabled NLS.  */
+/* The return type 'const char *' serves the purpose of producing warnings
+   for invalid uses of the value returned from these functions.  */
+#  if __GNUC__ >= 9
+#   pragma GCC diagnostic push
+#   pragma GCC diagnostic ignored "-Wbuiltin-declaration-mismatch"
+#  endif
+#  if __GNUC__ + (__GNUC_MINOR__ >= 2) > 4
+__attribute__ ((__always_inline__, __gnu_inline__))
+#  else
+__attribute__ ((__always_inline__))
+#  endif
+extern inline
+#  if !defined(__sun)
+const
+#  endif
+char *
+gettext (const char *msgid)
+{
+  return msgid;
+}
+#  if __GNUC__ + (__GNUC_MINOR__ >= 2) > 4
+__attribute__ ((__always_inline__, __gnu_inline__))
+#  else
+__attribute__ ((__always_inline__))
+#  endif
+extern inline
+#  if !defined(__sun)
+const
+#  endif
+char *
+dgettext (const char *domain, const char *msgid)
+{
+  (void) domain;
+  return msgid;
+}
+#  if __GNUC__ + (__GNUC_MINOR__ >= 2) > 4
+__attribute__ ((__always_inline__, __gnu_inline__))
+#  else
+__attribute__ ((__always_inline__))
+#  endif
+extern inline
+#  if !defined(__sun)
+const
+#  endif
+char *
+dcgettext (const char *domain, const char *msgid, int category)
+{
+  (void) domain;
+  (void) category;
+  return msgid;
+}
+#  if __GNUC__ >= 9
+#   pragma GCC diagnostic pop
+#  endif
+# else
+/* The casts to 'const char *' serve the purpose of producing warnings
+   for invalid uses of the value returned from these functions.  */
+#  undef gettext
+#  define gettext(Msgid) ((const char *) (Msgid))
+#  undef dgettext
+#  define dgettext(Domainname, Msgid) ((void) (Domainname), gettext (Msgid))
+#  undef dcgettext
+#  define dcgettext(Domainname, Msgid, Category) \
+     ((void) (Category), dgettext (Domainname, Msgid))
+# endif
 # undef ngettext
 # define ngettext(Msgid1, Msgid2, N) \
     ((N) == 1 \
@@ -93,12 +151,14 @@
 
 #endif
 
+
 /* Prefer gnulib's setlocale override over libintl's setlocale override.  */
 #ifdef GNULIB_defined_setlocale
 # undef setlocale
 # define setlocale rpl_setlocale
 #endif
 
+
 /* A pseudo function call that serves as a marker for the automated
    extraction of messages, but does not call gettext().  The run-time
    translation is done at a different place in the code.
@@ -108,6 +168,7 @@
    initializer for static 'char[]' or 'const char[]' variables.  */
 #define gettext_noop(String) String
 
+
 /* The separator between msgctxt and msgid in a .mo file.  */
 #define GETTEXT_CONTEXT_GLUE "\004"
 
@@ -115,6 +176,9 @@
    MSGID.  MSGCTXT and MSGID must be string literals.  MSGCTXT should be
    short and rarely need to change.
    The letter 'p' stands for 'particular' or 'special'.  */
+
+#include <locale.h> /* for LC_MESSAGES */
+
 #ifdef DEFAULT_TEXT_DOMAIN
 # define pgettext(Msgctxt, Msgid) \
    pgettext_aux (DEFAULT_TEXT_DOMAIN, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES)
@@ -178,11 +242,12 @@ npgettext_aux (const char *domain,
     return translation;
 }
 
+
 /* The same thing extended for non-constant arguments.  Here MSGCTXT and MSGID
    can be arbitrary expressions.  But for string literals these macros are
    less efficient than those above.  */
 
-#include <string.h>
+#include <string.h> /* for memcpy */
 
 /* GNULIB_NO_VLA can be defined to disable use of VLAs even if supported.
    This relates to the -Wvla and -Wvla-larger-than warnings, enabled in
@@ -199,7 +264,7 @@ npgettext_aux (const char *domain,
 #endif
 
 #if !_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS
-#include <stdlib.h>
+# include <stdlib.h> /* for malloc, free */
 #endif
 
 #define pgettext_expr(Msgctxt, Msgid) \
@@ -297,4 +362,5 @@ dcnpgettext_expr (const char *domain,
   return (n == 1 ? msgid : msgid_plural);
 }
 
+
 #endif /* _LIBGETTEXT_H */
diff --git a/gl/gl_openssl.h b/gl/gl_openssl.h
index 06864732..dea70c1c 100644
--- a/gl/gl_openssl.h
+++ b/gl/gl_openssl.h
@@ -1,6 +1,6 @@
 /* Wrap openssl crypto hash routines in gnulib interface.  -*- coding: utf-8 -*-
 
-   Copyright (C) 2013-2024 Free Software Foundation, Inc.
+   Copyright (C) 2013-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/glthread/lock.c b/gl/glthread/lock.c
index 6661ad6a..dace4fda 100644
--- a/gl/glthread/lock.c
+++ b/gl/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -240,8 +240,6 @@ glthread_recursive_lock_destroy (gl_recursive_lock_t *lock)
   return 0;
 }
 
-/* -------------------------- gl_once_t datatype -------------------------- */
-
 #endif
 
 /* ========================================================================= */
@@ -271,7 +269,7 @@ glthread_rwlock_init_for_glibc (pthread_rwlock_t *lock)
   /* Note: PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP is the only value that
      causes the writer to be preferred. PTHREAD_RWLOCK_PREFER_WRITER_NP does not
      do this; see
-     http://man7.org/linux/man-pages/man3/pthread_rwlockattr_setkind_np.3.html */
+     https://man7.org/linux/man-pages/man3/pthread_rwlockattr_setkind_np.3.html */
   err = pthread_rwlockattr_setkind_np (&attributes,
                                        PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP);
   if (err == 0)
@@ -698,46 +696,6 @@ glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *lock)
 
 # endif
 
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
-
-int
-glthread_once_singlethreaded (pthread_once_t *once_control)
-{
-  /* We don't know whether pthread_once_t is an integer type, a floating-point
-     type, a pointer type, or a structure type.  */
-  char *firstbyte = (char *)once_control;
-  if (*firstbyte == *(const char *)&fresh_once)
-    {
-      /* First time use of once_control.  Invert the first byte.  */
-      *firstbyte = ~ *(const char *)&fresh_once;
-      return 1;
-    }
-  else
-    return 0;
-}
-
-# if !(PTHREAD_IN_USE_DETECTION_HARD || USE_POSIX_THREADS_WEAK)
-
-int
-glthread_once_multithreaded (pthread_once_t *once_control,
-                             void (*init_function) (void))
-{
-  int err = pthread_once (once_control, init_function);
-  if (err == ENOSYS)
-    {
-      /* This happens on FreeBSD 11: The pthread_once function in libc returns
-         ENOSYS.  */
-      if (glthread_once_singlethreaded (once_control))
-        init_function ();
-      return 0;
-    }
-  return err;
-}
-
-# endif
-
 #endif
 
 /* ========================================================================= */
diff --git a/gl/glthread/lock.h b/gl/glthread/lock.h
index 2d5cb320..d6ccc202 100644
--- a/gl/glthread/lock.h
+++ b/gl/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -64,13 +64,6 @@
      Taking the lock:     err = glthread_recursive_lock_lock (&name);
      Releasing the lock:  err = glthread_recursive_lock_unlock (&name);
      De-initialization:   err = glthread_recursive_lock_destroy (&name);
-
-  Once-only execution:
-     Type:                gl_once_t
-     Initializer:         gl_once_define(extern, name)
-     Execution:           gl_once (name, initfunction);
-   Equivalent functions with control of error handling:
-     Execution:           err = glthread_once (&name, initfunction);
 */
 
 
@@ -88,17 +81,9 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#if !defined c11_threads_in_use
-# if HAVE_THREADS_H && USE_POSIX_THREADS_FROM_LIBC
-#  define c11_threads_in_use() 1
-# elif HAVE_THREADS_H && USE_POSIX_THREADS_WEAK
-#  include <threads.h>
-#  pragma weak thrd_exit
-#  define c11_threads_in_use() (thrd_exit != NULL)
-# else
-#  define c11_threads_in_use() 0
-# endif
-#endif
+#include "glthread/once.h"
+
+/* c11_threads_in_use() is defined in glthread/once.h.  */
 
 /* ========================================================================= */
 
@@ -195,14 +180,6 @@ extern int glthread_recursive_lock_lock (gl_recursive_lock_t *lock);
 extern int glthread_recursive_lock_unlock (gl_recursive_lock_t *lock);
 extern int glthread_recursive_lock_destroy (gl_recursive_lock_t *lock);
 
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef once_flag gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS once_flag NAME = ONCE_FLAG_INIT;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (call_once (ONCE_CONTROL, INITFUNCTION), 0)
-
 # ifdef __cplusplus
 }
 # endif
@@ -221,80 +198,7 @@ typedef once_flag gl_once_t;
 extern "C" {
 # endif
 
-# if PTHREAD_IN_USE_DETECTION_HARD
-
-/* The pthread_in_use() detection needs to be done at runtime.  */
-#  define pthread_in_use() \
-     glthread_in_use ()
-extern int glthread_in_use (void);
-
-# endif
-
-# if USE_POSIX_THREADS_WEAK
-
-/* Use weak references to the POSIX threads library.  */
-
-/* Weak references avoid dragging in external libraries if the other parts
-   of the program don't use them.  Here we use them, because we don't want
-   every program that uses libintl to depend on libpthread.  This assumes
-   that libpthread would not be loaded after libintl; i.e. if libintl is
-   loaded first, by an executable that does not depend on libpthread, and
-   then a module is dynamically loaded that depends on libpthread, libintl
-   will not be multithread-safe.  */
-
-/* The way to test at runtime whether libpthread is present is to test
-   whether a function pointer's value, such as &pthread_mutex_init, is
-   non-NULL.  However, some versions of GCC have a bug through which, in
-   PIC mode, &foo != NULL always evaluates to true if there is a direct
-   call to foo(...) in the same function.  To avoid this, we test the
-   address of a function in libpthread that we don't use.  */
-
-#  pragma weak pthread_mutex_init
-#  pragma weak pthread_mutex_lock
-#  pragma weak pthread_mutex_unlock
-#  pragma weak pthread_mutex_destroy
-#  pragma weak pthread_rwlock_init
-#  pragma weak pthread_rwlock_rdlock
-#  pragma weak pthread_rwlock_wrlock
-#  pragma weak pthread_rwlock_unlock
-#  pragma weak pthread_rwlock_destroy
-#  pragma weak pthread_once
-#  pragma weak pthread_cond_init
-#  pragma weak pthread_cond_wait
-#  pragma weak pthread_cond_signal
-#  pragma weak pthread_cond_broadcast
-#  pragma weak pthread_cond_destroy
-#  pragma weak pthread_mutexattr_init
-#  pragma weak pthread_mutexattr_settype
-#  pragma weak pthread_mutexattr_destroy
-#  pragma weak pthread_rwlockattr_init
-#  if __GNU_LIBRARY__ > 1
-#   pragma weak pthread_rwlockattr_setkind_np
-#  endif
-#  pragma weak pthread_rwlockattr_destroy
-#  ifndef pthread_self
-#   pragma weak pthread_self
-#  endif
-
-#  if !PTHREAD_IN_USE_DETECTION_HARD
-    /* Considering all platforms with USE_POSIX_THREADS_WEAK, only few symbols
-       can be used to determine whether libpthread is in use.  These are:
-         pthread_mutexattr_gettype
-         pthread_rwlockattr_destroy
-         pthread_rwlockattr_init
-     */
-#   pragma weak pthread_mutexattr_gettype
-#   define pthread_in_use() \
-      (pthread_mutexattr_gettype != NULL || c11_threads_in_use ())
-#  endif
-
-# else
-
-#  if !PTHREAD_IN_USE_DETECTION_HARD
-#   define pthread_in_use() 1
-#  endif
-
-# endif
+/* pthread_in_use() is defined in glthread/once.h.  */
 
 /* -------------------------- gl_lock_t datatype -------------------------- */
 
@@ -510,26 +414,6 @@ extern int glthread_recursive_lock_destroy_multithreaded (gl_recursive_lock_t *l
 
 # endif
 
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef pthread_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT;
-# if PTHREAD_IN_USE_DETECTION_HARD || USE_POSIX_THREADS_WEAK
-#  define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-     (pthread_in_use ()                                                        \
-      ? pthread_once (ONCE_CONTROL, INITFUNCTION)                              \
-      : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-# else
-#  define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-     (pthread_in_use ()                                                        \
-      ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)               \
-      : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
-extern int glthread_once_multithreaded (pthread_once_t *once_control,
-                                        void (*init_function) (void));
-# endif
-extern int glthread_once_singlethreaded (pthread_once_t *once_control);
-
 # ifdef __cplusplus
 }
 # endif
@@ -546,7 +430,6 @@ extern int glthread_once_singlethreaded (pthread_once_t *once_control);
 # include "windows-mutex.h"
 # include "windows-rwlock.h"
 # include "windows-recmutex.h"
-# include "windows-once.h"
 
 # ifdef __cplusplus
 extern "C" {
@@ -619,14 +502,6 @@ typedef glwthread_recmutex_t gl_recursive_lock_t;
 # define glthread_recursive_lock_destroy(LOCK) \
     glwthread_recmutex_destroy (LOCK)
 
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef glwthread_once_t gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = GLWTHREAD_ONCE_INIT;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (glwthread_once (ONCE_CONTROL, INITFUNCTION), 0)
-
 # ifdef __cplusplus
 }
 # endif
@@ -670,14 +545,6 @@ typedef int gl_recursive_lock_t;
 # define glthread_recursive_lock_unlock(NAME) 0
 # define glthread_recursive_lock_destroy(NAME) 0
 
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-typedef int gl_once_t;
-# define gl_once_define(STORAGECLASS, NAME) \
-    STORAGECLASS gl_once_t NAME = 0;
-# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
-    (*(ONCE_CONTROL) == 0 ? (*(ONCE_CONTROL) = ~ 0, INITFUNCTION (), 0) : 0)
-
 #endif
 
 /* ========================================================================= */
@@ -784,16 +651,6 @@ typedef int gl_once_t;
      }                                              \
    while (0)
 
-/* -------------------------- gl_once_t datatype -------------------------- */
-
-#define gl_once(NAME, INITFUNCTION) \
-   do                                           \
-     {                                          \
-       if (glthread_once (&NAME, INITFUNCTION)) \
-         abort ();                              \
-     }                                          \
-   while (0)
-
 /* ========================================================================= */
 
 #endif /* _LOCK_H */
diff --git a/gl/glthread/once.c b/gl/glthread/once.c
new file mode 100644
index 00000000..53211af8
--- /dev/null
+++ b/gl/glthread/once.c
@@ -0,0 +1,80 @@
+/* Once-only initialization in multithreaded situations.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-posix.h, gthr-posix95.h.  */
+
+#include <config.h>
+
+#include "glthread/once.h"
+
+/* ========================================================================= */
+
+#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+static const pthread_once_t fresh_once = PTHREAD_ONCE_INIT;
+
+int
+glthread_once_singlethreaded (pthread_once_t *once_control)
+{
+  /* We don't know whether pthread_once_t is an integer type, a floating-point
+     type, a pointer type, or a structure type.  */
+  char *firstbyte = (char *)once_control;
+  if (*firstbyte == *(const char *)&fresh_once)
+    {
+      /* First time use of once_control.  Invert the first byte.  */
+      *firstbyte = ~ *(const char *)&fresh_once;
+      return 1;
+    }
+  else
+    return 0;
+}
+
+# if !(PTHREAD_IN_USE_DETECTION_HARD || USE_POSIX_THREADS_WEAK)
+
+int
+glthread_once_multithreaded (pthread_once_t *once_control,
+                             void (*init_function) (void))
+{
+  int err = pthread_once (once_control, init_function);
+  if (err == ENOSYS)
+    {
+      /* This happens on FreeBSD 11: The pthread_once function in libc returns
+         ENOSYS.  */
+      if (glthread_once_singlethreaded (once_control))
+        init_function ();
+      return 0;
+    }
+  return err;
+}
+
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WINDOWS_THREADS
+
+#endif
+
+/* ========================================================================= */
diff --git a/gl/glthread/once.h b/gl/glthread/once.h
new file mode 100644
index 00000000..943bd7a2
--- /dev/null
+++ b/gl/glthread/once.h
@@ -0,0 +1,272 @@
+/* Once-only initialization in multithreaded situations.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2005.
+   Based on GCC's gthr-posix.h, gthr-posix95.h, gthr-win32.h.  */
+
+/* This file contains once-only initialization primitives for use with a given
+   thread library.
+   It does not contain primitives for creating threads or for other
+   synchronization primitives.
+
+  Once-only execution:
+     Type:                gl_once_t
+     Initializer:         gl_once_define(extern, name)
+     Execution:           gl_once (name, initfunction);
+   Equivalent functions with control of error handling:
+     Execution:           err = glthread_once (&name, initfunction);
+*/
+
+
+#ifndef _ONCE_H
+#define _ONCE_H
+
+/* This file uses HAVE_THREADS_H.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+#include <errno.h>
+#include <stdlib.h>
+
+#if !defined c11_threads_in_use
+# if HAVE_THREADS_H && USE_POSIX_THREADS_FROM_LIBC
+#  define c11_threads_in_use() 1
+# elif HAVE_THREADS_H && USE_POSIX_THREADS_WEAK
+#  include <threads.h>
+#  pragma weak thrd_exit
+#  define c11_threads_in_use() (thrd_exit != NULL)
+# else
+#  define c11_threads_in_use() 0
+# endif
+#endif
+
+/* ========================================================================= */
+
+#if USE_ISOC_THREADS || USE_ISOC_AND_POSIX_THREADS
+
+/* Use the ISO C threads library.  */
+
+# include <threads.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef once_flag gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS once_flag NAME = ONCE_FLAG_INIT;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (call_once (ONCE_CONTROL, INITFUNCTION), 0)
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_POSIX_THREADS
+
+/* Use the POSIX threads library.  */
+
+# include <pthread.h>
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# if PTHREAD_IN_USE_DETECTION_HARD
+
+/* The pthread_in_use() detection needs to be done at runtime.  */
+#  define pthread_in_use() \
+     glthread_in_use ()
+extern int glthread_in_use (void);
+
+# endif
+
+# if USE_POSIX_THREADS_WEAK
+
+/* Use weak references to the POSIX threads library.  */
+
+/* Weak references avoid dragging in external libraries if the other parts
+   of the program don't use them.  Here we use them, because we don't want
+   every program that uses libintl to depend on libpthread.  This assumes
+   that libpthread would not be loaded after libintl; i.e. if libintl is
+   loaded first, by an executable that does not depend on libpthread, and
+   then a module is dynamically loaded that depends on libpthread, libintl
+   will not be multithread-safe.  */
+
+/* The way to test at runtime whether libpthread is present is to test
+   whether a function pointer's value, such as &pthread_mutex_init, is
+   non-NULL.  However, some versions of GCC have a bug through which, in
+   PIC mode, &foo != NULL always evaluates to true if there is a direct
+   call to foo(...) in the same function.  To avoid this, we test the
+   address of a function in libpthread that we don't use.  */
+
+#  pragma weak pthread_mutex_init
+#  pragma weak pthread_mutex_lock
+#  pragma weak pthread_mutex_unlock
+#  pragma weak pthread_mutex_destroy
+/* Work around clang bug <https://github.com/llvm/llvm-project/issues/104670> */
+#  ifndef pthread_rwlock_init
+#   pragma weak pthread_rwlock_init
+#  endif
+#  pragma weak pthread_rwlock_rdlock
+#  pragma weak pthread_rwlock_wrlock
+#  pragma weak pthread_rwlock_unlock
+#  pragma weak pthread_rwlock_destroy
+#  pragma weak pthread_once
+#  pragma weak pthread_cond_init
+#  pragma weak pthread_cond_wait
+#  pragma weak pthread_cond_signal
+#  pragma weak pthread_cond_broadcast
+#  pragma weak pthread_cond_destroy
+#  pragma weak pthread_mutexattr_init
+#  pragma weak pthread_mutexattr_settype
+#  pragma weak pthread_mutexattr_destroy
+/* Work around clang bug <https://github.com/llvm/llvm-project/issues/104670> */
+#  ifndef pthread_rwlockattr_init
+#   pragma weak pthread_rwlockattr_init
+#  endif
+#  if __GNU_LIBRARY__ > 1
+#   pragma weak pthread_rwlockattr_setkind_np
+#  endif
+#  pragma weak pthread_rwlockattr_destroy
+#  ifndef pthread_self
+#   pragma weak pthread_self
+#  endif
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+    /* Considering all platforms with USE_POSIX_THREADS_WEAK, only few symbols
+       can be used to determine whether libpthread is in use.  These are:
+         pthread_mutexattr_gettype
+         pthread_rwlockattr_destroy
+         pthread_rwlockattr_init
+     */
+#   pragma weak pthread_mutexattr_gettype
+#   define pthread_in_use() \
+      (pthread_mutexattr_gettype != NULL || c11_threads_in_use ())
+#  endif
+
+# else
+
+#  if !PTHREAD_IN_USE_DETECTION_HARD
+#   define pthread_in_use() 1
+#  endif
+
+# endif
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef pthread_once_t gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS pthread_once_t NAME = PTHREAD_ONCE_INIT;
+# if PTHREAD_IN_USE_DETECTION_HARD || USE_POSIX_THREADS_WEAK
+#  define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+     (pthread_in_use ()                                                        \
+      ? pthread_once (ONCE_CONTROL, INITFUNCTION)                              \
+      : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
+# else
+#  define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+     (pthread_in_use ()                                                        \
+      ? glthread_once_multithreaded (ONCE_CONTROL, INITFUNCTION)               \
+      : (glthread_once_singlethreaded (ONCE_CONTROL) ? (INITFUNCTION (), 0) : 0))
+extern int glthread_once_multithreaded (pthread_once_t *once_control,
+                                        void (*init_function) (void));
+# endif
+extern int glthread_once_singlethreaded (pthread_once_t *once_control);
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if USE_WINDOWS_THREADS
+
+# define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+# include <windows.h>
+
+# include "windows-once.h"
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+/* We can use CRITICAL_SECTION directly, rather than the native Windows Event,
+   Mutex, Semaphore types, because
+     - we need only to synchronize inside a single process (address space),
+       not inter-process locking,
+     - we don't need to support trylock operations.  (TryEnterCriticalSection
+       does not work on Windows 95/98/ME.  Packages that need trylock usually
+       define their own mutex type.)  */
+
+/* There is no way to statically initialize a CRITICAL_SECTION.  It needs
+   to be done lazily, once only.  For this we need spinlocks.  */
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef glwthread_once_t gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = GLWTHREAD_ONCE_INIT;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (glwthread_once (ONCE_CONTROL, INITFUNCTION), 0)
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif
+
+/* ========================================================================= */
+
+#if !(USE_ISOC_THREADS || USE_POSIX_THREADS || USE_ISOC_AND_POSIX_THREADS || USE_WINDOWS_THREADS)
+
+/* Provide dummy implementation if threads are not supported.  */
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+typedef int gl_once_t;
+# define gl_once_define(STORAGECLASS, NAME) \
+    STORAGECLASS gl_once_t NAME = 0;
+# define glthread_once(ONCE_CONTROL, INITFUNCTION) \
+    (*(ONCE_CONTROL) == 0 ? (*(ONCE_CONTROL) = ~ 0, INITFUNCTION (), 0) : 0)
+
+#endif
+
+/* ========================================================================= */
+
+/* Macros with built-in error handling.  */
+
+/* -------------------------- gl_once_t datatype -------------------------- */
+
+#define gl_once(NAME, INITFUNCTION) \
+   do                                           \
+     {                                          \
+       if (glthread_once (&NAME, INITFUNCTION)) \
+         abort ();                              \
+     }                                          \
+   while (0)
+
+/* ========================================================================= */
+
+#endif /* _ONCE_H */
diff --git a/gl/glthread/threadlib.c b/gl/glthread/threadlib.c
index 7a776768..a6f7688b 100644
--- a/gl/glthread/threadlib.c
+++ b/gl/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/hard-locale.c b/gl/hard-locale.c
index 653c5809..767906d1 100644
--- a/gl/hard-locale.c
+++ b/gl/hard-locale.c
@@ -1,6 +1,6 @@
 /* hard-locale.c -- Determine whether a locale is hard.
 
-   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2024 Free Software
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/hard-locale.h b/gl/hard-locale.h
index 5d40e522..29808da6 100644
--- a/gl/hard-locale.h
+++ b/gl/hard-locale.h
@@ -1,6 +1,6 @@
 /* Determine whether a locale is hard.
 
-   Copyright (C) 1999, 2003-2004, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003-2004, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/ialloc.c b/gl/ialloc.c
index 8564a15b..881c8f04 100644
--- a/gl/ialloc.c
+++ b/gl/ialloc.c
@@ -1,6 +1,6 @@
 /* malloc with idx_t rather than size_t
 
-   Copyright 2021-2024 Free Software Foundation, Inc.
+   Copyright 2021-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/ialloc.h b/gl/ialloc.h
index 2aa94ae7..8bf5dd12 100644
--- a/gl/ialloc.h
+++ b/gl/ialloc.h
@@ -1,6 +1,6 @@
 /* ialloc.h -- malloc with idx_t rather than size_t
 
-   Copyright 2021-2024 Free Software Foundation, Inc.
+   Copyright 2021-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -29,9 +29,6 @@
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
-#if defined __CHERI_PURE_CAPABILITY__
-# include <cheri.h>
-#endif
 
 _GL_INLINE_HEADER_BEGIN
 #ifndef IALLOC_INLINE
@@ -68,19 +65,7 @@ IALLOC_INLINE
 void *
 irealloc (void *p, idx_t s)
 {
-  if (s <= SIZE_MAX)
-    {
-      /* Work around GNU realloc glitch by treating a zero size as if it
-         were 1, so that returning NULL is equivalent to failing.  */
-      p = realloc (p, s | !s);
-#if defined __CHERI_PURE_CAPABILITY__
-      if (p != NULL)
-        p = cheri_bounds_set (p, s);
-#endif
-      return p;
-    }
-  else
-    return _gl_alloc_nomem ();
+  return s <= SIZE_MAX ? realloc (p, s) : _gl_alloc_nomem ();
 }
 
 /* icalloc (num, size) is like calloc (num, size).
@@ -112,23 +97,9 @@ icalloc (idx_t n, idx_t s)
 IALLOC_INLINE void *
 ireallocarray (void *p, idx_t n, idx_t s)
 {
-  if (n <= SIZE_MAX && s <= SIZE_MAX)
-    {
-      /* Work around GNU reallocarray glitch by treating a zero size as if
-         it were 1, so that returning NULL is equivalent to failing.  */
-      size_t nx = n;
-      size_t sx = s;
-      if (n == 0 || s == 0)
-        nx = sx = 1;
-      p = reallocarray (p, nx, sx);
-#if defined __CHERI_PURE_CAPABILITY__
-      if (p != NULL && (n == 0 || s == 0))
-        p = cheri_bounds_set (p, 0);
-#endif
-      return p;
-    }
-  else
-    return _gl_alloc_nomem ();
+  return (n <= SIZE_MAX && s <= SIZE_MAX
+          ? reallocarray (p, n, s)
+          : _gl_alloc_nomem ());
 }
 
 #ifdef __cplusplus
diff --git a/gl/idpriv-droptemp.c b/gl/idpriv-droptemp.c
index eb882dea..ecaab836 100644
--- a/gl/idpriv-droptemp.c
+++ b/gl/idpriv-droptemp.c
@@ -1,5 +1,5 @@
 /* Dropping uid/gid privileges of the current process temporarily.
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,18 +25,18 @@
 
 /* The privileged uid and gid that the process had earlier.  */
 #if HAVE_GETUID
-static int saved_uid = -1;
+static uid_t saved_uid = -1;
 #endif
 #if HAVE_GETGID
-static int saved_gid = -1;
+static gid_t saved_gid = -1;
 #endif
 
 int
 idpriv_temp_drop (void)
 {
 #if HAVE_GETEUID && HAVE_GETEGID && (HAVE_SETRESUID || HAVE_SETREUID) && (HAVE_SETRESGID || HAVE_SETREGID)
-  int uid = getuid ();
-  int gid = getgid ();
+  uid_t uid = getuid ();
+  gid_t gid = getgid ();
 
   /* Find out about the privileged uid and gid at the first call.  */
   if (saved_uid == -1)
@@ -124,8 +124,8 @@ int
 idpriv_temp_restore (void)
 {
 #if HAVE_GETEUID && HAVE_GETEGID && (HAVE_SETRESUID || HAVE_SETREUID) && (HAVE_SETRESGID || HAVE_SETREGID)
-  int uid = getuid ();
-  int gid = getgid ();
+  uid_t uid = getuid ();
+  gid_t gid = getgid ();
 
   if (saved_uid == -1 || saved_gid == -1)
     /* Caller error: idpriv_temp_drop was never invoked.  */
diff --git a/gl/idpriv.h b/gl/idpriv.h
index a3ae5926..f4f8158e 100644
--- a/gl/idpriv.h
+++ b/gl/idpriv.h
@@ -1,5 +1,5 @@
 /* Dropping uid/gid privileges of the current process.
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gl/idx.h b/gl/idx.h
index 43793f2d..639b6cf0 100644
--- a/gl/idx.h
+++ b/gl/idx.h
@@ -1,5 +1,5 @@
 /* A type for indices and sizes.
-   Copyright (C) 2020-2024 Free Software Foundation, Inc.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/inet_ntop.c b/gl/inet_ntop.c
index 0a4ba20e..df3d9512 100644
--- a/gl/inet_ntop.c
+++ b/gl/inet_ntop.c
@@ -1,6 +1,6 @@
 /* inet_ntop.c -- convert IPv4 and IPv6 addresses from binary to text form
 
-   Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -117,7 +117,7 @@ inet_ntop (int af, const void *restrict src,
  *      'dst' (as a const)
  * notes:
  *      (1) uses no statics
- *      (2) takes a u_char* not an in_addr as input
+ *      (2) takes a 'unsigned char *' not an in_addr as input
  * author:
  *      Paul Vixie, 1996.
  */
diff --git a/gl/inet_pton.c b/gl/inet_pton.c
new file mode 100644
index 00000000..74d55c43
--- /dev/null
+++ b/gl/inet_pton.c
@@ -0,0 +1,268 @@
+/* inet_pton.c -- convert IPv4 and IPv6 addresses from text to binary form
+
+   Copyright (C) 2006, 2008-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/*
+ * Copyright (c) 1996,1999 by Internet Software Consortium.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
+ * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
+ * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ */
+
+#include <config.h>
+
+/* Specification.  */
+#include <arpa/inet.h>
+
+#if HAVE_DECL_INET_PTON
+
+# undef inet_pton
+
+int
+rpl_inet_pton (int af, const char *restrict src, void *restrict dst)
+{
+  return inet_pton (af, src, dst);
+}
+
+#else
+
+# include <c-ctype.h>
+# include <string.h>
+# include <errno.h>
+
+# define NS_INADDRSZ 4
+# define NS_IN6ADDRSZ 16
+# define NS_INT16SZ 2
+
+/*
+ * WARNING: Don't even consider trying to compile this on a system where
+ * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
+ */
+
+static int inet_pton4 (const char *src, unsigned char *dst);
+# if HAVE_IPV6
+static int inet_pton6 (const char *src, unsigned char *dst);
+# endif
+
+/* int
+ * inet_pton(af, src, dst)
+ *      convert from presentation format (which usually means ASCII printable)
+ *      to network format (which is usually some kind of binary format).
+ * return:
+ *      1 if the address was valid for the specified address family
+ *      0 if the address wasn't valid ('dst' is untouched in this case)
+ *      -1 if some other error occurred ('dst' is untouched in this case, too)
+ * author:
+ *      Paul Vixie, 1996.
+ */
+int
+inet_pton (int af, const char *restrict src, void *restrict dst)
+{
+  switch (af)
+    {
+    case AF_INET:
+      return (inet_pton4 (src, dst));
+
+# if HAVE_IPV6
+    case AF_INET6:
+      return (inet_pton6 (src, dst));
+# endif
+
+    default:
+      errno = EAFNOSUPPORT;
+      return (-1);
+    }
+  /* NOTREACHED */
+}
+
+/* int
+ * inet_pton4(src, dst)
+ *      like inet_aton() but without all the hexadecimal, octal (with the
+ *      exception of 0) and shorthand.
+ * return:
+ *      1 if 'src' is a valid dotted quad, else 0.
+ * notice:
+ *      does not touch 'dst' unless it's returning 1.
+ * author:
+ *      Paul Vixie, 1996.
+ */
+static int
+inet_pton4 (const char *restrict src, unsigned char *restrict dst)
+{
+  int saw_digit, octets, ch;
+  unsigned char tmp[NS_INADDRSZ], *tp;
+
+  saw_digit = 0;
+  octets = 0;
+  *(tp = tmp) = 0;
+  while ((ch = *src++) != '\0')
+    {
+
+      if (ch >= '0' && ch <= '9')
+        {
+          unsigned new = *tp * 10 + (ch - '0');
+
+          if (saw_digit && *tp == 0)
+            return (0);
+          if (new > 255)
+            return (0);
+          *tp = new;
+          if (!saw_digit)
+            {
+              if (++octets > 4)
+                return (0);
+              saw_digit = 1;
+            }
+        }
+      else if (ch == '.' && saw_digit)
+        {
+          if (octets == 4)
+            return (0);
+          *++tp = 0;
+          saw_digit = 0;
+        }
+      else
+        return (0);
+    }
+  if (octets < 4)
+    return (0);
+  memcpy (dst, tmp, NS_INADDRSZ);
+  return (1);
+}
+
+# if HAVE_IPV6
+
+/* int
+ * inet_pton6(src, dst)
+ *      convert presentation level address to network order binary form.
+ * return:
+ *      1 if 'src' is a valid [RFC1884 2.2] address, else 0.
+ * notice:
+ *      (1) does not touch 'dst' unless it's returning 1.
+ *      (2) :: in a full address is silently ignored.
+ * credit:
+ *      inspired by Mark Andrews.
+ * author:
+ *      Paul Vixie, 1996.
+ */
+static int
+inet_pton6 (const char *restrict src, unsigned char *restrict dst)
+{
+  static const char xdigits[] = "0123456789abcdef";
+  unsigned char tmp[NS_IN6ADDRSZ], *tp, *endp, *colonp;
+  const char *curtok;
+  int ch, saw_xdigit;
+  unsigned val;
+
+  tp = memset (tmp, '\0', NS_IN6ADDRSZ);
+  endp = tp + NS_IN6ADDRSZ;
+  colonp = NULL;
+  /* Leading :: requires some special handling. */
+  if (*src == ':')
+    if (*++src != ':')
+      return (0);
+  curtok = src;
+  saw_xdigit = 0;
+  val = 0;
+  while ((ch = c_tolower (*src++)) != '\0')
+    {
+      const char *pch;
+
+      pch = strchr (xdigits, ch);
+      if (pch != NULL)
+        {
+          val <<= 4;
+          val |= (pch - xdigits);
+          if (val > 0xffff)
+            return (0);
+          saw_xdigit = 1;
+          continue;
+        }
+      if (ch == ':')
+        {
+          curtok = src;
+          if (!saw_xdigit)
+            {
+              if (colonp)
+                return (0);
+              colonp = tp;
+              continue;
+            }
+          else if (*src == '\0')
+            {
+              return (0);
+            }
+          if (tp + NS_INT16SZ > endp)
+            return (0);
+          *tp++ = (unsigned char) (val >> 8) & 0xff;
+          *tp++ = (unsigned char) val & 0xff;
+          saw_xdigit = 0;
+          val = 0;
+          continue;
+        }
+      if (ch == '.' && ((tp + NS_INADDRSZ) <= endp) &&
+          inet_pton4 (curtok, tp) > 0)
+        {
+          tp += NS_INADDRSZ;
+          saw_xdigit = 0;
+          break;                /* '\0' was seen by inet_pton4(). */
+        }
+      return (0);
+    }
+  if (saw_xdigit)
+    {
+      if (tp + NS_INT16SZ > endp)
+        return (0);
+      *tp++ = (unsigned char) (val >> 8) & 0xff;
+      *tp++ = (unsigned char) val & 0xff;
+    }
+  if (colonp != NULL)
+    {
+      /*
+       * Since some memmove()'s erroneously fail to handle
+       * overlapping regions, we'll do the shift by hand.
+       */
+      const int n = tp - colonp;
+      int i;
+
+      if (tp == endp)
+        return (0);
+      for (i = 1; i <= n; i++)
+        {
+          endp[-i] = colonp[n - i];
+          colonp[n - i] = 0;
+        }
+      tp = endp;
+    }
+  if (tp != endp)
+    return (0);
+  memcpy (dst, tmp, NS_IN6ADDRSZ);
+  return (1);
+}
+
+# endif
+
+#endif
diff --git a/gl/intprops-internal.h b/gl/intprops-internal.h
index b5ba8d7c..7ace0cdd 100644
--- a/gl/intprops-internal.h
+++ b/gl/intprops-internal.h
@@ -1,6 +1,6 @@
 /* intprops-internal.h -- properties of integer types not visible to users
 
-   Copyright (C) 2001-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -21,7 +21,7 @@
 #include <limits.h>
 
 /* Pacify GCC 13.2 in some calls to _GL_EXPR_SIGNED.  */
-#if defined __GNUC__ && 4 < __GNUC__ + (3 <= __GNUC_MINOR__)
+#if 4 < __GNUC__ + (3 <= __GNUC_MINOR__) && !defined __clang__
 # pragma GCC diagnostic ignored "-Wtype-limits"
 #endif
 
@@ -77,10 +77,11 @@
 
 /* Does the __typeof__ keyword work?  This could be done by
    'configure', but for now it's easier to do it by hand.  */
-#if (2 <= __GNUC__ \
-     || (4 <= __clang_major__) \
-     || (1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
-     || (0x5110 <= __SUNPRO_C && !__STDC__))
+#if ((defined __GNUC__ && 2 <= __GNUC__) \
+     || (defined __clang_major__ && 4 <= __clang_major__) \
+     || (defined __IBMC__ && 1210 <= __IBMC__ && defined __IBM__TYPEOF__) \
+     || (defined __SUNPRO_C && 0x5110 <= __SUNPRO_C && !__STDC__) \
+     || (defined _MSC_VER && 1939 <= _MSC_VER))
 # define _GL_HAVE___TYPEOF__ 1
 #else
 # define _GL_HAVE___TYPEOF__ 0
@@ -119,8 +120,8 @@
 #endif
 
 /* True if __builtin_mul_overflow (A, B, P) works when P is non-null.  */
-#if defined __clang_major__ && __clang_major__ < 14
-/* Work around Clang bug <https://bugs.llvm.org/show_bug.cgi?id=16404>.  */
+#if defined __clang_major__ && __clang_major__ < 21
+/* Work around Clang bug <https://github.com/llvm/llvm-project/issues/16778>. */
 # define _GL_HAS_BUILTIN_MUL_OVERFLOW 0
 #else
 # define _GL_HAS_BUILTIN_MUL_OVERFLOW _GL_HAS_BUILTIN_ADD_OVERFLOW
@@ -163,7 +164,7 @@
 #if _GL_HAS_BUILTIN_MUL_OVERFLOW
 # if ((9 < __GNUC__ + (3 <= __GNUC_MINOR__) \
        || (__GNUC__ == 8 && 4 <= __GNUC_MINOR__)) \
-      && !defined __EDG__)
+      && !defined __clang__ && !defined __EDG__)
 #  define _GL_INT_MULTIPLY_WRAPV(a, b, r) __builtin_mul_overflow (a, b, r)
 # else
    /* Work around GCC bug 91450.  */
@@ -182,13 +183,13 @@
    _GL_INT_OP_WRAPV (a, b, r, *, _GL_INT_MULTIPLY_RANGE_OVERFLOW)
 #endif
 
-/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25390.  See:
+/* Nonzero if this compiler has GCC bug 68193 or Clang bug 25764.  See:
    https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68193
-   https://llvm.org/bugs/show_bug.cgi?id=25390
-   For now, assume all versions of GCC-like compilers generate bogus
+   https://github.com/llvm/llvm-project/issues/25764
+   For now, assume GCC < 14 and all Clang versions generate bogus
    warnings for _Generic.  This matters only for compilers that
    lack relevant builtins.  */
-#if __GNUC__ || defined __clang__
+#if (__GNUC__ && __GNUC__ < 14) || defined __clang__
 # define _GL__GENERIC_BOGUS 1
 #else
 # define _GL__GENERIC_BOGUS 0
diff --git a/gl/intprops.h b/gl/intprops.h
index 43734f34..2f9fa0a0 100644
--- a/gl/intprops.h
+++ b/gl/intprops.h
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -34,6 +34,14 @@
    signed or floating type.  Do not evaluate E.  */
 #define EXPR_SIGNED(e) _GL_EXPR_SIGNED (e)
 
+/* The same value as as the arithmetic expression E, but with E's type
+   after integer promotions.  For example, if E is of type 'enum {A, B}'
+   then 'switch (INT_PROMOTE (E))' pacifies gcc -Wswitch-enum if some
+   enum values are deliberately omitted from the switch's cases.
+   Here, unary + is safer than a cast or inline function, as unary +
+   does only integer promotions and is disallowed on pointers.  */
+#define INT_PROMOTE(e) (+ (e))
+
 
 /* Minimum and maximum values for integer types and expressions.  */
 
diff --git a/gl/inttypes.in.h b/gl/inttypes.in.h
index b9ab8a4b..5520ebc5 100644
--- a/gl/inttypes.in.h
+++ b/gl/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2024 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2025 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
@@ -913,11 +913,11 @@ extern "C" {
 #   undef imaxabs
 #   define imaxabs rpl_imaxabs
 #  endif
-_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x));
+_GL_FUNCDECL_RPL (imaxabs, intmax_t, (intmax_t x), );
 _GL_CXXALIAS_RPL (imaxabs, intmax_t, (intmax_t x));
 # else
 #  if !@HAVE_DECL_IMAXABS@
-_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x));
+_GL_FUNCDECL_SYS (imaxabs, intmax_t, (intmax_t x), );
 #  endif
 _GL_CXXALIAS_SYS (imaxabs, intmax_t, (intmax_t x));
 # endif
@@ -944,11 +944,11 @@ typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t;
 #   undef imaxdiv
 #   define imaxdiv rpl_imaxdiv
 #  endif
-_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+_GL_FUNCDECL_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom), );
 _GL_CXXALIAS_RPL (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
 # else
 #  if !@HAVE_DECL_IMAXDIV@
-_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+_GL_FUNCDECL_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom), );
 #  endif
 _GL_CXXALIAS_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
 # endif
@@ -970,7 +970,7 @@ _GL_WARN_ON_USE (imaxdiv, "imaxdiv is unportable - "
 #   define strtoimax rpl_strtoimax
 #  endif
 _GL_FUNCDECL_RPL (strtoimax, intmax_t,
-                  (const char *restrict, char **restrict, int)
+                  (const char *restrict, char **restrict, int),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtoimax, intmax_t,
                   (const char *restrict, char **restrict, int));
@@ -978,7 +978,7 @@ _GL_CXXALIAS_RPL (strtoimax, intmax_t,
 #  if !@HAVE_DECL_STRTOIMAX@
 #   undef strtoimax
 _GL_FUNCDECL_SYS (strtoimax, intmax_t,
-                  (const char *restrict, char **restrict, int)
+                  (const char *restrict, char **restrict, int),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtoimax, intmax_t,
@@ -1000,7 +1000,7 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - "
 #   define strtoumax rpl_strtoumax
 #  endif
 _GL_FUNCDECL_RPL (strtoumax, uintmax_t,
-                  (const char *restrict, char **restrict, int)
+                  (const char *restrict, char **restrict, int),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtoumax, uintmax_t,
                   (const char *restrict, char **restrict, int));
@@ -1008,7 +1008,7 @@ _GL_CXXALIAS_RPL (strtoumax, uintmax_t,
 #  if !@HAVE_DECL_STRTOUMAX@
 #   undef strtoumax
 _GL_FUNCDECL_SYS (strtoumax, uintmax_t,
-                  (const char *restrict, char **restrict, int)
+                  (const char *restrict, char **restrict, int),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtoumax, uintmax_t,
diff --git a/gl/iswblank.c b/gl/iswblank.c
index f699850a..6e361f43 100644
--- a/gl/iswblank.c
+++ b/gl/iswblank.c
@@ -1,5 +1,5 @@
 /* Test wide character for being blank.
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/iswctype-impl.h b/gl/iswctype-impl.h
index 999f220c..c87e00ff 100644
--- a/gl/iswctype-impl.h
+++ b/gl/iswctype-impl.h
@@ -1,5 +1,5 @@
 /* Test whether a wide character has a given property.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/iswctype.c b/gl/iswctype.c
index f4e6f015..576e93e4 100644
--- a/gl/iswctype.c
+++ b/gl/iswctype.c
@@ -1,5 +1,5 @@
 /* Test whether a wide character has a given property.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/iswdigit.c b/gl/iswdigit.c
index 57363ab8..6bba487b 100644
--- a/gl/iswdigit.c
+++ b/gl/iswdigit.c
@@ -1,5 +1,5 @@
 /* Test wide character for being a digit.
-   Copyright (C) 2020-2024 Free Software Foundation, Inc.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/iswpunct.c b/gl/iswpunct.c
index c7cb28b5..2b9258a9 100644
--- a/gl/iswpunct.c
+++ b/gl/iswpunct.c
@@ -1,5 +1,5 @@
 /* Test wide character for being a punctuation or symbol character.
-   Copyright (C) 2023-2024 Free Software Foundation, Inc.
+   Copyright (C) 2023-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/iswxdigit.c b/gl/iswxdigit.c
index d32e3b0f..e154ac80 100644
--- a/gl/iswxdigit.c
+++ b/gl/iswxdigit.c
@@ -1,5 +1,5 @@
 /* Test wide character for being a hexadecimal digit.
-   Copyright (C) 2020-2024 Free Software Foundation, Inc.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/itold.c b/gl/itold.c
index e6fbcff4..084eba23 100644
--- a/gl/itold.c
+++ b/gl/itold.c
@@ -1,5 +1,5 @@
 /* Replacement for 'int' to 'long double' conversion routine.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/langinfo.in.h b/gl/langinfo.in.h
index febbd25f..e16c95b3 100644
--- a/gl/langinfo.in.h
+++ b/gl/langinfo.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <langinfo.h>.
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -115,6 +115,18 @@ typedef int nl_item;
 # define ABMON_10    (ABMON_1 + 9)
 # define ABMON_11    (ABMON_1 + 10)
 # define ABMON_12    (ABMON_1 + 11)
+# define ABALTMON_1  10220
+# define ABALTMON_2  (ABALTMON_1 + 1)
+# define ABALTMON_3  (ABALTMON_1 + 2)
+# define ABALTMON_4  (ABALTMON_1 + 3)
+# define ABALTMON_5  (ABALTMON_1 + 4)
+# define ABALTMON_6  (ABALTMON_1 + 5)
+# define ABALTMON_7  (ABALTMON_1 + 6)
+# define ABALTMON_8  (ABALTMON_1 + 7)
+# define ABALTMON_9  (ABALTMON_1 + 8)
+# define ABALTMON_10 (ABALTMON_1 + 9)
+# define ABALTMON_11 (ABALTMON_1 + 10)
+# define ABALTMON_12 (ABALTMON_1 + 11)
 # define ERA         10047
 # define ERA_D_FMT   10048
 # define ERA_D_T_FMT 10049
@@ -171,6 +183,37 @@ typedef int nl_item;
 #  define GNULIB_defined_ALTMON 1
 # endif
 
+# if !@HAVE_LANGINFO_ABALTMON@
+#  if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 27
+#   define ABALTMON_1  _NL_ABALTMON_1
+#   define ABALTMON_2  _NL_ABALTMON_2
+#   define ABALTMON_3  _NL_ABALTMON_3
+#   define ABALTMON_4  _NL_ABALTMON_4
+#   define ABALTMON_5  _NL_ABALTMON_5
+#   define ABALTMON_6  _NL_ABALTMON_6
+#   define ABALTMON_7  _NL_ABALTMON_7
+#   define ABALTMON_8  _NL_ABALTMON_8
+#   define ABALTMON_9  _NL_ABALTMON_9
+#   define ABALTMON_10 _NL_ABALTMON_10
+#   define ABALTMON_11 _NL_ABALTMON_11
+#   define ABALTMON_12 _NL_ABALTMON_12
+#  else
+#   define ABALTMON_1  10220
+#   define ABALTMON_2  (ABALTMON_1 + 1)
+#   define ABALTMON_3  (ABALTMON_1 + 2)
+#   define ABALTMON_4  (ABALTMON_1 + 3)
+#   define ABALTMON_5  (ABALTMON_1 + 4)
+#   define ABALTMON_6  (ABALTMON_1 + 5)
+#   define ABALTMON_7  (ABALTMON_1 + 6)
+#   define ABALTMON_8  (ABALTMON_1 + 7)
+#   define ABALTMON_9  (ABALTMON_1 + 8)
+#   define ABALTMON_10 (ABALTMON_1 + 9)
+#   define ABALTMON_11 (ABALTMON_1 + 10)
+#   define ABALTMON_12 (ABALTMON_1 + 11)
+#   define GNULIB_defined_ABALTMON 1
+#  endif
+# endif
+
 # if !@HAVE_LANGINFO_ERA@
 #  define ERA         10047
 #  define ERA_D_FMT   10048
@@ -205,11 +248,11 @@ typedef int nl_item;
 #   undef nl_langinfo
 #   define nl_langinfo rpl_nl_langinfo
 #  endif
-_GL_FUNCDECL_RPL (nl_langinfo, char *, (nl_item item));
+_GL_FUNCDECL_RPL (nl_langinfo, char *, (nl_item item), );
 _GL_CXXALIAS_RPL (nl_langinfo, char *, (nl_item item));
 # else
 #  if !@HAVE_NL_LANGINFO@
-_GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item));
+_GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item), );
 #  endif
 _GL_CXXALIAS_SYS (nl_langinfo, char *, (nl_item item));
 # endif
diff --git a/gl/lc-charset-dispatch.c b/gl/lc-charset-dispatch.c
index e2f8b2f5..91ab6d72 100644
--- a/gl/lc-charset-dispatch.c
+++ b/gl/lc-charset-dispatch.c
@@ -1,5 +1,5 @@
 /* Dispatching based on the current locale's character encoding.
-   Copyright (C) 2018-2024 Free Software Foundation, Inc.
+   Copyright (C) 2018-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/lc-charset-dispatch.h b/gl/lc-charset-dispatch.h
index 4c1cf5f1..554137b6 100644
--- a/gl/lc-charset-dispatch.h
+++ b/gl/lc-charset-dispatch.h
@@ -1,5 +1,5 @@
 /* Dispatching based on the current locale's character encoding.
-   Copyright (C) 2018-2024 Free Software Foundation, Inc.
+   Copyright (C) 2018-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/libc-config.h b/gl/libc-config.h
index 70114608..33da9cf1 100644
--- a/gl/libc-config.h
+++ b/gl/libc-config.h
@@ -1,6 +1,6 @@
 /* System definitions for code taken from the GNU C Library
 
-   Copyright 2017-2024 Free Software Foundation, Inc.
+   Copyright 2017-2025 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -48,6 +48,11 @@
 
 /* From glibc <features.h>.  */
 
+#if defined __clang__
+  /* clang really only groks GNU C 4.2, regardless of its value of __GNUC__.  */
+# undef __GNUC_PREREQ
+# define __GNUC_PREREQ(maj, min) ((maj) < 4 + ((min) <= 2))
+#endif
 #ifndef __GNUC_PREREQ
 # if defined __GNUC__ && defined __GNUC_MINOR__
 #  define __GNUC_PREREQ(maj, min) ((maj) < __GNUC__ + ((min) <= __GNUC_MINOR__))
diff --git a/gl/limits.in.h b/gl/limits.in.h
index c65eb4c1..c33c59e1 100644
--- a/gl/limits.in.h
+++ b/gl/limits.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <limits.h>.
 
-   Copyright 2016-2024 Free Software Foundation, Inc.
+   Copyright 2016-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,7 +20,7 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined _GL_ALREADY_INCLUDING_LIMITS_H
+#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_LIMITS_H
 /* Special invocation convention:
    On Haiku/x86_64, we have a sequence of nested includes
    <limits.h> -> <syslimits.h> -> <limits.h>.
@@ -34,12 +34,12 @@
 
 #ifndef _@GUARD_PREFIX@_LIMITS_H
 
-# define _GL_ALREADY_INCLUDING_LIMITS_H
+# define _@GUARD_PREFIX@_ALREADY_INCLUDING_LIMITS_H
 
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_LIMITS_H@
 
-# undef _GL_ALREADY_INCLUDING_LIMITS_H
+# undef _@GUARD_PREFIX@_ALREADY_INCLUDING_LIMITS_H
 
 #ifndef _@GUARD_PREFIX@_LIMITS_H
 #define _@GUARD_PREFIX@_LIMITS_H
diff --git a/gl/localcharset.c b/gl/localcharset.c
index 93c4baa4..32f6f78e 100644
--- a/gl/localcharset.c
+++ b/gl/localcharset.c
@@ -1,6 +1,6 @@
 /* Determine a canonical name for the current locale's character encoding.
 
-   Copyright (C) 2000-2006, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -380,7 +380,7 @@ static const struct table_entry alias_table[] =
 #  if defined OS2                                           /* OS/2 */
     /* The list of encodings is taken from "List of OS/2 Codepages"
        by Alex Taylor:
-       <http://altsan.org/os2/toolkits/uls/index.html#codepages>.
+       <https://altsan.org/os2/toolkits/uls/index.html#codepages>.
        See also "__convcp() of kLIBC":
        <https://github.com/bitwiseworks/libc/blob/master/src/emx/src/lib/locale/__convcp.c>.  */
     { "CP1004",        "CP1252" },
@@ -939,8 +939,10 @@ locale_charset (void)
       sprintf (buf, "CP%u", GetACP ());
     }
   /* For a locale name such as "French_France.65001", in Windows 10,
-     setlocale now returns "French_France.utf8" instead.  */
-  if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0)
+     setlocale now returns "French_France.utf8" instead, or in the UTF-8
+     environment (with modern system settings) "fr_FR.UTF-8".  */
+  if (strcmp (buf + 2, "65001") == 0 || strcmp (buf + 2, "utf8") == 0
+      || strcmp (buf + 2, "UTF-8") == 0)
     codeset = "UTF-8";
   else
     {
diff --git a/gl/localcharset.h b/gl/localcharset.h
index 47214024..25e6d099 100644
--- a/gl/localcharset.h
+++ b/gl/localcharset.h
@@ -1,5 +1,5 @@
 /* Determine a canonical name for the current locale's character encoding.
-   Copyright (C) 2000-2003, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2025 Free Software Foundation, Inc.
    This file is part of the GNU CHARSET Library.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/locale.in.h b/gl/locale.in.h
index 1b11a41c..34f8c5b6 100644
--- a/gl/locale.in.h
+++ b/gl/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,7 +20,7 @@
 @PRAGMA_COLUMNS@
 
 #if (defined _WIN32 && !defined __CYGWIN__ && defined __need_locale_t) \
-    || defined _GL_ALREADY_INCLUDING_LOCALE_H
+    || defined _@GUARD_PREFIX@_ALREADY_INCLUDING_LOCALE_H
 
 /* Special invocation convention:
    - Inside mingw header files,
@@ -34,12 +34,12 @@
 
 #ifndef _@GUARD_PREFIX@_LOCALE_H
 
-#define _GL_ALREADY_INCLUDING_LOCALE_H
+#define _@GUARD_PREFIX@_ALREADY_INCLUDING_LOCALE_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_LOCALE_H@
 
-#undef _GL_ALREADY_INCLUDING_LOCALE_H
+#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_LOCALE_H
 
 #ifndef _@GUARD_PREFIX@_LOCALE_H
 #define _@GUARD_PREFIX@_LOCALE_H
@@ -69,6 +69,85 @@
 # define LC_MESSAGES 1729
 #endif
 
+#if !@HAVE_LOCALE_T@
+# if !defined GNULIB_defined_locale_t
+/* The values of the POSIX-standardized LC_* macros are:
+
+                  LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+   glibc, Solaris,     3        0           5         4            1        2
+   Android
+   macOS, *BSD         1        2           6         3            4        5
+   native Windows      1        2        1729         3            4        5
+
+   We map these to the log2(LC_*_MASK) values, chosen to be compatible with
+   later releases of the same operating system.  */
+#  if defined __APPLE__ && defined __MACH__          /* macOS */
+/*                LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+   category            1        2           6         3            4        5
+   log2(LC_*_MASK)     0        1           2         3            4        5
+ */
+#   define gl_log2_lc_mask(category) ((0x2543100 >> (4 * (category))) & 0xf)
+#  elif defined __FreeBSD__ || defined __DragonFly__ /* FreeBSD */
+/*                LC_COLLATE LC_CTYPE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME
+
+   category            1        2           6         3            4        5
+   log2(LC_*_MASK)     0        1           5         2            3        4
+ */
+#   define gl_log2_lc_mask(category) ((category) - 1)
+#  elif defined _WIN32 && !defined __CYGWIN__        /* native Windows */
+#   define gl_log2_lc_mask(category) \
+      ((category) == LC_MESSAGES ? 0 : (category))
+#  else                           /* glibc, Solaris, Android, NetBSD, OpenBSD */
+#   define gl_log2_lc_mask(category) (category)
+#  endif
+/* From there we map them to array indices 0..5.  */
+#  if (gl_log2_lc_mask (LC_COLLATE) == 0 || gl_log2_lc_mask (LC_CTYPE) == 0 \
+       || gl_log2_lc_mask (LC_MESSAGES) == 0)
+  /* glibc, Solaris, Android, macOS, FreeBSD, native Windows */
+#   define gl_log2_lcmask_to_index(c) (c)
+#   define gl_index_to_log2_lcmask(i) (i)
+#  else
+  /* NetBSD, OpenBSD */
+#   define gl_log2_lcmask_to_index(c) ((c) - 1)
+#   define gl_index_to_log2_lcmask(i) ((i) + 1)
+#  endif
+/* Define the LC_*_MASK macros.  */
+#  define LC_COLLATE_MASK  (1 << gl_log2_lc_mask (LC_COLLATE))
+#  define LC_CTYPE_MASK    (1 << gl_log2_lc_mask (LC_CTYPE))
+#  define LC_MESSAGES_MASK (1 << gl_log2_lc_mask (LC_MESSAGES))
+#  define LC_MONETARY_MASK (1 << gl_log2_lc_mask (LC_MONETARY))
+#  define LC_NUMERIC_MASK  (1 << gl_log2_lc_mask (LC_NUMERIC))
+#  define LC_TIME_MASK     (1 << gl_log2_lc_mask (LC_TIME))
+#  define LC_ALL_MASK \
+     (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | LC_MONETARY_MASK \
+      | LC_NUMERIC_MASK | LC_TIME_MASK)
+/* Now define the locale_t type.  */
+struct gl_locale_category_t
+{
+  char *name;
+  bool is_c_locale;
+#  if @HAVE_WINDOWS_LOCALE_T@
+  /* Use the native Windows '_locale_t' type.
+     Documentation:
+     <https://learn.microsoft.com/en-us/cpp/c-runtime-library/locale>
+     This field is NULL if is_c_locale is true.  But don't use this NULL value,
+     since for the native Windows *_l functions a null _locale_t means to use
+     the global locale.  */
+  _locale_t system_locale;
+#  endif
+};
+struct gl_locale_t
+{
+  struct gl_locale_category_t category[6];
+};
+typedef struct gl_locale_t *locale_t;
+#  define LC_GLOBAL_LOCALE ((locale_t)(-1))
+#  define GNULIB_defined_locale_t 1
+# endif
+#endif
+
 /* On native Windows with MSVC, 'struct lconv' lacks the members int_p_* and
    int_n_*.  Instead of overriding 'struct lconv', merely define these member
    names as macros.  This avoids trouble in C++ mode.  */
@@ -83,7 +162,8 @@
 
 /* Bionic libc's 'struct lconv' is just a dummy.  */
 #if @REPLACE_STRUCT_LCONV@
-# define lconv rpl_lconv
+# if !defined GNULIB_defined_struct_lconv
+#  define lconv rpl_lconv
 struct lconv
 {
   /* All 'char *' are actually 'const char *'.  */
@@ -160,6 +240,8 @@ struct lconv
      number.  */
   char int_n_sep_by_space;
 };
+#  define GNULIB_defined_struct_lconv 1
+# endif
 #endif
 
 #if @GNULIB_LOCALECONV@
@@ -168,7 +250,7 @@ struct lconv
 #   undef localeconv
 #   define localeconv rpl_localeconv
 #  endif
-_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void));
+_GL_FUNCDECL_RPL (localeconv, struct lconv *, (void), );
 _GL_CXXALIAS_RPL (localeconv, struct lconv *, (void));
 # else
 _GL_CXXALIAS_SYS (localeconv, struct lconv *, (void));
@@ -177,8 +259,10 @@ _GL_CXXALIAS_SYS (localeconv, struct lconv *, (void));
 _GL_CXXALIASWARN (localeconv);
 # endif
 #elif @REPLACE_STRUCT_LCONV@
-# undef localeconv
-# define localeconv localeconv_used_without_requesting_gnulib_module_localeconv
+# if !GNULIB_LOCALECONV
+#  undef localeconv
+#  define localeconv localeconv_used_without_requesting_gnulib_module_localeconv
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef localeconv
 # if HAVE_RAW_DECL_LOCALECONV
@@ -195,7 +279,7 @@ _GL_WARN_ON_USE (localeconv,
 #   define setlocale rpl_setlocale
 #   define GNULIB_defined_setlocale 1
 #  endif
-_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale));
+_GL_FUNCDECL_RPL (setlocale, char *, (int category, const char *locale), );
 _GL_CXXALIAS_RPL (setlocale, char *, (int category, const char *locale));
 # else
 _GL_CXXALIAS_SYS (setlocale, char *, (int category, const char *locale));
@@ -216,7 +300,7 @@ _GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - "
 # include "setlocale_null.h"
 #endif
 
-#if /*@GNULIB_NEWLOCALE@ ||*/ (@GNULIB_LOCALENAME_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_NEWLOCALE@)
+#if @GNULIB_NEWLOCALE@ || (@GNULIB_GETLOCALENAME_L_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_NEWLOCALE@)
 # if @REPLACE_NEWLOCALE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef newlocale
@@ -224,24 +308,22 @@ _GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - "
 #   define GNULIB_defined_newlocale 1
 #  endif
 _GL_FUNCDECL_RPL (newlocale, locale_t,
-                  (int category_mask, const char *name, locale_t base)
+                  (int category_mask, const char *name, locale_t base),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (newlocale, locale_t,
                   (int category_mask, const char *name, locale_t base));
 # else
-#  if @HAVE_NEWLOCALE@
+#  if !@HAVE_NEWLOCALE@
+_GL_FUNCDECL_SYS (newlocale, locale_t,
+                  (int category_mask, const char *name, locale_t base),
+                  _GL_ARG_NONNULL ((2)));
+#  endif
 _GL_CXXALIAS_SYS (newlocale, locale_t,
                   (int category_mask, const char *name, locale_t base));
-#  endif
 # endif
-# if __GLIBC__ >= 2 && @HAVE_NEWLOCALE@
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (newlocale);
 # endif
-# if @HAVE_NEWLOCALE@ || @REPLACE_NEWLOCALE@
-#  ifndef HAVE_WORKING_NEWLOCALE
-#   define HAVE_WORKING_NEWLOCALE 1
-#  endif
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef newlocale
 # if HAVE_RAW_DECL_NEWLOCALE
@@ -249,53 +331,50 @@ _GL_WARN_ON_USE (newlocale, "newlocale is not portable");
 # endif
 #endif
 
-#if @GNULIB_DUPLOCALE@ || (@GNULIB_LOCALENAME_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_DUPLOCALE@)
-# if @HAVE_DUPLOCALE@ /* locale_t may be undefined if !@HAVE_DUPLOCALE@.  */
-#  if @REPLACE_DUPLOCALE@
-#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#    undef duplocale
-#    define duplocale rpl_duplocale
-#    define GNULIB_defined_duplocale 1
-#   endif
-_GL_FUNCDECL_RPL (duplocale, locale_t, (locale_t locale) _GL_ARG_NONNULL ((1)));
+#if @GNULIB_DUPLOCALE@ || (@GNULIB_GETLOCALENAME_L_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_DUPLOCALE@)
+# if @REPLACE_DUPLOCALE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef duplocale
+#   define duplocale rpl_duplocale
+#   define GNULIB_defined_duplocale 1
+#  endif
+_GL_FUNCDECL_RPL (duplocale, locale_t, (locale_t locale), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale));
-#  else
-_GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale));
+# else
+#  if !@HAVE_DUPLOCALE@
+_GL_FUNCDECL_SYS (duplocale, locale_t, (locale_t locale), _GL_ARG_NONNULL ((1)));
 #  endif
+_GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale));
 # endif
-# if __GLIBC__ >= 2 && @HAVE_DUPLOCALE@
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (duplocale);
 # endif
-# if @HAVE_DUPLOCALE@
-#  ifndef HAVE_WORKING_DUPLOCALE
-#   define HAVE_WORKING_DUPLOCALE 1
-#  endif
-# endif
 #elif defined GNULIB_POSIXCHECK
 # undef duplocale
 # if HAVE_RAW_DECL_DUPLOCALE
-_GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - "
+_GL_WARN_ON_USE (duplocale, "duplocale is unportable and buggy on some glibc systems - "
                  "use gnulib module duplocale for portability");
 # endif
 #endif
 
-#if /*@GNULIB_FREELOCALE@ ||*/ (@GNULIB_LOCALENAME_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_FREELOCALE@)
+#if @GNULIB_FREELOCALE@ || (@GNULIB_GETLOCALENAME_L_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_FREELOCALE@)
 # if @REPLACE_FREELOCALE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef freelocale
 #   define freelocale rpl_freelocale
 #   define GNULIB_defined_freelocale 1
 #  endif
-_GL_FUNCDECL_RPL (freelocale, void, (locale_t locale) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (freelocale, void, (locale_t locale), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (freelocale, void, (locale_t locale));
 # else
-#  if @HAVE_FREELOCALE@
+#  if !@HAVE_FREELOCALE@
+_GL_FUNCDECL_SYS (freelocale, void, (locale_t locale), _GL_ARG_NONNULL ((1)));
+#  endif
 /* Need to cast, because on FreeBSD and Mac OS X 10.13, the return type is
                                    int.  */
 _GL_CXXALIAS_SYS_CAST (freelocale, void, (locale_t locale));
-#  endif
 # endif
-# if __GLIBC__ >= 2 && @HAVE_FREELOCALE@
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (freelocale);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -305,6 +384,36 @@ _GL_WARN_ON_USE (freelocale, "freelocale is not portable");
 # endif
 #endif
 
+#if @GNULIB_GETLOCALENAME_L@
+# if @REPLACE_GETLOCALENAME_L@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getlocalename_l
+#   define getlocalename_l rpl_getlocalename_l
+#  endif
+_GL_FUNCDECL_RPL (getlocalename_l, const char *,
+                  (int category, locale_t locale),
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (getlocalename_l, const char *,
+                  (int category, locale_t locale));
+# else
+#  if !@HAVE_GETLOCALENAME_L@
+_GL_FUNCDECL_SYS (getlocalename_l, const char *,
+                  (int category, locale_t locale),
+                  _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (getlocalename_l, const char *,
+                  (int category, locale_t locale));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (getlocalename_l);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getlocalename_l
+# if HAVE_RAW_DECL_GETLOCALENAME_L
+_GL_WARN_ON_USE (getlocalename_l, "getlocalename_l is not portable");
+# endif
+#endif
+
 #endif /* _@GUARD_PREFIX@_LOCALE_H */
 #endif /* _@GUARD_PREFIX@_LOCALE_H */
-#endif /* !(__need_locale_t || _GL_ALREADY_INCLUDING_LOCALE_H) */
+#endif /* !(__need_locale_t || _@GUARD_PREFIX@_ALREADY_INCLUDING_LOCALE_H) */
diff --git a/gl/localeconv.c b/gl/localeconv.c
index 10fc7b74..a6bbdced 100644
--- a/gl/localeconv.c
+++ b/gl/localeconv.c
@@ -1,5 +1,5 @@
 /* Query locale dependent information for formatting numbers.
-   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+   Copyright (C) 2012-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/lseek.c b/gl/lseek.c
index 61bd9fcb..41708787 100644
--- a/gl/lseek.c
+++ b/gl/lseek.c
@@ -1,5 +1,5 @@
 /* An lseek() function that detects pipes.
-   Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/lstat.c b/gl/lstat.c
new file mode 100644
index 00000000..bb4a59f1
--- /dev/null
+++ b/gl/lstat.c
@@ -0,0 +1,104 @@
+/* Work around a bug of lstat on some systems
+
+   Copyright (C) 1997-2006, 2008-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* written by Jim Meyering */
+
+/* If the user's config.h happens to include <sys/stat.h>, let it include only
+   the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to
+   rpl_lstat.  */
+#define __need_system_sys_stat_h
+#include <config.h>
+
+#if !HAVE_LSTAT
+/* On systems that lack symlinks, our replacement <sys/stat.h> already
+   defined lstat as stat, so there is nothing further to do other than
+   avoid an empty file.  */
+typedef int dummy;
+#else /* HAVE_LSTAT */
+
+/* Get the original definition of lstat.  It might be defined as a macro.  */
+# include <sys/types.h>
+# include <sys/stat.h>
+# undef __need_system_sys_stat_h
+
+static int
+orig_lstat (const char *filename, struct stat *buf)
+{
+  return lstat (filename, buf);
+}
+
+/* Specification.  */
+# ifdef __osf__
+/* Write "sys/stat.h" here, not <sys/stat.h>, otherwise OSF/1 5.1 DTK cc
+   eliminates this include because of the preliminary #include <sys/stat.h>
+   above.  */
+#  include "sys/stat.h"
+# else
+#  include <sys/stat.h>
+# endif
+
+# include "stat-time.h"
+
+# include <string.h>
+# include <errno.h>
+
+/* lstat works differently on Linux and Solaris systems.  POSIX (see
+   "pathname resolution" in the glossary) requires that programs like
+   'ls' take into consideration the fact that FILE has a trailing slash
+   when FILE is a symbolic link.  On Linux and Solaris 10 systems, the
+   lstat function already has the desired semantics (in treating
+   'lstat ("symlink/", sbuf)' just like 'lstat ("symlink/.", sbuf)',
+   but on Solaris 9 and earlier it does not.
+
+   If FILE has a trailing slash and specifies a symbolic link,
+   then use stat() to get more info on the referent of FILE.
+   If the referent is a non-directory, then set errno to ENOTDIR
+   and return -1.  Otherwise, return stat's result.  */
+
+int
+rpl_lstat (const char *file, struct stat *sbuf)
+{
+  int result = orig_lstat (file, sbuf);
+
+  /* This replacement file can blindly check against '/' rather than
+     using the ISSLASH macro, because all platforms with '\\' either
+     lack symlinks (mingw) or have working lstat (cygwin) and thus do
+     not compile this file.  0 len should have already been filtered
+     out above, with a failure return of ENOENT.  */
+  if (result == 0)
+    {
+      if (S_ISDIR (sbuf->st_mode) || file[strlen (file) - 1] != '/')
+        result = stat_time_normalize (result, sbuf);
+      else
+        {
+          /* At this point, a trailing slash is permitted only on
+             symlink-to-dir; but it should have found information on the
+             directory, not the symlink.  Call 'stat' to get info about the
+             link's referent.  Our replacement stat guarantees valid results,
+             even if the symlink is not pointing to a directory.  */
+          if (!S_ISLNK (sbuf->st_mode))
+            {
+              errno = ENOTDIR;
+              return -1;
+            }
+          result = stat (file, sbuf);
+        }
+    }
+  return result;
+}
+
+#endif /* HAVE_LSTAT */
diff --git a/gl/m4/00gnulib.m4 b/gl/m4/00gnulib.m4
index cd167718..2b205b35 100644
--- a/gl/m4/00gnulib.m4
+++ b/gl/m4/00gnulib.m4
@@ -1,9 +1,10 @@
 # 00gnulib.m4
 # serial 9
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl This file must be named something that sorts before all other
 dnl gnulib-provided .m4 files.  It is needed until the clang fix has
diff --git a/gl/m4/__inline.m4 b/gl/m4/__inline.m4
index 20baf164..d1b8257b 100644
--- a/gl/m4/__inline.m4
+++ b/gl/m4/__inline.m4
@@ -1,9 +1,10 @@
 # __inline.m4
 # serial 1
-dnl Copyright 2017-2024 Free Software Foundation, Inc.
+dnl Copyright 2017-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Test for __inline keyword
 
diff --git a/gl/m4/absolute-header.m4 b/gl/m4/absolute-header.m4
index 0abd6d90..5501b07b 100644
--- a/gl/m4/absolute-header.m4
+++ b/gl/m4/absolute-header.m4
@@ -1,9 +1,10 @@
 # absolute-header.m4
 # serial 18
-dnl Copyright (C) 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Derek Price.
 
diff --git a/gl/m4/af_alg.m4 b/gl/m4/af_alg.m4
index 33b74945..38575b6d 100644
--- a/gl/m4/af_alg.m4
+++ b/gl/m4/af_alg.m4
@@ -1,9 +1,10 @@
 # af_alg.m4
 # serial 6
-dnl Copyright 2018-2024 Free Software Foundation, Inc.
+dnl Copyright 2018-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Matteo Croce.
 
diff --git a/gl/m4/alloca.m4 b/gl/m4/alloca.m4
index dc78dc19..68fc6211 100644
--- a/gl/m4/alloca.m4
+++ b/gl/m4/alloca.m4
@@ -1,10 +1,11 @@
 # alloca.m4
 # serial 21
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2024 Free Software Foundation,
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_ALLOCA],
 [
diff --git a/gl/m4/arpa_inet_h.m4 b/gl/m4/arpa_inet_h.m4
index 9eac86d7..5dae6f72 100644
--- a/gl/m4/arpa_inet_h.m4
+++ b/gl/m4/arpa_inet_h.m4
@@ -1,9 +1,10 @@
 # arpa_inet_h.m4
-# serial 17
-dnl Copyright (C) 2006, 2008-2024 Free Software Foundation, Inc.
+# serial 18
+dnl Copyright (C) 2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Written by Simon Josefsson and Bruno Haible
 
@@ -68,8 +69,12 @@ AC_DEFUN([gl_ARPA_INET_H_REQUIRE_DEFAULTS],
 AC_DEFUN([gl_ARPA_INET_H_DEFAULTS],
 [
   dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_DECL_HTONL=1;      AC_SUBST([HAVE_DECL_HTONL])
+  HAVE_DECL_HTONS=1;      AC_SUBST([HAVE_DECL_HTONS])
   HAVE_DECL_INET_NTOP=1;  AC_SUBST([HAVE_DECL_INET_NTOP])
   HAVE_DECL_INET_PTON=1;  AC_SUBST([HAVE_DECL_INET_PTON])
+  HAVE_DECL_NTOHL=1;      AC_SUBST([HAVE_DECL_NTOHL])
+  HAVE_DECL_NTOHS=1;      AC_SUBST([HAVE_DECL_NTOHS])
   REPLACE_INET_NTOP=0;    AC_SUBST([REPLACE_INET_NTOP])
   REPLACE_INET_PTON=0;    AC_SUBST([REPLACE_INET_PTON])
 ])
diff --git a/gl/m4/assert_h.m4 b/gl/m4/assert_h.m4
index b90d0f19..e77524ca 100644
--- a/gl/m4/assert_h.m4
+++ b/gl/m4/assert_h.m4
@@ -1,9 +1,10 @@
 # assert_h.m4
-# serial 1
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+# serial 5
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Paul Eggert.
 
@@ -12,30 +13,31 @@ AC_DEFUN([gl_ASSERT_H],
   AC_CACHE_CHECK([for static_assert], [gl_cv_static_assert],
     [gl_saved_CFLAGS=$CFLAGS
      for gl_working in "yes, a keyword" "yes, an <assert.h> macro"; do
-      AS_CASE([$gl_working],
-        [*assert.h*], [CFLAGS="$gl_saved_CFLAGS -DINCLUDE_ASSERT_H"])
-
-      AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#if defined __clang__ && __STDC_VERSION__ < 202311
-             #pragma clang diagnostic error "-Wc2x-extensions"
-             #pragma clang diagnostic error "-Wc++1z-extensions"
-            #endif
-            #ifdef INCLUDE_ASSERT_H
-             #include <assert.h>
-            #endif
-            static_assert (2 + 2 == 4, "arithmetic does not work");
-            static_assert (2 + 2 == 4);
-          ]],
-          [[
-            static_assert (sizeof (char) == 1, "sizeof does not work");
-            static_assert (sizeof (char) == 1);
-          ]])],
-       [gl_cv_static_assert=$gl_working],
-       [gl_cv_static_assert=no])
-      CFLAGS=$gl_saved_CFLAGS
-      test "$gl_cv_static_assert" != no && break
-     done])
+       AS_CASE([$gl_working],
+         [*assert.h*], [CFLAGS="$gl_saved_CFLAGS -DINCLUDE_ASSERT_H"])
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#if defined __clang__ && __STDC_VERSION__ < 202311
+               #pragma clang diagnostic error "-Wc2x-extensions"
+               #pragma clang diagnostic error "-Wc++1z-extensions"
+              #endif
+              #ifdef INCLUDE_ASSERT_H
+               #include <assert.h>
+              #endif
+              static_assert (2 + 2 == 4, "arithmetic does not work");
+              static_assert (2 + 2 == 4);
+            ]],
+            [[
+              static_assert (sizeof (char) == 1, "sizeof does not work");
+              static_assert (sizeof (char) == 1);
+            ]])
+         ],
+         [gl_cv_static_assert=$gl_working],
+         [gl_cv_static_assert=no])
+       CFLAGS=$gl_saved_CFLAGS
+       test "$gl_cv_static_assert" != no && break
+     done
+    ])
 
   GL_GENERATE_ASSERT_H=false
   AS_CASE([$gl_cv_static_assert],
@@ -48,6 +50,10 @@ AC_DEFUN([gl_ASSERT_H],
 
   dnl The "zz" puts this toward config.h's end, to avoid potential
   dnl collisions with other definitions.
+  dnl Hardcode the known configuration results for GCC and clang, so that
+  dnl a configuration made with the C compiler works also with the C++ compiler
+  dnl and vice versa.
+  dnl The seemingly redundant parentheses are necessary for MSVC 14.
   dnl #undef assert so that programs are not tempted to use it without
   dnl specifically including assert.h.
   dnl #undef __ASSERT_H__ so that on IRIX, when programs later include
@@ -55,7 +61,18 @@ AC_DEFUN([gl_ASSERT_H],
   dnl Break the #undef_s apart with a comment so that 'configure' does
   dnl not comment them out.
   AH_VERBATIM([zzstatic_assert],
-[#if (!defined HAVE_C_STATIC_ASSERT && !defined assert \
+[#if (!(defined __clang__ \
+       ? (defined __cplusplus \
+          ? __cplusplus >= 201703L \
+          : __STDC_VERSION__ >= 202000L && __clang_major__ >= 16 \
+            && !defined __sun) \
+       : (defined __GNUC__ \
+          ? (defined __cplusplus \
+             ? __cplusplus >= 201103L && __GNUG__ >= 6 \
+             : __STDC_VERSION__ >= 202000L && __GNUC__ >= 13 \
+               && !defined __sun) \
+          : defined HAVE_C_STATIC_ASSERT)) \
+     && !defined assert \
      && (!defined __cplusplus \
          || (__cpp_static_assert < 201411 \
              && __GNUG__ < 6 && __clang_major__ < 6)))
@@ -65,8 +82,9 @@ AC_DEFUN([gl_ASSERT_H],
   #undef/**/__ASSERT_H__
  #endif
  /* Solaris 11.4 <assert.h> defines static_assert as a macro with 2 arguments.
-    We need it also to be invocable with a single argument.  */
- #if defined __sun && (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus
+    We need it also to be invocable with a single argument.
+    Haiku 2022 <assert.h> does not define static_assert at all.  */
+ #if (__STDC_VERSION__ - 0 >= 201112L) && !defined __cplusplus
   #undef/**/static_assert
   #define static_assert _Static_assert
  #endif
diff --git a/gl/m4/base64.m4 b/gl/m4/base64.m4
index 26f2af41..785d31c0 100644
--- a/gl/m4/base64.m4
+++ b/gl/m4/base64.m4
@@ -1,9 +1,10 @@
 # base64.m4
 # serial 4
-dnl Copyright (C) 2004, 2006, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2004, 2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_BASE64],
 [
diff --git a/gl/m4/btowc.m4 b/gl/m4/btowc.m4
index d9dd7036..59d52be6 100644
--- a/gl/m4/btowc.m4
+++ b/gl/m4/btowc.m4
@@ -1,13 +1,15 @@
 # btowc.m4
-# serial 14
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+# serial 15
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_BTOWC],
 [
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_REQUIRE([gt_TYPE_WINT_T])
 
   dnl Check whether <wchar.h> is usable at all, first. Otherwise the test
   dnl program below may lead to an endless loop. See
@@ -133,6 +135,13 @@ int main ()
           ])
       ])
 
+    if test $GNULIBHEADERS_OVERRIDE_WINT_T = 1; then
+      dnl On mingw/ucrt, we override the return type of btowc().
+      dnl While the original wint_t (= unsigned short) and the overridden wint_t
+      dnl (= unsigned int) are equivalent in function parameters, this is not
+      dnl the case for function return types.
+      REPLACE_BTOWC=1
+    fi
     case "$gl_cv_func_btowc_nul" in
       *yes) ;;
       *) REPLACE_BTOWC=1 ;;
diff --git a/gl/m4/build-to-host.m4 b/gl/m4/build-to-host.m4
new file mode 100644
index 00000000..01bff8f3
--- /dev/null
+++ b/gl/m4/build-to-host.m4
@@ -0,0 +1,274 @@
+# build-to-host.m4
+# serial 5
+dnl Copyright (C) 2023-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl Written by Bruno Haible.
+
+dnl When the build environment ($build_os) is different from the target runtime
+dnl environment ($host_os), file names may need to be converted from the build
+dnl environment syntax to the target runtime environment syntax. This is
+dnl because the Makefiles are executed (mostly) by build environment tools and
+dnl therefore expect file names in build environment syntax, whereas the runtime
+dnl expects file names in target runtime environment syntax.
+dnl
+dnl For example, if $build_os = cygwin and $host_os = mingw32, filenames need
+dnl be converted from Cygwin syntax to native Windows syntax:
+dnl   /cygdrive/c/foo/bar -> C:\foo\bar
+dnl   /usr/local/share    -> C:\cygwin64\usr\local\share
+dnl
+dnl gl_BUILD_TO_HOST([somedir])
+dnl This macro takes as input an AC_SUBSTed variable 'somedir', which must
+dnl already have its final value assigned, and produces two additional
+dnl AC_SUBSTed variables 'somedir_c' and 'somedir_c_make', that designate the
+dnl same file name value, just in different syntax:
+dnl   - somedir_c       is the file name in target runtime environment syntax,
+dnl                     as a C string (starting and ending with a double-quote,
+dnl                     and with escaped backslashes and double-quotes in
+dnl                     between).
+dnl   - somedir_c_make  is the same thing, escaped for use in a Makefile.
+
+AC_DEFUN([gl_BUILD_TO_HOST],
+[
+  AC_REQUIRE([AC_CANONICAL_BUILD])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_BUILD_TO_HOST_INIT])
+
+  dnl Define somedir_c.
+  gl_final_[$1]="$[$1]"
+  dnl Translate it from build syntax to host syntax.
+  case "$build_os" in
+    cygwin*)
+      case "$host_os" in
+        mingw* | windows*)
+          gl_final_[$1]=`cygpath -w "$gl_final_[$1]"` ;;
+      esac
+      ;;
+  esac
+  dnl Convert it to C string syntax.
+  [$1]_c=`printf '%s\n' "$gl_final_[$1]" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+  [$1]_c='"'"$[$1]_c"'"'
+  AC_SUBST([$1_c])
+
+  dnl Define somedir_c_make.
+  [$1]_c_make=`printf '%s\n' "$[$1]_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+  dnl Use the substituted somedir variable, when possible, so that the user
+  dnl may adjust somedir a posteriori when there are no special characters.
+  if test "$[$1]_c_make" = '\"'"${gl_final_[$1]}"'\"'; then
+    [$1]_c_make='\"$([$1])\"'
+  fi
+  AC_SUBST([$1_c_make])
+])
+
+dnl Some initializations for gl_BUILD_TO_HOST.
+AC_DEFUN([gl_BUILD_TO_HOST_INIT],
+[
+  gl_sed_double_backslashes='s/\\/\\\\/g'
+  gl_sed_escape_doublequotes='s/"/\\"/g'
+changequote(,)dnl
+  gl_sed_escape_for_make_1="s,\\([ \"&'();<>\\\\\`|]\\),\\\\\\1,g"
+changequote([,])dnl
+  gl_sed_escape_for_make_2='s,\$,\\$$,g'
+  dnl Find out how to remove carriage returns from output. Solaris /usr/ucb/tr
+  dnl does not understand '\r'.
+  case `echo r | tr -d '\r'` in
+    '') gl_tr_cr='\015' ;;
+    *)  gl_tr_cr='\r' ;;
+  esac
+])
+
+
+dnl The following macros are convenience invocations of gl_BUILD_TO_HOST
+dnl for some of the variables that are defined by Autoconf.
+dnl To do so for _all_ the possible variables, use the module 'configmake'.
+
+dnl Defines bindir_c and bindir_c_make.
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_BINDIR],
+[
+  dnl Find the final value of bindir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_bindir="${bindir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval bindir="$bindir"
+  gl_BUILD_TO_HOST([bindir])
+  bindir="${gl_saved_bindir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines datadir_c and datadir_c_make,
+dnl where datadir = $(datarootdir)
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_DATADIR],
+[
+  dnl Find the final value of datadir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_datadir="${datadir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval datadir="$datadir"
+  gl_BUILD_TO_HOST([datadir])
+  datadir="${gl_saved_datadir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines libdir_c and libdir_c_make.
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LIBDIR],
+[
+  dnl Find the final value of libdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libdir="${libdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libdir="$libdir"
+  gl_BUILD_TO_HOST([libdir])
+  libdir="${gl_saved_libdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines libexecdir_c and libexecdir_c_make.
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LIBEXECDIR],
+[
+  dnl Find the final value of libexecdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libexecdir="${libexecdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libexecdir="$libexecdir"
+  gl_BUILD_TO_HOST([libexecdir])
+  libexecdir="${gl_saved_libexecdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines localedir_c and localedir_c_make.
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_LOCALEDIR],
+[
+  dnl Find the final value of localedir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
+  gl_BUILD_TO_HOST([localedir])
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines pkgdatadir_c and pkgdatadir_c_make,
+dnl where pkgdatadir = $(datadir)/$(PACKAGE)
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGDATADIR],
+[
+  dnl Find the final value of pkgdatadir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_datadir="${datadir}"
+  gl_saved_pkgdatadir="${pkgdatadir}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval datadir="$datadir"
+  eval pkgdatadir="$pkgdatadir"
+  gl_BUILD_TO_HOST([pkgdatadir])
+  pkgdatadir="${gl_saved_pkgdatadir}"
+  datadir="${gl_saved_datadir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines pkglibdir_c and pkglibdir_c_make,
+dnl where pkglibdir = $(libdir)/$(PACKAGE)
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGLIBDIR],
+[
+  dnl Find the final value of pkglibdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libdir="${libdir}"
+  gl_saved_pkglibdir="${pkglibdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libdir="$libdir"
+  eval pkglibdir="$pkglibdir"
+  gl_BUILD_TO_HOST([pkglibdir])
+  pkglibdir="${gl_saved_pkglibdir}"
+  libdir="${gl_saved_libdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
+
+dnl Defines pkglibexecdir_c and pkglibexecdir_c_make,
+dnl where pkglibexecdir = $(libexecdir)/$(PACKAGE)
+AC_DEFUN_ONCE([gl_BUILD_TO_HOST_PKGLIBEXECDIR],
+[
+  dnl Find the final value of pkglibexecdir.
+  gl_saved_prefix="${prefix}"
+  gl_saved_exec_prefix="${exec_prefix}"
+  gl_saved_libexecdir="${libexecdir}"
+  gl_saved_pkglibexecdir="${pkglibexecdir}"
+  dnl Unfortunately, prefix and exec_prefix get only finally determined
+  dnl at the end of configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  if test "X$exec_prefix" = "XNONE"; then
+    exec_prefix='${prefix}'
+  fi
+  eval exec_prefix="$exec_prefix"
+  eval libexecdir="$libexecdir"
+  eval pkglibexecdir="$pkglibexecdir"
+  gl_BUILD_TO_HOST([pkglibexecdir])
+  pkglibexecdir="${gl_saved_pkglibexecdir}"
+  libexecdir="${gl_saved_libexecdir}"
+  exec_prefix="${gl_saved_exec_prefix}"
+  prefix="${gl_saved_prefix}"
+])
diff --git a/gl/m4/builtin-expect.m4 b/gl/m4/builtin-expect.m4
index c7af926b..76d32867 100644
--- a/gl/m4/builtin-expect.m4
+++ b/gl/m4/builtin-expect.m4
@@ -1,11 +1,12 @@
 # builtin-expect.m4
-# serial 1
-dnl Copyright 2016-2024 Free Software Foundation, Inc.
+# serial 3
+dnl Copyright 2016-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
-dnl Check for __builtin_expect.
+dnl Provide a GCC-compatible __builtin_expect macro in <config.h>.
 
 dnl Written by Paul Eggert.
 
@@ -47,5 +48,4 @@ AC_DEFUN([gl___BUILTIN_EXPECT],
 #elif HAVE___BUILTIN_EXPECT == 2
 # include <builtins.h>
 #endif
-    ])
-])
+])])
diff --git a/gl/m4/byteswap.m4 b/gl/m4/byteswap.m4
index 0c76fe93..b53cb4d0 100644
--- a/gl/m4/byteswap.m4
+++ b/gl/m4/byteswap.m4
@@ -1,18 +1,42 @@
 # byteswap.m4
-# serial 5
-dnl Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc.
+# serial 7
+dnl Copyright (C) 2005, 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Written by Oskar Liljeblad.
 
 AC_DEFUN([gl_BYTESWAP],
 [
   dnl Prerequisites of lib/byteswap.in.h.
-  AC_CHECK_HEADERS([byteswap.h], [
+  AC_CHECK_HEADERS_ONCE([byteswap.h])
+  if test $ac_cv_header_byteswap_h = yes; then
+    AC_CACHE_CHECK([for working bswap_16, bswap_32, bswap_64],
+      [gl_cv_header_working_byteswap_h],
+      [gl_cv_header_working_byteswap_h=no
+       dnl Check that floating point arguments work.
+       dnl This also checks C libraries with implementations like
+       dnl '#define bswap_16(x) (((x) >> 8 & 0xff) | (((x) & 0xff) << 8))'
+       dnl that mistakenly evaluate their arguments multiple times.
+       AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <byteswap.h>
+            ]],
+            [[int value_16 = bswap_16 (0.0);
+              int value_32 = bswap_32 (0.0);
+              int value_64 = bswap_64 (0.0);
+              return !(value_16 + value_32 + value_64);
+            ]])
+         ],
+         [gl_cv_header_working_byteswap_h=yes],
+         [gl_cv_header_working_byteswap_h=no])
+      ])
+  fi
+  if test "$gl_cv_header_working_byteswap_h" = yes; then
     GL_GENERATE_BYTESWAP_H=false
-  ], [
+  else
     GL_GENERATE_BYTESWAP_H=true
-  ])
+  fi
 ])
diff --git a/gl/m4/c-bool.m4 b/gl/m4/c-bool.m4
index 0fb0de3b..8fa8bfc8 100644
--- a/gl/m4/c-bool.m4
+++ b/gl/m4/c-bool.m4
@@ -1,9 +1,10 @@
 # c-bool.m4
-# serial 1
-dnl Copyright 2022-2024 Free Software Foundation, Inc.
+# serial 3
+dnl Copyright 2022-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Check for bool that conforms to C2023.
 
@@ -29,12 +30,23 @@ AC_DEFUN([gl_C_BOOL],
   dnl The "zz" puts this toward config.h's end, to avoid potential
   dnl collisions with other definitions.
   dnl If 'bool', 'true' and 'false' do not work, arrange for them to work.
-  dnl In C, this means including <stdbool.h> if it is not already included.
+  dnl Hardcode the known configuration results for GCC and clang, so that
+  dnl a configuration made with the C compiler works also with the C++ compiler
+  dnl and vice versa.
+  dnl The seemingly redundant parentheses are necessary for MSVC 14.
+  dnl "Arrange for them to work", in C, means including <stdbool.h> if it is
+  dnl not already included.
   dnl However, if the preprocessor mistakenly treats 'true' as 0,
   dnl define it to a bool expression equal to 1; this is needed in
   dnl Sun C++ 5.11 (Oracle Solaris Studio 12.2, 2010) and older.
   AH_VERBATIM([zzbool],
-[#ifndef HAVE_C_BOOL
+[#if !(defined __cplusplus \
+      ? 1 \
+      : (defined __clang__ \
+         ? __STDC_VERSION__ >= 202000L && __clang_major__ >= 15 \
+         : (defined __GNUC__ \
+            ? __STDC_VERSION__ >= 202000L && __GNUC__ >= 13 \
+            : defined HAVE_C_BOOL)))
 # if !defined __cplusplus && !defined __bool_true_false_are_defined
 #  if HAVE_STDBOOL_H
 #   include <stdbool.h>
diff --git a/gl/m4/c32rtomb.m4 b/gl/m4/c32rtomb.m4
new file mode 100644
index 00000000..ce26a31e
--- /dev/null
+++ b/gl/m4/c32rtomb.m4
@@ -0,0 +1,187 @@
+# c32rtomb.m4
+# serial 8
+dnl Copyright (C) 2020-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN([gl_FUNC_C32RTOMB],
+[
+  AC_REQUIRE([gl_UCHAR_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+
+  AC_REQUIRE([gl_CHECK_FUNC_C32RTOMB])
+  if test $gl_cv_func_c32rtomb = no; then
+    HAVE_C32RTOMB=0
+  else
+    dnl When we override mbrtoc32, redefining the meaning of the char32_t
+    dnl values, we need to override c32rtomb as well, for consistency.
+    if test $HAVE_WORKING_MBRTOC32 = 0; then
+      REPLACE_C32RTOMB=1
+    fi
+    AC_CACHE_CHECK([whether c32rtomb return value is correct],
+      [gl_cv_func_c32rtomb_retval],
+      [
+        dnl Initial guess, used when cross-compiling.
+changequote(,)dnl
+        case "$host_os" in
+          # Guess no on AIX.
+          aix*) gl_cv_func_c32rtomb_retval="guessing no" ;;
+          # Guess yes otherwise.
+          *)    gl_cv_func_c32rtomb_retval="guessing yes" ;;
+        esac
+changequote([,])dnl
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <stddef.h>
+#ifdef __HAIKU__
+ #include <stdint.h>
+#endif
+#include <uchar.h>
+int main ()
+{
+  int result = 0;
+  if (c32rtomb (NULL, 0, NULL) != 1)
+    result |= 1;
+  return result;
+}]])],
+          [gl_cv_func_c32rtomb_retval=yes],
+          [gl_cv_func_c32rtomb_retval=no],
+          [:])
+      ])
+    case "$gl_cv_func_c32rtomb_retval" in
+      *yes) ;;
+      *) AC_DEFINE([C32RTOMB_RETVAL_BUG], [1],
+           [Define if the c32rtomb function has an incorrect return value.])
+         REPLACE_C32RTOMB=1 ;;
+    esac
+    if test $HAVE_WORKING_C32RTOMB = 0; then
+      REPLACE_C32RTOMB=1
+    fi
+  fi
+])
+
+AC_DEFUN([gl_CHECK_FUNC_C32RTOMB],
+[
+  dnl Cf. gl_CHECK_FUNCS_ANDROID
+  AC_CHECK_DECL([c32rtomb], , ,
+    [[#ifdef __HAIKU__
+       #include <stdint.h>
+      #endif
+      #include <uchar.h>
+    ]])
+  if test $ac_cv_have_decl_c32rtomb = yes; then
+    dnl We can't use AC_CHECK_FUNC here, because c32rtomb() is defined as a
+    dnl static inline function on Haiku 2020.
+    AC_CACHE_CHECK([for c32rtomb], [gl_cv_func_c32rtomb],
+      [AC_LINK_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <stdlib.h>
+              #ifdef __HAIKU__
+               #include <stdint.h>
+              #endif
+              #include <uchar.h>
+            ]],
+            [[char buf[8];
+              return c32rtomb (buf, 0, NULL) == 0;
+            ]])
+         ],
+         [gl_cv_func_c32rtomb=yes],
+         [gl_cv_func_c32rtomb=no])
+      ])
+  else
+    gl_cv_func_c32rtomb=no
+  fi
+])
+
+dnl Test whether c32rtomb works not worse than wcrtomb.
+dnl Result is HAVE_WORKING_C32RTOMB.
+
+AC_DEFUN([gl_C32RTOMB_SANITYCHECK],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gl_TYPE_CHAR32_T])
+  AC_REQUIRE([gl_CHECK_FUNC_C32RTOMB])
+  AC_REQUIRE([gt_LOCALE_ZH_CN])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $gl_cv_func_c32rtomb = no; then
+    HAVE_WORKING_C32RTOMB=0
+  else
+    AC_CACHE_CHECK([whether c32rtomb works as well as wcrtomb],
+      [gl_cv_func_c32rtomb_sanitycheck],
+      [
+        dnl Initial guess, used when cross-compiling or when no suitable locale
+        dnl is present.
+changequote(,)dnl
+        case "$host_os" in
+          # Guess no on Solaris derivatives.
+          solaris*)
+            if test -f /etc/release && grep 'Oracle Solaris' /etc/release >/dev/null; then
+              gl_cv_func_c32rtomb_sanitycheck="guessing yes"
+            else
+              gl_cv_func_c32rtomb_sanitycheck="guessing no"
+            fi
+            ;;
+          # Guess yes otherwise.
+          *)
+            gl_cv_func_c32rtomb_sanitycheck="guessing yes"
+            ;;
+        esac
+changequote([,])dnl
+        if test $LOCALE_ZH_CN != none; then
+          AC_RUN_IFELSE(
+            [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#ifdef __HAIKU__
+ #include <stdint.h>
+#endif
+#include <uchar.h>
+int main ()
+{
+  int result = 0;
+  /* This fails on Solaris 11 OmniOS:
+     c32rtomb returns (size_t)-1.
+     wcrtomb returns 4 (correct).  */
+  if (strcmp ("$LOCALE_ZH_CN", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      mbstate_t state;
+      wchar_t wc = (wchar_t) 0xBADFACE;
+      char buf[16];
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, "\201\060\211\070", 4, &state) == 4
+          && wcrtomb (buf, wc, NULL) == 4
+          && memcmp (buf, "\201\060\211\070", 4) == 0)
+        {
+          char32_t c32 = (wchar_t) 0xBADFACE;
+          memset (&state, '\0', sizeof (mbstate_t));
+          if (mbrtoc32 (&c32, "\201\060\211\070", 4, &state) == 4
+              && c32rtomb (buf, c32, NULL) != 4)
+            result |= 1;
+        }
+    }
+  return result;
+}]])],
+            [gl_cv_func_c32rtomb_sanitycheck=yes],
+            [gl_cv_func_c32rtomb_sanitycheck=no],
+            [:])
+        fi
+      ])
+    case "$gl_cv_func_c32rtomb_sanitycheck" in
+      *yes)
+        HAVE_WORKING_C32RTOMB=1
+        AC_DEFINE([HAVE_WORKING_C32RTOMB], [1],
+          [Define if the c32rtomb function basically works.])
+        ;;
+      *) HAVE_WORKING_C32RTOMB=0 ;;
+    esac
+  fi
+  AC_SUBST([HAVE_WORKING_C32RTOMB])
+])
diff --git a/gl/m4/calloc.m4 b/gl/m4/calloc.m4
index 550cf5cc..ac7d08d4 100644
--- a/gl/m4/calloc.m4
+++ b/gl/m4/calloc.m4
@@ -1,9 +1,10 @@
 # calloc.m4
-# serial 31
-dnl Copyright (C) 2004-2024 Free Software Foundation, Inc.
+# serial 36
+dnl Copyright (C) 2004-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Written by Jim Meyering.
 
@@ -12,42 +13,35 @@ dnl with or without modifications, as long as this notice is preserved.
 # If so, define HAVE_CALLOC.  Otherwise, define calloc to rpl_calloc
 # and arrange to use a calloc wrapper function that does work in that case.
 
-# _AC_FUNC_CALLOC_IF([IF-WORKS], [IF-NOT])
-# -------------------------------------
+# gl_FUNC_CALLOC_IF([IF-WORKS], [IF-NOT])
+# ---------------------------------------
 # If calloc is compatible with GNU calloc, run IF-WORKS, otherwise, IF-NOT.
-AC_DEFUN([_AC_FUNC_CALLOC_IF],
+AC_DEFUN([gl_FUNC_CALLOC_IF],
 [
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether calloc (0, n) and calloc (n, 0) return nonnull],
-    [ac_cv_func_calloc_0_nonnull],
-    [if test $cross_compiling != yes; then
-       ac_cv_func_calloc_0_nonnull=yes
-       AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM(
-            [AC_INCLUDES_DEFAULT],
-            [[int result = 0;
-              char * volatile p = calloc (0, 0);
-              if (!p)
-                result |= 1;
-              free (p);
-              return result;
-            ]])],
-         [],
-         [ac_cv_func_calloc_0_nonnull=no])
-     else
-       case "$host_os" in
-                             # Guess yes on glibc systems.
-         *-gnu* | gnu*)      ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-                             # Guess yes on musl systems.
-         *-musl* | midipix*) ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-                             # Guess yes on native Windows.
-         mingw* | windows*)  ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-                             # If we don't know, obey --enable-cross-guesses.
-         *)                  ac_cv_func_calloc_0_nonnull="$gl_cross_guess_normal" ;;
-       esac
-     fi
-    ])
-  AS_CASE([$ac_cv_func_calloc_0_nonnull], [*yes], [$1], [$2])
+    [gl_cv_func_calloc_0_nonnull],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdlib.h>
+            /* Use pcalloc to test; "volatile" prevents the compiler
+               from optimizing the calloc call away.  */
+            void *(*volatile pcalloc) (size_t, size_t) = calloc;]],
+          [[void *p = pcalloc (0, 0);
+            int result = !p;
+            free (p);
+            return result;]])],
+       [gl_cv_func_calloc_0_nonnull=yes],
+       [gl_cv_func_calloc_0_nonnull=no],
+       [AS_CASE([$host_os],
+          [# Guess yes on platforms where we know the result.
+           *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
+           | gnu* | *-musl* | midipix* | midnightbsd* \
+           | hpux* | solaris* | cygwin* | mingw* | windows* | msys*],
+            [gl_cv_func_calloc_0_nonnull="guessing yes"],
+          [# If we don't know, obey --enable-cross-guesses.
+           gl_cv_func_calloc_0_nonnull="$gl_cross_guess_normal"])])])
+  AS_CASE([$gl_cv_func_calloc_0_nonnull], [*yes], [$1], [$2])
 ])
 
 
@@ -58,9 +52,14 @@ AC_DEFUN([gl_FUNC_CALLOC_GNU],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_CALLOC_POSIX])
+
+  dnl Through the dependency on module extensions-aix, _LINUX_SOURCE_COMPAT
+  dnl gets defined already before this macro gets invoked.  This helps
+  dnl if !(__VEC__ || __AIXVEC), and doesn't hurt otherwise.
+
   REPLACE_CALLOC_FOR_CALLOC_GNU="$REPLACE_CALLOC_FOR_CALLOC_POSIX"
   if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 0; then
-    _AC_FUNC_CALLOC_IF([], [REPLACE_CALLOC_FOR_CALLOC_GNU=1])
+    gl_FUNC_CALLOC_IF([], [REPLACE_CALLOC_FOR_CALLOC_GNU=1])
   fi
 ])# gl_FUNC_CALLOC_GNU
 
@@ -73,9 +72,7 @@ AC_DEFUN([gl_FUNC_CALLOC_POSIX],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
-  if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then
-    REPLACE_CALLOC_FOR_CALLOC_POSIX=1
-  fi
+  REPLACE_CALLOC_FOR_CALLOC_POSIX=$REPLACE_MALLOC_FOR_MALLOC_POSIX
   dnl Although in theory we should also test for size_t overflow,
   dnl in practice testing for ptrdiff_t overflow suffices
   dnl since PTRDIFF_MAX <= SIZE_MAX on all known Gnulib porting targets.
diff --git a/gl/m4/close.m4 b/gl/m4/close.m4
index 88c37fab..314e321e 100644
--- a/gl/m4/close.m4
+++ b/gl/m4/close.m4
@@ -1,9 +1,10 @@
 # close.m4
 # serial 10
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_FUNC_CLOSE],
 [
diff --git a/gl/m4/codeset.m4 b/gl/m4/codeset.m4
index e69b7402..6bed9dee 100644
--- a/gl/m4/codeset.m4
+++ b/gl/m4/codeset.m4
@@ -1,10 +1,11 @@
 # codeset.m4
 # serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2024 Free Software
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2025 Free Software
 dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 
diff --git a/gl/m4/double-slash-root.m4 b/gl/m4/double-slash-root.m4
index 3437c699..5c40b73c 100644
--- a/gl/m4/double-slash-root.m4
+++ b/gl/m4/double-slash-root.m4
@@ -1,9 +1,10 @@
 # double-slash-root.m4
 # serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_DOUBLE_SLASH_ROOT],
 [
diff --git a/gl/m4/dup2.m4 b/gl/m4/dup2.m4
index 786121fd..5da3a0b9 100644
--- a/gl/m4/dup2.m4
+++ b/gl/m4/dup2.m4
@@ -1,9 +1,10 @@
 # dup2.m4
 # serial 28
-dnl Copyright (C) 2002, 2005, 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2005, 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_DUP2],
 [
diff --git a/gl/m4/eealloc.m4 b/gl/m4/eealloc.m4
deleted file mode 100644
index 8a15e705..00000000
--- a/gl/m4/eealloc.m4
+++ /dev/null
@@ -1,32 +0,0 @@
-# eealloc.m4
-# serial 3
-dnl Copyright (C) 2003, 2009-2024 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_EEALLOC],
-[
-  AC_REQUIRE([gl_EEMALLOC])
-  AC_REQUIRE([gl_EEREALLOC])
-])
-
-AC_DEFUN([gl_EEMALLOC],
-[
-  _AC_FUNC_MALLOC_IF(
-    [gl_cv_func_malloc_0_nonnull=1],
-    [gl_cv_func_malloc_0_nonnull=0])
-  AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], [$gl_cv_func_malloc_0_nonnull],
-    [If malloc(0) is != NULL, define this to 1.  Otherwise define this
-     to 0.])
-])
-
-AC_DEFUN([gl_EEREALLOC],
-[
-  _AC_FUNC_REALLOC_IF(
-    [gl_cv_func_realloc_0_nonnull=1],
-    [gl_cv_func_realloc_0_nonnull=0])
-  AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], [$gl_cv_func_realloc_0_nonnull],
-    [If realloc(NULL,0) is != NULL, define this to 1.  Otherwise define this
-     to 0.])
-])
diff --git a/gl/m4/environ.m4 b/gl/m4/environ.m4
index 107960b2..e0690e54 100644
--- a/gl/m4/environ.m4
+++ b/gl/m4/environ.m4
@@ -1,9 +1,10 @@
 # environ.m4
 # serial 8
-dnl Copyright (C) 2001-2004, 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2004, 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_ENVIRON],
 [
diff --git a/gl/m4/errno_h.m4 b/gl/m4/errno_h.m4
index b6050e5d..420d5bb3 100644
--- a/gl/m4/errno_h.m4
+++ b/gl/m4/errno_h.m4
@@ -1,15 +1,21 @@
 # errno_h.m4
-# serial 14
-dnl Copyright (C) 2004, 2006, 2008-2024 Free Software Foundation, Inc.
+# serial 18
+dnl Copyright (C) 2004, 2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_PREREQ([2.61])
 
 AC_DEFUN_ONCE([gl_HEADER_ERRNO_H],
 [
   AC_REQUIRE([AC_PROG_CC])
+
+  dnl Through the dependency on module extensions-aix, _LINUX_SOURCE_COMPAT
+  dnl gets defined already before this macro gets invoked.  This persuades
+  dnl AIX 7.3 errno.h to assign ENOTEMPTY a value different than EEXIST.
+
   AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [
     AC_EGREP_CPP([booboo],[
 #include <errno.h>
@@ -64,6 +70,9 @@ booboo
 #if !defined EILSEQ
 booboo
 #endif
+#if !defined ESOCKTNOSUPPORT
+booboo
+#endif
       ],
       [gl_cv_header_errno_h_complete=no],
       [gl_cv_header_errno_h_complete=yes])
diff --git a/gl/m4/error.m4 b/gl/m4/error.m4
index 273b636b..1572250a 100644
--- a/gl/m4/error.m4
+++ b/gl/m4/error.m4
@@ -1,9 +1,11 @@
 # error.m4
 # serial 16
-dnl Copyright (C) 1996-1998, 2001-2004, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-1998, 2001-2004, 2009-2025 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_ERROR],
 [
diff --git a/gl/m4/error_h.m4 b/gl/m4/error_h.m4
index 050a410c..4ef5cbff 100644
--- a/gl/m4/error_h.m4
+++ b/gl/m4/error_h.m4
@@ -1,9 +1,10 @@
 # error_h.m4
-# serial 4
-dnl Copyright (C) 1996-2024 Free Software Foundation, Inc.
+# serial 5
+dnl Copyright (C) 1996-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 dnl Provide a working <error.h>.
@@ -111,12 +112,15 @@ AC_DEFUN_ONCE([gl_ERROR_H],
     esac
   fi
 
-  if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \
-     || test $HAVE_ERROR_AT_LINE = 0 || test $REPLACE_ERROR_AT_LINE = 1; then
-    COMPILE_ERROR_C=1
-  else
-    COMPILE_ERROR_C=0
-  fi
+  m4_ifdef([gl_HAVE_MODULE_VERROR],
+    [COMPILE_ERROR_C=1],
+    [if test $HAVE_ERROR = 0 || test $REPLACE_ERROR = 1 \
+        || test $HAVE_ERROR_AT_LINE = 0 \
+        || test $REPLACE_ERROR_AT_LINE = 1; then
+       COMPILE_ERROR_C=1
+     else
+       COMPILE_ERROR_C=0
+     fi])
 
   AC_SUBST([HAVE_ERROR])
   AC_SUBST([HAVE_ERROR_AT_LINE])
diff --git a/gl/m4/exponentd.m4 b/gl/m4/exponentd.m4
index db597afc..08e93397 100644
--- a/gl/m4/exponentd.m4
+++ b/gl/m4/exponentd.m4
@@ -1,9 +1,10 @@
 # exponentd.m4
-# serial 4
-dnl Copyright (C) 2007-2008, 2010-2024 Free Software Foundation, Inc.
+# serial 5
+dnl Copyright (C) 2007-2008, 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 AC_DEFUN_ONCE([gl_DOUBLE_EXPONENT_LOCATION],
 [
   AC_CACHE_CHECK([where to find the exponent in a 'double'],
@@ -84,7 +85,7 @@ int main ()
           dnl The newer VFP instructions assume little-endian order
           dnl consistently.
           AC_EGREP_CPP([mixed_endianness], [
-#if defined arm || defined __arm || defined __arm__
+#if defined __arm__
   mixed_endianness
 #endif
             ],
diff --git a/gl/m4/extensions-aix.m4 b/gl/m4/extensions-aix.m4
new file mode 100644
index 00000000..08b703b4
--- /dev/null
+++ b/gl/m4/extensions-aix.m4
@@ -0,0 +1,26 @@
+# extensions-aix.m4
+# serial 1
+dnl Copyright (C) 2024-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+# On AIX, most extensions are already enabled through the _ALL_SOURCE macro,
+# defined by gl_USE_SYSTEM_EXTENSIONS.  gl_USE_AIX_EXTENSIONS additionally
+# activates more GNU and Linux-like behaviours, affecting
+#   - the time_t type,
+#   - errno values in <errno.h>: ENOTEMPTY
+#   - functions in <stdlib.h>: malloc calloc realloc valloc
+#     <https://www.ibm.com/docs/en/aix/7.3?topic=m-malloc-free-realloc-calloc-mallopt-mallinfo-mallinfo-heap-alloca-valloc-posix-memalign-subroutine>
+#   - functions in <string.h>: strerror_r (returns 'char *', like glibc)
+#   - functions in <dirent.h>: scandir, alphasort, readdir_r
+#   - functions in <netdb.h>: gethostbyname_r gethostbyaddr_r
+#   - declarations in <unistd.h>: sbrk
+# and a couple of secondary <sys/*> header files.
+
+AC_DEFUN_ONCE([gl_USE_AIX_EXTENSIONS],
+[
+  AC_DEFINE([_LINUX_SOURCE_COMPAT], [1],
+    [Define so that AIX headers are more compatible with GNU/Linux.])
+])
diff --git a/gl/m4/extensions.m4 b/gl/m4/extensions.m4
index 1fb68956..76516bce 100644
--- a/gl/m4/extensions.m4
+++ b/gl/m4/extensions.m4
@@ -1,9 +1,10 @@
 # extensions.m4
 # serial 25  -*- Autoconf -*-
-dnl Copyright (C) 2003, 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Enable extensions on systems that normally disable them.
 
diff --git a/gl/m4/extern-inline.m4 b/gl/m4/extern-inline.m4
index 547da82a..d4fe6d82 100644
--- a/gl/m4/extern-inline.m4
+++ b/gl/m4/extern-inline.m4
@@ -1,9 +1,10 @@
 # extern-inline.m4
 # serial 1
-dnl Copyright 2012-2024 Free Software Foundation, Inc.
+dnl Copyright 2012-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl 'extern inline' a la ISO C99.
 
diff --git a/gl/m4/fclose.m4 b/gl/m4/fclose.m4
index 0c1358ed..cfb92e28 100644
--- a/gl/m4/fclose.m4
+++ b/gl/m4/fclose.m4
@@ -1,9 +1,10 @@
 # fclose.m4
 # serial 12
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_FUNC_FCLOSE],
 [
diff --git a/gl/m4/fcntl-o.m4 b/gl/m4/fcntl-o.m4
index 43aa1325..8020c481 100644
--- a/gl/m4/fcntl-o.m4
+++ b/gl/m4/fcntl-o.m4
@@ -1,15 +1,17 @@
 # fcntl-o.m4
-# serial 8
-dnl Copyright (C) 2006, 2009-2024 Free Software Foundation, Inc.
+# serial 12
+dnl Copyright (C) 2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Written by Paul Eggert.
 
 AC_PREREQ([2.60])
 
-# Test whether the flags O_NOATIME and O_NOFOLLOW actually work.
+# Test whether the flags O_DIRECTORY, O_NOATIME and O_NOFOLLOW actually work.
+# Define HAVE_WORKING_O_DIRECTORY to 1 if O_DIRECTORY works, or to 0 otherwise.
 # Define HAVE_WORKING_O_NOATIME to 1 if O_NOATIME works, or to 0 otherwise.
 # Define HAVE_WORKING_O_NOFOLLOW to 1 if O_NOFOLLOW works, or to 0 otherwise.
 AC_DEFUN([gl_FCNTL_O_FLAGS],
@@ -30,16 +32,23 @@ AC_DEFUN([gl_FCNTL_O_FLAGS],
            #else /* on Windows with MSVC */
            # include <io.h>
            # include <stdlib.h>
-           # defined sleep(n) _sleep ((n) * 1000)
+           # define sleep(n) _sleep ((n) * 1000)
            #endif
+           #include <errno.h>
            #include <fcntl.h>
            ]GL_MDA_DEFINES[
+           #ifndef O_DIRECTORY
+            #define O_DIRECTORY 0
+           #endif
            #ifndef O_NOATIME
             #define O_NOATIME 0
            #endif
            #ifndef O_NOFOLLOW
             #define O_NOFOLLOW 0
            #endif
+           #ifndef O_SEARCH
+            #define O_SEARCH O_RDONLY
+           #endif
            static int const constants[] =
             {
               O_CREAT, O_EXCL, O_NOCTTY, O_TRUNC, O_APPEND,
@@ -52,31 +61,38 @@ AC_DEFUN([gl_FCNTL_O_FLAGS],
             {
               static char const sym[] = "conftest.sym";
               if (symlink ("/dev/null", sym) != 0)
-                result |= 2;
+                result |= 1;
               else
                 {
                   int fd = open (sym, O_WRONLY | O_NOFOLLOW | O_CREAT, 0);
                   if (fd >= 0)
                     {
                       close (fd);
-                      result |= 4;
+                      result |= 3;
                     }
                 }
               if (unlink (sym) != 0 || symlink (".", sym) != 0)
-                result |= 2;
+                result |= 1;
               else
                 {
                   int fd = open (sym, O_RDONLY | O_NOFOLLOW);
                   if (fd >= 0)
                     {
                       close (fd);
-                      result |= 4;
+                      result |= 3;
                     }
                 }
               unlink (sym);
             }
             #endif
             {
+              int fd = open ("confdefs.h", O_SEARCH | O_DIRECTORY);
+              if (!(fd < 0 && errno == ENOTDIR))
+                result |= 4;
+              if (0 <= fd)
+                close (fd);
+            }
+            {
               static char const file[] = "confdefs.h";
               int fd = open (file, O_RDONLY | O_NOATIME);
               if (fd < 0)
@@ -111,31 +127,46 @@ AC_DEFUN([gl_FCNTL_O_FLAGS],
             }
             return result;]])],
        [gl_cv_header_working_fcntl_h=yes],
-       [case $? in #(
-        4) gl_cv_header_working_fcntl_h='no (bad O_NOFOLLOW)';; #(
-        64) gl_cv_header_working_fcntl_h='no (bad O_NOATIME)';; #(
-        68) gl_cv_header_working_fcntl_h='no (bad O_NOATIME, O_NOFOLLOW)';; #(
-         *) gl_cv_header_working_fcntl_h='no';;
-        esac],
-       [case "$host_os" in
-                             # Guess 'no' on native Windows.
-          mingw* | windows*) gl_cv_header_working_fcntl_h='no' ;;
-          *)                 gl_cv_header_working_fcntl_h=cross-compiling ;;
-        esac
-       ])
-    ])
+       [AS_CASE([$?],
+          dnl We cannot catch exit code 1 or 2 here, because
+          dnl - exit code 1 can occur through a compilation error on mingw (e.g.
+          dnl   when O_NOCTTY, O_NONBLOCK, O_SYNC are not defined) or when
+          dnl   result = 1, whereas
+          dnl - exit code 2 can occur through a compilation error on MSVC (e.g.
+          dnl   again when O_NOCTTY, O_NONBLOCK, O_SYNC are not defined) or when
+          dnl   result = 2.
+          [ 3], [gl_cv_header_working_fcntl_h="no (bad O_NOFOLLOW)"],
+          [ 4], [gl_cv_header_working_fcntl_h="no (bad O_DIRECTORY)"],
+          [ 7], [gl_cv_header_working_fcntl_h="no (bad O_NOFOLLOW, O_DIRECTORY)"],
+          [64], [gl_cv_header_working_fcntl_h="no (bad O_NOATIME)"],
+          [67], [gl_cv_header_working_fcntl_h="no (bad O_NOFOLLOW, O_NOATIME)"],
+          [68], [gl_cv_header_working_fcntl_h="no (bad O_DIRECTORY, O_NOATIME)"],
+          [71], [gl_cv_header_working_fcntl_h="no (bad O_NOFOLLOW, O_DIRECTORY, O_NOATIME)"],
+          [gl_cv_header_working_fcntl_h="no"])],
+       [AS_CASE([$host_os,$gl_cross_guess_normal],
+          # The O_DIRECTORY test is known to fail on Mac OS X 10.4.11 (2007)
+          # (see <https://bugs.gnu.org/78509#95>)
+          # and to succeed on Mac OS X 10.5.8 [darwin9.8.0] (2009).
+          # Guess it fails on Mac OS X 10.4.x and earlier.
+          [darwin[[0-8]].*yes],
+             [gl_cv_header_working_fcntl_h="guessing no (bad O_DIRECTORY)"],
+          # Known to be "no" on native MS-Windows.
+          [mingw* | windows*],
+             [gl_cv_header_working_fcntl_h=no],
+          [gl_cv_header_working_fcntl_h=$gl_cross_guess_normal])])])
+
+  AS_CASE([$gl_cv_header_working_fcntl_h],
+    [*O_DIRECTORY* | *no], [gl_val=0], [gl_val=1])
+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_DIRECTORY], [$gl_val],
+    [Define to 1 if O_DIRECTORY works, 0 otherwise.])
 
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOATIME* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$ac_val],
-    [Define to 1 if O_NOATIME works.])
+  AS_CASE([$gl_cv_header_working_fcntl_h],
+    [*O_NOATIME* | *no], [gl_val=0], [gl_val=1])
+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOATIME], [$gl_val],
+    [Define to 1 if O_NOATIME works, 0 otherwise.])
 
-  case $gl_cv_header_working_fcntl_h in #(
-  *O_NOFOLLOW* | no | cross-compiling) ac_val=0;; #(
-  *) ac_val=1;;
-  esac
-  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$ac_val],
-    [Define to 1 if O_NOFOLLOW works.])
+  AS_CASE([$gl_cv_header_working_fcntl_h],
+    [*O_NOFOLLOW* | *no], [gl_val=0], [gl_val=1])
+  AC_DEFINE_UNQUOTED([HAVE_WORKING_O_NOFOLLOW], [$gl_val],
+    [Define to 1 if O_NOFOLLOW works, 0 otherwise.])
 ])
diff --git a/gl/m4/fcntl.m4 b/gl/m4/fcntl.m4
index f6d0f377..08ab936f 100644
--- a/gl/m4/fcntl.m4
+++ b/gl/m4/fcntl.m4
@@ -1,9 +1,10 @@
 # fcntl.m4
 # serial 12
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # For now, this module ensures that fcntl()
 # - supports F_DUPFD correctly
diff --git a/gl/m4/fcntl_h.m4 b/gl/m4/fcntl_h.m4
index b69f7a0c..1c9f9cce 100644
--- a/gl/m4/fcntl_h.m4
+++ b/gl/m4/fcntl_h.m4
@@ -1,9 +1,10 @@
 # fcntl_h.m4
 # serial 20
-dnl Copyright (C) 2006-2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Configure fcntl.h.
 
diff --git a/gl/m4/fflush.m4 b/gl/m4/fflush.m4
index 43fc3bf3..399065b6 100644
--- a/gl/m4/fflush.m4
+++ b/gl/m4/fflush.m4
@@ -1,9 +1,10 @@
 # fflush.m4
-# serial 19
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 20
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Eric Blake
 
@@ -79,8 +80,9 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
        [gl_cv_func_fflush_stdin=yes],
        [gl_cv_func_fflush_stdin=no],
        [case "$host_os" in
-                             # Guess no on native Windows.
-          mingw* | windows*) gl_cv_func_fflush_stdin="guessing no" ;;
+                             # Guess no on NetBSD, OpenBSD, native Windows.
+          netbsd* | openbsd* | mingw* | windows*)
+                             gl_cv_func_fflush_stdin="guessing no" ;;
           *)                 gl_cv_func_fflush_stdin=cross ;;
         esac
        ])
@@ -92,8 +94,8 @@ AC_DEFUN([gl_FUNC_FFLUSH_STDIN],
     *)    gl_func_fflush_stdin='(-1)' ;;
   esac
   AC_DEFINE_UNQUOTED([FUNC_FFLUSH_STDIN], [$gl_func_fflush_stdin],
-    [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008,
-     0 if fflush is known to not work, -1 if unknown.])
+    [Define to 1 if fflush is known to work on stdin as per POSIX.1-2008
+     or later, 0 if fflush is known to not work, -1 if unknown.])
 ])
 
 # Prerequisites of lib/fflush.c.
diff --git a/gl/m4/float_h.m4 b/gl/m4/float_h.m4
index c95d4171..8580c9c9 100644
--- a/gl/m4/float_h.m4
+++ b/gl/m4/float_h.m4
@@ -1,9 +1,10 @@
 # float_h.m4
-# serial 14
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+# serial 15
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FLOAT_H],
 [
@@ -54,6 +55,31 @@ changequote([,])dnl
       ;;
   esac
 
+  dnl Test for completeness w.r.t. ISO C 23.
+  REPLACE_FLOAT_SNAN=0
+  AC_CACHE_CHECK([whether float.h conforms to ISO C23],
+    [gl_cv_header_float_h_isoc23],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <float.h>
+            int x[] = { FLT_DECIMAL_DIG, DBL_DECIMAL_DIG, LDBL_DECIMAL_DIG };
+            float maxf = FLT_NORM_MAX;
+            double maxd = DBL_NORM_MAX;
+            long double maxl = LDBL_NORM_MAX;
+          ]],
+          [[float sf = FLT_SNAN;
+            double sd = DBL_SNAN;
+            long double sl = LDBL_SNAN;
+            return (sf != 0) + (sd != 0) + (sl != 0);
+          ]])],
+       [gl_cv_header_float_h_isoc23=yes],
+       [gl_cv_header_float_h_isoc23=no])
+    ])
+  if test $gl_cv_header_float_h_isoc23 != yes; then
+    GL_GENERATE_FLOAT_H=true
+    REPLACE_FLOAT_SNAN=1
+  fi
+
   dnl Test against glibc-2.7 Linux/SPARC64 bug.
   REPLACE_ITOLD=0
   AC_CACHE_CHECK([whether conversion from 'int' to 'long double' works],
diff --git a/gl/m4/floorf.m4 b/gl/m4/floorf.m4
index 2572c848..cb75fce9 100644
--- a/gl/m4/floorf.m4
+++ b/gl/m4/floorf.m4
@@ -1,9 +1,10 @@
 # floorf.m4
 # serial 21
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FLOORF],
 [
diff --git a/gl/m4/fopen.m4 b/gl/m4/fopen.m4
index f3b7aadd..e27b3270 100644
--- a/gl/m4/fopen.m4
+++ b/gl/m4/fopen.m4
@@ -1,9 +1,10 @@
 # fopen.m4
 # serial 16
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FOPEN_ITSELF],
 [
diff --git a/gl/m4/fpurge.m4 b/gl/m4/fpurge.m4
index a77f5b96..408a2579 100644
--- a/gl/m4/fpurge.m4
+++ b/gl/m4/fpurge.m4
@@ -1,65 +1,65 @@
 # fpurge.m4
-# serial 14
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+# serial 16
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FPURGE],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_HEADERS_ONCE([stdio_ext.h])
   AC_CHECK_FUNCS_ONCE([fpurge])
   gl_CHECK_FUNCS_ANDROID([__fpurge], [[#include <stdio_ext.h>]])
   AC_CHECK_DECLS([fpurge], , , [[#include <stdio.h>]])
-  if test "x$ac_cv_func_fpurge" = xyes; then
+  if test $ac_cv_func_fpurge = yes; then
     HAVE_FPURGE=1
     # Detect BSD bug.  Only cygwin 1.7 and musl are known to be immune.
     AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works],
-      [AC_RUN_IFELSE(
-         [AC_LANG_PROGRAM(
-            [[#include <stdio.h>
-]],
-            [[FILE *f = fopen ("conftest.txt", "w+");
-              if (!f)
-                return 1;
-              if (fputc ('a', f) != 'a')
-                { fclose (f); return 2; }
-              rewind (f);
-              if (fgetc (f) != 'a')
-                { fclose (f); return 3; }
-              if (fgetc (f) != EOF)
-                { fclose (f); return 4; }
-              if (fpurge (f) != 0)
-                { fclose (f); return 5; }
-              if (putc ('b', f) != 'b')
-                { fclose (f); return 6; }
-              if (fclose (f) != 0)
-                return 7;
-              if ((f = fopen ("conftest.txt", "r")) == NULL)
-                return 8;
-              if (fgetc (f) != 'a')
-                { fclose (f); return 9; }
-              if (fgetc (f) != 'b')
-                { fclose (f); return 10; }
-              if (fgetc (f) != EOF)
-                { fclose (f); return 11; }
-              if (fclose (f) != 0)
-                return 12;
-              if (remove ("conftest.txt") != 0)
-                return 13;
-              return 0;
-            ]])],
-         [gl_cv_func_fpurge_works=yes],
-         [gl_cv_func_fpurge_works=no],
-         [case "$host_os" in
-                                # Guess yes on musl systems.
-            *-musl* | midipix*) gl_cv_func_fpurge_works="guessing yes" ;;
-                                # Otherwise obey --enable-cross-guesses.
-            *)                  gl_cv_func_fpurge_works="$gl_cross_guess_normal" ;;
-          esac
-         ])
+      [if test $ac_cv_have_decl_fpurge = yes; then
+         AC_RUN_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <stdio.h>
+              ]],
+              [[FILE *f = fopen ("conftest.txt", "w+");
+                if (!f)
+                  return 1;
+                if (fputc ('a', f) != 'a')
+                  { fclose (f); return 2; }
+                rewind (f);
+                if (fgetc (f) != 'a')
+                  { fclose (f); return 3; }
+                if (fgetc (f) != EOF)
+                  { fclose (f); return 4; }
+                if (fpurge (f) != 0)
+                  { fclose (f); return 5; }
+                if (putc ('b', f) != 'b')
+                  { fclose (f); return 6; }
+                if (fclose (f) != 0)
+                  return 7;
+                if ((f = fopen ("conftest.txt", "r")) == NULL)
+                  return 8;
+                if (fgetc (f) != 'a')
+                  { fclose (f); return 9; }
+                if (fgetc (f) != 'b')
+                  { fclose (f); return 10; }
+                if (fgetc (f) != EOF)
+                  { fclose (f); return 11; }
+                if (fclose (f) != 0)
+                  return 12;
+                if (remove ("conftest.txt") != 0)
+                  return 13;
+                return 0;
+              ]])],
+           [gl_cv_func_fpurge_works=yes],
+           [gl_cv_func_fpurge_works=no],
+           [# Obey --enable-cross-guesses.
+            gl_cv_func_fpurge_works="$gl_cross_guess_normal"
+           ])
+       else
+         gl_cv_func_fpurge_works=no
+       fi
       ])
     case "$gl_cv_func_fpurge_works" in
       *yes) ;;
diff --git a/gl/m4/freading.m4 b/gl/m4/freading.m4
index be899456..373d2bff 100644
--- a/gl/m4/freading.m4
+++ b/gl/m4/freading.m4
@@ -1,9 +1,10 @@
 # freading.m4
 # serial 3
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FREADING],
 [
diff --git a/gl/m4/free.m4 b/gl/m4/free.m4
index a2b596d6..485d8243 100644
--- a/gl/m4/free.m4
+++ b/gl/m4/free.m4
@@ -1,9 +1,10 @@
 # free.m4
 # serial 6
-dnl Copyright (C) 2003-2005, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2005, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Written by Paul Eggert and Bruno Haible.
 
diff --git a/gl/m4/fseek.m4 b/gl/m4/fseek.m4
index fb220a1f..ce728f60 100644
--- a/gl/m4/fseek.m4
+++ b/gl/m4/fseek.m4
@@ -1,9 +1,10 @@
 # fseek.m4
 # serial 4
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FSEEK],
 [
diff --git a/gl/m4/fseeko.m4 b/gl/m4/fseeko.m4
index 5682a1f2..c093d399 100644
--- a/gl/m4/fseeko.m4
+++ b/gl/m4/fseeko.m4
@@ -1,9 +1,10 @@
 # fseeko.m4
-# serial 20
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 21
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FSEEKO],
 [
@@ -69,6 +70,10 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET],
 # Prerequisites of lib/fseeko.c.
 AC_DEFUN([gl_PREREQ_FSEEKO],
 [
+  if test $gl_cv_func_fseeko != no; then
+    AC_DEFINE([HAVE_FSEEKO], [1],
+      [Define to 1 if the system has the fseeko function.])
+  fi
   dnl Native Windows has the function _fseeki64. mingw hides it in some
   dnl circumstances, but mingw64 makes it usable again.
   AC_CHECK_FUNCS([_fseeki64])
diff --git a/gl/m4/fseterr.m4 b/gl/m4/fseterr.m4
new file mode 100644
index 00000000..3a94c288
--- /dev/null
+++ b/gl/m4/fseterr.m4
@@ -0,0 +1,15 @@
+# fseterr.m4
+# serial 2
+dnl Copyright (C) 2012-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN([gl_FUNC_FSETERR],
+[
+  gl_CHECK_FUNCS_ANDROID([__fseterr],
+    [[#include <stdio.h>
+      #include <stdio_ext.h>
+    ]])
+])
diff --git a/gl/m4/fstat.m4 b/gl/m4/fstat.m4
index 47777b0c..e89bbc32 100644
--- a/gl/m4/fstat.m4
+++ b/gl/m4/fstat.m4
@@ -1,9 +1,10 @@
 # fstat.m4
 # serial 10
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FSTAT],
 [
diff --git a/gl/m4/fstypename.m4 b/gl/m4/fstypename.m4
index 05a68805..4407b765 100644
--- a/gl/m4/fstypename.m4
+++ b/gl/m4/fstypename.m4
@@ -1,10 +1,11 @@
 # fstypename.m4
 # serial 6
-dnl Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2024 Free Software
+dnl Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2025 Free Software
 dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Jim Meyering.
 dnl
diff --git a/gl/m4/fsusage.m4 b/gl/m4/fsusage.m4
index 1ce90660..bb7b6e43 100644
--- a/gl/m4/fsusage.m4
+++ b/gl/m4/fsusage.m4
@@ -1,9 +1,11 @@
 # fsusage.m4
 # serial 35
-dnl Copyright (C) 1997-1998, 2000-2001, 2003-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-1998, 2000-2001, 2003-2025 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Obtaining file system usage information.
 
diff --git a/gl/m4/ftell.m4 b/gl/m4/ftell.m4
index ab10736b..d5610b70 100644
--- a/gl/m4/ftell.m4
+++ b/gl/m4/ftell.m4
@@ -1,9 +1,10 @@
 # ftell.m4
 # serial 3
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FTELL],
 [
diff --git a/gl/m4/ftello.m4 b/gl/m4/ftello.m4
index 0eb8fa0d..35d30f98 100644
--- a/gl/m4/ftello.m4
+++ b/gl/m4/ftello.m4
@@ -1,9 +1,10 @@
 # ftello.m4
-# serial 16
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 17
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_FTELLO],
 [
@@ -157,6 +158,10 @@ main (void)
 # Prerequisites of lib/ftello.c.
 AC_DEFUN([gl_PREREQ_FTELLO],
 [
+  if test $gl_cv_func_ftello != no; then
+    AC_DEFINE([HAVE_FTELLO], [1],
+      [Define to 1 if the system has the ftello function.])
+  fi
   dnl Native Windows has the function _ftelli64. mingw hides it, but mingw64
   dnl makes it usable again.
   AC_CHECK_FUNCS([_ftelli64])
diff --git a/gl/m4/getaddrinfo.m4 b/gl/m4/getaddrinfo.m4
index 8e209177..2931d526 100644
--- a/gl/m4/getaddrinfo.m4
+++ b/gl/m4/getaddrinfo.m4
@@ -1,14 +1,16 @@
 # getaddrinfo.m4
-# serial 35
-dnl Copyright (C) 2004-2024 Free Software Foundation, Inc.
+# serial 38
+dnl Copyright (C) 2004-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_GETADDRINFO],
 [
   AC_REQUIRE([gl_SYS_SOCKET_H])dnl for HAVE_SYS_SOCKET_H, HAVE_WINSOCK2_H
   AC_REQUIRE([gl_NETDB_H])dnl for HAVE_NETDB_H
+  AC_REQUIRE([AC_CANONICAL_HOST])
   GETADDRINFO_LIB=
   gai_saved_LIBS="$LIBS"
 
@@ -87,6 +89,46 @@ int getaddrinfo (const char *, const char *, const struct addrinfo *, struct add
       HAVE_GETADDRINFO=0
     fi
   fi
+  if test $HAVE_GETADDRINFO != 0; then
+    AC_CACHE_CHECK([whether getaddrinfo supports AI_NUMERICSERV],
+      [gl_cv_func_getaddrinfo_works],
+      [AC_RUN_IFELSE(
+         [AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+#include <stddef.h>
+#include <string.h>
+            ]], [[
+              struct addrinfo hints;
+              struct addrinfo *ai;
+              memset (&hints, 0, sizeof (hints));
+              hints.ai_flags = AI_NUMERICSERV;
+              return getaddrinfo ("www.gnu.org", "http", &hints, &ai) != EAI_NONAME;
+            ]])
+         ],
+         [gl_cv_func_getaddrinfo_works=yes],
+         [gl_cv_func_getaddrinfo_works=no],
+         [case "$host_os" in
+                               # Guess no on native Windows.
+            mingw* | windows*) gl_cv_func_getaddrinfo_works="guessing no" ;;
+                               # Guess yes otherwise.
+            *)                 gl_cv_func_getaddrinfo_works="guessing yes" ;;
+          esac
+         ])
+      ])
+    case "$gl_cv_func_getaddrinfo_works" in
+      *yes) ;;
+      *) REPLACE_GETADDRINFO=1 ;;
+    esac
+  fi
   AC_DEFINE_UNQUOTED([HAVE_GETADDRINFO], [$HAVE_GETADDRINFO],
     [Define to 1 if getaddrinfo exists, or to 0 otherwise.])
 
diff --git a/gl/m4/getdelim.m4 b/gl/m4/getdelim.m4
index 61139039..63d88306 100644
--- a/gl/m4/getdelim.m4
+++ b/gl/m4/getdelim.m4
@@ -1,11 +1,12 @@
 # getdelim.m4
 # serial 19
 
-dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2025 Free Software Foundation, Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_PREREQ([2.59])
 
diff --git a/gl/m4/getdtablesize.m4 b/gl/m4/getdtablesize.m4
index aaefe9b2..112c1c4d 100644
--- a/gl/m4/getdtablesize.m4
+++ b/gl/m4/getdtablesize.m4
@@ -1,9 +1,10 @@
 # getdtablesize.m4
 # serial 8
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_GETDTABLESIZE],
 [
diff --git a/gl/m4/gethostname.m4 b/gl/m4/gethostname.m4
index 2f743b7d..be71ff78 100644
--- a/gl/m4/gethostname.m4
+++ b/gl/m4/gethostname.m4
@@ -1,9 +1,10 @@
 # gethostname.m4
 # serial 16
-dnl Copyright (C) 2002, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Ensure
 # - the gethostname() function,
diff --git a/gl/m4/getline.m4 b/gl/m4/getline.m4
index 36513cd4..b97b8011 100644
--- a/gl/m4/getline.m4
+++ b/gl/m4/getline.m4
@@ -1,12 +1,13 @@
 # getline.m4
 # serial 33
 
-dnl Copyright (C) 1998-2003, 2005-2007, 2009-2024 Free Software Foundation,
+dnl Copyright (C) 1998-2003, 2005-2007, 2009-2025 Free Software Foundation,
 dnl Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_PREREQ([2.59])
 
diff --git a/gl/m4/getloadavg.m4 b/gl/m4/getloadavg.m4
index 0918bcd2..8ab613db 100644
--- a/gl/m4/getloadavg.m4
+++ b/gl/m4/getloadavg.m4
@@ -1,10 +1,11 @@
 # getloadavg.m4
 # serial 13
-dnl Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2024 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2025 Free
+dnl Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Check for getloadavg.
 
diff --git a/gl/m4/getopt.m4 b/gl/m4/getopt.m4
index 297722ea..cb344c15 100644
--- a/gl/m4/getopt.m4
+++ b/gl/m4/getopt.m4
@@ -1,9 +1,10 @@
 # getopt.m4
-# serial 49
-dnl Copyright (C) 2002-2006, 2008-2024 Free Software Foundation, Inc.
+# serial 50
+dnl Copyright (C) 2002-2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Request a POSIX compliant getopt function.
 AC_DEFUN([gl_FUNC_GETOPT_POSIX],
@@ -77,7 +78,7 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS],
   fi
 
   dnl POSIX 2008 does not specify leading '+' behavior, but see
-  dnl http://austingroupbugs.net/view.php?id=191 for a recommendation on
+  dnl https://austingroupbugs.net/view.php?id=191 for a recommendation on
   dnl the next version of POSIX.  For now, we only guarantee leading '+'
   dnl behavior with getopt-gnu.
   if test -z "$gl_replace_getopt"; then
@@ -366,14 +367,7 @@ dnl is ambiguous with environment values that contain newlines.
 
 AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER],
 [
-  AC_CHECK_HEADERS_ONCE([sys/cdefs.h])
-  if test $ac_cv_header_sys_cdefs_h = yes; then
-    HAVE_SYS_CDEFS_H=1
-  else
-    HAVE_SYS_CDEFS_H=0
-  fi
-  AC_SUBST([HAVE_SYS_CDEFS_H])
-
+  gl_CHECK_HEADER_SYS_CDEFS_H
   AC_DEFINE([__GETOPT_PREFIX], [[rpl_]],
     [Define to rpl_ if the getopt replacement functions and variables
      should be used.])
diff --git a/gl/m4/getprogname.m4 b/gl/m4/getprogname.m4
index b24f4480..90f34c74 100644
--- a/gl/m4/getprogname.m4
+++ b/gl/m4/getprogname.m4
@@ -1,9 +1,10 @@
 # getprogname.m4
 # serial 8
-dnl Copyright (C) 2016-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2016-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Check for getprogname or replacements for it
 
diff --git a/gl/m4/gl-openssl.m4 b/gl/m4/gl-openssl.m4
index c5e1f7ba..3cfea50f 100644
--- a/gl/m4/gl-openssl.m4
+++ b/gl/m4/gl-openssl.m4
@@ -1,9 +1,10 @@
 # gl-openssl.m4
 # serial 7
-dnl Copyright (C) 2013-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2013-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_SET_CRYPTO_CHECK_DEFAULT],
 [
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index fcf84226..6a6e8593 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2024 Free Software Foundation, Inc.
+# Copyright (C) 2002-2025 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4
index cb730449..034dae69 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,9 +1,10 @@
 # gnulib-common.m4
-# serial 93
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 113
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_PREREQ([2.62])
 
@@ -20,43 +21,61 @@ AC_DEFUN([gl_COMMON_BODY], [
 [/* Witness that <config.h> has been included.  */
 #define _GL_CONFIG_H_INCLUDED 1
 ])
+  dnl Avoid warnings from gcc -Wtrailing-whitespace.
+  dnl This is a temporary workaround until Autoconf fixes it.
+  dnl Test case:
+  dnl empty1=; empty2=; AC_DEFINE_UNQUOTED([FOO], [$empty1$empty2], [...])
+  dnl should produce "#define FOO /**/", not "#define FOO ".
+  AH_TOP([#if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wtrailing-whitespace"
+#endif
+])
+  AH_BOTTOM([#if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+# pragma GCC diagnostic pop
+#endif
+])
   AH_VERBATIM([_GL_GNUC_PREREQ],
-[/* True if the compiler says it groks GNU C version MAJOR.MINOR.  */
-#if defined __GNUC__ && defined __GNUC_MINOR__
+[/* True if the compiler says it groks GNU C version MAJOR.MINOR.
+    Except that
+      - clang groks GNU C 4.2, even on Windows, where it does not define
+        __GNUC__.
+      - The OpenMandriva-modified clang compiler pretends that it groks
+        GNU C version 13.1, but it doesn't: It does not support
+        __attribute__ ((__malloc__ (f, i))), nor does it support
+        __attribute__ ((__warning__ (message))) on a function redeclaration.
+      - Users can make clang lie as well, through the -fgnuc-version option.  */
+#if defined __GNUC__ && defined __GNUC_MINOR__ && !defined __clang__
 # define _GL_GNUC_PREREQ(major, minor) \
     ((major) < __GNUC__ + ((minor) <= __GNUC_MINOR__))
+#elif defined __clang__
+  /* clang really only groks GNU C 4.2.  */
+# define _GL_GNUC_PREREQ(major, minor) \
+    ((major) < 4 + ((minor) <= 2))
 #else
 # define _GL_GNUC_PREREQ(major, minor) 0
 #endif
 ])
   AH_VERBATIM([_Noreturn],
-[/* The _Noreturn keyword of C11.  */
+[/* The _Noreturn keyword of C11.
+   Do not use [[noreturn]], because with it the syntax
+     extern _Noreturn void func (...);
+   would not be valid; such a declaration would be valid only with 'extern'
+   and '_Noreturn' swapped, or without the 'extern' keyword.  However, some
+   AIX system header files and several gnulib header files use precisely
+   this syntax with 'extern'.  So even though C23 deprecates _Noreturn,
+   it is currently more portable to prefer it to [[noreturn]].
+
+   Also, do not try to work around LLVM bug 59792 (clang 15 or earlier).
+   This rare bug can be worked around by compiling with 'clang -D_Noreturn=',
+   though the workaround may generate many false-alarm warnings.  */
 #ifndef _Noreturn
-# if (defined __cplusplus \
-      && ((201103 <= __cplusplus && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) \
-          || (defined _MSC_VER && 1900 <= _MSC_VER)) \
-      && 0)
-    /* [[noreturn]] is not practically usable, because with it the syntax
-         extern _Noreturn void func (...);
-       would not be valid; such a declaration would only be valid with 'extern'
-       and '_Noreturn' swapped, or without the 'extern' keyword.  However, some
-       AIX system header files and several gnulib header files use precisely
-       this syntax with 'extern'.  */
-#  define _Noreturn [[noreturn]]
-# elif (defined __clang__ && __clang_major__ < 16 \
-        && defined _GL_WORK_AROUND_LLVM_BUG_59792)
-   /* Compile with -D_GL_WORK_AROUND_LLVM_BUG_59792 to work around
-      that rare LLVM bug, though you may get many false-alarm warnings.  */
-#  define _Noreturn
-# elif ((!defined __cplusplus || defined __clang__) \
-        && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) \
-            || (!defined __STRICT_ANSI__ \
-                && (_GL_GNUC_PREREQ (4, 7) \
-                    || (defined __apple_build_version__ \
-                        ? 6000000 <= __apple_build_version__ \
-                        : 3 < __clang_major__ + (5 <= __clang_minor__))))))
+# if ((!defined __cplusplus || defined __clang__) \
+      && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0)))
    /* _Noreturn works as-is.  */
 # elif _GL_GNUC_PREREQ (2, 8) || defined __clang__ || 0x5110 <= __SUNPRO_C
+   /* Prefer __attribute__ ((__noreturn__)) to plain _Noreturn even if the
+      latter works, as 'gcc -std=gnu99 -Wpedantic' warns about _Noreturn.  */
 #  define _Noreturn __attribute__ ((__noreturn__))
 # elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0)
 #  define _Noreturn __declspec (noreturn)
@@ -90,6 +109,9 @@ AC_DEFUN([gl_COMMON_BODY], [
 #  define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
 # else
 #  define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
+/* The following lines list the first GCC version that supports the attribute.
+   Although the lines are not used in GCC 5 and later (as GCC 5 introduced
+   __has_attribute support), list GCC versions 5+ anyway for completeness.  */
 #  define _GL_ATTR_alloc_size _GL_GNUC_PREREQ (4, 3)
 #  define _GL_ATTR_always_inline _GL_GNUC_PREREQ (3, 2)
 #  define _GL_ATTR_artificial _GL_GNUC_PREREQ (4, 3)
@@ -110,12 +132,15 @@ AC_DEFUN([gl_COMMON_BODY], [
 #  endif
 #  define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1)
 #  define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3)
+#  define _GL_ATTR_nonnull_if_nonzero _GL_GNUC_PREREQ (15, 1)
 #  define _GL_ATTR_nonstring _GL_GNUC_PREREQ (8, 0)
 #  define _GL_ATTR_nothrow _GL_GNUC_PREREQ (3, 3)
 #  define _GL_ATTR_packed _GL_GNUC_PREREQ (2, 7)
 #  define _GL_ATTR_pure _GL_GNUC_PREREQ (2, 96)
+#  define _GL_ATTR_reproducible _GL_GNUC_PREREQ (15, 1)
 #  define _GL_ATTR_returns_nonnull _GL_GNUC_PREREQ (4, 9)
 #  define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0)
+#  define _GL_ATTR_unsequenced _GL_GNUC_PREREQ (15, 1)
 #  define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7)
 #  define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4)
 # endif
@@ -131,6 +156,23 @@ AC_DEFUN([gl_COMMON_BODY], [
 # define _GL_HAVE___HAS_C_ATTRIBUTE 0
 #endif
 
+/* Attributes in bracket syntax [[...]] vs. attributes in __attribute__((...))
+   syntax, in function declarations.  There are two problems here.
+   (Last tested with gcc/g++ 14 and clang/clang++ 18.)
+
+   1) We want that the _GL_ATTRIBUTE_* can be cumulated on the same declaration
+      in any order.
+      =========================== foo.c = foo.cc ===========================
+      __attribute__ ((__deprecated__)) [[__nodiscard__]] int bar1 (int);
+      [[__nodiscard__]] __attribute__ ((__deprecated__)) int bar2 (int);
+      ======================================================================
+      This gives a syntax error
+        - in C mode with gcc
+          <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108796>, and
+        - in C++ mode with clang++ version < 16, and
+        - in C++ mode, inside extern "C" {}, still in newer clang++ versions
+          <https://github.com/llvm/llvm-project/issues/101990>.
+ */
 /* Define if, in a function declaration, the attributes in bracket syntax
    [[...]] must come before the attributes in __attribute__((...)) syntax.
    If this is defined, it is best to avoid the bracket syntax, so that the
@@ -145,6 +187,176 @@ AC_DEFUN([gl_COMMON_BODY], [
 #  define _GL_BRACKET_BEFORE_ATTRIBUTE 1
 # endif
 #endif
+/*
+   2) We want that the _GL_ATTRIBUTE_* can be placed in a declaration
+        - without 'extern', in C as well as in C++,
+        - with 'extern', in C,
+        - with 'extern "C"', in C++
+      in the same position.  That is, we don't want to be forced to use a
+      macro which arranges for the attribute to come before 'extern' in
+      one case and after 'extern' in the other case, because such a macro
+      would make the source code of .h files pretty ugly.
+      =========================== foo.c = foo.cc ===========================
+      #ifdef __cplusplus
+      # define CC "C"
+      #else
+      # define CC
+      #endif
+
+      #define ND   [[__nodiscard__]]
+      #define WUR  __attribute__((__warn_unused_result__))
+
+      #ifdef __cplusplus
+      extern "C" {
+      #endif
+                                        // gcc   clang  g++   clang++
+
+      ND int foo (int);
+      int ND foo (int);                 // warn  error  warn  error
+      int foo ND (int);
+      int foo (int) ND;                 // warn  error  warn  error
+
+      WUR int foo (int);
+      int WUR foo (int);
+      int fo1 WUR (int);                // error error  error error
+      int foo (int) WUR;
+
+      #ifdef __cplusplus
+      }
+      #endif
+
+                                        // gcc   clang  g++   clang++
+
+      ND extern CC int foo (int);       //              error error
+      extern CC ND int foo (int);       // error error
+      extern CC int ND foo (int);       // warn  error  warn  error
+      extern CC int foo ND (int);
+      extern CC int foo (int) ND;       // warn  error  warn  error
+
+      WUR extern CC int foo (int);      //              warn
+      extern CC WUR int foo (int);
+      extern CC int WUR foo (int);
+      extern CC int foo WUR (int);      // error error  error error
+      extern CC int foo (int) WUR;
+
+      ND EXTERN_C_FUNC int foo (int);   //              error error
+      EXTERN_C_FUNC ND int foo (int);
+      EXTERN_C_FUNC int ND foo (int);   // warn  error  warn  error
+      EXTERN_C_FUNC int foo ND (int);
+      EXTERN_C_FUNC int foo (int) ND;   // warn  error  warn  error
+
+      WUR EXTERN_C_FUNC int foo (int);  //              warn
+      EXTERN_C_FUNC WUR int foo (int);
+      EXTERN_C_FUNC int WUR foo (int);
+      EXTERN_C_FUNC int fo2 WUR (int);  // error error  error error
+      EXTERN_C_FUNC int foo (int) WUR;
+      ======================================================================
+      So, if we insist on using the 'extern' keyword ('extern CC' idiom):
+        * If _GL_ATTRIBUTE_* expands to bracket syntax [[...]]
+          in both C and C++, there is one available position:
+            - between the function name and the parameter list.
+        * If _GL_ATTRIBUTE_* expands to __attribute__((...)) syntax
+          in both C and C++, there are several available positions:
+            - before the return type,
+            - between return type and function name,
+            - at the end of the declaration.
+        * If _GL_ATTRIBUTE_* expands to bracket syntax [[...]] in C and to
+          __attribute__((...)) syntax in C++, there is no available position:
+          it would need to come before 'extern' in C but after 'extern "C"'
+          in C++.
+        * If _GL_ATTRIBUTE_* expands to __attribute__((...)) syntax in C and
+          to bracket syntax [[...]] in C++, there is one available position:
+            - before the return type.
+      Whereas, if we use the 'EXTERN_C_FUNC' idiom, which conditionally
+      omits the 'extern' keyword:
+        * If _GL_ATTRIBUTE_* expands to bracket syntax [[...]]
+          in both C and C++, there are two available positions:
+            - before the return type,
+            - between the function name and the parameter list.
+        * If _GL_ATTRIBUTE_* expands to __attribute__((...)) syntax
+          in both C and C++, there are several available positions:
+            - before the return type,
+            - between return type and function name,
+            - at the end of the declaration.
+        * If _GL_ATTRIBUTE_* expands to bracket syntax [[...]] in C and to
+          __attribute__((...)) syntax in C++, there is one available position:
+            - before the return type.
+        * If _GL_ATTRIBUTE_* expands to __attribute__((...)) syntax in C and
+          to bracket syntax [[...]] in C++, there is one available position:
+            - before the return type.
+      The best choice is therefore to use the 'EXTERN_C_FUNC' idiom and
+      put the attributes before the return type. This works regardless
+      to what the _GL_ATTRIBUTE_* macros expand.
+ */
+
+/* Attributes in bracket syntax [[...]] vs. attributes in __attribute__((...))
+   syntax, in static/inline function definitions.
+
+   There are similar constraints as for function declarations.  However, here,
+   we cannot omit the storage-class specifier.  Therefore, the following rule
+   applies:
+     * The macros
+         _GL_ATTRIBUTE_CONST
+         _GL_ATTRIBUTE_DEPRECATED
+         _GL_ATTRIBUTE_MAYBE_UNUSED
+         _GL_ATTRIBUTE_NODISCARD
+         _GL_ATTRIBUTE_PURE
+         _GL_ATTRIBUTE_REPRODUCIBLE
+         _GL_ATTRIBUTE_UNSEQUENCED
+       which may expand to bracket syntax [[...]], must come first, before the
+       storage-class specifier.
+     * Other _GL_ATTRIBUTE_* macros, that expand to __attribute__((...)) syntax,
+       are better placed between the storage-class specifier and the return
+       type.
+ */
+
+/* Attributes in bracket syntax [[...]] vs. attributes in __attribute__((...))
+   syntax, in variable declarations.
+
+   At which position can they be placed?
+   (Last tested with gcc/g++ 14 and clang/clang++ 18.)
+
+      =========================== foo.c = foo.cc ===========================
+      #ifdef __cplusplus
+      # define CC "C"
+      #else
+      # define CC
+      #endif
+
+      #define BD   [[__deprecated__]]
+      #define AD   __attribute__ ((__deprecated__))
+
+                              // gcc   clang  g++    clang++
+
+      BD extern CC int var;   //              error  error
+      extern CC BD int var;   // error error
+      extern CC int BD var;   // warn  error  warn   error
+      extern CC int var BD;
+
+      AD extern CC int var;   //              warn
+      extern CC AD int var;
+      extern CC int AD var;
+      extern CC int var AD;
+
+      BD extern CC int z[];   //              error  error
+      extern CC BD int z[];   // error error
+      extern CC int BD z[];   // warn  error  warn   error
+      extern CC int z1 BD [];
+      extern CC int z[] BD;   // warn  error         error
+
+      AD extern CC int z[];   //              warn
+      extern CC AD int z[];
+      extern CC int AD z[];
+      extern CC int z2 AD []; // error error  error  error
+      extern CC int z[] AD;
+      ======================================================================
+
+   * For non-array variables, the only good position is after the variable name,
+     that is, at the end of the declaration.
+   * For array variables, you will need to distinguish C and C++:
+       - In C, before the 'extern' keyword.
+       - In C++, between the 'extern "C"' and the variable's type.
+ */
 ]dnl There is no _GL_ATTRIBUTE_ALIGNED; use stdalign's alignas instead.
 [
 /* _GL_ATTRIBUTE_ALLOC_SIZE ((N)) declares that the Nth argument of the function
@@ -152,7 +364,7 @@ AC_DEFUN([gl_COMMON_BODY], [
    _GL_ATTRIBUTE_ALLOC_SIZE ((M, N)) declares that the Mth argument multiplied
    by the Nth argument of the function is the size of the returned memory block.
  */
-/* Applies to: function, pointer to function, function types.  */
+/* Applies to: functions, pointer to functions, function types.  */
 #ifndef _GL_ATTRIBUTE_ALLOC_SIZE
 # if _GL_HAS_ATTRIBUTE (alloc_size)
 #  define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
@@ -163,7 +375,7 @@ AC_DEFUN([gl_COMMON_BODY], [
 
 /* _GL_ATTRIBUTE_ALWAYS_INLINE tells that the compiler should always inline the
    function and report an error if it cannot do so.  */
-/* Applies to: function.  */
+/* Applies to: functions.  */
 #ifndef _GL_ATTRIBUTE_ALWAYS_INLINE
 # if _GL_HAS_ATTRIBUTE (always_inline)
 #  define _GL_ATTRIBUTE_ALWAYS_INLINE __attribute__ ((__always_inline__))
@@ -175,7 +387,7 @@ AC_DEFUN([gl_COMMON_BODY], [
 /* _GL_ATTRIBUTE_ARTIFICIAL declares that the function is not important to show
     in stack traces when debugging.  The compiler should omit the function from
     stack traces.  */
-/* Applies to: function.  */
+/* Applies to: functions.  */
 #ifndef _GL_ATTRIBUTE_ARTIFICIAL
 # if _GL_HAS_ATTRIBUTE (artificial)
 #  define _GL_ATTRIBUTE_ARTIFICIAL __attribute__ ((__artificial__))
@@ -201,18 +413,23 @@ AC_DEFUN([gl_COMMON_BODY], [
 # endif
 #endif
 
-/* _GL_ATTRIBUTE_CONST declares that it is OK for a compiler to omit duplicate
-   calls to the function with the same arguments.
-   This attribute is safe for a function that neither depends on nor affects
-   observable state, and always returns exactly once - e.g., does not loop
-   forever, and does not call longjmp.
-   (This attribute is stricter than _GL_ATTRIBUTE_PURE.)  */
+/* _GL_ATTRIBUTE_CONST declares:
+   It is OK for a compiler to move calls to the function and to omit
+   calls to the function if another call has the same arguments or the
+   result is not used.
+   This attribute is safe for a function that neither depends on
+   nor affects state, and always returns exactly once -
+   e.g., does not raise an exception, call longjmp, or loop forever.
+   (This attribute is stricter than _GL_ATTRIBUTE_PURE because the
+   function cannot observe state.  It is stricter than
+   _GL_ATTRIBUTE_UNSEQUENCED because the function must return exactly
+   once and cannot depend on state addressed by its arguments.)  */
 /* Applies to: functions.  */
 #ifndef _GL_ATTRIBUTE_CONST
 # if _GL_HAS_ATTRIBUTE (const)
 #  define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
 # else
-#  define _GL_ATTRIBUTE_CONST
+#  define _GL_ATTRIBUTE_CONST _GL_ATTRIBUTE_UNSEQUENCED
 # endif
 #endif
 
@@ -460,6 +677,17 @@ AC_DEFUN([gl_COMMON_BODY], [
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NONNULL_IF_NONZERO (NP, NI) declares that the argument NP
+   (a pointer) must not be NULL if the argument NI (an integer) is != 0.  */
+/* Applies to: functions.  */
+#ifndef _GL_ATTRIBUTE_NONNULL_IF_NONZERO
+# if _GL_HAS_ATTRIBUTE (nonnull_if_nonzero)
+#  define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni) __attribute__ ((__nonnull_if_nonzero__ (np, ni)))
+# else
+#  define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni)
+# endif
+#endif
+
 /* _GL_ATTRIBUTE_NONSTRING declares that the contents of a character array is
    not meant to be NUL-terminated.  */
 /* Applies to: struct/union members and variables that are arrays of element
@@ -481,7 +709,7 @@ AC_DEFUN([gl_COMMON_BODY], [
    other attributes.  */
 #ifndef _GL_ATTRIBUTE_NOTHROW
 # if defined __cplusplus
-#  if _GL_GNUC_PREREQ (2, 8) || __clang_major >= 4
+#  if _GL_GNUC_PREREQ (2, 8) || __clang_major__ >= 4
 #   if __cplusplus >= 201103L
 #    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
 #   else
@@ -505,9 +733,9 @@ AC_DEFUN([gl_COMMON_BODY], [
    minimizing the memory required.  */
 /* Applies to: struct members, struct, union,
    in C++ also: class.  */
+#ifndef _GL_ATTRIBUTE_PACKED
 /* Oracle Studio 12.6 miscompiles code with __attribute__ ((__packed__)) despite
    __has_attribute OK.  */
-#ifndef _GL_ATTRIBUTE_PACKED
 # if _GL_HAS_ATTRIBUTE (packed) && !defined __SUNPRO_C
 #  define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__))
 # else
@@ -515,18 +743,51 @@ AC_DEFUN([gl_COMMON_BODY], [
 # endif
 #endif
 
-/* _GL_ATTRIBUTE_PURE declares that It is OK for a compiler to omit duplicate
-   calls to the function with the same arguments if observable state is not
-   changed between calls.
-   This attribute is safe for a function that does not affect
-   observable state, and always returns exactly once.
-   (This attribute is looser than _GL_ATTRIBUTE_CONST.)  */
+/* _GL_ATTRIBUTE_PURE declares:
+   It is OK for a compiler to move calls to the function and to omit
+   calls to the function if another call has the same arguments or the
+   result is not used, and if observable state is the same.
+   This attribute is safe for a function that does not affect observable state
+   and always returns exactly once.
+   (This attribute is looser than _GL_ATTRIBUTE_CONST because the function
+   can depend on observable state.  It is stricter than
+   _GL_ATTRIBUTE_REPRODUCIBLE because the function must return exactly
+   once and cannot affect state addressed by its arguments.)  */
 /* Applies to: functions.  */
 #ifndef _GL_ATTRIBUTE_PURE
 # if _GL_HAS_ATTRIBUTE (pure)
 #  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
 # else
-#  define _GL_ATTRIBUTE_PURE
+#  define _GL_ATTRIBUTE_PURE _GL_ATTRIBUTE_REPRODUCIBLE
+# endif
+#endif
+
+/* _GL_ATTRIBUTE_REPRODUCIBLE declares:
+   It is OK for a compiler to move calls to the function and to omit duplicate
+   calls to the function with the same arguments, so long as the state
+   addressed by its arguments is the same and is updated in time for
+   the rest of the program.
+   This attribute is safe for a function that is effectless and idempotent; see
+   ISO C 23 § 6.7.12.7 for a definition of these terms.
+   (This attribute is looser than _GL_ATTRIBUTE_UNSEQUENCED because
+   the function need not be stateless and idempotent.  It is looser
+   than _GL_ATTRIBUTE_PURE because the function need not return
+   exactly once and can affect state addressed by its arguments.)
+   See also <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2956.htm> and
+   <https://stackoverflow.com/questions/76847905/>.
+   ATTENTION! Efforts are underway to change the meaning of this attribute.
+   See <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3424.htm>.  */
+/* Applies to: functions, pointer to functions, function types.  */
+#ifndef _GL_ATTRIBUTE_REPRODUCIBLE
+/* This may be revisited when gcc and clang support [[reproducible]] or possibly
+   __attribute__ ((__reproducible__)).  */
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if _GL_HAS_ATTRIBUTE (reproducible)
+#   define _GL_ATTRIBUTE_REPRODUCIBLE [[reproducible]]
+#  endif
+# endif
+# ifndef _GL_ATTRIBUTE_REPRODUCIBLE
+#  define _GL_ATTRIBUTE_REPRODUCIBLE
 # endif
 #endif
 
@@ -554,6 +815,35 @@ AC_DEFUN([gl_COMMON_BODY], [
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_UNSEQUENCED declares:
+   It is OK for a compiler to move calls to the function and to omit duplicate
+   calls to the function with the same arguments, so long as the state
+   addressed by its arguments is the same.
+   This attribute is safe for a function that is effectless, idempotent,
+   stateless, and independent; see ISO C 23 § 6.7.12.7 for a definition of
+   these terms.
+   (This attribute is stricter than _GL_ATTRIBUTE_REPRODUCIBLE because
+   the function must be stateless and independent.  It is looser than
+   _GL_ATTRIBUTE_CONST because the function need not return exactly
+   once and can depend on state addressed by its arguments.)
+   See also <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2956.htm> and
+   <https://stackoverflow.com/questions/76847905/>.
+   ATTENTION! Efforts are underway to change the meaning of this attribute.
+   See <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3424.htm>.  */
+/* Applies to: functions, pointer to functions, function types.  */
+#ifndef _GL_ATTRIBUTE_UNSEQUENCED
+/* This may be revisited when gcc and clang support [[unsequenced]] or possibly
+   __attribute__ ((__unsequenced__)).  */
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if _GL_HAS_ATTRIBUTE (unsequenced)
+#   define _GL_ATTRIBUTE_UNSEQUENCED [[unsequenced]]
+#  endif
+# endif
+# ifndef _GL_ATTRIBUTE_UNSEQUENCED
+#  define _GL_ATTRIBUTE_UNSEQUENCED
+# endif
+#endif
+
 /* A helper macro.  Don't use it directly.  */
 #ifndef _GL_ATTRIBUTE_UNUSED
 # if _GL_HAS_ATTRIBUTE (unused)
@@ -578,6 +868,35 @@ AC_DEFUN([gl_COMMON_BODY], [
 #  define _GL_UNUSED_LABEL
 # endif
 #endif
+
+/* The following attributes enable detection of multithread-safety problems
+   and resource leaks at compile-time, by clang ≥ 15, when the warning option
+   -Wthread-safety is enabled.  For usage, see
+   <https://clang.llvm.org/docs/ThreadSafetyAnalysis.html>.  */
+#ifndef _GL_ATTRIBUTE_CAPABILITY_TYPE
+# if __clang_major__ >= 15
+#  define _GL_ATTRIBUTE_CAPABILITY_TYPE(concept) \
+     __attribute__ ((__capability__ (concept)))
+# else
+#  define _GL_ATTRIBUTE_CAPABILITY_TYPE(concept)
+# endif
+#endif
+#ifndef _GL_ATTRIBUTE_ACQUIRE_CAPABILITY
+# if __clang_major__ >= 15
+#  define _GL_ATTRIBUTE_ACQUIRE_CAPABILITY(resource) \
+     __attribute__ ((__acquire_capability__ (resource)))
+# else
+#  define _GL_ATTRIBUTE_ACQUIRE_CAPABILITY(resource)
+# endif
+#endif
+#ifndef _GL_ATTRIBUTE_RELEASE_CAPABILITY
+# if __clang_major__ >= 15
+#  define _GL_ATTRIBUTE_RELEASE_CAPABILITY(resource) \
+     __attribute__ ((__release_capability__ (resource)))
+# else
+#  define _GL_ATTRIBUTE_RELEASE_CAPABILITY(resource)
+# endif
+#endif
 ])
   AH_VERBATIM([c_linkage],
 [/* In C++, there is the concept of "language linkage", that encompasses
@@ -628,8 +947,8 @@ AC_DEFUN([gl_COMMON_BODY], [
      -1 if n1 < n2
    The naïve code   (n1 > n2 ? 1 : n1 < n2 ? -1 : 0)  produces a conditional
    jump with nearly all GCC versions up to GCC 10.
-   This variant     (n1 < n2 ? -1 : n1 > n2)  produces a conditional with many
-   GCC versions up to GCC 9.
+   This variant     (n1 < n2 ? -1 : n1 > n2)  produces a conditional jump with
+   many GCC versions up to GCC 9.
    The better code  (n1 > n2) - (n1 < n2)  from Hacker's Delight § 2-9
    avoids conditional jumps in all GCC versions >= 3.4.  */
 #define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2)))
@@ -1006,7 +1325,7 @@ AC_DEFUN([gl_CC_ALLOW_WARNINGS],
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for C compiler option to allow warnings],
     [gl_cv_cc_wallow],
-    [rm -f conftest*
+    [rm -fr conftest*
      echo 'int dummy;' > conftest.c
      AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -c conftest.c 2>conftest1.err]) >/dev/null
      AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Wno-error -c conftest.c 2>conftest2.err]) >/dev/null
@@ -1019,7 +1338,7 @@ AC_DEFUN([gl_CC_ALLOW_WARNINGS],
      else
        gl_cv_cc_wallow=none
      fi
-     rm -f conftest*
+     rm -fr conftest*
     ])
   case "$gl_cv_cc_wallow" in
     none) GL_CFLAG_ALLOW_WARNINGS='' ;;
@@ -1037,7 +1356,7 @@ AC_DEFUN([gl_CXX_ALLOW_WARNINGS],
   if test -n "$CXX" && test "$CXX" != no; then
     AC_CACHE_CHECK([for C++ compiler option to allow warnings],
       [gl_cv_cxx_wallow],
-      [rm -f conftest*
+      [rm -fr conftest*
        echo 'int dummy;' > conftest.cc
        AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc 2>conftest1.err]) >/dev/null
        AC_TRY_COMMAND([${CXX-c++} $CXXFLAGS $CPPFLAGS -Wno-error -c conftest.cc 2>conftest2.err]) >/dev/null
@@ -1050,7 +1369,7 @@ AC_DEFUN([gl_CXX_ALLOW_WARNINGS],
        else
          gl_cv_cxx_wallow=none
        fi
-       rm -f conftest*
+       rm -fr conftest*
       ])
     case "$gl_cv_cxx_wallow" in
       none) GL_CXXFLAG_ALLOW_WARNINGS='' ;;
@@ -1087,11 +1406,12 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS],
     dnl -Wno-type-limits                      >= 4.3          >= 3.9
     dnl -Wno-undef                            >= 3            >= 3.9
     dnl -Wno-unsuffixed-float-constants       >= 4.5
+    dnl -Wno-unused-const-variable            >= 4.4          >= 3.9
     dnl -Wno-unused-function                  >= 3            >= 3.9
     dnl -Wno-unused-parameter                 >= 3            >= 3.9
     dnl
     cat > conftest.c <<\EOF
-      #if __GNUC__ >= 3 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
+      #if (__GNUC__ >= 3 && !defined __clang__) || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-cast-qual
       -Wno-conversion
       -Wno-float-equal
@@ -1100,23 +1420,26 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS],
       -Wno-unused-function
       -Wno-unused-parameter
       #endif
-      #if __GNUC__ + (__GNUC_MINOR__ >= 9) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
+      #if (__GNUC__ + (__GNUC_MINOR__ >= 9) > 4 && !defined __clang__) || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-float-conversion
       #endif
-      #if __GNUC__ >= 7 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
+      #if (__GNUC__ >= 7 && !defined __clang__) || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wimplicit-fallthrough
       #endif
-      #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
+      #if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 4 && !defined __clang__) || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-pedantic
       #endif
       #if 3 < __clang_major__ + (9 <= __clang_minor__)
       -Wno-tautological-constant-out-of-range-compare
       #endif
-      #if __GNUC__ + (__GNUC_MINOR__ >= 3) > 4 || (__clang_major__ + (__clang_minor__ >= 9) > 3)
+      #if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 4 && !defined __clang__) || (__clang_major__ + (__clang_minor__ >= 9) > 3)
       -Wno-sign-conversion
       -Wno-type-limits
       #endif
-      #if __GNUC__ + (__GNUC_MINOR__ >= 5) > 4
+      #if (__GNUC__ + (__GNUC_MINOR__ >= 4) > 4 && !defined __clang__) || (__clang_major__ + (__clang_minor__ >= 9) > 3)
+      -Wno-unused-const-variable
+      #endif
+      #if (__GNUC__ + (__GNUC_MINOR__ >= 5) > 4 && !defined __clang__)
       -Wno-unsuffixed-float-constants
       #endif
 EOF
@@ -1240,13 +1563,25 @@ AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_MACOS],
              if test $[ac_cv_func_][$1] = yes; then
                [gl_cv_onwards_func_][$1]=yes
              else
+               dnl This is a bit complicated, because here we need the behaviour
+               dnl of AC_CHECK_DECL before the
+               dnl commit e1bbc9b93cdff61d70719c224b37970e065008bb (2025-05-26).
+               [ac_cv_have_decl_][$1][_saved]="$[ac_cv_have_decl_][$1]"
                unset [ac_cv_have_decl_][$1]
+               ac_c_future_darwin_options_saved="$ac_c_future_darwin_options"
+               ac_cxx_future_darwin_options_saved="$ac_cxx_future_darwin_options"
+               ac_c_future_darwin_options=
+               ac_cxx_future_darwin_options=
                AC_CHECK_DECL([$1], , , [$2])
+               ac_c_future_darwin_options="$ac_c_future_darwin_options_saved"
+               ac_cxx_future_darwin_options="$ac_cxx_future_darwin_options_saved"
                if test $[ac_cv_have_decl_][$1] = yes; then
                  [gl_cv_onwards_func_][$1]='future OS version'
                else
                  [gl_cv_onwards_func_][$1]=no
                fi
+               [ac_cv_have_decl_][$1]="$[ac_cv_have_decl_][$1][_saved]"
+               unset [ac_cv_have_decl_][$1][_saved]
              fi
            else
              AC_CHECK_FUNC([$1])
@@ -1299,7 +1634,7 @@ dnl
 dnl This macro sets two variables:
 dnl   - gl_cv_onwards_func_<func>   to yes / no / "future OS version"
 dnl   - ac_cv_func_<func>           to yes / no / no
-dnl The first variable allows to distinguish all three cases.
+dnl The first variable allows distinguishing all three cases.
 dnl The second variable is set, so that an invocation
 dnl   gl_CHECK_FUNCS_ANDROID([func], [[#include <foo.h>]])
 dnl can be used as a drop-in replacement for
@@ -1352,7 +1687,7 @@ dnl
 dnl This macro sets two variables:
 dnl   - gl_cv_onwards_func_<func>   to yes / no / "future OS version"
 dnl   - ac_cv_func_<func>           to yes / no / no
-dnl The first variable allows to distinguish all three cases.
+dnl The first variable allows distinguishing all three cases.
 dnl The second variable is set, so that an invocation
 dnl   gl_CHECK_FUNCS_MACOS([func], [[#include <foo.h>]])
 dnl can be used as a drop-in replacement for
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 83a0f727..50e98454 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -1,5 +1,5 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2024 Free Software Foundation, Inc.
+# Copyright (C) 2002-2025 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -45,14 +45,30 @@ AC_DEFUN([gl_EARLY],
   # Code from module absolute-header:
   # Code from module alignasof:
   # Code from module alloca-opt:
-  # Code from module arpa_inet:
+  # Code from module arpa_inet-h:
   # Code from module assert-h:
   # Code from module attribute:
   # Code from module base64:
   # Code from module basename-lgpl:
+  # Code from module bool:
   # Code from module btowc:
   # Code from module builtin-expect:
   # Code from module byteswap:
+  # Code from module c-ctype:
+  # Code from module c32isalnum:
+  # Code from module c32isalpha:
+  # Code from module c32isblank:
+  # Code from module c32iscntrl:
+  # Code from module c32isdigit:
+  # Code from module c32isgraph:
+  # Code from module c32islower:
+  # Code from module c32isprint:
+  # Code from module c32ispunct:
+  # Code from module c32isspace:
+  # Code from module c32isupper:
+  # Code from module c32isxdigit:
+  # Code from module c32tolower:
+  # Code from module c32width:
   # Code from module c99:
   # Code from module calloc-gnu:
   # Code from module calloc-posix:
@@ -66,11 +82,15 @@ AC_DEFUN([gl_EARLY],
   # Code from module double-slash-root:
   # Code from module dup2:
   # Code from module environ:
-  # Code from module errno:
+  # Code from module errno-h:
   # Code from module error:
   # Code from module error-h:
   # Code from module exitfail:
   # Code from module extensions:
+  # This is actually already done in the pre-early phase.
+  # AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  # Code from module extensions-aix:
+  AC_REQUIRE([gl_USE_AIX_EXTENSIONS])
   # Code from module extern-inline:
   # Code from module fcntl:
   # Code from module fcntl-h:
@@ -78,7 +98,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module fflush:
   AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
   # Code from module filename:
-  # Code from module float:
+  # Code from module float-h:
   # Code from module floorf:
   # Code from module fopen:
   # Code from module fopen-gnu:
@@ -88,6 +108,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module fseek:
   # Code from module fseeko:
   AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
+  # Code from module fseterr:
   # Code from module fstat:
   # Code from module fsusage:
   # Code from module ftell:
@@ -105,6 +126,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module getprogname:
   # Code from module gettext-h:
   # Code from module glibc-internal/dynarray:
+  # Code from module gnulib-i18n:
   # Code from module hard-locale:
   # Code from module hostent:
   # Code from module ialloc:
@@ -112,29 +134,35 @@ AC_DEFUN([gl_EARLY],
   # Code from module idx:
   # Code from module include_next:
   # Code from module inet_ntop:
+  # Code from module inet_pton:
   # Code from module intprops:
-  # Code from module inttypes-incomplete:
+  # Code from module inttypes-h-incomplete:
   # Code from module iswblank:
   # Code from module iswctype:
   # Code from module iswdigit:
   # Code from module iswpunct:
   # Code from module iswxdigit:
-  # Code from module langinfo:
+  # Code from module langinfo-h:
   # Code from module largefile:
   AC_REQUIRE([AC_SYS_LARGEFILE])
   # Code from module libc-config:
   # Code from module limits-h:
   # Code from module localcharset:
-  # Code from module locale:
+  # Code from module locale-h:
   # Code from module localeconv:
   # Code from module lock:
   # Code from module lseek:
+  # Code from module lstat:
   # Code from module malloc-gnu:
   # Code from module malloc-posix:
   # Code from module malloca:
-  # Code from module math:
+  # Code from module math-h:
+  # Code from module mbchar:
+  # Code from module mbiterf:
+  # Code from module mbrtoc32:
   # Code from module mbrtowc:
   # Code from module mbsinit:
+  # Code from module mbsnlen:
   # Code from module mbszero:
   # Code from module mbtowc:
   # Code from module memchr:
@@ -145,16 +173,20 @@ AC_DEFUN([gl_EARLY],
   # Code from module msvc-inval:
   # Code from module msvc-nothrow:
   # Code from module multiarch:
-  # Code from module netdb:
-  # Code from module netinet_in:
+  # Code from module netdb-h:
+  # Code from module netinet_in-h:
   # Code from module nl_langinfo:
   # Code from module nocrash:
+  # Code from module once:
   # Code from module open:
   # Code from module pathmax:
-  # Code from module realloc-gnu:
+  # Code from module pthread-h:
+  gl_ANYTHREADLIB_EARLY
+  # Code from module pthread-once:
   # Code from module realloc-posix:
   # Code from module reallocarray:
   # Code from module regex:
+  # Code from module sched-h:
   # Code from module servent:
   # Code from module setenv:
   # Code from module setlocale-null:
@@ -172,33 +204,56 @@ AC_DEFUN([gl_EARLY],
   # Code from module stat:
   # Code from module stat-time:
   # Code from module std-gnu11:
-  # Code from module stdbool:
-  # Code from module stdckdint:
-  # Code from module stddef:
-  # Code from module stdint:
-  # Code from module stdio:
+  # Code from module stdckdint-h:
+  # Code from module stddef-h:
+  # Code from module stdint-h:
+  # Code from module stdio-h:
   gl_STDIO_H_EARLY
-  # Code from module stdlib:
+  # Code from module stdlib-h:
   # Code from module strcase:
+  # Code from module strcasecmp:
   # Code from module strcasestr:
   # Code from module strcasestr-simple:
   # Code from module streq:
   # Code from module strerror:
   # Code from module strerror-override:
-  # Code from module string:
-  # Code from module strings:
+  # Code from module string-h:
+  # Code from module strings-h:
+  # Code from module strncasecmp:
+  # Code from module strncpy:
   # Code from module strsep:
   # Code from module strstr-simple:
-  # Code from module sys_socket:
-  # Code from module sys_stat:
-  # Code from module sys_types:
-  # Code from module sys_uio:
+  # Code from module sys_socket-h:
+  # Code from module sys_stat-h:
+  # Code from module sys_types-h:
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+  # Code from module sys_uio-h:
   # Code from module threadlib:
   gl_THREADLIB_EARLY
   # Code from module time-h:
   # Code from module time_r:
   # Code from module timegm:
-  # Code from module unistd:
+  # Code from module uchar-h:
+  # Code from module unicase/base:
+  # Code from module unicase/tolower:
+  # Code from module unictype/base:
+  # Code from module unictype/ctype-alnum:
+  # Code from module unictype/ctype-alpha:
+  # Code from module unictype/ctype-blank:
+  # Code from module unictype/ctype-cntrl:
+  # Code from module unictype/ctype-digit:
+  # Code from module unictype/ctype-graph:
+  # Code from module unictype/ctype-lower:
+  # Code from module unictype/ctype-print:
+  # Code from module unictype/ctype-punct:
+  # Code from module unictype/ctype-space:
+  # Code from module unictype/ctype-upper:
+  # Code from module unictype/ctype-xdigit:
+  # Code from module uninorm/base:
+  # Code from module unistd-h:
+  # Code from module unitypes-h:
+  # Code from module uniwidth/base:
+  # Code from module uniwidth/width:
   # Code from module unlocked-io-internal:
   # Code from module unsetenv:
   # Code from module vararrays:
@@ -206,10 +261,12 @@ AC_DEFUN([gl_EARLY],
   # Code from module vasprintf:
   # Code from module verify:
   # Code from module vsnprintf:
-  # Code from module wchar:
+  # Code from module vsnzprintf:
+  # Code from module wchar-h:
   # Code from module wcrtomb:
   # Code from module wctype:
   # Code from module wctype-h:
+  # Code from module wcwidth:
   # Code from module windows-mutex:
   # Code from module windows-once:
   # Code from module windows-recmutex:
@@ -250,6 +307,7 @@ AC_DEFUN([gl_INIT],
   gl_CONDITIONAL_HEADER([assert.h])
   AC_PROG_MKDIR_P
   gl_FUNC_BASE64
+  gl_C_BOOL
   gl_FUNC_BTOWC
   gl_CONDITIONAL([GL_COND_OBJ_BTOWC],
                  [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1])
@@ -261,6 +319,104 @@ AC_DEFUN([gl_INIT],
   gl_BYTESWAP
   gl_CONDITIONAL_HEADER([byteswap.h])
   AC_PROG_MKDIR_P
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isalnum])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isalpha])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isblank])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32iscntrl])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isdigit])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isgraph])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32islower])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isprint])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32ispunct])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isspace])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isupper])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32isxdigit])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32tolower])
+  AC_REQUIRE([gl_UCHAR_H])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how mbrtoc32 is implemented.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  gl_UCHAR_MODULE_INDICATOR([c32width])
   gl_FUNC_CALLOC_GNU
   if test $REPLACE_CALLOC_FOR_CALLOC_GNU = 1; then
     AC_LIBOBJ([calloc])
@@ -275,6 +431,7 @@ AC_DEFUN([gl_INIT],
   gl_FUNC_CLOSE
   gl_CONDITIONAL([GL_COND_OBJ_CLOSE], [test $REPLACE_CLOSE = 1])
   gl_UNISTD_MODULE_INDICATOR([close])
+  gl_MODULE_INDICATOR([close])
   gl_AF_ALG
   AC_REQUIRE([AC_C_RESTRICT])
   gl_SHA256
@@ -320,8 +477,11 @@ AC_DEFUN([gl_INIT],
   gl_FLOAT_H
   gl_CONDITIONAL_HEADER([float.h])
   AC_PROG_MKDIR_P
-  gl_CONDITIONAL([GL_COND_OBJ_FLOAT], [test $REPLACE_FLOAT_LDBL = 1])
+  gl_CONDITIONAL([GL_COND_OBJ_FLOAT],
+                 [test $REPLACE_FLOAT_LDBL = 1 || test $REPLACE_FLOAT_SNAN = 1])
   gl_CONDITIONAL([GL_COND_OBJ_ITOLD], [test $REPLACE_ITOLD = 1])
+  dnl Prerequisites of lib/float.c.
+  AC_REQUIRE([gl_BIGENDIAN])
   gl_FUNC_FLOORF
   gl_CONDITIONAL([GL_COND_OBJ_FLOORF],
                  [test $HAVE_DECL_FLOORF = 0 || test $REPLACE_FLOORF = 1])
@@ -360,6 +520,8 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_FSEEKO
   ])
   gl_STDIO_MODULE_INDICATOR([fseeko])
+  gl_FUNC_FSETERR
+  gl_CONDITIONAL([GL_COND_OBJ_FSETERR], [test $ac_cv_func___fseterr = no])
   gl_FUNC_FSTAT
   gl_CONDITIONAL([GL_COND_OBJ_FSTAT], [test $REPLACE_FSTAT = 1])
   AM_COND_IF([GL_COND_OBJ_FSTAT], [
@@ -371,6 +533,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_FSTAT
   ])
   gl_SYS_STAT_MODULE_INDICATOR([fstat])
+  gl_MODULE_INDICATOR([fstat])
   gl_FSUSAGE
   gl_CONDITIONAL([GL_COND_OBJ_FSUSAGE], [test $gl_cv_fs_space = yes])
   AM_COND_IF([GL_COND_OBJ_FSUSAGE], [
@@ -412,6 +575,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_GETHOSTNAME
   ])
   gl_UNISTD_MODULE_INDICATOR([gethostname])
+  gl_MODULE_INDICATOR([gethostname])
   gl_FUNC_GETLINE
   gl_CONDITIONAL([GL_COND_OBJ_GETLINE], [test $REPLACE_GETLINE = 1])
   AM_COND_IF([GL_COND_OBJ_GETLINE], [
@@ -441,6 +605,8 @@ AC_DEFUN([gl_INIT],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_GETOPT], [1])
   ])
   gl_UNISTD_MODULE_INDICATOR([getopt-posix])
+  gl_MUSL_LIBC
+  AC_REQUIRE([AC_CANONICAL_HOST])
   gl_FUNC_GETPROGNAME
   gl_CONDITIONAL([GL_COND_OBJ_GETPROGNAME],
                  [test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1])
@@ -451,6 +617,7 @@ AC_DEFUN([gl_INIT],
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
   AC_PROG_MKDIR_P
+  GNULIB_I18N
   AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
   HARD_LOCALE_LIB="$SETLOCALE_NULL_LIB"
   AC_SUBST([HARD_LOCALE_LIB])
@@ -466,6 +633,13 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_INET_NTOP
   ])
   gl_ARPA_INET_MODULE_INDICATOR([inet_ntop])
+  gl_FUNC_INET_PTON
+  gl_CONDITIONAL([GL_COND_OBJ_INET_PTON],
+                 [test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1])
+  AM_COND_IF([GL_COND_OBJ_INET_PTON], [
+    gl_PREREQ_INET_PTON
+  ])
+  gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
   gl_INTTYPES_INCOMPLETE
   gl_INTTYPES_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
@@ -510,11 +684,19 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_LOCALECONV
   ])
   gl_LOCALE_MODULE_INDICATOR([localeconv])
+  gl_MODULE_INDICATOR([localeconv])
   gl_LOCK
   gl_MODULE_INDICATOR([lock])
   gl_FUNC_LSEEK
   gl_CONDITIONAL([GL_COND_OBJ_LSEEK], [test $REPLACE_LSEEK = 1])
   gl_UNISTD_MODULE_INDICATOR([lseek])
+  gl_FUNC_LSTAT
+  gl_CONDITIONAL([GL_COND_OBJ_LSTAT], [test $REPLACE_LSTAT = 1])
+  AM_COND_IF([GL_COND_OBJ_LSTAT], [
+    gl_PREREQ_LSTAT
+  ])
+  gl_SYS_STAT_MODULE_INDICATOR([lstat])
+  gl_MODULE_INDICATOR([lstat])
   gl_FUNC_MALLOC_GNU
   if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 1; then
     AC_LIBOBJ([malloc])
@@ -529,6 +711,20 @@ AC_DEFUN([gl_INIT],
   gl_MATH_H
   gl_MATH_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
+  gl_MBCHAR
+  gl_MBITER
+  gl_FUNC_MBRTOC32
+  gl_CONDITIONAL([GL_COND_OBJ_MBRTOC32],
+                 [test $HAVE_MBRTOC32 = 0 || test $REPLACE_MBRTOC32 = 1])
+  AM_COND_IF([GL_COND_OBJ_MBRTOC32], [
+    if test $REPLACE_MBSTATE_T = 1; then
+      AC_LIBOBJ([lc-charset-dispatch])
+      AC_LIBOBJ([mbtowc-lock])
+      gl_PREREQ_MBTOWC_LOCK
+    fi
+    gl_PREREQ_MBRTOC32
+  ])
+  gl_UCHAR_MODULE_INDICATOR([mbrtoc32])
   gl_FUNC_MBRTOWC
   gl_CONDITIONAL([GL_COND_OBJ_MBRTOWC],
                  [test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1])
@@ -548,6 +744,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_MBSINIT
   ])
   gl_WCHAR_MODULE_INDICATOR([mbsinit])
+  gl_STRING_MODULE_INDICATOR([mbsnlen])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   gl_MBSTATE_T_BROKEN
   gl_MUSL_LIBC
@@ -578,10 +775,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_MKTIME
   fi
   gl_MOUNTLIST
-  gl_CONDITIONAL([GL_COND_OBJ_MOUNTLIST], [test $gl_cv_list_mounted_fs = yes])
-  AM_COND_IF([GL_COND_OBJ_MOUNTLIST], [
-    gl_PREREQ_MOUNTLIST_EXTRA
-  ])
+  gl_PREREQ_MOUNTLIST_EXTRA
   AC_REQUIRE([gl_MSVC_INVAL])
   gl_CONDITIONAL([GL_COND_OBJ_MSVC_INVAL],
                  [test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1])
@@ -605,6 +799,7 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_NL_LANGINFO_LOCK
   fi
   gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
+  gl_ONCE
   gl_FUNC_OPEN
   gl_CONDITIONAL([GL_COND_OBJ_OPEN], [test $REPLACE_OPEN = 1])
   AM_COND_IF([GL_COND_OBJ_OPEN], [
@@ -612,15 +807,17 @@ AC_DEFUN([gl_INIT],
   ])
   gl_FCNTL_MODULE_INDICATOR([open])
   gl_PATHMAX
-  gl_FUNC_REALLOC_GNU
-  if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 1; then
-    AC_LIBOBJ([realloc])
-  fi
-  gl_STDLIB_MODULE_INDICATOR([realloc-gnu])
+  gl_PTHREAD_H
+  gl_PTHREAD_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  gl_PTHREAD_ONCE
+  gl_CONDITIONAL([GL_COND_OBJ_PTHREAD_ONCE],
+                 [test $HAVE_PTHREAD_ONCE = 0 || test $REPLACE_PTHREAD_ONCE = 1])
+  gl_PTHREAD_MODULE_INDICATOR([pthread-once])
   gl_FUNC_REALLOC_POSIX
-  if test $REPLACE_REALLOC_FOR_REALLOC_POSIX = 1; then
-    AC_LIBOBJ([realloc])
-  fi
+  gl_FUNC_REALLOC_0_NONNULL
+  gl_CONDITIONAL([GL_COND_OBJ_REALLOC_POSIX],
+                 [test $REPLACE_REALLOC_FOR_REALLOC_POSIX != 0])
   gl_STDLIB_MODULE_INDICATOR([realloc-posix])
   gl_FUNC_REALLOCARRAY
   gl_CONDITIONAL([GL_COND_OBJ_REALLOCARRAY],
@@ -635,6 +832,9 @@ AC_DEFUN([gl_INIT],
   AM_COND_IF([GL_COND_OBJ_REGEX], [
     gl_PREREQ_REGEX
   ])
+  gl_SCHED_H
+  gl_SCHED_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
   gl_SERVENT
   gl_FUNC_SETENV
   gl_CONDITIONAL([GL_COND_OBJ_SETENV],
@@ -666,15 +866,10 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_STAT
   ])
   gl_SYS_STAT_MODULE_INDICATOR([stat])
+  gl_MODULE_INDICATOR([stat])
   gl_STAT_TIME
   gl_STAT_BIRTHTIME
-  gl_C_BOOL
-  AC_CHECK_HEADERS_ONCE([stdckdint.h])
-  if test $ac_cv_header_stdckdint_h = yes; then
-    GL_GENERATE_STDCKDINT_H=false
-  else
-    GL_GENERATE_STDCKDINT_H=true
-  fi
+  gl_STDCKDINT_H
   gl_CONDITIONAL_HEADER([stdckdint.h])
   AC_PROG_MKDIR_P
   gl_STDDEF_H
@@ -689,6 +884,19 @@ AC_DEFUN([gl_INIT],
   gl_STDIO_H
   gl_STDIO_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
+  USES_MSVCRT=0
+  case "$host_os" in
+    mingw* | windows*)
+      AC_EGREP_CPP([Special], [
+  #ifndef _UCRT
+   Special
+  #endif
+        ],
+        [USES_MSVCRT=1])
+      ;;
+  esac
+  gl_CONDITIONAL([GL_COND_OBJ_STDIO_CONSOLESAFE], [test $USES_MSVCRT = 1])
+  AC_CHECK_FUNCS([vasprintf])
   gl_CONDITIONAL([GL_COND_OBJ_STDIO_READ], [test $REPLACE_STDIO_READ_FUNCS = 1])
   gl_CONDITIONAL([GL_COND_OBJ_STDIO_WRITE], [test $REPLACE_STDIO_WRITE_FUNCS = 1])
   dnl No need to create extra modules for these functions. Everyone who uses
@@ -717,15 +925,13 @@ AC_DEFUN([gl_INIT],
   gl_STDLIB_H
   gl_STDLIB_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
-  gl_STRCASE
-  gl_CONDITIONAL([GL_COND_OBJ_STRCASECMP], [test $HAVE_STRCASECMP = 0])
+  gl_FUNC_STRCASECMP
+  gl_CONDITIONAL([GL_COND_OBJ_STRCASECMP],
+                 [test $HAVE_STRCASECMP = 0 || test $REPLACE_STRCASECMP = 1])
   AM_COND_IF([GL_COND_OBJ_STRCASECMP], [
     gl_PREREQ_STRCASECMP
   ])
-  gl_CONDITIONAL([GL_COND_OBJ_STRNCASECMP], [test $HAVE_STRNCASECMP = 0])
-  AM_COND_IF([GL_COND_OBJ_STRNCASECMP], [
-    gl_PREREQ_STRNCASECMP
-  ])
+  gl_STRINGS_MODULE_INDICATOR([strcasecmp])
   gl_FUNC_STRCASESTR
   if test $HAVE_STRCASESTR = 0 || test $REPLACE_STRCASESTR = 1; then
     AC_LIBOBJ([strcasestr])
@@ -754,6 +960,19 @@ AC_DEFUN([gl_INIT],
   gl_STRINGS_H
   gl_STRINGS_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
+  gl_FUNC_STRNCASECMP
+  gl_CONDITIONAL([GL_COND_OBJ_STRNCASECMP],
+                 [test $HAVE_STRNCASECMP = 0 || test $REPLACE_STRNCASECMP = 1])
+  AM_COND_IF([GL_COND_OBJ_STRNCASECMP], [
+    gl_PREREQ_STRNCASECMP
+  ])
+  gl_STRINGS_MODULE_INDICATOR([strncasecmp])
+  gl_FUNC_STRNCPY
+  gl_CONDITIONAL([GL_COND_OBJ_STRNCPY], [test $REPLACE_STRNCPY = 1])
+  AM_COND_IF([GL_COND_OBJ_STRNCPY], [
+    gl_PREREQ_STRNCPY
+  ])
+  gl_STRING_MODULE_INDICATOR([strncpy])
   gl_FUNC_STRSEP
   gl_CONDITIONAL([GL_COND_OBJ_STRSEP], [test $HAVE_STRSEP = 0])
   AM_COND_IF([GL_COND_OBJ_STRSEP], [
@@ -795,9 +1014,55 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_TIMEGM
   ])
   gl_TIME_MODULE_INDICATOR([timegm])
+  gl_UCHAR_H
+  gl_UCHAR_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  gl_LIBUNISTRING_LIBHEADER([1.2], [unicase.h])
+  gl_UNICASE_H
+  gl_UNICASE_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  gl_LIBUNISTRING_MODULE([1.3], [unicase/tolower])
+  gl_LIBUNISTRING_LIBHEADER([1.3], [unictype.h])
+  gl_UNICTYPE_H
+  gl_UNICTYPE_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-alnum])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-alpha])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-blank])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-cntrl])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-digit])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-graph])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-lower])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-print])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-punct])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-space])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([1.3], [unictype/ctype-upper])
+  AC_REQUIRE([AC_C_INLINE])
+  gl_LIBUNISTRING_MODULE([0.9.8], [unictype/ctype-xdigit])
+  gl_LIBUNISTRING_LIBHEADER([1.2], [uninorm.h])
+  gl_UNINORM_H
+  gl_UNINORM_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
   gl_UNISTD_H
   gl_UNISTD_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
+  gl_LIBUNISTRING_LIBHEADER([0.9.11], [unitypes.h])
+  AC_PROG_MKDIR_P
+  gl_UNITYPES_H
+  gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h])
+  AC_PROG_MKDIR_P
+  gl_LIBUNISTRING_MODULE([1.3], [uniwidth/width])
   gl_FUNC_GLIBC_UNLOCKED_IO
   gl_FUNC_UNSETENV
   gl_CONDITIONAL([GL_COND_OBJ_UNSETENV],
@@ -816,6 +1081,7 @@ AC_DEFUN([gl_INIT],
      AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
   gl_FUNC_VSNPRINTF
   gl_STDIO_MODULE_INDICATOR([vsnprintf])
+  gl_STDIO_MODULE_INDICATOR([vsnzprintf])
   gl_WCHAR_H
   gl_WCHAR_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
@@ -832,6 +1098,13 @@ AC_DEFUN([gl_INIT],
   gl_WCTYPE_H
   gl_WCTYPE_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
+  gl_FUNC_WCWIDTH
+  gl_CONDITIONAL([GL_COND_OBJ_WCWIDTH],
+                 [test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1])
+  AM_COND_IF([GL_COND_OBJ_WCWIDTH], [
+    gl_PREREQ_WCWIDTH
+  ])
+  gl_WCHAR_MODULE_INDICATOR([wcwidth])
   AC_REQUIRE([AC_CANONICAL_HOST])
   gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_MUTEX],
                  [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
@@ -871,27 +1144,35 @@ AC_DEFUN([gl_INIT],
     gl_libobjs=
     gl_ltlibobjs=
     gl_libobjdeps=
+    gl_libgnu_libobjs=
+    gl_libgnu_ltlibobjs=
+    gl_libgnu_libobjdeps=
     if test -n "$gl_LIBOBJS"; then
       # Remove the extension.
 changequote(,)dnl
       sed_drop_objext='s/\.o$//;s/\.obj$//'
       sed_dirname1='s,//*,/,g'
       sed_dirname2='s,\(.\)/$,\1,'
-      sed_dirname3='s,^[^/]*$,.,'
-      sed_dirname4='s,\(.\)/[^/]*$,\1,'
+      sed_dirname3='s,[^/]*$,,'
       sed_basename1='s,.*/,,'
 changequote([, ])dnl
       for i in `for i in $gl_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
         gl_libobjs="$gl_libobjs $i.$ac_objext"
         gl_ltlibobjs="$gl_ltlibobjs $i.lo"
-        i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"`
+        i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3"`
         i_base=`echo "$i" | sed -e "$sed_basename1"`
-        gl_libobjdeps="$gl_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Po"
+        gl_libgnu_libobjs="$gl_libgnu_libobjs $i_dir""libgnu_a-$i_base.$ac_objext"
+        gl_libgnu_ltlibobjs="$gl_libgnu_ltlibobjs $i_dir""libgnu_la-$i_base.lo"
+        gl_libobjdeps="$gl_libobjdeps $i_dir\$(DEPDIR)/$i_base.Po"
+        gl_libgnu_libobjdeps="$gl_libgnu_libobjdeps $i_dir\$(DEPDIR)/libgnu_a-$i_base.Po"
       done
     fi
     AC_SUBST([gl_LIBOBJS], [$gl_libobjs])
     AC_SUBST([gl_LTLIBOBJS], [$gl_ltlibobjs])
     AC_SUBST([gl_LIBOBJDEPS], [$gl_libobjdeps])
+    AC_SUBST([gl_libgnu_LIBOBJS], [$gl_libgnu_libobjs])
+    AC_SUBST([gl_libgnu_LTLIBOBJS], [$gl_libgnu_ltlibobjs])
+    AC_SUBST([gl_libgnu_LIBOBJDEPS], [$gl_libgnu_libobjdeps])
   ])
   gltests_libdeps=
   gltests_ltlibdeps=
@@ -934,27 +1215,35 @@ changequote([, ])dnl
     gltests_libobjs=
     gltests_ltlibobjs=
     gltests_libobjdeps=
+    gltests_libgnu_libobjs=
+    gltests_libgnu_ltlibobjs=
+    gltests_libgnu_libobjdeps=
     if test -n "$gltests_LIBOBJS"; then
       # Remove the extension.
 changequote(,)dnl
       sed_drop_objext='s/\.o$//;s/\.obj$//'
       sed_dirname1='s,//*,/,g'
       sed_dirname2='s,\(.\)/$,\1,'
-      sed_dirname3='s,^[^/]*$,.,'
-      sed_dirname4='s,\(.\)/[^/]*$,\1,'
+      sed_dirname3='s,[^/]*$,,'
       sed_basename1='s,.*/,,'
 changequote([, ])dnl
       for i in `for i in $gltests_LIBOBJS; do echo "$i"; done | sed -e "$sed_drop_objext" | sort | uniq`; do
         gltests_libobjs="$gltests_libobjs $i.$ac_objext"
         gltests_ltlibobjs="$gltests_ltlibobjs $i.lo"
-        i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3" -e "$sed_dirname4"`
+        i_dir=`echo "$i" | sed -e "$sed_dirname1" -e "$sed_dirname2" -e "$sed_dirname3"`
         i_base=`echo "$i" | sed -e "$sed_basename1"`
-        gltests_libobjdeps="$gltests_libobjdeps $i_dir/\$(DEPDIR)/$i_base.Po"
+        gltests_libgnu_libobjs="$gltests_libgnu_libobjs $i_dir""libgnu_a-$i_base.$ac_objext"
+        gltests_libgnu_ltlibobjs="$gltests_libgnu_ltlibobjs $i_dir""libgnu_la-$i_base.lo"
+        gltests_libobjdeps="$gltests_libobjdeps $i_dir\$(DEPDIR)/$i_base.Po"
+        gltests_libgnu_libobjdeps="$gltests_libgnu_libobjdeps $i_dir\$(DEPDIR)/libgnu_a-$i_base.Po"
       done
     fi
     AC_SUBST([gltests_LIBOBJS], [$gltests_libobjs])
     AC_SUBST([gltests_LTLIBOBJS], [$gltests_ltlibobjs])
     AC_SUBST([gltests_LIBOBJDEPS], [$gltests_libobjdeps])
+    AC_SUBST([gltests_libgnu_LIBOBJS], [$gltests_libgnu_libobjs])
+    AC_SUBST([gltests_libgnu_LTLIBOBJS], [$gltests_libgnu_ltlibobjs])
+    AC_SUBST([gltests_libgnu_LIBOBJDEPS], [$gltests_libgnu_libobjdeps])
   ])
   AC_REQUIRE([gl_CC_GNULIB_WARNINGS])
   LIBGNU_LIBDEPS="$gl_libdeps"
@@ -1025,6 +1314,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/af_alg.h
   lib/alloca.in.h
   lib/arg-nonnull.h
+  lib/arpa_inet.c
   lib/arpa_inet.in.h
   lib/asnprintf.c
   lib/asprintf.c
@@ -1036,8 +1326,27 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/basename-lgpl.h
   lib/basename.c
   lib/btowc.c
+  lib/byteswap.c
   lib/byteswap.in.h
   lib/c++defs.h
+  lib/c-ctype.c
+  lib/c-ctype.h
+  lib/c32is-impl.h
+  lib/c32isalnum.c
+  lib/c32isalpha.c
+  lib/c32isblank.c
+  lib/c32iscntrl.c
+  lib/c32isdigit.c
+  lib/c32isgraph.c
+  lib/c32islower.c
+  lib/c32isprint.c
+  lib/c32ispunct.c
+  lib/c32isspace.c
+  lib/c32isupper.c
+  lib/c32isxdigit.c
+  lib/c32to-impl.h
+  lib/c32tolower.c
+  lib/c32width.c
   lib/calloc.c
   lib/cdefs.h
   lib/cloexec.c
@@ -1071,6 +1380,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/free.c
   lib/fseek.c
   lib/fseeko.c
+  lib/fseterr.c
+  lib/fseterr.h
   lib/fstat.c
   lib/fsusage.c
   lib/fsusage.h
@@ -1098,6 +1409,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/gl_openssl.h
   lib/glthread/lock.c
   lib/glthread/lock.h
+  lib/glthread/once.c
+  lib/glthread/once.h
   lib/glthread/threadlib.c
   lib/hard-locale.c
   lib/hard-locale.h
@@ -1107,6 +1420,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/idpriv.h
   lib/idx.h
   lib/inet_ntop.c
+  lib/inet_pton.c
   lib/intprops-internal.h
   lib/intprops.h
   lib/inttypes.in.h
@@ -1127,6 +1441,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/locale.in.h
   lib/localeconv.c
   lib/lseek.c
+  lib/lstat.c
   lib/malloc.c
   lib/malloc/dynarray-skeleton.c
   lib/malloc/dynarray.h
@@ -1139,10 +1454,16 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/malloca.h
   lib/math.c
   lib/math.in.h
+  lib/mbchar.c
+  lib/mbchar.h
+  lib/mbiterf.c
+  lib/mbiterf.h
+  lib/mbrtoc32.c
   lib/mbrtowc-impl-utf8.h
   lib/mbrtowc-impl.h
   lib/mbrtowc.c
   lib/mbsinit.c
+  lib/mbsnlen.c
   lib/mbszero.c
   lib/mbtowc-impl.h
   lib/mbtowc-lock.c
@@ -1169,6 +1490,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/printf-args.h
   lib/printf-parse.c
   lib/printf-parse.h
+  lib/pthread-once.c
+  lib/pthread.in.h
   lib/realloc.c
   lib/reallocarray.c
   lib/regcomp.c
@@ -1177,6 +1500,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/regex_internal.c
   lib/regex_internal.h
   lib/regexec.c
+  lib/sched.in.h
   lib/setenv.c
   lib/setlocale-lock.c
   lib/setlocale_null-unlocked.c
@@ -1197,10 +1521,12 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/stdckdint.in.h
   lib/stddef.in.h
   lib/stdint.in.h
+  lib/stdio-consolesafe.c
   lib/stdio-impl.h
   lib/stdio-read.c
   lib/stdio-write.c
   lib/stdio.in.h
+  lib/stdlib.c
   lib/stdlib.in.h
   lib/str-two-way.h
   lib/strcasecmp.c
@@ -1213,6 +1539,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/strings.in.h
   lib/stripslash.c
   lib/strncasecmp.c
+  lib/strncpy.c
   lib/strsep.c
   lib/strstr.c
   lib/sys-limits.h
@@ -1224,8 +1551,46 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/time.in.h
   lib/time_r.c
   lib/timegm.c
+  lib/uchar.in.h
+  lib/unicase.in.h
+  lib/unicase/simple-mapping.h
+  lib/unicase/tolower.c
+  lib/unicase/tolower.h
+  lib/unictype.in.h
+  lib/unictype/bitmap.h
+  lib/unictype/ctype_alnum.c
+  lib/unictype/ctype_alnum.h
+  lib/unictype/ctype_alpha.c
+  lib/unictype/ctype_alpha.h
+  lib/unictype/ctype_blank.c
+  lib/unictype/ctype_blank.h
+  lib/unictype/ctype_cntrl.c
+  lib/unictype/ctype_cntrl.h
+  lib/unictype/ctype_digit.c
+  lib/unictype/ctype_digit.h
+  lib/unictype/ctype_graph.c
+  lib/unictype/ctype_graph.h
+  lib/unictype/ctype_lower.c
+  lib/unictype/ctype_lower.h
+  lib/unictype/ctype_print.c
+  lib/unictype/ctype_print.h
+  lib/unictype/ctype_punct.c
+  lib/unictype/ctype_punct.h
+  lib/unictype/ctype_space.c
+  lib/unictype/ctype_space.h
+  lib/unictype/ctype_upper.c
+  lib/unictype/ctype_upper.h
+  lib/unictype/ctype_xdigit.c
+  lib/unictype/ctype_xdigit.h
+  lib/uninorm.in.h
   lib/unistd.c
   lib/unistd.in.h
+  lib/unitypes.in.h
+  lib/uniwidth.in.h
+  lib/uniwidth/cjk.h
+  lib/uniwidth/width.c
+  lib/uniwidth/width0.h
+  lib/uniwidth/width2.h
   lib/unlocked-io.h
   lib/unsetenv.c
   lib/vasnprintf.c
@@ -1233,6 +1598,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/vasprintf.c
   lib/verify.h
   lib/vsnprintf.c
+  lib/vsnzprintf.c
   lib/w32sock.h
   lib/warn-on-use.h
   lib/wchar.in.h
@@ -1241,6 +1607,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/wctype-impl.h
   lib/wctype.c
   lib/wctype.in.h
+  lib/wcwidth.c
   lib/windows-initguard.h
   lib/windows-mutex.c
   lib/windows-mutex.h
@@ -1265,20 +1632,22 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/assert_h.m4
   m4/base64.m4
   m4/btowc.m4
+  m4/build-to-host.m4
   m4/builtin-expect.m4
   m4/byteswap.m4
   m4/c-bool.m4
+  m4/c32rtomb.m4
   m4/calloc.m4
   m4/close.m4
   m4/codeset.m4
   m4/double-slash-root.m4
   m4/dup2.m4
-  m4/eealloc.m4
   m4/environ.m4
   m4/errno_h.m4
   m4/error.m4
   m4/error_h.m4
   m4/exponentd.m4
+  m4/extensions-aix.m4
   m4/extensions.m4
   m4/extern-inline.m4
   m4/fclose.m4
@@ -1294,6 +1663,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/free.m4
   m4/fseek.m4
   m4/fseeko.m4
+  m4/fseterr.m4
   m4/fstat.m4
   m4/fstypename.m4
   m4/fsusage.m4
@@ -1309,10 +1679,12 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/getprogname.m4
   m4/gl-openssl.m4
   m4/gnulib-common.m4
+  m4/gnulib-i18n.m4
   m4/hostent.m4
   m4/idpriv.m4
   m4/include_next.m4
   m4/inet_ntop.m4
+  m4/inet_pton.m4
   m4/intmax_t.m4
   m4/inttypes.m4
   m4/inttypes_h.m4
@@ -1323,8 +1695,10 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/iswxdigit.m4
   m4/langinfo_h.m4
   m4/largefile.m4
+  m4/libunistring-base.m4
   m4/limits-h.m4
   m4/localcharset.m4
+  m4/locale-en.m4
   m4/locale-fr.m4
   m4/locale-ja.m4
   m4/locale-zh.m4
@@ -1332,9 +1706,13 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/localeconv.m4
   m4/lock.m4
   m4/lseek.m4
+  m4/lstat.m4
   m4/malloc.m4
   m4/malloca.m4
   m4/math_h.m4
+  m4/mbchar.m4
+  m4/mbiter.m4
+  m4/mbrtoc32.m4
   m4/mbrtowc.m4
   m4/mbsinit.m4
   m4/mbstate_t.m4
@@ -1353,17 +1731,23 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/netinet_in_h.m4
   m4/nl_langinfo.m4
   m4/nocrash.m4
+  m4/off64_t.m4
   m4/off_t.m4
+  m4/once.m4
   m4/open-cloexec.m4
   m4/open-slash.m4
   m4/open.m4
   m4/pathmax.m4
   m4/pid_t.m4
   m4/printf.m4
+  m4/pthread-once.m4
+  m4/pthread-spin.m4
+  m4/pthread_h.m4
   m4/pthread_rwlock_rdlock.m4
   m4/realloc.m4
   m4/reallocarray.m4
   m4/regex.m4
+  m4/sched_h.m4
   m4/servent.m4
   m4/setenv.m4
   m4/setlocale_null.m4
@@ -1379,18 +1763,22 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/stat.m4
   m4/std-gnu11.m4
   m4/stdalign.m4
+  m4/stdckdint_h.m4
   m4/stddef_h.m4
   m4/stdint.m4
   m4/stdint_h.m4
   m4/stdio_h.m4
   m4/stdlib_h.m4
-  m4/strcase.m4
+  m4/strcasecmp.m4
   m4/strcasestr.m4
   m4/strerror.m4
   m4/string_h.m4
   m4/strings_h.m4
+  m4/strncasecmp.m4
+  m4/strncpy.m4
   m4/strsep.m4
   m4/strstr.m4
+  m4/sys_cdefs_h.m4
   m4/sys_socket_h.m4
   m4/sys_stat_h.m4
   m4/sys_types_h.m4
@@ -1399,8 +1787,13 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/time_h.m4
   m4/time_r.m4
   m4/timegm.m4
+  m4/uchar_h.m4
   m4/ungetc.m4
+  m4/unicase_h.m4
+  m4/unictype_h.m4
+  m4/uninorm_h.m4
   m4/unistd_h.m4
+  m4/unitypes_h.m4
   m4/unlocked-io.m4
   m4/vararrays.m4
   m4/vasnprintf.m4
@@ -1409,10 +1802,10 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/vsnprintf.m4
   m4/warn-on-use.m4
   m4/wchar_h.m4
-  m4/wchar_t.m4
   m4/wcrtomb.m4
   m4/wctype.m4
   m4/wctype_h.m4
+  m4/wcwidth.m4
   m4/wint_t.m4
   m4/xalloc.m4
   m4/xsize.m4
diff --git a/gl/m4/gnulib-i18n.m4 b/gl/m4/gnulib-i18n.m4
new file mode 100644
index 00000000..868043e7
--- /dev/null
+++ b/gl/m4/gnulib-i18n.m4
@@ -0,0 +1,61 @@
+# gnulib-i18n.m4
+# serial 1
+dnl Copyright (C) 2005-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Bruno Haible.
+
+dnl Support for internationalization of Gnulib code.
+
+dnl GNULIB_I18N
+dnl Sets GNULIB_LOCALEDIR to indicate where to find the gnulib.mo files.
+dnl Also it defines GNULIB_LOCALEDIR as macro in config.h, that expands to
+dnl the corresponding C string.
+AC_DEFUN([GNULIB_I18N],
+[
+  dnl It is best to not test "$USE_NLS" here, because: It would be empty
+  dnl in case the package is internationalized but this macro is used before
+  dnl AM_GNU_GETTEXT. We would need to warn about this situation. But since
+  dnl this module is used as a dependency of many packages, such a warning is
+  dnl not welcome.
+
+  dnl Determine gnulib's localedir.
+  dnl Generally, accept an option --with-gnulib-prefix=PREFIX to indicate
+  dnl where to find gnulib's runtime data.
+  dnl Usually ${prefix}/share/locale, but can be influenced by the configure
+  dnl options --datarootdir and --localedir.
+  GNULIB_LOCALEDIR="${localedir}"
+  AC_ARG_WITH([gnulib-prefix],
+    [[  --with-gnulib-prefix=DIR  search for gnulib's runtime data in DIR/share]],
+    [if test "X$withval" != "X" && test "X$withval" != "Xno"; then
+       GNULIB_LOCALEDIR="$withval/share/locale"
+     fi
+    ])
+  AC_SUBST([GNULIB_LOCALEDIR])
+
+  dnl Define GNULIB_LOCALEDIR_c and GNULIB_LOCALEDIR_c_make.
+  dnl Find the final value of GNULIB_LOCALEDIR.
+  gl_saved_prefix="${prefix}"
+  gl_saved_datarootdir="${datarootdir}"
+  gl_saved_localedir="${localedir}"
+  gl_saved_gnuliblocaledir="${GNULIB_LOCALEDIR}"
+  dnl Unfortunately, prefix gets only finally determined at the end of
+  dnl configure.
+  if test "X$prefix" = "XNONE"; then
+    prefix="$ac_default_prefix"
+  fi
+  eval datarootdir="$datarootdir"
+  eval localedir="$localedir"
+  eval GNULIB_LOCALEDIR="$GNULIB_LOCALEDIR"
+  gl_BUILD_TO_HOST([GNULIB_LOCALEDIR])
+  GNULIB_LOCALEDIR="${gl_saved_gnuliblocaledir}"
+  localedir="${gl_saved_localedir}"
+  datarootdir="${gl_saved_datarootdir}"
+  prefix="${gl_saved_prefix}"
+
+  AC_DEFINE_UNQUOTED([GNULIB_LOCALEDIR], [${GNULIB_LOCALEDIR_c}],
+    [Define to the directory where to find the localizations of the translation domain 'gnulib', as a C string.])
+])
diff --git a/gl/m4/gnulib-tool.m4 b/gl/m4/gnulib-tool.m4
index ef45f51f..8634a6e9 100644
--- a/gl/m4/gnulib-tool.m4
+++ b/gl/m4/gnulib-tool.m4
@@ -1,9 +1,10 @@
 # gnulib-tool.m4
-# serial 4
-dnl Copyright (C) 2004-2005, 2009-2024 Free Software Foundation, Inc.
+# serial 5
+dnl Copyright (C) 2004-2005, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl The following macros need not be invoked explicitly.
 dnl Invoking them does nothing except to declare default arguments
@@ -42,6 +43,9 @@ AC_DEFUN([gl_LIB], [])
 dnl Usage: gl_LGPL or gl_LGPL([VERSION])
 AC_DEFUN([gl_LGPL], [])
 
+dnl Usage: gl_GPL([VERSION])
+AC_DEFUN([gl_GPL], [])
+
 dnl Usage: gl_MAKEFILE_NAME([FILENAME])
 AC_DEFUN([gl_MAKEFILE_NAME], [])
 
diff --git a/gl/m4/hostent.m4 b/gl/m4/hostent.m4
index 36dc636e..9278285c 100644
--- a/gl/m4/hostent.m4
+++ b/gl/m4/hostent.m4
@@ -1,9 +1,10 @@
 # hostent.m4
 # serial 5
-dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_HOSTENT],
 [
diff --git a/gl/m4/idpriv.m4 b/gl/m4/idpriv.m4
index 53693527..6e855e9a 100644
--- a/gl/m4/idpriv.m4
+++ b/gl/m4/idpriv.m4
@@ -1,9 +1,10 @@
 # idpriv.m4
 # serial 1
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_IDPRIV],
 [
diff --git a/gl/m4/include_next.m4 b/gl/m4/include_next.m4
index 03e85251..80de991e 100644
--- a/gl/m4/include_next.m4
+++ b/gl/m4/include_next.m4
@@ -1,9 +1,10 @@
 # include_next.m4
 # serial 27
-dnl Copyright (C) 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Paul Eggert and Derek Price.
 
diff --git a/gl/m4/inet_ntop.m4 b/gl/m4/inet_ntop.m4
index 168e17e0..693bd51b 100644
--- a/gl/m4/inet_ntop.m4
+++ b/gl/m4/inet_ntop.m4
@@ -1,9 +1,10 @@
 # inet_ntop.m4
 # serial 22
-dnl Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_INET_NTOP],
 [
diff --git a/gl/m4/inet_pton.m4 b/gl/m4/inet_pton.m4
new file mode 100644
index 00000000..b6e59a25
--- /dev/null
+++ b/gl/m4/inet_pton.m4
@@ -0,0 +1,72 @@
+# inet_pton.m4
+# serial 20
+dnl Copyright (C) 2006, 2008-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN([gl_FUNC_INET_PTON],
+[
+  AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
+
+  dnl Persuade Solaris <arpa/inet.h> to declare inet_pton.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  dnl Most platforms that provide inet_pton define it in libc.
+  dnl Solaris 8..10 provide inet_pton in libnsl instead.
+  dnl Solaris 2.6..7 provide inet_pton in libresolv instead.
+  dnl Haiku provides it in -lnetwork.
+  dnl Native Windows provides it in -lws2_32 instead, with a declaration in
+  dnl <ws2tcpip.h>, and it uses stdcall calling convention, not cdecl
+  dnl (hence we cannot use AC_CHECK_FUNCS, AC_SEARCH_LIBS to find it).
+  HAVE_INET_PTON=1
+  INET_PTON_LIB=
+  gl_PREREQ_SYS_H_WINSOCK2
+  if test $HAVE_WINSOCK2_H = 1; then
+    dnl It needs to be overridden, because the stdcall calling convention
+    dnl is not compliant with POSIX.  Set REPLACE_INET_PTON in order to avoid
+    dnl a name conflict at the linker level, even though the header file
+    dnl <ws2tcpip.h> declares inet_pton only if _WIN32_WINNT >= 0x0600.
+    REPLACE_INET_PTON=1
+    AC_CHECK_DECLS([inet_pton],,, [[#include <ws2tcpip.h>]])
+    if test $ac_cv_have_decl_inet_pton = yes; then
+      INET_PTON_LIB="-lws2_32"
+    else
+      HAVE_DECL_INET_PTON=0
+    fi
+  else
+    gl_saved_LIBS=$LIBS
+    AC_SEARCH_LIBS([inet_pton], [nsl resolv network], [],
+      [AC_CHECK_FUNCS([inet_pton])
+       if test $ac_cv_func_inet_pton = no; then
+         HAVE_INET_PTON=0
+       fi
+      ])
+    LIBS=$gl_saved_LIBS
+
+    if test "$ac_cv_search_inet_pton" != "no" \
+       && test "$ac_cv_search_inet_pton" != "none required"; then
+      INET_PTON_LIB="$ac_cv_search_inet_pton"
+    fi
+
+    AC_CHECK_HEADERS_ONCE([netdb.h])
+    AC_CHECK_DECLS([inet_pton],,,
+      [[#include <arpa/inet.h>
+        #if HAVE_NETDB_H
+        # include <netdb.h>
+        #endif
+      ]])
+    if test $ac_cv_have_decl_inet_pton = no; then
+      HAVE_DECL_INET_PTON=0
+    fi
+  fi
+  AC_SUBST([INET_PTON_LIB])
+])
+
+# Prerequisites of lib/inet_pton.c.
+AC_DEFUN([gl_PREREQ_INET_PTON], [
+  AC_REQUIRE([gl_SOCKET_FAMILIES])
+])
diff --git a/gl/m4/intmax_t.m4 b/gl/m4/intmax_t.m4
index 72858ea8..c1df7b27 100644
--- a/gl/m4/intmax_t.m4
+++ b/gl/m4/intmax_t.m4
@@ -1,10 +1,11 @@
 # intmax_t.m4
 # serial 9
-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2024 Free Software Foundation,
+dnl Copyright (C) 1997-2004, 2006-2007, 2009-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Paul Eggert.
 
diff --git a/gl/m4/inttypes.m4 b/gl/m4/inttypes.m4
index c43cd162..63c82c61 100644
--- a/gl/m4/inttypes.m4
+++ b/gl/m4/inttypes.m4
@@ -1,9 +1,10 @@
 # inttypes.m4
 # serial 37
-dnl Copyright (C) 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Derek Price, Bruno Haible.
 dnl Test whether <inttypes.h> is supported or must be substituted.
diff --git a/gl/m4/inttypes_h.m4 b/gl/m4/inttypes_h.m4
index 3b9da5b0..ad939a53 100644
--- a/gl/m4/inttypes_h.m4
+++ b/gl/m4/inttypes_h.m4
@@ -1,9 +1,10 @@
 # inttypes_h.m4
 # serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Paul Eggert.
 
diff --git a/gl/m4/iswblank.m4 b/gl/m4/iswblank.m4
index 4dc12d9a..d06b16a2 100644
--- a/gl/m4/iswblank.m4
+++ b/gl/m4/iswblank.m4
@@ -1,9 +1,10 @@
 # iswblank.m4
 # serial 7
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_ISWBLANK],
 [
diff --git a/gl/m4/iswctype.m4 b/gl/m4/iswctype.m4
index 16031be4..f5a3b760 100644
--- a/gl/m4/iswctype.m4
+++ b/gl/m4/iswctype.m4
@@ -1,9 +1,10 @@
 # iswctype.m4
 # serial 3
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_ISWCTYPE],
 [
diff --git a/gl/m4/iswdigit.m4 b/gl/m4/iswdigit.m4
index 999acd28..4582f598 100644
--- a/gl/m4/iswdigit.m4
+++ b/gl/m4/iswdigit.m4
@@ -1,9 +1,10 @@
 # iswdigit.m4
-# serial 7
-dnl Copyright (C) 2020-2024 Free Software Foundation, Inc.
+# serial 9
+dnl Copyright (C) 2020-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_ISWDIGIT],
 [
@@ -11,7 +12,7 @@ AC_DEFUN([gl_FUNC_ISWDIGIT],
   AC_REQUIRE([gl_WCTYPE_H])
   AC_REQUIRE([gt_LOCALE_FR])
   AC_REQUIRE([gt_LOCALE_JA])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([gt_LOCALE_EN_UTF8])
   AC_REQUIRE([gt_LOCALE_ZH_CN])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
@@ -26,14 +27,14 @@ AC_DEFUN([gl_FUNC_ISWDIGIT],
        dnl is present.
 changequote(,)dnl
        case "$host_os" in
-         # Guess no on FreeBSD, NetBSD, Solaris, native Windows.
-         freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*)
+         # Guess no on FreeBSD, NetBSD, OpenBSD, Solaris, native Windows, Haiku, Android.
+         freebsd* | dragonfly* | netbsd* | openbsd* | solaris* | mingw* | windows* | haiku* | *-android*)
            gl_cv_func_iswdigit_works="guessing no" ;;
          # Guess yes otherwise.
          *) gl_cv_func_iswdigit_works="guessing yes" ;;
        esac
 changequote([,])dnl
-       if test $LOCALE_FR != none || test $LOCALE_JA != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_ZH_CN != none; then
+       if test $LOCALE_FR != none || test $LOCALE_JA != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_ZH_CN != none; then
          AC_RUN_IFELSE(
            [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -83,15 +84,15 @@ main (int argc, char *argv[])
       if (!(is == 0))
         result |= 2;
     }
-  if (strcmp ("$LOCALE_FR_UTF8", "none") != 0
-      && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (strcmp ("$LOCALE_EN_UTF8", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
-      /* This fails on FreeBSD 13.0, NetBSD 10.0, MSVC 14.  */
+      /* This fails on FreeBSD 13.0, NetBSD 10.0, OpenBSD 7.5, MSVC 14, Haiku, Android.  */
       /* U+0663 ARABIC-INDIC DIGIT THREE */
       is = for_character ("\331\243", 2);
       if (!(is == 0))
         result |= 4;
-      /* This fails on FreeBSD 13.0, NetBSD 10.0, MSVC 14.  */
+      /* This fails on FreeBSD 13.0, NetBSD 10.0, OpenBSD 7.5, MSVC 14, Haiku, Android.  */
       /* U+FF11 FULLWIDTH DIGIT ONE */
       is = for_character ("\357\274\221", 3);
       if (!(is == 0))
diff --git a/gl/m4/iswpunct.m4 b/gl/m4/iswpunct.m4
index 1edf58aa..d8e8d712 100644
--- a/gl/m4/iswpunct.m4
+++ b/gl/m4/iswpunct.m4
@@ -1,9 +1,10 @@
 # iswpunct.m4
 # serial 2
-dnl Copyright (C) 2023-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2023-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_ISWPUNCT],
 [
diff --git a/gl/m4/iswxdigit.m4 b/gl/m4/iswxdigit.m4
index 6085bf6b..95226fc4 100644
--- a/gl/m4/iswxdigit.m4
+++ b/gl/m4/iswxdigit.m4
@@ -1,16 +1,17 @@
 # iswxdigit.m4
-# serial 7
-dnl Copyright (C) 2020-2024 Free Software Foundation, Inc.
+# serial 9
+dnl Copyright (C) 2020-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_ISWXDIGIT],
 [
   AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
   AC_REQUIRE([gl_WCTYPE_H])
   AC_REQUIRE([gt_LOCALE_JA])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([gt_LOCALE_EN_UTF8])
   AC_REQUIRE([gt_LOCALE_ZH_CN])
   AC_REQUIRE([AC_CANONICAL_HOST])
 
@@ -25,14 +26,14 @@ AC_DEFUN([gl_FUNC_ISWXDIGIT],
        dnl is present.
 changequote(,)dnl
        case "$host_os" in
-         # Guess no on FreeBSD, NetBSD, Solaris, native Windows.
-         freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*)
+         # Guess no on FreeBSD, NetBSD, OpenBSD, Solaris, native Windows, Haiku, Android.
+         freebsd* | dragonfly* | netbsd* | openbsd* | solaris* | mingw* | windows* | haiku* | *-android*)
            gl_cv_func_iswxdigit_works="guessing no" ;;
          # Guess yes otherwise.
          *) gl_cv_func_iswxdigit_works="guessing yes" ;;
        esac
 changequote([,])dnl
-       if test $LOCALE_JA != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_ZH_CN != none; then
+       if test $LOCALE_JA != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_ZH_CN != none; then
          AC_RUN_IFELSE(
            [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -73,15 +74,15 @@ main (int argc, char *argv[])
       if (!(is == 0))
         result |= 1;
     }
-  if (strcmp ("$LOCALE_FR_UTF8", "none") != 0
-      && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (strcmp ("$LOCALE_EN_UTF8", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
-      /* This fails on FreeBSD 13.0.  */
+      /* This fails on FreeBSD 13.0, Haiku, Android.  */
       /* U+0663 ARABIC-INDIC DIGIT THREE */
       is = for_character ("\331\243", 2);
       if (!(is == 0))
         result |= 2;
-      /* This fails on NetBSD 10.0, MSVC 14.  */
+      /* This fails on NetBSD 10.0, OpenBSD 7.5, MSVC 14, Haiku, Android.  */
       /* U+FF21 FULLWIDTH LATIN CAPITAL LETTER A */
       is = for_character ("\357\274\241", 3);
       if (!(is == 0))
diff --git a/gl/m4/langinfo_h.m4 b/gl/m4/langinfo_h.m4
index 5eee8a71..69f936f0 100644
--- a/gl/m4/langinfo_h.m4
+++ b/gl/m4/langinfo_h.m4
@@ -1,9 +1,10 @@
 # langinfo_h.m4
-# serial 12
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# serial 13
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_LANGINFO_H],
 [
@@ -19,6 +20,7 @@ AC_DEFUN_ONCE([gl_LANGINFO_H],
   HAVE_LANGINFO_CODESET=0
   HAVE_LANGINFO_T_FMT_AMPM=0
   HAVE_LANGINFO_ALTMON=0
+  HAVE_LANGINFO_ABALTMON=0
   HAVE_LANGINFO_ERA=0
   HAVE_LANGINFO_YESEXPR=0
   AC_CHECK_HEADERS_ONCE([langinfo.h])
@@ -29,6 +31,7 @@ AC_DEFUN_ONCE([gl_LANGINFO_H],
     dnl ERA etc. are missing on OpenBSD 6.7.
     dnl T_FMT_AMPM and YESEXPR, NOEXPR are missing on IRIX 5.3.
     dnl ALTMON_* are missing on glibc 2.26 and many other systems.
+    dnl ABALTMON_* are missing on glibc 2.41 and many other systems.
     AC_CACHE_CHECK([whether langinfo.h defines CODESET],
       [gl_cv_header_langinfo_codeset],
       [AC_COMPILE_IFELSE(
@@ -65,6 +68,18 @@ int a = ALTMON_1;
     if test $gl_cv_header_langinfo_altmon = yes; then
       HAVE_LANGINFO_ALTMON=1
     fi
+    AC_CACHE_CHECK([whether langinfo.h defines ABALTMON_1],
+      [gl_cv_header_langinfo_abaltmon],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM([[#include <langinfo.h>
+int a = ABALTMON_1;
+]])],
+         [gl_cv_header_langinfo_abaltmon=yes],
+         [gl_cv_header_langinfo_abaltmon=no])
+      ])
+    if test $gl_cv_header_langinfo_abaltmon = yes; then
+      HAVE_LANGINFO_ABALTMON=1
+    fi
     AC_CACHE_CHECK([whether langinfo.h defines ERA],
       [gl_cv_header_langinfo_era],
       [AC_COMPILE_IFELSE(
@@ -96,6 +111,7 @@ int a = YESEXPR;
   AC_SUBST([HAVE_LANGINFO_CODESET])
   AC_SUBST([HAVE_LANGINFO_T_FMT_AMPM])
   AC_SUBST([HAVE_LANGINFO_ALTMON])
+  AC_SUBST([HAVE_LANGINFO_ABALTMON])
   AC_SUBST([HAVE_LANGINFO_ERA])
   AC_SUBST([HAVE_LANGINFO_YESEXPR])
 
diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
index 2f824089..b24f657d 100644
--- a/gl/m4/largefile.m4
+++ b/gl/m4/largefile.m4
@@ -1,9 +1,10 @@
 # largefile.m4
-# serial 1
-dnl Copyright 1992-1996, 1998-2024 Free Software Foundation, Inc.
+# serial 2
+dnl Copyright 1992-1996, 1998-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Enable large files on systems where this is not the default.
 # Enable support for files on Linux file systems with 64-bit inode numbers.
@@ -88,7 +89,7 @@ m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize(
 # If you change this macro you may also need to change
 # _AC_SYS_YEAR2038_OPTIONS.
 AC_DEFUN([_AC_SYS_YEAR2038_PROBE],
-[AC_CACHE_CHECK([for $CPPFLAGS option for timestamps after 2038],
+[AC_CACHE_CHECK([for $CC option to support timestamps after 2038],
   [ac_cv_sys_year2038_opts],
   [ac_save_CPPFLAGS="$CPPFLAGS"
   ac_opt_found=no
@@ -234,7 +235,7 @@ m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize(
 # If you change this macro you may also need to change
 # _AC_SYS_LARGEFILE_OPTIONS.
 AC_DEFUN([_AC_SYS_LARGEFILE_PROBE],
-[AC_CACHE_CHECK([for $CPPFLAGS option for large files],
+[AC_CACHE_CHECK([for $CC option to support large files],
   [ac_cv_sys_largefile_opts],
   [ac_save_CPPFLAGS=$CPPFLAGS
   ac_opt_found=no
@@ -294,7 +295,7 @@ AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])])
 # By default, many hosts won't let programs access large files;
 # one must use special compiler options to get large-file access to work.
 # For more details about this brain damage please see:
-# http://www.unix.org/version2/whatsnew/lfs20mar.html
+# https://www.unix.org/version2/whatsnew/lfs20mar.html
 # Additionally, on Linux file systems with 64-bit inodes a file that happens
 # to have a 64-bit inode number cannot be accessed by 32-bit applications on
 # Linux x86/x86_64.  This can occur with file systems such as XFS and NFS.
diff --git a/gl/m4/libunistring-base.m4 b/gl/m4/libunistring-base.m4
new file mode 100644
index 00000000..9b5795ed
--- /dev/null
+++ b/gl/m4/libunistring-base.m4
@@ -0,0 +1,204 @@
+# libunistring-base.m4
+# serial 10
+dnl Copyright (C) 2010-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Paolo Bonzini and Bruno Haible.
+
+dnl gl_LIBUNISTRING_MODULE([VERSION], [Module])
+dnl Declares that the source files of Module should be compiled, unless we
+dnl are linking with libunistring and its version is >= the given VERSION.
+dnl Defines an automake conditional LIBUNISTRING_COMPILE_$MODULE that is
+dnl true if the source files of Module should be compiled.
+dnl This macro is to be used for public libunistring API, not for
+dnl undocumented API.
+dnl
+dnl You have to bump the VERSION argument to the next projected version
+dnl number each time you make a change that affects the behaviour of the
+dnl functions defined in Module (even if the sources of Module itself do not
+dnl change).
+dnl
+dnl This macro invocation must not occur in macros that are AC_REQUIREd.
+
+AC_DEFUN([gl_LIBUNISTRING_MODULE],
+[
+  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
+  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
+  dnl gl_LIBUNISTRING_CORE if that macro has been run.
+  gl_CONDITIONAL(AS_TR_CPP([LIBUNISTRING_COMPILE_$2]),
+    [gl_LIBUNISTRING_VERSION_CMP([$1])])
+])
+
+dnl gl_LIBUNISTRING_MODULE_WITH_VARIABLE([VERSION], [Module])
+dnl is like gl_LIBUNISTRING_MODULE([VERSION], [Module]), except that it also
+dnl defines an AC_SUBSTed autoconf variable GNULIB_$MODULE_DLL_VARIABLE.
+dnl What's the expansion of this autoconf variable?
+dnl   - When building libunistring, it expands to LIBUNISTRING_DLL_VARIABLE.
+dnl     (This is necessary because this token must be present in the .h files
+dnl     when the .h files get installed.)
+dnl   - When building gnulib or application code it expands to
+dnl       - LIBUNISTRING_DLL_VARIABLE by default,
+dnl       - if the automake conditional LIBUNISTRING_COMPILE_$MODULE evaluates
+dnl         to true: the value of
+dnl         ${module_indicator_prefix}_GNULIB_LIBUNISTRING_DLL_VARIABLE_NAME
+dnl         (which usually is empty, unless explicitly set in configure.ac).
+dnl     (This is necessary because when the conditional evaluates to false,
+dnl     the application code expects to use the declared variable from the
+dnl     installed libunistring; it's in this case that the
+dnl     LIBUNISTRING_DLL_VARIABLE macro from the installed
+dnl     <unistring/woe32dll.h> must be used.)
+dnl
+dnl This macro invocation must not occur in macros that are AC_REQUIREd.
+
+AC_DEFUN([gl_LIBUNISTRING_MODULE_WITH_VARIABLE],
+[
+  gl_LIBUNISTRING_MODULE([$1], [$2])
+  m4_ifndef([gl_IN_LIBUNISTRING],
+    [if test -z "${AS_TR_CPP([LIBUNISTRING_COMPILE_$2])_TRUE}"; then
+       GL_MODULE_INDICATOR_PREFIX[]_GNULIB_[]AS_TR_CPP([$2_DLL_VARIABLE])=$GL_MODULE_INDICATOR_PREFIX[]_GNULIB_LIBUNISTRING_DLL_VARIABLE_NAME
+     fi
+    ])
+])
+
+dnl gl_LIBUNISTRING_LIBHEADER([VERSION], [HeaderFile])
+dnl Declares that HeaderFile should be created, unless we are linking
+dnl with libunistring and its version is >= the given VERSION.
+dnl HeaderFile should be relative to the lib directory and end in '.h'.
+dnl Prepares for substituting LIBUNISTRING_HEADERFILE (to HeaderFile or empty).
+dnl
+dnl When we are linking with the already installed libunistring and its version
+dnl is < VERSION, we create HeaderFile here, because we may compile functions
+dnl (via gl_LIBUNISTRING_MODULE above) that are not contained in the installed
+dnl version.
+dnl When we are linking with the already installed libunistring and its version
+dnl is > VERSION, we don't create HeaderFile here: it could cause compilation
+dnl errors in other libunistring header files if some types are missing.
+dnl
+dnl You have to bump the VERSION argument to the next projected version
+dnl number each time you make a non-comment change to the HeaderFile.
+
+AC_DEFUN([gl_LIBUNISTRING_LIBHEADER],
+[
+  AC_REQUIRE([gl_LIBUNISTRING_LIB_PREPARE])
+  dnl Use the variables HAVE_LIBUNISTRING, LIBUNISTRING_VERSION from
+  dnl gl_LIBUNISTRING_CORE if that macro has been run.
+  if gl_LIBUNISTRING_VERSION_CMP([$1]); then
+    dnl It is OK to use a .h file in lib/ from within tests/, but not vice
+    dnl versa.
+    if test -z "$LIBUNISTRING_[]AS_TR_CPP([$2])"; then
+      LIBUNISTRING_[]AS_TR_CPP([$2])="${gl_source_base_prefix}$2"
+    fi
+  else
+    LIBUNISTRING_[]AS_TR_CPP([$2])=
+  fi
+  AC_SUBST([LIBUNISTRING_]AS_TR_CPP([$2]))
+])
+
+dnl Miscellaneous preparations/initializations.
+
+AC_DEFUN([gl_LIBUNISTRING_LIB_PREPARE],
+[
+  dnl Ensure that HAVE_LIBUNISTRING is fully determined at this point.
+  m4_ifdef([gl_LIBUNISTRING], [AC_REQUIRE([gl_LIBUNISTRING])])
+
+  AC_REQUIRE([AC_PROG_AWK])
+
+dnl Sed expressions to extract the parts of a version number.
+changequote(,)
+gl_libunistring_sed_extract_major='/^[0-9]/{s/^\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{s/^[0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+gl_libunistring_sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p;q;}
+i\
+0
+q
+'
+changequote([,])
+
+  if test "$HAVE_LIBUNISTRING" = yes; then
+    LIBUNISTRING_VERSION_MAJOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_major"`
+    LIBUNISTRING_VERSION_MINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_minor"`
+    LIBUNISTRING_VERSION_SUBMINOR=`echo "$LIBUNISTRING_VERSION" | sed -n -e "$gl_libunistring_sed_extract_subminor"`
+  fi
+
+  dnl Determine whether <unistring/woe32dll.h> from an installed libunistring
+  dnl is available.
+  m4_ifdef([gl_IN_LIBUNISTRING],
+    [dnl In libunistring, all .h files that declare variables need to
+     dnl #include <unistring/woe32dll.h>.  This references the file
+     dnl unistring/woe32dll.h in libunistring.
+     HAVE_UNISTRING_WOE32DLL_H=1
+    ],
+    [dnl In gnulib or in applications, we need a #include <unistring/woe32dll.h>
+     dnl if and only if an installed libunistring is available.
+     if test "$HAVE_LIBUNISTRING" = yes; then
+       AC_CHECK_HEADERS([unistring/woe32dll.h],
+         [HAVE_UNISTRING_WOE32DLL_H=1],
+         [HAVE_UNISTRING_WOE32DLL_H=0])
+     else
+       HAVE_UNISTRING_WOE32DLL_H=0
+     fi
+    ])
+  AC_SUBST([HAVE_UNISTRING_WOE32DLL_H])
+])
+
+dnl gl_LIBUNISTRING_VERSION_CMP([VERSION])
+dnl Expands to a shell statement that evaluates to true if LIBUNISTRING_VERSION
+dnl is less than the VERSION argument.
+AC_DEFUN([gl_LIBUNISTRING_VERSION_CMP],
+[dnl VERSION = 999.9 means to evaluates to true always, i.e. to ignore
+dnl the installed libunistring regardless of its version.
+m4_if([$1], [999.9],
+[true],
+[ { test "$HAVE_LIBUNISTRING" != yes \
+    || {
+         dnl AS_LITERAL_IF exists and works fine since autoconf-2.59 at least.
+         AS_LITERAL_IF([$1],
+           [dnl This is the optimized variant, that assumes the argument is a literal:
+            m4_pushdef([requested_version_major],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^\([0-9]*\).*], [\1]), [])])
+            m4_pushdef([requested_version_minor],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
+            m4_pushdef([requested_version_subminor],
+              [gl_LIBUNISTRING_ARG_OR_ZERO(m4_bpatsubst([$1], [^[0-9]*[.][0-9]*[.]\([0-9]*\).*], [\1]), [$1])])
+            test $LIBUNISTRING_VERSION_MAJOR -lt requested_version_major \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq requested_version_major \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt requested_version_minor \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq requested_version_minor \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt requested_version_subminor
+                         }
+                    }
+               }
+            m4_popdef([requested_version_subminor])
+            m4_popdef([requested_version_minor])
+            m4_popdef([requested_version_major])
+           ],
+           [dnl This is the unoptimized variant:
+            requested_version_major=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_major"`
+            requested_version_minor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_minor"`
+            requested_version_subminor=`echo '$1' | sed -n -e "$gl_libunistring_sed_extract_subminor"`
+            test $LIBUNISTRING_VERSION_MAJOR -lt $requested_version_major \
+            || { test $LIBUNISTRING_VERSION_MAJOR -eq $requested_version_major \
+                 && { test $LIBUNISTRING_VERSION_MINOR -lt $requested_version_minor \
+                      || { test $LIBUNISTRING_VERSION_MINOR -eq $requested_version_minor \
+                           && test $LIBUNISTRING_VERSION_SUBMINOR -lt $requested_version_subminor
+                         }
+                    }
+               }
+           ])
+       }
+  }])])
+
+dnl gl_LIBUNISTRING_ARG_OR_ZERO([ARG], [ORIG]) expands to ARG if it is not the
+dnl same as ORIG, otherwise to 0.
+m4_define([gl_LIBUNISTRING_ARG_OR_ZERO], [m4_if([$1], [$2], [0], [$1])])
diff --git a/gl/m4/limits-h.m4 b/gl/m4/limits-h.m4
index 1b619e1e..202df492 100644
--- a/gl/m4/limits-h.m4
+++ b/gl/m4/limits-h.m4
@@ -1,9 +1,10 @@
 # limits-h.m4
 # serial 1
-dnl Copyright 2016-2024 Free Software Foundation, Inc.
+dnl Copyright 2016-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Check whether limits.h has needed features.
 
diff --git a/gl/m4/localcharset.m4 b/gl/m4/localcharset.m4
index 807a5eed..374a48f1 100644
--- a/gl/m4/localcharset.m4
+++ b/gl/m4/localcharset.m4
@@ -1,9 +1,10 @@
 # localcharset.m4
 # serial 8
-dnl Copyright (C) 2002, 2004, 2006, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2004, 2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_LOCALCHARSET],
 [
diff --git a/gl/m4/locale-en.m4 b/gl/m4/locale-en.m4
new file mode 100644
index 00000000..4151428a
--- /dev/null
+++ b/gl/m4/locale-en.m4
@@ -0,0 +1,138 @@
+# locale-en.m4
+# serial 1
+dnl Copyright (C) 2003-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Bruno Haible.
+
+dnl Determine the name of an English (or American English) locale with
+dnl UTF-8 encoding.
+AC_DEFUN_ONCE([gt_LOCALE_EN_UTF8],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AM_LANGINFO_CODESET])
+  AC_CACHE_CHECK([for an english Unicode locale], [gt_cv_locale_en_utf8], [
+    case "$host_os" in
+      *-musl* | midipix*)
+        dnl On musl libc, all kinds of ll_CC.UTF-8 locales exist, even without
+        dnl any locale file on disk. But they are effectively equivalent to the
+        dnl C.UTF-8 locale, except for locale categories (such as LC_MESSSAGES)
+        dnl for which localizations (.mo files) have been installed.
+        gt_cv_locale_en_utf8=en_US.UTF-8
+        ;;
+      *)
+        AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+#include <locale.h>
+#include <time.h>
+#if HAVE_LANGINFO_CODESET
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <string.h>
+struct tm t;
+char buf[16];
+int main () {
+  /* On BeOS and Haiku, locales are not implemented in libc.  Rather, libintl
+     imitates locale dependent behaviour by looking at the environment
+     variables, and all locales use the UTF-8 encoding.  */
+#if !(defined __BEOS__ || defined __HAIKU__)
+  /* Check whether the given locale name is recognized by the system.  */
+# if defined _WIN32 && !defined __CYGWIN__
+  /* On native Windows, setlocale(category, "") looks at the system settings,
+     not at the environment variables.  Also, when an encoding suffix such
+     as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
+     category of the locale to "C".  */
+  if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
+      || strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
+    return 1;
+# else
+  if (setlocale (LC_ALL, "") == NULL) return 1;
+# endif
+  /* Check whether nl_langinfo(CODESET) is "UTF-8" or equivalent.  */
+# if HAVE_LANGINFO_CODESET
+  {
+    const char *cs = nl_langinfo (CODESET);
+    if (!(strcmp (cs, "UTF-8") == 0 || strcmp (cs, "UTF8") == 0
+          || strcmp (cs, "utf-8") == 0 || strcmp (cs, "utf8") == 0))
+      return 1;
+  }
+# endif
+# ifdef __CYGWIN__
+  /* On Cygwin, avoid locale names without encoding suffix, because the
+     locale_charset() function relies on the encoding suffix.  Note that
+     LC_ALL is set on the command line.  */
+  if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
+# endif
+  /* Check the third month name.  */
+  t.tm_year = 1975 - 1900; t.tm_mon = 3 - 1; t.tm_mday = 24;
+  if (strftime (buf, sizeof (buf), "%B", &t) < 5 || strcmp (buf, "March") != 0)
+    return 1;
+#endif
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
+  /* Check whether the decimal separator is a dot.  */
+  if (localeconv () ->decimal_point[0] != '.') return 1;
+#endif
+  return 0;
+}
+          ]])])
+        if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
+          case "$host_os" in
+            # Handle native Windows specially, because there setlocale() interprets
+            # "ar" or "ara" as "Arabic" or "Arabic_Saudi Arabia.1256",
+            # "en" or "eng" as "English" or "English_United States.1252",
+            # "fr" or "fra" as "French" or "French_France.1252",
+            # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
+            # "ja" or "jpn" as "Japanese" or "Japanese_Japan.932",
+            # and similar.
+            mingw* | windows*)
+              # Test for the hypothetical native Windows locale name.
+              if (LC_ALL='English_United States.65001' LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_en_utf8='English_United States.65001'
+              else
+                # None found.
+                gt_cv_locale_en_utf8=none
+              fi
+              ;;
+            *)
+              # Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
+              # otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
+              # configure script would override the LC_ALL setting. Likewise for
+              # LC_CTYPE, which is also set at the beginning of the configure script.
+              # Test for the locale name with explicit encoding suffix first
+              # (this is necessary on Haiku).
+              if (LC_ALL=en_US.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_en_utf8=en_US.UTF-8
+              else
+                # Test for the locale name without encoding suffix.
+                if (LC_ALL=en_US LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                  gt_cv_locale_en_utf8=en_US
+                else
+                  # Test for the Solaris 10 locale name.
+                  if (LC_ALL=en.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                    gt_cv_locale_en_utf8=en.UTF-8
+                  else
+                    # None found.
+                    gt_cv_locale_en_utf8=none
+                  fi
+                fi
+              fi
+              ;;
+          esac
+        fi
+        rm -fr conftest*
+        ;;
+    esac
+  ])
+  LOCALE_EN_UTF8="$gt_cv_locale_en_utf8"
+  case "$LOCALE_EN_UTF8" in #(
+    '' | *[[\"\$\'*@<:@]]*)
+      dnl The empty value occurs when the conftest.c program above could not
+      dnl be compiled.  The other values might cause trouble with sh or make.
+      AC_MSG_WARN([invalid locale "$LOCALE_EN_UTF8"; assuming "none"])
+      LOCALE_EN_UTF8=none;;
+  esac
+  AC_SUBST([LOCALE_EN_UTF8])
+])
diff --git a/gl/m4/locale-fr.m4 b/gl/m4/locale-fr.m4
index f8d7c543..f504d5b5 100644
--- a/gl/m4/locale-fr.m4
+++ b/gl/m4/locale-fr.m4
@@ -1,9 +1,10 @@
 # locale-fr.m4
-# serial 23
-dnl Copyright (C) 2003, 2005-2024 Free Software Foundation, Inc.
+# serial 24
+dnl Copyright (C) 2003, 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 
@@ -71,8 +72,9 @@ int main () {
   if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
 # if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale
+     and on Haiku in the fr_FR.UTF-8 locale,
+     localeconv()->decimal_point are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
 # endif
   return 0;
@@ -82,10 +84,11 @@ int main () {
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
       case "$host_os" in
         # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "ar" or "ara" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "en" or "eng" as "English" or "English_United States.1252",
         # "fr" or "fra" as "French" or "French_France.1252",
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
+        # "ja" or "jpn" as "Japanese" or "Japanese_Japan.932",
         # and similar.
         mingw* | windows*)
           # Test for the native Windows locale name.
@@ -214,8 +217,9 @@ int main () {
 #endif
 #if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy.  */
   /* Check whether the decimal separator is a comma.
-     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
-     are nl_langinfo(RADIXCHAR) are both ".".  */
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale
+     and on Haiku in the fr_FR.UTF-8 locale,
+     localeconv()->decimal_point are nl_langinfo(RADIXCHAR) are both ".".  */
   if (localeconv () ->decimal_point[0] != ',') return 1;
 #endif
   return 0;
@@ -224,10 +228,11 @@ int main () {
         if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
           case "$host_os" in
             # Handle native Windows specially, because there setlocale() interprets
-            # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+            # "ar" or "ara" as "Arabic" or "Arabic_Saudi Arabia.1256",
+            # "en" or "eng" as "English" or "English_United States.1252",
             # "fr" or "fra" as "French" or "French_France.1252",
             # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-            # "ja" as "Japanese" or "Japanese_Japan.932",
+            # "ja" or "jpn" as "Japanese" or "Japanese_Japan.932",
             # and similar.
             mingw* | windows*)
               # Test for the hypothetical native Windows locale name.
diff --git a/gl/m4/locale-ja.m4 b/gl/m4/locale-ja.m4
index 8423bcb9..1c813b89 100644
--- a/gl/m4/locale-ja.m4
+++ b/gl/m4/locale-ja.m4
@@ -1,9 +1,10 @@
 # locale-ja.m4
-# serial 18
-dnl Copyright (C) 2003, 2005-2024 Free Software Foundation, Inc.
+# serial 19
+dnl Copyright (C) 2003, 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 
@@ -86,10 +87,11 @@ int main ()
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
       case "$host_os" in
         # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "ar" or "ara" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "en" or "eng" as "English" or "English_United States.1252",
         # "fr" or "fra" as "French" or "French_France.1252",
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
+        # "ja" or "jpn" as "Japanese" or "Japanese_Japan.932",
         # and similar.
         mingw* | windows*)
           # Note that on native Windows, the Japanese locale is
diff --git a/gl/m4/locale-zh.m4 b/gl/m4/locale-zh.m4
index 7f1a10be..6f9374d2 100644
--- a/gl/m4/locale-zh.m4
+++ b/gl/m4/locale-zh.m4
@@ -1,9 +1,10 @@
 # locale-zh.m4
-# serial 18
-dnl Copyright (C) 2003, 2005-2024 Free Software Foundation, Inc.
+# serial 20
+dnl Copyright (C) 2003, 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 
@@ -22,6 +23,7 @@ AC_DEFUN_ONCE([gt_LOCALE_ZH_CN],
 #endif
 #include <stdlib.h>
 #include <string.h>
+#include <wchar.h>
 struct tm t;
 char buf[16];
 int main ()
@@ -80,6 +82,19 @@ int main ()
      single wide character.  This excludes the GB2312 and GBK encodings.  */
   if (mblen ("\203\062\332\066", 5) != 4)
     return 1;
+  /* Check whether mbrtowc accept this character one byte at a time.
+     This excludes NetBSD 10.0.  */
+  if (sizeof (wchar_t) > 2)
+    {
+      wchar_t wc;
+      mbstate_t state;
+      memset (&state, 0, sizeof (state));
+      if (!(mbrtowc (&wc, "\203", 1, &state) == (size_t)(-2)
+            && mbrtowc (&wc, "\062", 1, &state) == (size_t)(-2)
+            && mbrtowc (&wc, "\332", 1, &state) == (size_t)(-2)
+            && mbrtowc (&wc, "\066", 1, &state) == 1))
+        return 1;
+    }
   return 0;
 #endif
 }
@@ -87,10 +102,11 @@ int main ()
     if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
       case "$host_os" in
         # Handle native Windows specially, because there setlocale() interprets
-        # "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "ar" or "ara" as "Arabic" or "Arabic_Saudi Arabia.1256",
+        # "en" or "eng" as "English" or "English_United States.1252",
         # "fr" or "fra" as "French" or "French_France.1252",
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
-        # "ja" as "Japanese" or "Japanese_Japan.932",
+        # "ja" or "jpn" as "Japanese" or "Japanese_Japan.932",
         # and similar.
         mingw* | windows*)
           # Test for the hypothetical native Windows locale name.
diff --git a/gl/m4/locale_h.m4 b/gl/m4/locale_h.m4
index cd1c81ec..e1afbc16 100644
--- a/gl/m4/locale_h.m4
+++ b/gl/m4/locale_h.m4
@@ -1,9 +1,10 @@
 # locale_h.m4
-# serial 31
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+# serial 37
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_LOCALE_H],
 [
@@ -19,6 +20,26 @@ AC_DEFUN_ONCE([gl_LOCALE_H],
   AC_REQUIRE([gl_STDDEF_H])
 
   AC_REQUIRE([gl_LOCALE_T])
+  dnl On native Windows, there is a type '_locale_t' that can be used to
+  dnl define locale_t.
+  AC_CACHE_CHECK([whether locale.h defines _locale_t],
+    [gl_cv_header_locale_has_windows_locale_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <locale.h>
+            _locale_t x;]],
+          [[]])],
+       [gl_cv_header_locale_has_windows_locale_t=yes],
+       [gl_cv_header_locale_has_windows_locale_t=no])
+    ])
+  if test $gl_cv_header_locale_has_windows_locale_t = yes; then
+    HAVE_WINDOWS_LOCALE_T=1
+    AC_DEFINE([HAVE_WINDOWS_LOCALE_T], [1],
+      [Define to 1 if <locale.h> defines the _locale_t type.])
+  else
+    HAVE_WINDOWS_LOCALE_T=0
+  fi
+  AC_SUBST([HAVE_WINDOWS_LOCALE_T])
 
   dnl Solaris 11.0 defines the int_p_*, int_n_* members of 'struct lconv'
   dnl only if _LCONV_C99 is defined.
@@ -86,7 +107,7 @@ AC_DEFUN_ONCE([gl_LOCALE_H],
 # include <xlocale.h>
 #endif
     ]],
-    [setlocale newlocale duplocale freelocale])
+    [setlocale newlocale duplocale freelocale getlocalename_l])
 ])
 
 dnl Checks to determine whether the system has the locale_t type,
@@ -130,6 +151,7 @@ AC_DEFUN([gl_LOCALE_T],
     fi
   fi
   AC_SUBST([HAVE_XLOCALE_H])
+  AC_SUBST([HAVE_LOCALE_T])
 ])
 
 # gl_LOCALE_MODULE_INDICATOR([modulename])
@@ -154,7 +176,11 @@ AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALECONV])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NEWLOCALE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREELOCALE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOCALENAME_L])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOCALENAME_L_UNSAFE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME_UNSAFE])
   ])
   m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS])
@@ -164,14 +190,16 @@ AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS],
 AC_DEFUN([gl_LOCALE_H_DEFAULTS],
 [
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_NEWLOCALE=1;       AC_SUBST([HAVE_NEWLOCALE])
-  HAVE_DUPLOCALE=1;       AC_SUBST([HAVE_DUPLOCALE])
-  HAVE_FREELOCALE=1;      AC_SUBST([HAVE_FREELOCALE])
-  REPLACE_LOCALECONV=0;   AC_SUBST([REPLACE_LOCALECONV])
-  REPLACE_SETLOCALE=0;    AC_SUBST([REPLACE_SETLOCALE])
-  REPLACE_NEWLOCALE=0;    AC_SUBST([REPLACE_NEWLOCALE])
-  REPLACE_DUPLOCALE=0;    AC_SUBST([REPLACE_DUPLOCALE])
-  REPLACE_FREELOCALE=0;   AC_SUBST([REPLACE_FREELOCALE])
-  REPLACE_STRUCT_LCONV=0; AC_SUBST([REPLACE_STRUCT_LCONV])
+  HAVE_NEWLOCALE=1;          AC_SUBST([HAVE_NEWLOCALE])
+  HAVE_DUPLOCALE=1;          AC_SUBST([HAVE_DUPLOCALE])
+  HAVE_FREELOCALE=1;         AC_SUBST([HAVE_FREELOCALE])
+  HAVE_GETLOCALENAME_L=1;    AC_SUBST([HAVE_GETLOCALENAME_L])
+  REPLACE_LOCALECONV=0;      AC_SUBST([REPLACE_LOCALECONV])
+  REPLACE_SETLOCALE=0;       AC_SUBST([REPLACE_SETLOCALE])
+  REPLACE_NEWLOCALE=0;       AC_SUBST([REPLACE_NEWLOCALE])
+  REPLACE_DUPLOCALE=0;       AC_SUBST([REPLACE_DUPLOCALE])
+  REPLACE_FREELOCALE=0;      AC_SUBST([REPLACE_FREELOCALE])
+  REPLACE_GETLOCALENAME_L=0; AC_SUBST([REPLACE_GETLOCALENAME_L])
+  REPLACE_STRUCT_LCONV=0;    AC_SUBST([REPLACE_STRUCT_LCONV])
   LOCALENAME_ENHANCE_LOCALE_FUNCS=0; AC_SUBST([LOCALENAME_ENHANCE_LOCALE_FUNCS])
 ])
diff --git a/gl/m4/localeconv.m4 b/gl/m4/localeconv.m4
index 77d5684f..55a669d0 100644
--- a/gl/m4/localeconv.m4
+++ b/gl/m4/localeconv.m4
@@ -1,9 +1,10 @@
 # localeconv.m4
 # serial 3
-dnl Copyright (C) 2012-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_LOCALECONV],
 [
diff --git a/gl/m4/lock.m4 b/gl/m4/lock.m4
index eb0fc6a1..b1d3f435 100644
--- a/gl/m4/lock.m4
+++ b/gl/m4/lock.m4
@@ -1,9 +1,10 @@
 # lock.m4
 # serial 14
-dnl Copyright (C) 2005-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 
diff --git a/gl/m4/lseek.m4 b/gl/m4/lseek.m4
index 0bc3d65e..ddfadd38 100644
--- a/gl/m4/lseek.m4
+++ b/gl/m4/lseek.m4
@@ -1,9 +1,10 @@
 # lseek.m4
 # serial 15
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_LSEEK],
 [
diff --git a/gl/m4/lstat.m4 b/gl/m4/lstat.m4
new file mode 100644
index 00000000..efae2485
--- /dev/null
+++ b/gl/m4/lstat.m4
@@ -0,0 +1,82 @@
+# lstat.m4
+# serial 36
+dnl Copyright (C) 1997-2001, 2003-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Jim Meyering.
+
+AC_DEFUN([gl_FUNC_LSTAT],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
+  dnl If lstat does not exist, the replacement <sys/stat.h> does
+  dnl "#define lstat stat", and lstat.c is a no-op.
+  AC_CHECK_FUNCS_ONCE([lstat])
+  if test $ac_cv_func_lstat = yes; then
+    AC_REQUIRE([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+    case $host_os,$gl_cv_func_lstat_dereferences_slashed_symlink in
+      darwin* | solaris* | *no)
+        REPLACE_LSTAT=1
+        ;;
+    esac
+  else
+    HAVE_LSTAT=0
+  fi
+])
+
+# Prerequisites of lib/lstat.c.
+AC_DEFUN([gl_PREREQ_LSTAT], [:])
+
+AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
+[
+  dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it
+  dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ.
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether lstat correctly handles trailing slash],
+    [gl_cv_func_lstat_dereferences_slashed_symlink],
+    [rm -f conftest.sym conftest.file
+     echo >conftest.file
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [AC_INCLUDES_DEFAULT],
+          [[struct stat sbuf;
+            if (symlink ("conftest.file", "conftest.sym") != 0)
+              return 1;
+            /* Linux will dereference the symlink and fail, as required by
+               POSIX.  That is better in the sense that it means we will not
+               have to compile and use the lstat wrapper.  */
+            return lstat ("conftest.sym/", &sbuf) == 0;
+          ]])],
+       [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
+       [gl_cv_func_lstat_dereferences_slashed_symlink=no],
+       [case "$host_os" in
+          linux-* | linux)
+            # Guess yes on Linux systems.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+          midipix*)
+            # Guess yes on systems that emulate the Linux system calls.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+          *-gnu* | gnu*)
+            # Guess yes on glibc systems.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+          mingw* | windows*)
+            # Guess no on native Windows.
+            gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
+          *)
+            # If we don't know, obey --enable-cross-guesses.
+            gl_cv_func_lstat_dereferences_slashed_symlink="$gl_cross_guess_normal" ;;
+        esac
+       ])
+     rm -f conftest.sym conftest.file
+    ])
+  case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
+    *yes)
+      AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1],
+        [Define to 1 if 'lstat' dereferences a symlink specified
+         with a trailing slash.])
+      ;;
+  esac
+])
diff --git a/gl/m4/malloc.m4 b/gl/m4/malloc.m4
index 41a46937..547b4e4d 100644
--- a/gl/m4/malloc.m4
+++ b/gl/m4/malloc.m4
@@ -1,12 +1,24 @@
 # malloc.m4
-# serial 31
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+# serial 43.1
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
-# This is adapted with modifications from upstream Autoconf here:
-# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n949
+m4_version_prereq([2.73], [], [
+# Modules that use this macro directly or indirectly should depend
+# on extensions-aix, so that _LINUX_SOURCE_COMPAT gets defined
+# before this macro gets invoked.  This helps on AIX 7.2 and earlier
+# if !(__VEC__ || __AIXVEC), and doesn't hurt otherwise.
+#
+# This is copied from upstream Autoconf here:
+# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=1f38316f6af7bf63e5e7dd187ff6456e07ad743e#n971
+# _AC_FUNC_MALLOC_IF(IF-WORKS, IF-NOT[, UNKNOWN-ASSUME])
+# ------------------------------------------------------
+# If 'malloc (0)' returns nonnull, run IF-WORKS, otherwise, IF-NOT.
+# If it is not known whether it works, assume the shell word UNKNOWN-ASSUME,
+# which should end in "yes" or in something else (the latter is the default).
 AC_DEFUN([_AC_FUNC_MALLOC_IF],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
@@ -15,56 +27,81 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
     [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <stdlib.h>
-          ]],
-          [[void *p = malloc (0);
-            void * volatile vp = p;
-            int result = !vp;
+            /* Use pmalloc to test; 'volatile' prevents the compiler
+               from optimizing the malloc call away.  */
+            void *(*volatile pmalloc) (size_t) = malloc;]],
+          [[void *p = pmalloc (0);
+            int result = !p;
             free (p);
-            return result;]])
-       ],
+            return result;]])],
        [ac_cv_func_malloc_0_nonnull=yes],
        [ac_cv_func_malloc_0_nonnull=no],
-       [case "$host_os" in
-          # Guess yes on platforms where we know the result.
-          *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-          | gnu* | *-musl* | midipix* | midnightbsd* \
-          | hpux* | solaris* | cygwin* | mingw* | windows* | msys* )
-            ac_cv_func_malloc_0_nonnull="guessing yes" ;;
-          # If we don't know, obey --enable-cross-guesses.
-          *) ac_cv_func_malloc_0_nonnull="$gl_cross_guess_normal" ;;
-        esac
-       ])
-    ])
+       [AS_CASE([$host_os],
+          [# Guess yes on platforms where we know the result.
+           *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
+           | gnu* | *-musl* | midipix* | midnightbsd* \
+           | hpux* | solaris* | cygwin* | mingw* | windows* | msys*],
+            [ac_cv_func_malloc_0_nonnull="guessing yes"],
+          [# Guess as follows if we don't know.
+           ac_cv_func_malloc_0_nonnull=m4_default([$3], ["guessing no"])])])])
   AS_CASE([$ac_cv_func_malloc_0_nonnull], [*yes], [$1], [$2])
 ])# _AC_FUNC_MALLOC_IF
+])
+
+# gl_FUNC_MALLOC_0_NONNULL
+# ------------------------
+# If 'malloc (0)' returns nonnull define HAVE_MALLOC_0_NONNULL.
+# Also, set ac_cv_func_malloc_0_nonnull to a string that ends in
+# "yes", otherwise set it to something else.  If unknown whether
+# malloc (0) works, guess as normal for cross-builds.
+AC_DEFUN([gl_FUNC_MALLOC_0_NONNULL],
+[
+  _AC_FUNC_MALLOC_IF(
+    [AC_DEFINE([HAVE_MALLOC_0_NONNULL], [1],
+       [Define to 1 if malloc (0) returns nonnull.])],
+    [],
+    ["$gl_cross_guess_normal"])
+])
 
 # gl_FUNC_MALLOC_GNU
 # ------------------
-# Replace malloc if it is not compatible with GNU libc.
+# Test whether malloc (0) is compatible with GNU libc.
+# Replace malloc if not.
+# Define HAVE_MALLOC_0_NONNULL if malloc (0) returns nonnull (except upon
+# out-of-memory).
+# Define HAVE_MALLOC_PTRDIFF if malloc (N) reliably fails when N exceeds
+# PTRDIFF_MAX.
 AC_DEFUN([gl_FUNC_MALLOC_GNU],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
-  REPLACE_MALLOC_FOR_MALLOC_GNU="$REPLACE_MALLOC_FOR_MALLOC_POSIX"
-  if test $REPLACE_MALLOC_FOR_MALLOC_GNU = 0; then
-    _AC_FUNC_MALLOC_IF([], [REPLACE_MALLOC_FOR_MALLOC_GNU=1])
-  fi
+  AC_REQUIRE([gl_FUNC_MALLOC_0_NONNULL])
+
+  AS_CASE([$ac_cv_func_malloc_0_nonnull],
+    [*yes],
+      [REPLACE_MALLOC_FOR_MALLOC_GNU=$REPLACE_MALLOC_FOR_MALLOC_POSIX],
+    [REPLACE_MALLOC_FOR_MALLOC_GNU=1])
 ])
 
 # gl_FUNC_MALLOC_PTRDIFF
 # ----------------------
-# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX,
-# and replace malloc otherwise.
+# Test whether malloc (N) reliably fails when N exceeds PTRDIFF_MAX.
+# Define HAVE_MALLOC_PTRDIFF if yes.
+# Replace malloc if not.
 AC_DEFUN([gl_FUNC_MALLOC_PTRDIFF],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF])
-  test "$gl_cv_malloc_ptrdiff" = yes || REPLACE_MALLOC_FOR_MALLOC_POSIX=1
+  AS_IF([test "$gl_cv_malloc_ptrdiff" = yes],
+    [AC_DEFINE([HAVE_MALLOC_PTRDIFF], 1,
+       [Define to 1 if malloc-like functions do not allocate objects
+        larger than PTRDIFF_MAX bytes.])],
+    [REPLACE_MALLOC_FOR_MALLOC_POSIX=1])
 ])
 
-# Test whether malloc, realloc, calloc refuse to create objects
+# Test whether malloc, calloc refuse to create objects
 # larger than what can be expressed in ptrdiff_t.
-# Set gl_cv_func_malloc_gnu to yes or no accordingly.
+# Set gl_cv_func_malloc_gnu.
 AC_DEFUN([gl_CHECK_MALLOC_PTRDIFF],
 [
   AC_CACHE_CHECK([whether malloc is ptrdiff_t safe],
@@ -108,30 +145,48 @@ AC_DEFUN([gl_FUNC_MALLOC_POSIX],
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_MALLOC_PTRDIFF])
   AC_REQUIRE([gl_CHECK_MALLOC_POSIX])
-  if test "$gl_cv_func_malloc_posix" = yes; then
-    AC_DEFINE([HAVE_MALLOC_POSIX], [1],
-      [Define if malloc, realloc, and calloc set errno on allocation failure.])
-  else
-    REPLACE_MALLOC_FOR_MALLOC_POSIX=1
-  fi
+  case "$gl_cv_func_malloc_posix" in
+    *yes)
+      AC_DEFINE([HAVE_MALLOC_POSIX], [1],
+        [Define if malloc and calloc set errno on allocation failure.])
+      ;;
+    *)
+      REPLACE_MALLOC_FOR_MALLOC_POSIX=1
+      ;;
+  esac
 ])
 
-# Test whether malloc, realloc, calloc set errno to ENOMEM on failure.
-# Set gl_cv_func_malloc_posix to yes or no accordingly.
+# Test whether malloc, calloc set errno to ENOMEM on failure.
+# Set gl_cv_func_malloc_posix to *yes or *no accordingly.
 AC_DEFUN([gl_CHECK_MALLOC_POSIX],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_CACHE_CHECK([whether malloc, realloc, calloc set errno on failure],
+  AC_CACHE_CHECK([whether malloc, calloc set errno on failure],
     [gl_cv_func_malloc_posix],
     [
       dnl It is too dangerous to try to allocate a large amount of memory:
       dnl some systems go to their knees when you do that. So assume that
       dnl all Unix implementations of the function set errno on failure,
       dnl except on those platforms where we have seen 'test-malloc-gnu',
-      dnl 'test-realloc-gnu', 'test-calloc-gnu' fail.
+      dnl 'test-realloc-posix', 'test-calloc-gnu' fail. For platforms
+      dnl where only 'test-realloc-posix', see realloc.m4.
       case "$host_os" in
         mingw* | windows*)
-          gl_cv_func_malloc_posix=no ;;
+          dnl Old MSVCRT from 2001 did not set errno=ENOMEM when malloc failed.
+          dnl More recent MSVCRT from 2019 does so.
+          dnl UCRT is the successor of MSVCRT. Assume that UCRT does so as well.
+          AC_COMPILE_IFELSE(
+            [AC_LANG_PROGRAM(
+              [[#include <stdio.h>
+                #ifndef _UCRT
+                msvcrt yuck
+                #endif
+              ]],
+              [[]])
+            ],
+            [gl_cv_func_malloc_posix="guessing yes"],
+            [gl_cv_func_malloc_posix="guessing no"])
+          ;;
         irix* | solaris*)
           dnl On IRIX 6.5, the three functions return NULL with errno unset
           dnl when the argument is larger than PTRDIFF_MAX.
diff --git a/gl/m4/malloca.m4 b/gl/m4/malloca.m4
index 9e09d22c..cabe5fe7 100644
--- a/gl/m4/malloca.m4
+++ b/gl/m4/malloca.m4
@@ -1,15 +1,16 @@
 # malloca.m4
-# serial 2
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2024 Free Software Foundation,
+# serial 3
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_MALLOCA],
 [
   dnl Use the autoconf tests for alloca(), but not the AC_SUBSTed variables
   dnl @ALLOCA@ and @LTALLOCA@.
   dnl gl_FUNC_ALLOCA   dnl Already brought in by the module dependencies.
-  AC_REQUIRE([gl_EEMALLOC])
+  AC_REQUIRE([gl_FUNC_MALLOC_GNU])
 ])
diff --git a/gl/m4/math_h.m4 b/gl/m4/math_h.m4
index 4b26c9e9..8c27503b 100644
--- a/gl/m4/math_h.m4
+++ b/gl/m4/math_h.m4
@@ -1,9 +1,10 @@
 # math_h.m4
-# serial 138
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 140.1
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_MATH_H],
 [
@@ -49,7 +50,7 @@ AC_DEFUN_ONCE([gl_MATH_H],
      ilogb ilogbf ilogbl
      ldexpf ldexpl
      log logf logl log10 log10f log10l log1p log1pf log1pl log2 log2f log2l
-     logb logbf logbl
+     logb logbf logbl logp1 log1pf logp1l
      modf modff modfl powf
      remainder remainderf remainderl
      rint rintf rintl round roundf roundl
@@ -153,6 +154,9 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGB])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGBL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGP1])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGP1F])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOGP1L])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MODFL])
@@ -253,6 +257,9 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   HAVE_LOG1PL=1;                    AC_SUBST([HAVE_LOG1PL])
   HAVE_LOGBF=1;                     AC_SUBST([HAVE_LOGBF])
   HAVE_LOGBL=1;                     AC_SUBST([HAVE_LOGBL])
+  HAVE_LOGP1=1;                     AC_SUBST([HAVE_LOGP1])
+  HAVE_LOGP1F=1;                    AC_SUBST([HAVE_LOGP1F])
+  HAVE_LOGP1L=1;                    AC_SUBST([HAVE_LOGP1L])
   HAVE_MODFF=1;                     AC_SUBST([HAVE_MODFF])
   HAVE_MODFL=1;                     AC_SUBST([HAVE_MODFL])
   HAVE_POWF=1;                      AC_SUBST([HAVE_POWF])
@@ -392,6 +399,7 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   REPLACE_SIGNBIT_USING_BUILTINS=0; AC_SUBST([REPLACE_SIGNBIT_USING_BUILTINS])
   REPLACE_SINF=0;                   AC_SUBST([REPLACE_SINF])
   REPLACE_SINHF=0;                  AC_SUBST([REPLACE_SINHF])
+  REPLACE_SINL=0;                   AC_SUBST([REPLACE_SINL])
   REPLACE_SQRTF=0;                  AC_SUBST([REPLACE_SQRTF])
   REPLACE_SQRTL=0;                  AC_SUBST([REPLACE_SQRTL])
   REPLACE_TANF=0;                   AC_SUBST([REPLACE_TANF])
diff --git a/gl/m4/mbchar.m4 b/gl/m4/mbchar.m4
new file mode 100644
index 00000000..b76f1d7b
--- /dev/null
+++ b/gl/m4/mbchar.m4
@@ -0,0 +1,15 @@
+# mbchar.m4
+# serial 9
+dnl Copyright (C) 2005-2007, 2009-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl autoconf tests required for use of mbchar.m4
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_MBCHAR],
+[
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+])
diff --git a/gl/m4/mbiter.m4 b/gl/m4/mbiter.m4
new file mode 100644
index 00000000..b51242e6
--- /dev/null
+++ b/gl/m4/mbiter.m4
@@ -0,0 +1,16 @@
+# mbiter.m4
+# serial 7
+dnl Copyright (C) 2005, 2008-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl autoconf tests required for use of mbiter.h
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_MBITER],
+[
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  :
+])
diff --git a/gl/m4/mbrtoc32.m4 b/gl/m4/mbrtoc32.m4
new file mode 100644
index 00000000..1991529c
--- /dev/null
+++ b/gl/m4/mbrtoc32.m4
@@ -0,0 +1,326 @@
+# mbrtoc32.m4
+# serial 21
+dnl Copyright (C) 2014-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN([gl_FUNC_MBRTOC32],
+[
+  AC_REQUIRE([gl_UCHAR_H_DEFAULTS])
+
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  dnl Determine REPLACE_MBSTATE_T, from which GNULIB_defined_mbstate_t is
+  dnl determined.  It describes how our overridden mbrtowc is implemented.
+  dnl We then implement mbrtoc32 accordingly.
+  AC_REQUIRE([gl_MBSTATE_T_BROKEN])
+
+  AC_REQUIRE([gl_TYPE_CHAR32_T])
+  AC_REQUIRE([gl_MBRTOC32_SANITYCHECK])
+
+  AC_REQUIRE([gl_CHECK_FUNC_MBRTOC32])
+  if test $gl_cv_func_mbrtoc32 = no; then
+    HAVE_MBRTOC32=0
+  else
+    if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $REPLACE_MBSTATE_T = 1; then
+      REPLACE_MBRTOC32=1
+    else
+      gl_MBRTOC32_EMPTY_INPUT
+      gl_MBRTOC32_C_LOCALE
+      gl_MBRTOC32_UTF8_LOCALE
+      case "$gl_cv_func_mbrtoc32_empty_input" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOC32_EMPTY_INPUT_BUG], [1],
+             [Define if the mbrtoc32 function does not return (size_t) -2 for empty input.])
+           REPLACE_MBRTOC32=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ], [1],
+             [Define if the mbrtoc32 function may signal encoding errors in the C locale.])
+           REPLACE_MBRTOC32=1
+           ;;
+      esac
+      case "$gl_cv_func_mbrtoc32_utf8_locale_works" in
+        *yes) ;;
+        *) AC_DEFINE([MBRTOC32_MULTIBYTE_LOCALE_BUG], [1],
+             [Define if the mbrtoc32 function does not accept the input bytes one-by-one.])
+           REPLACE_MBRTOC32=1
+           dnl Our replacement mbrtoc32 can handle UTF-8, but not GB18030.
+           LOCALE_ZH_CN=none
+           ;;
+      esac
+    fi
+    if test $HAVE_WORKING_MBRTOC32 = 0; then
+      REPLACE_MBRTOC32=1
+    fi
+  fi
+])
+
+AC_DEFUN([gl_CHECK_FUNC_MBRTOC32],
+[
+  dnl Cf. gl_CHECK_FUNCS_ANDROID
+  AC_CHECK_DECL([mbrtoc32], , ,
+    [[#ifdef __HAIKU__
+       #include <stdint.h>
+      #endif
+      #include <uchar.h>
+    ]])
+  if test $ac_cv_have_decl_mbrtoc32 = yes; then
+    dnl We can't use AC_CHECK_FUNC here, because mbrtoc32() is defined as a
+    dnl static inline function on Haiku 2020.
+    AC_CACHE_CHECK([for mbrtoc32], [gl_cv_func_mbrtoc32],
+      [AC_LINK_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <stdlib.h>
+              #ifdef __HAIKU__
+               #include <stdint.h>
+              #endif
+              #include <uchar.h>
+            ]],
+            [[char32_t c;
+              return mbrtoc32 (&c, "", 1, NULL) == 0;
+            ]])
+         ],
+         [gl_cv_func_mbrtoc32=yes],
+         [gl_cv_func_mbrtoc32=no])
+      ])
+  else
+    gl_cv_func_mbrtoc32=no
+  fi
+])
+
+dnl Test whether mbrtoc32 returns the correct value on empty input.
+
+AC_DEFUN([gl_MBRTOC32_EMPTY_INPUT],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtoc32 works on empty input],
+    [gl_cv_func_mbrtoc32_empty_input],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+           #ifdef __HAIKU__
+            #include <stdint.h>
+           #endif
+           #include <uchar.h>
+           static char32_t wc;
+           static mbstate_t mbs;
+           int
+           main (void)
+           {
+             return mbrtoc32 (&wc, "", 0, &mbs) != (size_t) -2;
+           }]])],
+        [gl_cv_func_mbrtoc32_empty_input=yes],
+        [gl_cv_func_mbrtoc32_empty_input=no],
+        [case "$host_os" in
+                              # Guess no on glibc systems.
+           *-gnu* | gnu*)     gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
+                              # Guess no on Android.
+           linux*-android*)   gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
+                              # Guess no on native Windows.
+           mingw* | windows*) gl_cv_func_mbrtoc32_empty_input="guessing no" ;;
+           *)                 gl_cv_func_mbrtoc32_empty_input="guessing yes" ;;
+         esac
+        ])
+    ])
+])
+
+dnl <https://pubs.opengroup.org/onlinepubs/9699919799/functions/mbrtowc.html>
+dnl POSIX:2018 says regarding mbrtowc: "In the POSIX locale an [EILSEQ] error
+dnl cannot occur since all byte values are valid characters."  It is reasonable
+dnl to expect mbrtoc32 to behave in the same way.
+
+AC_DEFUN([gl_MBRTOC32_C_LOCALE],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether the C locale is free of encoding errors],
+    [gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <limits.h>
+            #include <locale.h>
+            #ifdef __HAIKU__
+             #include <stdint.h>
+            #endif
+            #include <uchar.h>
+          ]], [[
+            int i;
+            char *locale = setlocale (LC_ALL, "C");
+            if (! locale)
+              return 2;
+            for (i = CHAR_MIN; i <= CHAR_MAX; i++)
+              {
+                char c = i;
+                char32_t wc;
+                mbstate_t mbs = { 0, };
+                size_t ss = mbrtoc32 (&wc, &c, 1, &mbs);
+                if (1 < ss)
+                  return 3;
+              }
+            return 0;
+          ]])],
+       [gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ=yes],
+       [gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ=no],
+       [case "$host_os" in
+                             # Guess yes on native Windows.
+          mingw* | windows*) gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="guessing yes" ;;
+          *)                 gl_cv_func_mbrtoc32_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;;
+        esac
+       ])
+    ])
+])
+
+dnl Test whether mbrtoc32 works when it's fed the bytes one-by-one in an UTF-8
+dnl locale.
+
+AC_DEFUN([gl_MBRTOC32_UTF8_LOCALE],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether mbrtoc32 works in an UTF-8 locale],
+    [gl_cv_func_mbrtoc32_utf8_locale_works],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <locale.h>
+            #ifdef __HAIKU__
+             #include <stdint.h>
+            #endif
+            #include <uchar.h>
+          ]], [[
+            char *locale = setlocale (LC_ALL, "en_US.UTF-8");
+            if (locale)
+              {
+                /* This test fails on Cygwin 3.5.3.  */
+                mbstate_t state = { 0, };
+                char32_t uc = 0xDEADBEEF;
+                /* \360\237\220\203 = U+0001F403 */
+                if (mbrtoc32 (&uc, "\360", 1, &state) != (size_t)-2)
+                  return 1;
+                if (mbrtoc32 (&uc, "\237", 1, &state) != (size_t)-2)
+                  return 2;
+                if (mbrtoc32 (&uc, "\220", 1, &state) != (size_t)-2)
+                  return 3;
+                if (mbrtoc32 (&uc, "\203", 1, &state) != 1)
+                  return 4;
+                if (uc != 0x0001F403)
+                  return 5;
+              }
+            return 0;
+          ]])],
+       [gl_cv_func_mbrtoc32_utf8_locale_works=yes],
+       [gl_cv_func_mbrtoc32_utf8_locale_works=no],
+       [case "$host_os" in
+                   # Guess no on Cygwin.
+          cygwin*) gl_cv_func_mbrtoc32_utf8_locale_works="guessing no" ;;
+          *)       gl_cv_func_mbrtoc32_utf8_locale_works="$gl_cross_guess_normal" ;;
+        esac
+       ])
+    ])
+])
+
+dnl Test whether mbrtoc32 works not worse than mbrtowc.
+dnl Result is HAVE_WORKING_MBRTOC32.
+
+AC_DEFUN([gl_MBRTOC32_SANITYCHECK],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gl_TYPE_CHAR32_T])
+  AC_REQUIRE([gl_CHECK_FUNC_MBRTOC32])
+  AC_REQUIRE([gt_LOCALE_FR])
+  AC_REQUIRE([gt_LOCALE_ZH_CN])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  if test $GNULIBHEADERS_OVERRIDE_CHAR32_T = 1 || test $gl_cv_func_mbrtoc32 = no; then
+    HAVE_WORKING_MBRTOC32=0
+  else
+    AC_CACHE_CHECK([whether mbrtoc32 works as well as mbrtowc],
+      [gl_cv_func_mbrtoc32_sanitycheck],
+      [
+        dnl Initial guess, used when cross-compiling or when no suitable locale
+        dnl is present.
+changequote(,)dnl
+        case "$host_os" in
+          # Guess no on FreeBSD, Solaris, native Windows.
+          freebsd* | midnightbsd* | solaris* | mingw* | windows*)
+            gl_cv_func_mbrtoc32_sanitycheck="guessing no"
+            ;;
+          # Guess yes otherwise.
+          *)
+            gl_cv_func_mbrtoc32_sanitycheck="guessing yes"
+            ;;
+        esac
+changequote([,])dnl
+        if test $LOCALE_FR != none || test $LOCALE_ZH_CN != none; then
+          AC_RUN_IFELSE(
+            [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#ifdef __HAIKU__
+ #include <stdint.h>
+#endif
+#include <uchar.h>
+int main ()
+{
+  int result = 0;
+  /* This fails on native Windows:
+     mbrtoc32 returns (size_t)-1.
+     mbrtowc returns 1 (correct).  */
+  if (strcmp ("$LOCALE_FR", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+    {
+      mbstate_t state;
+      wchar_t wc = (wchar_t) 0xBADFACE;
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, "\374", 1, &state) == 1)
+        {
+          char32_t c32 = (wchar_t) 0xBADFACE;
+          memset (&state, '\0', sizeof (mbstate_t));
+          if (mbrtoc32 (&c32, "\374", 1, &state) != 1)
+            result |= 1;
+        }
+    }
+  /* This fails on FreeBSD 13.0 and Solaris 11.4:
+     mbrtoc32 returns (size_t)-2 or (size_t)-1.
+     mbrtowc returns 4 (correct).  */
+  if (strcmp ("$LOCALE_ZH_CN", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      mbstate_t state;
+      wchar_t wc = (wchar_t) 0xBADFACE;
+      memset (&state, '\0', sizeof (mbstate_t));
+      if (mbrtowc (&wc, "\224\071\375\067", 4, &state) == 4)
+        {
+          char32_t c32 = (wchar_t) 0xBADFACE;
+          memset (&state, '\0', sizeof (mbstate_t));
+          if (mbrtoc32 (&c32, "\224\071\375\067", 4, &state) != 4)
+            result |= 2;
+        }
+    }
+  return result;
+}]])],
+            [gl_cv_func_mbrtoc32_sanitycheck=yes],
+            [gl_cv_func_mbrtoc32_sanitycheck=no],
+            [:])
+        fi
+      ])
+    case "$gl_cv_func_mbrtoc32_sanitycheck" in
+      *yes)
+        HAVE_WORKING_MBRTOC32=1
+        AC_DEFINE([HAVE_WORKING_MBRTOC32], [1],
+          [Define if the mbrtoc32 function basically works.])
+        ;;
+      *) HAVE_WORKING_MBRTOC32=0 ;;
+    esac
+  fi
+  AC_SUBST([HAVE_WORKING_MBRTOC32])
+])
+
+# Prerequisites of lib/mbrtoc32.c and lib/lc-charset-dispatch.c.
+AC_DEFUN([gl_PREREQ_MBRTOC32], [
+  AC_REQUIRE([gl_C32RTOMB_SANITYCHECK])
+  :
+])
diff --git a/gl/m4/mbrtowc.m4 b/gl/m4/mbrtowc.m4
index 62c4fdb3..cc09a5fb 100644
--- a/gl/m4/mbrtowc.m4
+++ b/gl/m4/mbrtowc.m4
@@ -1,10 +1,11 @@
 # mbrtowc.m4
-# serial 44  -*- coding: utf-8 -*-
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2024 Free Software Foundation,
+# serial 46
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_MBRTOWC],
 [
@@ -160,7 +161,7 @@ AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE],
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([gt_LOCALE_JA])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([gt_LOCALE_EN_UTF8])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether mbrtowc handles incomplete characters],
     [gl_cv_func_mbrtowc_incomplete_state],
@@ -200,7 +201,7 @@ int main ()
           [gl_cv_func_mbrtowc_incomplete_state=no],
           [:])
       else
-        if test $LOCALE_FR_UTF8 != none; then
+        if test "$LOCALE_EN_UTF8" != none; then
           AC_RUN_IFELSE(
             [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -208,7 +209,7 @@ int main ()
 #include <wchar.h>
 int main ()
 {
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
       const char input[] = "B\303\274\303\237er"; /* "Büßer" */
       mbstate_t state;
@@ -288,7 +289,7 @@ dnl Result is gl_cv_func_mbrtowc_null_arg1.
 AC_DEFUN([gl_MBRTOWC_NULL_ARG1],
 [
   AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([gt_LOCALE_EN_UTF8])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether mbrtowc handles a NULL pwc argument],
     [gl_cv_func_mbrtowc_null_arg1],
@@ -303,7 +304,7 @@ changequote(,)dnl
         *)        gl_cv_func_mbrtowc_null_arg1="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none; then
+      if test "$LOCALE_EN_UTF8" != none; then
         AC_RUN_IFELSE(
           [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -314,7 +315,7 @@ int main ()
 {
   int result = 0;
 
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
       char input[] = "\303\237er";
       mbstate_t state;
@@ -351,7 +352,7 @@ dnl Result is gl_cv_func_mbrtowc_null_arg2.
 AC_DEFUN([gl_MBRTOWC_NULL_ARG2],
 [
   AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([gt_LOCALE_EN_UTF8])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether mbrtowc handles a NULL string argument],
     [gl_cv_func_mbrtowc_null_arg2],
@@ -366,7 +367,7 @@ changequote(,)dnl
         *)    gl_cv_func_mbrtowc_null_arg2="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none; then
+      if test "$LOCALE_EN_UTF8" != none; then
         AC_RUN_IFELSE(
           [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -374,7 +375,7 @@ changequote([,])dnl
 #include <wchar.h>
 int main ()
 {
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
       mbstate_t state;
       wchar_t wc;
@@ -404,7 +405,7 @@ dnl Result is gl_cv_func_mbrtowc_retval.
 AC_DEFUN([gl_MBRTOWC_RETVAL],
 [
   AC_REQUIRE([AC_PROG_CC])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([gt_LOCALE_EN_UTF8])
   AC_REQUIRE([gt_LOCALE_JA])
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CACHE_CHECK([whether mbrtowc has a correct return value],
@@ -422,7 +423,7 @@ changequote(,)dnl
           gl_cv_func_mbrtowc_retval="guessing yes" ;;
       esac
 changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
+      if test "$LOCALE_EN_UTF8" != none || test $LOCALE_JA != none \
          || { case "$host_os" in mingw* | windows*) true;; *) false;; esac; }; then
         AC_RUN_IFELSE(
           [AC_LANG_SOURCE([[
@@ -434,8 +435,8 @@ int main ()
   int result = 0;
   int found_some_locale = 0;
   /* This fails on Solaris.  */
-  if (strcmp ("$LOCALE_FR_UTF8", "none") != 0
-      && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (strcmp ("$LOCALE_EN_UTF8", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
       char input[] = "B\303\274\303\237er"; /* "Büßer" */
       mbstate_t state;
@@ -649,8 +650,8 @@ int main ()
            [:])
          ;;
        *)
-         AC_REQUIRE([gt_LOCALE_FR_UTF8])
-         if test $LOCALE_FR_UTF8 != none; then
+         AC_REQUIRE([gt_LOCALE_EN_UTF8])
+         if test "$LOCALE_EN_UTF8" != none; then
            AC_RUN_IFELSE(
              [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -658,7 +659,7 @@ int main ()
 #include <wchar.h>
 int main ()
 {
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
       wchar_t wc = (wchar_t) 0xBADFACE;
       mbstate_t state;
diff --git a/gl/m4/mbsinit.m4 b/gl/m4/mbsinit.m4
index 10c86ba9..69cfa574 100644
--- a/gl/m4/mbsinit.m4
+++ b/gl/m4/mbsinit.m4
@@ -1,9 +1,10 @@
 # mbsinit.m4
 # serial 10
-dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_MBSINIT],
 [
diff --git a/gl/m4/mbstate_t.m4 b/gl/m4/mbstate_t.m4
index 66d65cd7..59df1e2e 100644
--- a/gl/m4/mbstate_t.m4
+++ b/gl/m4/mbstate_t.m4
@@ -1,9 +1,10 @@
 # mbstate_t.m4
 # serial 14
-dnl Copyright (C) 2000-2002, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # From Paul Eggert.
 
diff --git a/gl/m4/mbtowc.m4 b/gl/m4/mbtowc.m4
index 603b0c1a..3e3f6ce0 100644
--- a/gl/m4/mbtowc.m4
+++ b/gl/m4/mbtowc.m4
@@ -1,9 +1,10 @@
 # mbtowc.m4
 # serial 5
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_MBTOWC],
 [
diff --git a/gl/m4/memchr.m4 b/gl/m4/memchr.m4
index 346a2882..1c2ecf1d 100644
--- a/gl/m4/memchr.m4
+++ b/gl/m4/memchr.m4
@@ -1,9 +1,10 @@
 # memchr.m4
-# serial 19
-dnl Copyright (C) 2002-2004, 2009-2024 Free Software Foundation, Inc.
+# serial 20
+dnl Copyright (C) 2002-2004, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
 [
@@ -49,7 +50,7 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
   if (fd >= 0)
 # endif
     {
-      int pagesize = getpagesize ();
+      long int pagesize = sysconf (_SC_PAGESIZE);
       char *two_pages =
         (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
                        flags, fd, 0);
diff --git a/gl/m4/minmax.m4 b/gl/m4/minmax.m4
index bc7d0c34..69c8a89f 100644
--- a/gl/m4/minmax.m4
+++ b/gl/m4/minmax.m4
@@ -1,9 +1,10 @@
 # minmax.m4
 # serial 4
-dnl Copyright (C) 2005, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_PREREQ([2.53])
 
diff --git a/gl/m4/mktime.m4 b/gl/m4/mktime.m4
index 85c52454..eca6c4d8 100644
--- a/gl/m4/mktime.m4
+++ b/gl/m4/mktime.m4
@@ -1,9 +1,11 @@
 # mktime.m4
-# serial 39
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2024 Free Software Foundation, Inc.
+# serial 42
+dnl Copyright (C) 2002-2003, 2005-2007, 2009-2025 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Jim Meyering.
 
diff --git a/gl/m4/mmap-anon.m4 b/gl/m4/mmap-anon.m4
index 61ca0120..3f7a6656 100644
--- a/gl/m4/mmap-anon.m4
+++ b/gl/m4/mmap-anon.m4
@@ -1,9 +1,10 @@
 # mmap-anon.m4
 # serial 12
-dnl Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Detect how mmap can be used to create anonymous (not file-backed) memory
 # mappings.
diff --git a/gl/m4/mode_t.m4 b/gl/m4/mode_t.m4
index 0d5c2808..7dae201b 100644
--- a/gl/m4/mode_t.m4
+++ b/gl/m4/mode_t.m4
@@ -1,9 +1,10 @@
 # mode_t.m4
 # serial 2
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # For using mode_t, it's sufficient to use AC_TYPE_MODE_T and
 # include <sys/types.h>.
diff --git a/gl/m4/mountlist.m4 b/gl/m4/mountlist.m4
index ff414e66..e7eac2e9 100644
--- a/gl/m4/mountlist.m4
+++ b/gl/m4/mountlist.m4
@@ -1,9 +1,10 @@
 # mountlist.m4
-# serial 17
-dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc.
+# serial 18
+dnl Copyright (C) 2002-2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Jim Meyering.
 
@@ -318,12 +319,17 @@ int getmntinfo (struct statfs **, int);
   fi
 
   if test -z "$ac_list_mounted_fs"; then
-    AC_MSG_ERROR([could not determine how to read list of mounted file systems])
-    # FIXME -- no need to abort building the whole package
-    # Can't build mountlist.c or anything that needs its functions
+    case "$host_os" in
+      mingw* | windows*) ac_list_mounted_fs=found ;;
+    esac
+  fi
+
+  if test -z "$ac_list_mounted_fs"; then
+    AC_DEFINE([MOUNTED_NOT_PORTED], [1],
+      [Define if we don't know how to determine the list of mounted file systems.])
   fi
 
-  if test $ac_list_mounted_fs = found; then
+  if test "$ac_list_mounted_fs" = found; then
     gl_cv_list_mounted_fs=yes
   else
     gl_cv_list_mounted_fs=no
diff --git a/gl/m4/msvc-inval.m4 b/gl/m4/msvc-inval.m4
index 7919ff12..bfbb983b 100644
--- a/gl/m4/msvc-inval.m4
+++ b/gl/m4/msvc-inval.m4
@@ -1,9 +1,10 @@
 # msvc-inval.m4
 # serial 1
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_MSVC_INVAL],
 [
diff --git a/gl/m4/msvc-nothrow.m4 b/gl/m4/msvc-nothrow.m4
index 007c7620..6a470971 100644
--- a/gl/m4/msvc-nothrow.m4
+++ b/gl/m4/msvc-nothrow.m4
@@ -1,9 +1,10 @@
 # msvc-nothrow.m4
 # serial 1
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_MSVC_NOTHROW],
 [
diff --git a/gl/m4/multiarch.m4 b/gl/m4/multiarch.m4
index 3af29d39..817f01f1 100644
--- a/gl/m4/multiarch.m4
+++ b/gl/m4/multiarch.m4
@@ -1,9 +1,10 @@
 # multiarch.m4
 # serial 9
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Determine whether the compiler is or may be producing universal binaries.
 #
diff --git a/gl/m4/musl.m4 b/gl/m4/musl.m4
index 0d4de892..6ff778cb 100644
--- a/gl/m4/musl.m4
+++ b/gl/m4/musl.m4
@@ -1,9 +1,10 @@
 # musl.m4
 # serial 4
-dnl Copyright (C) 2019-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2019-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Test for musl libc, despite the musl libc authors don't like it
 # <https://wiki.musl-libc.org/faq.html>
diff --git a/gl/m4/netdb_h.m4 b/gl/m4/netdb_h.m4
index d8c00217..88512546 100644
--- a/gl/m4/netdb_h.m4
+++ b/gl/m4/netdb_h.m4
@@ -1,9 +1,10 @@
 # netdb_h.m4
 # serial 15
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_NETDB_H],
 [
diff --git a/gl/m4/netinet_in_h.m4 b/gl/m4/netinet_in_h.m4
index 926f7f95..b56e354c 100644
--- a/gl/m4/netinet_in_h.m4
+++ b/gl/m4/netinet_in_h.m4
@@ -1,9 +1,10 @@
 # netinet_in_h.m4
 # serial 6
-dnl Copyright (C) 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_HEADER_NETINET_IN],
 [
diff --git a/gl/m4/nl_langinfo.m4 b/gl/m4/nl_langinfo.m4
index f38f11bb..9b1e0f32 100644
--- a/gl/m4/nl_langinfo.m4
+++ b/gl/m4/nl_langinfo.m4
@@ -1,9 +1,10 @@
 # nl_langinfo.m4
-# serial 11
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# serial 12.1
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_NL_LANGINFO],
 [
@@ -40,16 +41,18 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
     AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS],
       [$FUNC_NL_LANGINFO_YESEXPR_WORKS],
       [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.])
-    # On Solaris 10 and Solaris 11.3, nl_langinfo is not multithread-safe.
+    # On macOS 26, Solaris 10, and Solaris 11.3, nl_langinfo is not
+    # multithread-safe.
     case "$host_os" in
-      solaris*) NL_LANGINFO_MTSAFE=0 ;;
-      *)        NL_LANGINFO_MTSAFE=1 ;;
+      darwin* | solaris*) NL_LANGINFO_MTSAFE=0 ;;
+      *)                  NL_LANGINFO_MTSAFE=1 ;;
     esac
     AC_DEFINE_UNQUOTED([NL_LANGINFO_MTSAFE], [$NL_LANGINFO_MTSAFE],
       [Define to 1 if nl_langinfo is multithread-safe.])
     if test $HAVE_LANGINFO_CODESET = 1 \
        && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \
        && test $HAVE_LANGINFO_ALTMON = 1 \
+       && test $HAVE_LANGINFO_ABALTMON = 1 \
        && test $HAVE_LANGINFO_ERA = 1 \
        && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1 \
        && test $NL_LANGINFO_MTSAFE = 1; then
diff --git a/gl/m4/nocrash.m4 b/gl/m4/nocrash.m4
index cbe8fe82..662fb049 100644
--- a/gl/m4/nocrash.m4
+++ b/gl/m4/nocrash.m4
@@ -1,9 +1,10 @@
 # nocrash.m4
 # serial 5
-dnl Copyright (C) 2005, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Based on libsigsegv, from Bruno Haible and Paolo Bonzini.
 
diff --git a/gl/m4/off64_t.m4 b/gl/m4/off64_t.m4
new file mode 100644
index 00000000..963d53e9
--- /dev/null
+++ b/gl/m4/off64_t.m4
@@ -0,0 +1,32 @@
+# off64_t.m4
+# serial 1
+dnl Copyright (C) 2024-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl Check whether <sys/types.h> defines the 'off64_t' type.
+dnl Set HAVE_OFF64_T.
+
+AC_DEFUN([gl_TYPE_OFF64_T],
+[
+  dnl Persuade glibc <sys/types.h>, <stdio.h>, <fcntl.h>, <unistd.h>, <aio.h>
+  dnl to define off64_t.
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_CACHE_CHECK([for off64_t], [gl_cv_off64_t],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <sys/types.h>]],
+          [[int x = sizeof (off64_t *) + sizeof (off64_t);
+            return !x;]])],
+       [gl_cv_off64_t=yes], [gl_cv_off64_t=no])])
+
+  if test $gl_cv_off64_t != no; then
+    HAVE_OFF64_T=1
+  else
+    HAVE_OFF64_T=0
+  fi
+  AC_SUBST([HAVE_OFF64_T])
+])
diff --git a/gl/m4/off_t.m4 b/gl/m4/off_t.m4
index db6035db..f4f4bbf6 100644
--- a/gl/m4/off_t.m4
+++ b/gl/m4/off_t.m4
@@ -1,9 +1,10 @@
 # off_t.m4
 # serial 1
-dnl Copyright (C) 2012-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2012-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Check whether to override the 'off_t' type.
 dnl Set WINDOWS_64_BIT_OFF_T.
diff --git a/gl/m4/once.m4 b/gl/m4/once.m4
new file mode 100644
index 00000000..7876a8fe
--- /dev/null
+++ b/gl/m4/once.m4
@@ -0,0 +1,14 @@
+# once.m4
+# serial 1
+dnl Copyright (C) 2024-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Bruno Haible.
+
+AC_DEFUN([gl_ONCE],
+[
+  AC_REQUIRE([gl_THREADLIB])
+])
diff --git a/gl/m4/open-cloexec.m4 b/gl/m4/open-cloexec.m4
index 6defdfb4..860541b0 100644
--- a/gl/m4/open-cloexec.m4
+++ b/gl/m4/open-cloexec.m4
@@ -1,9 +1,10 @@
 # open-cloexec.m4
 # serial 1
-dnl Copyright 2017-2024 Free Software Foundation, Inc.
+dnl Copyright 2017-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Test whether O_CLOEXEC is defined.
 
diff --git a/gl/m4/open-slash.m4 b/gl/m4/open-slash.m4
index 03460e42..2cba48fe 100644
--- a/gl/m4/open-slash.m4
+++ b/gl/m4/open-slash.m4
@@ -1,9 +1,10 @@
 # open-slash.m4
 # serial 2
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Tests whether open() and creat() recognize a trailing slash.
 dnl Sets gl_cv_func_open_slash.
diff --git a/gl/m4/open.m4 b/gl/m4/open.m4
index 62a11a11..dd3a805f 100644
--- a/gl/m4/open.m4
+++ b/gl/m4/open.m4
@@ -1,14 +1,18 @@
 # open.m4
-# serial 16
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 17
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_OPEN],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_PREPROC_O_CLOEXEC])
+  AC_REQUIRE([gl_FCNTL_O_FLAGS])
+  AS_CASE([$gl_cv_header_working_fcntl_h],
+    [*O_DIRECTORY* | *no], [REPLACE_OPEN=1])
   case "$host_os" in
     mingw* | windows* | pw*)
       REPLACE_OPEN=1
diff --git a/gl/m4/pathmax.m4 b/gl/m4/pathmax.m4
index 4280837f..0c3925df 100644
--- a/gl/m4/pathmax.m4
+++ b/gl/m4/pathmax.m4
@@ -1,10 +1,11 @@
 # pathmax.m4
 # serial 11
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2024 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_PATHMAX],
 [
diff --git a/gl/m4/pid_t.m4 b/gl/m4/pid_t.m4
index 8bedcc6b..a8bdabc2 100644
--- a/gl/m4/pid_t.m4
+++ b/gl/m4/pid_t.m4
@@ -1,9 +1,10 @@
 # pid_t.m4
 # serial 4
-dnl Copyright (C) 2020-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2020-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # The following implementation works around a problem in autoconf <= 2.69.
 m4_version_prereq([2.70], [], [
diff --git a/gl/m4/printf.m4 b/gl/m4/printf.m4
index 0cb14d6f..4619a402 100644
--- a/gl/m4/printf.m4
+++ b/gl/m4/printf.m4
@@ -1,9 +1,10 @@
 # printf.m4
-# serial 91
-dnl Copyright (C) 2003, 2007-2024 Free Software Foundation, Inc.
+# serial 96
+dnl Copyright (C) 2003, 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Test whether the *printf family of functions supports the 'j', 'z', 't',
 dnl 'L' size specifiers. (ISO C99, POSIX:2001)
@@ -616,6 +617,7 @@ static double zero = 0.0;
 int main ()
 {
   int result = 0;
+  /* This fails on FreeBSD 5.2.1, Solaris 11.4.  */
   if (sprintf (buf, "%a %d", 3.1416015625, 33, 44, 55) < 0
       || (strcmp (buf, "0x1.922p+1 33") != 0
           && strcmp (buf, "0x3.244p+0 33") != 0
@@ -627,27 +629,29 @@ int main ()
           && strcmp (buf, "-0X3.244P+0 33") != 0
           && strcmp (buf, "-0X6.488P-1 33") != 0
           && strcmp (buf, "-0XC.91P-2 33") != 0))
-    result |= 2;
-  /* This catches a FreeBSD 13.0 bug: it doesn't round.  */
+    result |= 1;
+  /* This catches a Mac OS X 10.5, FreeBSD 6.4, NetBSD 10.0 bug:
+     it doesn't round.  */
   if (sprintf (buf, "%.2a %d", 1.51, 33, 44, 55) < 0
       || (strcmp (buf, "0x1.83p+0 33") != 0
           && strcmp (buf, "0x3.05p-1 33") != 0
           && strcmp (buf, "0x6.0ap-2 33") != 0
           && strcmp (buf, "0xc.14p-3 33") != 0))
-    result |= 4;
-  /* This catches a Mac OS X 10.12.4 (Darwin 16.5) bug: it doesn't round.  */
+    result |= 2;
+  /* This catches a macOS 14 (Darwin 23), FreeBSD 14.0, OpenBSD 7.5, AIX 7.3,
+     Solaris 11.4 bug: it doesn't round.  */
   if (sprintf (buf, "%.0a %d", 1.51, 33, 44, 55) < 0
       || (strcmp (buf, "0x2p+0 33") != 0
           && strcmp (buf, "0x3p-1 33") != 0
           && strcmp (buf, "0x6p-2 33") != 0
           && strcmp (buf, "0xcp-3 33") != 0))
     result |= 4;
-  /* This catches a FreeBSD 6.1 bug.  See
+  /* This catches a Mac OS X 10.5, FreeBSD 6.4 bug.  See
      <https://lists.gnu.org/r/bug-gnulib/2007-04/msg00107.html> */
   if (sprintf (buf, "%010a %d", 1.0 / zero, 33, 44, 55) < 0
       || buf[0] == '0')
     result |= 8;
-  /* This catches a Mac OS X 10.3.9 (Darwin 7.9) bug.  */
+  /* This catches a Mac OS X 10.3.9 (Darwin 7.9), FreeBSD 6.4 bug.  */
   if (sprintf (buf, "%.1a", 1.999) < 0
       || (strcmp (buf, "0x1.0p+1") != 0
           && strcmp (buf, "0x2.0p+0") != 0
@@ -655,7 +659,8 @@ int main ()
           && strcmp (buf, "0x8.0p-2") != 0))
     result |= 16;
   /* This catches the same Mac OS X 10.3.9 (Darwin 7.9) bug and also a
-     glibc 2.4 bug <https://sourceware.org/bugzilla/show_bug.cgi?id=2908>.  */
+     glibc 2.4 bug <https://sourceware.org/bugzilla/show_bug.cgi?id=2908>
+     and a FreeBSD 6.4, NetBSD 10.0 bug.  */
   if (sprintf (buf, "%.1La", 1.999L) < 0
       || (strcmp (buf, "0x1.0p+1") != 0
           && strcmp (buf, "0x2.0p+0") != 0
@@ -893,9 +898,14 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_N],
         [AC_LANG_SOURCE([[
 #include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
+#if defined _WIN32 && !defined __CYGWIN__
+# include <stdlib.h>
+#else
+# include <unistd.h>
+#endif
 #ifdef _MSC_VER
+#include <crtdbg.h>
 #include <inttypes.h>
 /* See page about "Parameter Validation" on msdn.microsoft.com.
    <https://docs.microsoft.com/en-us/cpp/c-runtime-library/parameter-validation>
@@ -922,6 +932,9 @@ int main ()
   int count = -1;
 #ifdef _MSC_VER
   _set_invalid_parameter_handler (invalid_parameter_handler);
+  /* Also avoid an Abort/Retry/Ignore dialog in debug builds.
+     <https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/crtsetreportmode>  */
+  _CrtSetReportMode (_CRT_ASSERT, 0);
 #endif
   signal (SIGABRT, abort_handler);
   /* Copy the format string.  Some systems (glibc with _FORTIFY_SOURCE=2)
@@ -1173,6 +1186,112 @@ changequote([,])dnl
     ])
 ])
 
+dnl Test whether the *printf family of functions supports POSIX/XSI format
+dnl strings with the ' flag for grouping of decimal digits on integers,
+dnl together with a precision.
+dnl Result is gl_cv_func_printf_flag_grouping_int_precision.
+
+AC_DEFUN([gl_PRINTF_FLAG_GROUPING_INT_PRECISION],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([whether printf supports grouping on integers with a precision],
+    [gl_cv_func_printf_flag_grouping_int_precision],
+    [
+      dnl Prepare a guess, used when cross-compiling or when specific locales
+      dnl are not available.
+      case "$host_os" in
+        # Guess no on FreeBSD, NetBSD, Solaris, Cygwin, Haiku.
+        freebsd* | dragonfly* | netbsd* | solaris* | cygwin* | haiku*)
+          gl_cv_func_printf_flag_grouping_int_precision="guessing no";;
+        *)
+          gl_cv_func_printf_flag_grouping_int_precision="guessing yes";;
+      esac
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+static char buf[100];
+int main ()
+{
+  if (setlocale (LC_ALL, "fr_FR.UTF-8") != NULL
+      || setlocale (LC_ALL, "fr_FR") != NULL
+      || setlocale (LC_ALL, "fr_FR.ISO-8859-1") != NULL
+      || setlocale (LC_ALL, "fr_FR.ISO8859-1") != NULL)
+    {
+      if (sprintf (buf, "%'.10d", 1000) < 0)
+        return 1;
+      if (strlen (buf) == 10 && strcmp (buf, "0000001000") != 0)
+        /* The sprintf implementation has produced fewer than 10 digits.  */
+        return 2;
+      else
+        return 0;
+    }
+  return 3;
+}]])],
+        [gl_cv_func_printf_flag_grouping_int_precision=yes],
+        [if test $? = 2; then
+           gl_cv_func_printf_flag_grouping_int_precision=no
+         fi
+        ],
+        [:])
+    ])
+])
+
+dnl Test whether the *printf family of functions supports POSIX/XSI format
+dnl strings with the ' flag for grouping of decimal digits, when the thousands
+dnl separator is a multibyte character (such as U+00A0 or U+202F in a UTF-8
+dnl locale).
+dnl Result is gl_cv_func_printf_flag_grouping_multibyte.
+
+AC_DEFUN([gl_PRINTF_FLAG_GROUPING_MULTIBYTE],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([whether printf supports grouping with a multibyte separator],
+    [gl_cv_func_printf_flag_grouping_multibyte],
+    [
+      dnl Prepare a guess, used when cross-compiling or when specific locales
+      dnl are not available.
+      case "$host_os" in
+        # Guess no on NetBSD and Solaris 11 OpenIndiana.
+        netbsd* | solaris*)
+          gl_cv_func_printf_flag_grouping_multibyte="guessing no";;
+        *)
+          gl_cv_func_printf_flag_grouping_multibyte="guessing yes";;
+      esac
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <stdio.h>
+#include <string.h>
+static char buf[100];
+int main ()
+{
+  if (setlocale (LC_ALL, "fr_FR.UTF-8") == NULL)
+    return 0;
+  if (sprintf (buf, "%'.0f", 1000.0) < 0)
+    return 1;
+  if (strlen (localeconv ()->thousands_sep) > 1)
+    {
+      if (strlen (buf) <= 4 + 1)
+        return 2;
+      else
+        return 3;
+    }
+  return 0;
+}]])],
+        [:],
+        [case $? in
+           2) gl_cv_func_printf_flag_grouping_multibyte=no ;;
+           3) gl_cv_func_printf_flag_grouping_multibyte=yes ;;
+         esac
+        ],
+        [:])
+    ])
+])
+
 dnl Test whether the *printf family of functions supports the - flag correctly.
 dnl (ISO C99.) See
 dnl <https://lists.gnu.org/r/bug-coreutils/2008-02/msg00035.html>
@@ -1709,6 +1828,11 @@ AC_DEFUN([gl_SNPRINTF_DIRECTIVE_N],
 #include <signal.h>
 #include <stdio.h>
 #include <string.h>
+#if defined _WIN32 && !defined __CYGWIN__
+# include <stdlib.h>
+#else
+# include <unistd.h>
+#endif
 #if HAVE_SNPRINTF
 # define my_snprintf snprintf
 #else
@@ -2143,20 +2267,22 @@ dnl 11 = gl_PRINTF_DIRECTIVE_LS
 dnl 12 = gl_PRINTF_DIRECTIVE_LC
 dnl 13 = gl_PRINTF_POSITIONS
 dnl 14 = gl_PRINTF_FLAG_GROUPING
-dnl 15 = gl_PRINTF_FLAG_LEFTADJUST
-dnl 16 = gl_PRINTF_FLAG_ZERO
-dnl 17 = gl_PRINTF_FLAG_ALT_PRECISION_ZERO
-dnl 18 = gl_PRINTF_PRECISION
-dnl 19 = gl_PRINTF_ENOMEM
-dnl 20 = gl_SNPRINTF_PRESENCE
-dnl 21 = gl_SNPRINTF_TRUNCATION_C99
-dnl 22 = gl_SNPRINTF_RETVAL_C99
-dnl 23 = gl_SNPRINTF_DIRECTIVE_N
-dnl 24 = gl_SNPRINTF_SIZE1
-dnl 25 = gl_VSNPRINTF_ZEROSIZE_C99
-dnl 26 = gl_SWPRINTF_WORKS
-dnl 27 = gl_SWPRINTF_DIRECTIVE_LA
-dnl 28 = gl_SWPRINTF_DIRECTIVE_LC
+dnl 15 = gl_PRINTF_FLAG_GROUPING_INT_PRECISION
+dnl 16 = gl_PRINTF_FLAG_GROUPING_MULTIBYTE
+dnl 17 = gl_PRINTF_FLAG_LEFTADJUST
+dnl 18 = gl_PRINTF_FLAG_ZERO
+dnl 19 = gl_PRINTF_FLAG_ALT_PRECISION_ZERO
+dnl 20 = gl_PRINTF_PRECISION
+dnl 21 = gl_PRINTF_ENOMEM
+dnl 22 = gl_SNPRINTF_PRESENCE
+dnl 23 = gl_SNPRINTF_TRUNCATION_C99
+dnl 24 = gl_SNPRINTF_RETVAL_C99
+dnl 25 = gl_SNPRINTF_DIRECTIVE_N
+dnl 26 = gl_SNPRINTF_SIZE1
+dnl 27 = gl_VSNPRINTF_ZEROSIZE_C99
+dnl 28 = gl_SWPRINTF_WORKS
+dnl 29 = gl_SWPRINTF_DIRECTIVE_LA
+dnl 30 = gl_SWPRINTF_DIRECTIVE_LC
 dnl
 dnl 1 = checking whether printf supports size specifiers as in C99...
 dnl 2 = checking whether printf supports size specifiers as in C23...
@@ -2172,62 +2298,64 @@ dnl 11 = checking whether printf supports the 'ls' directive...
 dnl 12 = checking whether printf supports the 'lc' directive correctly...
 dnl 13 = checking whether printf supports POSIX/XSI format strings with positions...
 dnl 14 = checking whether printf supports the grouping flag...
-dnl 15 = checking whether printf supports the left-adjust flag correctly...
-dnl 16 = checking whether printf supports the zero flag correctly...
-dnl 17 = checking whether printf supports the alternative flag with a zero precision...
-dnl 18 = checking whether printf supports large precisions...
-dnl 19 = checking whether printf survives out-of-memory conditions...
-dnl 20 = checking for snprintf...
-dnl 21 = checking whether snprintf truncates the result as in C99...
-dnl 22 = checking whether snprintf returns a byte count as in C99...
-dnl 23 = checking whether snprintf fully supports the 'n' directive...
-dnl 24 = checking whether snprintf respects a size of 1...
-dnl 25 = checking whether vsnprintf respects a zero size as in C99...
-dnl 26 = checking whether swprintf works...
-dnl 27 = checking whether swprintf supports the 'La' and 'LA' directives...
-dnl 28 = checking whether swprintf supports the 'lc' directive...
+dnl 15 = checking whether printf supports grouping on integers with a precision...
+dnl 16 = checking whether printf supports grouping with a multibyte separator...
+dnl 17 = checking whether printf supports the left-adjust flag correctly...
+dnl 18 = checking whether printf supports the zero flag correctly...
+dnl 19 = checking whether printf supports the alternative flag with a zero precision...
+dnl 20 = checking whether printf supports large precisions...
+dnl 21 = checking whether printf survives out-of-memory conditions...
+dnl 22 = checking for snprintf...
+dnl 23 = checking whether snprintf truncates the result as in C99...
+dnl 24 = checking whether snprintf returns a byte count as in C99...
+dnl 25 = checking whether snprintf fully supports the 'n' directive...
+dnl 26 = checking whether snprintf respects a size of 1...
+dnl 27 = checking whether vsnprintf respects a zero size as in C99...
+dnl 28 = checking whether swprintf works...
+dnl 29 = checking whether swprintf supports the 'La' and 'LA' directives...
+dnl 30 = checking whether swprintf supports the 'lc' directive...
 dnl
 dnl . = yes, # = no.
 dnl
-dnl                                  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
-dnl   musl libc 1.2.3                .  #  .  .  .  .  #  #  .  .  .  #  .  .  .  .  ?  .  .  .  .  .  .  .  .  #  .  #
-dnl   glibc 2.35                     .  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
-dnl   glibc 2.5                      .  #  .  .  .  .  #  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  #  .
-dnl   glibc 2.3.6                    .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  #  .
-dnl   FreeBSD 14.0                   .  .  .  .  .  #  .  .  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  #  .  #
-dnl   FreeBSD 13.0                   .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  #  .  #
-dnl   FreeBSD 5.4, 6.1               .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  #  ?  .  #  .  .  .  .  .  .  #  ?  ?
-dnl   Mac OS X 10.13.5               .  #  .  .  #  #  #  #  .  #  .  .  .  .  .  .  .  .  .  .  .  .  #  .  .  #  ?  ?
-dnl   Mac OS X 10.5.8                .  #  .  .  #  #  #  #  .  .  .  .  .  .  .  #  #  .  .  .  .  .  .  .  .  #  ?  ?
-dnl   Mac OS X 10.3.9                .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  #  #  .  #  .  .  .  .  .  .  #  ?  ?
-dnl   OpenBSD 6.0, 6.7               .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  #  .  #
-dnl   OpenBSD 3.9, 4.0               .  #  .  #  #  #  #  #  #  .  #  .  .  #  .  #  ?  .  #  .  .  .  .  .  .  #  ?  ?
-dnl   Cygwin 1.7.0 (2009)            .  #  .  .  #  .  #  #  .  .  ?  ?  .  .  .  .  ?  .  ?  .  .  .  .  .  .  ?  ?  ?
-dnl   Cygwin 1.5.25 (2008)           .  #  .  .  #  #  #  #  .  .  #  ?  .  .  .  .  ?  .  #  .  .  .  .  .  .  ?  ?  ?
-dnl   Cygwin 1.5.19 (2006)           #  #  .  .  #  #  #  #  #  .  #  ?  .  #  .  #  ?  #  #  .  .  .  .  .  .  ?  ?  ?
-dnl   Solaris 11.4                   .  #  .  #  #  #  #  #  .  .  #  .  .  .  .  #  .  .  .  .  .  .  .  .  .  .  #  .
-dnl   Solaris 11.3                   .  #  .  .  .  #  #  #  .  .  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  #  .
-dnl   Solaris 11.0                   .  #  .  #  #  #  #  #  .  .  #  .  .  .  .  #  .  .  .  .  .  .  .  .  .  ?  ?  ?
-dnl   Solaris 10                     .  #  .  #  #  #  #  #  .  .  #  .  .  .  .  #  .  #  .  .  .  .  .  .  .  .  #  .
-dnl   Solaris 2.6 ... 9              #  #  .  #  #  #  #  #  #  .  #  .  .  .  .  #  ?  #  .  .  .  #  .  .  .  ?  ?  ?
-dnl   Solaris 2.5.1                  #  #  .  #  #  #  #  #  #  .  #  .  .  .  .  #  ?  .  .  #  #  #  #  #  #  ?  ?  ?
-dnl   AIX 7.1                        .  #  .  #  #  #  #  #  .  .  .  .  .  .  .  #  .  #  .  .  .  .  .  .  .  #  .  .
-dnl   AIX 5.2                        .  #  .  #  #  #  #  #  .  .  .  .  .  .  .  #  ?  .  .  .  .  .  .  .  .  #  ?  ?
-dnl   AIX 4.3.2, 5.1                 #  #  .  #  #  #  #  #  #  .  .  .  .  .  .  #  ?  .  .  .  .  #  .  .  .  #  ?  ?
-dnl   HP-UX 11.31                    .  #  .  .  .  #  #  #  .  .  .  ?  .  .  .  #  ?  .  .  .  .  #  #  .  .  ?  ?  ?
-dnl   HP-UX 11.{00,11,23}            #  #  .  .  .  #  #  #  #  .  .  ?  .  .  .  #  ?  .  .  .  .  #  #  .  #  ?  ?  ?
-dnl   HP-UX 10.20                    #  #  .  #  .  #  #  #  #  .  ?  ?  .  .  #  #  ?  .  .  .  .  #  #  ?  #  ?  ?  ?
-dnl   IRIX 6.5                       #  #  .  #  #  #  #  #  #  .  #  .  .  .  .  #  ?  .  .  .  .  #  .  .  .  #  ?  ?
-dnl   OSF/1 5.1                      #  #  .  #  #  #  #  #  #  .  .  ?  .  .  .  #  ?  .  .  .  .  #  .  .  #  ?  ?  ?
-dnl   OSF/1 4.0d                     #  #  .  #  #  #  #  #  #  .  .  ?  .  .  .  #  ?  .  .  #  #  #  #  #  #  ?  ?  ?
-dnl   NetBSD 9.0                     .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  #  .  #
-dnl   NetBSD 5.0                     .  #  .  .  #  #  #  #  .  .  .  .  .  .  .  #  ?  .  #  .  .  .  .  .  .  #  ?  ?
-dnl   NetBSD 4.0                     .  #  ?  ?  ?  ?  #  #  ?  .  ?  .  .  ?  ?  ?  ?  ?  ?  .  .  .  ?  ?  ?  #  ?  ?
-dnl   NetBSD 3.0                     .  #  .  .  .  #  #  #  #  .  ?  .  #  #  ?  #  ?  .  #  .  .  .  .  .  .  #  ?  ?
-dnl   Haiku                          .  #  .  .  #  #  #  #  #  .  #  ?  .  .  .  .  ?  .  ?  .  .  ?  .  .  .  .  #  .
-dnl   BeOS                           #  #  #  .  #  #  #  #  #  .  ?  ?  #  .  ?  .  ?  #  ?  .  .  ?  .  .  .  ?  ?  ?
-dnl   Android 4.3                    .  #  .  #  #  #  #  #  #  #  #  ?  .  #  .  #  ?  .  #  .  .  .  #  .  .  ?  ?  ?
-dnl   old mingw / msvcrt             #  #  #  #  #  #  #  #  #  .  .  ?  #  #  .  #  ?  #  ?  .  #  #  #  .  .  #  ?  ?
-dnl   MSVC 9                         #  #  #  #  #  #  #  #  #  #  .  ?  #  #  .  #  ?  #  ?  #  #  #  #  .  .  #  ?  ?
-dnl   mingw 2009-2011                .  #  #  .  #  .  #  #  .  .  .  ?  #  #  .  .  ?  .  ?  .  .  .  .  .  .  #  ?  ?
-dnl   mingw-w64 2011                 #  #  #  #  #  #  #  #  #  .  .  ?  #  #  .  #  ?  #  ?  .  #  #  #  .  .  #  ?  ?
+dnl                                  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
+dnl   musl libc 1.2.3                .  #  .  .  .  .  #  #  .  .  .  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  #  .  #
+dnl   glibc 2.35                     .  #  .  .  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
+dnl   glibc 2.5                      .  #  .  .  .  .  #  #  .  .  .  .  .  .  #  .  .  .  .  .  .  .  .  .  .  .  .  .  #  .
+dnl   glibc 2.3.6                    .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  #  .
+dnl   FreeBSD 14.0                   .  .  .  .  .  #  .  .  .  .  .  .  .  .  #  .  .  .  .  .  #  .  .  .  .  .  .  #  .  #
+dnl   FreeBSD 13.0                   .  #  .  .  .  #  #  #  .  .  .  .  .  .  #  .  .  .  .  .  #  .  .  .  .  .  .  #  .  #
+dnl   FreeBSD 5.4, 6.1               .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  .  .  #  ?  .  #  .  .  .  .  .  .  #  ?  ?
+dnl   Mac OS X 10.13.5               .  #  .  .  #  #  #  #  .  #  .  .  .  .  ?  ?  .  .  .  .  .  .  .  .  #  .  .  #  ?  ?
+dnl   Mac OS X 10.5.8                .  #  .  .  #  #  #  #  .  .  .  .  .  .  ?  ?  .  #  #  .  .  .  .  .  .  .  .  #  ?  ?
+dnl   Mac OS X 10.3.9                .  #  .  .  .  #  #  #  .  .  .  .  .  .  ?  ?  .  #  #  .  #  .  .  .  .  .  .  #  ?  ?
+dnl   OpenBSD 6.0, 6.7               .  #  .  .  .  #  #  #  .  .  .  .  .  .  .  .  .  .  .  .  #  .  .  .  .  .  .  #  .  #
+dnl   OpenBSD 3.9, 4.0               .  #  .  #  #  #  #  #  #  .  #  .  .  #  ?  ?  .  #  ?  .  #  .  .  .  .  .  .  #  ?  ?
+dnl   Cygwin 1.7.0 (2009)            .  #  .  .  #  .  #  #  .  .  ?  ?  .  .  ?  ?  .  .  ?  .  ?  .  .  .  .  .  .  ?  ?  ?
+dnl   Cygwin 1.5.25 (2008)           .  #  .  .  #  #  #  #  .  .  #  ?  .  .  ?  ?  .  .  ?  .  #  .  .  .  .  .  .  ?  ?  ?
+dnl   Cygwin 1.5.19 (2006)           #  #  .  .  #  #  #  #  #  .  #  ?  .  #  ?  ?  .  #  ?  #  #  .  .  .  .  .  .  ?  ?  ?
+dnl   Solaris 11.4                   .  #  .  #  #  #  #  #  .  .  #  .  .  .  #  #  .  #  .  .  .  .  .  .  .  .  .  .  #  .
+dnl   Solaris 11.3                   .  #  .  .  .  #  #  #  .  .  #  .  .  .  ?  ?  .  .  .  .  .  .  .  .  .  .  .  .  #  .
+dnl   Solaris 11.0                   .  #  .  #  #  #  #  #  .  .  #  .  .  .  ?  ?  .  #  .  .  .  .  .  .  .  .  .  ?  ?  ?
+dnl   Solaris 10                     .  #  .  #  #  #  #  #  .  .  #  .  .  .  #  #  .  #  .  #  .  .  .  .  .  .  .  .  #  .
+dnl   Solaris 2.6 ... 9              #  #  .  #  #  #  #  #  #  .  #  .  .  .  ?  ?  .  #  ?  #  .  .  .  #  .  .  .  ?  ?  ?
+dnl   Solaris 2.5.1                  #  #  .  #  #  #  #  #  #  .  #  .  .  .  ?  ?  .  #  ?  .  .  #  #  #  #  #  #  ?  ?  ?
+dnl   AIX 7.1                        .  #  .  #  #  #  #  #  .  .  .  .  .  .  .  .  .  #  .  #  .  .  .  .  .  .  .  #  .  .
+dnl   AIX 5.2                        .  #  .  #  #  #  #  #  .  .  .  .  .  .  ?  ?  .  #  ?  .  .  .  .  .  .  .  .  #  ?  ?
+dnl   AIX 4.3.2, 5.1                 #  #  .  #  #  #  #  #  #  .  .  .  .  .  ?  ?  .  #  ?  .  .  .  .  #  .  .  .  #  ?  ?
+dnl   HP-UX 11.31                    .  #  .  .  .  #  #  #  .  .  .  ?  .  .  ?  ?  .  #  ?  .  .  .  .  #  #  .  .  ?  ?  ?
+dnl   HP-UX 11.{00,11,23}            #  #  .  .  .  #  #  #  #  .  .  ?  .  .  ?  ?  .  #  ?  .  .  .  .  #  #  .  #  ?  ?  ?
+dnl   HP-UX 10.20                    #  #  .  #  .  #  #  #  #  .  ?  ?  .  .  ?  ?  #  #  ?  .  .  .  .  #  #  ?  #  ?  ?  ?
+dnl   IRIX 6.5                       #  #  .  #  #  #  #  #  #  .  #  .  .  .  ?  ?  .  #  ?  .  .  .  .  #  .  .  .  #  ?  ?
+dnl   OSF/1 5.1                      #  #  .  #  #  #  #  #  #  .  .  ?  .  .  ?  ?  .  #  ?  .  .  .  .  #  .  .  #  ?  ?  ?
+dnl   OSF/1 4.0d                     #  #  .  #  #  #  #  #  #  .  .  ?  .  .  ?  ?  .  #  ?  .  .  #  #  #  #  #  #  ?  ?  ?
+dnl   NetBSD 9.0                     .  #  .  .  .  #  #  #  .  .  .  .  .  .  #  #  .  .  .  .  .  .  .  .  .  .  .  #  .  #
+dnl   NetBSD 5.0                     .  #  .  .  #  #  #  #  .  .  .  .  .  .  ?  ?  .  #  ?  .  #  .  .  .  .  .  .  #  ?  ?
+dnl   NetBSD 4.0                     .  #  ?  ?  ?  ?  #  #  ?  .  ?  .  .  ?  ?  ?  ?  ?  ?  ?  ?  .  .  .  ?  ?  ?  #  ?  ?
+dnl   NetBSD 3.0                     .  #  .  .  .  #  #  #  #  .  ?  .  #  #  ?  ?  ?  #  ?  .  #  .  .  .  .  .  .  #  ?  ?
+dnl   Haiku                          .  #  .  .  #  #  #  #  #  .  #  ?  .  .  #  .  .  .  ?  .  ?  .  .  ?  .  .  .  .  #  .
+dnl   BeOS                           #  #  #  .  #  #  #  #  #  .  ?  ?  #  .  ?  ?  ?  .  ?  #  ?  .  .  ?  .  .  .  ?  ?  ?
+dnl   Android 4.3                    .  #  .  #  #  #  #  #  #  #  #  ?  .  #  ?  ?  .  #  ?  .  #  .  .  .  #  .  .  ?  ?  ?
+dnl   old mingw / msvcrt             #  #  #  #  #  #  #  #  #  .  .  ?  #  #  ?  ?  .  #  ?  #  ?  .  #  #  #  .  .  #  ?  ?
+dnl   MSVC 9                         #  #  #  #  #  #  #  #  #  #  .  ?  #  #  ?  ?  .  #  ?  #  ?  #  #  #  #  .  .  #  ?  ?
+dnl   mingw 2009-2011                .  #  #  .  #  .  #  #  .  .  .  ?  #  #  ?  ?  .  .  ?  .  ?  .  .  .  .  .  .  #  ?  ?
+dnl   mingw-w64 2011                 #  #  #  #  #  #  #  #  #  .  .  ?  #  #  ?  ?  .  #  ?  #  ?  .  #  #  #  .  .  #  ?  ?
diff --git a/gl/m4/pthread-once.m4 b/gl/m4/pthread-once.m4
new file mode 100644
index 00000000..85549254
--- /dev/null
+++ b/gl/m4/pthread-once.m4
@@ -0,0 +1,83 @@
+# pthread-once.m4
+# serial 6
+dnl Copyright (C) 2019-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN([gl_PTHREAD_ONCE],
+[
+  AC_REQUIRE([gl_PTHREAD_H])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_PTHREADLIB])
+
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
+     && test $gl_threads_api = windows; then
+    dnl Choose function names that don't conflict with the mingw-w64 winpthreads
+    dnl library.
+    REPLACE_PTHREAD_ONCE=1
+    PTHREAD_ONCE_LIB=
+  else
+    if test $HAVE_PTHREAD_H = 0; then
+      HAVE_PTHREAD_ONCE=0
+      PTHREAD_ONCE_LIB=
+    else
+      dnl Work around Cygwin 3.5.3 bug.
+      AC_CACHE_CHECK([whether pthread_once works],
+        [gl_cv_func_pthread_once_works],
+        [case "$host_os" in
+           cygwin*) gl_cv_func_pthread_once_works="guessing no" ;;
+           *)       gl_cv_func_pthread_once_works="yes" ;;
+         esac
+        ])
+      case "$gl_cv_func_pthread_once_works" in
+        *yes) ;;
+        *) REPLACE_PTHREAD_ONCE=1 ;;
+      esac
+      dnl Determine whether linking requires $(LIBPMULTITHREAD) or only
+      dnl $(LIBPTHREAD).
+      if test -z "$LIBPTHREAD" && test -n "$LIBPMULTITHREAD"; then
+        AC_CACHE_CHECK([whether pthread_once can be used without linking with libpthread],
+          [gl_cv_func_pthread_once_no_lib],
+          [AC_RUN_IFELSE(
+             [AC_LANG_PROGRAM(
+                [[#include <pthread.h>
+                  static pthread_once_t a_once = PTHREAD_ONCE_INIT;
+                  static int a;
+                  static void a_init (void) { a = 8647; }
+                ]],
+                [[if (pthread_once (&a_once, a_init)) return 1;
+                  if (a != 8647) return 2;
+                  return 0;
+                ]])],
+             [gl_cv_func_pthread_once_no_lib=yes],
+             [gl_cv_func_pthread_once_no_lib=no],
+             [case "$host_os" in
+                # Guess no on glibc.
+                *-gnu* | gnu*)
+                  gl_cv_func_pthread_once_no_lib="guessing no" ;;
+                # Guess no on FreeBSD.
+                freebsd* | dragonfly* | midnightbsd*)
+                  gl_cv_func_pthread_once_no_lib="guessing no" ;;
+                # Guess yes otherwise.
+                *)
+                  gl_cv_func_pthread_once_no_lib="guessing yes" ;;
+              esac
+             ])
+          ])
+        case "$gl_cv_func_pthread_once_no_lib" in
+          *yes) PTHREAD_ONCE_LIB="$LIBPTHREAD" ;;
+          *)    PTHREAD_ONCE_LIB="$LIBPMULTITHREAD" ;;
+        esac
+        dnl Expected result:
+        dnl PTHREAD_ONCE_LIB is $(LIBPMULTITHREAD) on glibc < 2.34, FreeBSD.
+        dnl PTHREAD_ONCE_LIB is $(LIBPTHREAD) in particular on
+        dnl   musl libc, macOS, NetBSD, Solaris, Cygwin, Haiku, Android.
+      else
+        PTHREAD_ONCE_LIB="$LIBPTHREAD"
+      fi
+    fi
+  fi
+  AC_SUBST([PTHREAD_ONCE_LIB])
+])
diff --git a/gl/m4/pthread-spin.m4 b/gl/m4/pthread-spin.m4
new file mode 100644
index 00000000..aae2fb3b
--- /dev/null
+++ b/gl/m4/pthread-spin.m4
@@ -0,0 +1,72 @@
+# pthread-spin.m4
+# serial 8
+dnl Copyright (C) 2019-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN_ONCE([gl_PTHREAD_SPIN],
+[
+  AC_REQUIRE([gl_PTHREAD_H_PART1])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
+     && test $gl_threads_api = windows; then
+    dnl Choose function names that don't conflict with the mingw-w64 winpthreads
+    dnl library.
+    REPLACE_PTHREAD_SPIN_INIT=1
+    REPLACE_PTHREAD_SPIN_LOCK=1
+    REPLACE_PTHREAD_SPIN_TRYLOCK=1
+    REPLACE_PTHREAD_SPIN_UNLOCK=1
+    REPLACE_PTHREAD_SPIN_DESTROY=1
+  else
+    if test $HAVE_PTHREAD_H = 0 || test $HAVE_PTHREAD_SPINLOCK_T = 0; then
+      HAVE_PTHREAD_SPIN_INIT=0
+      HAVE_PTHREAD_SPIN_LOCK=0
+      HAVE_PTHREAD_SPIN_TRYLOCK=0
+      HAVE_PTHREAD_SPIN_UNLOCK=0
+      HAVE_PTHREAD_SPIN_DESTROY=0
+    else
+      dnl Test whether the gnulib module 'threadlib' is in use.
+      dnl Some packages like Emacs use --avoid=threadlib.
+      dnl Write the symbol in such a way that it does not cause 'aclocal' to pick
+      dnl the threadlib.m4 file that is installed in $PREFIX/share/aclocal/.
+      m4_ifdef([gl_][THREADLIB], [
+        AC_REQUIRE([gl_][THREADLIB])
+        dnl Test whether the functions actually exist.
+        dnl FreeBSD 5.2.1 declares them but does not define them.
+        AC_CACHE_CHECK([for pthread_spin_init],
+          [gl_cv_func_pthread_spin_init_in_LIBMULTITHREAD],
+          [gl_saved_LIBS="$LIBS"
+           LIBS="$LIBS $LIBMULTITHREAD"
+           AC_LINK_IFELSE(
+             [AC_LANG_PROGRAM(
+                [[#include <pthread.h>
+                ]],
+                [[pthread_spinlock_t lock;
+                  return pthread_spin_init (&lock, 0);
+                ]])
+             ],
+             [gl_cv_func_pthread_spin_init_in_LIBMULTITHREAD=yes],
+             [gl_cv_func_pthread_spin_init_in_LIBMULTITHREAD=no])
+           LIBS="$gl_saved_LIBS"
+          ])
+        if test $gl_cv_func_pthread_spin_init_in_LIBMULTITHREAD != yes; then
+          HAVE_PTHREAD_SPIN_INIT=0
+          REPLACE_PTHREAD_SPIN_INIT=1
+          HAVE_PTHREAD_SPIN_LOCK=0
+          REPLACE_PTHREAD_SPIN_LOCK=1
+          HAVE_PTHREAD_SPIN_TRYLOCK=0
+          REPLACE_PTHREAD_SPIN_TRYLOCK=1
+          HAVE_PTHREAD_SPIN_UNLOCK=0
+          REPLACE_PTHREAD_SPIN_UNLOCK=1
+          HAVE_PTHREAD_SPIN_DESTROY=0
+          REPLACE_PTHREAD_SPIN_DESTROY=1
+        fi
+      ], [
+        :
+      ])
+    fi
+  fi
+])
diff --git a/gl/m4/pthread_h.m4 b/gl/m4/pthread_h.m4
new file mode 100644
index 00000000..bb921386
--- /dev/null
+++ b/gl/m4/pthread_h.m4
@@ -0,0 +1,293 @@
+# pthread_h.m4
+# serial 11
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN_ONCE([gl_PTHREAD_H_PART1],
+[
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_PTHREAD_H_DEFAULTS])
+
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_PTHREADLIB])
+
+  gl_CHECK_NEXT_HEADERS([pthread.h])
+  if test $ac_cv_header_pthread_h = yes; then
+    HAVE_PTHREAD_H=1
+    dnl On mingw, if --enable-threads=windows or gl_AVOID_WINPTHREAD is used,
+    dnl ignore the <pthread.h> from the mingw-w64 winpthreads library.
+    m4_ifdef([gl_][THREADLIB], [
+      AC_REQUIRE([gl_][THREADLIB])
+      if { case "$host_os" in mingw* | windows*) true;; *) false;; esac; } \
+         && test $gl_threads_api = windows; then
+        HAVE_PTHREAD_H=0
+      fi
+    ])
+  else
+    HAVE_PTHREAD_H=0
+  fi
+  AC_SUBST([HAVE_PTHREAD_H])
+
+  AC_CHECK_TYPES([pthread_t, pthread_spinlock_t], [], [],
+    [AC_INCLUDES_DEFAULT[
+     #if HAVE_PTHREAD_H
+      #include <pthread.h>
+     #endif]])
+  if test $ac_cv_type_pthread_t != yes; then
+    HAVE_PTHREAD_T=0
+  fi
+  if test $ac_cv_type_pthread_spinlock_t != yes; then
+    HAVE_PTHREAD_SPINLOCK_T=0
+  fi
+])
+
+AC_DEFUN([gl_PTHREAD_H],
+[
+  AC_REQUIRE([gl_PTHREAD_H_PART1])
+
+  dnl Set HAVE_PTHREAD_SPIN_INIT, REPLACE_PTHREAD_SPIN_INIT.
+  gl_PTHREAD_SPIN
+
+  dnl Constants may be defined as C preprocessor macros or as enum items.
+
+  AC_CACHE_CHECK([for PTHREAD_CREATE_DETACHED],
+    [gl_cv_const_PTHREAD_CREATE_DETACHED],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <pthread.h>
+            int x = PTHREAD_CREATE_DETACHED;
+          ]],
+          [[]])],
+       [gl_cv_const_PTHREAD_CREATE_DETACHED=yes],
+       [gl_cv_const_PTHREAD_CREATE_DETACHED=no])
+    ])
+  if test $gl_cv_const_PTHREAD_CREATE_DETACHED != yes; then
+    HAVE_PTHREAD_CREATE_DETACHED=0
+  fi
+
+  AC_CACHE_CHECK([for PTHREAD_MUTEX_RECURSIVE],
+    [gl_cv_const_PTHREAD_MUTEX_RECURSIVE],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <pthread.h>
+            int x = PTHREAD_MUTEX_RECURSIVE;
+          ]],
+          [[]])],
+       [gl_cv_const_PTHREAD_MUTEX_RECURSIVE=yes],
+       [gl_cv_const_PTHREAD_MUTEX_RECURSIVE=no])
+    ])
+  if test $gl_cv_const_PTHREAD_MUTEX_RECURSIVE != yes; then
+    HAVE_PTHREAD_MUTEX_RECURSIVE=0
+  fi
+
+  AC_CACHE_CHECK([for PTHREAD_MUTEX_ROBUST],
+    [gl_cv_const_PTHREAD_MUTEX_ROBUST],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <pthread.h>
+            int x = PTHREAD_MUTEX_ROBUST;
+          ]],
+          [[]])],
+       [gl_cv_const_PTHREAD_MUTEX_ROBUST=yes],
+       [gl_cv_const_PTHREAD_MUTEX_ROBUST=no])
+    ])
+  if test $gl_cv_const_PTHREAD_MUTEX_ROBUST != yes; then
+    HAVE_PTHREAD_MUTEX_ROBUST=0
+  fi
+
+  AC_CACHE_CHECK([for PTHREAD_PROCESS_SHARED],
+    [gl_cv_const_PTHREAD_PROCESS_SHARED],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <pthread.h>
+            int x = PTHREAD_PROCESS_SHARED;
+          ]],
+          [[]])],
+       [gl_cv_const_PTHREAD_PROCESS_SHARED=yes],
+       [gl_cv_const_PTHREAD_PROCESS_SHARED=no])
+    ])
+  if test $gl_cv_const_PTHREAD_PROCESS_SHARED != yes; then
+    HAVE_PTHREAD_PROCESS_SHARED=0
+  fi
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, if it is not common
+  dnl enough to be declared everywhere.
+  gl_WARN_ON_USE_PREPARE([[#include <pthread.h>
+    ]], [
+    pthread_create pthread_attr_init pthread_attr_getdetachstate
+    pthread_attr_setdetachstate pthread_attr_destroy pthread_self pthread_equal
+    pthread_detach pthread_join pthread_exit
+    pthread_once
+    pthread_mutex_init pthread_mutexattr_init pthread_mutexattr_gettype
+    pthread_mutexattr_settype pthread_mutexattr_getrobust
+    pthread_mutexattr_setrobust pthread_mutexattr_destroy pthread_mutex_lock
+    pthread_mutex_trylock pthread_mutex_timedlock pthread_mutex_unlock
+    pthread_mutex_destroy
+    pthread_rwlock_init pthread_rwlockattr_init pthread_rwlockattr_destroy
+    pthread_rwlock_rdlock pthread_rwlock_wrlock pthread_rwlock_tryrdlock
+    pthread_rwlock_trywrlock pthread_rwlock_timedrdlock
+    pthread_rwlock_timedwrlock pthread_rwlock_unlock pthread_rwlock_destroy
+    pthread_cond_init pthread_condattr_init pthread_condattr_destroy
+    pthread_cond_wait pthread_cond_timedwait pthread_cond_signal
+    pthread_cond_broadcast pthread_cond_destroy
+    pthread_key_create pthread_setspecific pthread_getspecific
+    pthread_key_delete
+    pthread_spin_init pthread_spin_lock pthread_spin_trylock pthread_spin_unlock
+    pthread_spin_destroy])
+
+  AC_REQUIRE([AC_C_RESTRICT])
+
+  dnl For backward compatibility with gnulib versions <= 2019-07.
+  LIB_PTHREAD="$LIBPMULTITHREAD"
+  AC_SUBST([LIB_PTHREAD])
+])
+
+# gl_PTHREAD_MODULE_INDICATOR([modulename])
+# sets the shell variable that indicates the presence of the given module
+# to a C preprocessor expression that will evaluate to 1.
+# This macro invocation must not occur in macros that are AC_REQUIREd.
+AC_DEFUN([gl_PTHREAD_MODULE_INDICATOR],
+[
+  dnl Ensure to expand the default settings once only.
+  gl_PTHREAD_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+# Initializes the default values for AC_SUBSTed shell variables.
+# This macro must not be AC_REQUIREd.  It must only be invoked, and only
+# outside of macros or in macros that are not AC_REQUIREd.
+AC_DEFUN([gl_PTHREAD_H_REQUIRE_DEFAULTS],
+[
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_PTHREAD_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_THREAD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_ONCE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_MUTEX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_RWLOCK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_COND])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_TSS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_SPIN])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTHREAD_MUTEX_TIMEDLOCK])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_PTHREAD_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_PTHREAD_H_DEFAULTS])
+])
+
+AC_DEFUN([gl_PTHREAD_H_DEFAULTS],
+[
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_PTHREAD_T=1;                      AC_SUBST([HAVE_PTHREAD_T])
+  HAVE_PTHREAD_SPINLOCK_T=1;             AC_SUBST([HAVE_PTHREAD_SPINLOCK_T])
+  HAVE_PTHREAD_CREATE_DETACHED=1;        AC_SUBST([HAVE_PTHREAD_CREATE_DETACHED])
+  HAVE_PTHREAD_MUTEX_RECURSIVE=1;        AC_SUBST([HAVE_PTHREAD_MUTEX_RECURSIVE])
+  HAVE_PTHREAD_MUTEX_ROBUST=1;           AC_SUBST([HAVE_PTHREAD_MUTEX_ROBUST])
+  HAVE_PTHREAD_PROCESS_SHARED=1;         AC_SUBST([HAVE_PTHREAD_PROCESS_SHARED])
+  HAVE_PTHREAD_CREATE=1;                 AC_SUBST([HAVE_PTHREAD_CREATE])
+  HAVE_PTHREAD_ATTR_INIT=1;              AC_SUBST([HAVE_PTHREAD_ATTR_INIT])
+  HAVE_PTHREAD_ATTR_GETDETACHSTATE=1;    AC_SUBST([HAVE_PTHREAD_ATTR_GETDETACHSTATE])
+  HAVE_PTHREAD_ATTR_SETDETACHSTATE=1;    AC_SUBST([HAVE_PTHREAD_ATTR_SETDETACHSTATE])
+  HAVE_PTHREAD_ATTR_DESTROY=1;           AC_SUBST([HAVE_PTHREAD_ATTR_DESTROY])
+  HAVE_PTHREAD_SELF=1;                   AC_SUBST([HAVE_PTHREAD_SELF])
+  HAVE_PTHREAD_EQUAL=1;                  AC_SUBST([HAVE_PTHREAD_EQUAL])
+  HAVE_PTHREAD_DETACH=1;                 AC_SUBST([HAVE_PTHREAD_DETACH])
+  HAVE_PTHREAD_JOIN=1;                   AC_SUBST([HAVE_PTHREAD_JOIN])
+  HAVE_PTHREAD_EXIT=1;                   AC_SUBST([HAVE_PTHREAD_EXIT])
+  HAVE_PTHREAD_ONCE=1;                   AC_SUBST([HAVE_PTHREAD_ONCE])
+  HAVE_PTHREAD_MUTEX_INIT=1;             AC_SUBST([HAVE_PTHREAD_MUTEX_INIT])
+  HAVE_PTHREAD_MUTEXATTR_INIT=1;         AC_SUBST([HAVE_PTHREAD_MUTEXATTR_INIT])
+  HAVE_PTHREAD_MUTEXATTR_GETTYPE=1;      AC_SUBST([HAVE_PTHREAD_MUTEXATTR_GETTYPE])
+  HAVE_PTHREAD_MUTEXATTR_SETTYPE=1;      AC_SUBST([HAVE_PTHREAD_MUTEXATTR_SETTYPE])
+  HAVE_PTHREAD_MUTEXATTR_GETROBUST=1;    AC_SUBST([HAVE_PTHREAD_MUTEXATTR_GETROBUST])
+  HAVE_PTHREAD_MUTEXATTR_SETROBUST=1;    AC_SUBST([HAVE_PTHREAD_MUTEXATTR_SETROBUST])
+  HAVE_PTHREAD_MUTEXATTR_DESTROY=1;      AC_SUBST([HAVE_PTHREAD_MUTEXATTR_DESTROY])
+  HAVE_PTHREAD_MUTEX_LOCK=1;             AC_SUBST([HAVE_PTHREAD_MUTEX_LOCK])
+  HAVE_PTHREAD_MUTEX_TRYLOCK=1;          AC_SUBST([HAVE_PTHREAD_MUTEX_TRYLOCK])
+  HAVE_PTHREAD_MUTEX_TIMEDLOCK=1;        AC_SUBST([HAVE_PTHREAD_MUTEX_TIMEDLOCK])
+  HAVE_PTHREAD_MUTEX_UNLOCK=1;           AC_SUBST([HAVE_PTHREAD_MUTEX_UNLOCK])
+  HAVE_PTHREAD_MUTEX_DESTROY=1;          AC_SUBST([HAVE_PTHREAD_MUTEX_DESTROY])
+  HAVE_PTHREAD_RWLOCK_INIT=1;            AC_SUBST([HAVE_PTHREAD_RWLOCK_INIT])
+  HAVE_PTHREAD_RWLOCKATTR_INIT=1;        AC_SUBST([HAVE_PTHREAD_RWLOCKATTR_INIT])
+  HAVE_PTHREAD_RWLOCKATTR_DESTROY=1;     AC_SUBST([HAVE_PTHREAD_RWLOCKATTR_DESTROY])
+  HAVE_PTHREAD_RWLOCK_RDLOCK=1;          AC_SUBST([HAVE_PTHREAD_RWLOCK_RDLOCK])
+  HAVE_PTHREAD_RWLOCK_WRLOCK=1;          AC_SUBST([HAVE_PTHREAD_RWLOCK_WRLOCK])
+  HAVE_PTHREAD_RWLOCK_TRYRDLOCK=1;       AC_SUBST([HAVE_PTHREAD_RWLOCK_TRYRDLOCK])
+  HAVE_PTHREAD_RWLOCK_TRYWRLOCK=1;       AC_SUBST([HAVE_PTHREAD_RWLOCK_TRYWRLOCK])
+  HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK=1;     AC_SUBST([HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK])
+  HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK=1;     AC_SUBST([HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK])
+  HAVE_PTHREAD_RWLOCK_UNLOCK=1;          AC_SUBST([HAVE_PTHREAD_RWLOCK_UNLOCK])
+  HAVE_PTHREAD_RWLOCK_DESTROY=1;         AC_SUBST([HAVE_PTHREAD_RWLOCK_DESTROY])
+  HAVE_PTHREAD_COND_INIT=1;              AC_SUBST([HAVE_PTHREAD_COND_INIT])
+  HAVE_PTHREAD_CONDATTR_INIT=1;          AC_SUBST([HAVE_PTHREAD_CONDATTR_INIT])
+  HAVE_PTHREAD_CONDATTR_DESTROY=1;       AC_SUBST([HAVE_PTHREAD_CONDATTR_DESTROY])
+  HAVE_PTHREAD_COND_WAIT=1;              AC_SUBST([HAVE_PTHREAD_COND_WAIT])
+  HAVE_PTHREAD_COND_TIMEDWAIT=1;         AC_SUBST([HAVE_PTHREAD_COND_TIMEDWAIT])
+  HAVE_PTHREAD_COND_SIGNAL=1;            AC_SUBST([HAVE_PTHREAD_COND_SIGNAL])
+  HAVE_PTHREAD_COND_BROADCAST=1;         AC_SUBST([HAVE_PTHREAD_COND_BROADCAST])
+  HAVE_PTHREAD_COND_DESTROY=1;           AC_SUBST([HAVE_PTHREAD_COND_DESTROY])
+  HAVE_PTHREAD_KEY_CREATE=1;             AC_SUBST([HAVE_PTHREAD_KEY_CREATE])
+  HAVE_PTHREAD_SETSPECIFIC=1;            AC_SUBST([HAVE_PTHREAD_SETSPECIFIC])
+  HAVE_PTHREAD_GETSPECIFIC=1;            AC_SUBST([HAVE_PTHREAD_GETSPECIFIC])
+  HAVE_PTHREAD_KEY_DELETE=1;             AC_SUBST([HAVE_PTHREAD_KEY_DELETE])
+  HAVE_PTHREAD_SPIN_INIT=1;              AC_SUBST([HAVE_PTHREAD_SPIN_INIT])
+  HAVE_PTHREAD_SPIN_LOCK=1;              AC_SUBST([HAVE_PTHREAD_SPIN_LOCK])
+  HAVE_PTHREAD_SPIN_TRYLOCK=1;           AC_SUBST([HAVE_PTHREAD_SPIN_TRYLOCK])
+  HAVE_PTHREAD_SPIN_UNLOCK=1;            AC_SUBST([HAVE_PTHREAD_SPIN_UNLOCK])
+  HAVE_PTHREAD_SPIN_DESTROY=1;           AC_SUBST([HAVE_PTHREAD_SPIN_DESTROY])
+  REPLACE_PTHREAD_CREATE=0;              AC_SUBST([REPLACE_PTHREAD_CREATE])
+  REPLACE_PTHREAD_ATTR_INIT=0;           AC_SUBST([REPLACE_PTHREAD_ATTR_INIT])
+  REPLACE_PTHREAD_ATTR_GETDETACHSTATE=0; AC_SUBST([REPLACE_PTHREAD_ATTR_GETDETACHSTATE])
+  REPLACE_PTHREAD_ATTR_SETDETACHSTATE=0; AC_SUBST([REPLACE_PTHREAD_ATTR_SETDETACHSTATE])
+  REPLACE_PTHREAD_ATTR_DESTROY=0;        AC_SUBST([REPLACE_PTHREAD_ATTR_DESTROY])
+  REPLACE_PTHREAD_SELF=0;                AC_SUBST([REPLACE_PTHREAD_SELF])
+  REPLACE_PTHREAD_EQUAL=0;               AC_SUBST([REPLACE_PTHREAD_EQUAL])
+  REPLACE_PTHREAD_DETACH=0;              AC_SUBST([REPLACE_PTHREAD_DETACH])
+  REPLACE_PTHREAD_JOIN=0;                AC_SUBST([REPLACE_PTHREAD_JOIN])
+  REPLACE_PTHREAD_EXIT=0;                AC_SUBST([REPLACE_PTHREAD_EXIT])
+  REPLACE_PTHREAD_ONCE=0;                AC_SUBST([REPLACE_PTHREAD_ONCE])
+  REPLACE_PTHREAD_MUTEX_INIT=0;          AC_SUBST([REPLACE_PTHREAD_MUTEX_INIT])
+  REPLACE_PTHREAD_MUTEXATTR_INIT=0;      AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_INIT])
+  REPLACE_PTHREAD_MUTEXATTR_GETTYPE=0;   AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_GETTYPE])
+  REPLACE_PTHREAD_MUTEXATTR_SETTYPE=0;   AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_SETTYPE])
+  REPLACE_PTHREAD_MUTEXATTR_GETROBUST=0; AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_GETROBUST])
+  REPLACE_PTHREAD_MUTEXATTR_SETROBUST=0; AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_SETROBUST])
+  REPLACE_PTHREAD_MUTEXATTR_DESTROY=0;   AC_SUBST([REPLACE_PTHREAD_MUTEXATTR_DESTROY])
+  REPLACE_PTHREAD_MUTEX_LOCK=0;          AC_SUBST([REPLACE_PTHREAD_MUTEX_LOCK])
+  REPLACE_PTHREAD_MUTEX_TRYLOCK=0;       AC_SUBST([REPLACE_PTHREAD_MUTEX_TRYLOCK])
+  REPLACE_PTHREAD_MUTEX_TIMEDLOCK=0;     AC_SUBST([REPLACE_PTHREAD_MUTEX_TIMEDLOCK])
+  REPLACE_PTHREAD_MUTEX_UNLOCK=0;        AC_SUBST([REPLACE_PTHREAD_MUTEX_UNLOCK])
+  REPLACE_PTHREAD_MUTEX_DESTROY=0;       AC_SUBST([REPLACE_PTHREAD_MUTEX_DESTROY])
+  REPLACE_PTHREAD_RWLOCK_INIT=0;         AC_SUBST([REPLACE_PTHREAD_RWLOCK_INIT])
+  REPLACE_PTHREAD_RWLOCKATTR_INIT=0;     AC_SUBST([REPLACE_PTHREAD_RWLOCKATTR_INIT])
+  REPLACE_PTHREAD_RWLOCKATTR_DESTROY=0;  AC_SUBST([REPLACE_PTHREAD_RWLOCKATTR_DESTROY])
+  REPLACE_PTHREAD_RWLOCK_RDLOCK=0;       AC_SUBST([REPLACE_PTHREAD_RWLOCK_RDLOCK])
+  REPLACE_PTHREAD_RWLOCK_WRLOCK=0;       AC_SUBST([REPLACE_PTHREAD_RWLOCK_WRLOCK])
+  REPLACE_PTHREAD_RWLOCK_TRYRDLOCK=0;    AC_SUBST([REPLACE_PTHREAD_RWLOCK_TRYRDLOCK])
+  REPLACE_PTHREAD_RWLOCK_TRYWRLOCK=0;    AC_SUBST([REPLACE_PTHREAD_RWLOCK_TRYWRLOCK])
+  REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK=0;  AC_SUBST([REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK])
+  REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK=0;  AC_SUBST([REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK])
+  REPLACE_PTHREAD_RWLOCK_UNLOCK=0;       AC_SUBST([REPLACE_PTHREAD_RWLOCK_UNLOCK])
+  REPLACE_PTHREAD_RWLOCK_DESTROY=0;      AC_SUBST([REPLACE_PTHREAD_RWLOCK_DESTROY])
+  REPLACE_PTHREAD_COND_INIT=0;           AC_SUBST([REPLACE_PTHREAD_COND_INIT])
+  REPLACE_PTHREAD_CONDATTR_INIT=0;       AC_SUBST([REPLACE_PTHREAD_CONDATTR_INIT])
+  REPLACE_PTHREAD_CONDATTR_DESTROY=0;    AC_SUBST([REPLACE_PTHREAD_CONDATTR_DESTROY])
+  REPLACE_PTHREAD_COND_WAIT=0;           AC_SUBST([REPLACE_PTHREAD_COND_WAIT])
+  REPLACE_PTHREAD_COND_TIMEDWAIT=0;      AC_SUBST([REPLACE_PTHREAD_COND_TIMEDWAIT])
+  REPLACE_PTHREAD_COND_SIGNAL=0;         AC_SUBST([REPLACE_PTHREAD_COND_SIGNAL])
+  REPLACE_PTHREAD_COND_BROADCAST=0;      AC_SUBST([REPLACE_PTHREAD_COND_BROADCAST])
+  REPLACE_PTHREAD_COND_DESTROY=0;        AC_SUBST([REPLACE_PTHREAD_COND_DESTROY])
+  REPLACE_PTHREAD_KEY_CREATE=0;          AC_SUBST([REPLACE_PTHREAD_KEY_CREATE])
+  REPLACE_PTHREAD_SETSPECIFIC=0;         AC_SUBST([REPLACE_PTHREAD_SETSPECIFIC])
+  REPLACE_PTHREAD_GETSPECIFIC=0;         AC_SUBST([REPLACE_PTHREAD_GETSPECIFIC])
+  REPLACE_PTHREAD_KEY_DELETE=0;          AC_SUBST([REPLACE_PTHREAD_KEY_DELETE])
+  REPLACE_PTHREAD_SPIN_INIT=0;           AC_SUBST([REPLACE_PTHREAD_SPIN_INIT])
+  REPLACE_PTHREAD_SPIN_LOCK=0;           AC_SUBST([REPLACE_PTHREAD_SPIN_LOCK])
+  REPLACE_PTHREAD_SPIN_TRYLOCK=0;        AC_SUBST([REPLACE_PTHREAD_SPIN_TRYLOCK])
+  REPLACE_PTHREAD_SPIN_UNLOCK=0;         AC_SUBST([REPLACE_PTHREAD_SPIN_UNLOCK])
+  REPLACE_PTHREAD_SPIN_DESTROY=0;        AC_SUBST([REPLACE_PTHREAD_SPIN_DESTROY])
+])
diff --git a/gl/m4/pthread_rwlock_rdlock.m4 b/gl/m4/pthread_rwlock_rdlock.m4
index b8b5b117..aec9f076 100644
--- a/gl/m4/pthread_rwlock_rdlock.m4
+++ b/gl/m4/pthread_rwlock_rdlock.m4
@@ -1,9 +1,10 @@
 # pthread_rwlock_rdlock.m4
 # serial 8
-dnl Copyright (C) 2017-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2017-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 dnl Inspired by
diff --git a/gl/m4/realloc.m4 b/gl/m4/realloc.m4
index eb90d588..67c1476b 100644
--- a/gl/m4/realloc.m4
+++ b/gl/m4/realloc.m4
@@ -1,54 +1,22 @@
 # realloc.m4
-# serial 29
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+# serial 39.1
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
-# This is adapted with modifications from upstream Autoconf here:
-# https://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/autoconf/functions.m4?id=v2.70#n1455
-AC_DEFUN([_AC_FUNC_REALLOC_IF],
+# An an experimental option, the user can request a sanitized realloc()
+# implementation, i.e. one that aborts upon undefined behaviour,
+# by setting
+#   gl_cv_func_realloc_sanitize=yes
+# at configure time.
+AC_DEFUN([gl_FUNC_REALLOC_SANITIZED],
 [
-  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
-  AC_CACHE_CHECK([whether realloc (0, 0) returns nonnull],
-    [ac_cv_func_realloc_0_nonnull],
-    [AC_RUN_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stdlib.h>
-          ]],
-          [[void *p = realloc (0, 0);
-            void * volatile vp = p;
-            int result = !vp;
-            free (p);
-            return result;]])
-       ],
-       [ac_cv_func_realloc_0_nonnull=yes],
-       [ac_cv_func_realloc_0_nonnull=no],
-       [case "$host_os" in
-          # Guess yes on platforms where we know the result.
-          *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-          | gnu* | *-musl* | midipix* | midnightbsd* \
-          | hpux* | solaris* | cygwin* | mingw* | windows* | msys* )
-            ac_cv_func_realloc_0_nonnull="guessing yes" ;;
-          # If we don't know, obey --enable-cross-guesses.
-          *) ac_cv_func_realloc_0_nonnull="$gl_cross_guess_normal" ;;
-        esac
-       ])
-    ])
-  AS_CASE([$ac_cv_func_realloc_0_nonnull], [*yes], [$1], [$2])
-])# AC_FUNC_REALLOC
-
-# gl_FUNC_REALLOC_GNU
-# -------------------
-# Replace realloc if it is not compatible with GNU libc.
-AC_DEFUN([gl_FUNC_REALLOC_GNU],
-[
-  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-  AC_REQUIRE([gl_FUNC_REALLOC_POSIX])
-  if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 0; then
-    _AC_FUNC_REALLOC_IF([], [REPLACE_REALLOC_FOR_REALLOC_GNU=1])
-  fi
-])# gl_FUNC_REALLOC_GNU
+  AC_CACHE_CHECK([whether realloc should abort upon undefined behaviour],
+    [gl_cv_func_realloc_sanitize],
+    [test -n "$gl_cv_func_realloc_sanitize" || gl_cv_func_realloc_sanitize=no])
+])
 
 # gl_FUNC_REALLOC_POSIX
 # ---------------------
@@ -59,7 +27,100 @@ AC_DEFUN([gl_FUNC_REALLOC_POSIX],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_MALLOC_POSIX])
-  if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([whether realloc sets errno on failure],
+    [gl_cv_func_realloc_posix],
+    [
+      dnl FreeBSD 15.0 realloc() does not set errno when asked for more than
+      dnl 0x7000000000000000 bytes.
+      case "$host_os" in
+        darwin* | freebsd* | dragonfly* | midnightbsd* | netbsd* | openbsd*)
+          AC_RUN_IFELSE(
+            [AC_LANG_SOURCE(
+               [[#include <errno.h>
+                 #include <stdlib.h>
+                 int main (int argc, char **argv)
+                 {
+                   void *p;
+                   errno = 1729;
+                   p = realloc (malloc (1), (size_t)(-1) / 100 * 49);
+                   return (!p && errno == 1729);
+                 }
+               ]])
+            ],
+            [gl_cv_func_realloc_posix=yes],
+            [gl_cv_func_realloc_posix=no],
+            [case "$host_os" in
+               freebsd*) gl_cv_func_realloc_posix="guessing no" ;;
+               *)        gl_cv_func_realloc_posix="guessing yes" ;;
+             esac
+            ])
+          ;;
+        *)
+          gl_cv_func_realloc_posix="$gl_cv_func_malloc_posix"
+          ;;
+      esac
+    ])
+  case "$gl_cv_func_realloc_posix" in
+    *yes)
+      AC_DEFINE([HAVE_REALLOC_POSIX], [1],
+        [Define if realloc sets errno on allocation failure.])
+      ;;
+    *)
+      REPLACE_REALLOC_FOR_REALLOC_POSIX=1
+      ;;
+  esac
+  AC_REQUIRE([gl_FUNC_REALLOC_SANITIZED])
+  if test "$gl_cv_func_realloc_sanitize" != no; then
     REPLACE_REALLOC_FOR_REALLOC_POSIX=1
+    AC_DEFINE([NEED_SANITIZED_REALLOC], [1],
+      [Define to 1 if realloc should abort upon undefined behaviour.])
   fi
 ])
+
+# gl_FUNC_REALLOC_0_NONNULL
+# -------------------------
+# Replace realloc if realloc (..., 0) returns null.
+# Modules that use this macro directly or indirectly should depend
+# on extensions-aix, so that _LINUX_SOURCE_COMPAT gets defined
+# before this macro gets invoked.  This helps if !(__VEC__ || __AIXVEC),
+# and doesn't hurt otherwise.
+AC_DEFUN([gl_FUNC_REALLOC_0_NONNULL],
+[
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles
+  AC_REQUIRE([gl_FUNC_REALLOC_POSIX])
+  AC_CACHE_CHECK([whether realloc (..., 0) returns nonnull],
+    [gl_cv_func_realloc_0_nonnull],
+    [AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stdlib.h>
+            /* Use prealloc to test; "volatile" prevents the compiler
+               from optimizing the realloc call away.  */
+            void *(*volatile prealloc) (void *, size_t) = realloc;]],
+          [[void *p = prealloc (0, 0);
+            int result = !p;
+            p = prealloc (p, 0);
+            result |= !p;
+            free (p);
+            return result;]])],
+       [gl_cv_func_realloc_0_nonnull=yes],
+       [gl_cv_func_realloc_0_nonnull=no],
+       [AS_CASE([$host_os],
+          [# Guess yes on platforms where we know the result.
+           freebsd* | netbsd* | openbsd* | darwin* | bitrig* \
+           | *-musl* | midipix* | midnightbsd* \
+           | hpux* | solaris* | cygwin*],
+            [gl_cv_func_realloc_0_nonnull="guessing yes"],
+          [# Guess as follows if we don't know.
+           gl_cv_func_realloc_0_nonnull=$gl_cross_guess_normal])])])
+  AS_CASE([$gl_cv_func_realloc_0_nonnull],
+    [*yes],
+      [AC_DEFINE([HAVE_REALLOC_0_NONNULL], [1],
+         [Define to 1 if realloc (..., 0) returns nonnull.])],
+    [AS_CASE([$gl_cv_func_realloc_sanitize,$gl_cv_malloc_ptrdiff,$gl_cv_func_malloc_posix,$host],
+       [yes,*,*,* | *,no,*,* | *,*,*no,* | *,*,*,aarch64c-*-freebsd*],
+         [REPLACE_REALLOC_FOR_REALLOC_POSIX=1],
+       [# Optimize for common case of glibc 2.1.1+ and compatibles.
+        REPLACE_REALLOC_FOR_REALLOC_POSIX=2])])
+])
diff --git a/gl/m4/reallocarray.m4 b/gl/m4/reallocarray.m4
index 958095e1..3970d9e1 100644
--- a/gl/m4/reallocarray.m4
+++ b/gl/m4/reallocarray.m4
@@ -1,9 +1,10 @@
 # reallocarray.m4
-# serial 5
-dnl Copyright (C) 2017-2024 Free Software Foundation, Inc.
+# serial 7
+dnl Copyright (C) 2017-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_REALLOCARRAY],
 [
@@ -12,14 +13,21 @@ AC_DEFUN([gl_FUNC_REALLOCARRAY],
 
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF])
+  AC_REQUIRE([gl_FUNC_REALLOC_0_NONNULL])
   gl_CHECK_FUNCS_ANDROID([reallocarray], [[#include <stdlib.h>]])
   if test "$ac_cv_func_reallocarray" = no; then
     HAVE_REALLOCARRAY=0
     case "$gl_cv_onwards_func_reallocarray" in
       future*) REPLACE_REALLOCARRAY=1 ;;
     esac
-  elif test "$gl_cv_malloc_ptrdiff" = no; then
-    REPLACE_REALLOCARRAY=1
+  else
+    if test "$gl_cv_malloc_ptrdiff" = no; then
+      REPLACE_REALLOCARRAY=1
+    fi
+    case "$gl_cv_func_realloc_0_nonnull" in
+      *yes) ;;
+      *) REPLACE_REALLOCARRAY=1 ;;
+    esac
   fi
 ])
 
diff --git a/gl/m4/regex.m4 b/gl/m4/regex.m4
index f0101fe6..49a8059f 100644
--- a/gl/m4/regex.m4
+++ b/gl/m4/regex.m4
@@ -1,9 +1,10 @@
 # regex.m4
-# serial 75
-dnl Copyright (C) 1996-2001, 2003-2024 Free Software Foundation, Inc.
+# serial 81
+dnl Copyright (C) 1996-2001, 2003-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
@@ -39,19 +40,24 @@ AC_DEFUN([gl_REGEX],
             #include <limits.h>
             #include <string.h>
 
-            #if defined M_CHECK_ACTION || HAVE_DECL_ALARM
-            # include <signal.h>
-            # include <unistd.h>
+            #if HAVE_MALLOC_H
+            # include <malloc.h> /* defines M_CHECK_ACTION on glibc */
             #endif
 
-            #if HAVE_MALLOC_H
-            # include <malloc.h>
+            #if defined __HAIKU__ || defined M_CHECK_ACTION || HAVE_DECL_ALARM
+            # include <signal.h>
+            # include <unistd.h>
             #endif
 
-            #ifdef M_CHECK_ACTION
+            #if defined __HAIKU__ || defined M_CHECK_ACTION
             /* Exit with distinguishable exit code.  */
             static void sigabrt_no_core (int sig) { raise (SIGTERM); }
             #endif
+
+            /* There is no need to check whether RE_SYNTAX_EMACS is
+               (RE_CHAR_CLASSES | RE_INTERVALS), corresponding to
+               Emacs 21 (2001) and later, because Gnulib's lib/regex.h
+               is always used and has this value.  */
           ]],
           [[int result = 0;
             static struct re_pattern_buffer regex;
@@ -67,6 +73,9 @@ AC_DEFUN([gl_REGEX],
             signal (SIGALRM, SIG_DFL);
             alarm (2);
 #endif
+#ifdef __HAIKU__
+            signal (SIGABRT, sigabrt_no_core);
+#endif
 #ifdef M_CHECK_ACTION
             signal (SIGABRT, sigabrt_no_core);
             mallopt (M_CHECK_ACTION, 2);
@@ -388,7 +397,6 @@ AC_DEFUN([gl_PREREQ_REGEX],
   AC_REQUIRE([AC_C_INLINE])
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
-  AC_REQUIRE([gl_EEMALLOC])
   AC_CHECK_HEADERS([libintl.h])
   AC_CHECK_FUNCS_ONCE([isblank iswctype])
   AC_CHECK_DECLS([isblank], [], [], [[#include <ctype.h>]])
diff --git a/gl/m4/sched_h.m4 b/gl/m4/sched_h.m4
new file mode 100644
index 00000000..1ffd465f
--- /dev/null
+++ b/gl/m4/sched_h.m4
@@ -0,0 +1,102 @@
+# sched_h.m4
+# serial 16
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl Written by Bruno Haible.
+
+AC_DEFUN_ONCE([gl_SCHED_H],
+[
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_SCHED_H_DEFAULTS])
+
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  AC_REQUIRE([gl_CHECK_HEADER_SYS_CDEFS_H])
+
+  AC_CHECK_HEADERS([sched.h], [], [],
+    [[#if HAVE_SYS_CDEFS_H
+       #include <sys/cdefs.h>
+      #endif
+    ]])
+  gl_NEXT_HEADERS([sched.h])
+
+  if test "$ac_cv_header_sched_h" = yes; then
+    HAVE_SCHED_H=1
+  else
+    HAVE_SCHED_H=0
+  fi
+  AC_SUBST([HAVE_SCHED_H])
+
+  if test "$HAVE_SCHED_H" = 1; then
+    AC_CHECK_TYPE([struct sched_param],
+      [HAVE_STRUCT_SCHED_PARAM=1], [HAVE_STRUCT_SCHED_PARAM=0],
+      [[#if HAVE_SYS_CDEFS_H
+         #include <sys/cdefs.h>
+        #endif
+        #include <sched.h>
+      ]])
+  else
+    HAVE_STRUCT_SCHED_PARAM=0
+    case "$host_os" in
+      os2*)
+        dnl On OS/2 kLIBC, struct sched_param is in spawn.h.
+        AC_CHECK_TYPE([struct sched_param],
+          [HAVE_STRUCT_SCHED_PARAM=1], [],
+          [#include <spawn.h>])
+        ;;
+      vms)
+        dnl On OpenVMS 7.2 or newer, struct sched_param is in pthread.h.
+        AC_CHECK_TYPE([struct sched_param],
+          [HAVE_STRUCT_SCHED_PARAM=1], [],
+          [#include <pthread.h>])
+        ;;
+    esac
+  fi
+  AC_SUBST([HAVE_STRUCT_SCHED_PARAM])
+
+  dnl Ensure the type pid_t gets defined.
+  AC_REQUIRE([AC_TYPE_PID_T])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, if it is not common
+  dnl enough to be declared everywhere.
+  gl_WARN_ON_USE_PREPARE([[#include <sched.h>
+    ]], [sched_yield])
+])
+
+# gl_SCHED_MODULE_INDICATOR([modulename])
+# sets the shell variable that indicates the presence of the given module
+# to a C preprocessor expression that will evaluate to 1.
+# This macro invocation must not occur in macros that are AC_REQUIREd.
+AC_DEFUN([gl_SCHED_MODULE_INDICATOR],
+[
+  dnl Ensure to expand the default settings once only.
+  gl_SCHED_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+# Initializes the default values for AC_SUBSTed shell variables.
+# This macro must not be AC_REQUIREd.  It must only be invoked, and only
+# outside of macros or in macros that are not AC_REQUIREd.
+AC_DEFUN([gl_SCHED_H_REQUIRE_DEFAULTS],
+[
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_SCHED_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCHED_YIELD])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_SCHED_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_SCHED_H_DEFAULTS])
+])
+
+AC_DEFUN([gl_SCHED_H_DEFAULTS],
+[
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_SCHED_YIELD=1;    AC_SUBST([HAVE_SCHED_YIELD])
+  REPLACE_SCHED_YIELD=0; AC_SUBST([REPLACE_SCHED_YIELD])
+])
diff --git a/gl/m4/servent.m4 b/gl/m4/servent.m4
index 422003b4..ba6ebd1d 100644
--- a/gl/m4/servent.m4
+++ b/gl/m4/servent.m4
@@ -1,9 +1,10 @@
 # servent.m4
 # serial 5
-dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008, 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_SERVENT],
 [
diff --git a/gl/m4/setenv.m4 b/gl/m4/setenv.m4
index e7f00f39..727e35af 100644
--- a/gl/m4/setenv.m4
+++ b/gl/m4/setenv.m4
@@ -1,9 +1,10 @@
 # setenv.m4
-# serial 33
-dnl Copyright (C) 2001-2004, 2006-2024 Free Software Foundation, Inc.
+# serial 35
+dnl Copyright (C) 2001-2004, 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_SETENV],
 [
@@ -155,6 +156,7 @@ AC_DEFUN([gl_PREREQ_SETENV],
   AC_REQUIRE([gl_ENVIRON])
   AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CHECK_HEADERS([search.h])
+  AC_CHECK_DECLS_ONCE([_putenv])
   gl_CHECK_FUNCS_ANDROID([tsearch], [[#include <search.h>]])
 ])
 
@@ -163,4 +165,5 @@ AC_DEFUN([gl_PREREQ_UNSETENV],
 [
   AC_REQUIRE([gl_ENVIRON])
   AC_CHECK_HEADERS_ONCE([unistd.h])
+  AC_CHECK_DECLS_ONCE([_putenv])
 ])
diff --git a/gl/m4/setlocale_null.m4 b/gl/m4/setlocale_null.m4
index e5b7d28b..3c8b693e 100644
--- a/gl/m4/setlocale_null.m4
+++ b/gl/m4/setlocale_null.m4
@@ -1,11 +1,12 @@
 # setlocale_null.m4
-# serial 9
-dnl Copyright (C) 2019-2024 Free Software Foundation, Inc.
+# serial 10
+dnl Copyright (C) 2019-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
-AC_DEFUN([gl_FUNC_SETLOCALE_NULL],
+AC_DEFUN_ONCE([gl_FUNC_SETLOCALE_NULL],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_PTHREADLIB])
diff --git a/gl/m4/sha256.m4 b/gl/m4/sha256.m4
index ad5596a4..30e8deeb 100644
--- a/gl/m4/sha256.m4
+++ b/gl/m4/sha256.m4
@@ -1,9 +1,10 @@
 # sha256.m4
 # serial 8
-dnl Copyright (C) 2005, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_SHA256],
 [
diff --git a/gl/m4/size_max.m4 b/gl/m4/size_max.m4
index df91cf06..b0460d45 100644
--- a/gl/m4/size_max.m4
+++ b/gl/m4/size_max.m4
@@ -1,9 +1,10 @@
 # size_max.m4
 # serial 12
-dnl Copyright (C) 2003, 2005-2006, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2005-2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 
diff --git a/gl/m4/snprintf.m4 b/gl/m4/snprintf.m4
index 6dbe146f..2c50cee9 100644
--- a/gl/m4/snprintf.m4
+++ b/gl/m4/snprintf.m4
@@ -1,9 +1,10 @@
 # snprintf.m4
 # serial 7
-dnl Copyright (C) 2002-2004, 2007-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Libintl 0.17 will replace snprintf only if it does not support %1$s,
 dnl but defers to any gnulib snprintf replacements.  Therefore, gnulib
diff --git a/gl/m4/socketlib.m4 b/gl/m4/socketlib.m4
index 09f01161..e3509f81 100644
--- a/gl/m4/socketlib.m4
+++ b/gl/m4/socketlib.m4
@@ -1,9 +1,10 @@
 # socketlib.m4
 # serial 4
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl gl_SOCKETLIB
 dnl Determines the library to use for socket functions.
diff --git a/gl/m4/sockets.m4 b/gl/m4/sockets.m4
index a3dfe92f..54f4dc79 100644
--- a/gl/m4/sockets.m4
+++ b/gl/m4/sockets.m4
@@ -1,9 +1,10 @@
 # sockets.m4
 # serial 7
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_SOCKETS],
 [
diff --git a/gl/m4/socklen.m4 b/gl/m4/socklen.m4
index 9ece0abb..a8ac25b1 100644
--- a/gl/m4/socklen.m4
+++ b/gl/m4/socklen.m4
@@ -1,9 +1,10 @@
 # socklen.m4
 # serial 11
-dnl Copyright (C) 2005-2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Albert Chin, Windows fixes from Simon Josefsson.
 
diff --git a/gl/m4/sockpfaf.m4 b/gl/m4/sockpfaf.m4
index c68b3abb..08ce843d 100644
--- a/gl/m4/sockpfaf.m4
+++ b/gl/m4/sockpfaf.m4
@@ -1,9 +1,10 @@
 # sockpfaf.m4
-# serial 10
-dnl Copyright (C) 2004, 2006, 2009-2024 Free Software Foundation, Inc.
+# serial 11
+dnl Copyright (C) 2004, 2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Test for some common socket protocol families (PF_INET, PF_INET6, ...)
 dnl and some common address families (AF_INET, AF_INET6, ...).
@@ -64,6 +65,13 @@ AC_DEFUN([gl_SOCKET_FAMILY_UNIX],
   AC_REQUIRE([gl_SYS_SOCKET_H])
   AC_CHECK_HEADERS_ONCE([sys/un.h])
 
+  dnl Windows versions released after 2017 may have support for AF_UNIX.
+  dnl Including it requires types from <winsock2.h> to be defined.
+  dnl <https://devblogs.microsoft.com/commandline/af_unix-comes-to-windows/>.
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    AC_CHECK_HEADERS([afunix.h], [], [], [#include <winsock2.h>])
+  fi
+
   AC_CACHE_CHECK([for UNIX domain sockets],
     [gl_cv_socket_unix],
     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
@@ -75,6 +83,9 @@ AC_DEFUN([gl_SOCKET_FAMILY_UNIX],
 #endif
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
+#endif
+#ifdef HAVE_AFUNIX_H
+#include <afunix.h>
 #endif]],
 [[int x = AF_UNIX; struct sockaddr_un y;
  if (&x && &y) return 0;]])],
diff --git a/gl/m4/ssize_t.m4 b/gl/m4/ssize_t.m4
index c15f948a..a2ffd6fc 100644
--- a/gl/m4/ssize_t.m4
+++ b/gl/m4/ssize_t.m4
@@ -1,9 +1,10 @@
 # ssize_t.m4
 # serial 6
-dnl Copyright (C) 2001-2003, 2006, 2010-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2003, 2006, 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 dnl Define ssize_t if it does not already exist.
diff --git a/gl/m4/stat-time.m4 b/gl/m4/stat-time.m4
index e8ee7d51..4aa24e7f 100644
--- a/gl/m4/stat-time.m4
+++ b/gl/m4/stat-time.m4
@@ -1,9 +1,11 @@
 # stat-time.m4
 # serial 1
-dnl Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2025 Free Software
+dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Checks for stat-related time functions.
 
diff --git a/gl/m4/stat.m4 b/gl/m4/stat.m4
index fabd360c..66876305 100644
--- a/gl/m4/stat.m4
+++ b/gl/m4/stat.m4
@@ -1,9 +1,10 @@
 # stat.m4
 # serial 21
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_STAT],
 [
diff --git a/gl/m4/std-gnu11.m4 b/gl/m4/std-gnu11.m4
index 37324c15..762764e0 100644
--- a/gl/m4/std-gnu11.m4
+++ b/gl/m4/std-gnu11.m4
@@ -1,22 +1,27 @@
 # std-gnu11.m4
-# serial 1
+# serial 3
 
 # Prefer GNU C11 and C++11 to earlier versions.  -*- coding: utf-8 -*-
 
+# The std-gnu23 module, which defines _AC_C_C23_OPTIONS, supersedes us.
+m4_ifndef([_AC_C_C23_OPTIONS], [
+
 # This implementation is taken from GNU Autoconf lib/autoconf/c.m4
 # commit 017d5ddd82854911f0119691d91ea8a1438824d6
 # dated Sun Apr 3 13:57:17 2016 -0700
+# with minor changes to commentary.
 # This implementation will be obsolete once we can assume Autoconf 2.70
 # or later is installed everywhere a Gnulib program might be developed.
 
 m4_version_prereq([2.70], [], [
 
 
-# Copyright (C) 2001-2024 Free Software Foundation, Inc.
+# Copyright (C) 2001-2025 Free Software Foundation, Inc.
 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# This file is part of Autoconf.  This program is free
+# software; you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -24,8 +29,15 @@ m4_version_prereq([2.70], [], [
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
+# Under Section 7 of GPL version 3, you are granted additional
+# permissions described in the Autoconf Configure Script Exception,
+# version 3.0, as published by the Free Software Foundation.
+#
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+# and a copy of the Autoconf Configure Script Exception along with
+# this program; see the files COPYINGv3 and COPYING.EXCEPTION
+# respectively.  If not, see <https://www.gnu.org/licenses/> and
+# <https://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=blob_plain;f=COPYING.EXCEPTION>.
 
 # Written by David MacKenzie, with help from
 # Akim Demaille, Paul Eggert,
@@ -38,7 +50,7 @@ m4_version_prereq([2.70], [], [
 # COMPILER ... is a space separated list of C compilers to search for.
 # This just gives the user an opportunity to specify an alternative
 # search list for the C compiler.
-AC_DEFUN_ONCE([AC_PROG_CC],
+AC_DEFUN([AC_PROG_CC],
 [AC_LANG_PUSH(C)dnl
 AC_ARG_VAR([CC],     [C compiler command])dnl
 AC_ARG_VAR([CFLAGS], [C compiler flags])dnl
@@ -830,3 +842,4 @@ dnl with extended modes being tried first.
 
 
 ])# m4_version_prereq
+])# !_AC_C_C23_OPTIONS
diff --git a/gl/m4/stdalign.m4 b/gl/m4/stdalign.m4
index 2b4762f3..885feafd 100644
--- a/gl/m4/stdalign.m4
+++ b/gl/m4/stdalign.m4
@@ -1,9 +1,10 @@
 # stdalign.m4
-# serial 1
-dnl Copyright 2011-2024 Free Software Foundation, Inc.
+# serial 3
+dnl Copyright 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Check for alignas and alignof that conform to C23.
 
@@ -81,10 +82,10 @@ AC_DEFUN([gl_ALIGNASOF],
 
    References:
    ISO C23 (latest free draft
-   <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n3047.pdf>)
+   <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3096.pdf>)
    sections 6.5.3.4, 6.7.5, 7.15.
    C++11 (latest free draft
-   <http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>)
+   <https://www.open-std.org/jtc1/sc22/wg21/docs/papers/2011/n3242.pdf>)
    section 18.10. */
 
 /* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment
@@ -103,11 +104,13 @@ AC_DEFUN([gl_ALIGNASOF],
 
 /* GCC releases before GCC 4.9 had a bug in _Alignof.  See GCC bug 52023
    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52023>.
-   clang versions < 8.0.0 have the same bug.  */
+   clang versions < 8.0.0 have the same bug.
+   IBM XL C V16.1.0 cc (non-clang) has the same bug.  */
 #  if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
        || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
            && !defined __clang__) \
-       || (defined __clang__ && __clang_major__ < 8))
+       || (defined __clang__ && __clang_major__ < 8) \
+       || defined __xlC__)
 #   undef/**/_Alignof
 #   ifdef __cplusplus
 #    if (201103 <= __cplusplus || defined _MSC_VER)
@@ -178,7 +181,8 @@ AC_DEFUN([gl_ALIGNASOF],
 #  if ((defined _Alignas \
         && !(defined __cplusplus \
              && (201103 <= __cplusplus || defined _MSC_VER))) \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
+       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__ \
+           && !defined __xlC__))
 #   define alignas _Alignas
 #  endif
 # endif
diff --git a/gl/m4/stdckdint_h.m4 b/gl/m4/stdckdint_h.m4
new file mode 100644
index 00000000..d269faa5
--- /dev/null
+++ b/gl/m4/stdckdint_h.m4
@@ -0,0 +1,136 @@
+# stdckdint_h.m4
+# serial 1
+dnl Copyright 2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl Written by Collin Funk.
+
+AC_DEFUN_ONCE([gl_STDCKDINT_H],
+[
+  gl_CHECK_NEXT_HEADERS([stdckdint.h])
+  if test $ac_cv_header_stdckdint_h = yes; then
+    HAVE_STDCKDINT_H=1
+  else
+    HAVE_STDCKDINT_H=0
+  fi
+  AC_SUBST([HAVE_STDCKDINT_H])
+
+  if test $HAVE_STDCKDINT_H = 1; then
+    AC_CACHE_CHECK([whether stdckdint.h can be included in C],
+      [gl_cv_header_c_stdckdint_h],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <stdckdint.h>
+            ]])],
+         [gl_cv_header_c_stdckdint_h=yes],
+         [gl_cv_header_c_stdckdint_h=no])])
+    if test $gl_cv_header_c_stdckdint_h = yes; then
+      HAVE_C_STDCKDINT_H=1
+      AC_CACHE_CHECK([checking for an ISO C23 compliant stdckdint.h in C],
+        [gl_cv_header_c_stdckdint_h_works],
+        [AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM(
+              [[#include <stdckdint.h>
+              ]],
+              [[int r;
+                int a = 1;
+                int b = 1;
+                return !!(ckd_add (&r, a, b) || ckd_sub (&r, a, b)
+                          || ckd_mul (&r, a, b));
+              ]])],
+           [gl_cv_header_c_stdckdint_h_works=yes],
+           [gl_cv_header_c_stdckdint_h_works=no])])
+      if test $gl_cv_header_c_stdckdint_h_works = yes; then
+        HAVE_WORKING_C_STDCKDINT_H=1
+      else
+        HAVE_WORKING_C_STDCKDINT_H=0
+      fi
+    else
+      HAVE_C_STDCKDINT_H=0
+      HAVE_WORKING_C_STDCKDINT_H=0
+    fi
+    if test "$CXX" != no; then
+      AC_CACHE_CHECK([whether stdckdint.h can be included in C++],
+        [gl_cv_header_cxx_stdckdint_h],
+        [dnl We can't use AC_LANG_PUSH([C++]) and AC_LANG_POP([C++]) here, due to
+         dnl an autoconf bug <https://savannah.gnu.org/support/?110294>.
+         cat > conftest.cpp <<\EOF
+#include <stdckdint.h>
+EOF
+         gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp"
+         if AC_TRY_EVAL([gl_command]); then
+           gl_cv_header_cxx_stdckdint_h=yes
+         else
+           gl_cv_header_cxx_stdckdint_h=no
+         fi
+         rm -fr conftest*
+        ])
+      if test $gl_cv_header_cxx_stdckdint_h = yes; then
+        HAVE_CXX_STDCKDINT_H=1
+        AC_CACHE_CHECK([checking for an ISO C++26 compliant stdckdint.h in C++],
+          [gl_cv_header_cxx_stdckdint_h_works],
+          [dnl We can't use AC_LANG_PUSH([C++]) and AC_LANG_POP([C++]) here, due to
+           dnl an autoconf bug <https://savannah.gnu.org/support/?110294>.
+           cat > conftest.cpp <<\EOF
+#include <stdckdint.h>
+int
+main (void)
+{
+  int r;
+  int a = 1;
+  int b = 1;
+  return !!(ckd_add (&r, a, b) || ckd_sub (&r, a, b) || ckd_mul (&r, a, b));
+}
+EOF
+           gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp"
+           if AC_TRY_EVAL([gl_command]); then
+             gl_cv_header_cxx_stdckdint_h_works=yes
+           else
+             gl_cv_header_cxx_stdckdint_h_works=no
+           fi
+           rm -fr conftest*
+          ])
+        if test $gl_cv_header_cxx_stdckdint_h_works = yes; then
+          HAVE_WORKING_CXX_STDCKDINT_H=1
+        else
+          HAVE_WORKING_CXX_STDCKDINT_H=0
+        fi
+      else
+        HAVE_CXX_STDCKDINT_H=0
+        HAVE_WORKING_CXX_STDCKDINT_H=0
+      fi
+    fi
+  else
+    HAVE_C_STDCKDINT_H=0
+    HAVE_WORKING_C_STDCKDINT_H=0
+    HAVE_CXX_STDCKDINT_H=0
+    HAVE_WORKING_CXX_STDCKDINT_H=0
+  fi
+  AC_SUBST([HAVE_C_STDCKDINT_H])
+  AC_SUBST([HAVE_WORKING_C_STDCKDINT_H])
+  AC_SUBST([HAVE_CXX_STDCKDINT_H])
+  AC_SUBST([HAVE_WORKING_CXX_STDCKDINT_H])
+
+  if test "$CXX" != no; then
+    dnl We might need the header for C or C++.
+    if test $HAVE_C_STDCKDINT_H = 1 \
+       && test $HAVE_WORKING_C_STDCKDINT_H = 1 \
+       && test $HAVE_CXX_STDCKDINT_H = 1 \
+       && test $HAVE_WORKING_CXX_STDCKDINT_H = 1; then
+      GL_GENERATE_STDCKDINT_H=false
+    else
+      GL_GENERATE_STDCKDINT_H=true
+    fi
+  else
+    dnl We don't care about C++ here.
+    if test $HAVE_C_STDCKDINT_H = 1 \
+       && test $HAVE_WORKING_C_STDCKDINT_H = 1; then
+      GL_GENERATE_STDCKDINT_H=false
+    else
+      GL_GENERATE_STDCKDINT_H=true
+    fi
+  fi
+])
diff --git a/gl/m4/stddef_h.m4 b/gl/m4/stddef_h.m4
index 84d3bae8..127ec05b 100644
--- a/gl/m4/stddef_h.m4
+++ b/gl/m4/stddef_h.m4
@@ -1,16 +1,16 @@
 # stddef_h.m4
-# serial 14
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# serial 23
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl A placeholder for <stddef.h>, for platforms that have issues.
 
 AC_DEFUN_ONCE([gl_STDDEF_H],
 [
   AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
-  AC_REQUIRE([gt_TYPE_WCHAR_T])
 
   dnl Persuade OpenBSD <stddef.h> to declare max_align_t.
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
@@ -52,11 +52,6 @@ AC_DEFUN_ONCE([gl_STDDEF_H],
     GL_GENERATE_STDDEF_H=true
   fi
 
-  if test $gt_cv_c_wchar_t = no; then
-    HAVE_WCHAR_T=0
-    GL_GENERATE_STDDEF_H=true
-  fi
-
   AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions],
     [gl_cv_decl_null_works],
     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h>
@@ -69,21 +64,60 @@ AC_DEFUN_ONCE([gl_STDDEF_H],
     GL_GENERATE_STDDEF_H=true
   fi
 
-  AC_CACHE_CHECK([for unreachable],
-    [gl_cv_func_unreachable],
+  AC_CACHE_CHECK([for unreachable in C],
+    [gl_cv_c_func_unreachable],
     [AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <stddef.h>
           ]],
           [[unreachable ();
           ]])],
-       [gl_cv_func_unreachable=yes],
-       [gl_cv_func_unreachable=no])
+       [gl_cv_c_func_unreachable=yes],
+       [gl_cv_c_func_unreachable=no])
     ])
-  if test $gl_cv_func_unreachable = no; then
+  if test $gl_cv_c_func_unreachable = no; then
+    GL_GENERATE_STDDEF_H=true
+    HAVE_C_UNREACHABLE=0
+  else
+    HAVE_C_UNREACHABLE=1
+  fi
+  AC_SUBST([HAVE_C_UNREACHABLE])
+  dnl Provide gl_unreachable() unconditionally.
+  GL_GENERATE_STDDEF_H=true
+
+  dnl https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114869
+  AC_CACHE_CHECK([whether nullptr_t needs <stddef.h>],
+    [gl_cv_nullptr_t_needs_stddef],
+    [AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[nullptr_t x;]],
+       [gl_cv_nullptr_t_needs_stddef=no],
+       [gl_cv_nullptr_t_needs_stddef=yes])])
+  if test "$gl_cv_nullptr_t_needs_stddef" = no; then
+    NULLPTR_T_NEEDS_STDDEF=0
     GL_GENERATE_STDDEF_H=true
   fi
 
+  dnl https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870
+  dnl affects GCC 13.3 and 14.2.
+  AC_CACHE_CHECK([whether <stddef.h> is idempotent],
+    [gl_cv_stddef_idempotent],
+    [AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+       [[
+       #if \
+           ((__GNUC__ == 13 && __GNUC_MINOR__ <= 3) \
+            || (__GNUC__ == 14 && __GNUC_MINOR__ <= 2))
+        #error "bug 114870 is present"
+       #endif
+       ]])],
+       [gl_cv_stddef_idempotent="guessing yes"],
+       [gl_cv_stddef_idempotent="guessing no"])
+    ])
+  case "$gl_cv_stddef_idempotent" in
+    *yes) ;;
+    *) STDDEF_NOT_IDEMPOTENT=1
+       GL_GENERATE_STDDEF_H=true
+       ;;
+  esac
+
   if $GL_GENERATE_STDDEF_H; then
     gl_NEXT_HEADERS([stddef.h])
   fi
@@ -114,7 +148,8 @@ AC_DEFUN([gl_STDDEF_H_REQUIRE_DEFAULTS],
 AC_DEFUN([gl_STDDEF_H_DEFAULTS],
 [
   dnl Assume proper GNU behavior unless another module says otherwise.
+  NULLPTR_T_NEEDS_STDDEF=1;      AC_SUBST([NULLPTR_T_NEEDS_STDDEF])
+  STDDEF_NOT_IDEMPOTENT=0;       AC_SUBST([STDDEF_NOT_IDEMPOTENT])
   REPLACE_NULL=0;                AC_SUBST([REPLACE_NULL])
   HAVE_MAX_ALIGN_T=1;            AC_SUBST([HAVE_MAX_ALIGN_T])
-  HAVE_WCHAR_T=1;                AC_SUBST([HAVE_WCHAR_T])
 ])
diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4
index 2dea8469..2d69088b 100644
--- a/gl/m4/stdint.m4
+++ b/gl/m4/stdint.m4
@@ -1,9 +1,10 @@
 # stdint.m4
-# serial 63
-dnl Copyright (C) 2001-2024 Free Software Foundation, Inc.
+# serial 64
+dnl Copyright (C) 2001-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Paul Eggert and Bruno Haible.
 dnl Test whether <stdint.h> is supported or must be substituted.
@@ -157,7 +158,7 @@ uintmax_t j = UINTMAX_MAX;
         || defined __clang__)
 int k = _Generic (SIZE_MAX, size_t: 0);
 #elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \
-       || (0x5110 <= __SUNPRO_C && !__STDC__))
+       || (0x5110 <= __SUNPRO_C && !__STDC__) || 1939 <= _MSC_VER)
 extern size_t k;
 extern __typeof__ (SIZE_MAX) k;
 #endif
diff --git a/gl/m4/stdint_h.m4 b/gl/m4/stdint_h.m4
index 29f42160..d4f1acdd 100644
--- a/gl/m4/stdint_h.m4
+++ b/gl/m4/stdint_h.m4
@@ -1,9 +1,10 @@
 # stdint_h.m4
 # serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 1997-2004, 2006, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Paul Eggert.
 
diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4
index 8eb5816a..71d86180 100644
--- a/gl/m4/stdio_h.m4
+++ b/gl/m4/stdio_h.m4
@@ -1,9 +1,10 @@
 # stdio_h.m4
-# serial 63
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 75
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_STDIO_H_EARLY],
 [
@@ -133,6 +134,7 @@ AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS],
 [
   m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDIO_H_MODULE_INDICATOR_DEFAULTS], [
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCLOSE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FDOPEN])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFLUSH])
@@ -153,12 +155,14 @@ AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FTELLO])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FWRITE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETC])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETCHAR])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETDELIM])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLINE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_PRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OBSTACK_ZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PCLOSE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PERROR])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_POPEN])
@@ -172,20 +176,29 @@ AC_DEFUN([gl_STDIO_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RENAMEAT])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SCANF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SNZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SPRINTF_POSIX])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_NONBLOCKING])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TMPFILE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VASZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFSCANF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSCANF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VDZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFPRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VFZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VPRINTF_POSIX])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSNZPRINTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSPRINTF_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VSZPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_VZPRINTF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ZPRINTF])
     dnl Support Microsoft deprecated alias function names by default.
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FCLOSEALL], [1])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_FDOPEN], [1])
diff --git a/gl/m4/stdlib_h.m4 b/gl/m4/stdlib_h.m4
index a4662f29..2d25da37 100644
--- a/gl/m4/stdlib_h.m4
+++ b/gl/m4/stdlib_h.m4
@@ -1,9 +1,10 @@
 # stdlib_h.m4
-# serial 77
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 84
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_STDLIB_H],
 [
@@ -37,44 +38,51 @@ AC_DEFUN_ONCE([gl_STDLIB_H],
   dnl On Solaris 10, in UTF-8 locales, its value is 3 but needs to be 4.
   dnl Fortunately, we can do this because on this platform MB_LEN_MAX is 5.
   AC_REQUIRE([AC_CANONICAL_HOST])
-  AC_REQUIRE([gt_LOCALE_FR_UTF8])
+  AC_REQUIRE([gt_LOCALE_EN_UTF8])
   AC_CACHE_CHECK([whether MB_CUR_MAX is correct],
     [gl_cv_macro_MB_CUR_MAX_good],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                  # Guess no on Solaris.
-        solaris*) gl_cv_macro_MB_CUR_MAX_good="guessing no" ;;
-                  # Guess yes otherwise.
-        *)        gl_cv_macro_MB_CUR_MAX_good="guessing yes" ;;
-      esac
-changequote([,])dnl
-      if test $LOCALE_FR_UTF8 != none; then
-        AC_RUN_IFELSE(
-          [AC_LANG_SOURCE([[
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM([[#include <stdlib.h>
+                        ]],
+                        [[return !!MB_CUR_MAX;]])
+       ],
+       [dnl Initial guess, used when cross-compiling or when no suitable locale
+        dnl is present.
+        # Guess no on Solaris and Haiku, yes otherwise.
+        AS_CASE([$host_os],
+          [solaris* | haiku*],
+            [gl_cv_macro_MB_CUR_MAX_good="guessing no"],
+            [gl_cv_macro_MB_CUR_MAX_good="guessing yes"])
+        if test "$LOCALE_EN_UTF8" != none; then
+          AC_RUN_IFELSE(
+            [AC_LANG_SOURCE([[
 #include <locale.h>
 #include <stdlib.h>
 int main ()
 {
   int result = 0;
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
       if (MB_CUR_MAX < 4)
         result |= 1;
     }
   return result;
 }]])],
-          [gl_cv_macro_MB_CUR_MAX_good=yes],
-          [gl_cv_macro_MB_CUR_MAX_good=no],
-          [:])
-      fi
+            [gl_cv_macro_MB_CUR_MAX_good=yes],
+            [gl_cv_macro_MB_CUR_MAX_good=no],
+            [:])
+        fi
+       ],
+       [gl_cv_macro_MB_CUR_MAX_good="link failed - so no"])
     ])
-  case "$gl_cv_macro_MB_CUR_MAX_good" in
-    *yes) ;;
-    *) REPLACE_MB_CUR_MAX=1 ;;
-  esac
+  AS_CASE([$gl_cv_macro_MB_CUR_MAX_good],
+    [*yes],
+      [],
+    ["link failed - so no"],
+      [# 4 suffices as a workaround in Android NDK 16,
+       # the only known platform with the bug.
+       REPLACE_MB_CUR_MAX=4],
+      [REPLACE_MB_CUR_MAX="(-1)"])
 
   AC_CHECK_DECLS_ONCE([ecvt])
   if test $ac_cv_have_decl_ecvt = no; then
@@ -110,6 +118,7 @@ AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS],
 [
   m4_defun(GL_MODULE_INDICATOR_PREFIX[_STDLIB_H_MODULE_INDICATOR_DEFAULTS], [
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB__EXIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ABORT_DEBUG])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ALIGNED_ALLOC])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ATOLL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CALLOC_GNU])
@@ -139,12 +148,12 @@ AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_GNU])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOC_POSIX])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALPATH])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RPMATCH])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STACK_TRACE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL])
@@ -218,6 +227,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
   HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
   REPLACE__EXIT=0;           AC_SUBST([REPLACE__EXIT])
+  REPLACE_ABORT=0;           AC_SUBST([REPLACE_ABORT])
   REPLACE_ALIGNED_ALLOC=0;   AC_SUBST([REPLACE_ALIGNED_ALLOC])
   REPLACE_CALLOC_FOR_CALLOC_GNU=0;    AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_GNU])
   REPLACE_CALLOC_FOR_CALLOC_POSIX=0;  AC_SUBST([REPLACE_CALLOC_FOR_CALLOC_POSIX])
@@ -244,7 +254,6 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   REPLACE_RAND=0;            AC_SUBST([REPLACE_RAND])
   REPLACE_RANDOM=0;          AC_SUBST([REPLACE_RANDOM])
   REPLACE_RANDOM_R=0;        AC_SUBST([REPLACE_RANDOM_R])
-  REPLACE_REALLOC_FOR_REALLOC_GNU=0;    AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_GNU])
   REPLACE_REALLOC_FOR_REALLOC_POSIX=0;  AC_SUBST([REPLACE_REALLOC_FOR_REALLOC_POSIX])
   REPLACE_REALLOCARRAY=0;    AC_SUBST([REPLACE_REALLOCARRAY])
   REPLACE_REALPATH=0;        AC_SUBST([REPLACE_REALPATH])
@@ -259,4 +268,5 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   REPLACE_STRTOULL=0;        AC_SUBST([REPLACE_STRTOULL])
   REPLACE_UNSETENV=0;        AC_SUBST([REPLACE_UNSETENV])
   REPLACE_WCTOMB=0;          AC_SUBST([REPLACE_WCTOMB])
+  CAN_PRINT_STACK_TRACE=0;   AC_SUBST([CAN_PRINT_STACK_TRACE])
 ])
diff --git a/gl/m4/strcasecmp.m4 b/gl/m4/strcasecmp.m4
new file mode 100644
index 00000000..eb4345d9
--- /dev/null
+++ b/gl/m4/strcasecmp.m4
@@ -0,0 +1,67 @@
+# strcasecmp.m4
+# serial 3
+dnl Copyright (C) 2002-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN([gl_FUNC_STRCASECMP],
+[
+  AC_REQUIRE([gl_STRINGS_H_DEFAULTS])
+  AC_CHECK_FUNCS([strcasecmp])
+  if test $ac_cv_func_strcasecmp = yes; then
+    gl_STRCASECMP_WORKS
+    case "$gl_cv_func_strcasecmp_works" in
+      *yes) ;;
+      *) REPLACE_STRCASECMP=1 ;;
+    esac
+  else
+    HAVE_STRCASECMP=0
+  fi
+])
+
+AC_DEFUN([gl_STRCASECMP_WORKS],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([whether strcasecmp works],
+    [gl_cv_func_strcasecmp_works],
+    [dnl Prepare a guess, used when cross-compiling or when specific locales
+     dnl are not available.
+     case "$host_os" in
+       solaris* | cygwin*)
+         gl_cv_func_strcasecmp_works="guessing no" ;;
+       *)
+         gl_cv_func_strcasecmp_works="guessing yes" ;;
+     esac
+     AC_RUN_IFELSE(
+       [AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <ctype.h>
+#include <locale.h>
+#include <strings.h>
+int main ()
+{
+  if (setlocale (LC_ALL, "fr_FR.ISO-8859-1") != NULL
+      || setlocale (LC_ALL, "fr_FR.ISO8859-1") != NULL)
+    {
+      int c1 = (unsigned char) '\311';
+      int c2 = (unsigned char) '\351';
+      if (tolower (c1) == c2 && toupper (c2) == c1)
+        return strcasecmp ("Fej\311r", "Fej\351r") != 0;
+    }
+  return 2;
+}]])],
+       [gl_cv_func_strcasecmp_works=yes],
+       [if test $? = 1; then
+          gl_cv_func_strcasecmp_works=no
+        fi
+       ],
+       [:])
+    ])
+])
+
+# Prerequisites of lib/strcasecmp.c.
+AC_DEFUN([gl_PREREQ_STRCASECMP], [
+  :
+])
diff --git a/gl/m4/strcasestr.m4 b/gl/m4/strcasestr.m4
index d2548716..eb2862f1 100644
--- a/gl/m4/strcasestr.m4
+++ b/gl/m4/strcasestr.m4
@@ -1,9 +1,10 @@
 # strcasestr.m4
-# serial 28
-dnl Copyright (C) 2005, 2007-2024 Free Software Foundation, Inc.
+# serial 29
+dnl Copyright (C) 2005, 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Check that strcasestr is present and works.
 AC_DEFUN([gl_FUNC_STRCASESTR_SIMPLE],
@@ -98,7 +99,7 @@ static void quit (int sig) { _exit (sig + 128); }
     char *haystack = (char *) malloc (2 * m + 2);
     char *needle = (char *) malloc (m + 2);
     /* Failure to compile this test due to missing alarm is okay,
-       since all such platforms (mingw) also lack strcasestr.  */
+       since all such platforms (mingw, MSVC) also lack strcasestr.  */
     signal (SIGALRM, quit);
     alarm (5);
     /* Check for quadratic performance.  */
diff --git a/gl/m4/strerror.m4 b/gl/m4/strerror.m4
index 0272c6f4..c8b3b207 100644
--- a/gl/m4/strerror.m4
+++ b/gl/m4/strerror.m4
@@ -1,9 +1,10 @@
 # strerror.m4
 # serial 25
-dnl Copyright (C) 2002, 2007-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2002, 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_STRERROR],
 [
diff --git a/gl/m4/string_h.m4 b/gl/m4/string_h.m4
index f31264ae..fc73603a 100644
--- a/gl/m4/string_h.m4
+++ b/gl/m4/string_h.m4
@@ -1,9 +1,10 @@
 # string_h.m4
-# serial 39
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 44.1
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Configure a GNU-like replacement for <string.h>.
 
@@ -23,8 +24,9 @@ AC_DEFUN_ONCE([gl_STRING_H],
     ]],
     [explicit_bzero ffsl ffsll memmem mempcpy memrchr memset_explicit
      rawmemchr stpcpy stpncpy strchrnul
-     strdup strncat strndup strnlen strpbrk strsep strcasestr strtok_r
-     strerror_r strerrorname_np sigabbrev_np sigdescr_np strsignal strverscmp])
+     strdup strncat strncpy strndup strnlen strpbrk strsep strcasestr strtok_r
+     strerror_l strerror_r strerrorname_np
+     sigabbrev_np sigdescr_np strsignal strverscmp])
 
   AC_REQUIRE([AC_C_RESTRICT])
 ])
@@ -62,6 +64,7 @@ AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCHRNUL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRDUP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCAT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCPY])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNDUP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNLEN])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPBRK])
@@ -69,6 +72,8 @@ AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRSTR])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASESTR])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOK_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STR_STARTSWITH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STR_ENDSWITH])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSLEN])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNLEN])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSCHR])
@@ -83,8 +88,11 @@ AC_DEFUN([gl_STRING_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSPN])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSSEP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOK_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBS_STARTSWITH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBS_ENDSWITH])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERROR_L])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRERRORNAME_NP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGABBREV_NP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGDESCR_NP])
@@ -123,6 +131,7 @@ AC_DEFUN([gl_STRING_H_DEFAULTS],
   HAVE_STRCASESTR=1;            AC_SUBST([HAVE_STRCASESTR])
   HAVE_DECL_STRTOK_R=1;         AC_SUBST([HAVE_DECL_STRTOK_R])
   HAVE_DECL_STRERROR_R=1;       AC_SUBST([HAVE_DECL_STRERROR_R])
+  HAVE_STRERROR_L=1;            AC_SUBST([HAVE_STRERROR_L])
   HAVE_STRERRORNAME_NP=1;       AC_SUBST([HAVE_STRERRORNAME_NP])
   HAVE_SIGABBREV_NP=1;          AC_SUBST([HAVE_SIGABBREV_NP])
   HAVE_SIGDESCR_NP=1;           AC_SUBST([HAVE_SIGDESCR_NP])
@@ -138,6 +147,7 @@ AC_DEFUN([gl_STRING_H_DEFAULTS],
   REPLACE_STRCHRNUL=0;          AC_SUBST([REPLACE_STRCHRNUL])
   REPLACE_STRDUP=0;             AC_SUBST([REPLACE_STRDUP])
   REPLACE_STRNCAT=0;            AC_SUBST([REPLACE_STRNCAT])
+  REPLACE_STRNCPY=0;            AC_SUBST([REPLACE_STRNCPY])
   REPLACE_STRNDUP=0;            AC_SUBST([REPLACE_STRNDUP])
   REPLACE_STRNLEN=0;            AC_SUBST([REPLACE_STRNLEN])
   REPLACE_STRSTR=0;             AC_SUBST([REPLACE_STRSTR])
@@ -145,6 +155,7 @@ AC_DEFUN([gl_STRING_H_DEFAULTS],
   REPLACE_STRTOK_R=0;           AC_SUBST([REPLACE_STRTOK_R])
   REPLACE_STRERROR=0;           AC_SUBST([REPLACE_STRERROR])
   REPLACE_STRERROR_R=0;         AC_SUBST([REPLACE_STRERROR_R])
+  REPLACE_STRERROR_L=0;         AC_SUBST([REPLACE_STRERROR_L])
   REPLACE_STRERRORNAME_NP=0;    AC_SUBST([REPLACE_STRERRORNAME_NP])
   REPLACE_STRSIGNAL=0;          AC_SUBST([REPLACE_STRSIGNAL])
   REPLACE_STRVERSCMP=0;         AC_SUBST([REPLACE_STRVERSCMP])
diff --git a/gl/m4/strings_h.m4 b/gl/m4/strings_h.m4
index aaafb559..18f30d4a 100644
--- a/gl/m4/strings_h.m4
+++ b/gl/m4/strings_h.m4
@@ -1,9 +1,10 @@
 # strings_h.m4
-# serial 9
-dnl Copyright (C) 2007, 2009-2024 Free Software Foundation, Inc.
+# serial 14
+dnl Copyright (C) 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Configure a replacement for <strings.h>.
 
@@ -28,7 +29,7 @@ AC_DEFUN_ONCE([gl_STRINGS_H],
        <strings.h>.  */
     #include <sys/types.h>
     #include <strings.h>
-    ]], [ffs strcasecmp strncasecmp])
+    ]], [ffs strcasecmp strcasecmp_l strncasecmp strncasecmp_l])
 ])
 
 # gl_STRINGS_MODULE_INDICATOR([modulename])
@@ -49,6 +50,10 @@ AC_DEFUN([gl_STRINGS_H_REQUIRE_DEFAULTS],
 [
   m4_defun(GL_MODULE_INDICATOR_PREFIX[_STRINGS_H_MODULE_INDICATOR_DEFAULTS], [
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FFS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASECMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRCASECMP_L])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCASECMP])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRNCASECMP_L])
   ])
   m4_require(GL_MODULE_INDICATOR_PREFIX[_STRINGS_H_MODULE_INDICATOR_DEFAULTS])
   AC_REQUIRE([gl_STRINGS_H_DEFAULTS])
@@ -59,5 +64,12 @@ AC_DEFUN([gl_STRINGS_H_DEFAULTS],
   dnl Assume proper GNU behavior unless another module says otherwise.
   HAVE_FFS=1;              AC_SUBST([HAVE_FFS])
   HAVE_STRCASECMP=1;       AC_SUBST([HAVE_STRCASECMP])
+  HAVE_STRCASECMP_L=1;     AC_SUBST([HAVE_STRCASECMP_L])
+  HAVE_STRNCASECMP=1;      AC_SUBST([HAVE_STRNCASECMP])
+  HAVE_STRNCASECMP_L=1;    AC_SUBST([HAVE_STRNCASECMP_L])
   HAVE_DECL_STRNCASECMP=1; AC_SUBST([HAVE_DECL_STRNCASECMP])
+  REPLACE_STRCASECMP=0;    AC_SUBST([REPLACE_STRCASECMP])
+  REPLACE_STRCASECMP_L=0;  AC_SUBST([REPLACE_STRCASECMP_L])
+  REPLACE_STRNCASECMP=0;   AC_SUBST([REPLACE_STRNCASECMP])
+  REPLACE_STRNCASECMP_L=0; AC_SUBST([REPLACE_STRNCASECMP_L])
 ])
diff --git a/gl/m4/strcase.m4 b/gl/m4/strncasecmp.m4
index 63021733..c7c8b240 100644
--- a/gl/m4/strcase.m4
+++ b/gl/m4/strncasecmp.m4
@@ -1,31 +1,22 @@
-# strcase.m4
-# serial 12
-dnl Copyright (C) 2002, 2005-2024 Free Software Foundation, Inc.
+# strncasecmp.m4
+# serial 2
+dnl Copyright (C) 2002-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
-
-AC_DEFUN([gl_STRCASE],
-[
-  gl_FUNC_STRCASECMP
-  gl_FUNC_STRNCASECMP
-])
-
-AC_DEFUN([gl_FUNC_STRCASECMP],
-[
-  AC_REQUIRE([gl_STRINGS_H_DEFAULTS])
-  AC_CHECK_FUNCS([strcasecmp])
-  if test $ac_cv_func_strcasecmp = no; then
-    HAVE_STRCASECMP=0
-  fi
-])
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_STRNCASECMP],
 [
   AC_REQUIRE([gl_STRINGS_H_DEFAULTS])
   AC_CHECK_FUNCS([strncasecmp])
   if test $ac_cv_func_strncasecmp = yes; then
-    HAVE_STRNCASECMP=1
+    dnl Assume that strncasecmp and strcasecmp share the same bugs.
+    gl_STRCASECMP_WORKS
+    case "$gl_cv_func_strcasecmp_works" in
+      *yes) ;;
+      *) REPLACE_STRNCASECMP=1 ;;
+    esac
   else
     HAVE_STRNCASECMP=0
   fi
@@ -35,11 +26,6 @@ AC_DEFUN([gl_FUNC_STRNCASECMP],
   fi
 ])
 
-# Prerequisites of lib/strcasecmp.c.
-AC_DEFUN([gl_PREREQ_STRCASECMP], [
-  :
-])
-
 # Prerequisites of lib/strncasecmp.c.
 AC_DEFUN([gl_PREREQ_STRNCASECMP], [
   :
diff --git a/gl/m4/strncpy.m4 b/gl/m4/strncpy.m4
new file mode 100644
index 00000000..57876171
--- /dev/null
+++ b/gl/m4/strncpy.m4
@@ -0,0 +1,94 @@
+# strncpy.m4
+# serial 1
+dnl Copyright (C) 2002-2004, 2009-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN_ONCE([gl_FUNC_STRNCPY],
+[
+  AC_REQUIRE([gl_STRING_H_DEFAULTS])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Check for prerequisites for memory fence checks.
+  gl_FUNC_MMAP_ANON
+  AC_CHECK_HEADERS_ONCE([sys/mman.h])
+  AC_CHECK_FUNCS_ONCE([mprotect])
+
+  dnl Detect bug in FreeBSD 15.0 on x86_64:
+  dnl strncpy should not dereference more than n bytes, but always dereferences
+  dnl n+1 bytes if the first n bytes don't contain a NUL byte.
+  dnl Assume that strncpy works on platforms that lack mprotect.
+  AC_CACHE_CHECK([whether strncpy works], [gl_cv_func_strncpy_works],
+    [AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+#include <string.h>
+#if HAVE_SYS_MMAN_H
+# include <fcntl.h>
+# include <unistd.h>
+# include <sys/types.h>
+# include <sys/mman.h>
+#endif
+]GL_MDA_DEFINES],
+[[
+  char *fence = NULL;
+#if HAVE_SYS_MMAN_H && HAVE_MPROTECT
+  {
+    long int pagesize = sysconf (_SC_PAGESIZE);
+    char *two_pages =
+      (char *) mmap (NULL, 2 * pagesize, PROT_READ | PROT_WRITE,
+                     MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
+    if (two_pages != (char *)(-1)
+        && mprotect (two_pages + pagesize, pagesize, PROT_NONE) == 0)
+      fence = two_pages + pagesize;
+  }
+#endif
+  if (fence)
+    {
+      char dest[8];
+
+      dest[0] = 'a';
+      dest[1] = 'b';
+      dest[2] = 'c';
+      dest[3] = 'd';
+      dest[4] = 'e';
+      dest[5] = 'f';
+      dest[6] = 'g';
+
+      *(fence - 3) = '7';
+      *(fence - 2) = '2';
+      *(fence - 1) = '9';
+
+      if (strncpy (dest + 1, fence - 3, 3) != dest + 1)
+        return 1;
+      if (dest[0] != 'a')
+        return 2;
+      if (dest[1] != '7' || dest[2] != '2' || dest[3] != '9')
+        return 3;
+      if (dest[4] != 'e')
+        return 4;
+    }
+  return 0;
+]])], [gl_cv_func_strncpy_works=yes], [gl_cv_func_strncpy_works=no],
+       [
+        case "$host_os" in
+                                 # Guess no on FreeBSD.
+          freebsd* | dragonfly*) gl_cv_func_strncpy_works="guessing no" ;;
+                                 # Guess yes on native Windows.
+          mingw* | windows*)     gl_cv_func_strncpy_works="guessing yes" ;;
+                                 # Guess yes otherwise.
+          *)                     gl_cv_func_strncpy_works="guessing yes" ;;
+        esac
+       ])
+    ])
+  case "$gl_cv_func_strncpy_works" in
+    *yes) ;;
+    *) REPLACE_STRNCPY=1 ;;
+  esac
+])
+
+# Prerequisites of lib/strncpy.c.
+AC_DEFUN([gl_PREREQ_STRNCPY], [
+  :
+])
diff --git a/gl/m4/strsep.m4 b/gl/m4/strsep.m4
index cfde87a5..b018ff88 100644
--- a/gl/m4/strsep.m4
+++ b/gl/m4/strsep.m4
@@ -1,9 +1,10 @@
 # strsep.m4
 # serial 11
-dnl Copyright (C) 2002-2004, 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_STRSEP],
 [
diff --git a/gl/m4/strstr.m4 b/gl/m4/strstr.m4
index 957ed2e3..1b5ef6c1 100644
--- a/gl/m4/strstr.m4
+++ b/gl/m4/strstr.m4
@@ -1,9 +1,10 @@
 # strstr.m4
-# serial 24
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+# serial 25
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Check that strstr works.
 AC_DEFUN([gl_FUNC_STRSTR_SIMPLE],
@@ -95,7 +96,7 @@ static void quit (int sig) { _exit (sig + 128); }
     char *haystack = (char *) malloc (2 * m + 2);
     char *needle = (char *) malloc (m + 2);
     /* Failure to compile this test due to missing alarm is okay,
-       since all such platforms (mingw) also have quadratic strstr.  */
+       since all such platforms (mingw, MSVC) also have quadratic strstr.  */
     signal (SIGALRM, quit);
     alarm (5);
     /* Check for quadratic performance.  */
diff --git a/gl/m4/sys_cdefs_h.m4 b/gl/m4/sys_cdefs_h.m4
new file mode 100644
index 00000000..d72796ca
--- /dev/null
+++ b/gl/m4/sys_cdefs_h.m4
@@ -0,0 +1,26 @@
+# sys_cdefs_h.m4 - Is <sys/cdefs.h> compatible enough with glibc?
+# serial 2
+dnl Copyright 2024-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl Written by Paul Eggert.
+
+AC_DEFUN_ONCE([gl_CHECK_HEADER_SYS_CDEFS_H],
+  [AC_CACHE_CHECK([for glibc-compatible sys/cdefs.h],
+     [gl_cv_header_sys_cdefs_h],
+     [AC_COMPILE_IFELSE(
+        [AC_LANG_DEFINES_PROVIDED
+         [#include <sys/cdefs.h>
+          enum { foo = __GNUC_PREREQ (14, 1) } bar;
+        ]],
+        [gl_cv_header_sys_cdefs_h=yes],
+        [gl_cv_header_sys_cdefs_h=no])])
+   if test "$gl_cv_header_sys_cdefs_h" = yes; then
+     HAVE_SYS_CDEFS_H=1
+   else
+     HAVE_SYS_CDEFS_H=0
+   fi
+   AC_SUBST([HAVE_SYS_CDEFS_H])])
diff --git a/gl/m4/sys_socket_h.m4 b/gl/m4/sys_socket_h.m4
index 3bf3cb47..fb69209b 100644
--- a/gl/m4/sys_socket_h.m4
+++ b/gl/m4/sys_socket_h.m4
@@ -1,9 +1,10 @@
 # sys_socket_h.m4
-# serial 29
-dnl Copyright (C) 2005-2024 Free Software Foundation, Inc.
+# serial 31
+dnl Copyright (C) 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Simon Josefsson.
 
@@ -52,24 +53,10 @@ AC_DEFUN_ONCE([gl_SYS_SOCKET_H],
   fi
   # We need to check for ws2tcpip.h now.
   gl_PREREQ_SYS_H_SOCKET
-  AC_CHECK_TYPES([struct sockaddr_storage, sa_family_t],,,[
-  /* sys/types.h is not needed according to POSIX, but the
-     sys/socket.h in i386-unknown-freebsd4.10 and
-     powerpc-apple-darwin5.5 required it. */
-#include <sys/types.h>
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
-])
+  gl_PREREQ_SYS_SA_FAMILY
   if test $ac_cv_type_struct_sockaddr_storage = no; then
     HAVE_STRUCT_SOCKADDR_STORAGE=0
   fi
-  if test $ac_cv_type_sa_family_t = no; then
-    HAVE_SA_FAMILY_T=0
-  fi
   if test $ac_cv_type_struct_sockaddr_storage != no; then
     AC_CHECK_MEMBERS([struct sockaddr_storage.ss_family],
       [],
@@ -158,6 +145,32 @@ AC_DEFUN([gl_PREREQ_SYS_H_WS2TCPIP],
   AC_SUBST([HAVE_WS2TCPIP_H])
 ])
 
+# Common prerequisites of the <sys/socket.h> replacement and of the <sys/un.h>
+# replacement.
+# Sets and substitutes HAVE_SA_FAMILY_T.
+AC_DEFUN([gl_PREREQ_SYS_SA_FAMILY],
+[
+  AC_REQUIRE([gl_CHECK_SOCKET_HEADERS])
+  AC_CHECK_TYPES([struct sockaddr_storage, sa_family_t],,,[
+  /* sys/types.h is not needed according to POSIX, but the
+     sys/socket.h in i386-unknown-freebsd4.10 and
+     powerpc-apple-darwin5.5 required it. */
+#include <sys/types.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
+#endif
+])
+  if test $ac_cv_type_sa_family_t = yes; then
+    HAVE_SA_FAMILY_T=1
+  else
+    HAVE_SA_FAMILY_T=0
+  fi
+  AC_SUBST([HAVE_SA_FAMILY_T])
+])
+
 # gl_SYS_SOCKET_MODULE_INDICATOR([modulename])
 # sets the shell variable that indicates the presence of the given module
 # to a C preprocessor expression that will evaluate to 1.
@@ -202,6 +215,5 @@ AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS],
   HAVE_STRUCT_SOCKADDR_STORAGE=1; AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE])
   HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY=1;
                         AC_SUBST([HAVE_STRUCT_SOCKADDR_STORAGE_SS_FAMILY])
-  HAVE_SA_FAMILY_T=1;   AC_SUBST([HAVE_SA_FAMILY_T])
   HAVE_ACCEPT4=1;       AC_SUBST([HAVE_ACCEPT4])
 ])
diff --git a/gl/m4/sys_stat_h.m4 b/gl/m4/sys_stat_h.m4
index 3cc50ce6..fdcc8954 100644
--- a/gl/m4/sys_stat_h.m4
+++ b/gl/m4/sys_stat_h.m4
@@ -1,9 +1,10 @@
 # sys_stat_h.m4
 # serial 42   -*- Autoconf -*-
-dnl Copyright (C) 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Eric Blake.
 dnl Provide a GNU-like <sys/stat.h>.
diff --git a/gl/m4/sys_types_h.m4 b/gl/m4/sys_types_h.m4
index 00d2437b..e99fdcc6 100644
--- a/gl/m4/sys_types_h.m4
+++ b/gl/m4/sys_types_h.m4
@@ -1,9 +1,10 @@
 # sys_types_h.m4
-# serial 13
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+# serial 15
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_SYS_TYPES_H],
 [
@@ -23,6 +24,9 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H],
   dnl Whether to override the 'off_t' type.
   AC_REQUIRE([gl_TYPE_OFF_T])
 
+  dnl Whether to define the 'off64_t' type.
+  AC_REQUIRE([gl_TYPE_OFF64_T])
+
   dnl Whether to override the 'dev_t' and 'ino_t' types.
   m4_ifdef([gl_WINDOWS_STAT_INODES], [
     AC_REQUIRE([gl_WINDOWS_STAT_INODES])
@@ -30,6 +34,14 @@ AC_DEFUN_ONCE([gl_SYS_TYPES_H],
     WINDOWS_STAT_INODES=0
   ])
   AC_SUBST([WINDOWS_STAT_INODES])
+
+  dnl Test whether the 'blksize_t' type is defined.
+  AC_CHECK_TYPE([blksize_t], [HAVE_BLKSIZE_T=1], [HAVE_BLKSIZE_T=0])
+  AC_SUBST([HAVE_BLKSIZE_T])
+
+  dnl Test whether the 'blkcnt_t' type is defined.
+  AC_CHECK_TYPE([blkcnt_t], [HAVE_BLKCNT_T=1], [HAVE_BLKCNT_T=0])
+  AC_SUBST([HAVE_BLKCNT_T])
 ])
 
 # Initializes the default values for AC_SUBSTed shell variables.
diff --git a/gl/m4/sys_uio_h.m4 b/gl/m4/sys_uio_h.m4
index a471c720..eb0e8424 100644
--- a/gl/m4/sys_uio_h.m4
+++ b/gl/m4/sys_uio_h.m4
@@ -1,9 +1,10 @@
 # sys_uio_h.m4
 # serial 3
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_SYS_UIO_H],
 [
diff --git a/gl/m4/threadlib.m4 b/gl/m4/threadlib.m4
index f5e81479..333c8fe0 100644
--- a/gl/m4/threadlib.m4
+++ b/gl/m4/threadlib.m4
@@ -1,9 +1,10 @@
 # threadlib.m4
-# serial 42
-dnl Copyright (C) 2005-2024 Free Software Foundation, Inc.
+# serial 45.1
+dnl Copyright (C) 2005-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 
@@ -56,24 +57,22 @@ AC_DEFUN([gl_ANYTHREADLIB_EARLY],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   if test -z "$gl_anythreadlib_early_done"; then
-    case "$host_os" in
-      osf*)
-        # On OSF/1, the compiler needs the flag -D_REENTRANT so that it
+    AS_CASE([$host_os],
+      [osf*],
+       [# On OSF/1, the compiler needs the flag -D_REENTRANT so that it
         # groks <pthread.h>. cc also understands the flag -pthread, but
-        # we don't use it because 1. gcc-2.95 doesn't understand -pthread,
+        # we do not use it because 1. gcc-2.95 does not understand -pthread,
         # 2. putting a flag into CPPFLAGS that has an effect on the linker
         # causes the AC_LINK_IFELSE test below to succeed unexpectedly,
         # leading to wrong values of LIBTHREAD and LTLIBTHREAD.
         CPPFLAGS="$CPPFLAGS -D_REENTRANT"
-        ;;
-    esac
+       ])
     # Some systems optimize for single-threaded programs by default, and
     # need special flags to disable these optimizations. For example, the
-    # definition of 'errno' in <errno.h>.
-    case "$host_os" in
-      aix* | freebsd*) CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE" ;;
-      solaris*) CPPFLAGS="$CPPFLAGS -D_REENTRANT" ;;
-    esac
+    # definition of errno in <errno.h>.
+    AS_CASE([$host_os],
+      [aix* | freebsd*], [CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"],
+      [hpux* | solaris*], [CPPFLAGS="$CPPFLAGS -D_REENTRANT"])
     gl_anythreadlib_early_done=done
   fi
 ])
@@ -85,24 +84,26 @@ AC_DEFUN([gl_WEAK_SYMBOLS],
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CACHE_CHECK([whether imported symbols can be declared weak],
     [gl_cv_have_weak],
-    [case "$host_os" in
-       cygwin* | mingw* | windows*)
+    [AS_CASE([$host_os],
+       [cygwin* | mingw* | windows*],
+        [
          dnl On Cygwin 3.2.0 with gcc 10.2, and likewise on mingw 10.0.0 with
          dnl gcc 11.3, the test below would succeed, but programs that use
          dnl pthread_in_use() with weak symbol references crash miserably at
          dnl runtime.
          gl_cv_have_weak="guessing no"
-         ;;
-       *)
+        ],
+        [
          gl_cv_have_weak=no
          dnl First, test whether the compiler accepts it syntactically.
          AC_LINK_IFELSE(
            [AC_LANG_PROGRAM(
               [[extern void xyzzy ();
-#pragma weak xyzzy]],
+#pragma weak xyzzy
+              ]],
               [[xyzzy();]])],
            [gl_cv_have_weak=maybe])
-         if test $gl_cv_have_weak = maybe; then
+         AS_IF([test $gl_cv_have_weak = maybe], [
            dnl Second, test whether it actually works. On Cygwin 1.7.2, with
            dnl gcc 4.3, symbols declared weak always evaluate to the address 0.
            AC_RUN_IFELSE(
@@ -125,20 +126,19 @@ int main ()
                 [gl_cv_have_weak="guessing yes"],
                 [gl_cv_have_weak="guessing no"])
              ])
-         fi
-         ;;
-     esac
-     dnl But when linking statically, weak symbols don't work.
-     case " $LDFLAGS " in
-       *" -static "*) gl_cv_have_weak=no ;;
-     esac
+         ])
+        ])
+     dnl But when linking statically, weak symbols do not work.
+     AS_CASE([" $LDFLAGS "],
+       [*" -static "*], [gl_cv_have_weak=no])
      dnl Test for a bug in FreeBSD 11: A link error occurs when using a weak
      dnl symbol and linking against a shared library that has a dependency on
      dnl the shared library that defines the symbol.
-     case "$gl_cv_have_weak" in
-       *yes)
-         case "$host_os" in
-           freebsd* | dragonfly* | midnightbsd*)
+     AS_CASE([$gl_cv_have_weak],
+       [*yes],
+        [AS_CASE([$host_os],
+           [freebsd* | dragonfly* | midnightbsd*],
+            [
              : > conftest1.c
              $CC $CPPFLAGS $CFLAGS $LDFLAGS -fPIC -shared -o libempty.so conftest1.c -lpthread >&AS_MESSAGE_LOG_FD 2>&1
              cat <<EOF > conftest2.c
@@ -152,17 +152,15 @@ EOF
              $CC $CPPFLAGS $CFLAGS $LDFLAGS -o conftest conftest2.c libempty.so >&AS_MESSAGE_LOG_FD 2>&1 \
                || gl_cv_have_weak=no
              rm -f conftest1.c libempty.so conftest2.c conftest
-             ;;
-         esac
-         ;;
-     esac
+            ])
+        ])
     ])
-  case "$gl_cv_have_weak" in
-    *yes)
+  AS_CASE([$gl_cv_have_weak],
+    [*yes],
+     [
       AC_DEFINE([HAVE_WEAK_SYMBOLS], [1],
         [Define to 1 if the compiler and linker support weak declarations of symbols.])
-      ;;
-  esac
+     ])
 ])
 
 dnl ============================================================================
@@ -188,15 +186,15 @@ dnl The guts of gl_PTHREADLIB. Needs to be expanded only once.
 AC_DEFUN([gl_PTHREADLIB_BODY],
 [
   AC_REQUIRE([gl_ANYTHREADLIB_EARLY])
-  if test -z "$gl_pthreadlib_body_done"; then
+  AS_IF([test -z "$gl_pthreadlib_body_done"], [
     gl_pthread_api=no
     LIBPTHREAD=
     LIBPMULTITHREAD=
     # On OSF/1, the compiler needs the flag -pthread or -D_REENTRANT so that
-    # it groks <pthread.h>. It's added above, in gl_ANYTHREADLIB_EARLY.
+    # it groks <pthread.h>. It is added above, in gl_ANYTHREADLIB_EARLY.
     AC_CHECK_HEADER([pthread.h],
       [gl_have_pthread_h=yes], [gl_have_pthread_h=no])
-    if test "$gl_have_pthread_h" = yes; then
+    AS_IF([test "$gl_have_pthread_h" = yes], [
       # Other possible tests:
       #   -lpthreads (FSU threads, PCthreads)
       #   -lgthreads
@@ -208,7 +206,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
       # needs -pthread for some reason.  See:
       # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html
       saved_LIBS="$LIBS"
-      for gl_pthread in '' '-pthread'; do
+      for gl_pthread in "" "-pthread"; do
         LIBS="$LIBS $gl_pthread"
         AC_LINK_IFELSE(
           [AC_LANG_PROGRAM(
@@ -230,8 +228,9 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
       gl_pthread_in_glibc=no
       # On Linux with glibc >= 2.34, libc contains the fully functional
       # pthread functions.
-      case "$host_os" in
-        linux*)
+      AS_CASE([$host_os],
+        [linux*],
+         [
           AC_EGREP_CPP([Lucky user],
             [#include <features.h>
              #ifdef __GNU_LIBRARY__
@@ -242,19 +241,18 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
             ],
             [gl_pthread_in_glibc=yes],
             [])
-          ;;
-      esac
+         ])
       echo "$as_me:__oline__: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&AS_MESSAGE_LOG_FD
 
       # Test for libpthread by looking for pthread_kill. (Not pthread_self,
       # since it is defined as a macro on OSF/1.)
-      if test $gl_pthread_api = yes && test -z "$LIBPTHREAD"; then
+      AS_IF([test $gl_pthread_api = yes && test -z "$LIBPTHREAD"], [
         # The program links fine without libpthread. But it may actually
         # need to link with libpthread in order to create multiple threads.
         AC_CHECK_LIB([pthread], [pthread_kill],
-          [if test $gl_pthread_in_glibc = yes; then
+          [AS_IF([test $gl_pthread_in_glibc = yes], [
              LIBPMULTITHREAD=
-           else
+           ], [
              LIBPMULTITHREAD=-lpthread
              # On Solaris and HP-UX, most pthread functions exist also in libc.
              # Therefore pthread_in_use() needs to actually try to create a
@@ -262,14 +260,13 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
              # pthread_create will actually create a thread.
              # On Solaris 10 or newer, this test is no longer needed, because
              # libc contains the fully functional pthread functions.
-             case "$host_os" in
-changequote(,)dnl
-               solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*)
-changequote([,])dnl
-                 AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
-                   [Define if the pthread_in_use() detection is hard.])
-             esac
-           fi
+             AS_CASE([$host_os],
+              [[solaris | solaris2.[1-9] | solaris2.[1-9].* | hpux*]],
+               [
+                AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
+                  [Define if the pthread_in_use() detection is hard.])
+               ])
+           ])
           ],
           [dnl This is needed on FreeBSD 5.2.1.
            AC_CHECK_LIB([thr], [pthread_kill],
@@ -280,35 +277,36 @@ changequote([,])dnl
               fi
              ])
           ])
-      elif test $gl_pthread_api != yes; then
+      ], [test $gl_pthread_api != yes], [
         # Some library is needed. Try libpthread and libc_r.
         AC_CHECK_LIB([pthread], [pthread_kill],
           [gl_pthread_api=yes
            LIBPTHREAD=-lpthread
            LIBPMULTITHREAD=-lpthread])
-        if test $gl_pthread_api != yes; then
+        AS_IF([test $gl_pthread_api != yes], [
           # For FreeBSD 4.
           AC_CHECK_LIB([c_r], [pthread_kill],
             [gl_pthread_api=yes
              LIBPTHREAD=-lc_r
              LIBPMULTITHREAD=-lc_r])
-        fi
-      fi
+        ])
+      ])
       echo "$as_me:__oline__: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&AS_MESSAGE_LOG_FD
-    fi
+    ])
     AC_MSG_CHECKING([whether POSIX threads API is available])
     AC_MSG_RESULT([$gl_pthread_api])
     AC_SUBST([LIBPTHREAD])
     AC_SUBST([LIBPMULTITHREAD])
-    if test $gl_pthread_api = yes; then
+    AS_IF([test $gl_pthread_api = yes], [
       AC_DEFINE([HAVE_PTHREAD_API], [1],
         [Define if you have the <pthread.h> header and the POSIX threads API.])
-    fi
+    ])
 
     dnl On some systems, sched_yield is in librt, rather than in libpthread.
     AC_LINK_IFELSE(
       [AC_LANG_PROGRAM(
-         [[#include <sched.h>]],
+         [[#include <sched.h>
+         ]],
          [[sched_yield ();]])],
       [SCHED_YIELD_LIB=
       ],
@@ -323,7 +321,7 @@ changequote([,])dnl
     AC_SUBST([LIB_SCHED_YIELD])
 
     gl_pthreadlib_body_done=done
-  fi
+  ])
 ])
 
 AC_DEFUN([gl_PTHREADLIB],
@@ -350,44 +348,45 @@ AC_DEFUN([gl_STDTHREADLIB_BODY],
 [
   AC_REQUIRE([gl_ANYTHREADLIB_EARLY])
   AC_REQUIRE([AC_CANONICAL_HOST])
-  if test -z "$gl_stdthreadlib_body_done"; then
+  AS_IF([test -z "$gl_stdthreadlib_body_done"], [
     AC_CHECK_HEADERS_ONCE([threads.h])
 
-    case "$host_os" in
-      mingw* | windows*)
+    AS_CASE([$host_os],
+      [mingw* | windows*],
+       [
         LIBSTDTHREAD=
-        ;;
-      *)
+       ],
+       [
         gl_PTHREADLIB_BODY
-        if test $ac_cv_header_threads_h = yes; then
+        AS_IF([test $ac_cv_header_threads_h = yes], [
           dnl glibc >= 2.29 has thrd_create in libpthread.
           dnl FreeBSD >= 10 has thrd_create in libstdthreads; this library depends
-          dnl on libpthread (for the symbol 'pthread_mutexattr_gettype').
+          dnl on libpthread (for the symbol pthread_mutexattr_gettype).
           dnl glibc >= 2.34, AIX >= 7.1, and Solaris >= 11.4 have thrd_create in
           dnl libc.
-          gl_CHECK_FUNCS_ANDROID([thrd_create], [[#include <threads.h>]])
-          if test $ac_cv_func_thrd_create = yes; then
+          gl_CHECK_FUNCS_ANDROID([thrd_create], [[#include <threads.h>
+                                                ]])
+          AS_IF([test $ac_cv_func_thrd_create = yes], [
             LIBSTDTHREAD=
-          else
+          ], [
             AC_CHECK_LIB([stdthreads], [thrd_create], [
-              LIBSTDTHREAD='-lstdthreads -lpthread'
+              LIBSTDTHREAD="-lstdthreads -lpthread"
             ], [
               dnl Guess that thrd_create is in libpthread.
               LIBSTDTHREAD="$LIBPMULTITHREAD"
             ])
-          fi
-        else
+          ])
+        ], [
           dnl Libraries needed by thrd.c, mtx.c, cnd.c, tss.c.
           LIBSTDTHREAD="$LIBPMULTITHREAD $SCHED_YIELD_LIB"
-        fi
-        ;;
-    esac
+        ])
+       ])
     AC_SUBST([LIBSTDTHREAD])
 
     AC_MSG_CHECKING([whether ISO C threads API is available])
     AC_MSG_RESULT([$ac_cv_header_threads_h])
     gl_stdthreadlib_body_done=done
-  fi
+  ])
 ])
 
 AC_DEFUN([gl_STDTHREADLIB],
@@ -404,7 +403,7 @@ dnl ------------
 dnl Tests for a multithreading library to be used.
 dnl If the configure.ac contains a definition of the gl_THREADLIB_DEFAULT_NO
 dnl (it must be placed before the invocation of gl_THREADLIB_EARLY!), then the
-dnl default is 'no', otherwise it is system dependent. In both cases, the user
+dnl default is "no", otherwise it is system dependent. In both cases, the user
 dnl can change the choice through the options --enable-threads=choice or
 dnl --disable-threads.
 dnl Defines at most one of the macros USE_ISOC_THREADS, USE_POSIX_THREADS,
@@ -449,7 +448,7 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY],
   m4_ifdef([gl_THREADLIB_DEFAULT_NO],
     [m4_divert_text([DEFAULTS], [gl_use_threads_default=no])],
     [m4_divert_text([DEFAULTS], [gl_use_threads_default=])])
-  dnl gl_use_winpthreads_default defaults to 'no', because in mingw 10, like
+  dnl gl_use_winpthreads_default defaults to "no", because in mingw 10, like
   dnl in mingw 5, the use of libwinpthread still makes test-pthread-tss crash.
   m4_divert_text([DEFAULTS], [gl_use_winpthreads_default=no])
   AC_ARG_ENABLE([threads],
@@ -459,41 +458,35 @@ AS_HELP_STRING([[--disable-threads]], [build without multithread safety])]),
     [if test -n "$gl_use_threads_default"; then
        gl_use_threads="$gl_use_threads_default"
      else
-changequote(,)dnl
-       case "$host_os" in
+       AS_CASE([$host_os],
          dnl Disable multithreading by default on OSF/1, because it interferes
          dnl with fork()/exec(): When msgexec is linked with -lpthread, its
          dnl child process gets an endless segmentation fault inside execvp().
-         osf*) gl_use_threads=no ;;
+         [osf*], [gl_use_threads=no],
          dnl Disable multithreading by default on Cygwin 1.5.x, because it has
          dnl bugs that lead to endless loops or crashes. See
          dnl <https://cygwin.com/ml/cygwin/2009-08/msg00283.html>.
-         cygwin*)
-               case `uname -r` in
-                 1.[0-5].*) gl_use_threads=no ;;
-                 *)         gl_use_threads=yes ;;
-               esac
-               ;;
+         [cygwin*],
+          [AS_CASE([$(uname -r)],
+             [[1.[0-5].*]], [gl_use_threads=no],
+                            [gl_use_threads=yes])
+          ],
          dnl Obey gl_AVOID_WINPTHREAD on mingw.
-         mingw* | windows*)
-               case "$gl_use_winpthreads_default" in
-                 yes) gl_use_threads=posix ;;
-                 no)  gl_use_threads=windows ;;
-                 *)   gl_use_threads=yes ;;
-               esac
-               ;;
-         *)    gl_use_threads=yes ;;
-       esac
-changequote([,])dnl
+         [mingw* | windows*],
+          [AS_CASE([$gl_use_winpthreads_default],
+             [yes], [gl_use_threads=posix],
+             [no],  [gl_use_threads=windows],
+                    [gl_use_threads=yes])
+          ],
+          [gl_use_threads=yes])
      fi
     ])
-  if test "$gl_use_threads" = yes \
-     || test "$gl_use_threads" = isoc \
-     || test "$gl_use_threads" = posix \
-     || test "$gl_use_threads" = isoc+posix; then
-    # For using <threads.h> or <pthread.h>:
-    gl_ANYTHREADLIB_EARLY
-  fi
+  AS_CASE([$gl_use_threads],
+    [yes | isoc | posix | isoc+posix],
+     [
+      # For using <threads.h> or <pthread.h>:
+      gl_ANYTHREADLIB_EARLY
+     ])
 ])
 
 dnl The guts of gl_THREADLIB. Needs to be expanded only once.
@@ -506,90 +499,95 @@ AC_DEFUN([gl_THREADLIB_BODY],
   LTLIBTHREAD=
   LIBMULTITHREAD=
   LTLIBMULTITHREAD=
-  if test "$gl_use_threads" != no; then
+  AS_IF([test "$gl_use_threads" = no],
+   [AC_DEFINE([AVOID_ANY_THREADS], [1],
+      [Define if no multithread safety and no multithreading is desired.])],
+   [
     dnl Check whether the compiler and linker support weak declarations.
     gl_WEAK_SYMBOLS
-    if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-      dnl If we use weak symbols to implement pthread_in_use / pth_in_use /
-      dnl thread_in_use, we also need to test whether the ISO C 11 thrd_create
-      dnl facility is in use.
-      AC_CHECK_HEADERS_ONCE([threads.h])
-      :
-    fi
-    if test "$gl_use_threads" = isoc || test "$gl_use_threads" = isoc+posix; then
-      AC_CHECK_HEADERS_ONCE([threads.h])
-      gl_have_isoc_threads="$ac_cv_header_threads_h"
-    fi
-    if test "$gl_use_threads" = yes \
-       || test "$gl_use_threads" = posix \
-       || test "$gl_use_threads" = isoc+posix; then
-      gl_PTHREADLIB_BODY
-      LIBTHREAD=$LIBPTHREAD LTLIBTHREAD=$LIBPTHREAD
-      LIBMULTITHREAD=$LIBPMULTITHREAD LTLIBMULTITHREAD=$LIBPMULTITHREAD
-      if test $gl_pthread_api = yes; then
-        if test "$gl_use_threads" = isoc+posix && test "$gl_have_isoc_threads" = yes; then
-          gl_threads_api='isoc+posix'
-          AC_DEFINE([USE_ISOC_AND_POSIX_THREADS], [1],
-            [Define if the combination of the ISO C and POSIX multithreading APIs can be used.])
-          LIBTHREAD= LTLIBTHREAD=
-        else
-          gl_threads_api=posix
-          AC_DEFINE([USE_POSIX_THREADS], [1],
-            [Define if the POSIX multithreading library can be used.])
-          if test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"; then
-            AC_DEFINE([USE_POSIX_THREADS_FROM_LIBC], [1],
-              [Define if references to the POSIX multithreading library are satisfied by libc.])
-          else
-            if case "$gl_cv_have_weak" in *yes) true;; *) false;; esac; then
-              AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
-                [Define if references to the POSIX multithreading library should be made weak.])
-              LIBTHREAD= LTLIBTHREAD=
-            else
-              case "$host_os" in
-                freebsd* | dragonfly* | midnightbsd*)
-                  if test "x$LIBTHREAD" != "x$LIBMULTITHREAD"; then
-                    dnl If weak symbols can't tell whether pthread_create(), pthread_key_create()
-                    dnl etc. will succeed, we need a runtime test.
-                    AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
-                      [Define if the pthread_in_use() detection is hard.])
-                  fi
-                  ;;
-              esac
-            fi
-          fi
-        fi
-      fi
-    fi
-    if test $gl_threads_api = none; then
-      if test "$gl_use_threads" = isoc && test "$gl_have_isoc_threads" = yes; then
+    AS_CASE([$gl_cv_have_weak],
+      [*yes],
+       [
+        dnl If we use weak symbols to implement pthread_in_use / pth_in_use /
+        dnl thread_in_use, we also need to test whether the ISO C 11 thrd_create
+        dnl facility is in use.
+        AC_CHECK_HEADERS_ONCE([threads.h])
+        :
+       ])
+    AS_CASE([$gl_use_threads],
+      [isoc | isoc+posix],
+       [
+        AC_CHECK_HEADERS_ONCE([threads.h])
+        gl_have_isoc_threads="$ac_cv_header_threads_h"
+       ])
+    AS_CASE([$gl_use_threads],
+      [yes | posix | isoc+posix],
+       [
+        gl_PTHREADLIB_BODY
+        LIBTHREAD=$LIBPTHREAD LTLIBTHREAD=$LIBPTHREAD
+        LIBMULTITHREAD=$LIBPMULTITHREAD LTLIBMULTITHREAD=$LIBPMULTITHREAD
+        AS_IF([test $gl_pthread_api = yes], [
+          AS_IF([test "$gl_use_threads" = isoc+posix &&
+                 test "$gl_have_isoc_threads" = yes], [
+            gl_threads_api="isoc+posix"
+            AC_DEFINE([USE_ISOC_AND_POSIX_THREADS], [1],
+              [Define if the combination of the ISO C and POSIX multithreading APIs can be used.])
+            LIBTHREAD= LTLIBTHREAD=
+          ], [
+            gl_threads_api=posix
+            AC_DEFINE([USE_POSIX_THREADS], [1],
+              [Define if the POSIX multithreading library can be used.])
+            AS_IF([test -z "$LIBMULTITHREAD" && test -z "$LTLIBMULTITHREAD"], [
+              AC_DEFINE([USE_POSIX_THREADS_FROM_LIBC], [1],
+                [Define if references to the POSIX multithreading library are satisfied by libc.])
+            ], [
+              AS_CASE([$gl_cv_have_weak],
+                [*yes],
+                 [
+                  AC_DEFINE([USE_POSIX_THREADS_WEAK], [1],
+                    [Define if references to the POSIX multithreading library should be made weak.])
+                  LIBTHREAD= LTLIBTHREAD=
+                 ],
+                 [AS_CASE([$host_os],
+                    [freebsd* | dragonfly* | midnightbsd*],
+                     [
+                      AS_IF([test "x$LIBTHREAD" != "x$LIBMULTITHREAD"], [
+                        dnl If weak symbols cannot tell whether
+                        dnl pthread_create(), dnl pthread_key_create()
+                        dnl etc. will succeed, we need a runtime test.
+                        AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1],
+                          [Define if the pthread_in_use() detection is hard.])
+                      ])
+                     ])
+                 ])
+            ])
+          ])
+        ])
+       ])
+    AS_IF([test $gl_threads_api = none], [
+      AS_IF([test "$gl_use_threads" = isoc && test "$gl_have_isoc_threads" = yes], [
         gl_STDTHREADLIB_BODY
         LIBTHREAD=$LIBSTDTHREAD LTLIBTHREAD=$LIBSTDTHREAD
         LIBMULTITHREAD=$LIBSTDTHREAD LTLIBMULTITHREAD=$LIBSTDTHREAD
         gl_threads_api=isoc
         AC_DEFINE([USE_ISOC_THREADS], [1],
           [Define if the ISO C multithreading library can be used.])
-      fi
-    fi
-    if test $gl_threads_api = none; then
-      case "$gl_use_threads" in
-        yes | windows | win32) # The 'win32' is for backward compatibility.
-          if { case "$host_os" in
-                 mingw* | windows*) true;;
-                 *) false;;
-               esac
-             }; then
-            gl_threads_api=windows
-            AC_DEFINE([USE_WINDOWS_THREADS], [1],
-              [Define if the native Windows multithreading API can be used.])
-          fi
-          ;;
-      esac
-    fi
-  else
-    dnl "$gl_use_threads" is "no".
-    AC_DEFINE([AVOID_ANY_THREADS], [1],
-      [Define if no multithread safety and no multithreading is desired.])
-  fi
+      ])
+    ])
+    AS_IF([test $gl_threads_api = none], [
+      # The "win32" is for backward compatibility.
+      AS_CASE([$gl_use_threads],
+        [yes | windows | win32],
+         [AS_CASE([$host_os],
+            [mingw* | windows*],
+             [
+              gl_threads_api=windows
+              AC_DEFINE([USE_WINDOWS_THREADS], [1],
+                [Define if the native Windows multithreading API can be used.])
+             ])
+         ])
+    ])
+   ])
   AC_MSG_CHECKING([for multithread API to use])
   AC_MSG_RESULT([$gl_threads_api])
   AC_SUBST([LIBTHREAD])
@@ -609,7 +607,7 @@ dnl gl_DISABLE_THREADS
 dnl ------------------
 dnl Sets the gl_THREADLIB default so that threads are not used by default.
 dnl The user can still override it at installation time, by using the
-dnl configure option '--enable-threads'.
+dnl configure option "--enable-threads".
 
 AC_DEFUN([gl_DISABLE_THREADS], [
   m4_divert_text([INIT_PREPARE], [gl_use_threads_default=no])
@@ -621,7 +619,7 @@ dnl -------------------
 dnl Sets the gl_THREADLIB default so that on mingw, a dependency to the
 dnl libwinpthread DLL (mingw-w64 winpthreads library) is avoided.
 dnl The user can still override it at installation time, by using the
-dnl configure option '--enable-threads=posix'.
+dnl configure option "--enable-threads=posix".
 dnl As of 2023, this is now the default.
 
 AC_DEFUN([gl_AVOID_WINPTHREAD], [
diff --git a/gl/m4/time_h.m4 b/gl/m4/time_h.m4
index d2f3c970..f4d8e20f 100644
--- a/gl/m4/time_h.m4
+++ b/gl/m4/time_h.m4
@@ -1,9 +1,11 @@
 # time_h.m4
-# serial 25
-dnl Copyright (C) 2000-2001, 2003-2007, 2009-2024 Free Software Foundation, Inc.
+# serial 27
+dnl Copyright (C) 2000-2001, 2003-2007, 2009-2025 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Configure a more-standard replacement for <time.h>.
 
@@ -145,6 +147,7 @@ AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GETRES])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_R])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME_RZ])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZNAME])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TZSET])
     dnl Support Microsoft deprecated alias function names by default.
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_TZSET], [1])
@@ -162,13 +165,16 @@ AC_DEFUN([gl_TIME_H_DEFAULTS],
   HAVE_TIMEGM=1;                         AC_SUBST([HAVE_TIMEGM])
   HAVE_TIMESPEC_GET=1;                   AC_SUBST([HAVE_TIMESPEC_GET])
   HAVE_TIMESPEC_GETRES=1;                AC_SUBST([HAVE_TIMESPEC_GETRES])
-  dnl Even GNU libc does not have timezone_t yet.
+  dnl Even GNU libc does not have timezone_t and tzalloc() yet.
   HAVE_TIMEZONE_T=0;                     AC_SUBST([HAVE_TIMEZONE_T])
+  HAVE_TZALLOC=0;                        AC_SUBST([HAVE_TZALLOC])
   REPLACE_CTIME=0;                       AC_SUBST([REPLACE_CTIME])
   REPLACE_GMTIME=0;                      AC_SUBST([REPLACE_GMTIME])
   REPLACE_LOCALTIME=0;                   AC_SUBST([REPLACE_LOCALTIME])
   REPLACE_LOCALTIME_R=0;                 AC_SUBST([REPLACE_LOCALTIME_R])
+  REPLACE_LOCALTIME_RZ=0;                AC_SUBST([REPLACE_LOCALTIME_RZ])
   REPLACE_MKTIME=0;                      AC_SUBST([REPLACE_MKTIME])
+  REPLACE_MKTIME_Z=0;                    AC_SUBST([REPLACE_MKTIME_Z])
   REPLACE_NANOSLEEP=0;                   AC_SUBST([REPLACE_NANOSLEEP])
   REPLACE_STRFTIME=0;                    AC_SUBST([REPLACE_STRFTIME])
   REPLACE_TIME=0;                        AC_SUBST([REPLACE_TIME])
diff --git a/gl/m4/time_r.m4 b/gl/m4/time_r.m4
index 3675390e..96f5c5b5 100644
--- a/gl/m4/time_r.m4
+++ b/gl/m4/time_r.m4
@@ -1,9 +1,10 @@
 # time_r.m4
 # serial 1
-dnl Copyright (C) 2003, 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Reentrant time functions: localtime_r, gmtime_r.
 
diff --git a/gl/m4/timegm.m4 b/gl/m4/timegm.m4
index c1ff2677..cb6da6da 100644
--- a/gl/m4/timegm.m4
+++ b/gl/m4/timegm.m4
@@ -1,9 +1,10 @@
 # timegm.m4
 # serial 16
-dnl Copyright (C) 2003, 2007, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_TIMEGM],
 [
diff --git a/gl/m4/uchar_h.m4 b/gl/m4/uchar_h.m4
new file mode 100644
index 00000000..b2309385
--- /dev/null
+++ b/gl/m4/uchar_h.m4
@@ -0,0 +1,279 @@
+# uchar_h.m4
+# serial 32
+dnl Copyright (C) 2019-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+dnl From Bruno Haible.
+dnl Prepare the overridden <uchar.h>.
+
+AC_DEFUN_ONCE([gl_UCHAR_H],
+[
+  AC_REQUIRE([gl_UCHAR_H_DEFAULTS])
+
+  gl_CHECK_NEXT_HEADERS([uchar.h])
+  if test $ac_cv_header_uchar_h = yes; then
+    HAVE_UCHAR_H=1
+  else
+    HAVE_UCHAR_H=0
+  fi
+  AC_SUBST([HAVE_UCHAR_H])
+
+  dnl On macOS 15, in C mode, <uchar.h> does not exist. But in C++ mode,
+  dnl it exists, and we need to #include_next it, otherwise we get an error
+  dnl "<cuchar> tried including <uchar.h> but didn't find libc++'s <uchar.h>
+  dnl  header."
+  m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])])
+  CXX_HAVE_UCHAR_H=0
+  if test "$CXX" != no; then
+    AC_CACHE_CHECK([whether the C++ compiler has <uchar.h>],
+      [gl_cv_cxx_have_uchar_h],
+      [dnl We can't use AC_LANG_PUSH([C++]) and AC_LANG_POP([C++]) here, due to
+       dnl an autoconf bug <https://savannah.gnu.org/support/?110294>.
+       cat > conftest.cpp <<\EOF
+#include <uchar.h>
+EOF
+       gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp"
+       if AC_TRY_EVAL([gl_command]); then
+         gl_cv_cxx_have_uchar_h=yes
+       else
+         gl_cv_cxx_have_uchar_h=no
+       fi
+       rm -fr conftest*
+      ])
+    if test $gl_cv_cxx_have_uchar_h = yes; then
+      CXX_HAVE_UCHAR_H=1
+    fi
+  fi
+  AC_SUBST([CXX_HAVE_UCHAR_H])
+
+  gl_TYPE_CHAR8_T
+  gl_TYPE_CHAR16_T
+  gl_TYPE_CHAR32_T
+
+  dnl In C++ mode, clang defines 'char16_t' and 'char32_t' as built-in types
+  dnl on some platforms (e.g. OpenBSD 6.7), and as types defined by many
+  dnl header files (<limits.h>, <stddef.h>, <stdint.h>, <stdio.h>, <stdlib.h>
+  dnl and others) on some platforms (e.g. Mac OS X 10.13).
+  dnl The same thing may also happen for 'char8_t'; so, be prepared for it.
+  m4_ifdef([gl_ANSI_CXX], [AC_REQUIRE([gl_ANSI_CXX])])
+  CXX_HAS_UCHAR_TYPES=0
+  if test $HAVE_UCHAR_H = 0; then
+    if test "$CXX" != no; then
+      AC_CACHE_CHECK([whether the C++ compiler predefines the <uchar.h> types],
+        [gl_cv_cxx_has_uchar_types],
+        [dnl We can't use AC_LANG_PUSH([C++]) and AC_LANG_POP([C++]) here, due to
+         dnl an autoconf bug <https://savannah.gnu.org/support/?110294>.
+         cat > conftest.cpp <<\EOF
+#include <stddef.h>
+char16_t a;
+char32_t b;
+EOF
+         gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp"
+         if AC_TRY_EVAL([gl_command]); then
+           gl_cv_cxx_has_uchar_types=yes
+         else
+           gl_cv_cxx_has_uchar_types=no
+         fi
+         rm -fr conftest*
+        ])
+      if test $gl_cv_cxx_has_uchar_types = yes; then
+        CXX_HAS_UCHAR_TYPES=1
+      fi
+    fi
+  fi
+  AC_SUBST([CXX_HAS_UCHAR_TYPES])
+  CXX_HAS_CHAR8_TYPE=0
+  if test $HAVE_UCHAR_H = 0; then
+    if test "$CXX" != no; then
+      AC_CACHE_CHECK([whether the C++ compiler predefines the char8_t type],
+        [gl_cv_cxx_has_char8_type],
+        [dnl We can't use AC_LANG_PUSH([C++]) and AC_LANG_POP([C++]) here, due to
+         dnl an autoconf bug <https://savannah.gnu.org/support/?110294>.
+         cat > conftest.cpp <<\EOF
+#include <stddef.h>
+char8_t a;
+EOF
+         gl_command="$CXX $CXXFLAGS $CPPFLAGS -c conftest.cpp"
+         if AC_TRY_EVAL([gl_command]); then
+           gl_cv_cxx_has_char8_type=yes
+         else
+           gl_cv_cxx_has_char8_type=no
+         fi
+         rm -fr conftest*
+        ])
+      if test $gl_cv_cxx_has_char8_type = yes; then
+        CXX_HAS_CHAR8_TYPE=1
+      fi
+    fi
+  fi
+  AC_SUBST([CXX_HAS_CHAR8_TYPE])
+
+  dnl Test whether a 'char32_t' can hold more characters than a 'wchar_t'.
+  gl_STDINT_BITSIZEOF([wchar_t], [gl_STDINT_INCLUDES])
+  if test $BITSIZEOF_WCHAR_T -lt 32; then
+    SMALL_WCHAR_T=1
+  else
+    SMALL_WCHAR_T=0
+  fi
+  dnl SMALL_WCHAR_T is expected to be 1 on 32-bit AIX, Cygwin, native Windows.
+  AC_SUBST([SMALL_WCHAR_T])
+
+  dnl Check for declarations of anything we want to poison if the
+  dnl corresponding gnulib module is not in use, and which is not
+  dnl guaranteed by C11.
+  gl_WARN_ON_USE_PREPARE([[
+      #ifdef __HAIKU__
+       #include <stdint.h>
+      #endif
+      #include <uchar.h>
+    ]], [c32rtomb mbrtoc16 mbrtoc32])
+])
+
+AC_DEFUN_ONCE([gl_TYPE_CHAR8_T],
+[
+  dnl Determine whether gnulib's <uchar.h> would, if present, override char8_t.
+  AC_CACHE_CHECK([whether char8_t is correctly defined],
+    [gl_cv_type_char8_t_works],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+          #ifdef __HAIKU__
+           #include <stdint.h>
+          #endif
+          #include <uchar.h>
+          int verify[(char8_t)(-1) >= 0 && sizeof (char8_t) == sizeof (unsigned char) ? 1 : -1];
+          ]])
+       ],
+       [gl_cv_type_char8_t_works=yes],
+       [gl_cv_type_char8_t_works=no])
+    ])
+  if test $gl_cv_type_char8_t_works = no; then
+    GNULIBHEADERS_OVERRIDE_CHAR8_T=1
+  else
+    GNULIBHEADERS_OVERRIDE_CHAR8_T=0
+  fi
+  AC_SUBST([GNULIBHEADERS_OVERRIDE_CHAR8_T])
+])
+
+dnl On Haiku 2020, char16_t and char32_t are incorrectly defined.
+dnl See <https://dev.haiku-os.org/ticket/15990>.
+AC_DEFUN_ONCE([gl_TYPE_CHAR16_T],
+[
+  dnl Determine whether gnulib's <uchar.h> would, if present, override char16_t.
+  AC_CACHE_CHECK([whether char16_t is correctly defined],
+    [gl_cv_type_char16_t_works],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+          #ifdef __HAIKU__
+           #include <stdint.h>
+          #endif
+          #include <uchar.h>
+          /* For simplicity, assume that uint16_least_t is equivalent to
+             'unsigned short'.  */
+          int verify[(char16_t)(-1) >= 0 && sizeof (char16_t) == sizeof (unsigned short) ? 1 : -1];
+          ]])
+       ],
+       [gl_cv_type_char16_t_works=yes],
+       [gl_cv_type_char16_t_works=no])
+    ])
+  if test $gl_cv_type_char16_t_works = no; then
+    GNULIBHEADERS_OVERRIDE_CHAR16_T=1
+  else
+    GNULIBHEADERS_OVERRIDE_CHAR16_T=0
+  fi
+  AC_SUBST([GNULIBHEADERS_OVERRIDE_CHAR16_T])
+])
+AC_DEFUN_ONCE([gl_TYPE_CHAR32_T],
+[
+  dnl Determine whether gnulib's <uchar.h> would, if present, override char32_t.
+  AC_CACHE_CHECK([whether char32_t is correctly defined],
+    [gl_cv_type_char32_t_works],
+    [AC_COMPILE_IFELSE(
+       [AC_LANG_PROGRAM([[
+          #ifdef __HAIKU__
+           #include <stdint.h>
+          #endif
+          #include <uchar.h>
+          /* For simplicity, assume that uint32_least_t is equivalent to
+             'unsigned int'.  */
+          int verify[(char32_t)(-1) >= 0 && sizeof (char32_t) == sizeof (unsigned int) ? 1 : -1];
+          ]])
+       ],
+       [gl_cv_type_char32_t_works=yes],
+       [gl_cv_type_char32_t_works=no])
+    ])
+  if test $gl_cv_type_char32_t_works = no; then
+    GNULIBHEADERS_OVERRIDE_CHAR32_T=1
+  else
+    GNULIBHEADERS_OVERRIDE_CHAR32_T=0
+  fi
+  AC_SUBST([GNULIBHEADERS_OVERRIDE_CHAR32_T])
+])
+
+# gl_UCHAR_MODULE_INDICATOR([modulename])
+# sets the shell variable that indicates the presence of the given module
+# to a C preprocessor expression that will evaluate to 1.
+# This macro invocation must not occur in macros that are AC_REQUIREd.
+AC_DEFUN([gl_UCHAR_MODULE_INDICATOR],
+[
+  dnl Ensure to expand the default settings once only.
+  gl_UCHAR_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+# Initializes the default values for AC_SUBSTed shell variables.
+# This macro must not be AC_REQUIREd.  It must only be invoked, and only
+# outside of macros or in macros that are not AC_REQUIREd.
+AC_DEFUN([gl_UCHAR_H_REQUIRE_DEFAULTS],
+[
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_UCHAR_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOC32])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISALNUM])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISALPHA])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISBLANK])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISCNTRL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISDIGIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISGRAPH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISLOWER])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISPRINT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISPUNCT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISSPACE])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISUPPER])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32ISXDIGIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOLOWER])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOUPPER])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32WIDTH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32RTOMB])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SNRTOMBS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SRTOMBS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32STOMBS])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32SWIDTH])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32TOB])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_APPLY_MAPPING])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_APPLY_TYPE_TEST])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_GET_MAPPING])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_C32_GET_TYPE_TEST])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOC16])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOC32])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSNRTOC32S])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOC32S])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOC32S])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_UCHAR_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_UCHAR_H_DEFAULTS])
+])
+
+AC_DEFUN([gl_UCHAR_H_DEFAULTS],
+[
+  dnl Assume proper GNU behavior unless another module says otherwise.
+  HAVE_C32RTOMB=1;             AC_SUBST([HAVE_C32RTOMB])
+  HAVE_MBRTOC16=1;             AC_SUBST([HAVE_MBRTOC16])
+  HAVE_MBRTOC32=1;             AC_SUBST([HAVE_MBRTOC32])
+  REPLACE_C32RTOMB=0;          AC_SUBST([REPLACE_C32RTOMB])
+  REPLACE_MBRTOC16=0;          AC_SUBST([REPLACE_MBRTOC16])
+  REPLACE_MBRTOC32=0;          AC_SUBST([REPLACE_MBRTOC32])
+])
diff --git a/gl/m4/ungetc.m4 b/gl/m4/ungetc.m4
index 42f7ec32..969b60e8 100644
--- a/gl/m4/ungetc.m4
+++ b/gl/m4/ungetc.m4
@@ -1,9 +1,10 @@
 # ungetc.m4
 # serial 12
-dnl Copyright (C) 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
 [
diff --git a/gl/m4/unicase_h.m4 b/gl/m4/unicase_h.m4
new file mode 100644
index 00000000..bf5d4c2e
--- /dev/null
+++ b/gl/m4/unicase_h.m4
@@ -0,0 +1,45 @@
+# unicase_h.m4
+# serial 1
+dnl Copyright (C) 2023-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN_ONCE([gl_UNICASE_H],
+[
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_UNICASE_H_DEFAULTS])
+])
+
+# gl_UNICASE_MODULE_INDICATOR([modulename])
+# sets the shell variable that indicates the presence of the given module
+# to a C preprocessor expression that will evaluate to 1.
+# This macro invocation must not occur in macros that are AC_REQUIREd.
+AC_DEFUN([gl_UNICASE_MODULE_INDICATOR],
+[
+  dnl Ensure to expand the default settings once only.
+  gl_UNICASE_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+# Initializes the default values for AC_SUBSTed shell variables.
+# This macro must not be AC_REQUIREd.  It must only be invoked, and only
+# outside of macros or in macros that are not AC_REQUIREd.
+AC_DEFUN([gl_UNICASE_H_REQUIRE_DEFAULTS],
+[
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNICASE_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_UNICASE_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_UNICASE_H_DEFAULTS])
+])
+
+AC_DEFUN([gl_UNICASE_H_DEFAULTS],
+[
+  dnl Assume proper GNU behavior unless another module says otherwise.
+])
diff --git a/gl/m4/unictype_h.m4 b/gl/m4/unictype_h.m4
new file mode 100644
index 00000000..68ddaf6c
--- /dev/null
+++ b/gl/m4/unictype_h.m4
@@ -0,0 +1,179 @@
+# unictype_h.m4
+# serial 4
+dnl Copyright (C) 2023-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN_ONCE([gl_UNICTYPE_H],
+[
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_UNICTYPE_H_DEFAULTS])
+])
+
+# gl_UNICTYPE_MODULE_INDICATOR([modulename])
+# sets the shell variable that indicates the presence of the given module
+# to a C preprocessor expression that will evaluate to 1.
+# This macro invocation must not occur in macros that are AC_REQUIREd.
+AC_DEFUN([gl_UNICTYPE_MODULE_INDICATOR],
+[
+  dnl Ensure to expand the default settings once only.
+  gl_UNICTYPE_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+# Initializes the default values for AC_SUBSTed shell variables.
+# This macro must not be AC_REQUIREd.  It must only be invoked, and only
+# outside of macros or in macros that are not AC_REQUIREd.
+AC_DEFUN([gl_UNICTYPE_H_REQUIRE_DEFAULTS],
+[
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNICTYPE_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_UNICTYPE_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_UNICTYPE_H_DEFAULTS])
+])
+
+AC_DEFUN([gl_UNICTYPE_H_DEFAULTS],
+[
+  dnl Assume proper GNU behavior unless another module says otherwise.
+])
diff --git a/gl/m4/uninorm_h.m4 b/gl/m4/uninorm_h.m4
new file mode 100644
index 00000000..d416f73b
--- /dev/null
+++ b/gl/m4/uninorm_h.m4
@@ -0,0 +1,47 @@
+# uninorm_h.m4
+# serial 1
+dnl Copyright (C) 2023-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN_ONCE([gl_UNINORM_H],
+[
+  dnl Ensure to expand the default settings once only, before all statements
+  dnl that occur in other macros.
+  AC_REQUIRE([gl_UNINORM_H_DEFAULTS])
+])
+
+# gl_UNINORM_MODULE_INDICATOR([modulename])
+# sets the shell variable that indicates the presence of the given module
+# to a C preprocessor expression that will evaluate to 1.
+# This macro invocation must not occur in macros that are AC_REQUIREd.
+AC_DEFUN([gl_UNINORM_MODULE_INDICATOR],
+[
+  dnl Ensure to expand the default settings once only.
+  gl_UNINORM_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_SET_VARIABLE([$1])
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR_FOR_TESTS([$1])
+])
+
+# Initializes the default values for AC_SUBSTed shell variables.
+# This macro must not be AC_REQUIREd.  It must only be invoked, and only
+# outside of macros or in macros that are not AC_REQUIREd.
+AC_DEFUN([gl_UNINORM_H_REQUIRE_DEFAULTS],
+[
+  m4_defun(GL_MODULE_INDICATOR_PREFIX[_UNINORM_H_MODULE_INDICATOR_DEFAULTS], [
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNINORM_NFD_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNINORM_NFC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNINORM_NFKD_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNINORM_NFKC_DLL_VARIABLE], ['LIBUNISTRING_DLL_VARIABLE'])
+  ])
+  m4_require(GL_MODULE_INDICATOR_PREFIX[_UNINORM_H_MODULE_INDICATOR_DEFAULTS])
+  AC_REQUIRE([gl_UNINORM_H_DEFAULTS])
+])
+
+AC_DEFUN([gl_UNINORM_H_DEFAULTS],
+[
+  dnl Assume proper GNU behavior unless another module says otherwise.
+])
diff --git a/gl/m4/unistd_h.m4 b/gl/m4/unistd_h.m4
index 81d1b9f6..6ec16286 100644
--- a/gl/m4/unistd_h.m4
+++ b/gl/m4/unistd_h.m4
@@ -1,9 +1,10 @@
 # unistd_h.m4
-# serial 95
-dnl Copyright (C) 2006-2024 Free Software Foundation, Inc.
+# serial 97
+dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Written by Simon Josefsson, Bruno Haible.
 
@@ -243,11 +244,13 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_GETDOMAINNAME=0;           AC_SUBST([REPLACE_GETDOMAINNAME])
   REPLACE_GETDTABLESIZE=0;           AC_SUBST([REPLACE_GETDTABLESIZE])
   REPLACE_GETENTROPY=0;              AC_SUBST([REPLACE_GETENTROPY])
+  REPLACE_GETLOGIN=0;                AC_SUBST([REPLACE_GETLOGIN])
   REPLACE_GETLOGIN_R=0;              AC_SUBST([REPLACE_GETLOGIN_R])
   REPLACE_GETGROUPS=0;               AC_SUBST([REPLACE_GETGROUPS])
   REPLACE_GETPAGESIZE=0;             AC_SUBST([REPLACE_GETPAGESIZE])
   REPLACE_GETPASS=0;                 AC_SUBST([REPLACE_GETPASS])
   REPLACE_GETPASS_FOR_GETPASS_GNU=0; AC_SUBST([REPLACE_GETPASS_FOR_GETPASS_GNU])
+  REPLACE_GETUSERSHELL=0;            AC_SUBST([REPLACE_GETUSERSHELL])
   REPLACE_ISATTY=0;                  AC_SUBST([REPLACE_ISATTY])
   REPLACE_LCHOWN=0;                  AC_SUBST([REPLACE_LCHOWN])
   REPLACE_LINK=0;                    AC_SUBST([REPLACE_LINK])
diff --git a/gl/m4/unitypes_h.m4 b/gl/m4/unitypes_h.m4
new file mode 100644
index 00000000..264e61be
--- /dev/null
+++ b/gl/m4/unitypes_h.m4
@@ -0,0 +1,26 @@
+# unitypes_h.m4
+# serial 1
+dnl Copyright (C) 2021-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN_ONCE([gl_UNITYPES_H],
+[
+  AH_VERBATIM([unitypes_restrict], [
+/* This definition is a duplicate of the one in unitypes.h.
+   It is here so that we can cope with an older version of unitypes.h
+   that does not contain this definition and that is pre-installed among
+   the public header files.  */
+# if defined __restrict \
+     || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \
+     || __clang_major__ >= 3
+#  define _UC_RESTRICT __restrict
+# elif 199901L <= __STDC_VERSION__ || defined restrict
+#  define _UC_RESTRICT restrict
+# else
+#  define _UC_RESTRICT
+# endif
+])
+])
diff --git a/gl/m4/unlocked-io.m4 b/gl/m4/unlocked-io.m4
index e96cf5f8..97f43f4b 100644
--- a/gl/m4/unlocked-io.m4
+++ b/gl/m4/unlocked-io.m4
@@ -1,9 +1,10 @@
 # unlocked-io.m4
 # serial 16
-dnl Copyright (C) 1998-2006, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 1998-2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Jim Meyering.
 dnl
diff --git a/gl/m4/vararrays.m4 b/gl/m4/vararrays.m4
index 9211f69d..086e409f 100644
--- a/gl/m4/vararrays.m4
+++ b/gl/m4/vararrays.m4
@@ -1,9 +1,10 @@
 # vararrays.m4
 # serial 6
-dnl Copyright (C) 2001, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2001, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # Check for variable-length arrays.
 
diff --git a/gl/m4/vasnprintf.m4 b/gl/m4/vasnprintf.m4
index 1ea2055e..1d040d6e 100644
--- a/gl/m4/vasnprintf.m4
+++ b/gl/m4/vasnprintf.m4
@@ -1,14 +1,47 @@
 # vasnprintf.m4
-# serial 52
-dnl Copyright (C) 2002-2004, 2006-2024 Free Software Foundation, Inc.
+# serial 56
+dnl Copyright (C) 2002-2004, 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_VASNPRINTF],
 [
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_FUNCS_ONCE([vasnprintf])
-  if test $ac_cv_func_vasnprintf = no; then
+  if test $ac_cv_func_vasnprintf = yes; then
+    dnl On Cygwin, in directives with a huge width, the width is ignored, and
+    dnl the function returns a wrong result.
+    AC_CACHE_CHECK([whether vasnprintf works],
+      [gl_cv_func_vasnprintf_works],
+      [AC_RUN_IFELSE(
+         [AC_LANG_SOURCE(
+            [[#include <stdio.h>
+            ]],
+            [[size_t len;
+              char *res = vasnprintf (NULL, &len, "x%03000000000dy\n", -17);
+              /* On Cygwin 3.4.6, res is "x-17y\n" and len == 6: wrong.  */
+              return (res != NULL && len < 10);
+            ]])
+         ],
+         [gl_cv_func_vasnprintf_works=yes],
+         [gl_cv_func_vasnprintf_works=no],
+         [case "$host_os" in
+                     # Guess no on Cygwin.
+            cygwin*) gl_cv_func_vasnprintf_works="guessing no";;
+                     # If we don't know, obey --enable-cross-guesses.
+            *)       gl_cv_func_vasnprintf_works="$gl_cross_guess_normal";;
+          esac
+         ])
+      ])
+  fi
+  if test $ac_cv_func_vasnprintf != yes \
+     || case "$gl_cv_func_vasnprintf_works" in
+          *yes) false;;
+          *)    true;;
+        esac
+  then
     gl_REPLACE_VASNPRINTF
   fi
 ])
@@ -42,7 +75,6 @@ AC_DEFUN([gl_FUNC_VASNWPRINTF],
 # Prerequisites of lib/printf-args.h, lib/printf-args.c.
 AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 [
-  AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
 ])
 
@@ -51,7 +83,6 @@ AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 [
   AC_REQUIRE([gl_FEATURES_H])
-  AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
   AC_REQUIRE([AC_TYPE_SIZE_T])
   AC_CHECK_TYPE([ptrdiff_t], ,
@@ -185,7 +216,6 @@ int main()
 AC_DEFUN_ONCE([gl_PREREQ_VASNXPRINTF],
 [
   AC_REQUIRE([AC_FUNC_ALLOCA])
-  AC_REQUIRE([gt_TYPE_WCHAR_T])
   AC_REQUIRE([gt_TYPE_WINT_T])
   AC_CHECK_FUNCS([wcslen])
   dnl Knowing DBL_EXPBIT0_WORD and DBL_EXPBIT0_BIT enables an optimization
@@ -327,15 +357,39 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_LC],
 # Extra prerequisites of lib/vasnprintf.c for supporting the ' flag.
 AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_GROUPING],
 [
+  AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_PRINTF_FLAG_GROUPING])
-  case "$gl_cv_func_printf_flag_grouping" in
-    *yes)
-      ;;
-    *)
+  AC_REQUIRE([gl_PRINTF_FLAG_GROUPING_INT_PRECISION])
+  AC_REQUIRE([gl_PRINTF_FLAG_GROUPING_MULTIBYTE])
+  case "$host_os" in
+    mingw* | windows*)
+      dnl MSVC does not support the ' flag at all.
+      dnl mingw does not support it, unless __USE_MINGW_ANSI_STDIO is defined.
+      dnl mingw also has other bugs regarding the ' flag.
       AC_DEFINE([NEED_PRINTF_FLAG_GROUPING], [1],
         [Define if the vasnprintf implementation needs special code for the
          ' flag.])
       ;;
+    *)
+      case "$gl_cv_func_printf_flag_grouping,$gl_cv_func_printf_flag_grouping_multibyte" in
+        *yes,*yes)
+          case "$gl_cv_func_printf_flag_grouping_int_precision" in
+            *yes)
+              ;;
+            *)
+              AC_DEFINE([NEED_PRINTF_FLAG_GROUPING_INT], [1],
+                [Define if the vasnprintf implementation needs special code for the
+                 ' flag, for integer directives only.])
+              ;;
+          esac
+          ;;
+        *)
+          AC_DEFINE([NEED_PRINTF_FLAG_GROUPING], [1],
+            [Define if the vasnprintf implementation needs special code for the
+             ' flag.])
+          ;;
+      esac
+      ;;
   esac
 ])
 
diff --git a/gl/m4/vasprintf.m4 b/gl/m4/vasprintf.m4
index 73f7b807..6ea602bd 100644
--- a/gl/m4/vasprintf.m4
+++ b/gl/m4/vasprintf.m4
@@ -1,10 +1,11 @@
 # vasprintf.m4
 # serial 6
-dnl Copyright (C) 2002-2003, 2006-2007, 2009-2024 Free Software Foundation,
+dnl Copyright (C) 2002-2003, 2006-2007, 2009-2025 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_VASPRINTF],
 [
diff --git a/gl/m4/visibility.m4 b/gl/m4/visibility.m4
index ecf09686..c2cd38d0 100644
--- a/gl/m4/visibility.m4
+++ b/gl/m4/visibility.m4
@@ -1,9 +1,10 @@
 # visibility.m4
 # serial 9
-dnl Copyright (C) 2005, 2008, 2010-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2005, 2008, 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 
diff --git a/gl/m4/vsnprintf.m4 b/gl/m4/vsnprintf.m4
index 9f321f3f..68ab757d 100644
--- a/gl/m4/vsnprintf.m4
+++ b/gl/m4/vsnprintf.m4
@@ -1,9 +1,10 @@
 # vsnprintf.m4
 # serial 7
-dnl Copyright (C) 2002-2004, 2007-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2004, 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Libintl 0.17 will replace vsnprintf only if it does not support %1$s,
 dnl but defers to any gnulib vsnprintf replacements.  Therefore, gnulib
diff --git a/gl/m4/warn-on-use.m4 b/gl/m4/warn-on-use.m4
index 6c8c76b8..73cf16fb 100644
--- a/gl/m4/warn-on-use.m4
+++ b/gl/m4/warn-on-use.m4
@@ -1,9 +1,10 @@
 # warn-on-use.m4
 # serial 11
-dnl Copyright (C) 2010-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2010-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 # gl_WARN_ON_USE_PREPARE(INCLUDES, NAMES)
 # ---------------------------------------
diff --git a/gl/m4/wchar_h.m4 b/gl/m4/wchar_h.m4
index 995bdc65..722fcfc2 100644
--- a/gl/m4/wchar_h.m4
+++ b/gl/m4/wchar_h.m4
@@ -1,9 +1,10 @@
 # wchar_h.m4
-# serial 64
-dnl Copyright (C) 2007-2024 Free Software Foundation, Inc.
+# serial 65
+dnl Copyright (C) 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
@@ -256,6 +257,7 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS],
   REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
   REPLACE_WCSFTIME=0;   AC_SUBST([REPLACE_WCSFTIME])
   REPLACE_WCSCMP=0;     AC_SUBST([REPLACE_WCSCMP])
+  REPLACE_WCSNCAT=0;    AC_SUBST([REPLACE_WCSNCAT])
   REPLACE_WCSNCMP=0;    AC_SUBST([REPLACE_WCSNCMP])
   REPLACE_WCSSTR=0;     AC_SUBST([REPLACE_WCSSTR])
   REPLACE_WCSTOK=0;     AC_SUBST([REPLACE_WCSTOK])
diff --git a/gl/m4/wchar_t.m4 b/gl/m4/wchar_t.m4
deleted file mode 100644
index 968832cb..00000000
--- a/gl/m4/wchar_t.m4
+++ /dev/null
@@ -1,25 +0,0 @@
-# wchar_t.m4
-# serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2024 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-dnl Test whether <stddef.h> has the 'wchar_t' type.
-dnl Prerequisite: AC_PROG_CC
-
-AC_DEFUN([gt_TYPE_WCHAR_T],
-[
-  AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
-    [AC_COMPILE_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <stddef.h>
-            wchar_t foo = (wchar_t)'\0';]],
-          [[]])],
-       [gt_cv_c_wchar_t=yes],
-       [gt_cv_c_wchar_t=no])])
-  if test $gt_cv_c_wchar_t = yes; then
-    AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
-  fi
-])
diff --git a/gl/m4/wcrtomb.m4 b/gl/m4/wcrtomb.m4
index 35dff6f0..91530176 100644
--- a/gl/m4/wcrtomb.m4
+++ b/gl/m4/wcrtomb.m4
@@ -1,9 +1,10 @@
 # wcrtomb.m4
-# serial 19
-dnl Copyright (C) 2008-2024 Free Software Foundation, Inc.
+# serial 21
+dnl Copyright (C) 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_FUNC_WCRTOMB],
 [
@@ -36,7 +37,7 @@ AC_DEFUN([gl_FUNC_WCRTOMB],
       dnl sometimes returns 0 instead of 1.
       AC_REQUIRE([AC_PROG_CC])
       AC_REQUIRE([gt_LOCALE_FR])
-      AC_REQUIRE([gt_LOCALE_FR_UTF8])
+      AC_REQUIRE([gt_LOCALE_EN_UTF8])
       AC_REQUIRE([gt_LOCALE_JA])
       AC_REQUIRE([gt_LOCALE_ZH_CN])
       AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
@@ -90,7 +91,7 @@ changequote(,)dnl
               gl_cv_func_wcrtomb_retval="guessing yes" ;;
           esac
 changequote([,])dnl
-          if test $LOCALE_FR != none || test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
+          if test $LOCALE_FR != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then
             AC_RUN_IFELSE(
               [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -106,8 +107,8 @@ int main ()
       if (wcrtomb (NULL, 0, NULL) != 1)
         result |= 1;
     }
-  if (strcmp ("$LOCALE_FR_UTF8", "none") != 0
-      && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (strcmp ("$LOCALE_EN_UTF8", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_EN_UTF8") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
         result |= 2;
diff --git a/gl/m4/wctype.m4 b/gl/m4/wctype.m4
index e5d70740..56593cd5 100644
--- a/gl/m4/wctype.m4
+++ b/gl/m4/wctype.m4
@@ -1,9 +1,10 @@
 # wctype.m4
 # serial 6
-dnl Copyright (C) 2011-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2011-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN_ONCE([gl_FUNC_WCTYPE],
 [
diff --git a/gl/m4/wctype_h.m4 b/gl/m4/wctype_h.m4
index a3b07c2a..8e54678d 100644
--- a/gl/m4/wctype_h.m4
+++ b/gl/m4/wctype_h.m4
@@ -3,10 +3,11 @@
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl Written by Paul Eggert.
 
diff --git a/gl/m4/wcwidth.m4 b/gl/m4/wcwidth.m4
new file mode 100644
index 00000000..2cc6ebb1
--- /dev/null
+++ b/gl/m4/wcwidth.m4
@@ -0,0 +1,116 @@
+# wcwidth.m4
+# serial 38
+dnl Copyright (C) 2006-2025 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
+
+AC_DEFUN([gl_FUNC_WCWIDTH],
+[
+  AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  dnl Persuade glibc <wchar.h> to declare wcwidth().
+  AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
+
+  AC_REQUIRE([gt_TYPE_WINT_T])
+
+  AC_CHECK_HEADERS_ONCE([wchar.h])
+  AC_CHECK_FUNCS_ONCE([wcwidth])
+
+  AC_CHECK_DECLS([wcwidth], [], [], [[
+    #include <wchar.h>
+  ]])
+  if test $ac_cv_have_decl_wcwidth != yes; then
+    HAVE_DECL_WCWIDTH=0
+  fi
+
+  if test $ac_cv_func_wcwidth != yes; then
+    AC_CACHE_CHECK([whether wcwidth is a macro],
+      [gl_cv_func_wcwidth_macro],
+      [AC_EGREP_CPP([wchar_header_defines_wcwidth], [
+#include <wchar.h>
+#ifdef wcwidth
+ wchar_header_defines_wcwidth
+#endif],
+         [gl_cv_func_wcwidth_macro=yes],
+         [gl_cv_func_wcwidth_macro=no])
+      ])
+  fi
+
+  if test $ac_cv_func_wcwidth = yes || test $gl_cv_func_wcwidth_macro = yes; then
+    HAVE_WCWIDTH=1
+    dnl On Mac OS X 10.3, wcwidth(0x0301) (COMBINING ACUTE ACCENT) returns 1.
+    dnl On macOS 12.5, NetBSD 9.3, OpenBSD 5.0, MidnightBSD 1.1,
+    dnl wcwidth(0x05B0) (HEBREW POINT SHEVA) returns 1.
+    dnl On macOS 12.5, NetBSD 9.3, MidnightBSD 1.1, OSF/1 5.1,
+    dnl wcwidth(0x200B) (ZERO WIDTH SPACE) returns 1.
+    dnl On OpenBSD 5.8, wcwidth(0xFF1A) (FULLWIDTH COLON) returns 0.
+    dnl This leads to bugs in 'ls' (coreutils).
+    dnl On Solaris 11.4, wcwidth(0x2202) (PARTIAL DIFFERENTIAL) returns 2,
+    dnl even in Western locales.
+    AC_CACHE_CHECK([whether wcwidth works reasonably in UTF-8 locales],
+      [gl_cv_func_wcwidth_works],
+      [
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <wchar.h>
+#if !HAVE_DECL_WCWIDTH
+extern
+# ifdef __cplusplus
+"C"
+# endif
+int wcwidth (int);
+#endif
+int main ()
+{
+  int result = 0;
+  if (setlocale (LC_ALL, "en_US.UTF-8") != NULL)
+    {
+      if (wcwidth (0x0301) > 0)
+        result |= 1;
+      if (wcwidth (0x05B0) > 0)
+        result |= 2;
+      if (wcwidth (0x200B) > 0)
+        result |= 4;
+      if (wcwidth (0xFF1A) == 0)
+        result |= 8;
+      if (wcwidth (0x2202) > 1)
+        result |= 16;
+    }
+  return result;
+}]])],
+          [gl_cv_func_wcwidth_works=yes],
+          [gl_cv_func_wcwidth_works=no],
+          [
+changequote(,)dnl
+           case "$host_os" in
+                                 # Guess yes on glibc systems.
+             *-gnu* | gnu*)      gl_cv_func_wcwidth_works="guessing yes";;
+                                 # Guess yes on musl systems.
+             *-musl* | midipix*) gl_cv_func_wcwidth_works="guessing yes";;
+                                 # Guess yes on AIX 7 systems.
+             aix[7-9]*)          gl_cv_func_wcwidth_works="guessing yes";;
+             *)                  gl_cv_func_wcwidth_works="$gl_cross_guess_normal";;
+           esac
+changequote([,])dnl
+          ])
+      ])
+    case "$gl_cv_func_wcwidth_works" in
+      *yes) ;;
+      *no) REPLACE_WCWIDTH=1 ;;
+    esac
+  else
+    HAVE_WCWIDTH=0
+  fi
+  dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
+  dnl have the wcwidth function, then it does not declare it.
+])
+
+# Prerequisites of lib/wcwidth.c.
+AC_DEFUN([gl_PREREQ_WCWIDTH], [
+  AC_REQUIRE([AC_C_INLINE])
+  :
+])
diff --git a/gl/m4/wint_t.m4 b/gl/m4/wint_t.m4
index 883fac28..8a3c7944 100644
--- a/gl/m4/wint_t.m4
+++ b/gl/m4/wint_t.m4
@@ -1,9 +1,10 @@
 # wint_t.m4
 # serial 11
-dnl Copyright (C) 2003, 2007-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2003, 2007-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl From Bruno Haible.
 dnl Test whether <wchar.h> has the 'wint_t' type and whether gnulib's
diff --git a/gl/m4/xalloc.m4 b/gl/m4/xalloc.m4
index d44d0f08..c10c4189 100644
--- a/gl/m4/xalloc.m4
+++ b/gl/m4/xalloc.m4
@@ -1,8 +1,9 @@
 # xalloc.m4
 # serial 18
-dnl Copyright (C) 2002-2006, 2009-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2002-2006, 2009-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_XALLOC], [:])
diff --git a/gl/m4/xsize.m4 b/gl/m4/xsize.m4
index e5784973..157d635c 100644
--- a/gl/m4/xsize.m4
+++ b/gl/m4/xsize.m4
@@ -1,9 +1,10 @@
 # xsize.m4
 # serial 5
-dnl Copyright (C) 2003-2004, 2008-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2003-2004, 2008-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 AC_DEFUN([gl_XSIZE],
 [
diff --git a/gl/m4/zzgnulib.m4 b/gl/m4/zzgnulib.m4
index 710fba4e..343bda5c 100644
--- a/gl/m4/zzgnulib.m4
+++ b/gl/m4/zzgnulib.m4
@@ -1,9 +1,10 @@
 # zzgnulib.m4
 # serial 1
-dnl Copyright (C) 2020-2024 Free Software Foundation, Inc.
+dnl Copyright (C) 2020-2025 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
+dnl This file is offered as-is, without any warranty.
 
 dnl This file must be named something that sorts after all other
 dnl package- or gnulib-provided .m4 files - at least for those packages
diff --git a/gl/malloc.c b/gl/malloc.c
index 2a7867a1..5642c83c 100644
--- a/gl/malloc.c
+++ b/gl/malloc.c
@@ -1,6 +1,6 @@
 /* malloc() function that is glibc compatible.
 
-   Copyright (C) 1997-1998, 2006-2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -17,28 +17,33 @@
 
 /* written by Jim Meyering and Bruno Haible */
 
+/* Ensure that we call the system's malloc() below.  */
 #define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
 #include <stdlib.h>
 
 #include <errno.h>
-
-#include "xalloc-oversized.h"
+#include <stdckdint.h>
 
 /* Allocate an N-byte block of memory from the heap, even if N is 0.  */
 
 void *
 rpl_malloc (size_t n)
 {
+#if !HAVE_MALLOC_0_NONNULL
   if (n == 0)
     n = 1;
+#endif
 
-  if (xalloc_oversized (n, 1))
+#if !HAVE_MALLOC_PTRDIFF
+  ptrdiff_t signed_n;
+  if (ckd_add (&signed_n, n, 0))
     {
       errno = ENOMEM;
       return NULL;
     }
+#endif
 
   void *result = malloc (n);
 
diff --git a/gl/malloc/dynarray-skeleton.c b/gl/malloc/dynarray-skeleton.c
index a95241ab..6b0585c1 100644
--- a/gl/malloc/dynarray-skeleton.c
+++ b/gl/malloc/dynarray-skeleton.c
@@ -1,5 +1,5 @@
 /* Type-safe arrays which grow dynamically.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/malloc/dynarray.h b/gl/malloc/dynarray.h
index 3163e278..6cbbe50e 100644
--- a/gl/malloc/dynarray.h
+++ b/gl/malloc/dynarray.h
@@ -1,5 +1,5 @@
 /* Type-safe arrays which grow dynamically.  Shared definitions.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/malloc/dynarray_at_failure.c b/gl/malloc/dynarray_at_failure.c
index 95e34e7a..b94ac3df 100644
--- a/gl/malloc/dynarray_at_failure.c
+++ b/gl/malloc/dynarray_at_failure.c
@@ -1,5 +1,5 @@
 /* Report an dynamic array index out of bounds condition.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/malloc/dynarray_emplace_enlarge.c b/gl/malloc/dynarray_emplace_enlarge.c
index 7bdba159..53126863 100644
--- a/gl/malloc/dynarray_emplace_enlarge.c
+++ b/gl/malloc/dynarray_emplace_enlarge.c
@@ -1,5 +1,5 @@
 /* Increase the size of a dynamic array in preparation of an emplace operation.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/malloc/dynarray_finalize.c b/gl/malloc/dynarray_finalize.c
index 52764f73..3178c687 100644
--- a/gl/malloc/dynarray_finalize.c
+++ b/gl/malloc/dynarray_finalize.c
@@ -1,5 +1,5 @@
 /* Copy the dynamically-allocated area to an explicitly-sized heap allocation.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/malloc/dynarray_resize.c b/gl/malloc/dynarray_resize.c
index 7323f8ee..3cd1626a 100644
--- a/gl/malloc/dynarray_resize.c
+++ b/gl/malloc/dynarray_resize.c
@@ -1,5 +1,5 @@
 /* Increase the size of a dynamic array.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/malloc/dynarray_resize_clear.c b/gl/malloc/dynarray_resize_clear.c
index aa17f740..7bfc0005 100644
--- a/gl/malloc/dynarray_resize_clear.c
+++ b/gl/malloc/dynarray_resize_clear.c
@@ -1,5 +1,5 @@
 /* Increase the size of a dynamic array and clear the new part.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/gl/malloca.c b/gl/malloca.c
index e75c72df..4bce9a3d 100644
--- a/gl/malloca.c
+++ b/gl/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003, 2018.
 
    This file is free software: you can redistribute it and/or modify
@@ -93,7 +93,7 @@ mmalloca (size_t n)
   /* Out of memory.  */
   return NULL;
 #else
-# if !MALLOC_0_IS_NONNULL
+# if !HAVE_MALLOC_0_NONNULL
   if (n == 0)
     n = 1;
 # endif
@@ -118,7 +118,7 @@ freea (void *p)
       char *cp = p;
       small_t *sp = p;
 # if defined __CHERI_PURE_CAPABILITY__
-      void *mem = sp[-1];
+      void *mem = (void *) sp[-1];
 # else
       void *mem = cp - sp[-1];
 # endif
diff --git a/gl/malloca.h b/gl/malloca.h
index c5208421..f131fd5a 100644
--- a/gl/malloca.h
+++ b/gl/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/math.c b/gl/math.c
index 78da4d4a..febdf82a 100644
--- a/gl/math.c
+++ b/gl/math.c
@@ -1,6 +1,6 @@
 /* Inline functions for <math.h>.
 
-   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+   Copyright (C) 2012-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+#define _GL_MATH_INLINE _GL_EXTERN_INLINE
 #include <config.h>
 
-#define _GL_MATH_INLINE _GL_EXTERN_INLINE
 #include <math.h>
 typedef int dummy;
diff --git a/gl/math.in.h b/gl/math.in.h
index 96d0da44..f4e80c53 100644
--- a/gl/math.in.h
+++ b/gl/math.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <math.h>.
 
-   Copyright (C) 2002-2003, 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -160,12 +160,23 @@ static void (*_gl_math_fix_itold) (long double *, int) = _Qp_itoq;
 #endif
 
 
+/* Ensure that INFINITY is a constant expression, of type 'float'.  */
+#if !defined INFINITY || (defined __FreeBSD__ && __FreeBSD__ < 8) || defined _AIX || defined __MINGW32__
+# undef INFINITY
+# if defined __GNUC__ || defined __clang__
+#  define INFINITY (__builtin_inff ())
+# else
+#  define INFINITY (1.0f / 0.0f)
+# endif
+#endif
+
 /* POSIX allows platforms that don't support NAN.  But all major
    machines in the past 15 years have supported something close to
    IEEE NaN, so we define this unconditionally.  We also must define
    it on platforms like Solaris 10, where NAN is present but defined
-   as a function pointer rather than a floating point constant.  */
-#if !defined NAN || @REPLACE_NAN@
+   as a function pointer rather than a floating point constant.
+   Also ensure that it is a constant expression, of type 'float'.  */
+#if !defined NAN || @REPLACE_NAN@ || (defined __FreeBSD__ && __FreeBSD__ < 8) || defined _AIX || defined __MINGW32__
 # if !GNULIB_defined_NAN
 #  undef NAN
   /* The Compaq (ex-DEC) C 6.4 compiler and the Microsoft MSVC 9 compiler
@@ -178,6 +189,8 @@ _NaN ()
   return zero / zero;
 }
 #   define NAN (_NaN())
+#  elif defined __GNUC__ || defined __clang__
+#   define NAN (__builtin_nanf (""))
 #  else
 #   define NAN (0.0f / 0.0f)
 #  endif
@@ -197,46 +210,46 @@ _NaN ()
 #endif
 
 /* HUGE_VALF is a 'float' Infinity.  */
-#ifndef HUGE_VALF
+#if !defined HUGE_VALF || (defined __FreeBSD__ && __FreeBSD__ < 6)
+# undef HUGE_VALF
 # if defined _MSC_VER
 /* The Microsoft MSVC 9 compiler chokes on the expression 1.0f / 0.0f.  */
 #  define HUGE_VALF (1e25f * 1e25f)
+# elif defined __GNUC__ || defined __clang__
+#  define HUGE_VALF (__builtin_inff ())
 # else
 #  define HUGE_VALF (1.0f / 0.0f)
 # endif
 #endif
 
 /* HUGE_VAL is a 'double' Infinity.  */
-#ifndef HUGE_VAL
+#if !defined HUGE_VAL || (defined __FreeBSD__ && __FreeBSD__ < 6) || defined _AIX
+# undef HUGE_VAL
 # if defined _MSC_VER
 /* The Microsoft MSVC 9 compiler chokes on the expression 1.0 / 0.0.  */
 #  define HUGE_VAL (1e250 * 1e250)
+# elif defined __GNUC__ || defined __clang__
+#  define HUGE_VAL (__builtin_inf ())
 # else
 #  define HUGE_VAL (1.0 / 0.0)
 # endif
 #endif
 
 /* HUGE_VALL is a 'long double' Infinity.  */
-#ifndef HUGE_VALL
+#if !defined HUGE_VALL || (defined __FreeBSD__ && __FreeBSD__ < 6) || defined _AIX
+# undef HUGE_VALL
 # if defined _MSC_VER
 /* The Microsoft MSVC 9 compiler chokes on the expression 1.0L / 0.0L.  */
 #  define HUGE_VALL (1e250L * 1e250L)
+# elif defined __GNUC__ || defined __clang__
+#  define HUGE_VALL (__builtin_infl ())
 # else
 #  define HUGE_VALL (1.0L / 0.0L)
 # endif
 #endif
 
 
-#if defined FP_ILOGB0 && defined FP_ILOGBNAN
- /* Ensure FP_ILOGB0 and FP_ILOGBNAN are correct.  */
-# if defined __HAIKU__
-  /* Haiku: match what ilogb() does */
-#  undef FP_ILOGB0
-#  undef FP_ILOGBNAN
-#  define FP_ILOGB0   (- 2147483647 - 1) /* INT_MIN */
-#  define FP_ILOGBNAN (- 2147483647 - 1) /* INT_MIN */
-# endif
-#else
+#if !(defined FP_ILOGB0 && defined FP_ILOGBNAN)
  /* Ensure FP_ILOGB0 and FP_ILOGBNAN are defined.  */
 # if defined __NetBSD__ || defined __sgi
   /* NetBSD, IRIX 6.5: match what ilogb() does */
@@ -264,12 +277,12 @@ _NaN ()
 #   undef acosf
 #   define acosf rpl_acosf
 #  endif
-_GL_FUNCDECL_RPL (acosf, float, (float x));
+_GL_FUNCDECL_RPL (acosf, float, (float x), );
 _GL_CXXALIAS_RPL (acosf, float, (float x));
 # else
 #  if !@HAVE_ACOSF@
 #   undef acosf
-_GL_FUNCDECL_SYS (acosf, float, (float x));
+_GL_FUNCDECL_SYS (acosf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (acosf, float, (float x));
 # endif
@@ -285,7 +298,7 @@ _GL_WARN_ON_USE (acosf, "acosf is unportable - "
 #if @GNULIB_ACOSL@
 # if !@HAVE_ACOSL@ || !@HAVE_DECL_ACOSL@
 #  undef acosl
-_GL_FUNCDECL_SYS (acosl, long double, (long double x));
+_GL_FUNCDECL_SYS (acosl, long double, (long double x), );
 # endif
 _GL_CXXALIAS_SYS (acosl, long double, (long double x));
 # if __GLIBC__ >= 2
@@ -306,12 +319,12 @@ _GL_WARN_ON_USE (acosl, "acosl is unportable - "
 #   undef asinf
 #   define asinf rpl_asinf
 #  endif
-_GL_FUNCDECL_RPL (asinf, float, (float x));
+_GL_FUNCDECL_RPL (asinf, float, (float x), );
 _GL_CXXALIAS_RPL (asinf, float, (float x));
 # else
 #  if !@HAVE_ASINF@
 #   undef asinf
-_GL_FUNCDECL_SYS (asinf, float, (float x));
+_GL_FUNCDECL_SYS (asinf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (asinf, float, (float x));
 # endif
@@ -327,7 +340,7 @@ _GL_WARN_ON_USE (asinf, "asinf is unportable - "
 #if @GNULIB_ASINL@
 # if !@HAVE_ASINL@ || !@HAVE_DECL_ASINL@
 #  undef asinl
-_GL_FUNCDECL_SYS (asinl, long double, (long double x));
+_GL_FUNCDECL_SYS (asinl, long double, (long double x), );
 # endif
 _GL_CXXALIAS_SYS (asinl, long double, (long double x));
 # if __GLIBC__ >= 2
@@ -348,12 +361,12 @@ _GL_WARN_ON_USE (asinl, "asinl is unportable - "
 #   undef atanf
 #   define atanf rpl_atanf
 #  endif
-_GL_FUNCDECL_RPL (atanf, float, (float x));
+_GL_FUNCDECL_RPL (atanf, float, (float x), );
 _GL_CXXALIAS_RPL (atanf, float, (float x));
 # else
 #  if !@HAVE_ATANF@
 #   undef atanf
-_GL_FUNCDECL_SYS (atanf, float, (float x));
+_GL_FUNCDECL_SYS (atanf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (atanf, float, (float x));
 # endif
@@ -369,7 +382,7 @@ _GL_WARN_ON_USE (atanf, "atanf is unportable - "
 #if @GNULIB_ATANL@
 # if !@HAVE_ATANL@ || !@HAVE_DECL_ATANL@
 #  undef atanl
-_GL_FUNCDECL_SYS (atanl, long double, (long double x));
+_GL_FUNCDECL_SYS (atanl, long double, (long double x), );
 # endif
 _GL_CXXALIAS_SYS (atanl, long double, (long double x));
 # if __GLIBC__ >= 2
@@ -390,12 +403,12 @@ _GL_WARN_ON_USE (atanl, "atanl is unportable - "
 #   undef atan2f
 #   define atan2f rpl_atan2f
 #  endif
-_GL_FUNCDECL_RPL (atan2f, float, (float y, float x));
+_GL_FUNCDECL_RPL (atan2f, float, (float y, float x), );
 _GL_CXXALIAS_RPL (atan2f, float, (float y, float x));
 # else
 #  if !@HAVE_ATAN2F@
 #   undef atan2f
-_GL_FUNCDECL_SYS (atan2f, float, (float y, float x));
+_GL_FUNCDECL_SYS (atan2f, float, (float y, float x), );
 #  endif
 _GL_CXXALIAS_SYS (atan2f, float, (float y, float x));
 # endif
@@ -415,11 +428,11 @@ _GL_WARN_ON_USE (atan2f, "atan2f is unportable - "
 #   undef cbrtf
 #   define cbrtf rpl_cbrtf
 #  endif
-_GL_FUNCDECL_RPL (cbrtf, float, (float x));
+_GL_FUNCDECL_RPL (cbrtf, float, (float x), );
 _GL_CXXALIAS_RPL (cbrtf, float, (float x));
 # else
 #  if !@HAVE_DECL_CBRTF@
-_GL_FUNCDECL_SYS (cbrtf, float, (float x));
+_GL_FUNCDECL_SYS (cbrtf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (cbrtf, float, (float x));
 # endif
@@ -434,7 +447,7 @@ _GL_WARN_ON_USE (cbrtf, "cbrtf is unportable - "
 
 #if @GNULIB_CBRT@
 # if !@HAVE_CBRT@
-_GL_FUNCDECL_SYS (cbrt, double, (double x));
+_GL_FUNCDECL_SYS (cbrt, double, (double x), );
 # endif
 _GL_CXXALIAS_SYS (cbrt, double, (double x));
 # if __GLIBC__ >= 2
@@ -454,11 +467,11 @@ _GL_WARN_ON_USE (cbrt, "cbrt is unportable - "
 #   undef cbrtl
 #   define cbrtl rpl_cbrtl
 #  endif
-_GL_FUNCDECL_RPL (cbrtl, long double, (long double x));
+_GL_FUNCDECL_RPL (cbrtl, long double, (long double x), );
 _GL_CXXALIAS_RPL (cbrtl, long double, (long double x));
 # else
 #  if !@HAVE_DECL_CBRTL@
-_GL_FUNCDECL_SYS (cbrtl, long double, (long double x));
+_GL_FUNCDECL_SYS (cbrtl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (cbrtl, long double, (long double x));
 # endif
@@ -480,12 +493,12 @@ _GL_WARN_ON_USE (cbrtl, "cbrtl is unportable - "
 #   undef ceilf
 #   define ceilf rpl_ceilf
 #  endif
-_GL_FUNCDECL_RPL (ceilf, float, (float x));
+_GL_FUNCDECL_RPL (ceilf, float, (float x), );
 _GL_CXXALIAS_RPL (ceilf, float, (float x));
 # else
 #  if !@HAVE_DECL_CEILF@
 #   undef ceilf
-_GL_FUNCDECL_SYS (ceilf, float, (float x));
+_GL_FUNCDECL_SYS (ceilf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (ceilf, float, (float x));
 # endif
@@ -504,7 +517,7 @@ _GL_WARN_ON_USE (ceilf, "ceilf is unportable - "
 #   undef ceil
 #   define ceil rpl_ceil
 #  endif
-_GL_FUNCDECL_RPL (ceil, double, (double x));
+_GL_FUNCDECL_RPL (ceil, double, (double x), );
 _GL_CXXALIAS_RPL (ceil, double, (double x));
 # else
 _GL_CXXALIAS_SYS (ceil, double, (double x));
@@ -520,12 +533,12 @@ _GL_CXXALIASWARN1 (ceil, double, (double x));
 #   undef ceill
 #   define ceill rpl_ceill
 #  endif
-_GL_FUNCDECL_RPL (ceill, long double, (long double x));
+_GL_FUNCDECL_RPL (ceill, long double, (long double x), );
 _GL_CXXALIAS_RPL (ceill, long double, (long double x));
 # else
 #  if !@HAVE_DECL_CEILL@
 #   undef ceill
-_GL_FUNCDECL_SYS (ceill, long double, (long double x));
+_GL_FUNCDECL_SYS (ceill, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (ceill, long double, (long double x));
 # endif
@@ -544,7 +557,7 @@ _GL_WARN_ON_USE (ceill, "ceill is unportable - "
 #if @GNULIB_COPYSIGNF@
 # if !@HAVE_DECL_COPYSIGNF@
 #  undef copysignf
-_GL_FUNCDECL_SYS (copysignf, float, (float x, float y));
+_GL_FUNCDECL_SYS (copysignf, float, (float x, float y), );
 # endif
 _GL_CXXALIAS_SYS (copysignf, float, (float x, float y));
 _GL_CXXALIASWARN (copysignf);
@@ -558,7 +571,7 @@ _GL_WARN_ON_USE (copysignf, "copysignf is unportable - "
 
 #if @GNULIB_COPYSIGN@
 # if !@HAVE_COPYSIGN@
-_GL_FUNCDECL_SYS (copysign, double, (double x, double y));
+_GL_FUNCDECL_SYS (copysign, double, (double x, double y), );
 # endif
 _GL_CXXALIAS_SYS (copysign, double, (double x, double y));
 # if __GLIBC__ >= 2
@@ -574,7 +587,7 @@ _GL_WARN_ON_USE (copysign, "copysign is unportable - "
 
 #if @GNULIB_COPYSIGNL@
 # if !@HAVE_COPYSIGNL@
-_GL_FUNCDECL_SYS (copysignl, long double, (long double x, long double y));
+_GL_FUNCDECL_SYS (copysignl, long double, (long double x, long double y), );
 # endif
 _GL_CXXALIAS_SYS (copysignl, long double, (long double x, long double y));
 # if __GLIBC__ >= 2
@@ -595,12 +608,12 @@ _GL_WARN_ON_USE (copysign, "copysignl is unportable - "
 #   undef cosf
 #   define cosf rpl_cosf
 #  endif
-_GL_FUNCDECL_RPL (cosf, float, (float x));
+_GL_FUNCDECL_RPL (cosf, float, (float x), );
 _GL_CXXALIAS_RPL (cosf, float, (float x));
 # else
 #  if !@HAVE_COSF@
 #   undef cosf
-_GL_FUNCDECL_SYS (cosf, float, (float x));
+_GL_FUNCDECL_SYS (cosf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (cosf, float, (float x));
 # endif
@@ -616,7 +629,7 @@ _GL_WARN_ON_USE (cosf, "cosf is unportable - "
 #if @GNULIB_COSL@
 # if !@HAVE_COSL@ || !@HAVE_DECL_COSL@
 #  undef cosl
-_GL_FUNCDECL_SYS (cosl, long double, (long double x));
+_GL_FUNCDECL_SYS (cosl, long double, (long double x), );
 # endif
 _GL_CXXALIAS_SYS (cosl, long double, (long double x));
 # if __GLIBC__ >= 2
@@ -637,12 +650,12 @@ _GL_WARN_ON_USE (cosl, "cosl is unportable - "
 #   undef coshf
 #   define coshf rpl_coshf
 #  endif
-_GL_FUNCDECL_RPL (coshf, float, (float x));
+_GL_FUNCDECL_RPL (coshf, float, (float x), );
 _GL_CXXALIAS_RPL (coshf, float, (float x));
 # else
 #  if !@HAVE_COSHF@
 #   undef coshf
-_GL_FUNCDECL_SYS (coshf, float, (float x));
+_GL_FUNCDECL_SYS (coshf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (coshf, float, (float x));
 # endif
@@ -662,12 +675,12 @@ _GL_WARN_ON_USE (coshf, "coshf is unportable - "
 #   undef expf
 #   define expf rpl_expf
 #  endif
-_GL_FUNCDECL_RPL (expf, float, (float x));
+_GL_FUNCDECL_RPL (expf, float, (float x), );
 _GL_CXXALIAS_RPL (expf, float, (float x));
 # else
 #  if !@HAVE_EXPF@
 #   undef expf
-_GL_FUNCDECL_SYS (expf, float, (float x));
+_GL_FUNCDECL_SYS (expf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (expf, float, (float x));
 # endif
@@ -686,12 +699,12 @@ _GL_WARN_ON_USE (expf, "expf is unportable - "
 #   undef expl
 #   define expl rpl_expl
 #  endif
-_GL_FUNCDECL_RPL (expl, long double, (long double x));
+_GL_FUNCDECL_RPL (expl, long double, (long double x), );
 _GL_CXXALIAS_RPL (expl, long double, (long double x));
 # else
 #  if !@HAVE_EXPL@ || !@HAVE_DECL_EXPL@
 #   undef expl
-_GL_FUNCDECL_SYS (expl, long double, (long double x));
+_GL_FUNCDECL_SYS (expl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (expl, long double, (long double x));
 # endif
@@ -709,7 +722,7 @@ _GL_WARN_ON_USE (expl, "expl is unportable - "
 
 #if @GNULIB_EXP2F@
 # if !@HAVE_DECL_EXP2F@
-_GL_FUNCDECL_SYS (exp2f, float, (float x));
+_GL_FUNCDECL_SYS (exp2f, float, (float x), );
 # endif
 _GL_CXXALIAS_SYS (exp2f, float, (float x));
 _GL_CXXALIASWARN (exp2f);
@@ -727,11 +740,11 @@ _GL_WARN_ON_USE (exp2f, "exp2f is unportable - "
 #   undef exp2
 #   define exp2 rpl_exp2
 #  endif
-_GL_FUNCDECL_RPL (exp2, double, (double x));
+_GL_FUNCDECL_RPL (exp2, double, (double x), );
 _GL_CXXALIAS_RPL (exp2, double, (double x));
 # else
 #  if !@HAVE_DECL_EXP2@
-_GL_FUNCDECL_SYS (exp2, double, (double x));
+_GL_FUNCDECL_SYS (exp2, double, (double x), );
 #  endif
 _GL_CXXALIAS_SYS (exp2, double, (double x));
 # endif
@@ -752,12 +765,12 @@ _GL_WARN_ON_USE (exp2, "exp2 is unportable - "
 #   undef exp2l
 #   define exp2l rpl_exp2l
 #  endif
-_GL_FUNCDECL_RPL (exp2l, long double, (long double x));
+_GL_FUNCDECL_RPL (exp2l, long double, (long double x), );
 _GL_CXXALIAS_RPL (exp2l, long double, (long double x));
 # else
 #  if !@HAVE_DECL_EXP2L@
 #   undef exp2l
-_GL_FUNCDECL_SYS (exp2l, long double, (long double x));
+_GL_FUNCDECL_SYS (exp2l, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (exp2l, long double, (long double x));
 # endif
@@ -779,11 +792,11 @@ _GL_WARN_ON_USE (exp2l, "exp2l is unportable - "
 #   undef expm1f
 #   define expm1f rpl_expm1f
 #  endif
-_GL_FUNCDECL_RPL (expm1f, float, (float x));
+_GL_FUNCDECL_RPL (expm1f, float, (float x), );
 _GL_CXXALIAS_RPL (expm1f, float, (float x));
 # else
 #  if !@HAVE_EXPM1F@
-_GL_FUNCDECL_SYS (expm1f, float, (float x));
+_GL_FUNCDECL_SYS (expm1f, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (expm1f, float, (float x));
 # endif
@@ -802,11 +815,11 @@ _GL_WARN_ON_USE (expm1f, "expm1f is unportable - "
 #   undef expm1
 #   define expm1 rpl_expm1
 #  endif
-_GL_FUNCDECL_RPL (expm1, double, (double x));
+_GL_FUNCDECL_RPL (expm1, double, (double x), );
 _GL_CXXALIAS_RPL (expm1, double, (double x));
 # else
 #  if !@HAVE_EXPM1@
-_GL_FUNCDECL_SYS (expm1, double, (double x));
+_GL_FUNCDECL_SYS (expm1, double, (double x), );
 #  endif
 _GL_CXXALIAS_SYS (expm1, double, (double x));
 # endif
@@ -827,13 +840,13 @@ _GL_WARN_ON_USE (expm1, "expm1 is unportable - "
 #   undef expm1l
 #   define expm1l rpl_expm1l
 #  endif
-_GL_FUNCDECL_RPL (expm1l, long double, (long double x));
+_GL_FUNCDECL_RPL (expm1l, long double, (long double x), );
 _GL_CXXALIAS_RPL (expm1l, long double, (long double x));
 # else
 #  if !@HAVE_DECL_EXPM1L@
 #   undef expm1l
 #   if !(defined __cplusplus && defined _AIX)
-_GL_FUNCDECL_SYS (expm1l, long double, (long double x));
+_GL_FUNCDECL_SYS (expm1l, long double, (long double x), );
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (expm1l, long double, (long double x));
@@ -853,7 +866,7 @@ _GL_WARN_ON_USE (expm1l, "expm1l is unportable - "
 #if @GNULIB_FABSF@
 # if !@HAVE_FABSF@
 #  undef fabsf
-_GL_FUNCDECL_SYS (fabsf, float, (float x));
+_GL_FUNCDECL_SYS (fabsf, float, (float x), );
 # endif
 _GL_CXXALIAS_SYS (fabsf, float, (float x));
 # if __GLIBC__ >= 2
@@ -873,12 +886,12 @@ _GL_WARN_ON_USE (fabsf, "fabsf is unportable - "
 #   undef fabsl
 #   define fabsl rpl_fabsl
 #  endif
-_GL_FUNCDECL_RPL (fabsl, long double, (long double x));
+_GL_FUNCDECL_RPL (fabsl, long double, (long double x), );
 _GL_CXXALIAS_RPL (fabsl, long double, (long double x));
 # else
 #  if !@HAVE_FABSL@
 #   undef fabsl
-_GL_FUNCDECL_SYS (fabsl, long double, (long double x));
+_GL_FUNCDECL_SYS (fabsl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (fabsl, long double, (long double x));
 # endif
@@ -900,12 +913,12 @@ _GL_WARN_ON_USE (fabsl, "fabsl is unportable - "
 #   undef floorf
 #   define floorf rpl_floorf
 #  endif
-_GL_FUNCDECL_RPL (floorf, float, (float x));
+_GL_FUNCDECL_RPL (floorf, float, (float x), );
 _GL_CXXALIAS_RPL (floorf, float, (float x));
 # else
 #  if !@HAVE_DECL_FLOORF@
 #   undef floorf
-_GL_FUNCDECL_SYS (floorf, float, (float x));
+_GL_FUNCDECL_SYS (floorf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (floorf, float, (float x));
 # endif
@@ -924,7 +937,7 @@ _GL_WARN_ON_USE (floorf, "floorf is unportable - "
 #   undef floor
 #   define floor rpl_floor
 #  endif
-_GL_FUNCDECL_RPL (floor, double, (double x));
+_GL_FUNCDECL_RPL (floor, double, (double x), );
 _GL_CXXALIAS_RPL (floor, double, (double x));
 # else
 _GL_CXXALIAS_SYS (floor, double, (double x));
@@ -940,12 +953,12 @@ _GL_CXXALIASWARN1 (floor, double, (double x));
 #   undef floorl
 #   define floorl rpl_floorl
 #  endif
-_GL_FUNCDECL_RPL (floorl, long double, (long double x));
+_GL_FUNCDECL_RPL (floorl, long double, (long double x), );
 _GL_CXXALIAS_RPL (floorl, long double, (long double x));
 # else
 #  if !@HAVE_DECL_FLOORL@
 #   undef floorl
-_GL_FUNCDECL_SYS (floorl, long double, (long double x));
+_GL_FUNCDECL_SYS (floorl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (floorl, long double, (long double x));
 # endif
@@ -967,12 +980,12 @@ _GL_WARN_ON_USE (floorl, "floorl is unportable - "
 #   undef fmaf
 #   define fmaf rpl_fmaf
 #  endif
-_GL_FUNCDECL_RPL (fmaf, float, (float x, float y, float z));
+_GL_FUNCDECL_RPL (fmaf, float, (float x, float y, float z), );
 _GL_CXXALIAS_RPL (fmaf, float, (float x, float y, float z));
 # else
 #  if !@HAVE_FMAF@
 #   undef fmaf
-_GL_FUNCDECL_SYS (fmaf, float, (float x, float y, float z));
+_GL_FUNCDECL_SYS (fmaf, float, (float x, float y, float z), );
 #  endif
 _GL_CXXALIAS_SYS (fmaf, float, (float x, float y, float z));
 # endif
@@ -991,12 +1004,12 @@ _GL_WARN_ON_USE (fmaf, "fmaf is unportable - "
 #   undef fma
 #   define fma rpl_fma
 #  endif
-_GL_FUNCDECL_RPL (fma, double, (double x, double y, double z));
+_GL_FUNCDECL_RPL (fma, double, (double x, double y, double z), );
 _GL_CXXALIAS_RPL (fma, double, (double x, double y, double z));
 # else
 #  if !@HAVE_FMA@
 #   undef fma
-_GL_FUNCDECL_SYS (fma, double, (double x, double y, double z));
+_GL_FUNCDECL_SYS (fma, double, (double x, double y, double z), );
 #  endif
 _GL_CXXALIAS_SYS (fma, double, (double x, double y, double z));
 # endif
@@ -1018,7 +1031,7 @@ _GL_WARN_ON_USE (fma, "fma is unportable - "
 #   define fmal rpl_fmal
 #  endif
 _GL_FUNCDECL_RPL (fmal, long double,
-                  (long double x, long double y, long double z));
+                  (long double x, long double y, long double z), );
 _GL_CXXALIAS_RPL (fmal, long double,
                   (long double x, long double y, long double z));
 # else
@@ -1026,7 +1039,7 @@ _GL_CXXALIAS_RPL (fmal, long double,
 #   undef fmal
 #   if !(defined __cplusplus && defined _AIX)
 _GL_FUNCDECL_SYS (fmal, long double,
-                  (long double x, long double y, long double z));
+                  (long double x, long double y, long double z), );
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (fmal, long double,
@@ -1050,12 +1063,12 @@ _GL_WARN_ON_USE (fmal, "fmal is unportable - "
 #   undef fmodf
 #   define fmodf rpl_fmodf
 #  endif
-_GL_FUNCDECL_RPL (fmodf, float, (float x, float y));
+_GL_FUNCDECL_RPL (fmodf, float, (float x, float y), );
 _GL_CXXALIAS_RPL (fmodf, float, (float x, float y));
 # else
 #  if !@HAVE_FMODF@
 #   undef fmodf
-_GL_FUNCDECL_SYS (fmodf, float, (float x, float y));
+_GL_FUNCDECL_SYS (fmodf, float, (float x, float y), );
 #  endif
 _GL_CXXALIAS_SYS (fmodf, float, (float x, float y));
 # endif
@@ -1074,7 +1087,7 @@ _GL_WARN_ON_USE (fmodf, "fmodf is unportable - "
 #   undef fmod
 #   define fmod rpl_fmod
 #  endif
-_GL_FUNCDECL_RPL (fmod, double, (double x, double y));
+_GL_FUNCDECL_RPL (fmod, double, (double x, double y), );
 _GL_CXXALIAS_RPL (fmod, double, (double x, double y));
 # else
 _GL_CXXALIAS_SYS (fmod, double, (double x, double y));
@@ -1096,12 +1109,12 @@ _GL_WARN_ON_USE (fmod, "fmod has portability problems - "
 #   undef fmodl
 #   define fmodl rpl_fmodl
 #  endif
-_GL_FUNCDECL_RPL (fmodl, long double, (long double x, long double y));
+_GL_FUNCDECL_RPL (fmodl, long double, (long double x, long double y), );
 _GL_CXXALIAS_RPL (fmodl, long double, (long double x, long double y));
 # else
 #  if !@HAVE_FMODL@
 #   undef fmodl
-_GL_FUNCDECL_SYS (fmodl, long double, (long double x, long double y));
+_GL_FUNCDECL_SYS (fmodl, long double, (long double x, long double y), );
 #  endif
 _GL_CXXALIAS_SYS (fmodl, long double, (long double x, long double y));
 # endif
@@ -1130,12 +1143,12 @@ _GL_WARN_ON_USE (fmodl, "fmodl is unportable - "
 #   undef frexpf
 #   define frexpf rpl_frexpf
 #  endif
-_GL_FUNCDECL_RPL (frexpf, float, (float x, int *expptr) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_RPL (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (frexpf, float, (float x, int *expptr));
 # else
 #  if !@HAVE_FREXPF@
 #   undef frexpf
-_GL_FUNCDECL_SYS (frexpf, float, (float x, int *expptr) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_SYS (frexpf, float, (float x, int *expptr), _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (frexpf, float, (float x, int *expptr));
 # endif
@@ -1163,7 +1176,8 @@ _GL_WARN_ON_USE (frexpf, "frexpf is unportable - "
 #   undef frexp
 #   define frexp rpl_frexp
 #  endif
-_GL_FUNCDECL_RPL (frexp, double, (double x, int *expptr) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_RPL (frexp, double, (double x, int *expptr),
+                                 _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (frexp, double, (double x, int *expptr));
 # else
 _GL_CXXALIAS_SYS (frexp, double, (double x, int *expptr));
@@ -1174,8 +1188,10 @@ _GL_CXXALIASWARN1 (frexp, double, (double x, int *expptr));
 #elif defined GNULIB_POSIXCHECK
 # undef frexp
 /* Assume frexp is always declared.  */
-_GL_WARN_ON_USE (frexp, "frexp is unportable - "
-                 "use gnulib module frexp for portability");
+_GL_WARN_ON_USE_CXX (frexp,
+                     double, double, (double, int *),
+                     "frexp is unportable - "
+                     "use gnulib module frexp for portability");
 #endif
 
 /* Write x as
@@ -1191,12 +1207,12 @@ _GL_WARN_ON_USE (frexp, "frexp is unportable - "
 #  define frexpl rpl_frexpl
 # endif
 _GL_FUNCDECL_RPL (frexpl, long double,
-                  (long double x, int *expptr) _GL_ARG_NONNULL ((2)));
+                  (long double x, int *expptr), _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (frexpl, long double, (long double x, int *expptr));
 #else
 # if !@HAVE_DECL_FREXPL@
 _GL_FUNCDECL_SYS (frexpl, long double,
-                  (long double x, int *expptr) _GL_ARG_NONNULL ((2)));
+                  (long double x, int *expptr), _GL_ARG_NONNULL ((2)));
 # endif
 # if @GNULIB_FREXPL@
 _GL_CXXALIAS_SYS (frexpl, long double, (long double x, int *expptr));
@@ -1223,11 +1239,11 @@ _GL_WARN_ON_USE (frexpl, "frexpl is unportable - "
 #   undef hypotf
 #   define hypotf rpl_hypotf
 #  endif
-_GL_FUNCDECL_RPL (hypotf, float, (float x, float y));
+_GL_FUNCDECL_RPL (hypotf, float, (float x, float y), );
 _GL_CXXALIAS_RPL (hypotf, float, (float x, float y));
 # else
 #  if !@HAVE_HYPOTF@
-_GL_FUNCDECL_SYS (hypotf, float, (float x, float y));
+_GL_FUNCDECL_SYS (hypotf, float, (float x, float y), );
 #  endif
 _GL_CXXALIAS_SYS (hypotf, float, (float x, float y));
 # endif
@@ -1249,7 +1265,7 @@ _GL_WARN_ON_USE (hypotf, "hypotf is unportable - "
 #   undef hypot
 #   define hypot rpl_hypot
 #  endif
-_GL_FUNCDECL_RPL (hypot, double, (double x, double y));
+_GL_FUNCDECL_RPL (hypot, double, (double x, double y), );
 _GL_CXXALIAS_RPL (hypot, double, (double x, double y));
 # else
 _GL_CXXALIAS_SYS (hypot, double, (double x, double y));
@@ -1272,11 +1288,11 @@ _GL_WARN_ON_USE (hypotf, "hypot has portability problems - "
 #   undef hypotl
 #   define hypotl rpl_hypotl
 #  endif
-_GL_FUNCDECL_RPL (hypotl, long double, (long double x, long double y));
+_GL_FUNCDECL_RPL (hypotl, long double, (long double x, long double y), );
 _GL_CXXALIAS_RPL (hypotl, long double, (long double x, long double y));
 # else
 #  if !@HAVE_HYPOTL@
-_GL_FUNCDECL_SYS (hypotl, long double, (long double x, long double y));
+_GL_FUNCDECL_SYS (hypotl, long double, (long double x, long double y), );
 #  endif
 _GL_CXXALIAS_SYS (hypotl, long double, (long double x, long double y));
 # endif
@@ -1298,11 +1314,11 @@ _GL_WARN_ON_USE (hypotl, "hypotl is unportable - "
 #   undef ilogbf
 #   define ilogbf rpl_ilogbf
 #  endif
-_GL_FUNCDECL_RPL (ilogbf, int, (float x));
+_GL_FUNCDECL_RPL (ilogbf, int, (float x), );
 _GL_CXXALIAS_RPL (ilogbf, int, (float x));
 # else
 #  if !@HAVE_ILOGBF@
-_GL_FUNCDECL_SYS (ilogbf, int, (float x));
+_GL_FUNCDECL_SYS (ilogbf, int, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (ilogbf, int, (float x));
 # endif
@@ -1321,11 +1337,11 @@ _GL_WARN_ON_USE (ilogbf, "ilogbf is unportable - "
 #   undef ilogb
 #   define ilogb rpl_ilogb
 #  endif
-_GL_FUNCDECL_RPL (ilogb, int, (double x));
+_GL_FUNCDECL_RPL (ilogb, int, (double x), );
 _GL_CXXALIAS_RPL (ilogb, int, (double x));
 # else
 #  if !@HAVE_ILOGB@
-_GL_FUNCDECL_SYS (ilogb, int, (double x));
+_GL_FUNCDECL_SYS (ilogb, int, (double x), );
 #  endif
 _GL_CXXALIAS_SYS (ilogb, int, (double x));
 # endif
@@ -1346,12 +1362,12 @@ _GL_WARN_ON_USE (ilogb, "ilogb is unportable - "
 #   undef ilogbl
 #   define ilogbl rpl_ilogbl
 #  endif
-_GL_FUNCDECL_RPL (ilogbl, int, (long double x));
+_GL_FUNCDECL_RPL (ilogbl, int, (long double x), );
 _GL_CXXALIAS_RPL (ilogbl, int, (long double x));
 # else
 #  if !@HAVE_ILOGBL@
 #   undef ilogbl
-_GL_FUNCDECL_SYS (ilogbl, int, (long double x));
+_GL_FUNCDECL_SYS (ilogbl, int, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (ilogbl, int, (long double x));
 # endif
@@ -1420,7 +1436,7 @@ _GL_CXXALIASWARN (jn);
 #if @GNULIB_LDEXPF@
 # if !@HAVE_LDEXPF@
 #  undef ldexpf
-_GL_FUNCDECL_SYS (ldexpf, float, (float x, int exp));
+_GL_FUNCDECL_SYS (ldexpf, float, (float x, int exp), );
 # endif
 _GL_CXXALIAS_SYS (ldexpf, float, (float x, int exp));
 # if __GLIBC__ >= 2
@@ -1441,7 +1457,7 @@ _GL_WARN_ON_USE (ldexpf, "ldexpf is unportable - "
 #   undef ldexp
 #   define ldexp rpl_ldexp
 #  endif
-_GL_FUNCDECL_RPL (ldexp, double, (double x, int exp));
+_GL_FUNCDECL_RPL (ldexp, double, (double x, int exp), );
 _GL_CXXALIAS_RPL (ldexp, double, (double x, int exp));
 # else
 /* Assume ldexp is always declared.  */
@@ -1453,8 +1469,10 @@ _GL_CXXALIASWARN1 (ldexp, double, (double x, int exp));
 #elif defined GNULIB_POSIXCHECK
 # undef ldexp
 /* Assume ldexp is always declared.  */
-_GL_WARN_ON_USE (ldexp, "ldexp is unportable - "
-                 "use gnulib module ldexp for portability");
+_GL_WARN_ON_USE_CXX (ldexp,
+                     double, double, (double, int),
+                     "ldexp is unportable - "
+                     "use gnulib module ldexp for portability");
 #endif
 
 /* Return x * 2^exp.  */
@@ -1463,11 +1481,11 @@ _GL_WARN_ON_USE (ldexp, "ldexp is unportable - "
 #  undef ldexpl
 #  define ldexpl rpl_ldexpl
 # endif
-_GL_FUNCDECL_RPL (ldexpl, long double, (long double x, int exp));
+_GL_FUNCDECL_RPL (ldexpl, long double, (long double x, int exp), );
 _GL_CXXALIAS_RPL (ldexpl, long double, (long double x, int exp));
 #else
 # if !@HAVE_DECL_LDEXPL@
-_GL_FUNCDECL_SYS (ldexpl, long double, (long double x, int exp));
+_GL_FUNCDECL_SYS (ldexpl, long double, (long double x, int exp), );
 # endif
 # if @GNULIB_LDEXPL@
 _GL_CXXALIAS_SYS (ldexpl, long double, (long double x, int exp));
@@ -1493,12 +1511,12 @@ _GL_WARN_ON_USE (ldexpl, "ldexpl is unportable - "
 #   undef logf
 #   define logf rpl_logf
 #  endif
-_GL_FUNCDECL_RPL (logf, float, (float x));
+_GL_FUNCDECL_RPL (logf, float, (float x), );
 _GL_CXXALIAS_RPL (logf, float, (float x));
 # else
 #  if !@HAVE_LOGF@
 #   undef logf
-_GL_FUNCDECL_SYS (logf, float, (float x));
+_GL_FUNCDECL_SYS (logf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (logf, float, (float x));
 # endif
@@ -1517,7 +1535,7 @@ _GL_WARN_ON_USE (logf, "logf is unportable - "
 #   undef log
 #   define log rpl_log
 #  endif
-_GL_FUNCDECL_RPL (log, double, (double x));
+_GL_FUNCDECL_RPL (log, double, (double x), );
 _GL_CXXALIAS_RPL (log, double, (double x));
 # else
 _GL_CXXALIAS_SYS (log, double, (double x));
@@ -1539,12 +1557,12 @@ _GL_WARN_ON_USE (log, "log has portability problems - "
 #   undef logl
 #   define logl rpl_logl
 #  endif
-_GL_FUNCDECL_RPL (logl, long double, (long double x));
+_GL_FUNCDECL_RPL (logl, long double, (long double x), );
 _GL_CXXALIAS_RPL (logl, long double, (long double x));
 # else
 #  if !@HAVE_LOGL@ || !@HAVE_DECL_LOGL@
 #   undef logl
-_GL_FUNCDECL_SYS (logl, long double, (long double x));
+_GL_FUNCDECL_SYS (logl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (logl, long double, (long double x));
 # endif
@@ -1566,12 +1584,12 @@ _GL_WARN_ON_USE (logl, "logl is unportable - "
 #   undef log10f
 #   define log10f rpl_log10f
 #  endif
-_GL_FUNCDECL_RPL (log10f, float, (float x));
+_GL_FUNCDECL_RPL (log10f, float, (float x), );
 _GL_CXXALIAS_RPL (log10f, float, (float x));
 # else
 #  if !@HAVE_LOG10F@
 #   undef log10f
-_GL_FUNCDECL_SYS (log10f, float, (float x));
+_GL_FUNCDECL_SYS (log10f, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (log10f, float, (float x));
 # endif
@@ -1590,7 +1608,7 @@ _GL_WARN_ON_USE (log10f, "log10f is unportable - "
 #   undef log10
 #   define log10 rpl_log10
 #  endif
-_GL_FUNCDECL_RPL (log10, double, (double x));
+_GL_FUNCDECL_RPL (log10, double, (double x), );
 _GL_CXXALIAS_RPL (log10, double, (double x));
 # else
 _GL_CXXALIAS_SYS (log10, double, (double x));
@@ -1612,12 +1630,12 @@ _GL_WARN_ON_USE (log10, "log10 has portability problems - "
 #   undef log10l
 #   define log10l rpl_log10l
 #  endif
-_GL_FUNCDECL_RPL (log10l, long double, (long double x));
+_GL_FUNCDECL_RPL (log10l, long double, (long double x), );
 _GL_CXXALIAS_RPL (log10l, long double, (long double x));
 # else
 #  if !@HAVE_LOG10L@ || !@HAVE_DECL_LOG10L@
 #   undef log10l
-_GL_FUNCDECL_SYS (log10l, long double, (long double x));
+_GL_FUNCDECL_SYS (log10l, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (log10l, long double, (long double x));
 # endif
@@ -1639,11 +1657,11 @@ _GL_WARN_ON_USE (log10l, "log10l is unportable - "
 #   undef log1pf
 #   define log1pf rpl_log1pf
 #  endif
-_GL_FUNCDECL_RPL (log1pf, float, (float x));
+_GL_FUNCDECL_RPL (log1pf, float, (float x), );
 _GL_CXXALIAS_RPL (log1pf, float, (float x));
 # else
 #  if !@HAVE_LOG1PF@
-_GL_FUNCDECL_SYS (log1pf, float, (float x));
+_GL_FUNCDECL_SYS (log1pf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (log1pf, float, (float x));
 # endif
@@ -1662,11 +1680,11 @@ _GL_WARN_ON_USE (log1pf, "log1pf is unportable - "
 #   undef log1p
 #   define log1p rpl_log1p
 #  endif
-_GL_FUNCDECL_RPL (log1p, double, (double x));
+_GL_FUNCDECL_RPL (log1p, double, (double x), );
 _GL_CXXALIAS_RPL (log1p, double, (double x));
 # else
 #  if !@HAVE_LOG1P@
-_GL_FUNCDECL_SYS (log1p, double, (double x));
+_GL_FUNCDECL_SYS (log1p, double, (double x), );
 #  endif
 _GL_CXXALIAS_SYS (log1p, double, (double x));
 # endif
@@ -1687,11 +1705,11 @@ _GL_WARN_ON_USE (log1p, "log1p has portability problems - "
 #   undef log1pl
 #   define log1pl rpl_log1pl
 #  endif
-_GL_FUNCDECL_RPL (log1pl, long double, (long double x));
+_GL_FUNCDECL_RPL (log1pl, long double, (long double x), );
 _GL_CXXALIAS_RPL (log1pl, long double, (long double x));
 # else
 #  if !@HAVE_LOG1PL@
-_GL_FUNCDECL_SYS (log1pl, long double, (long double x));
+_GL_FUNCDECL_SYS (log1pl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (log1pl, long double, (long double x));
 # endif
@@ -1713,12 +1731,12 @@ _GL_WARN_ON_USE (log1pl, "log1pl has portability problems - "
 #   undef log2f
 #   define log2f rpl_log2f
 #  endif
-_GL_FUNCDECL_RPL (log2f, float, (float x));
+_GL_FUNCDECL_RPL (log2f, float, (float x), );
 _GL_CXXALIAS_RPL (log2f, float, (float x));
 # else
 #  if !@HAVE_DECL_LOG2F@
 #   undef log2f
-_GL_FUNCDECL_SYS (log2f, float, (float x));
+_GL_FUNCDECL_SYS (log2f, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (log2f, float, (float x));
 # endif
@@ -1739,12 +1757,12 @@ _GL_WARN_ON_USE (log2f, "log2f is unportable - "
 #   undef log2
 #   define log2 rpl_log2
 #  endif
-_GL_FUNCDECL_RPL (log2, double, (double x));
+_GL_FUNCDECL_RPL (log2, double, (double x), );
 _GL_CXXALIAS_RPL (log2, double, (double x));
 # else
 #  if !@HAVE_DECL_LOG2@
 #   undef log2
-_GL_FUNCDECL_SYS (log2, double, (double x));
+_GL_FUNCDECL_SYS (log2, double, (double x), );
 #  endif
 _GL_CXXALIAS_SYS (log2, double, (double x));
 # endif
@@ -1765,11 +1783,11 @@ _GL_WARN_ON_USE (log2, "log2 is unportable - "
 #   undef log2l
 #   define log2l rpl_log2l
 #  endif
-_GL_FUNCDECL_RPL (log2l, long double, (long double x));
+_GL_FUNCDECL_RPL (log2l, long double, (long double x), );
 _GL_CXXALIAS_RPL (log2l, long double, (long double x));
 # else
 #  if !@HAVE_DECL_LOG2L@
-_GL_FUNCDECL_SYS (log2l, long double, (long double x));
+_GL_FUNCDECL_SYS (log2l, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (log2l, long double, (long double x));
 # endif
@@ -1791,11 +1809,11 @@ _GL_WARN_ON_USE (log2l, "log2l is unportable - "
 #   undef logbf
 #   define logbf rpl_logbf
 #  endif
-_GL_FUNCDECL_RPL (logbf, float, (float x));
+_GL_FUNCDECL_RPL (logbf, float, (float x), );
 _GL_CXXALIAS_RPL (logbf, float, (float x));
 # else
 #  if !@HAVE_LOGBF@
-_GL_FUNCDECL_SYS (logbf, float, (float x));
+_GL_FUNCDECL_SYS (logbf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (logbf, float, (float x));
 # endif
@@ -1814,11 +1832,11 @@ _GL_WARN_ON_USE (logbf, "logbf is unportable - "
 #   undef logb
 #   define logb rpl_logb
 #  endif
-_GL_FUNCDECL_RPL (logb, double, (double x));
+_GL_FUNCDECL_RPL (logb, double, (double x), );
 _GL_CXXALIAS_RPL (logb, double, (double x));
 # else
 #  if !@HAVE_DECL_LOGB@
-_GL_FUNCDECL_SYS (logb, double, (double x));
+_GL_FUNCDECL_SYS (logb, double, (double x), );
 #  endif
 _GL_CXXALIAS_SYS (logb, double, (double x));
 # endif
@@ -1839,11 +1857,11 @@ _GL_WARN_ON_USE (logb, "logb is unportable - "
 #   undef logbl
 #   define logbl rpl_logbl
 #  endif
-_GL_FUNCDECL_RPL (logbl, long double, (long double x));
+_GL_FUNCDECL_RPL (logbl, long double, (long double x), );
 _GL_CXXALIAS_RPL (logbl, long double, (long double x));
 # else
 #  if !@HAVE_LOGBL@
-_GL_FUNCDECL_SYS (logbl, long double, (long double x));
+_GL_FUNCDECL_SYS (logbl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (logbl, long double, (long double x));
 # endif
@@ -1859,18 +1877,67 @@ _GL_WARN_ON_USE (logbl, "logbl is unportable - "
 #endif
 
 
+#if @GNULIB_LOGP1F@
+# if !@HAVE_LOGP1F@
+_GL_FUNCDECL_SYS (logp1f, float, (float x), );
+# endif
+_GL_CXXALIAS_SYS (logp1f, float, (float x));
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN1 (logp1f, float, (float x));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef logp1f
+# if HAVE_RAW_DECL_LOGP1F
+_GL_WARN_ON_USE (logp1f, "logp1f is unportable - "
+                 "use gnulib module logp1f for portability");
+# endif
+#endif
+
+#if @GNULIB_LOGP1@
+# if !@HAVE_LOGP1@
+_GL_FUNCDECL_SYS (logp1, double, (double x), );
+# endif
+_GL_CXXALIAS_SYS (logp1, double, (double x));
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN1 (logp1, double, (double x));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef logp1
+# if HAVE_RAW_DECL_LOGP1
+_GL_WARN_ON_USE (logp1, "logp1 is unportable - "
+                 "use gnulib module logp1 for portability");
+# endif
+#endif
+
+#if @GNULIB_LOGP1L@
+# if !@HAVE_LOGP1L@
+_GL_FUNCDECL_SYS (logp1l, long double, (long double x), );
+# endif
+_GL_CXXALIAS_SYS (logp1l, long double, (long double x));
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN1 (logp1l, long double, (long double x));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef logp1l
+# if HAVE_RAW_DECL_LOGP1L
+_GL_WARN_ON_USE (logp1l, "logp1l is unportable - "
+                 "use gnulib module logp1l for portability");
+# endif
+#endif
+
+
 #if @GNULIB_MODFF@
 # if @REPLACE_MODFF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef modff
 #   define modff rpl_modff
 #  endif
-_GL_FUNCDECL_RPL (modff, float, (float x, float *iptr) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_RPL (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (modff, float, (float x, float *iptr));
 # else
 #  if !@HAVE_MODFF@
 #   undef modff
-_GL_FUNCDECL_SYS (modff, float, (float x, float *iptr) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_SYS (modff, float, (float x, float *iptr), _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (modff, float, (float x, float *iptr));
 # endif
@@ -1889,7 +1956,8 @@ _GL_WARN_ON_USE (modff, "modff is unportable - "
 #   undef modf
 #   define modf rpl_modf
 #  endif
-_GL_FUNCDECL_RPL (modf, double, (double x, double *iptr) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_RPL (modf, double, (double x, double *iptr),
+                                _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (modf, double, (double x, double *iptr));
 # else
 _GL_CXXALIAS_SYS (modf, double, (double x, double *iptr));
@@ -1911,13 +1979,13 @@ _GL_WARN_ON_USE (modf, "modf has portability problems - "
 #   undef modfl
 #   define modfl rpl_modfl
 #  endif
-_GL_FUNCDECL_RPL (modfl, long double, (long double x, long double *iptr)
+_GL_FUNCDECL_RPL (modfl, long double, (long double x, long double *iptr),
                                       _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (modfl, long double, (long double x, long double *iptr));
 # else
 #  if !@HAVE_MODFL@
 #   undef modfl
-_GL_FUNCDECL_SYS (modfl, long double, (long double x, long double *iptr)
+_GL_FUNCDECL_SYS (modfl, long double, (long double x, long double *iptr),
                                       _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (modfl, long double, (long double x, long double *iptr));
@@ -1937,7 +2005,7 @@ _GL_WARN_ON_USE (modfl, "modfl is unportable - "
 #if @GNULIB_POWF@
 # if !@HAVE_POWF@
 #  undef powf
-_GL_FUNCDECL_SYS (powf, float, (float x, float y));
+_GL_FUNCDECL_SYS (powf, float, (float x, float y), );
 # endif
 _GL_CXXALIAS_SYS (powf, float, (float x, float y));
 _GL_CXXALIASWARN (powf);
@@ -1956,11 +2024,11 @@ _GL_WARN_ON_USE (powf, "powf is unportable - "
 #   undef remainderf
 #   define remainderf rpl_remainderf
 #  endif
-_GL_FUNCDECL_RPL (remainderf, float, (float x, float y));
+_GL_FUNCDECL_RPL (remainderf, float, (float x, float y), );
 _GL_CXXALIAS_RPL (remainderf, float, (float x, float y));
 # else
 #  if !@HAVE_REMAINDERF@
-_GL_FUNCDECL_SYS (remainderf, float, (float x, float y));
+_GL_FUNCDECL_SYS (remainderf, float, (float x, float y), );
 #  endif
 _GL_CXXALIAS_SYS (remainderf, float, (float x, float y));
 # endif
@@ -1979,11 +2047,11 @@ _GL_WARN_ON_USE (remainderf, "remainderf is unportable - "
 #   undef remainder
 #   define remainder rpl_remainder
 #  endif
-_GL_FUNCDECL_RPL (remainder, double, (double x, double y));
+_GL_FUNCDECL_RPL (remainder, double, (double x, double y), );
 _GL_CXXALIAS_RPL (remainder, double, (double x, double y));
 # else
 #  if !@HAVE_REMAINDER@ || !@HAVE_DECL_REMAINDER@
-_GL_FUNCDECL_SYS (remainder, double, (double x, double y));
+_GL_FUNCDECL_SYS (remainder, double, (double x, double y), );
 #  endif
 _GL_CXXALIAS_SYS (remainder, double, (double x, double y));
 # endif
@@ -2004,13 +2072,13 @@ _GL_WARN_ON_USE (remainder, "remainder is unportable - "
 #   undef remainderl
 #   define remainderl rpl_remainderl
 #  endif
-_GL_FUNCDECL_RPL (remainderl, long double, (long double x, long double y));
+_GL_FUNCDECL_RPL (remainderl, long double, (long double x, long double y), );
 _GL_CXXALIAS_RPL (remainderl, long double, (long double x, long double y));
 # else
 #  if !@HAVE_DECL_REMAINDERL@
 #   undef remainderl
 #   if !(defined __cplusplus && defined _AIX)
-_GL_FUNCDECL_SYS (remainderl, long double, (long double x, long double y));
+_GL_FUNCDECL_SYS (remainderl, long double, (long double x, long double y), );
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (remainderl, long double, (long double x, long double y));
@@ -2029,7 +2097,7 @@ _GL_WARN_ON_USE (remainderl, "remainderl is unportable - "
 
 #if @GNULIB_RINTF@
 # if !@HAVE_DECL_RINTF@
-_GL_FUNCDECL_SYS (rintf, float, (float x));
+_GL_FUNCDECL_SYS (rintf, float, (float x), );
 # endif
 _GL_CXXALIAS_SYS (rintf, float, (float x));
 _GL_CXXALIASWARN (rintf);
@@ -2043,7 +2111,7 @@ _GL_WARN_ON_USE (rintf, "rintf is unportable - "
 
 #if @GNULIB_RINT@
 # if !@HAVE_RINT@
-_GL_FUNCDECL_SYS (rint, double, (double x));
+_GL_FUNCDECL_SYS (rint, double, (double x), );
 # endif
 _GL_CXXALIAS_SYS (rint, double, (double x));
 # if __GLIBC__ >= 2
@@ -2063,11 +2131,11 @@ _GL_WARN_ON_USE (rint, "rint is unportable - "
 #   undef rintl
 #   define rintl rpl_rintl
 #  endif
-_GL_FUNCDECL_RPL (rintl, long double, (long double x));
+_GL_FUNCDECL_RPL (rintl, long double, (long double x), );
 _GL_CXXALIAS_RPL (rintl, long double, (long double x));
 # else
 #  if !@HAVE_RINTL@
-_GL_FUNCDECL_SYS (rintl, long double, (long double x));
+_GL_FUNCDECL_SYS (rintl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (rintl, long double, (long double x));
 # endif
@@ -2089,11 +2157,11 @@ _GL_WARN_ON_USE (rintl, "rintl is unportable - "
 #   undef roundf
 #   define roundf rpl_roundf
 #  endif
-_GL_FUNCDECL_RPL (roundf, float, (float x));
+_GL_FUNCDECL_RPL (roundf, float, (float x), );
 _GL_CXXALIAS_RPL (roundf, float, (float x));
 # else
 #  if !@HAVE_DECL_ROUNDF@
-_GL_FUNCDECL_SYS (roundf, float, (float x));
+_GL_FUNCDECL_SYS (roundf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (roundf, float, (float x));
 # endif
@@ -2112,11 +2180,11 @@ _GL_WARN_ON_USE (roundf, "roundf is unportable - "
 #   undef round
 #   define round rpl_round
 #  endif
-_GL_FUNCDECL_RPL (round, double, (double x));
+_GL_FUNCDECL_RPL (round, double, (double x), );
 _GL_CXXALIAS_RPL (round, double, (double x));
 # else
 #  if !@HAVE_DECL_ROUND@
-_GL_FUNCDECL_SYS (round, double, (double x));
+_GL_FUNCDECL_SYS (round, double, (double x), );
 #  endif
 _GL_CXXALIAS_SYS (round, double, (double x));
 # endif
@@ -2137,13 +2205,13 @@ _GL_WARN_ON_USE (round, "round is unportable - "
 #   undef roundl
 #   define roundl rpl_roundl
 #  endif
-_GL_FUNCDECL_RPL (roundl, long double, (long double x));
+_GL_FUNCDECL_RPL (roundl, long double, (long double x), );
 _GL_CXXALIAS_RPL (roundl, long double, (long double x));
 # else
 #  if !@HAVE_DECL_ROUNDL@
 #   undef roundl
 #   if !(defined __cplusplus && defined _AIX)
-_GL_FUNCDECL_SYS (roundl, long double, (long double x));
+_GL_FUNCDECL_SYS (roundl, long double, (long double x), );
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (roundl, long double, (long double x));
@@ -2166,12 +2234,12 @@ _GL_WARN_ON_USE (roundl, "roundl is unportable - "
 #   undef sinf
 #   define sinf rpl_sinf
 #  endif
-_GL_FUNCDECL_RPL (sinf, float, (float x));
+_GL_FUNCDECL_RPL (sinf, float, (float x), );
 _GL_CXXALIAS_RPL (sinf, float, (float x));
 # else
 #  if !@HAVE_SINF@
 #   undef sinf
-_GL_FUNCDECL_SYS (sinf, float, (float x));
+_GL_FUNCDECL_SYS (sinf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (sinf, float, (float x));
 # endif
@@ -2185,11 +2253,20 @@ _GL_WARN_ON_USE (sinf, "sinf is unportable - "
 #endif
 
 #if @GNULIB_SINL@
-# if !@HAVE_SINL@ || !@HAVE_DECL_SINL@
-#  undef sinl
-_GL_FUNCDECL_SYS (sinl, long double, (long double x));
-# endif
+# if @REPLACE_SINL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef sinl
+#   define sinl rpl_sinl
+#  endif
+_GL_FUNCDECL_RPL (sinl, long double, (long double x), );
+_GL_CXXALIAS_RPL (sinl, long double, (long double x));
+# else
+#  if !@HAVE_SINL@ || !@HAVE_DECL_SINL@
+#   undef sinl
+_GL_FUNCDECL_SYS (sinl, long double, (long double x), );
+#  endif
 _GL_CXXALIAS_SYS (sinl, long double, (long double x));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (sinl);
 # endif
@@ -2208,12 +2285,12 @@ _GL_WARN_ON_USE (sinl, "sinl is unportable - "
 #   undef sinhf
 #   define sinhf rpl_sinhf
 #  endif
-_GL_FUNCDECL_RPL (sinhf, float, (float x));
+_GL_FUNCDECL_RPL (sinhf, float, (float x), );
 _GL_CXXALIAS_RPL (sinhf, float, (float x));
 # else
 #  if !@HAVE_SINHF@
 #   undef sinhf
-_GL_FUNCDECL_SYS (sinhf, float, (float x));
+_GL_FUNCDECL_SYS (sinhf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (sinhf, float, (float x));
 # endif
@@ -2233,12 +2310,12 @@ _GL_WARN_ON_USE (sinhf, "sinhf is unportable - "
 #   undef sqrtf
 #   define sqrtf rpl_sqrtf
 #  endif
-_GL_FUNCDECL_RPL (sqrtf, float, (float x));
+_GL_FUNCDECL_RPL (sqrtf, float, (float x), );
 _GL_CXXALIAS_RPL (sqrtf, float, (float x));
 # else
 #  if !@HAVE_SQRTF@
 #   undef sqrtf
-_GL_FUNCDECL_SYS (sqrtf, float, (float x));
+_GL_FUNCDECL_SYS (sqrtf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (sqrtf, float, (float x));
 # endif
@@ -2257,12 +2334,12 @@ _GL_WARN_ON_USE (sqrtf, "sqrtf is unportable - "
 #   undef sqrtl
 #   define sqrtl rpl_sqrtl
 #  endif
-_GL_FUNCDECL_RPL (sqrtl, long double, (long double x));
+_GL_FUNCDECL_RPL (sqrtl, long double, (long double x), );
 _GL_CXXALIAS_RPL (sqrtl, long double, (long double x));
 # else
 #  if !@HAVE_SQRTL@ || !@HAVE_DECL_SQRTL@
 #   undef sqrtl
-_GL_FUNCDECL_SYS (sqrtl, long double, (long double x));
+_GL_FUNCDECL_SYS (sqrtl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (sqrtl, long double, (long double x));
 # endif
@@ -2284,12 +2361,12 @@ _GL_WARN_ON_USE (sqrtl, "sqrtl is unportable - "
 #   undef tanf
 #   define tanf rpl_tanf
 #  endif
-_GL_FUNCDECL_RPL (tanf, float, (float x));
+_GL_FUNCDECL_RPL (tanf, float, (float x), );
 _GL_CXXALIAS_RPL (tanf, float, (float x));
 # else
 #  if !@HAVE_TANF@
 #   undef tanf
-_GL_FUNCDECL_SYS (tanf, float, (float x));
+_GL_FUNCDECL_SYS (tanf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (tanf, float, (float x));
 # endif
@@ -2305,7 +2382,7 @@ _GL_WARN_ON_USE (tanf, "tanf is unportable - "
 #if @GNULIB_TANL@
 # if !@HAVE_TANL@ || !@HAVE_DECL_TANL@
 #  undef tanl
-_GL_FUNCDECL_SYS (tanl, long double, (long double x));
+_GL_FUNCDECL_SYS (tanl, long double, (long double x), );
 # endif
 _GL_CXXALIAS_SYS (tanl, long double, (long double x));
 # if __GLIBC__ >= 2
@@ -2326,12 +2403,12 @@ _GL_WARN_ON_USE (tanl, "tanl is unportable - "
 #   undef tanhf
 #   define tanhf rpl_tanhf
 #  endif
-_GL_FUNCDECL_RPL (tanhf, float, (float x));
+_GL_FUNCDECL_RPL (tanhf, float, (float x), );
 _GL_CXXALIAS_RPL (tanhf, float, (float x));
 # else
 #  if !@HAVE_TANHF@
 #   undef tanhf
-_GL_FUNCDECL_SYS (tanhf, float, (float x));
+_GL_FUNCDECL_SYS (tanhf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (tanhf, float, (float x));
 # endif
@@ -2351,11 +2428,11 @@ _GL_WARN_ON_USE (tanhf, "tanhf is unportable - "
 #   undef truncf
 #   define truncf rpl_truncf
 #  endif
-_GL_FUNCDECL_RPL (truncf, float, (float x));
+_GL_FUNCDECL_RPL (truncf, float, (float x), );
 _GL_CXXALIAS_RPL (truncf, float, (float x));
 # else
 #  if !@HAVE_DECL_TRUNCF@
-_GL_FUNCDECL_SYS (truncf, float, (float x));
+_GL_FUNCDECL_SYS (truncf, float, (float x), );
 #  endif
 _GL_CXXALIAS_SYS (truncf, float, (float x));
 # endif
@@ -2374,11 +2451,11 @@ _GL_WARN_ON_USE (truncf, "truncf is unportable - "
 #   undef trunc
 #   define trunc rpl_trunc
 #  endif
-_GL_FUNCDECL_RPL (trunc, double, (double x));
+_GL_FUNCDECL_RPL (trunc, double, (double x), );
 _GL_CXXALIAS_RPL (trunc, double, (double x));
 # else
 #  if !@HAVE_DECL_TRUNC@
-_GL_FUNCDECL_SYS (trunc, double, (double x));
+_GL_FUNCDECL_SYS (trunc, double, (double x), );
 #  endif
 _GL_CXXALIAS_SYS (trunc, double, (double x));
 # endif
@@ -2399,11 +2476,11 @@ _GL_WARN_ON_USE (trunc, "trunc is unportable - "
 #   undef truncl
 #   define truncl rpl_truncl
 #  endif
-_GL_FUNCDECL_RPL (truncl, long double, (long double x));
+_GL_FUNCDECL_RPL (truncl, long double, (long double x), );
 _GL_CXXALIAS_RPL (truncl, long double, (long double x));
 # else
 #  if !@HAVE_DECL_TRUNCL@
-_GL_FUNCDECL_SYS (truncl, long double, (long double x));
+_GL_FUNCDECL_SYS (truncl, long double, (long double x), );
 #  endif
 _GL_CXXALIAS_SYS (truncl, long double, (long double x));
 # endif
@@ -2487,7 +2564,7 @@ _GL_EXTERN_C int gl_isfinitel (long double x);
 #  if defined isfinite || defined GNULIB_NAMESPACE
 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (isfinite)
 #   undef isfinite
-#   if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined _AIX || (defined _WIN32 && !defined __CYGWIN__)))
+#   if __GNUC__ >= 6 || (defined __clang__ && (__clang_major__ >= 19 || !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined _AIX || (defined _WIN32 && !defined __CYGWIN__))))
   /* This platform's <cmath> possibly defines isfinite through a set of inline
      functions.  */
 _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isfinite, rpl_isfinite, bool)
@@ -2557,7 +2634,7 @@ _GL_EXTERN_C int isnanf (float x);
        GCC >= 4.0 also provides __builtin_isnanf, but clang doesn't.  */
 #    undef isnanf
 #    define isnanf(x) __builtin_isnan ((float)(x))
-#   elif defined isnan
+#   elif defined isnan && !defined HAVE_ISNANF_NOLIBM
 #    undef isnanf
 #    define isnanf(x) isnan ((float)(x))
 #   endif
@@ -2586,7 +2663,7 @@ _GL_EXTERN_C int isnand (double x);
     /* GCC >= 4.0 and clang provide a type-generic built-in for isnan.  */
 #    undef isnand
 #    define isnand(x) __builtin_isnan ((double)(x))
-#   else
+#   elif !defined HAVE_ISNAND_NOLIBM
 #    undef isnand
 #    define isnand(x) isnan ((double)(x))
 #   endif
@@ -2609,7 +2686,7 @@ _GL_EXTERN_C int isnand (double x);
        GCC >= 4.0 also provides __builtin_isnanl, but clang doesn't.  */
 #   undef isnanl
 #   define isnanl(x) __builtin_isnan ((long double)(x))
-#  elif defined isnan
+#  elif defined isnan && !defined HAVE_ISNANL_NOLIBM
 #   undef isnanl
 #   define isnanl(x) isnan ((long double)(x))
 #  endif
@@ -2754,7 +2831,7 @@ _GL_EXTERN_C int gl_signbitl (long double arg);
 #  if defined signbit || defined GNULIB_NAMESPACE
 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (signbit)
 #   undef signbit
-#   if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined _AIX || (defined _WIN32 && !defined __CYGWIN__)))
+#   if __cplusplus >= 201103L || __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__) || defined __FreeBSD__ || defined __OpenBSD__ || defined _AIX || (defined _WIN32 && !defined __CYGWIN__)))
   /* This platform's <cmath> possibly defines signbit through a set of inline
      functions.  */
 _GL_MATH_CXX_REAL_FLOATING_DECL_2 (signbit, rpl_signbit, bool)
@@ -2780,11 +2857,11 @@ _GL_WARN_REAL_FLOATING_DECL (signbit);
 #   undef getpayloadf
 #   define getpayloadf rpl_getpayloadf
 #  endif
-_GL_FUNCDECL_RPL (getpayloadf, float, (const float *));
+_GL_FUNCDECL_RPL (getpayloadf, float, (const float *), );
 _GL_CXXALIAS_RPL (getpayloadf, float, (const float *));
 # else
 #  if !@HAVE_GETPAYLOADF@
-_GL_FUNCDECL_SYS (getpayloadf, float, (const float *));
+_GL_FUNCDECL_SYS (getpayloadf, float, (const float *), );
 #  endif
 _GL_CXXALIAS_SYS (getpayloadf, float, (const float *));
 # endif
@@ -2803,11 +2880,11 @@ _GL_WARN_ON_USE (getpayloadf, "getpayloadf is unportable - "
 #   undef getpayload
 #   define getpayload rpl_getpayload
 #  endif
-_GL_FUNCDECL_RPL (getpayload, double, (const double *));
+_GL_FUNCDECL_RPL (getpayload, double, (const double *), );
 _GL_CXXALIAS_RPL (getpayload, double, (const double *));
 # else
 #  if !@HAVE_GETPAYLOAD@
-_GL_FUNCDECL_SYS (getpayload, double, (const double *));
+_GL_FUNCDECL_SYS (getpayload, double, (const double *), );
 #  endif
 _GL_CXXALIAS_SYS (getpayload, double, (const double *));
 # endif
@@ -2826,11 +2903,11 @@ _GL_WARN_ON_USE (getpayload, "getpayload is unportable - "
 #   undef getpayloadl
 #   define getpayloadl rpl_getpayloadl
 #  endif
-_GL_FUNCDECL_RPL (getpayloadl, long double, (const long double *));
+_GL_FUNCDECL_RPL (getpayloadl, long double, (const long double *), );
 _GL_CXXALIAS_RPL (getpayloadl, long double, (const long double *));
 # else
 #  if !@HAVE_GETPAYLOADL@
-_GL_FUNCDECL_SYS (getpayloadl, long double, (const long double *));
+_GL_FUNCDECL_SYS (getpayloadl, long double, (const long double *), );
 #  endif
 _GL_CXXALIAS_SYS (getpayloadl, long double, (const long double *));
 # endif
@@ -2846,7 +2923,7 @@ _GL_WARN_ON_USE (getpayloadl, "getpayloadl is unportable - "
 
 #if @GNULIB_SETPAYLOADF@
 # if !@HAVE_SETPAYLOADF@
-_GL_FUNCDECL_SYS (setpayloadf, int, (float *, float));
+_GL_FUNCDECL_SYS (setpayloadf, int, (float *, float), );
 # endif
 _GL_CXXALIAS_SYS (setpayloadf, int, (float *, float));
 _GL_CXXALIASWARN (setpayloadf);
@@ -2860,7 +2937,7 @@ _GL_WARN_ON_USE (setpayloadf, "setpayloadf is unportable - "
 
 #if @GNULIB_SETPAYLOAD@
 # if !@HAVE_SETPAYLOAD@
-_GL_FUNCDECL_SYS (setpayload, int, (double *, double));
+_GL_FUNCDECL_SYS (setpayload, int, (double *, double), );
 # endif
 _GL_CXXALIAS_SYS (setpayload, int, (double *, double));
 _GL_CXXALIASWARN (setpayload);
@@ -2874,7 +2951,7 @@ _GL_WARN_ON_USE (setpayload, "setpayload is unportable - "
 
 #if @GNULIB_SETPAYLOADL@
 # if !@HAVE_SETPAYLOADL@
-_GL_FUNCDECL_SYS (setpayloadl, int, (long double *, long double));
+_GL_FUNCDECL_SYS (setpayloadl, int, (long double *, long double), );
 # endif
 _GL_CXXALIAS_SYS (setpayloadl, int, (long double *, long double));
 _GL_CXXALIASWARN (setpayloadl);
@@ -2889,7 +2966,7 @@ _GL_WARN_ON_USE (setpayloadl, "setpayloadl is unportable - "
 
 #if @GNULIB_SETPAYLOADSIGF@
 # if !@HAVE_SETPAYLOADSIGF@
-_GL_FUNCDECL_SYS (setpayloadsigf, int, (float *, float));
+_GL_FUNCDECL_SYS (setpayloadsigf, int, (float *, float), );
 # endif
 _GL_CXXALIAS_SYS (setpayloadsigf, int, (float *, float));
 _GL_CXXALIASWARN (setpayloadsigf);
@@ -2903,7 +2980,7 @@ _GL_WARN_ON_USE (setpayloadsigf, "setpayloadsigf is unportable - "
 
 #if @GNULIB_SETPAYLOADSIG@
 # if !@HAVE_SETPAYLOADSIG@
-_GL_FUNCDECL_SYS (setpayloadsig, int, (double *, double));
+_GL_FUNCDECL_SYS (setpayloadsig, int, (double *, double), );
 # endif
 _GL_CXXALIAS_SYS (setpayloadsig, int, (double *, double));
 _GL_CXXALIASWARN (setpayloadsig);
@@ -2917,7 +2994,7 @@ _GL_WARN_ON_USE (setpayloadsig, "setpayloadsig is unportable - "
 
 #if @GNULIB_SETPAYLOADSIGL@
 # if !@HAVE_SETPAYLOADSIGL@
-_GL_FUNCDECL_SYS (setpayloadsigl, int, (long double *, long double));
+_GL_FUNCDECL_SYS (setpayloadsigl, int, (long double *, long double), );
 # endif
 _GL_CXXALIAS_SYS (setpayloadsigl, int, (long double *, long double));
 _GL_CXXALIASWARN (setpayloadsigl);
@@ -2936,11 +3013,11 @@ _GL_WARN_ON_USE (setpayloadsigl, "setpayloadsigl is unportable - "
 #   undef totalorderf
 #   define totalorderf rpl_totalorderf
 #  endif
-_GL_FUNCDECL_RPL (totalorderf, int, (float const *, float const *));
+_GL_FUNCDECL_RPL (totalorderf, int, (float const *, float const *), );
 _GL_CXXALIAS_RPL (totalorderf, int, (float const *, float const *));
 # else
 #  if !@HAVE_TOTALORDERF@
-_GL_FUNCDECL_SYS (totalorderf, int, (float const *, float const *));
+_GL_FUNCDECL_SYS (totalorderf, int, (float const *, float const *), );
 #  endif
 _GL_CXXALIAS_SYS (totalorderf, int, (float const *, float const *));
 # endif
@@ -2959,11 +3036,11 @@ _GL_WARN_ON_USE (totalorderf, "totalorderf is unportable - "
 #   undef totalorder
 #   define totalorder rpl_totalorder
 #  endif
-_GL_FUNCDECL_RPL (totalorder, int, (double const *, double const *));
+_GL_FUNCDECL_RPL (totalorder, int, (double const *, double const *), );
 _GL_CXXALIAS_RPL (totalorder, int, (double const *, double const *));
 # else
 #  if !@HAVE_TOTALORDER@
-_GL_FUNCDECL_SYS (totalorder, int, (double const *, double const *));
+_GL_FUNCDECL_SYS (totalorder, int, (double const *, double const *), );
 #  endif
 _GL_CXXALIAS_SYS (totalorder, int, (double const *, double const *));
 # endif
@@ -2985,13 +3062,13 @@ _GL_WARN_ON_USE (totalorder, "totalorder is unportable - "
 #   define totalorderl rpl_totalorderl
 #  endif
 _GL_FUNCDECL_RPL (totalorderl, int,
-                  (long double const *, long double const *));
+                  (long double const *, long double const *), );
 _GL_CXXALIAS_RPL (totalorderl, int,
                   (long double const *, long double const *));
 # else
 #  if !@HAVE_TOTALORDERL@
 _GL_FUNCDECL_SYS (totalorderl, int,
-                  (long double const *, long double const *));
+                  (long double const *, long double const *), );
 #  endif
 _GL_CXXALIAS_SYS (totalorderl, int,
                   (long double const *, long double const *));
@@ -3012,11 +3089,11 @@ _GL_WARN_ON_USE (totalorderl, "totalorderl is unportable - "
 #   undef totalordermagf
 #   define totalordermagf rpl_totalordermagf
 #  endif
-_GL_FUNCDECL_RPL (totalordermagf, int, (float const *, float const *));
+_GL_FUNCDECL_RPL (totalordermagf, int, (float const *, float const *), );
 _GL_CXXALIAS_RPL (totalordermagf, int, (float const *, float const *));
 # else
 #  if !@HAVE_TOTALORDERMAGF@
-_GL_FUNCDECL_SYS (totalordermagf, int, (float const *, float const *));
+_GL_FUNCDECL_SYS (totalordermagf, int, (float const *, float const *), );
 #  endif
 _GL_CXXALIAS_SYS (totalordermagf, int, (float const *, float const *));
 # endif
@@ -3037,11 +3114,11 @@ _GL_WARN_ON_USE (totalordermagf, "totalordermagf is unportable - "
 #   undef totalordermag
 #   define totalordermag rpl_totalordermag
 #  endif
-_GL_FUNCDECL_RPL (totalordermag, int, (double const *, double const *));
+_GL_FUNCDECL_RPL (totalordermag, int, (double const *, double const *), );
 _GL_CXXALIAS_RPL (totalordermag, int, (double const *, double const *));
 # else
 #  if !@HAVE_TOTALORDERMAG@
-_GL_FUNCDECL_SYS (totalordermag, int, (double const *, double const *));
+_GL_FUNCDECL_SYS (totalordermag, int, (double const *, double const *), );
 #  endif
 _GL_CXXALIAS_SYS (totalordermag, int, (double const *, double const *));
 # endif
@@ -3063,13 +3140,13 @@ _GL_WARN_ON_USE (totalordermag, "totalordermag is unportable - "
 #   define totalordermagl rpl_totalordermagl
 #  endif
 _GL_FUNCDECL_RPL (totalordermagl, int,
-                  (long double const *, long double const *));
+                  (long double const *, long double const *), );
 _GL_CXXALIAS_RPL (totalordermagl, int,
                   (long double const *, long double const *));
 # else
 #  if !@HAVE_TOTALORDERMAGL@
 _GL_FUNCDECL_SYS (totalordermagl, int,
-                  (long double const *, long double const *));
+                  (long double const *, long double const *), );
 #  endif
 _GL_CXXALIAS_SYS (totalordermagl, int,
                   (long double const *, long double const *));
diff --git a/gl/mbchar.c b/gl/mbchar.c
new file mode 100644
index 00000000..713c2f74
--- /dev/null
+++ b/gl/mbchar.c
@@ -0,0 +1,23 @@
+/* Copyright (C) 2001, 2006, 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+
+#include <config.h>
+
+#define MBCHAR_INLINE _GL_EXTERN_INLINE
+
+#include <limits.h>
+
+#include "mbchar.h"
diff --git a/gl/mbchar.h b/gl/mbchar.h
new file mode 100644
index 00000000..d77168e7
--- /dev/null
+++ b/gl/mbchar.h
@@ -0,0 +1,383 @@
+/* Multibyte character data type.
+   Copyright (C) 2001, 2005-2007, 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>.  */
+
+/* A multibyte character is a short subsequence of a char* string,
+   representing a single 32-bit wide character.
+
+   We use multibyte characters instead of 32-bit wide characters because
+   of the following goals:
+   1) correct multibyte handling, i.e. operate according to the LC_CTYPE
+      locale,
+   2) ease of maintenance, i.e. the maintainer needs not know all details
+      of the ISO C 99 standard,
+   3) don't fail grossly if the input is not in the encoding set by the
+      locale, because often different encodings are in use in the same
+      countries (ISO-8859-1/UTF-8, EUC-JP/Shift_JIS, ...),
+   4) fast in the case of ASCII characters.
+
+   Multibyte characters are only accessed through the mb* macros.
+
+   mb_ptr (mbc)
+     return a pointer to the beginning of the multibyte sequence.
+
+   mb_len (mbc)
+     returns the number of bytes occupied by the multibyte sequence.
+     Always > 0.
+
+   mb_iseq (mbc, sc)
+     returns true if mbc is the standard ASCII character sc.
+
+   mb_isnul (mbc)
+     returns true if mbc is the nul character.
+
+   mb_cmp (mbc1, mbc2)
+     returns a positive, zero, or negative value depending on whether mbc1
+     sorts after, same or before mbc2.
+
+   mb_casecmp (mbc1, mbc2)
+     returns a positive, zero, or negative value depending on whether mbc1
+     sorts after, same or before mbc2, modulo upper/lowercase conversion.
+
+   mb_equal (mbc1, mbc2)
+     returns true if mbc1 and mbc2 are equal.
+
+   mb_caseequal (mbc1, mbc2)
+     returns true if mbc1 and mbc2 are equal modulo upper/lowercase conversion.
+
+   mb_isalnum (mbc)
+     returns true if mbc is alphanumeric.
+
+   mb_isalpha (mbc)
+     returns true if mbc is alphabetic.
+
+   mb_isascii(mbc)
+     returns true if mbc is plain ASCII.
+
+   mb_isblank (mbc)
+     returns true if mbc is a blank.
+
+   mb_iscntrl (mbc)
+     returns true if mbc is a control character.
+
+   mb_isdigit (mbc)
+     returns true if mbc is a decimal digit.
+
+   mb_isgraph (mbc)
+     returns true if mbc is a graphic character.
+
+   mb_islower (mbc)
+     returns true if mbc is lowercase.
+
+   mb_isprint (mbc)
+     returns true if mbc is a printable character.
+
+   mb_ispunct (mbc)
+     returns true if mbc is a punctuation character.
+
+   mb_isspace (mbc)
+     returns true if mbc is a space character.
+
+   mb_isupper (mbc)
+     returns true if mbc is uppercase.
+
+   mb_isxdigit (mbc)
+     returns true if mbc is a hexadecimal digit.
+
+   mb_width (mbc)
+     returns the number of columns on the output device occupied by mbc.
+     Always >= 0.
+
+   mb_putc (mbc, stream)
+     outputs mbc on stream, a byte oriented FILE stream opened for output.
+
+   mb_setascii (&mbc, sc)
+     assigns the standard ASCII character sc to mbc.
+     (Only available if the 'mbfile' module is in use.)
+
+   mb_copy (&destmbc, &srcmbc)
+     copies srcmbc to destmbc.
+
+   Here are the function prototypes of the macros.
+
+   extern const char *  mb_ptr (const mbchar_t mbc);
+   extern size_t        mb_len (const mbchar_t mbc);
+   extern bool          mb_iseq (const mbchar_t mbc, char sc);
+   extern bool          mb_isnul (const mbchar_t mbc);
+   extern int           mb_cmp (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern int           mb_casecmp (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool          mb_equal (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool          mb_caseequal (const mbchar_t mbc1, const mbchar_t mbc2);
+   extern bool          mb_isalnum (const mbchar_t mbc);
+   extern bool          mb_isalpha (const mbchar_t mbc);
+   extern bool          mb_isascii (const mbchar_t mbc);
+   extern bool          mb_isblank (const mbchar_t mbc);
+   extern bool          mb_iscntrl (const mbchar_t mbc);
+   extern bool          mb_isdigit (const mbchar_t mbc);
+   extern bool          mb_isgraph (const mbchar_t mbc);
+   extern bool          mb_islower (const mbchar_t mbc);
+   extern bool          mb_isprint (const mbchar_t mbc);
+   extern bool          mb_ispunct (const mbchar_t mbc);
+   extern bool          mb_isspace (const mbchar_t mbc);
+   extern bool          mb_isupper (const mbchar_t mbc);
+   extern bool          mb_isxdigit (const mbchar_t mbc);
+   extern int           mb_width (const mbchar_t mbc);
+   extern void          mb_putc (const mbchar_t mbc, FILE *stream);
+   extern void          mb_setascii (mbchar_t *new, char sc);
+   extern void          mb_copy (mbchar_t *new, const mbchar_t *old);
+ */
+
+#ifndef _MBCHAR_H
+#define _MBCHAR_H 1
+
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+#include <string.h>
+#include <uchar.h>
+
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBCHAR_INLINE
+# define MBCHAR_INLINE _GL_INLINE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* The longest multibyte characters, nowadays, are 4 bytes long.
+   Regardless of the values of MB_CUR_MAX and MB_LEN_MAX.  */
+#define MBCHAR_BUF_SIZE 4
+
+struct mbchar
+{
+  const char *ptr;      /* pointer to current character */
+  size_t bytes;         /* number of bytes of current character, > 0 */
+  bool wc_valid;        /* true if wc is a valid 32-bit wide character */
+  char32_t wc;          /* if wc_valid: the current character */
+#if defined GNULIB_MBFILE
+  char buf[MBCHAR_BUF_SIZE]; /* room for the bytes, used for file input only */
+#endif
+};
+
+/* EOF (not a real character) is represented with bytes = 0 and
+   wc_valid = false.  */
+
+typedef struct mbchar mbchar_t;
+
+/* Access the current character.  */
+#define mb_ptr(mbc) ((mbc).ptr)
+#define mb_len(mbc) ((mbc).bytes)
+
+/* Comparison of characters.  */
+#define mb_iseq(mbc, sc) ((mbc).wc_valid && (mbc).wc == (sc))
+#define mb_isnul(mbc) ((mbc).wc_valid && (mbc).wc == 0)
+#define mb_cmp(mbc1, mbc2) \
+  ((mbc1).wc_valid                                                      \
+   ? ((mbc2).wc_valid                                                   \
+      ? _GL_CMP ((mbc1).wc, (mbc2).wc)                                  \
+      : -1)                                                             \
+   : ((mbc2).wc_valid                                                   \
+      ? 1                                                               \
+      : (mbc1).bytes == (mbc2).bytes                                    \
+        ? memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes)                 \
+        : (mbc1).bytes < (mbc2).bytes                                   \
+          ? (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) > 0 ? 1 : -1) \
+          : (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc2).bytes) >= 0 ? 1 : -1)))
+#define mb_casecmp(mbc1, mbc2) \
+  ((mbc1).wc_valid                                                      \
+   ? ((mbc2).wc_valid                                                   \
+      ? _GL_CMP (c32tolower ((mbc1).wc), c32tolower ((mbc2).wc))        \
+      : -1)                                                             \
+   : ((mbc2).wc_valid                                                   \
+      ? 1                                                               \
+      : (mbc1).bytes == (mbc2).bytes                                    \
+        ? memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes)                 \
+        : (mbc1).bytes < (mbc2).bytes                                   \
+          ? (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) > 0 ? 1 : -1) \
+          : (memcmp ((mbc1).ptr, (mbc2).ptr, (mbc2).bytes) >= 0 ? 1 : -1)))
+#define mb_equal(mbc1, mbc2) \
+  ((mbc1).wc_valid && (mbc2).wc_valid                                   \
+   ? (mbc1).wc == (mbc2).wc                                             \
+   : (mbc1).bytes == (mbc2).bytes                                       \
+     && memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) == 0)
+#define mb_caseequal(mbc1, mbc2) \
+  ((mbc1).wc_valid && (mbc2).wc_valid                                   \
+   ? c32tolower ((mbc1).wc) == c32tolower ((mbc2).wc)                   \
+   : (mbc1).bytes == (mbc2).bytes                                       \
+     && memcmp ((mbc1).ptr, (mbc2).ptr, (mbc1).bytes) == 0)
+
+/* <ctype.h>, <wctype.h> classification.  */
+#define mb_isascii(mbc) \
+  ((mbc).wc_valid && (mbc).wc >= 0 && (mbc).wc <= 127)
+#define mb_isalnum(mbc) ((mbc).wc_valid && c32isalnum ((mbc).wc))
+#define mb_isalpha(mbc) ((mbc).wc_valid && c32isalpha ((mbc).wc))
+#define mb_isblank(mbc) ((mbc).wc_valid && c32isblank ((mbc).wc))
+#define mb_iscntrl(mbc) ((mbc).wc_valid && c32iscntrl ((mbc).wc))
+#define mb_isdigit(mbc) ((mbc).wc_valid && c32isdigit ((mbc).wc))
+#define mb_isgraph(mbc) ((mbc).wc_valid && c32isgraph ((mbc).wc))
+#define mb_islower(mbc) ((mbc).wc_valid && c32islower ((mbc).wc))
+#define mb_isprint(mbc) ((mbc).wc_valid && c32isprint ((mbc).wc))
+#define mb_ispunct(mbc) ((mbc).wc_valid && c32ispunct ((mbc).wc))
+#define mb_isspace(mbc) ((mbc).wc_valid && c32isspace ((mbc).wc))
+#define mb_isupper(mbc) ((mbc).wc_valid && c32isupper ((mbc).wc))
+#define mb_isxdigit(mbc) ((mbc).wc_valid && c32isxdigit ((mbc).wc))
+
+/* Extra <wchar.h> function.  */
+
+/* Unprintable characters appear as a small box of width 1.  */
+#define MB_UNPRINTABLE_WIDTH 1
+
+MBCHAR_INLINE int
+mb_width_aux (char32_t wc)
+{
+  int w = c32width (wc);
+  /* For unprintable characters, arbitrarily return 0 for control characters
+     and MB_UNPRINTABLE_WIDTH otherwise.  */
+  return (w >= 0 ? w : c32iscntrl (wc) ? 0 : MB_UNPRINTABLE_WIDTH);
+}
+
+#define mb_width(mbc) \
+  ((mbc).wc_valid ? mb_width_aux ((mbc).wc) : MB_UNPRINTABLE_WIDTH)
+
+/* Output.  */
+#define mb_putc(mbc, stream)  fwrite ((mbc).ptr, 1, (mbc).bytes, (stream))
+
+#if defined GNULIB_MBFILE
+/* Assignment.  */
+# define mb_setascii(mbc, sc) \
+   ((mbc)->ptr = (mbc)->buf, (mbc)->bytes = 1, (mbc)->wc_valid = 1, \
+    (mbc)->wc = (mbc)->buf[0] = (sc))
+#endif
+
+/* Copying a character.  */
+MBCHAR_INLINE void
+mb_copy (mbchar_t *new_mbc, const mbchar_t *old_mbc)
+{
+#if defined GNULIB_MBFILE
+  if (old_mbc->ptr == &old_mbc->buf[0])
+    {
+      memcpy (&new_mbc->buf[0], &old_mbc->buf[0], old_mbc->bytes);
+      new_mbc->ptr = &new_mbc->buf[0];
+    }
+  else
+#endif
+    new_mbc->ptr = old_mbc->ptr;
+  new_mbc->bytes = old_mbc->bytes;
+  if ((new_mbc->wc_valid = old_mbc->wc_valid))
+    new_mbc->wc = old_mbc->wc;
+}
+
+
+/* is_basic(c) tests whether the single-byte character c is
+   - in the ISO C "basic character set" or is one of '@', '$', and '`'
+     which ISO C 23 § 5.2.1.1.(1) guarantees to be single-byte and in
+     practice are safe to treat as basic in the execution character set,
+     or
+   - in the POSIX "portable character set", which
+     <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap06.html>
+     equally guarantees to be single-byte.
+   This is a convenience function, and is in this file only to share code
+   between mbiter.h, mbuiter.h, and mbfile.h.  */
+#if (' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
+    && ('$' == 36) && ('%' == 37) && ('&' == 38) && ('\'' == 39) \
+    && ('(' == 40) && (')' == 41) && ('*' == 42) && ('+' == 43) \
+    && (',' == 44) && ('-' == 45) && ('.' == 46) && ('/' == 47) \
+    && ('0' == 48) && ('1' == 49) && ('2' == 50) && ('3' == 51) \
+    && ('4' == 52) && ('5' == 53) && ('6' == 54) && ('7' == 55) \
+    && ('8' == 56) && ('9' == 57) && (':' == 58) && (';' == 59) \
+    && ('<' == 60) && ('=' == 61) && ('>' == 62) && ('?' == 63) \
+    && ('@' == 64) && ('A' == 65) && ('B' == 66) && ('C' == 67) \
+    && ('D' == 68) && ('E' == 69) && ('F' == 70) && ('G' == 71) \
+    && ('H' == 72) && ('I' == 73) && ('J' == 74) && ('K' == 75) \
+    && ('L' == 76) && ('M' == 77) && ('N' == 78) && ('O' == 79) \
+    && ('P' == 80) && ('Q' == 81) && ('R' == 82) && ('S' == 83) \
+    && ('T' == 84) && ('U' == 85) && ('V' == 86) && ('W' == 87) \
+    && ('X' == 88) && ('Y' == 89) && ('Z' == 90) && ('[' == 91) \
+    && ('\\' == 92) && (']' == 93) && ('^' == 94) && ('_' == 95) \
+    && ('`' == 96) && ('a' == 97) && ('b' == 98) && ('c' == 99) \
+    && ('d' == 100) && ('e' == 101) && ('f' == 102) && ('g' == 103) \
+    && ('h' == 104) && ('i' == 105) && ('j' == 106) && ('k' == 107) \
+    && ('l' == 108) && ('m' == 109) && ('n' == 110) && ('o' == 111) \
+    && ('p' == 112) && ('q' == 113) && ('r' == 114) && ('s' == 115) \
+    && ('t' == 116) && ('u' == 117) && ('v' == 118) && ('w' == 119) \
+    && ('x' == 120) && ('y' == 121) && ('z' == 122) && ('{' == 123) \
+    && ('|' == 124) && ('}' == 125) && ('~' == 126)
+/* The character set is ISO-646, not EBCDIC. */
+# define IS_BASIC_ASCII 1
+
+/* All locale encodings (see localcharset.h) map the characters 0x00..0x7F
+   to U+0000..U+007F, like ASCII, except for
+     CP864      different mapping of '%'
+     SHIFT_JIS  different mappings of 0x5C, 0x7E
+     JOHAB      different mapping of 0x5C
+   However, these characters in the range 0x20..0x7E are in the ISO C
+   "basic character set" and in the POSIX "portable character set", which
+   ISO C and POSIX guarantee to be single-byte.  Thus, locales with these
+   encodings are not POSIX compliant.  And they are most likely not in use
+   any more (as of 2023).  */
+# define is_basic(c) ((unsigned char) (c) < 0x80)
+
+#else
+
+MBCHAR_INLINE bool
+is_basic (char c)
+{
+  switch (c)
+    {
+    case '\0':
+    case '\007': case '\010':
+    case '\t': case '\n': case '\v': case '\f': case '\r':
+    case ' ': case '!': case '"': case '#': case '$': case '%':
+    case '&': case '\'': case '(': case ')': case '*':
+    case '+': case ',': case '-': case '.': case '/':
+    case '0': case '1': case '2': case '3': case '4':
+    case '5': case '6': case '7': case '8': case '9':
+    case ':': case ';': case '<': case '=': case '>':
+    case '?': case '@':
+    case 'A': case 'B': case 'C': case 'D': case 'E':
+    case 'F': case 'G': case 'H': case 'I': case 'J':
+    case 'K': case 'L': case 'M': case 'N': case 'O':
+    case 'P': case 'Q': case 'R': case 'S': case 'T':
+    case 'U': case 'V': case 'W': case 'X': case 'Y':
+    case 'Z':
+    case '[': case '\\': case ']': case '^': case '_': case '`':
+    case 'a': case 'b': case 'c': case 'd': case 'e':
+    case 'f': case 'g': case 'h': case 'i': case 'j':
+    case 'k': case 'l': case 'm': case 'n': case 'o':
+    case 'p': case 'q': case 'r': case 's': case 't':
+    case 'u': case 'v': case 'w': case 'x': case 'y':
+    case 'z': case '{': case '|': case '}': case '~':
+      return 1;
+    default:
+      return 0;
+    }
+}
+
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+_GL_INLINE_HEADER_END
+
+#endif /* _MBCHAR_H */
diff --git a/gl/mbiterf.c b/gl/mbiterf.c
new file mode 100644
index 00000000..ad354c55
--- /dev/null
+++ b/gl/mbiterf.c
@@ -0,0 +1,21 @@
+/* Iterating through multibyte strings: macros for multi-byte encodings.
+
+   Copyright (C) 2023-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+#define MBITERF_INLINE _GL_EXTERN_INLINE
+#include "mbiterf.h"
diff --git a/gl/mbiterf.h b/gl/mbiterf.h
new file mode 100644
index 00000000..99d8d11d
--- /dev/null
+++ b/gl/mbiterf.h
@@ -0,0 +1,214 @@
+/* Iterating through multibyte strings, faster: macros for multi-byte encodings.
+   Copyright (C) 2001, 2005, 2007, 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>,
+   with insights from Paul Eggert.  */
+
+/* The macros in this file implement forward iteration through a
+   multi-byte string.
+
+   With these macros, an iteration loop that looks like
+
+      char *iter;
+      for (iter = buf; iter < buf + buflen; iter++)
+        {
+          do_something (*iter);
+        }
+
+   becomes
+
+      const char *buf_end = buf + buflen;
+      mbif_state_t state;
+      [const] char *iter;
+      for (mbif_init (state), iter = buf; mbif_avail (state, iter, buf_end); )
+        {
+          mbchar_t cur = mbif_next (state, iter, buf_end);
+          // Note: Here always mb_ptr (cur) == iter.
+          do_something (iter, mb_len (cur));
+          iter += mb_len (cur);
+        }
+
+   The benefit of these macros over plain use of mbrtowc or mbrtoc32 is:
+   - Handling of invalid multibyte sequences is possible without
+     making the code more complicated, while still preserving the
+     invalid multibyte sequences.
+
+   The benefit of these macros over those from mbiter.h is that it
+   produces faster code with today's optimizing compilers (because mbif_next
+   returns its result by value).
+
+   mbif_state_t
+     is a type usable for variable declarations.
+
+   mbif_init (state)
+     initializes the state.
+
+   mbif_avail (state, iter, endptr)
+     returns true if another loop round is needed.
+
+   mbif_next (state, iter, endptr)
+     returns the next multibyte character.
+     It asssumes that the state is initialized and that iter < endptr.
+
+   Here are the function prototypes of the macros.
+
+   extern void      mbif_init (mbif_state_t state);
+   extern bool      mbif_avail (mbif_state_t state, const char *iter, const char *endptr);
+   extern mbchar_t  mbif_next (mbif_state_t state, const char *iter, const char *endptr);
+ */
+
+#ifndef _MBITERF_H
+#define _MBITERF_H 1
+
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE,
+   _GL_ATTRIBUTE_ALWAYS_INLINE.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+#include <assert.h>
+#include <stddef.h>
+#include <string.h>
+#include <uchar.h>
+#include <wchar.h>
+
+#include "mbchar.h"
+
+_GL_INLINE_HEADER_BEGIN
+#ifndef MBITERF_INLINE
+# define MBITERF_INLINE _GL_INLINE _GL_ATTRIBUTE_ALWAYS_INLINE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+struct mbif_state
+{
+  #if !GNULIB_MBRTOC32_REGULAR
+  bool in_shift;        /* true if next byte may not be interpreted as ASCII */
+                        /* If GNULIB_MBRTOC32_REGULAR, it is always false,
+                           so optimize it away.  */
+  #endif
+  mbstate_t state;      /* if in_shift: current shift state */
+                        /* If GNULIB_MBRTOC32_REGULAR, it is in an initial state
+                           before and after every mbiterf_next invocation.
+                         */
+};
+
+MBITERF_INLINE mbchar_t
+mbiterf_next (struct mbif_state *ps, const char *iter, const char *endptr)
+{
+  #if !GNULIB_MBRTOC32_REGULAR
+  if (ps->in_shift)
+    goto with_shift;
+  #endif
+  /* Handle most ASCII characters quickly, without calling mbrtowc().  */
+  if (is_basic (*iter))
+    {
+      /* These characters are part of the POSIX portable character set.
+         For most of them, namely those in the ISO C basic character set,
+         ISO C 99 guarantees that their wide character code is identical to
+         their char code.  For the few other ones, this is the case as well,
+         in all locale encodings that are in use.  The 32-bit wide character
+         code is the same as well.  */
+      return (mbchar_t) { .ptr = iter, .bytes = 1, .wc_valid = true, .wc = *iter };
+    }
+  else
+    {
+      assert (mbsinit (&ps->state));
+      #if !GNULIB_MBRTOC32_REGULAR
+      ps->in_shift = true;
+    with_shift:;
+      #endif
+      size_t bytes;
+      char32_t wc;
+      bytes = mbrtoc32 (&wc, iter, endptr - iter, &ps->state);
+      if (bytes == (size_t) -1)
+        {
+          /* An invalid multibyte sequence was encountered.  */
+          /* Allow the next invocation to continue from a sane state.  */
+          #if !GNULIB_MBRTOC32_REGULAR
+          ps->in_shift = false;
+          #endif
+          mbszero (&ps->state);
+          return (mbchar_t) { .ptr = iter, .bytes = 1, .wc_valid = false };
+        }
+      else if (bytes == (size_t) -2)
+        {
+          /* An incomplete multibyte character at the end.  */
+          #if !GNULIB_MBRTOC32_REGULAR
+          ps->in_shift = false;
+          #endif
+          /* Whether to reset ps->state or not is not important; the string end
+             is reached anyway.  */
+          return (mbchar_t) { .ptr = iter, .bytes = endptr - iter, .wc_valid = false };
+        }
+      else
+        {
+          if (bytes == 0)
+            {
+              /* A null wide character was encountered.  */
+              bytes = 1;
+              assert (*iter == '\0');
+              assert (wc == 0);
+            }
+          #if !GNULIB_MBRTOC32_REGULAR
+          else if (bytes == (size_t) -3)
+            /* The previous multibyte sequence produced an additional 32-bit
+               wide character.  */
+            bytes = 0;
+          #endif
+
+          /* When in an initial state, we can go back treating ASCII
+             characters more quickly.  */
+          #if !GNULIB_MBRTOC32_REGULAR
+          if (mbsinit (&ps->state))
+            ps->in_shift = false;
+          #endif
+          return (mbchar_t) { .ptr = iter, .bytes = bytes, .wc_valid = true, .wc = wc };
+        }
+    }
+}
+
+/* Iteration macros.  */
+typedef struct mbif_state mbif_state_t;
+#if !GNULIB_MBRTOC32_REGULAR
+#define mbif_init(st) \
+  ((st).in_shift = false, mbszero (&(st).state))
+#else
+/* Optimized: no in_shift.  */
+#define mbif_init(st) \
+  (mbszero (&(st).state))
+#endif
+#if !GNULIB_MBRTOC32_REGULAR
+#define mbif_avail(st, iter, endptr) ((st).in_shift || ((iter) < (endptr)))
+#else
+/* Optimized: no in_shift.  */
+#define mbif_avail(st, iter, endptr) ((iter) < (endptr))
+#endif
+#define mbif_next(st, iter, endptr) \
+  mbiterf_next (&(st), (iter), (endptr))
+
+
+#ifdef __cplusplus
+}
+#endif
+
+_GL_INLINE_HEADER_END
+
+#endif /* _MBITERF_H */
diff --git a/gl/mbrtoc32.c b/gl/mbrtoc32.c
new file mode 100644
index 00000000..c4625525
--- /dev/null
+++ b/gl/mbrtoc32.c
@@ -0,0 +1,288 @@
+/* Convert multibyte character to 32-bit wide character.
+   Copyright (C) 2020-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2020.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <uchar.h>
+
+#include "attribute.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+#if GL_CHAR32_T_IS_UNICODE
+# include "lc-charset-unicode.h"
+#endif
+
+#if GNULIB_defined_mbstate_t /* AIX, IRIX */
+/* Implement mbrtoc32() on top of mbtowc() for the non-UTF-8 locales
+   and directly for the UTF-8 locales.  */
+
+/* Note: On AIX (64-bit) we can implement mbrtoc32 in two equivalent ways:
+   - in a way that parallels the override of mbrtowc; this is the code branch
+     here;
+   - in a way that invokes the overridden mbrtowc; this would be the #else
+     branch below.
+   They are equivalent.  */
+
+# if AVOID_ANY_THREADS
+
+/* The option '--disable-threads' explicitly requests no locking.  */
+
+# elif defined _WIN32 && !defined __CYGWIN__
+
+#  define WIN32_LEAN_AND_MEAN  /* avoid including junk */
+#  include <windows.h>
+
+# elif HAVE_PTHREAD_API
+
+#  include <pthread.h>
+#  if HAVE_THREADS_H && HAVE_WEAK_SYMBOLS
+#   include <threads.h>
+#   pragma weak thrd_exit
+#   define c11_threads_in_use() (thrd_exit != NULL)
+#  else
+#   define c11_threads_in_use() 0
+#  endif
+
+# elif HAVE_THREADS_H
+
+#  include <threads.h>
+
+# endif
+
+# include "lc-charset-dispatch.h"
+# include "mbtowc-lock.h"
+
+static_assert (sizeof (mbstate_t) >= 4);
+static char internal_state[4];
+
+size_t
+mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps)
+{
+# define FITS_IN_CHAR_TYPE(wc)  1
+# include "mbrtowc-impl.h"
+}
+
+#else /* glibc, macOS, FreeBSD, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, MSVC, Minix, Android */
+
+/* Implement mbrtoc32() based on the original mbrtoc32() or on mbrtowc().  */
+
+# include <wchar.h>
+
+# include "localcharset.h"
+# include "streq.h"
+
+# if MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ
+#  include "hard-locale.h"
+#  include <locale.h>
+# endif
+
+static mbstate_t internal_state;
+
+size_t
+mbrtoc32 (char32_t *pwc, const char *s, size_t n, mbstate_t *ps)
+# undef mbrtoc32
+{
+  /* It's simpler to handle the case s == NULL upfront, than to worry about
+     this case later, before every test of pwc and n.  */
+  if (s == NULL)
+    {
+      pwc = NULL;
+      s = "";
+      n = 1;
+    }
+
+# if MBRTOC32_EMPTY_INPUT_BUG || _GL_SMALL_WCHAR_T
+  if (n == 0)
+    return (size_t) -2;
+# endif
+
+  if (ps == NULL)
+    ps = &internal_state;
+
+# if HAVE_WORKING_MBRTOC32 && HAVE_WORKING_C32RTOMB && !MBRTOC32_MULTIBYTE_LOCALE_BUG
+  /* mbrtoc32() may produce different values for wc than mbrtowc().  Therefore
+     use mbrtoc32().  */
+
+#  if defined _WIN32 && !defined __CYGWIN__
+  char32_t wc;
+  size_t ret = mbrtoc32 (&wc, s, n, ps);
+  if (ret < (size_t) -2 && pwc != NULL)
+    *pwc = wc;
+#  else
+  size_t ret = mbrtoc32 (pwc, s, n, ps);
+#  endif
+
+#  if GNULIB_MBRTOC32_REGULAR
+  /* Verify that mbrtoc32 is regular.  */
+  if (ret < (size_t) -3 && ! mbsinit (ps))
+    /* This occurs on glibc 2.36.  */
+    mbszero (ps);
+  if (ret == (size_t) -3)
+    abort ();
+#  endif
+
+#  if MBRTOC32_IN_C_LOCALE_MAYBE_EILSEQ
+  if ((size_t) -2 <= ret && n != 0 && ! hard_locale (LC_CTYPE))
+    {
+      if (pwc != NULL)
+        *pwc = (unsigned char) *s;
+      return 1;
+    }
+#  endif
+
+  return ret;
+
+# elif _GL_SMALL_WCHAR_T
+
+  /* Special-case all encodings that may produce wide character values
+     > WCHAR_MAX.  */
+  const char *encoding = locale_charset ();
+  if (STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0))
+    {
+      /* Special-case the UTF-8 encoding.  Assume that the wide-character
+         encoding in a UTF-8 locale is UCS-2 or, equivalently, UTF-16.  */
+      /* Here n > 0.  */
+      char *pstate = (char *)ps;
+      size_t nstate = pstate[0];
+      char buf[4];
+      const char *p;
+      size_t m;
+      int res;
+
+      switch (nstate)
+        {
+        case 0:
+          p = s;
+          m = n;
+          break;
+        case 3:
+          buf[2] = pstate[3];
+          FALLTHROUGH;
+        case 2:
+          buf[1] = pstate[2];
+          FALLTHROUGH;
+        case 1:
+          buf[0] = pstate[1];
+          p = buf;
+          m = nstate;
+          buf[m++] = s[0];
+          if (n >= 2 && m < 4)
+            {
+              buf[m++] = s[1];
+              if (n >= 3 && m < 4)
+                buf[m++] = s[2];
+            }
+          break;
+        default:
+          errno = EINVAL;
+          return (size_t)(-1);
+        }
+
+      /* Here m > 0.  */
+
+      {
+#  define FITS_IN_CHAR_TYPE(wc)  1
+#  include "mbrtowc-impl-utf8.h"
+      }
+
+     success:
+      if (nstate >= (res > 0 ? res : 1))
+        abort ();
+      res -= nstate;
+      /* Set *ps to an initial state.  */
+#  if defined _WIN32 && !defined __CYGWIN__
+      /* Native Windows.  */
+      /* MSVC defines 'mbstate_t' as an 8-byte struct; the first 4 bytes matter.
+         On mingw, 'mbstate_t' is sometimes defined as 'int', sometimes defined
+         as an 8-byte struct, of which the first 4 bytes matter.  */
+      *(unsigned int *)pstate = 0;
+#  elif defined __CYGWIN__
+      /* Cygwin defines 'mbstate_t' as an 8-byte struct; the first 4 bytes
+         matter.  */
+      ps->__count = 0;
+#  else
+      pstate[0] = 0;
+#  endif
+      return res;
+
+     incomplete:
+      {
+        size_t k = nstate;
+        /* Here 0 <= k < m < 4.  */
+        pstate[++k] = s[0];
+        if (k < m)
+          {
+            pstate[++k] = s[1];
+            if (k < m)
+              pstate[++k] = s[2];
+          }
+        if (k != m)
+          abort ();
+      }
+      pstate[0] = m;
+      return (size_t)(-2);
+
+     invalid:
+      errno = EILSEQ;
+      /* The conversion state is undefined, says POSIX.  */
+      return (size_t)(-1);
+    }
+  else
+    {
+      wchar_t wc;
+      size_t ret = mbrtowc (&wc, s, n, ps);
+      if (ret < (size_t) -2 && pwc != NULL)
+        *pwc = wc;
+      return ret;
+    }
+
+# else
+
+  /* char32_t and wchar_t are equivalent.  Use mbrtowc().  */
+  wchar_t wc;
+  size_t ret = mbrtowc (&wc, s, n, ps);
+
+#  if GNULIB_MBRTOC32_REGULAR
+  /* Ensure that mbrtoc32 is regular.  */
+  if (ret < (size_t) -2 && ! mbsinit (ps))
+    /* This occurs on glibc 2.12.  */
+    mbszero (ps);
+#  endif
+
+#  if GL_CHAR32_T_IS_UNICODE && GL_CHAR32_T_VS_WCHAR_T_NEEDS_CONVERSION
+  if (ret < (size_t) -2 && wc != 0)
+    {
+      wc = locale_encoding_to_unicode (wc);
+      if (wc == 0)
+        {
+          ret = (size_t) -1;
+          errno = EILSEQ;
+        }
+    }
+#  endif
+  if (ret < (size_t) -2 && pwc != NULL)
+    *pwc = wc;
+  return ret;
+
+# endif
+}
+
+#endif
diff --git a/gl/mbrtowc-impl-utf8.h b/gl/mbrtowc-impl-utf8.h
index 3a3ba13c..98858e22 100644
--- a/gl/mbrtowc-impl-utf8.h
+++ b/gl/mbrtowc-impl-utf8.h
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/mbrtowc-impl.h b/gl/mbrtowc-impl.h
index 963631ca..61be6599 100644
--- a/gl/mbrtowc-impl.h
+++ b/gl/mbrtowc-impl.h
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/mbrtowc.c b/gl/mbrtowc.c
index 8a1646d2..6f0aa129 100644
--- a/gl/mbrtowc.c
+++ b/gl/mbrtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/mbsinit.c b/gl/mbsinit.c
index d1b8475c..2df30b32 100644
--- a/gl/mbsinit.c
+++ b/gl/mbsinit.c
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/mbsnlen.c b/gl/mbsnlen.c
new file mode 100644
index 00000000..9c25465a
--- /dev/null
+++ b/gl/mbsnlen.c
@@ -0,0 +1,60 @@
+/* Counting the multibyte characters in a string.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2007.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <string.h>
+
+#include <stdlib.h>
+
+#if GNULIB_MCEL_PREFER
+# include "mcel.h"
+#else
+# include "mbiterf.h"
+#endif
+
+/* Return the number of multibyte characters in the character string starting
+   at STRING and ending at STRING + LEN.  */
+size_t
+mbsnlen (const char *string, size_t len)
+{
+  if (MB_CUR_MAX > 1)
+    {
+      size_t count = 0;
+
+      const char *string_end = string + len;
+
+#if GNULIB_MCEL_PREFER
+      for (; string < string_end; string += mcel_scan (string, string_end).len)
+        count++;
+#else
+      mbif_state_t state;
+      const char *iter;
+      for (mbif_init (state), iter = string; mbif_avail (state, iter, string_end); )
+        {
+          mbchar_t cur = mbif_next (state, iter, string_end);
+          count++;
+          iter += mb_len (cur);
+        }
+#endif
+
+      return count;
+    }
+  else
+    return len;
+}
diff --git a/gl/mbszero.c b/gl/mbszero.c
index 25af2848..36fc9200 100644
--- a/gl/mbszero.c
+++ b/gl/mbszero.c
@@ -1,5 +1,5 @@
 /* Put an mbstate_t into an initial conversion state.
-   Copyright (C) 2023-2024 Free Software Foundation, Inc.
+   Copyright (C) 2023-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/mbtowc-impl.h b/gl/mbtowc-impl.h
index 92efb4a7..3366c9da 100644
--- a/gl/mbtowc-impl.h
+++ b/gl/mbtowc-impl.h
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/mbtowc-lock.c b/gl/mbtowc-lock.c
index 9001c5af..e350608b 100644
--- a/gl/mbtowc-lock.c
+++ b/gl/mbtowc-lock.c
@@ -1,5 +1,5 @@
 /* Return the internal lock used by mbrtowc and mbrtoc32.
-   Copyright (C) 2019-2024 Free Software Foundation, Inc.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/mbtowc-lock.h b/gl/mbtowc-lock.h
index 10f7dc7c..500f74cc 100644
--- a/gl/mbtowc-lock.h
+++ b/gl/mbtowc-lock.h
@@ -1,5 +1,5 @@
 /* Use the internal lock used by mbrtowc and mbrtoc32.
-   Copyright (C) 2019-2024 Free Software Foundation, Inc.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/mbtowc.c b/gl/mbtowc.c
index 31a2d635..27ff35c6 100644
--- a/gl/mbtowc.c
+++ b/gl/mbtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/memchr.c b/gl/memchr.c
index 67687a8f..ef0d15f7 100644
--- a/gl/memchr.c
+++ b/gl/memchr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2024
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2025
    Free Software Foundation, Inc.
 
    Based on strlen implementation by Torbjorn Granlund (tege@sics.se),
diff --git a/gl/memchr.valgrind b/gl/memchr.valgrind
index 0295d7e6..8e55c207 100644
--- a/gl/memchr.valgrind
+++ b/gl/memchr.valgrind
@@ -1,6 +1,6 @@
 # Suppress a valgrind message about use of uninitialized memory in memchr().
 
-# Copyright (C) 2009-2024 Free Software Foundation, Inc.
+# Copyright (C) 2009-2025 Free Software Foundation, Inc.
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as
diff --git a/gl/minmax.h b/gl/minmax.h
index f3df58b0..355de4b1 100644
--- a/gl/minmax.h
+++ b/gl/minmax.h
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2024 Free Software
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/mktime-internal.h b/gl/mktime-internal.h
index 0693aaf1..215be914 100644
--- a/gl/mktime-internal.h
+++ b/gl/mktime-internal.h
@@ -1,5 +1,5 @@
 /* Internals of mktime and related functions
-   Copyright 2016-2024 Free Software Foundation, Inc.
+   Copyright 2016-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert <eggert@cs.ucla.edu>.
 
@@ -19,6 +19,9 @@
 
 #ifndef _LIBC
 # include <time.h>
+# define __libc_lock_lock(lock) ((void) 0)
+# define __libc_lock_unlock(lock) ((void) 0)
+# define __tzset_unlocked() tzset ()
 #endif
 
 /* mktime_offset_t is a signed type wide enough to hold a UTC offset
@@ -71,9 +74,10 @@ typedef int mktime_offset_t;
 #endif
 
 /* Subroutine of mktime.  Return the time_t representation of TP and
-   normalize TP, given that a struct tm * maps to a time_t as performed
-   by FUNC.  Record next guess for localtime-gmtime offset in *OFFSET.  */
-extern __time64_t __mktime_internal (struct tm *tp,
-                                     struct tm *(*func) (__time64_t const *,
-                                                         struct tm *),
+   normalize TP, given that a struct tm * maps to a time_t.  If
+   LOCAL, the mapping is performed by localtime_r, otherwise by gmtime_r.
+   Record next guess for localtime-gmtime offset in *OFFSET.
+
+   If _LIBC, the caller must lock __tzset_lock.  */
+extern __time64_t __mktime_internal (struct tm *tp, bool local,
                                      mktime_offset_t *offset) attribute_hidden;
diff --git a/gl/mktime.c b/gl/mktime.c
index c704f415..4218fca6 100644
--- a/gl/mktime.c
+++ b/gl/mktime.c
@@ -1,5 +1,5 @@
 /* Convert a 'struct tm' to a time_t value.
-   Copyright (C) 1993-2024 Free Software Foundation, Inc.
+   Copyright (C) 1993-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert <eggert@twinsun.com>.
 
@@ -51,7 +51,6 @@
 #include <string.h>
 
 #include <intprops.h>
-#include <verify.h>
 
 #ifndef NEED_MKTIME_INTERNAL
 # define NEED_MKTIME_INTERNAL 0
@@ -63,6 +62,9 @@
 # define NEED_MKTIME_WORKING 0
 #endif
 
+#ifdef _LIBC
+# include <tzset.h>
+#endif
 #include "mktime-internal.h"
 
 #if !defined _LIBC && (NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS)
@@ -99,8 +101,8 @@ my_tzset (void)
   tzset ();
 # endif
 }
-# undef __tzset
-# define __tzset() my_tzset ()
+# undef tzset
+# define tzset() my_tzset ()
 #endif
 
 #if defined _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_INTERNAL
@@ -119,12 +121,12 @@ my_tzset (void)
    __time64_t values that mktime can generate even on platforms where
    __time64_t is wider than the int components of struct tm.  */
 
-#if INT_MAX <= LONG_MAX / 4 / 366 / 24 / 60 / 60
+# if INT_MAX <= LONG_MAX / 4 / 366 / 24 / 60 / 60
 typedef long int long_int;
-#else
+# else
 typedef long long int long_int;
-#endif
-verify (INT_MAX <= TYPE_MAXIMUM (long_int) / 4 / 366 / 24 / 60 / 60);
+# endif
+static_assert (INT_MAX <= TYPE_MAXIMUM (long_int) / 4 / 366 / 24 / 60 / 60);
 
 /* Shift A right by B bits portably, by dividing A by 2**B and
    truncating towards minus infinity.  B should be in the range 0 <= B
@@ -155,9 +157,9 @@ static long_int const mktime_max
   = (TYPE_MAXIMUM (long_int) < TYPE_MAXIMUM (__time64_t)
      ? TYPE_MAXIMUM (long_int) : TYPE_MAXIMUM (__time64_t));
 
-#define EPOCH_YEAR 1970
-#define TM_YEAR_BASE 1900
-verify (TM_YEAR_BASE % 100 == 0);
+# define EPOCH_YEAR 1970
+# define TM_YEAR_BASE 1900
+static_assert (TM_YEAR_BASE % 100 == 0);
 
 /* Is YEAR + TM_YEAR_BASE a leap year?  */
 static bool
@@ -172,9 +174,9 @@ leapyear (long_int year)
 }
 
 /* How many days come before each month (0-12).  */
-#ifndef _LIBC
+# ifndef _LIBC
 static
-#endif
+# endif
 const unsigned short int __mon_yday[2][13] =
   {
     /* Normal years.  */
@@ -206,7 +208,7 @@ static long_int
 ydhms_diff (long_int year1, long_int yday1, int hour1, int min1, int sec1,
             int year0, int yday0, int hour0, int min0, int sec0)
 {
-  verify (-1 / 2 == 0);
+  static_assert (-1 / 2 == 0);
 
   /* Compute intervening leap days correctly even if year is negative.
      Take care to avoid integer overflow here.  */
@@ -251,29 +253,34 @@ tm_diff (long_int year, long_int yday, int hour, int min, int sec,
                      tp->tm_hour, tp->tm_min, tp->tm_sec);
 }
 
-/* Use CONVERT to convert T to a struct tm value in *TM.  T must be in
-   range for __time64_t.  Return TM if successful, NULL (setting errno) on
-   failure.  */
+#ifndef _LIBC
+/* Convert T to a struct tm value in *TM.  Use localtime64_r if LOCAL,
+   otherwise gmtime64_r.  T must be in range for __time64_t.  Return
+   TM if successful, NULL (setting errno) on failure.  */
 static struct tm *
-convert_time (struct tm *(*convert) (const __time64_t *, struct tm *),
-              long_int t, struct tm *tm)
+convert_time (long_int t, bool local, struct tm *tm)
 {
   __time64_t x = t;
-  return convert (&x, tm);
+  if (local)
+    return __localtime64_r (&x, tm);
+  else
+    return __gmtime64_r (&x, tm);
 }
+# define __tz_convert convert_time
+#endif
 
-/* Use CONVERT to convert *T to a broken down time in *TP.
-   If *T is out of range for conversion, adjust it so that
-   it is the nearest in-range value and then convert that.
-   A value is in range if it fits in both __time64_t and long_int.
-   Return TP on success, NULL (setting errno) on failure.  */
+/* Convert *T to a broken down time in *TP (as if by localtime if
+   LOCAL, otherwise as if by gmtime).  If *T is out of range for
+   conversion, adjust it so that it is the nearest in-range value and
+   then convert that.  A value is in range if it fits in both
+   __time64_t and long_int.  Return TP on success, NULL (setting
+   errno) on failure.  */
 static struct tm *
-ranged_convert (struct tm *(*convert) (const __time64_t *, struct tm *),
-                long_int *t, struct tm *tp)
+ranged_convert (bool local, long_int *t, struct tm *tp)
 {
   long_int t1 = (*t < mktime_min ? mktime_min
                  : *t <= mktime_max ? *t : mktime_max);
-  struct tm *r = convert_time (convert, t1, tp);
+  struct tm *r = __tz_convert (t1, local, tp);
   if (r)
     {
       *t = t1;
@@ -294,7 +301,7 @@ ranged_convert (struct tm *(*convert) (const __time64_t *, struct tm *),
       long_int mid = long_int_avg (ok, bad);
       if (mid == ok || mid == bad)
         break;
-      if (convert_time (convert, mid, tp))
+      if (__tz_convert (mid, local, tp))
         ok = mid, oktm = *tp;
       else if (errno != EOVERFLOW)
         return NULL;
@@ -310,29 +317,38 @@ ranged_convert (struct tm *(*convert) (const __time64_t *, struct tm *),
 }
 
 
-/* Convert *TP to a __time64_t value, inverting
-   the monotonic and mostly-unit-linear conversion function CONVERT.
-   Use *OFFSET to keep track of a guess at the offset of the result,
+/* Convert *TP to a __time64_t value.  If LOCAL, the reverse mapping
+   is performed as if localtime, otherwise as if by gmtime.  Use
+   *OFFSET to keep track of a guess at the offset of the result,
    compared to what the result would be for UTC without leap seconds.
-   If *OFFSET's guess is correct, only one CONVERT call is needed.
-   If successful, set *TP to the canonicalized struct tm;
+   If *OFFSET's guess is correct, only one reverse mapping call is
+   needed.  If successful, set *TP to the canonicalized struct tm;
    otherwise leave *TP alone, return ((time_t) -1) and set errno.
-   This function is external because it is used also by timegm.c.  */
+   This function is external because it is used also by timegm.c.
+
+   If _LIBC, the caller must lock __tzset_lock.  */
 __time64_t
-__mktime_internal (struct tm *tp,
-                   struct tm *(*convert) (const __time64_t *, struct tm *),
-                   mktime_offset_t *offset)
+__mktime_internal (struct tm *tp, bool local, mktime_offset_t *offset)
 {
   struct tm tm;
 
-  /* The maximum number of probes (calls to CONVERT) should be enough
-     to handle any combinations of time zone rule changes, solar time,
-     leap seconds, and oscillations around a spring-forward gap.
-     POSIX.1 prohibits leap seconds, but some hosts have them anyway.  */
+  /* The maximum number of probes should be enough to handle any
+     combinations of time zone rule changes, solar time, leap seconds,
+     and oscillations around a spring-forward gap.  POSIX.1 prohibits
+     leap seconds, but some hosts have them anyway.  */
   int remaining_probes = 6;
 
-  /* Time requested.  Copy it in case CONVERT modifies *TP; this can
-     occur if TP is localtime's returned value and CONVERT is localtime.  */
+#ifndef _LIBC
+  /* Gnulib mktime doesn't lock the tz state, so it may need to probe
+     more often if some other thread changes local time while
+     __mktime_internal is probing.  Double the number of probes; this
+     should suffice for practical cases that are at all likely.  */
+  remaining_probes *= 2;
+#endif
+
+  /* Time requested.  Copy it in case gmtime/localtime modify *TP;
+     this can occur if TP is localtime's returned value and CONVERT is
+     localtime.  */
   int sec = tp->tm_sec;
   int min = tp->tm_min;
   int hour = tp->tm_hour;
@@ -341,8 +357,8 @@ __mktime_internal (struct tm *tp,
   int year_requested = tp->tm_year;
   int isdst = tp->tm_isdst;
 
-  /* 1 if the previous probe was DST.  */
-  int dst2 = 0;
+  /* True if the previous probe was DST.  */
+  bool dst2 = false;
 
   /* Ensure that mon is in range, and set year accordingly.  */
   int mon_remainder = mon % 12;
@@ -390,7 +406,7 @@ __mktime_internal (struct tm *tp,
 
   while (true)
     {
-      if (! ranged_convert (convert, &t, &tm))
+      if (! ranged_convert (local, &t, &tm))
         return -1;
       long_int dt = tm_diff (year, yday, hour, min, sec, &tm);
       if (dt == 0)
@@ -431,13 +447,10 @@ __mktime_internal (struct tm *tp,
 
          Heuristic: probe the adjacent timestamps in both directions,
          looking for the desired isdst.  If none is found within a
-         reasonable duration bound, assume a one-hour DST difference.
+         reasonable duration bound, ignore the disagreement.
          This should work for all real time zone histories in the tz
          database.  */
 
-      /* +1 if we wanted standard time but got DST, -1 if the reverse.  */
-      int dst_difference = (isdst == 0) - (tm.tm_isdst == 0);
-
       /* Distance between probes when looking for a DST boundary.  In
          tzdata2003a, the shortest period of DST is 601200 seconds
          (e.g., America/Recife starting 2000-10-08 01:00), and the
@@ -447,21 +460,17 @@ __mktime_internal (struct tm *tp,
          periods when probing.  */
       int stride = 601200;
 
-      /* In TZDB 2021e, the longest period of DST (or of non-DST), in
-         which the DST (or adjacent DST) difference is not one hour,
-         is 457243209 seconds: e.g., America/Cambridge_Bay with leap
-         seconds, starting 1965-10-31 00:00 in a switch from
-         double-daylight time (-05) to standard time (-07), and
-         continuing to 1980-04-27 02:00 in a switch from standard time
-         (-07) to daylight time (-06).  */
-      int duration_max = 457243209;
-
-      /* Search in both directions, so the maximum distance is half
-         the duration; add the stride to avoid off-by-1 problems.  */
-      int delta_bound = duration_max / 2 + stride;
+      /* Do not probe too far away from the requested time,
+         by striding until at least a year has passed, but then giving up.
+         This helps avoid unexpected results in (for example) Asia/Kolkata,
+         for which today's users expect to see no DST even though it
+         did observe DST long ago.  */
+      int year_seconds_bound = 366 * 24 * 60 * 60 + 1;
+      int delta_bound = year_seconds_bound + stride;
 
       int delta, direction;
 
+      /* Search in both directions, closest first.  */
       for (delta = stride; delta < delta_bound; delta += stride)
         for (direction = -1; direction <= 1; direction += 2)
           {
@@ -469,7 +478,7 @@ __mktime_internal (struct tm *tp,
             if (! ckd_add (&ot, t, delta * direction))
               {
                 struct tm otm;
-                if (! ranged_convert (convert, &ot, &otm))
+                if (! ranged_convert (local, &ot, &otm))
                   return -1;
                 if (! isdst_differ (isdst, otm.tm_isdst))
                   {
@@ -479,7 +488,7 @@ __mktime_internal (struct tm *tp,
                                                 &otm);
                     if (mktime_min <= gt && gt <= mktime_max)
                       {
-                        if (convert_time (convert, gt, &tm))
+                        if (__tz_convert (gt, local, &tm))
                           {
                             t = gt;
                             goto offset_found;
@@ -491,13 +500,8 @@ __mktime_internal (struct tm *tp,
               }
           }
 
-      /* No unusual DST offset was found nearby.  Assume one-hour DST.  */
-      t += 60 * 60 * dst_difference;
-      if (mktime_min <= t && t <= mktime_max && convert_time (convert, t, &tm))
-        goto offset_found;
-
-      __set_errno (EOVERFLOW);
-      return -1;
+      /* No probe with the requested tm_isdst was found nearby.
+         Ignore the requested tm_isdst.  */
     }
 
  offset_found:
@@ -520,7 +524,7 @@ __mktime_internal (struct tm *tp,
           __set_errno (EOVERFLOW);
           return -1;
         }
-      if (! convert_time (convert, t, &tm))
+      if (! __tz_convert (t, local, &tm))
         return -1;
     }
 
@@ -536,18 +540,19 @@ __mktime_internal (struct tm *tp,
 __time64_t
 __mktime64 (struct tm *tp)
 {
-  /* POSIX.1 8.1.1 requires that whenever mktime() is called, the
-     time zone names contained in the external variable 'tzname' shall
-     be set as if the tzset() function had been called.  */
-  __tzset ();
+  __libc_lock_lock (__tzset_lock);
+  __tzset_unlocked ();
 
 # if defined _LIBC || NEED_MKTIME_WORKING
   static mktime_offset_t localtime_offset;
-  return __mktime_internal (tp, __localtime64_r, &localtime_offset);
+  __time64_t result = __mktime_internal (tp, true, &localtime_offset);
 # else
 #  undef mktime
-  return mktime (tp);
+  __time64_t result = mktime (tp);
 # endif
+
+  __libc_lock_unlock (__tzset_lock);
+  return result;
 }
 #endif /* _LIBC || NEED_MKTIME_WORKING || NEED_MKTIME_WINDOWS */
 
diff --git a/gl/mountlist.c b/gl/mountlist.c
index 06300d6b..dcff6f83 100644
--- a/gl/mountlist.c
+++ b/gl/mountlist.c
@@ -1,6 +1,6 @@
 /* mountlist.c -- return a list of mounted file systems
 
-   Copyright (C) 1991-1992, 1997-2024 Free Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1997-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,20 +19,18 @@
 
 #include "mountlist.h"
 
+#include <errno.h>
+#include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
+#include <unistd.h>
 
+#include "c-ctype.h"
 #include "xalloc.h"
 
-#include <errno.h>
-
-#include <fcntl.h>
-
-#include <unistd.h>
-
 #if HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
@@ -132,6 +130,10 @@
 # endif
 #endif
 
+#if defined _WIN32 && !defined __CYGWIN__
+# include <windows.h>
+#endif
+
 #ifndef HAVE_HASMNTOPT
 # define hasmntopt(mnt, opt) ((char *) 0)
 #endif
@@ -396,15 +398,18 @@ dev_from_mount_options (char const *mount_options)
   if (devopt)
     {
       char const *optval = devopt + sizeof dev_pattern - 1;
-      char *optvalend;
-      unsigned long int dev;
-      errno = 0;
-      dev = strtoul (optval, &optvalend, 16);
-      if (optval != optvalend
-          && (*optvalend == '\0' || *optvalend == ',')
-          && ! (dev == ULONG_MAX && errno == ERANGE)
-          && dev == (dev_t) dev)
-        return dev;
+      if (c_isxdigit (*optval))
+        {
+          char *optvalend;
+          unsigned long int dev;
+          errno = 0;
+          dev = strtoul (optval, &optvalend, 16);
+          if (optval != optvalend
+              && (*optvalend == '\0' || *optvalend == ',')
+              && ! (dev == ULONG_MAX && errno == ERANGE)
+              && dev == (dev_t) dev)
+            return dev;
+        }
     }
 
 # endif
@@ -452,12 +457,8 @@ terminate_at_blank (char *str)
     *s = '\0';
   return s;
 }
-#endif
 
-/* Return a list of the currently mounted file systems, or NULL on error.
-   Add each entry to the tail of the list so that they stay in order.
-   If NEED_FS_TYPE is true, ensure that the file system type fields in
-   the returned list are valid.  Otherwise, they might not be.  */
+#endif
 
 struct mount_entry *
 read_file_system_list (bool need_fs_type)
@@ -567,7 +568,7 @@ read_file_system_list (bool need_fs_type)
           goto free_then_fail;
       }
     else /* fallback to /proc/self/mounts (/etc/mtab).  */
-# endif /* __linux __ || __ANDROID__ */
+# endif /* __linux__ || __ANDROID__ */
       {
         struct mntent *mnt;
         char const *table = MOUNTED;
@@ -883,7 +884,9 @@ read_file_system_list (bool need_fs_type)
             me->me_mntroot = NULL;
             me->me_type = xstrdup (mnt.mnt_fstype);
             me->me_type_malloced = 1;
-            me->me_dummy = MNT_IGNORE (&mnt) != 0;
+            /* The cast from 'struct extmnttab *' to 'struct mnttab *' is OK
+               because 'struct extmnttab' extends 'struct mnttab'.  */
+            me->me_dummy = MNT_IGNORE ((struct mnttab *) &mnt) != 0;
             me->me_remote = ME_REMOTE (me->me_devname, me->me_type);
             me->me_dev = makedev (mnt.mnt_major, mnt.mnt_minor);
 
@@ -1092,6 +1095,201 @@ read_file_system_list (bool need_fs_type)
   }
 #endif /* MOUNTED_INTERIX_STATVFS */
 
+#if defined _WIN32 && !defined __CYGWIN__  /* native Windows */
+/* Don't assume that UNICODE is not defined.  */
+# undef GetDriveType
+# define GetDriveType GetDriveTypeA
+# undef GetVolumeInformation
+# define GetVolumeInformation GetVolumeInformationA
+  {
+    /* Windows has drive prefixes which are similar to mount points.
+       GetLogicalDrives returns a bitmask where the i-th bit is set
+       if ASCII 'A' + i is an available drive.  See:
+       <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getlogicaldrives>.  */
+    DWORD value = GetLogicalDrives ();
+    unsigned int i;
+
+    for (i = 0; i < 26; ++i)
+      {
+        if (value & (1U << i))
+          {
+            char mountdir[4];
+            char fs_name[MAX_PATH + 1];
+            mountdir[0] = 'A' + i;
+            mountdir[1] = ':';
+            mountdir[2] = '\\';
+            mountdir[3] = '\0';
+            /* Test whether the drive actually exists, and
+               get the name of the file system.  See:
+               <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getvolumeinformationa>.  */
+            if (GetVolumeInformation (mountdir, NULL, 0, NULL, NULL, NULL,
+                                      fs_name, sizeof fs_name))
+              {
+                me = xmalloc (sizeof *me);
+                me->me_mountdir = xstrdup (mountdir);
+                /* Check if drive is remote.  See:
+                   <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getdrivetypea>.  */
+                me->me_remote = GetDriveType (mountdir) == DRIVE_REMOTE;
+                /* Here we could use
+                   QueryDosDeviceW -> returns something like '\Device\HarddiskVolume2'
+                   GetVolumeNameForVolumeMountPointW -> return something like '\\?\Volume{...}'
+                 */
+                me->me_devname = NULL;
+                {
+                  /* Find the SUBST or NET USE mapping of the given drive.
+                     <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-querydosdevicew>
+                     For testing of SUBST:   <https://ss64.com/nt/subst.html>
+                     For testing of NET USE: <https://ss64.com/nt/net-use.html>  */
+                  wchar_t drive[3];
+                  wchar_t mapping[MAX_PATH + 1];
+                  drive[0] = L'A' + i;
+                  drive[1] = L':';
+                  drive[2] = L'\0';
+                  DWORD mapping_len = QueryDosDeviceW (drive, mapping, sizeof (mapping) / sizeof (mapping[0]));
+                  if (mapping_len > 4 && wcsncmp (mapping, L"\\??\\", 4) == 0)
+                    {
+                      /* It's a SUBSTed drive.  */
+                      char subst_dir[MAX_PATH + 1];
+                      size_t subst_dir_len = wcstombs (subst_dir, mapping + 4, sizeof (subst_dir));
+                      if (subst_dir_len > 0 && subst_dir_len <= MAX_PATH)
+                        me->me_mntroot = xstrdup (subst_dir);
+                      else
+                        /* mapping is too long or not convertible to the
+                           locale encoding.  */
+                        me->me_mntroot = NULL;
+                    }
+                  else if (mapping_len > 26
+                           && wcsncmp (mapping, L"\\Device\\LanmanRedirector\\;", 26) == 0)
+                    {
+                      wchar_t *next_backslash = wcschr (mapping + 26, L'\\');
+                      if (next_backslash != NULL)
+                        {
+                          *--next_backslash = L'\\';
+                          char share_dir[MAX_PATH + 1];
+                          size_t share_dir_len = wcstombs (share_dir, next_backslash, sizeof (share_dir));
+                          if (share_dir_len > 0 && share_dir_len <= MAX_PATH)
+                            me->me_mntroot = xstrdup (share_dir);
+                          else
+                            /* mapping is too long or not convertible to the
+                               locale encoding.  */
+                            me->me_mntroot = NULL;
+                        }
+                      else
+                        /* mapping does not have the expected form.  */
+                        me->me_mntroot = NULL;
+                    }
+                  else
+                    /* It's neither a SUBSTed nor a NET USEd drive.  */
+                    me->me_mntroot = NULL;
+                }
+                me->me_dev = (dev_t) -1;
+                me->me_dummy = 0;
+                me->me_type = xstrdup (fs_name);
+                me->me_type_malloced = 1;
+
+                /* Add to the linked list. */
+                *mtail = me;
+                mtail = &me->me_next;
+              }
+          }
+      }
+  }
+  {
+    /* Windows also has true mount points, called "mounted folders".  See
+       <https://learn.microsoft.com/en-us/windows/win32/fileio/volume-mount-points>
+       For testing: <https://learn.microsoft.com/en-us/windows-server/storage/disk-management/assign-a-mount-point-folder-path-to-a-drive>  */
+    /* Enumerate the volumes.  See
+       <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findfirstvolumew>
+       <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findnextvolumew>
+       <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-findvolumeclose>  */
+    wchar_t vol_name[MAX_PATH + 1];
+    HANDLE h = FindFirstVolumeW (vol_name, sizeof (vol_name) / sizeof (vol_name[0]));
+    if (h != INVALID_HANDLE_VALUE)
+      {
+        do
+          {
+            /* Look where the volume vol_name is mounted.
+               There are two APIs for doing this:
+                 - FindFirstVolumeMountPointW, FindNextVolumeMountPointW,
+                   FindVolumeMountPointClose.  This API always fails with
+                   error code ERROR_ACCESS_DENIED.
+                 - GetVolumePathNamesForVolumeNameW.  This API works but
+                   may require a significantly larger buffer.
+                   <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getvolumepathnamesforvolumenamew>  */
+            wchar_t stack_buf[MAX_PATH + 2];
+            wchar_t *malloced_buf = NULL;
+            wchar_t *buf = stack_buf;
+            DWORD bufsize = sizeof (stack_buf) / sizeof (wchar_t);
+            BOOL success;
+            for (;;)
+              {
+                success = GetVolumePathNamesForVolumeNameW (vol_name, buf, bufsize, &bufsize);
+                if (!success && GetLastError () == ERROR_MORE_DATA)
+                  {
+                    free (malloced_buf);
+                    malloced_buf = (wchar_t *) xmalloc (bufsize * sizeof (wchar_t));
+                    buf = malloced_buf;
+                  }
+                else
+                  break;
+              }
+            if (success)
+              {
+                wchar_t *mount_dir = buf;
+                while (*mount_dir != L'\0')
+                  {
+                    /* Drive mounts are already handled above.  */
+                    if (!(mount_dir[0] >= L'A' && mount_dir[0] <= L'Z'
+                          && mount_dir[1] == L':' && mount_dir[2] == L'\\'
+                          && mount_dir[3] == L'\0'))
+                      {
+                        char mountdir[MAX_PATH + 1];
+                        size_t mountdir_len = wcstombs (mountdir, mount_dir, sizeof (mountdir));
+                        if (mountdir_len > 0 && mountdir_len <= MAX_PATH)
+                          {
+                            char fs_name[MAX_PATH + 1];
+                            /* Get the name of the file system.  See:
+                               <https://learn.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getvolumeinformationa>.  */
+                            if (GetVolumeInformation (mountdir, NULL, 0, NULL, NULL, NULL,
+                                                      fs_name, sizeof fs_name))
+                              {
+                                me = xmalloc (sizeof *me);
+                                me->me_mountdir = xstrdup (mountdir);
+                                me->me_remote = false;
+                                /* Here we could use vol_name, something like '\\?\Volume{...}'.  */
+                                me->me_devname = NULL;
+                                me->me_mntroot = NULL;
+                                me->me_dev = (dev_t) -1;
+                                me->me_dummy = 0;
+                                me->me_type = xstrdup (fs_name);
+                                me->me_type_malloced = 1;
+
+                                /* Add to the linked list. */
+                                *mtail = me;
+                                mtail = &me->me_next;
+                              }
+                          }
+                        else
+                          {
+                            /* mount_dir is too long or not convertible to the
+                               locale encoding.  */
+                          }
+                      }
+                    mount_dir += wcslen (mount_dir) + 1;
+                  }
+              }
+            free (malloced_buf);
+          }
+        while (FindNextVolumeW (h, vol_name, sizeof (vol_name) / sizeof (vol_name[0])));
+        FindVolumeClose (h);
+      }
+  }
+#endif
+
+#if MOUNTED_NOT_PORTED
+# error "Please port gnulib mountlist.c to your platform!"
+#endif
+
   *mtail = NULL;
   return mount_list;
 
diff --git a/gl/mountlist.h b/gl/mountlist.h
index 9728e38b..e8ba1d96 100644
--- a/gl/mountlist.h
+++ b/gl/mountlist.h
@@ -1,6 +1,6 @@
 /* mountlist.h -- declarations for list of mounted file systems
 
-   Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2024 Free Software
+   Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2025 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -46,8 +46,13 @@ struct mount_entry
   struct mount_entry *me_next;
 };
 
+/* Return a list of the currently mounted file systems, or NULL on error.
+   Add each entry to the tail of the list so that they stay in order.
+   If NEED_FS_TYPE is true, ensure that the file system type fields in
+   the returned list are valid.  Otherwise, they might not be.  */
 struct mount_entry *read_file_system_list (bool need_fs_type)
   _GL_ATTRIBUTE_MALLOC;
+
 void free_mount_entry (struct mount_entry *entry);
 
 
diff --git a/gl/msvc-inval.c b/gl/msvc-inval.c
index da3fc86a..1b51b1b0 100644
--- a/gl/msvc-inval.c
+++ b/gl/msvc-inval.c
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/msvc-inval.h b/gl/msvc-inval.h
index 7aee6e5d..9bb8a156 100644
--- a/gl/msvc-inval.h
+++ b/gl/msvc-inval.h
@@ -1,5 +1,5 @@
 /* Invalid parameter handler for MSVC runtime libraries.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/msvc-nothrow.c b/gl/msvc-nothrow.c
index 06b35a61..7cf7517e 100644
--- a/gl/msvc-nothrow.c
+++ b/gl/msvc-nothrow.c
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/msvc-nothrow.h b/gl/msvc-nothrow.h
index 121773d1..b02f36c4 100644
--- a/gl/msvc-nothrow.h
+++ b/gl/msvc-nothrow.h
@@ -1,6 +1,6 @@
 /* Wrappers that don't throw invalid parameter notifications
    with MSVC runtime libraries.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/netdb.in.h b/gl/netdb.in.h
index 43409b2f..22059ea0 100644
--- a/gl/netdb.in.h
+++ b/gl/netdb.in.h
@@ -1,5 +1,5 @@
 /* Provide a netdb.h header file for systems lacking it (read: MinGW).
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This file is free software: you can redistribute it and/or modify
@@ -54,6 +54,14 @@
 /* Declarations for a platform that lacks <netdb.h>, or where it is
    incomplete.  */
 
+/* Maximum length of a fully-qualified domain name.  */
+#undef NI_MAXHOST
+#define NI_MAXHOST 1025
+
+/* Maximum length of a service.  */
+#undef NI_MAXSERV
+#define NI_MAXSERV 32
+
 #if @GNULIB_GETADDRINFO@
 
 # if !@HAVE_STRUCT_ADDRINFO@
@@ -91,12 +99,11 @@ struct addrinfo
 # ifndef AI_CANONNAME
 #  define AI_CANONNAME  0x0002  /* Request for canonical name.  */
 # endif
-# ifndef AI_NUMERICSERV
-#  define AI_NUMERICSERV        0x0400  /* Don't use name resolution.  */
+# ifndef AI_NUMERICHOST
+#  define AI_NUMERICHOST 0x0004  /* Return numeric host address as name.  */
 # endif
-
-# if 0
-#  define AI_NUMERICHOST        0x0004  /* Don't use name resolution.  */
+# ifndef AI_NUMERICSERV
+#  define AI_NUMERICSERV 0x0400  /* Return service number as service name.  */
 # endif
 
 /* These symbolic constants are required to be present by POSIX, but
@@ -176,7 +183,7 @@ _GL_FUNCDECL_RPL (getaddrinfo, int,
                   (const char *restrict nodename,
                    const char *restrict servname,
                    const struct addrinfo *restrict hints,
-                   struct addrinfo **restrict res)
+                   struct addrinfo **restrict res),
                   _GL_ARG_NONNULL ((4)));
 _GL_CXXALIAS_RPL (getaddrinfo, int,
                   (const char *restrict nodename,
@@ -189,7 +196,7 @@ _GL_FUNCDECL_SYS (getaddrinfo, int,
                   (const char *restrict nodename,
                    const char *restrict servname,
                    const struct addrinfo *restrict hints,
-                   struct addrinfo **restrict res)
+                   struct addrinfo **restrict res),
                   _GL_ARG_NONNULL ((4)));
 #  endif
 _GL_CXXALIAS_SYS (getaddrinfo, int,
@@ -208,12 +215,12 @@ _GL_CXXALIASWARN (getaddrinfo);
 #   undef freeaddrinfo
 #   define freeaddrinfo rpl_freeaddrinfo
 #  endif
-_GL_FUNCDECL_RPL (freeaddrinfo, void, (struct addrinfo *ai)
+_GL_FUNCDECL_RPL (freeaddrinfo, void, (struct addrinfo *ai),
                                       _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (freeaddrinfo, void, (struct addrinfo *ai));
 # else
 #  if !@HAVE_DECL_FREEADDRINFO@
-_GL_FUNCDECL_SYS (freeaddrinfo, void, (struct addrinfo *ai)
+_GL_FUNCDECL_SYS (freeaddrinfo, void, (struct addrinfo *ai),
                                       _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (freeaddrinfo, void, (struct addrinfo *ai));
@@ -225,14 +232,14 @@ _GL_CXXALIASWARN (freeaddrinfo);
 #   undef gai_strerror
 #   define gai_strerror rpl_gai_strerror
 #  endif
-_GL_FUNCDECL_RPL (gai_strerror, const char *, (int ecode));
+_GL_FUNCDECL_RPL (gai_strerror, const char *, (int ecode), );
 _GL_CXXALIAS_RPL (gai_strerror, const char *, (int ecode));
 # else
 #  if !@HAVE_DECL_GAI_STRERROR@
 /* Convert error return from getaddrinfo() to a string.
    For more details, see the POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/gai_strerror.html>.  */
-_GL_FUNCDECL_SYS (gai_strerror, const char *, (int ecode));
+_GL_FUNCDECL_SYS (gai_strerror, const char *, (int ecode), );
 #  endif
 _GL_CXXALIAS_SYS (gai_strerror, const char *, (int ecode));
 # endif
@@ -248,7 +255,7 @@ _GL_FUNCDECL_SYS (getnameinfo, int,
                   (const struct sockaddr *restrict sa, socklen_t salen,
                    char *restrict node, socklen_t nodelen,
                    char *restrict service, socklen_t servicelen,
-                   int flags)
+                   int flags),
                   _GL_ARG_NONNULL ((1)));
 # endif
 /* Need to cast, because on glibc systems, the seventh parameter is
diff --git a/gl/netinet_in.in.h b/gl/netinet_in.in.h
index 4e9f6f2d..402d01a9 100644
--- a/gl/netinet_in.in.h
+++ b/gl/netinet_in.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <netinet/in.h>.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/nl_langinfo-lock.c b/gl/nl_langinfo-lock.c
index 5a248ed8..1ac25515 100644
--- a/gl/nl_langinfo-lock.c
+++ b/gl/nl_langinfo-lock.c
@@ -1,5 +1,5 @@
 /* Return the internal lock used by nl_langinfo.
-   Copyright (C) 2019-2024 Free Software Foundation, Inc.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/nl_langinfo.c b/gl/nl_langinfo.c
index 64ff93b0..0180c26a 100644
--- a/gl/nl_langinfo.c
+++ b/gl/nl_langinfo.c
@@ -1,6 +1,6 @@
 /* nl_langinfo() replacement: query locale dependent information.
 
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -154,11 +154,15 @@ ctype_codeset (void)
    "thread5 disturbed by threadN!", even when threadN invokes only
       nl_langinfo (CODESET);
       nl_langinfo (CRNCYSTR);
-   Similarly on Solaris 10.  */
+   Similarly on Solaris 10 and macOS 26.  */
 
-# if !NL_LANGINFO_MTSAFE /* Solaris */
+# if !NL_LANGINFO_MTSAFE /* macOS, Solaris */
 
-#  define ITEMS (MAXSTRMSG + 1)
+#  ifdef __sun /* Solaris */
+#   define ITEMS (MAXSTRMSG + 1)
+#  else /* macOS */
+#   define ITEMS (CRNCYSTR + 20)
+#  endif
 #  define MAX_RESULT_LEN 80
 
 static char *
@@ -317,6 +321,24 @@ rpl_nl_langinfo (nl_item item)
       item = item - ALTMON_1 + MON_1;
       break;
 # endif
+# if GNULIB_defined_ABALTMON
+    case ABALTMON_1:
+    case ABALTMON_2:
+    case ABALTMON_3:
+    case ABALTMON_4:
+    case ABALTMON_5:
+    case ABALTMON_6:
+    case ABALTMON_7:
+    case ABALTMON_8:
+    case ABALTMON_9:
+    case ABALTMON_10:
+    case ABALTMON_11:
+    case ABALTMON_12:
+      /* We don't ship the appropriate localizations with gnulib.  Therefore,
+         treat ABALTMON_i like ABMON_i.  */
+      item = item - ABALTMON_1 + ABMON_1;
+      break;
+# endif
 # if GNULIB_defined_ERA
     case ERA:
       /* The format is not standardized.  In glibc it is a sequence of strings
@@ -510,30 +532,57 @@ nl_langinfo (nl_item item)
           return result[item - ALTMON_1];
         }
     }
-    case ABMON_1:
-    case ABMON_2:
-    case ABMON_3:
-    case ABMON_4:
-    case ABMON_5:
-    case ABMON_6:
-    case ABMON_7:
-    case ABMON_8:
-    case ABMON_9:
-    case ABMON_10:
-    case ABMON_11:
-    case ABMON_12:
-      {
-        static char result[12][30];
-        static char const abmonths[][sizeof "Jan"] = {
-          "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
-          "Aug", "Sep", "Oct", "Nov", "Dec"
-        };
-        tmm.tm_mon = item - ABMON_1;
-        if (!strftime (buf, sizeof result[0], "%b", &tmm))
-          return (char *) abmonths[item - ABMON_1];
-        strcpy (result[item - ABMON_1], buf);
-        return result[item - ABMON_1];
-      }
+    {
+      static char const abmonths[][sizeof "Jan"] = {
+        "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
+        "Aug", "Sep", "Oct", "Nov", "Dec"
+      };
+      case ABMON_1:
+      case ABMON_2:
+      case ABMON_3:
+      case ABMON_4:
+      case ABMON_5:
+      case ABMON_6:
+      case ABMON_7:
+      case ABMON_8:
+      case ABMON_9:
+      case ABMON_10:
+      case ABMON_11:
+      case ABMON_12:
+        {
+          static char result[12][30];
+          tmm.tm_mon = item - ABMON_1;
+          if (!strftime (buf, sizeof result[0], "%b", &tmm))
+            return (char *) abmonths[item - ABMON_1];
+          strcpy (result[item - ABMON_1], buf);
+          return result[item - ABMON_1];
+        }
+      case ABALTMON_1:
+      case ABALTMON_2:
+      case ABALTMON_3:
+      case ABALTMON_4:
+      case ABALTMON_5:
+      case ABALTMON_6:
+      case ABALTMON_7:
+      case ABALTMON_8:
+      case ABALTMON_9:
+      case ABALTMON_10:
+      case ABALTMON_11:
+      case ABALTMON_12:
+        {
+          static char result[12][50];
+          tmm.tm_mon = item - ABALTMON_1;
+          /* The platforms without nl_langinfo() don't support strftime with
+             %Ob.  We don't even need to try.  */
+          #if 0
+          if (!strftime (buf, sizeof result[0], "%Ob", &tmm))
+          #endif
+            if (!strftime (buf, sizeof result[0], "%b", &tmm))
+              return (char *) abmonths[item - ABALTMON_1];
+          strcpy (result[item - ABALTMON_1], buf);
+          return result[item - ABALTMON_1];
+        }
+    }
     case ERA:
       return (char *) "";
     case ALT_DIGITS:
diff --git a/gl/open.c b/gl/open.c
index e690c9ea..d76372fd 100644
--- a/gl/open.c
+++ b/gl/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -55,24 +55,29 @@ orig_open (const char *filename, int flags, mode_t mode)
 #include <sys/stat.h>
 #include <unistd.h>
 
+#ifndef HAVE_WORKING_O_DIRECTORY
+# define HAVE_WORKING_O_DIRECTORY false
+#endif
+
+#ifndef OPEN_TRAILING_SLASH_BUG
+# define OPEN_TRAILING_SLASH_BUG false
+#endif
+
 #ifndef REPLACE_OPEN_DIRECTORY
-# define REPLACE_OPEN_DIRECTORY 0
+# define REPLACE_OPEN_DIRECTORY false
 #endif
 
+static int
+lstatif (char const *filename, struct stat *st, int flags)
+{
+  return flags & O_NOFOLLOW ? lstat (filename, st) : stat (filename, st);
+}
+
 int
 open (const char *filename, int flags, ...)
 {
-  /* 0 = unknown, 1 = yes, -1 = no.  */
-#if GNULIB_defined_O_CLOEXEC
-  int have_cloexec = -1;
-#else
-  static int have_cloexec;
-#endif
-
-  mode_t mode;
-  int fd;
+  mode_t mode = 0;
 
-  mode = 0;
   if (flags & O_CREAT)
     {
       va_list arg;
@@ -99,7 +104,6 @@ open (const char *filename, int flags, ...)
     filename = "NUL";
 #endif
 
-#if OPEN_TRAILING_SLASH_BUG
   /* Fail if one of O_CREAT, O_WRONLY, O_RDWR is specified and the filename
      ends in a slash, as POSIX says such a filename must name a directory
      <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13>:
@@ -118,21 +122,55 @@ open (const char *filename, int flags, ...)
          directories,
        - if O_WRONLY or O_RDWR is specified, open() must fail because the
          file does not contain a '.' directory.  */
-  if ((flags & O_CREAT)
-      || (flags & O_ACCMODE) == O_RDWR
-      || (flags & O_ACCMODE) == O_WRONLY)
+  bool check_for_slash_bug;
+  if (OPEN_TRAILING_SLASH_BUG)
     {
       size_t len = strlen (filename);
-      if (len > 0 && filename[len - 1] == '/')
+      check_for_slash_bug = len && filename[len - 1] == '/';
+    }
+  else
+    check_for_slash_bug = false;
+
+  if (check_for_slash_bug
+      && (flags & O_CREAT
+          || (flags & O_ACCMODE) == O_RDWR
+          || (flags & O_ACCMODE) == O_WRONLY))
+    {
+      errno = EISDIR;
+      return -1;
+    }
+
+  /* With the trailing slash bug or without working O_DIRECTORY, check with
+     stat first lest we hang trying to open a fifo.  Although there is
+     a race between this and opening the file, we can do no better.
+     After opening the file we will check again with fstat.  */
+  bool check_directory =
+    (check_for_slash_bug
+     || (!HAVE_WORKING_O_DIRECTORY && flags & O_DIRECTORY));
+  if (check_directory)
+    {
+      struct stat statbuf;
+      if (lstatif (filename, &statbuf, flags) < 0)
+        {
+          if (! (flags & O_CREAT && errno == ENOENT))
+            return -1;
+        }
+      else if (!S_ISDIR (statbuf.st_mode))
         {
-          errno = EISDIR;
+          errno = ENOTDIR;
           return -1;
         }
     }
+
+  /* 0 = unknown, 1 = yes, -1 = no.  */
+#if GNULIB_defined_O_CLOEXEC
+  int have_cloexec = -1;
+#else
+  static int have_cloexec;
 #endif
 
-  fd = orig_open (filename,
-                  flags & ~(have_cloexec < 0 ? O_CLOEXEC : 0), mode);
+  int fd = orig_open (filename,
+                      flags & ~(have_cloexec < 0 ? O_CLOEXEC : 0), mode);
 
   if (flags & O_CLOEXEC)
     {
@@ -154,19 +192,21 @@ open (const char *filename, int flags, ...)
 #if REPLACE_FCHDIR
   /* Implementing fchdir and fdopendir requires the ability to open a
      directory file descriptor.  If open doesn't support that (as on
-     mingw), we use a dummy file that behaves the same as directories
+     mingw), use a dummy file that behaves the same as directories
      on Linux (ie. always reports EOF on attempts to read()), and
-     override fstat() in fchdir.c to hide the fact that we have a
-     dummy.  */
+     override fstat in fchdir.c to hide the dummy.  */
   if (REPLACE_OPEN_DIRECTORY && fd < 0 && errno == EACCES
-      && ((flags & O_ACCMODE) == O_RDONLY
-          || (O_SEARCH != O_RDONLY && (flags & O_ACCMODE) == O_SEARCH)))
+      && ((flags & (O_ACCMODE | O_CREAT)) == O_RDONLY
+          || (O_SEARCH != O_RDONLY
+              && (flags & (O_ACCMODE | O_CREAT)) == O_SEARCH)))
     {
       struct stat statbuf;
-      if (stat (filename, &statbuf) == 0 && S_ISDIR (statbuf.st_mode))
+      if (check_directory
+          || (lstatif (filename, &statbuf, flags) == 0
+              && S_ISDIR (statbuf.st_mode)))
         {
           /* Maximum recursion depth of 1.  */
-          fd = open ("/dev/null", flags, mode);
+          fd = open ("/dev/null", flags & ~O_DIRECTORY, mode);
           if (0 <= fd)
             fd = _gl_register_fd (fd, filename);
         }
@@ -175,10 +215,8 @@ open (const char *filename, int flags, ...)
     }
 #endif
 
-#if OPEN_TRAILING_SLASH_BUG
-  /* If the filename ends in a slash and fd does not refer to a directory,
-     then fail.
-     Rationale: POSIX says such a filename must name a directory
+  /* If checking for directories, fail if fd does not refer to a directory.
+     Rationale: A filename ending in slash cannot name a non-directory
      <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13>:
        "A pathname that contains at least one non-<slash> character and that
         ends with one or more trailing <slash> characters shall not be resolved
@@ -186,23 +224,18 @@ open (const char *filename, int flags, ...)
         <slash> characters names an existing directory"
      If the named file without the slash is not a directory, open() must fail
      with ENOTDIR.  */
-  if (fd >= 0)
+  if (check_directory && 0 <= fd)
     {
-      /* We know len is positive, since open did not fail with ENOENT.  */
-      size_t len = strlen (filename);
-      if (filename[len - 1] == '/')
+      struct stat statbuf;
+      int r = fstat (fd, &statbuf);
+      if (r < 0 || !S_ISDIR (statbuf.st_mode))
         {
-          struct stat statbuf;
-
-          if (fstat (fd, &statbuf) >= 0 && !S_ISDIR (statbuf.st_mode))
-            {
-              close (fd);
-              errno = ENOTDIR;
-              return -1;
-            }
+          int err = r < 0 ? errno : ENOTDIR;
+          close (fd);
+          errno = err;
+          return -1;
         }
     }
-#endif
 
 #if REPLACE_FCHDIR
   if (!REPLACE_OPEN_DIRECTORY && 0 <= fd)
diff --git a/gl/pathmax.h b/gl/pathmax.h
index d6512c6f..5f535517 100644
--- a/gl/pathmax.h
+++ b/gl/pathmax.h
@@ -1,5 +1,5 @@
 /* Define PATH_MAX somehow.  Requires sys/types.h.
-   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2024 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/printf-args.c b/gl/printf-args.c
index eb0d2cdc..b83ec1e8 100644
--- a/gl/printf-args.c
+++ b/gl/printf-args.c
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2024 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -32,6 +32,9 @@
 /* Get INT_WIDTH.  */
 #include <limits.h>
 
+/* Get abort().  */
+#include <stdlib.h>
+
 #ifdef STATIC
 STATIC
 #endif
@@ -198,7 +201,6 @@ PRINTF_FETCHARGS (va_list args, arguments *a)
         if (ap->a.a_string == NULL)
           ap->a.a_string = "(NULL)";
         break;
-#if HAVE_WCHAR_T
       case TYPE_WIDE_STRING:
         ap->a.a_wide_string = va_arg (args, const wchar_t *);
         /* A null pointer is an invalid argument for "%ls", but in practice
@@ -216,7 +218,6 @@ PRINTF_FETCHARGS (va_list args, arguments *a)
             ap->a.a_wide_string = wide_null_string;
           }
         break;
-#endif
       case TYPE_POINTER:
         ap->a.a_pointer = va_arg (args, void *);
         break;
@@ -298,9 +299,19 @@ PRINTF_FETCHARGS (va_list args, arguments *a)
           }
         break;
 #endif
-      default:
-        /* Unknown type.  */
+      case TYPE_NONE:
+        /* Argument i is not used by any directive, but some argument with
+           number > i is used by a format directive.  POSIX says that this
+           is invalid:
+             "When numbered argument specifications are used, specifying the
+              Nth argument requires that all the leading arguments, from the
+              first to the (N-1)th, are specified in the format string."
+           The reason is that we cannot know how many bytes to skip in the
+           va_arg sequence.  */
         return -1;
+      default:
+        /* Unknown type.  Should not happen.  */
+        abort ();
       }
   return 0;
 }
diff --git a/gl/printf-args.h b/gl/printf-args.h
index 9b80bb39..6edc570c 100644
--- a/gl/printf-args.h
+++ b/gl/printf-args.h
@@ -1,5 +1,5 @@
 /* Decomposed printf argument list.
-   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2024 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -28,14 +28,9 @@
 # define PRINTF_FETCHARGS printf_fetchargs
 #endif
 
-/* Get size_t.  */
+/* Get size_t, wchar_t.  */
 #include <stddef.h>
 
-/* Get wchar_t.  */
-#if HAVE_WCHAR_T
-# include <stddef.h>
-#endif
-
 /* Get wint_t.  */
 #if HAVE_WINT_T
 # include <wchar.h>
@@ -89,9 +84,7 @@ typedef enum
   TYPE_WIDE_CHAR,
 #endif
   TYPE_STRING,
-#if HAVE_WCHAR_T
   TYPE_WIDE_STRING,
-#endif
   TYPE_POINTER,
   TYPE_COUNT_SCHAR_POINTER,
   TYPE_COUNT_SHORT_POINTER,
@@ -154,9 +147,7 @@ typedef struct
     wint_t                      a_wide_char;
 #endif
     const char*                 a_string;
-#if HAVE_WCHAR_T
     const wchar_t*              a_wide_string;
-#endif
     void*                       a_pointer;
     signed char *               a_count_schar_pointer;
     short *                     a_count_short_pointer;
diff --git a/gl/printf-parse.c b/gl/printf-parse.c
index a33e27a0..79b35034 100644
--- a/gl/printf-parse.c
+++ b/gl/printf-parse.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999-2000, 2002-2003, 2006-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -600,20 +600,14 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
                 if (signed_type == TYPE_LONGINT
                     /* For backward compatibility only.  */
                     || signed_type == TYPE_LONGLONGINT)
-#if HAVE_WCHAR_T
                   type = TYPE_WIDE_STRING;
-#else
-                  goto error;
-#endif
                 else
                   type = TYPE_STRING;
                 break;
-#if HAVE_WCHAR_T
               case 'S':
                 type = TYPE_WIDE_STRING;
                 c = 's';
                 break;
-#endif
               case 'p':
                 type = TYPE_POINTER;
                 break;
diff --git a/gl/printf-parse.h b/gl/printf-parse.h
index 949b8754..673053b8 100644
--- a/gl/printf-parse.h
+++ b/gl/printf-parse.h
@@ -1,5 +1,5 @@
 /* Parse printf format string.
-   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2024 Free Software
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/pthread-once.c b/gl/pthread-once.c
new file mode 100644
index 00000000..b19dae50
--- /dev/null
+++ b/gl/pthread-once.c
@@ -0,0 +1,148 @@
+/* POSIX once-only control.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2019.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <pthread.h>
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# include "windows-once.h"
+#endif
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+/* Use Windows threads.  */
+
+int
+pthread_once (pthread_once_t *once_control, void (*initfunction) (void))
+{
+  glwthread_once (once_control, initfunction);
+  return 0;
+}
+
+#elif HAVE_PTHREAD_H
+/* Provide workarounds for POSIX threads.  */
+
+# if defined __CYGWIN__
+
+#  include <stdlib.h>
+
+int
+pthread_once (pthread_once_t *once_control, void (*initfunction) (void))
+{
+  /* In this implementation, we reuse the type
+       typedef struct { pthread_mutex_t mutex; int state; } pthread_once_t;
+       #define PTHREAD_ONCE_INIT { PTHREAD_MUTEX_INITIALIZER, 0 }
+     while assigning the following meaning to the state:
+       state = (<number of waiting threads> << 16) + <1 if done>
+     In other words:
+       state = { unsigned int num_threads : 16; unsigned int done : 16; }
+   */
+  struct actual_state
+    {
+      _Atomic unsigned short num_threads;
+      /* done == 0: initial state
+         done == 1: initfunction executed, lock still active
+         done == 2: initfunction executed, lock no longer usable */
+      _Atomic unsigned short done;
+    };
+  struct actual_state *state_p = (struct actual_state *) &once_control->state;
+  /* This test is not necessary.  It's only an optimization, to establish
+     a fast path for the common case that the 'done' word is already > 0.  */
+  if (state_p->done == 0)
+    {
+      /* Increment num_threads (atomically), to indicate that this thread will
+         possibly take the lock.  */
+      state_p->num_threads += 1;
+      /* Test the 'done' word.  */
+      if (state_p->done == 0)
+        {
+          /* The 'done' word is still zero.  Now take the lock.  */
+          pthread_mutex_lock (&once_control->mutex);
+          /* Test the 'done' word again.  */
+          if (state_p->done == 0)
+            {
+              /* Execute the initfunction.  */
+              (*initfunction) ();
+              /* Set the 'done' word to 1 (atomically).  */
+              state_p->done = 1;
+            }
+          /* Now the 'done' word is 1.  Release the lock.  */
+          pthread_mutex_unlock (&once_control->mutex);
+        }
+      /* Here, done is > 0.  */
+      /* Decrement num_threads (atomically).  */
+      if ((state_p->num_threads -= 1) == 0)
+        {
+          /* num_threads is now zero, and done is > 0.
+             No other thread will need to use the lock.
+             We can therefore destroy the lock, to free resources.  */
+          if (__sync_bool_compare_and_swap (&state_p->done, 1, 2))
+            pthread_mutex_destroy (&once_control->mutex);
+        }
+    }
+  /* Proof of correctness:
+     * num_threads is incremented and then decremented by some threads.
+       Therefore, num_threads always stays >= 0, and is == 0 at the end.
+     * The 'done' word, once > 0, stays > 0 (since it is never assigned 0).
+     * The 'done' word is changed from == 0 to > 0 only while the lock
+       is taken. Therefore, only the first thread that succeeds in taking
+       the lock executes the initfunction and sets the 'done' word to a
+       value > 0; the other threads that take the lock do no side effects
+       between taking and releasing the lock.
+     * The 'done' word does not change any more once it is 2.
+       Therefore, it can be changed from 1 to 2 only once.
+     * pthread_mutex_destroy gets invoked right after 'done' has been changed
+       from 1 to 2.  Therefore, pthread_mutex_destroy gets invoked only once.
+     * After a moment where num_threads was 0 and done was > 0, no thread can
+       reach the pthread_mutex_lock invocation. Proof:
+       - At such a moment, no thread is in the code range between
+           state_p->num_threads += 1
+         and
+           state_p->num_threads -= 1
+       - After such a moment, some thread can increment num_threads, but from
+         there they cannot reach the pthread_mutex_lock invocation, because the
+           if (state_p->done == 0)
+         test prevents that.
+     * From this it follows that:
+       - pthread_mutex_destroy cannot be executed while the lock is taken
+         (because pthread_mutex_destroy is only executed after a moment where
+         num_threads was 0 and done was > 0).
+       - Once pthread_mutex_destroy has been executed, the lock is not used any
+         more.
+   */
+  return 0;
+}
+
+# endif
+
+#else
+/* Provide a dummy implementation for single-threaded applications.  */
+
+int
+pthread_once (pthread_once_t *once_control, void (*initfunction) (void))
+{
+  if (*once_control == 0)
+    {
+      *once_control = ~ 0;
+      initfunction ();
+    }
+  return 0;
+}
+
+#endif
diff --git a/gl/pthread.h b/gl/pthread.h
new file mode 100644
index 00000000..599f1633
--- /dev/null
+++ b/gl/pthread.h
@@ -0,0 +1,2571 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Implement the most essential subset of POSIX pthread.h.
+
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert, Glen Lenker, and Bruno Haible.  */
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+
+#if defined _GL_ALREADY_INCLUDING_PTHREAD_H
+/* Special invocation convention:
+   On Android, we have a sequence of nested includes
+   <pthread.h> -> <time.h> -> <sys/time.h> -> <sys/select.h> ->
+   <signal.h> -> <pthread.h>.
+   In this situation, PTHREAD_COND_INITIALIZER is not yet defined,
+   therefore we should not attempt to define PTHREAD_MUTEX_NORMAL etc.  */
+
+#include_next <pthread.h>
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _GL_PTHREAD_H_
+
+#if 1
+
+# define _GL_ALREADY_INCLUDING_PTHREAD_H
+
+/* The include_next requires a split double-inclusion guard.  */
+# include_next <pthread.h>
+
+# undef _GL_ALREADY_INCLUDING_PTHREAD_H
+
+#endif
+
+#ifndef _GL_PTHREAD_H_
+#define _GL_PTHREAD_H_
+
+/* This file uses _Noreturn, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+#define __need_system_stdlib_h
+#include <stdlib.h>
+#undef __need_system_stdlib_h
+
+
+/* The pthreads-win32 <pthread.h> defines a couple of broken macros.  */
+#undef asctime_r
+#undef ctime_r
+#undef gmtime_r
+#undef localtime_r
+#undef rand_r
+#undef strtok_r
+
+#include <errno.h>
+#include <sched.h>
+#include <sys/types.h>
+#include <time.h>
+
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The attribute __pure__ was added in gcc 2.96.  */
+#ifndef _GL_ATTRIBUTE_PURE
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__
+#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _GL_ATTRIBUTE_PURE /* empty */
+# endif
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+/* C++ compatible function declaration macros.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* Begin/end the GNULIB_NAMESPACE namespace.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE {
+# define _GL_END_NAMESPACE }
+#else
+# define _GL_BEGIN_NAMESPACE
+# define _GL_END_NAMESPACE
+#endif
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_EXTERN_C_FUNC declaration;
+   performs the declaration of a function with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C_FUNC extern "C"
+#else
+/* In C mode, omit the 'extern' keyword, because attributes in bracket syntax
+   are not allowed between 'extern' and the return type (see gnulib-common.m4).
+ */
+# define _GL_EXTERN_C_FUNC
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters, [attributes]);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...),
+                                  _GL_ARG_NONNULL ((1)));
+
+   Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front
+   of a _GL_FUNCDECL_RPL invocation only in C mode, not in C++ mode.  (That's
+   because
+     [[...]] extern "C" <declaration>;
+   is invalid syntax in C++.)
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters,...) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters, __VA_ARGS__)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+
+/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
+   parenthesized func otherwise.  Parenthesization is needed in C23 if
+   the function is like strchr and so is a qualifier-generic macro
+   that expands to something more complicated.  */
+#ifdef __cplusplus
+# define _GL_FUNCDECL_SYS_NAME(func) func
+#else
+# define _GL_FUNCDECL_SYS_NAME(func) (func)
+#endif
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+
+   Wrapping rpl_func in an object with an inline conversion operator
+   avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::rpl_func;                                  \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_MDA (func, rettype, parameters);
+   is to be used when func is a Microsoft deprecated alias, on native Windows.
+   It declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to _func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_MDA(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, _##func, rettype, parameters)
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      static const struct _gl_ ## func ## _wrapper                 \
+      {                                                            \
+        typedef rettype (*type) parameters;                        \
+                                                                   \
+        inline operator type () const                              \
+        {                                                          \
+          return reinterpret_cast<type>(::rpl_func);               \
+        }                                                          \
+      } func = {};                                                 \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_MDA_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_MDA (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#define _GL_CXXALIAS_MDA_CAST(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_CAST_1 (func, _##func, rettype, parameters)
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+
+   Wrapping func in an object with an inline conversion operator
+   avoids a reference to func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS(func,rettype,parameters)            \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::func;                                      \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static const struct _gl_ ## func ## _wrapper      \
+      {                                                 \
+        typedef rettype (*type) parameters;             \
+                                                        \
+        inline operator type () const                   \
+        {                                               \
+          return reinterpret_cast<type>(::func);        \
+        }                                               \
+      } func = {};                                      \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static const struct _gl_ ## func ## _wrapper                            \
+      {                                                                       \
+        typedef rettype (*type) parameters;                                   \
+                                                                              \
+        inline operator type () const                                         \
+        {                                                                     \
+          return reinterpret_cast<type>((rettype2 (*) parameters2)(::func));  \
+        }                                                                     \
+      } func = {};                                                            \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <https://gcc.gnu.org/PR43881>,
+   we enable the warning only when not optimizing.  */
+# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__)
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <https://gcc.gnu.org/PR43881>,
+   we enable the warning only when not optimizing.  */
+# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__)
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
+
+/* The definition of _Noreturn is copied here.  */
+/* A C macro for declaring that a function does not return.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* The _Noreturn keyword of C11.
+   Do not use [[noreturn]], because with it the syntax
+     extern _Noreturn void func (...);
+   would not be valid; such a declaration would be valid only with 'extern'
+   and '_Noreturn' swapped, or without the 'extern' keyword.  However, some
+   AIX system header files and several gnulib header files use precisely
+   this syntax with 'extern'.  So even though C23 deprecates _Noreturn,
+   it is currently more portable to prefer it to [[noreturn]].
+
+   Also, do not try to work around LLVM bug 59792 (clang 15 or earlier).
+   This rare bug can be worked around by compiling with 'clang -D_Noreturn=',
+   though the workaround may generate many false-alarm warnings.  */
+#ifndef _Noreturn
+# if ((!defined __cplusplus || defined __clang__) \
+      && (201112 <= (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0)))
+   /* _Noreturn works as-is.  */
+# elif (2 < __GNUC__ + (8 <= __GNUC_MINOR__) || defined __clang__ \
+        || 0x5110 <= __SUNPRO_C)
+   /* Prefer __attribute__ ((__noreturn__)) to plain _Noreturn even if the
+      latter works, as 'gcc -std=gnu99 -Wpedantic' warns about _Noreturn.  */
+#  define _Noreturn __attribute__ ((__noreturn__))
+# elif 1200 <= (defined _MSC_VER ? _MSC_VER : 0)
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn
+# endif
+#endif
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || defined __clang__
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+/* A C macro for emitting warnings if a function is used.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
+   for FUNCTION which will then trigger a compiler warning containing
+   the text of "literal string" anywhere that function is called, if
+   supported by the compiler.  If the compiler does not support this
+   feature, the macro expands to an unused extern declaration.
+
+   _GL_WARN_ON_USE_ATTRIBUTE ("literal string") expands to the
+   attribute used in _GL_WARN_ON_USE.  If the compiler does not support
+   this feature, it expands to empty.
+
+   These macros are useful for marking a function as a potential
+   portability trap, with the intent that "literal string" include
+   instructions on the replacement function that should be used
+   instead.
+   _GL_WARN_ON_USE is for functions with 'extern' linkage.
+   _GL_WARN_ON_USE_ATTRIBUTE is for functions with 'static' or 'inline'
+   linkage.
+
+   _GL_WARN_ON_USE should not be used more than once for a given function
+   in a given compilation unit (because this may generate a warning even
+   if the function is never called).
+
+   However, one of the reasons that a function is a portability trap is
+   if it has the wrong signature.  Declaring FUNCTION with a different
+   signature in C is a compilation error, so this macro must use the
+   same type as any existing declaration so that programs that avoid
+   the problematic FUNCTION do not fail to compile merely because they
+   included a header that poisoned the function.  But this implies that
+   _GL_WARN_ON_USE is only safe to use if FUNCTION is known to already
+   have a declaration.  Use of this macro implies that there must not
+   be any other macro hiding the declaration of FUNCTION; but
+   undefining FUNCTION first is part of the poisoning process anyway
+   (although for symbols that are provided only via a macro, the result
+   is a compilation error rather than a warning containing
+   "literal string").  Also note that in C++, it is only safe to use if
+   FUNCTION has no overloads.
+
+   For an example, it is possible to poison 'getline' by:
+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
+     [getline]) in configure.ac, which potentially defines
+     HAVE_RAW_DECL_GETLINE
+   - adding this code to a header that wraps the system <stdio.h>:
+     #undef getline
+     #if HAVE_RAW_DECL_GETLINE
+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
+       "not universally present; use the gnulib module getline");
+     #endif
+
+   It is not possible to directly poison global variables.  But it is
+   possible to write a wrapper accessor function, and poison that
+   (less common usage, like &environ, will cause a compilation error
+   rather than issue the nice warning, but the end result of informing
+   the developer about their portability problem is still achieved):
+     #if HAVE_RAW_DECL_ENVIRON
+     static char ***
+     rpl_environ (void) { return &environ; }
+     _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+     # undef environ
+     # define environ (*rpl_environ ())
+     #endif
+   or better (avoiding contradictory use of 'static' and 'extern'):
+     #if HAVE_RAW_DECL_ENVIRON
+     static char ***
+     _GL_WARN_ON_USE_ATTRIBUTE ("environ is not always properly declared")
+     rpl_environ (void) { return &environ; }
+     # undef environ
+     # define environ (*rpl_environ ())
+     #endif
+   */
+#ifndef _GL_WARN_ON_USE
+
+# if (4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)) && !defined __clang__
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function __attribute__ ((__warning__ (message)))
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message) \
+  __attribute__ ((__warning__ (message)))
+# elif __clang_major__ >= 4
+/* Another compiler attribute is available in clang.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function \
+  __attribute__ ((__diagnose_if__ (1, message, "warning")))
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message) \
+  __attribute__ ((__diagnose_if__ (1, message, "warning")))
+# elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message)
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message)
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype_gcc, rettype_clang, parameters_and_attributes, "message")
+   is like _GL_WARN_ON_USE (function, "message"), except that in C++ mode the
+   function is declared with the given prototype, consisting of return type,
+   parameters, and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if !defined __cplusplus
+#  define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+     _GL_WARN_ON_USE (function, msg)
+# else
+#  if (4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)) && !defined __clang__
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_gcc function parameters_and_attributes \
+  __attribute__ ((__warning__ (msg)))
+#  elif __clang_major__ >= 4
+/* Another compiler attribute is available in clang.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_clang function parameters_and_attributes \
+  __attribute__ ((__diagnose_if__ (1, msg, "warning")))
+#  elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_gcc function parameters_and_attributes
+#  else /* Unsupported.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+#  endif
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
+
+/* =========== Thread types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if 0
+#  include "windows-thread.h"
+#  if 1
+#   define pthread_t rpl_pthread_t
+#   define pthread_attr_t rpl_pthread_attr_t
+#  endif
+#  if !GNULIB_defined_pthread_thread_types
+typedef glwthread_thread_t pthread_t;
+typedef unsigned int pthread_attr_t;
+#   define GNULIB_defined_pthread_thread_types 1
+#  endif
+# else
+#  if 1
+#   define pthread_t rpl_pthread_t
+#   define pthread_attr_t rpl_pthread_attr_t
+#  endif
+#  if !GNULIB_defined_pthread_thread_types
+typedef int pthread_t;
+typedef unsigned int pthread_attr_t;
+#   define GNULIB_defined_pthread_thread_types 1
+#  endif
+# endif
+# undef PTHREAD_CREATE_JOINABLE
+# undef PTHREAD_CREATE_DETACHED
+# define PTHREAD_CREATE_JOINABLE 0
+# define PTHREAD_CREATE_DETACHED 1
+#else
+# if !1
+#  if !GNULIB_defined_pthread_thread_types
+typedef int pthread_t;
+typedef unsigned int pthread_attr_t;
+#   define GNULIB_defined_pthread_thread_types 1
+#  endif
+# endif
+# if !1
+#  define PTHREAD_CREATE_JOINABLE 0
+#  define PTHREAD_CREATE_DETACHED 1
+# endif
+#endif
+
+/* =========== Once-only control (initialization) types and macros ========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if 1
+#  include "windows-once.h"
+#  if 1
+#   define pthread_once_t rpl_pthread_once_t
+#  endif
+#  if !GNULIB_defined_pthread_once_types
+typedef glwthread_once_t pthread_once_t;
+#   define GNULIB_defined_pthread_once_types 1
+#  endif
+#  undef PTHREAD_ONCE_INIT
+#  define PTHREAD_ONCE_INIT GLWTHREAD_ONCE_INIT
+# else
+#  if 1
+#   define pthread_once_t rpl_pthread_once_t
+#  endif
+#  if !GNULIB_defined_pthread_once_types
+typedef int pthread_once_t;
+#   define GNULIB_defined_pthread_once_types 1
+#  endif
+#  undef PTHREAD_ONCE_INIT
+#  define PTHREAD_ONCE_INIT { 0 }
+# endif
+#else
+# if !1
+#  if !GNULIB_defined_pthread_once_types
+typedef int pthread_once_t;
+#   define GNULIB_defined_pthread_once_types 1
+#  endif
+#  undef PTHREAD_ONCE_INIT
+#  define PTHREAD_ONCE_INIT { 0 }
+# endif
+#endif
+
+/* =========== Mutex types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if 0
+#  include "windows-timedmutex.h"
+#  include "windows-timedrecmutex.h"
+#  if 1
+#   define pthread_mutex_t rpl_pthread_mutex_t
+#   define pthread_mutexattr_t rpl_pthread_mutexattr_t
+#  endif
+#  if !GNULIB_defined_pthread_mutex_types
+typedef struct
+        {
+          int type;
+          union
+            {
+              glwthread_timedmutex_t    u_timedmutex;
+              glwthread_timedrecmutex_t u_timedrecmutex;
+            }
+          u;
+        }
+        pthread_mutex_t;
+typedef unsigned int pthread_mutexattr_t;
+#   define GNULIB_defined_pthread_mutex_types 1
+#  endif
+#  undef PTHREAD_MUTEX_INITIALIZER
+#  define PTHREAD_MUTEX_INITIALIZER { 1, { GLWTHREAD_TIMEDMUTEX_INIT } }
+# else
+#  if 1
+#   define pthread_mutex_t rpl_pthread_mutex_t
+#   define pthread_mutexattr_t rpl_pthread_mutexattr_t
+#  endif
+#  if !GNULIB_defined_pthread_mutex_types
+typedef int pthread_mutex_t;
+typedef unsigned int pthread_mutexattr_t;
+#   define GNULIB_defined_pthread_mutex_types 1
+#  endif
+#  undef PTHREAD_MUTEX_INITIALIZER
+#  define PTHREAD_MUTEX_INITIALIZER { 0 }
+# endif
+# undef PTHREAD_MUTEX_DEFAULT
+# undef PTHREAD_MUTEX_NORMAL
+# undef PTHREAD_MUTEX_ERRORCHECK
+# undef PTHREAD_MUTEX_RECURSIVE
+# define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_NORMAL
+# define PTHREAD_MUTEX_NORMAL 0
+# define PTHREAD_MUTEX_ERRORCHECK 1
+# define PTHREAD_MUTEX_RECURSIVE 2
+# undef PTHREAD_MUTEX_STALLED
+# undef PTHREAD_MUTEX_ROBUST
+# define PTHREAD_MUTEX_STALLED 0
+# define PTHREAD_MUTEX_ROBUST 1
+#else
+# if !1
+#  if !GNULIB_defined_pthread_mutex_types
+typedef int pthread_mutex_t;
+typedef unsigned int pthread_mutexattr_t;
+#   define GNULIB_defined_pthread_mutex_types 1
+#  endif
+#  undef PTHREAD_MUTEX_INITIALIZER
+#  define PTHREAD_MUTEX_INITIALIZER { 0 }
+# endif
+# if !1
+#  define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_NORMAL
+#  define PTHREAD_MUTEX_NORMAL 0
+#  define PTHREAD_MUTEX_ERRORCHECK 1
+#  define PTHREAD_MUTEX_RECURSIVE 2
+# endif
+# if !1
+#  define PTHREAD_MUTEX_STALLED 0
+#  define PTHREAD_MUTEX_ROBUST 1
+# endif
+#endif
+
+/* =========== Read-write lock types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if 0
+#  include "windows-timedrwlock.h"
+#  if 1
+#   define pthread_rwlock_t rpl_pthread_rwlock_t
+#   define pthread_rwlockattr_t rpl_pthread_rwlockattr_t
+#  endif
+#  if !GNULIB_defined_pthread_rwlock_types
+typedef glwthread_timedrwlock_t pthread_rwlock_t;
+typedef unsigned int pthread_rwlockattr_t;
+#   define GNULIB_defined_pthread_rwlock_types 1
+#  endif
+#  undef PTHREAD_RWLOCK_INITIALIZER
+#  define PTHREAD_RWLOCK_INITIALIZER GLWTHREAD_TIMEDRWLOCK_INIT
+# else
+#  if 1
+#   define pthread_rwlock_t rpl_pthread_rwlock_t
+#   define pthread_rwlockattr_t rpl_pthread_rwlockattr_t
+#  endif
+#  if !GNULIB_defined_pthread_rwlock_types
+typedef int pthread_rwlock_t;
+typedef unsigned int pthread_rwlockattr_t;
+#   define GNULIB_defined_pthread_rwlock_types 1
+#  endif
+#  undef PTHREAD_RWLOCK_INITIALIZER
+#  define PTHREAD_RWLOCK_INITIALIZER { 0 }
+# endif
+#elif 0 && 0 /* i.e. PTHREAD_RWLOCK_UNIMPLEMENTED */
+# if 1
+#  define pthread_rwlock_t rpl_pthread_rwlock_t
+#  define pthread_rwlockattr_t rpl_pthread_rwlockattr_t
+# endif
+# if !GNULIB_defined_pthread_rwlock_types
+typedef struct
+        {
+          pthread_mutex_t lock; /* protects the remaining fields */
+          pthread_cond_t waiting_readers; /* waiting readers */
+          pthread_cond_t waiting_writers; /* waiting writers */
+          unsigned int waiting_writers_count; /* number of waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        pthread_rwlock_t;
+typedef unsigned int pthread_rwlockattr_t;
+#  define GNULIB_defined_pthread_rwlock_types 1
+# endif
+# undef PTHREAD_RWLOCK_INITIALIZER
+# define PTHREAD_RWLOCK_INITIALIZER \
+   { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 }
+#elif 0 && 0 /* i.e. PTHREAD_RWLOCK_BAD_WAITQUEUE */
+/* Use rwlocks of kind PREFER_WRITER or PREFER_WRITER_NONRECURSIVE instead of
+   the DEFAULT.  */
+# undef PTHREAD_RWLOCK_INITIALIZER
+# define PTHREAD_RWLOCK_INITIALIZER PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP
+#else
+# if 1
+#  if !defined PTHREAD_RWLOCK_INITIALIZER && defined PTHREAD_RWLOCK_INITIALIZER_NP /* z/OS */
+#   define PTHREAD_RWLOCK_INITIALIZER PTHREAD_RWLOCK_INITIALIZER_NP
+#  endif
+# else
+#  if !GNULIB_defined_pthread_rwlock_types
+typedef int pthread_rwlock_t;
+typedef unsigned int pthread_rwlockattr_t;
+#   define GNULIB_defined_pthread_rwlock_types 1
+#  endif
+#  undef PTHREAD_RWLOCK_INITIALIZER
+#  define PTHREAD_RWLOCK_INITIALIZER { 0 }
+# endif
+#endif
+
+/* =========== Condition variable types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if 0
+#  include "windows-cond.h"
+#  if 1
+#   define pthread_cond_t rpl_pthread_cond_t
+#   define pthread_condattr_t rpl_pthread_condattr_t
+#  endif
+#  if !GNULIB_defined_pthread_cond_types
+typedef glwthread_cond_t pthread_cond_t;
+typedef unsigned int pthread_condattr_t;
+#   define GNULIB_defined_pthread_cond_types 1
+#  endif
+#  undef PTHREAD_COND_INITIALIZER
+#  define PTHREAD_COND_INITIALIZER GLWTHREAD_COND_INIT
+# else
+#  if 1
+#   define pthread_cond_t rpl_pthread_cond_t
+#   define pthread_condattr_t rpl_pthread_condattr_t
+#  endif
+#  if !GNULIB_defined_pthread_cond_types
+typedef int pthread_cond_t;
+typedef unsigned int pthread_condattr_t;
+#   define GNULIB_defined_pthread_cond_types 1
+#  endif
+#  undef PTHREAD_COND_INITIALIZER
+#  define PTHREAD_COND_INITIALIZER { 0 }
+# endif
+#else
+# if !1
+#  if !GNULIB_defined_pthread_cond_types
+typedef int pthread_cond_t;
+typedef unsigned int pthread_condattr_t;
+#   define GNULIB_defined_pthread_cond_types 1
+#  endif
+#  undef PTHREAD_COND_INITIALIZER
+#  define PTHREAD_COND_INITIALIZER { 0 }
+# endif
+#endif
+
+/* =========== Thread-specific storage types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if 0
+#  include "windows-tls.h"
+#  if 1
+#   define pthread_key_t rpl_pthread_key_t
+#  endif
+#  if !GNULIB_defined_pthread_tss_types
+typedef glwthread_tls_key_t pthread_key_t;
+#   define GNULIB_defined_pthread_tss_types 1
+#  endif
+#  undef PTHREAD_DESTRUCTOR_ITERATIONS
+#  define PTHREAD_DESTRUCTOR_ITERATIONS GLWTHREAD_DESTRUCTOR_ITERATIONS
+# else
+#  if 1
+#   define pthread_key_t rpl_pthread_key_t
+#  endif
+#  if !GNULIB_defined_pthread_tss_types
+typedef void ** pthread_key_t;
+#   define GNULIB_defined_pthread_tss_types 1
+#  endif
+#  undef PTHREAD_DESTRUCTOR_ITERATIONS
+#  define PTHREAD_DESTRUCTOR_ITERATIONS 0
+# endif
+#else
+# if !1
+#  if !GNULIB_defined_pthread_tss_types
+typedef void ** pthread_key_t;
+#   define GNULIB_defined_pthread_tss_types 1
+#  endif
+#  undef PTHREAD_DESTRUCTOR_ITERATIONS
+#  define PTHREAD_DESTRUCTOR_ITERATIONS 0
+# endif
+#endif
+
+/* =========== Spinlock types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if 0
+#  include "windows-spin.h"
+#  if 1
+#   define pthread_spinlock_t rpl_pthread_spinlock_t
+#  endif
+#  if !GNULIB_defined_pthread_spin_types
+typedef glwthread_spinlock_t pthread_spinlock_t;
+#   define GNULIB_defined_pthread_spin_types 1
+#  endif
+# else
+#  if 1
+#   define pthread_spinlock_t rpl_pthread_spinlock_t
+#  endif
+#  if !GNULIB_defined_pthread_spin_types
+typedef pthread_mutex_t pthread_spinlock_t;
+#   define GNULIB_defined_pthread_spin_types 1
+#  endif
+# endif
+# undef PTHREAD_PROCESS_PRIVATE
+# undef PTHREAD_PROCESS_SHARED
+# define PTHREAD_PROCESS_PRIVATE 0
+# define PTHREAD_PROCESS_SHARED 1
+#else
+# if 1
+/* <pthread.h> exists and defines pthread_spinlock_t.  */
+#  if !1 || 0
+/* If the 'pthread-spin' module is in use, it defines all the pthread_spin*
+   functions.  Prepare for it by overriding pthread_spinlock_t if that might
+   be needed.  */
+#   if !(((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) \
+           || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1)) \
+          || (((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) \
+               && !defined __ANDROID__) \
+              || __clang_major__ >= 3)) \
+         && !defined __ibmxl__)
+/* We can't use GCC built-ins.  Approximate spinlocks with mutexes.  */
+#    if !GNULIB_defined_pthread_spin_types
+#     define pthread_spinlock_t pthread_mutex_t
+#     define GNULIB_defined_pthread_spin_types 1
+#    endif
+#   endif
+#  endif
+# else
+/* Approximate spinlocks with mutexes.  */
+#  if !GNULIB_defined_pthread_spin_types
+typedef pthread_mutex_t pthread_spinlock_t;
+#   define GNULIB_defined_pthread_spin_types 1
+#  endif
+# endif
+# if !1
+#  define PTHREAD_PROCESS_PRIVATE 0
+#  define PTHREAD_PROCESS_SHARED 1
+# endif
+#endif
+
+/* =========== Other types and macros =========== */
+
+#if !1
+# if !GNULIB_defined_other_pthread_types
+typedef int pthread_barrier_t;
+typedef unsigned int pthread_barrierattr_t;
+#  define GNULIB_defined_other_pthread_types 1
+# endif
+#endif
+
+#if !defined PTHREAD_CANCELED
+
+# define PTHREAD_BARRIER_SERIAL_THREAD (-1)
+
+# define PTHREAD_CANCEL_DEFERRED 0
+# define PTHREAD_CANCEL_ASYNCHRONOUS 1
+
+# define PTHREAD_CANCEL_ENABLE 0
+# define PTHREAD_CANCEL_DISABLE 1
+
+# define PTHREAD_CANCELED ((void *) -1)
+
+# define PTHREAD_INHERIT_SCHED 0
+# define PTHREAD_EXPLICIT_SCHED 1
+
+# define PTHREAD_PRIO_NONE 0
+# define PTHREAD_PRIO_INHERIT 1
+# define PTHREAD_PRIO_PROTECT 2
+
+# define PTHREAD_SCOPE_SYSTEM 0
+# define PTHREAD_SCOPE_PROCESS 1
+
+#endif
+
+/* =========== Thread functions =========== */
+
+#if 0
+/* The 'restrict' qualifier on ARG is nonsense, but POSIX specifies it this way.
+   Sigh.  */
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_create
+#   define pthread_create rpl_pthread_create
+#  endif
+_GL_FUNCDECL_RPL (pthread_create, int,
+                  (pthread_t *restrict threadp,
+                   const pthread_attr_t *restrict attr,
+                   void * (*mainfunc) (void *), void *restrict arg),
+                  _GL_ARG_NONNULL ((1, 3)));
+_GL_CXXALIAS_RPL (pthread_create, int,
+                  (pthread_t *restrict threadp,
+                   const pthread_attr_t *restrict attr,
+                   void * (*mainfunc) (void *), void *restrict arg));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_create, int,
+                  (pthread_t *restrict threadp,
+                   const pthread_attr_t *restrict attr,
+                   void * (*mainfunc) (void *), void *restrict arg),
+                  _GL_ARG_NONNULL ((1, 3)));
+#  endif
+_GL_CXXALIAS_SYS_CAST (pthread_create, int,
+                       (pthread_t *restrict threadp,
+                        const pthread_attr_t *restrict attr,
+                        void * (*mainfunc) (void *), void *restrict arg));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_create);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_CREATE
+_GL_WARN_ON_USE (pthread_create, "pthread_create is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_attr_init
+#   define pthread_attr_init rpl_pthread_attr_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_attr_init, int, (pthread_attr_t *attr),
+                                          _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_attr_init, int, (pthread_attr_t *attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_attr_init, int, (pthread_attr_t *attr),
+                                          _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_attr_init, int, (pthread_attr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_attr_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_ATTR_INIT
+_GL_WARN_ON_USE (pthread_attr_init, "pthread_attr_init is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_attr_getdetachstate
+#   define pthread_attr_getdetachstate rpl_pthread_attr_getdetachstate
+#  endif
+_GL_FUNCDECL_RPL (pthread_attr_getdetachstate, int,
+                  (const pthread_attr_t *attr, int *detachstatep),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_attr_getdetachstate, int,
+                  (const pthread_attr_t *attr, int *detachstatep));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_attr_getdetachstate, int,
+                  (const pthread_attr_t *attr, int *detachstatep),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_attr_getdetachstate, int,
+                  (const pthread_attr_t *attr, int *detachstatep));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_attr_getdetachstate);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_ATTR_GETDETACHSTATE
+_GL_WARN_ON_USE (pthread_attr_getdetachstate, "pthread_attr_getdetachstate is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_attr_setdetachstate
+#   define pthread_attr_setdetachstate rpl_pthread_attr_setdetachstate
+#  endif
+_GL_FUNCDECL_RPL (pthread_attr_setdetachstate, int,
+                  (pthread_attr_t *attr, int detachstate),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_attr_setdetachstate, int,
+                  (pthread_attr_t *attr, int detachstate));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_attr_setdetachstate, int,
+                  (pthread_attr_t *attr, int detachstate),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_attr_setdetachstate, int,
+                  (pthread_attr_t *attr, int detachstate));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_attr_setdetachstate);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_ATTR_SETDETACHSTATE
+_GL_WARN_ON_USE (pthread_attr_setdetachstate, "pthread_attr_setdetachstate is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_attr_destroy
+#   define pthread_attr_destroy rpl_pthread_attr_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_attr_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_ATTR_DESTROY
+_GL_WARN_ON_USE (pthread_attr_destroy, "pthread_attr_destroy is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_self
+#   define pthread_self rpl_pthread_self
+#  endif
+_GL_FUNCDECL_RPL (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (pthread_self, pthread_t, (void));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE);
+#  endif
+_GL_CXXALIAS_SYS (pthread_self, pthread_t, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_self);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_SELF
+_GL_WARN_ON_USE (pthread_self, "pthread_self is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_equal
+#   define pthread_equal rpl_pthread_equal
+#  endif
+_GL_FUNCDECL_RPL (pthread_equal, int, (pthread_t thread1, pthread_t thread2), );
+_GL_CXXALIAS_RPL (pthread_equal, int, (pthread_t thread1, pthread_t thread2));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_equal, int, (pthread_t thread1, pthread_t thread2), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_equal, int, (pthread_t thread1, pthread_t thread2));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_equal);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_EQUAL
+_GL_WARN_ON_USE (pthread_equal, "pthread_equal is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_detach
+#   define pthread_detach rpl_pthread_detach
+#  endif
+_GL_FUNCDECL_RPL (pthread_detach, int, (pthread_t thread), );
+_GL_CXXALIAS_RPL (pthread_detach, int, (pthread_t thread));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_detach, int, (pthread_t thread), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_detach, int, (pthread_t thread));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_detach);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_DETACH
+_GL_WARN_ON_USE (pthread_detach, "pthread_detach is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_join
+#   define pthread_join rpl_pthread_join
+#  endif
+_GL_FUNCDECL_RPL (pthread_join, int, (pthread_t thread, void **valuep), );
+_GL_CXXALIAS_RPL (pthread_join, int, (pthread_t thread, void **valuep));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_join, int, (pthread_t thread, void **valuep), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_join, int, (pthread_t thread, void **valuep));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_join);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_JOIN
+_GL_WARN_ON_USE (pthread_join, "pthread_join is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_exit
+#   define pthread_exit rpl_pthread_exit
+#  endif
+_GL_FUNCDECL_RPL (pthread_exit, _Noreturn void, (void *value), );
+_GL_CXXALIAS_RPL (pthread_exit, void, (void *value));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_exit, _Noreturn void, (void *value), );
+#  endif
+/* Need to cast because of AIX with xlclang++.  */
+_GL_CXXALIAS_SYS_CAST (pthread_exit, void, (void *value));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_exit);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_EXIT
+_GL_WARN_ON_USE (pthread_exit, "pthread_exit is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+/* =========== Once-only control (initialization) functions =========== */
+
+#if 1
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_once
+#   define pthread_once rpl_pthread_once
+#  endif
+_GL_FUNCDECL_RPL (pthread_once, int,
+                  (pthread_once_t *once_control, void (*initfunction) (void)),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_once, int,
+                  (pthread_once_t *once_control, void (*initfunction) (void)));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_once, int,
+                  (pthread_once_t *once_control, void (*initfunction) (void)),
+                   _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS_CAST (pthread_once, int,
+                       (pthread_once_t *once_control,
+                        void (*initfunction) (void)));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_once);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_ONCE
+_GL_WARN_ON_USE (pthread_once, "pthread_once is not portable - "
+                 "use gnulib module pthread-once for portability");
+# endif
+#endif
+
+/* =========== Mutex functions =========== */
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_init
+#   define pthread_mutex_init rpl_pthread_mutex_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_init, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_init, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutex_init, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_init, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_INIT
+_GL_WARN_ON_USE (pthread_mutex_init, "pthread_mutex_init is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_init
+#   define pthread_mutexattr_init rpl_pthread_mutexattr_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr),
+                                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr),
+                                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_INIT
+_GL_WARN_ON_USE (pthread_mutexattr_init, "pthread_mutexattr_init is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_gettype
+#   define pthread_mutexattr_gettype rpl_pthread_mutexattr_gettype
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_gettype, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict typep),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_gettype, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict typep));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutexattr_gettype, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict typep),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+/* Need to cast, because on FreeBSD the first parameter is
+                        pthread_mutexattr_t *attr.  */
+_GL_CXXALIAS_SYS_CAST (pthread_mutexattr_gettype, int,
+                       (const pthread_mutexattr_t *restrict attr,
+                        int *restrict typep));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_gettype);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_GETTYPE
+_GL_WARN_ON_USE (pthread_mutexattr_gettype, "pthread_mutexattr_gettype is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_settype
+#   define pthread_mutexattr_settype rpl_pthread_mutexattr_settype
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_settype, int,
+                  (pthread_mutexattr_t *attr, int type), _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_settype, int,
+                  (pthread_mutexattr_t *attr, int type));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutexattr_settype, int,
+                  (pthread_mutexattr_t *attr, int type), _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutexattr_settype, int,
+                  (pthread_mutexattr_t *attr, int type));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_settype);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_SETTYPE
+_GL_WARN_ON_USE (pthread_mutexattr_settype, "pthread_mutexattr_settype is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_getrobust
+#   define pthread_mutexattr_getrobust rpl_pthread_mutexattr_getrobust
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_getrobust, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict robustp),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_getrobust, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict robustp));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutexattr_getrobust, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict robustp),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+/* Need to cast, because on FreeBSD the first parameter is
+                        pthread_mutexattr_t *attr.  */
+_GL_CXXALIAS_SYS_CAST (pthread_mutexattr_getrobust, int,
+                       (const pthread_mutexattr_t *restrict attr,
+                        int *restrict robustp));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_getrobust);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_GETROBUST
+_GL_WARN_ON_USE (pthread_mutexattr_getrobust, "pthread_mutexattr_getrobust is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_setrobust
+#   define pthread_mutexattr_setrobust rpl_pthread_mutexattr_setrobust
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_setrobust, int,
+                  (pthread_mutexattr_t *attr, int robust),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_setrobust, int,
+                  (pthread_mutexattr_t *attr, int robust));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutexattr_setrobust, int,
+                  (pthread_mutexattr_t *attr, int robust),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutexattr_setrobust, int,
+                  (pthread_mutexattr_t *attr, int robust));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_setrobust);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_SETROBUST
+_GL_WARN_ON_USE (pthread_mutexattr_setrobust, "pthread_mutexattr_setrobust is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_destroy
+#   define pthread_mutexattr_destroy rpl_pthread_mutexattr_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr),
+                                                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr),
+                                                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_DESTROY
+_GL_WARN_ON_USE (pthread_mutexattr_destroy, "pthread_mutexattr_destroy is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_lock
+#   define pthread_mutex_lock rpl_pthread_mutex_lock
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex),
+                                           _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex),
+                                           _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_lock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_LOCK
+_GL_WARN_ON_USE (pthread_mutex_lock, "pthread_mutex_lock is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_trylock
+#   define pthread_mutex_trylock rpl_pthread_mutex_trylock
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_trylock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_TRYLOCK
+_GL_WARN_ON_USE (pthread_mutex_trylock, "pthread_mutex_trylock is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_timedlock
+#   define pthread_mutex_timedlock rpl_pthread_mutex_timedlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_timedlock, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_mutex_timedlock, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutex_timedlock, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_timedlock, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_timedlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_TIMEDLOCK
+_GL_WARN_ON_USE (pthread_mutex_timedlock, "pthread_mutex_timedlock is not portable - "
+                 "use gnulib module pthread_mutex_timedlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_unlock
+#   define pthread_mutex_unlock rpl_pthread_mutex_unlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_unlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_UNLOCK
+_GL_WARN_ON_USE (pthread_mutex_unlock, "pthread_mutex_unlock is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_destroy
+#   define pthread_mutex_destroy rpl_pthread_mutex_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_DESTROY
+_GL_WARN_ON_USE (pthread_mutex_destroy, "pthread_mutex_destroy is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+/* =========== Read-write lock functions =========== */
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_init
+#   define pthread_rwlock_init rpl_pthread_rwlock_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_init, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const pthread_rwlockattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_init, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const pthread_rwlockattr_t *restrict attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_init, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const pthread_rwlockattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_init, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const pthread_rwlockattr_t *restrict attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_INIT
+_GL_WARN_ON_USE (pthread_rwlock_init, "pthread_rwlock_init is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlockattr_init
+#   define pthread_rwlockattr_init rpl_pthread_rwlockattr_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr),
+                                                _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr),
+                                                _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlockattr_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCKATTR_INIT
+_GL_WARN_ON_USE (pthread_rwlockattr_init, "pthread_rwlockattr_init is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlockattr_destroy
+#   define pthread_rwlockattr_destroy rpl_pthread_rwlockattr_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlockattr_destroy, int,
+                  (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlockattr_destroy, int,
+                  (pthread_rwlockattr_t *attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlockattr_destroy, int,
+                  (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlockattr_destroy, int,
+                  (pthread_rwlockattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlockattr_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCKATTR_DESTROY
+_GL_WARN_ON_USE (pthread_rwlockattr_destroy, "pthread_rwlockattr_destroy is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_rdlock
+#   define pthread_rwlock_rdlock rpl_pthread_rwlock_rdlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_rdlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_RDLOCK
+_GL_WARN_ON_USE (pthread_rwlock_rdlock, "pthread_rwlock_rdlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_wrlock
+#   define pthread_rwlock_wrlock rpl_pthread_rwlock_wrlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_wrlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_WRLOCK
+_GL_WARN_ON_USE (pthread_rwlock_wrlock, "pthread_rwlock_wrlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_tryrdlock
+#   define pthread_rwlock_tryrdlock rpl_pthread_rwlock_tryrdlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock),
+                                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock),
+                                                 _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_tryrdlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_TRYRDLOCK
+_GL_WARN_ON_USE (pthread_rwlock_tryrdlock, "pthread_rwlock_tryrdlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_trywrlock
+#   define pthread_rwlock_trywrlock rpl_pthread_rwlock_trywrlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock),
+                                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock),
+                                                 _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_trywrlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_TRYWRLOCK
+_GL_WARN_ON_USE (pthread_rwlock_trywrlock, "pthread_rwlock_trywrlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_timedrdlock
+#   define pthread_rwlock_timedrdlock rpl_pthread_rwlock_timedrdlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_timedrdlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_rwlock_timedrdlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_timedrdlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_timedrdlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_timedrdlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_TIMEDRDLOCK
+_GL_WARN_ON_USE (pthread_rwlock_timedrdlock, "pthread_rwlock_timedrdlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_timedwrlock
+#   define pthread_rwlock_timedwrlock rpl_pthread_rwlock_timedwrlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_timedwrlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_rwlock_timedwrlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_timedwrlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_timedwrlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_timedwrlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_TIMEDWRLOCK
+_GL_WARN_ON_USE (pthread_rwlock_timedwrlock, "pthread_rwlock_timedwrlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_unlock
+#   define pthread_rwlock_unlock rpl_pthread_rwlock_unlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_unlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_UNLOCK
+_GL_WARN_ON_USE (pthread_rwlock_unlock, "pthread_rwlock_unlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_destroy
+#   define pthread_rwlock_destroy rpl_pthread_rwlock_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock),
+                                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock),
+                                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_DESTROY
+_GL_WARN_ON_USE (pthread_rwlock_destroy, "pthread_rwlock_destroy is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+/* =========== Condition variable functions =========== */
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_init
+#   define pthread_cond_init rpl_pthread_cond_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_init, int,
+                  (pthread_cond_t *restrict cond,
+                   const pthread_condattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_cond_init, int,
+                  (pthread_cond_t *restrict cond,
+                   const pthread_condattr_t *restrict attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_cond_init, int,
+                  (pthread_cond_t *restrict cond,
+                   const pthread_condattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_init, int,
+                  (pthread_cond_t *restrict cond,
+                   const pthread_condattr_t *restrict attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_COND_INIT
+_GL_WARN_ON_USE (pthread_cond_init, "pthread_cond_init is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_condattr_init
+#   define pthread_condattr_init rpl_pthread_condattr_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_condattr_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_CONDATTR_INIT
+_GL_WARN_ON_USE (pthread_condattr_init, "pthread_condattr_init is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_condattr_destroy
+#   define pthread_condattr_destroy rpl_pthread_condattr_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr),
+                                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr),
+                                                 _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_condattr_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_CONDATTR_DESTROY
+_GL_WARN_ON_USE (pthread_condattr_destroy, "pthread_condattr_destroy is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_wait
+#   define pthread_cond_wait rpl_pthread_cond_wait
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_wait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_cond_wait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_cond_wait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_wait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_wait);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_COND_WAIT
+_GL_WARN_ON_USE (pthread_cond_wait, "pthread_cond_wait is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_timedwait
+#   define pthread_cond_timedwait rpl_pthread_cond_timedwait
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_timedwait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+_GL_CXXALIAS_RPL (pthread_cond_timedwait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_cond_timedwait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_timedwait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_timedwait);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_COND_TIMEDWAIT
+_GL_WARN_ON_USE (pthread_cond_timedwait, "pthread_cond_timedwait is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_signal
+#   define pthread_cond_signal rpl_pthread_cond_signal
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_signal, int, (pthread_cond_t *cond),
+                                            _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_cond_signal, int, (pthread_cond_t *cond));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_cond_signal, int, (pthread_cond_t *cond),
+                                            _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_signal, int, (pthread_cond_t *cond));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_signal);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_COND_SIGNAL
+_GL_WARN_ON_USE (pthread_cond_signal, "pthread_cond_signal is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_broadcast
+#   define pthread_cond_broadcast rpl_pthread_cond_broadcast
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond),
+                                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond),
+                                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_broadcast);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_COND_BROADCAST
+_GL_WARN_ON_USE (pthread_cond_broadcast, "pthread_cond_broadcast is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_destroy
+#   define pthread_cond_destroy rpl_pthread_cond_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_COND_DESTROY
+_GL_WARN_ON_USE (pthread_cond_destroy, "pthread_cond_destroy is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+/* =========== Thread-specific storage functions =========== */
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_key_create
+#   define pthread_key_create rpl_pthread_key_create
+#  endif
+_GL_FUNCDECL_RPL (pthread_key_create, int,
+                  (pthread_key_t *keyp, void (*destructor) (void *)),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_key_create, int,
+                  (pthread_key_t *keyp, void (*destructor) (void *)));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_key_create, int,
+                  (pthread_key_t *keyp, void (*destructor) (void *)),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS_CAST (pthread_key_create, int,
+                       (pthread_key_t *keyp, void (*destructor) (void *)));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_key_create);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_KEY_CREATE
+_GL_WARN_ON_USE (pthread_key_create, "pthread_key_create is not portable - "
+                 "use gnulib module pthread-tss for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_setspecific
+#   define pthread_setspecific rpl_pthread_setspecific
+#  endif
+_GL_FUNCDECL_RPL (pthread_setspecific, int,
+                  (pthread_key_t key, const void *value), );
+_GL_CXXALIAS_RPL (pthread_setspecific, int,
+                  (pthread_key_t key, const void *value));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_setspecific, int,
+                  (pthread_key_t key, const void *value), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_setspecific, int,
+                  (pthread_key_t key, const void *value));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_setspecific);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_SETSPECIFIC
+_GL_WARN_ON_USE (pthread_setspecific, "pthread_setspecific is not portable - "
+                 "use gnulib module pthread-tss for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_getspecific
+#   define pthread_getspecific rpl_pthread_getspecific
+#  endif
+_GL_FUNCDECL_RPL (pthread_getspecific, void *, (pthread_key_t key), );
+_GL_CXXALIAS_RPL (pthread_getspecific, void *, (pthread_key_t key));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_getspecific, void *, (pthread_key_t key), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_getspecific, void *, (pthread_key_t key));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_getspecific);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_GETSPECIFIC
+_GL_WARN_ON_USE (pthread_getspecific, "pthread_getspecific is not portable - "
+                 "use gnulib module pthread-tss for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_key_delete
+#   define pthread_key_delete rpl_pthread_key_delete
+#  endif
+_GL_FUNCDECL_RPL (pthread_key_delete, int, (pthread_key_t key), );
+_GL_CXXALIAS_RPL (pthread_key_delete, int, (pthread_key_t key));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_key_delete, int, (pthread_key_t key), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_key_delete, int, (pthread_key_t key));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_key_delete);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_KEY_DELETE
+_GL_WARN_ON_USE (pthread_key_delete, "pthread_key_delete is not portable - "
+                 "use gnulib module pthread-tss for portability");
+# endif
+#endif
+
+/* =========== Spinlock functions =========== */
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_init
+#   define pthread_spin_init rpl_pthread_spin_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_init, int,
+                  (pthread_spinlock_t *lock, int shared_across_processes),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_init, int,
+                  (pthread_spinlock_t *lock, int shared_across_processes));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_spin_init, int,
+                  (pthread_spinlock_t *lock, int shared_across_processes),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_init, int,
+                  (pthread_spinlock_t *lock, int shared_across_processes));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_SPIN_INIT
+_GL_WARN_ON_USE (pthread_spin_init, "pthread_spin_init is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_lock
+#   define pthread_spin_lock rpl_pthread_spin_lock
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock),
+                                          _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock),
+                                          _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_lock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_SPIN_LOCK
+_GL_WARN_ON_USE (pthread_spin_lock, "pthread_spin_lock is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_trylock
+#   define pthread_spin_trylock rpl_pthread_spin_trylock
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_trylock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_SPIN_TRYLOCK
+_GL_WARN_ON_USE (pthread_spin_trylock, "pthread_spin_trylock is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_unlock
+#   define pthread_spin_unlock rpl_pthread_spin_unlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock),
+                                            _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock),
+                                            _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_unlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_SPIN_UNLOCK
+_GL_WARN_ON_USE (pthread_spin_unlock, "pthread_spin_unlock is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_destroy
+#   define pthread_spin_destroy rpl_pthread_spin_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_PTHREAD_SPIN_DESTROY
+_GL_WARN_ON_USE (pthread_spin_destroy, "pthread_spin_destroy is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+
+#if defined __cplusplus && defined GNULIB_NAMESPACE && !1 && defined __MINGW32__
+/* Provide the symbols required by mingw's <bits/gthr-default.h>.  */
+using GNULIB_NAMESPACE::pthread_create;
+using GNULIB_NAMESPACE::pthread_self;
+using GNULIB_NAMESPACE::pthread_equal;
+using GNULIB_NAMESPACE::pthread_detach;
+using GNULIB_NAMESPACE::pthread_join;
+using GNULIB_NAMESPACE::pthread_once;
+using GNULIB_NAMESPACE::pthread_mutex_init;
+using GNULIB_NAMESPACE::pthread_mutexattr_init;
+using GNULIB_NAMESPACE::pthread_mutexattr_settype;
+using GNULIB_NAMESPACE::pthread_mutexattr_destroy;
+using GNULIB_NAMESPACE::pthread_mutex_lock;
+using GNULIB_NAMESPACE::pthread_mutex_trylock;
+using GNULIB_NAMESPACE::pthread_mutex_timedlock;
+using GNULIB_NAMESPACE::pthread_mutex_unlock;
+using GNULIB_NAMESPACE::pthread_mutex_destroy;
+using GNULIB_NAMESPACE::pthread_cond_wait;
+using GNULIB_NAMESPACE::pthread_cond_timedwait;
+using GNULIB_NAMESPACE::pthread_cond_signal;
+using GNULIB_NAMESPACE::pthread_cond_broadcast;
+using GNULIB_NAMESPACE::pthread_cond_destroy;
+using GNULIB_NAMESPACE::pthread_key_create;
+using GNULIB_NAMESPACE::pthread_setspecific;
+using GNULIB_NAMESPACE::pthread_getspecific;
+using GNULIB_NAMESPACE::pthread_key_delete;
+#endif
+
+
+#endif /* _GL_PTHREAD_H_ */
+#endif /* _GL_PTHREAD_H_ */
+#endif
diff --git a/gl/pthread.in.h b/gl/pthread.in.h
new file mode 100644
index 00000000..28592cfc
--- /dev/null
+++ b/gl/pthread.in.h
@@ -0,0 +1,2032 @@
+/* Implement the most essential subset of POSIX pthread.h.
+
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Paul Eggert, Glen Lenker, and Bruno Haible.  */
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_PTHREAD_H
+/* Special invocation convention:
+   On Android, we have a sequence of nested includes
+   <pthread.h> -> <time.h> -> <sys/time.h> -> <sys/select.h> ->
+   <signal.h> -> <pthread.h>.
+   In this situation, PTHREAD_COND_INITIALIZER is not yet defined,
+   therefore we should not attempt to define PTHREAD_MUTEX_NORMAL etc.  */
+
+#@INCLUDE_NEXT@ @NEXT_PTHREAD_H@
+
+#else
+/* Normal invocation convention.  */
+
+#ifndef _@GUARD_PREFIX@_PTHREAD_H_
+
+#if @HAVE_PTHREAD_H@
+
+# define _@GUARD_PREFIX@_ALREADY_INCLUDING_PTHREAD_H
+
+/* The include_next requires a split double-inclusion guard.  */
+# @INCLUDE_NEXT@ @NEXT_PTHREAD_H@
+
+# undef _@GUARD_PREFIX@_ALREADY_INCLUDING_PTHREAD_H
+
+#endif
+
+#ifndef _@GUARD_PREFIX@_PTHREAD_H_
+#define _@GUARD_PREFIX@_PTHREAD_H_
+
+/* This file uses _Noreturn, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+#define __need_system_stdlib_h
+#include <stdlib.h>
+#undef __need_system_stdlib_h
+
+
+/* The pthreads-win32 <pthread.h> defines a couple of broken macros.  */
+#undef asctime_r
+#undef ctime_r
+#undef gmtime_r
+#undef localtime_r
+#undef rand_r
+#undef strtok_r
+
+#include <errno.h>
+#include <sched.h>
+#include <sys/types.h>
+#include <time.h>
+
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The attribute __pure__ was added in gcc 2.96.  */
+#ifndef _GL_ATTRIBUTE_PURE
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__
+#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _GL_ATTRIBUTE_PURE /* empty */
+# endif
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _Noreturn is copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+/* =========== Thread types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if @GNULIB_PTHREAD_THREAD@
+#  include "windows-thread.h"
+#  if @HAVE_PTHREAD_T@
+#   define pthread_t rpl_pthread_t
+#   define pthread_attr_t rpl_pthread_attr_t
+#  endif
+#  if !GNULIB_defined_pthread_thread_types
+typedef glwthread_thread_t pthread_t;
+typedef unsigned int pthread_attr_t;
+#   define GNULIB_defined_pthread_thread_types 1
+#  endif
+# else
+#  if @HAVE_PTHREAD_T@
+#   define pthread_t rpl_pthread_t
+#   define pthread_attr_t rpl_pthread_attr_t
+#  endif
+#  if !GNULIB_defined_pthread_thread_types
+typedef int pthread_t;
+typedef unsigned int pthread_attr_t;
+#   define GNULIB_defined_pthread_thread_types 1
+#  endif
+# endif
+# undef PTHREAD_CREATE_JOINABLE
+# undef PTHREAD_CREATE_DETACHED
+# define PTHREAD_CREATE_JOINABLE 0
+# define PTHREAD_CREATE_DETACHED 1
+#else
+# if !@HAVE_PTHREAD_T@
+#  if !GNULIB_defined_pthread_thread_types
+typedef int pthread_t;
+typedef unsigned int pthread_attr_t;
+#   define GNULIB_defined_pthread_thread_types 1
+#  endif
+# endif
+# if !@HAVE_PTHREAD_CREATE_DETACHED@
+#  define PTHREAD_CREATE_JOINABLE 0
+#  define PTHREAD_CREATE_DETACHED 1
+# endif
+#endif
+
+/* =========== Once-only control (initialization) types and macros ========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if @GNULIB_PTHREAD_ONCE@
+#  include "windows-once.h"
+#  if @HAVE_PTHREAD_T@
+#   define pthread_once_t rpl_pthread_once_t
+#  endif
+#  if !GNULIB_defined_pthread_once_types
+typedef glwthread_once_t pthread_once_t;
+#   define GNULIB_defined_pthread_once_types 1
+#  endif
+#  undef PTHREAD_ONCE_INIT
+#  define PTHREAD_ONCE_INIT GLWTHREAD_ONCE_INIT
+# else
+#  if @HAVE_PTHREAD_T@
+#   define pthread_once_t rpl_pthread_once_t
+#  endif
+#  if !GNULIB_defined_pthread_once_types
+typedef int pthread_once_t;
+#   define GNULIB_defined_pthread_once_types 1
+#  endif
+#  undef PTHREAD_ONCE_INIT
+#  define PTHREAD_ONCE_INIT { 0 }
+# endif
+#else
+# if !@HAVE_PTHREAD_T@
+#  if !GNULIB_defined_pthread_once_types
+typedef int pthread_once_t;
+#   define GNULIB_defined_pthread_once_types 1
+#  endif
+#  undef PTHREAD_ONCE_INIT
+#  define PTHREAD_ONCE_INIT { 0 }
+# endif
+#endif
+
+/* =========== Mutex types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if @GNULIB_PTHREAD_MUTEX@
+#  include "windows-timedmutex.h"
+#  include "windows-timedrecmutex.h"
+#  if @HAVE_PTHREAD_T@
+#   define pthread_mutex_t rpl_pthread_mutex_t
+#   define pthread_mutexattr_t rpl_pthread_mutexattr_t
+#  endif
+#  if !GNULIB_defined_pthread_mutex_types
+typedef struct
+        {
+          int type;
+          union
+            {
+              glwthread_timedmutex_t    u_timedmutex;
+              glwthread_timedrecmutex_t u_timedrecmutex;
+            }
+          u;
+        }
+        pthread_mutex_t;
+typedef unsigned int pthread_mutexattr_t;
+#   define GNULIB_defined_pthread_mutex_types 1
+#  endif
+#  undef PTHREAD_MUTEX_INITIALIZER
+#  define PTHREAD_MUTEX_INITIALIZER { 1, { GLWTHREAD_TIMEDMUTEX_INIT } }
+# else
+#  if @HAVE_PTHREAD_T@
+#   define pthread_mutex_t rpl_pthread_mutex_t
+#   define pthread_mutexattr_t rpl_pthread_mutexattr_t
+#  endif
+#  if !GNULIB_defined_pthread_mutex_types
+typedef int pthread_mutex_t;
+typedef unsigned int pthread_mutexattr_t;
+#   define GNULIB_defined_pthread_mutex_types 1
+#  endif
+#  undef PTHREAD_MUTEX_INITIALIZER
+#  define PTHREAD_MUTEX_INITIALIZER { 0 }
+# endif
+# undef PTHREAD_MUTEX_DEFAULT
+# undef PTHREAD_MUTEX_NORMAL
+# undef PTHREAD_MUTEX_ERRORCHECK
+# undef PTHREAD_MUTEX_RECURSIVE
+# define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_NORMAL
+# define PTHREAD_MUTEX_NORMAL 0
+# define PTHREAD_MUTEX_ERRORCHECK 1
+# define PTHREAD_MUTEX_RECURSIVE 2
+# undef PTHREAD_MUTEX_STALLED
+# undef PTHREAD_MUTEX_ROBUST
+# define PTHREAD_MUTEX_STALLED 0
+# define PTHREAD_MUTEX_ROBUST 1
+#else
+# if !@HAVE_PTHREAD_T@
+#  if !GNULIB_defined_pthread_mutex_types
+typedef int pthread_mutex_t;
+typedef unsigned int pthread_mutexattr_t;
+#   define GNULIB_defined_pthread_mutex_types 1
+#  endif
+#  undef PTHREAD_MUTEX_INITIALIZER
+#  define PTHREAD_MUTEX_INITIALIZER { 0 }
+# endif
+# if !@HAVE_PTHREAD_MUTEX_RECURSIVE@
+#  define PTHREAD_MUTEX_DEFAULT PTHREAD_MUTEX_NORMAL
+#  define PTHREAD_MUTEX_NORMAL 0
+#  define PTHREAD_MUTEX_ERRORCHECK 1
+#  define PTHREAD_MUTEX_RECURSIVE 2
+# endif
+# if !@HAVE_PTHREAD_MUTEX_ROBUST@
+#  define PTHREAD_MUTEX_STALLED 0
+#  define PTHREAD_MUTEX_ROBUST 1
+# endif
+#endif
+
+/* =========== Read-write lock types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if @GNULIB_PTHREAD_RWLOCK@
+#  include "windows-timedrwlock.h"
+#  if @HAVE_PTHREAD_T@
+#   define pthread_rwlock_t rpl_pthread_rwlock_t
+#   define pthread_rwlockattr_t rpl_pthread_rwlockattr_t
+#  endif
+#  if !GNULIB_defined_pthread_rwlock_types
+typedef glwthread_timedrwlock_t pthread_rwlock_t;
+typedef unsigned int pthread_rwlockattr_t;
+#   define GNULIB_defined_pthread_rwlock_types 1
+#  endif
+#  undef PTHREAD_RWLOCK_INITIALIZER
+#  define PTHREAD_RWLOCK_INITIALIZER GLWTHREAD_TIMEDRWLOCK_INIT
+# else
+#  if @HAVE_PTHREAD_T@
+#   define pthread_rwlock_t rpl_pthread_rwlock_t
+#   define pthread_rwlockattr_t rpl_pthread_rwlockattr_t
+#  endif
+#  if !GNULIB_defined_pthread_rwlock_types
+typedef int pthread_rwlock_t;
+typedef unsigned int pthread_rwlockattr_t;
+#   define GNULIB_defined_pthread_rwlock_types 1
+#  endif
+#  undef PTHREAD_RWLOCK_INITIALIZER
+#  define PTHREAD_RWLOCK_INITIALIZER { 0 }
+# endif
+#elif @GNULIB_PTHREAD_RWLOCK@ && @REPLACE_PTHREAD_RWLOCK_DESTROY@ /* i.e. PTHREAD_RWLOCK_UNIMPLEMENTED */
+# if @HAVE_PTHREAD_T@
+#  define pthread_rwlock_t rpl_pthread_rwlock_t
+#  define pthread_rwlockattr_t rpl_pthread_rwlockattr_t
+# endif
+# if !GNULIB_defined_pthread_rwlock_types
+typedef struct
+        {
+          pthread_mutex_t lock; /* protects the remaining fields */
+          pthread_cond_t waiting_readers; /* waiting readers */
+          pthread_cond_t waiting_writers; /* waiting writers */
+          unsigned int waiting_writers_count; /* number of waiting writers */
+          int runcount; /* number of readers running, or -1 when a writer runs */
+        }
+        pthread_rwlock_t;
+typedef unsigned int pthread_rwlockattr_t;
+#  define GNULIB_defined_pthread_rwlock_types 1
+# endif
+# undef PTHREAD_RWLOCK_INITIALIZER
+# define PTHREAD_RWLOCK_INITIALIZER \
+   { PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER, 0, 0 }
+#elif @GNULIB_PTHREAD_RWLOCK@ && @REPLACE_PTHREAD_RWLOCK_INIT@ /* i.e. PTHREAD_RWLOCK_BAD_WAITQUEUE */
+/* Use rwlocks of kind PREFER_WRITER or PREFER_WRITER_NONRECURSIVE instead of
+   the DEFAULT.  */
+# undef PTHREAD_RWLOCK_INITIALIZER
+# define PTHREAD_RWLOCK_INITIALIZER PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP
+#else
+# if @HAVE_PTHREAD_T@
+#  if !defined PTHREAD_RWLOCK_INITIALIZER && defined PTHREAD_RWLOCK_INITIALIZER_NP /* z/OS */
+#   define PTHREAD_RWLOCK_INITIALIZER PTHREAD_RWLOCK_INITIALIZER_NP
+#  endif
+# else
+#  if !GNULIB_defined_pthread_rwlock_types
+typedef int pthread_rwlock_t;
+typedef unsigned int pthread_rwlockattr_t;
+#   define GNULIB_defined_pthread_rwlock_types 1
+#  endif
+#  undef PTHREAD_RWLOCK_INITIALIZER
+#  define PTHREAD_RWLOCK_INITIALIZER { 0 }
+# endif
+#endif
+
+/* =========== Condition variable types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if @GNULIB_PTHREAD_COND@
+#  include "windows-cond.h"
+#  if @HAVE_PTHREAD_T@
+#   define pthread_cond_t rpl_pthread_cond_t
+#   define pthread_condattr_t rpl_pthread_condattr_t
+#  endif
+#  if !GNULIB_defined_pthread_cond_types
+typedef glwthread_cond_t pthread_cond_t;
+typedef unsigned int pthread_condattr_t;
+#   define GNULIB_defined_pthread_cond_types 1
+#  endif
+#  undef PTHREAD_COND_INITIALIZER
+#  define PTHREAD_COND_INITIALIZER GLWTHREAD_COND_INIT
+# else
+#  if @HAVE_PTHREAD_T@
+#   define pthread_cond_t rpl_pthread_cond_t
+#   define pthread_condattr_t rpl_pthread_condattr_t
+#  endif
+#  if !GNULIB_defined_pthread_cond_types
+typedef int pthread_cond_t;
+typedef unsigned int pthread_condattr_t;
+#   define GNULIB_defined_pthread_cond_types 1
+#  endif
+#  undef PTHREAD_COND_INITIALIZER
+#  define PTHREAD_COND_INITIALIZER { 0 }
+# endif
+#else
+# if !@HAVE_PTHREAD_T@
+#  if !GNULIB_defined_pthread_cond_types
+typedef int pthread_cond_t;
+typedef unsigned int pthread_condattr_t;
+#   define GNULIB_defined_pthread_cond_types 1
+#  endif
+#  undef PTHREAD_COND_INITIALIZER
+#  define PTHREAD_COND_INITIALIZER { 0 }
+# endif
+#endif
+
+/* =========== Thread-specific storage types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if @GNULIB_PTHREAD_TSS@
+#  include "windows-tls.h"
+#  if @HAVE_PTHREAD_T@
+#   define pthread_key_t rpl_pthread_key_t
+#  endif
+#  if !GNULIB_defined_pthread_tss_types
+typedef glwthread_tls_key_t pthread_key_t;
+#   define GNULIB_defined_pthread_tss_types 1
+#  endif
+#  undef PTHREAD_DESTRUCTOR_ITERATIONS
+#  define PTHREAD_DESTRUCTOR_ITERATIONS GLWTHREAD_DESTRUCTOR_ITERATIONS
+# else
+#  if @HAVE_PTHREAD_T@
+#   define pthread_key_t rpl_pthread_key_t
+#  endif
+#  if !GNULIB_defined_pthread_tss_types
+typedef void ** pthread_key_t;
+#   define GNULIB_defined_pthread_tss_types 1
+#  endif
+#  undef PTHREAD_DESTRUCTOR_ITERATIONS
+#  define PTHREAD_DESTRUCTOR_ITERATIONS 0
+# endif
+#else
+# if !@HAVE_PTHREAD_T@
+#  if !GNULIB_defined_pthread_tss_types
+typedef void ** pthread_key_t;
+#   define GNULIB_defined_pthread_tss_types 1
+#  endif
+#  undef PTHREAD_DESTRUCTOR_ITERATIONS
+#  define PTHREAD_DESTRUCTOR_ITERATIONS 0
+# endif
+#endif
+
+/* =========== Spinlock types and macros =========== */
+
+#if (defined _WIN32 && ! defined __CYGWIN__) && USE_WINDOWS_THREADS
+# if @GNULIB_PTHREAD_SPIN@
+#  include "windows-spin.h"
+#  if @HAVE_PTHREAD_T@
+#   define pthread_spinlock_t rpl_pthread_spinlock_t
+#  endif
+#  if !GNULIB_defined_pthread_spin_types
+typedef glwthread_spinlock_t pthread_spinlock_t;
+#   define GNULIB_defined_pthread_spin_types 1
+#  endif
+# else
+#  if @HAVE_PTHREAD_T@
+#   define pthread_spinlock_t rpl_pthread_spinlock_t
+#  endif
+#  if !GNULIB_defined_pthread_spin_types
+typedef pthread_mutex_t pthread_spinlock_t;
+#   define GNULIB_defined_pthread_spin_types 1
+#  endif
+# endif
+# undef PTHREAD_PROCESS_PRIVATE
+# undef PTHREAD_PROCESS_SHARED
+# define PTHREAD_PROCESS_PRIVATE 0
+# define PTHREAD_PROCESS_SHARED 1
+#else
+# if @HAVE_PTHREAD_SPINLOCK_T@
+/* <pthread.h> exists and defines pthread_spinlock_t.  */
+#  if !@HAVE_PTHREAD_SPIN_INIT@ || @REPLACE_PTHREAD_SPIN_INIT@
+/* If the 'pthread-spin' module is in use, it defines all the pthread_spin*
+   functions.  Prepare for it by overriding pthread_spinlock_t if that might
+   be needed.  */
+#   if !(((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) \
+           || __clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ >= 1)) \
+          || (((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) \
+               && !defined __ANDROID__) \
+              || __clang_major__ >= 3)) \
+         && !defined __ibmxl__)
+/* We can't use GCC built-ins.  Approximate spinlocks with mutexes.  */
+#    if !GNULIB_defined_pthread_spin_types
+#     define pthread_spinlock_t pthread_mutex_t
+#     define GNULIB_defined_pthread_spin_types 1
+#    endif
+#   endif
+#  endif
+# else
+/* Approximate spinlocks with mutexes.  */
+#  if !GNULIB_defined_pthread_spin_types
+typedef pthread_mutex_t pthread_spinlock_t;
+#   define GNULIB_defined_pthread_spin_types 1
+#  endif
+# endif
+# if !@HAVE_PTHREAD_PROCESS_SHARED@
+#  define PTHREAD_PROCESS_PRIVATE 0
+#  define PTHREAD_PROCESS_SHARED 1
+# endif
+#endif
+
+/* =========== Other types and macros =========== */
+
+#if !@HAVE_PTHREAD_T@
+# if !GNULIB_defined_other_pthread_types
+typedef int pthread_barrier_t;
+typedef unsigned int pthread_barrierattr_t;
+#  define GNULIB_defined_other_pthread_types 1
+# endif
+#endif
+
+#if !defined PTHREAD_CANCELED
+
+# define PTHREAD_BARRIER_SERIAL_THREAD (-1)
+
+# define PTHREAD_CANCEL_DEFERRED 0
+# define PTHREAD_CANCEL_ASYNCHRONOUS 1
+
+# define PTHREAD_CANCEL_ENABLE 0
+# define PTHREAD_CANCEL_DISABLE 1
+
+# define PTHREAD_CANCELED ((void *) -1)
+
+# define PTHREAD_INHERIT_SCHED 0
+# define PTHREAD_EXPLICIT_SCHED 1
+
+# define PTHREAD_PRIO_NONE 0
+# define PTHREAD_PRIO_INHERIT 1
+# define PTHREAD_PRIO_PROTECT 2
+
+# define PTHREAD_SCOPE_SYSTEM 0
+# define PTHREAD_SCOPE_PROCESS 1
+
+#endif
+
+/* =========== Thread functions =========== */
+
+#if @GNULIB_PTHREAD_THREAD@
+/* The 'restrict' qualifier on ARG is nonsense, but POSIX specifies it this way.
+   Sigh.  */
+# if @REPLACE_PTHREAD_CREATE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_create
+#   define pthread_create rpl_pthread_create
+#  endif
+_GL_FUNCDECL_RPL (pthread_create, int,
+                  (pthread_t *restrict threadp,
+                   const pthread_attr_t *restrict attr,
+                   void * (*mainfunc) (void *), void *restrict arg),
+                  _GL_ARG_NONNULL ((1, 3)));
+_GL_CXXALIAS_RPL (pthread_create, int,
+                  (pthread_t *restrict threadp,
+                   const pthread_attr_t *restrict attr,
+                   void * (*mainfunc) (void *), void *restrict arg));
+# else
+#  if !@HAVE_PTHREAD_CREATE@
+_GL_FUNCDECL_SYS (pthread_create, int,
+                  (pthread_t *restrict threadp,
+                   const pthread_attr_t *restrict attr,
+                   void * (*mainfunc) (void *), void *restrict arg),
+                  _GL_ARG_NONNULL ((1, 3)));
+#  endif
+_GL_CXXALIAS_SYS_CAST (pthread_create, int,
+                       (pthread_t *restrict threadp,
+                        const pthread_attr_t *restrict attr,
+                        void * (*mainfunc) (void *), void *restrict arg));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_create);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_create
+# if HAVE_RAW_DECL_PTHREAD_CREATE
+_GL_WARN_ON_USE (pthread_create, "pthread_create is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_ATTR_INIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_attr_init
+#   define pthread_attr_init rpl_pthread_attr_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_attr_init, int, (pthread_attr_t *attr),
+                                          _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_attr_init, int, (pthread_attr_t *attr));
+# else
+#  if !@HAVE_PTHREAD_ATTR_INIT@
+_GL_FUNCDECL_SYS (pthread_attr_init, int, (pthread_attr_t *attr),
+                                          _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_attr_init, int, (pthread_attr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_attr_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_attr_init
+# if HAVE_RAW_DECL_PTHREAD_ATTR_INIT
+_GL_WARN_ON_USE (pthread_attr_init, "pthread_attr_init is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_ATTR_GETDETACHSTATE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_attr_getdetachstate
+#   define pthread_attr_getdetachstate rpl_pthread_attr_getdetachstate
+#  endif
+_GL_FUNCDECL_RPL (pthread_attr_getdetachstate, int,
+                  (const pthread_attr_t *attr, int *detachstatep),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_attr_getdetachstate, int,
+                  (const pthread_attr_t *attr, int *detachstatep));
+# else
+#  if !@HAVE_PTHREAD_ATTR_GETDETACHSTATE@
+_GL_FUNCDECL_SYS (pthread_attr_getdetachstate, int,
+                  (const pthread_attr_t *attr, int *detachstatep),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_attr_getdetachstate, int,
+                  (const pthread_attr_t *attr, int *detachstatep));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_attr_getdetachstate);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_attr_getdetachstate
+# if HAVE_RAW_DECL_PTHREAD_ATTR_GETDETACHSTATE
+_GL_WARN_ON_USE (pthread_attr_getdetachstate, "pthread_attr_getdetachstate is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_ATTR_SETDETACHSTATE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_attr_setdetachstate
+#   define pthread_attr_setdetachstate rpl_pthread_attr_setdetachstate
+#  endif
+_GL_FUNCDECL_RPL (pthread_attr_setdetachstate, int,
+                  (pthread_attr_t *attr, int detachstate),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_attr_setdetachstate, int,
+                  (pthread_attr_t *attr, int detachstate));
+# else
+#  if !@HAVE_PTHREAD_ATTR_SETDETACHSTATE@
+_GL_FUNCDECL_SYS (pthread_attr_setdetachstate, int,
+                  (pthread_attr_t *attr, int detachstate),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_attr_setdetachstate, int,
+                  (pthread_attr_t *attr, int detachstate));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_attr_setdetachstate);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_attr_setdetachstate
+# if HAVE_RAW_DECL_PTHREAD_ATTR_SETDETACHSTATE
+_GL_WARN_ON_USE (pthread_attr_setdetachstate, "pthread_attr_setdetachstate is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_ATTR_DESTROY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_attr_destroy
+#   define pthread_attr_destroy rpl_pthread_attr_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_attr_destroy, int, (pthread_attr_t *attr));
+# else
+#  if !@HAVE_PTHREAD_ATTR_DESTROY@
+_GL_FUNCDECL_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_attr_destroy, int, (pthread_attr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_attr_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_attr_destroy
+# if HAVE_RAW_DECL_PTHREAD_ATTR_DESTROY
+_GL_WARN_ON_USE (pthread_attr_destroy, "pthread_attr_destroy is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_SELF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_self
+#   define pthread_self rpl_pthread_self
+#  endif
+_GL_FUNCDECL_RPL (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (pthread_self, pthread_t, (void));
+# else
+#  if !@HAVE_PTHREAD_SELF@
+_GL_FUNCDECL_SYS (pthread_self, pthread_t, (void), _GL_ATTRIBUTE_PURE);
+#  endif
+_GL_CXXALIAS_SYS (pthread_self, pthread_t, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_self);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_self
+# if HAVE_RAW_DECL_PTHREAD_SELF
+_GL_WARN_ON_USE (pthread_self, "pthread_self is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_EQUAL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_equal
+#   define pthread_equal rpl_pthread_equal
+#  endif
+_GL_FUNCDECL_RPL (pthread_equal, int, (pthread_t thread1, pthread_t thread2), );
+_GL_CXXALIAS_RPL (pthread_equal, int, (pthread_t thread1, pthread_t thread2));
+# else
+#  if !@HAVE_PTHREAD_EQUAL@
+_GL_FUNCDECL_SYS (pthread_equal, int, (pthread_t thread1, pthread_t thread2), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_equal, int, (pthread_t thread1, pthread_t thread2));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_equal);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_equal
+# if HAVE_RAW_DECL_PTHREAD_EQUAL
+_GL_WARN_ON_USE (pthread_equal, "pthread_equal is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_DETACH@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_detach
+#   define pthread_detach rpl_pthread_detach
+#  endif
+_GL_FUNCDECL_RPL (pthread_detach, int, (pthread_t thread), );
+_GL_CXXALIAS_RPL (pthread_detach, int, (pthread_t thread));
+# else
+#  if !@HAVE_PTHREAD_DETACH@
+_GL_FUNCDECL_SYS (pthread_detach, int, (pthread_t thread), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_detach, int, (pthread_t thread));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_detach);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_detach
+# if HAVE_RAW_DECL_PTHREAD_DETACH
+_GL_WARN_ON_USE (pthread_detach, "pthread_detach is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_JOIN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_join
+#   define pthread_join rpl_pthread_join
+#  endif
+_GL_FUNCDECL_RPL (pthread_join, int, (pthread_t thread, void **valuep), );
+_GL_CXXALIAS_RPL (pthread_join, int, (pthread_t thread, void **valuep));
+# else
+#  if !@HAVE_PTHREAD_JOIN@
+_GL_FUNCDECL_SYS (pthread_join, int, (pthread_t thread, void **valuep), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_join, int, (pthread_t thread, void **valuep));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_join);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_join
+# if HAVE_RAW_DECL_PTHREAD_JOIN
+_GL_WARN_ON_USE (pthread_join, "pthread_join is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_THREAD@
+# if @REPLACE_PTHREAD_EXIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_exit
+#   define pthread_exit rpl_pthread_exit
+#  endif
+_GL_FUNCDECL_RPL (pthread_exit, _Noreturn void, (void *value), );
+_GL_CXXALIAS_RPL (pthread_exit, void, (void *value));
+# else
+#  if !@HAVE_PTHREAD_EXIT@
+_GL_FUNCDECL_SYS (pthread_exit, _Noreturn void, (void *value), );
+#  endif
+/* Need to cast because of AIX with xlclang++.  */
+_GL_CXXALIAS_SYS_CAST (pthread_exit, void, (void *value));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_exit);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_exit
+# if HAVE_RAW_DECL_PTHREAD_EXIT
+_GL_WARN_ON_USE (pthread_exit, "pthread_exit is not portable - "
+                 "use gnulib module pthread-thread for portability");
+# endif
+#endif
+
+/* =========== Once-only control (initialization) functions =========== */
+
+#if @GNULIB_PTHREAD_ONCE@
+# if @REPLACE_PTHREAD_ONCE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_once
+#   define pthread_once rpl_pthread_once
+#  endif
+_GL_FUNCDECL_RPL (pthread_once, int,
+                  (pthread_once_t *once_control, void (*initfunction) (void)),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_once, int,
+                  (pthread_once_t *once_control, void (*initfunction) (void)));
+# else
+#  if !@HAVE_PTHREAD_ONCE@
+_GL_FUNCDECL_SYS (pthread_once, int,
+                  (pthread_once_t *once_control, void (*initfunction) (void)),
+                   _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS_CAST (pthread_once, int,
+                       (pthread_once_t *once_control,
+                        void (*initfunction) (void)));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_once);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_once
+# if HAVE_RAW_DECL_PTHREAD_ONCE
+_GL_WARN_ON_USE (pthread_once, "pthread_once is not portable - "
+                 "use gnulib module pthread-once for portability");
+# endif
+#endif
+
+/* =========== Mutex functions =========== */
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEX_INIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_init
+#   define pthread_mutex_init rpl_pthread_mutex_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_init, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_init, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr));
+# else
+#  if !@HAVE_PTHREAD_MUTEX_INIT@
+_GL_FUNCDECL_SYS (pthread_mutex_init, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_init, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const pthread_mutexattr_t *restrict attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutex_init
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_INIT
+_GL_WARN_ON_USE (pthread_mutex_init, "pthread_mutex_init is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEXATTR_INIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_init
+#   define pthread_mutexattr_init rpl_pthread_mutexattr_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr),
+                                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr));
+# else
+#  if !@HAVE_PTHREAD_MUTEXATTR_INIT@
+_GL_FUNCDECL_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr),
+                                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutexattr_init, int, (pthread_mutexattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutexattr_init
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_INIT
+_GL_WARN_ON_USE (pthread_mutexattr_init, "pthread_mutexattr_init is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEXATTR_GETTYPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_gettype
+#   define pthread_mutexattr_gettype rpl_pthread_mutexattr_gettype
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_gettype, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict typep),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_gettype, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict typep));
+# else
+#  if !@HAVE_PTHREAD_MUTEXATTR_GETTYPE@
+_GL_FUNCDECL_SYS (pthread_mutexattr_gettype, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict typep),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+/* Need to cast, because on FreeBSD the first parameter is
+                        pthread_mutexattr_t *attr.  */
+_GL_CXXALIAS_SYS_CAST (pthread_mutexattr_gettype, int,
+                       (const pthread_mutexattr_t *restrict attr,
+                        int *restrict typep));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_gettype);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutexattr_gettype
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_GETTYPE
+_GL_WARN_ON_USE (pthread_mutexattr_gettype, "pthread_mutexattr_gettype is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEXATTR_SETTYPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_settype
+#   define pthread_mutexattr_settype rpl_pthread_mutexattr_settype
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_settype, int,
+                  (pthread_mutexattr_t *attr, int type), _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_settype, int,
+                  (pthread_mutexattr_t *attr, int type));
+# else
+#  if !@HAVE_PTHREAD_MUTEXATTR_SETTYPE@
+_GL_FUNCDECL_SYS (pthread_mutexattr_settype, int,
+                  (pthread_mutexattr_t *attr, int type), _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutexattr_settype, int,
+                  (pthread_mutexattr_t *attr, int type));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_settype);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutexattr_settype
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_SETTYPE
+_GL_WARN_ON_USE (pthread_mutexattr_settype, "pthread_mutexattr_settype is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEXATTR_GETROBUST@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_getrobust
+#   define pthread_mutexattr_getrobust rpl_pthread_mutexattr_getrobust
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_getrobust, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict robustp),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_getrobust, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict robustp));
+# else
+#  if !@HAVE_PTHREAD_MUTEXATTR_GETROBUST@
+_GL_FUNCDECL_SYS (pthread_mutexattr_getrobust, int,
+                  (const pthread_mutexattr_t *restrict attr,
+                   int *restrict robustp),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+/* Need to cast, because on FreeBSD the first parameter is
+                        pthread_mutexattr_t *attr.  */
+_GL_CXXALIAS_SYS_CAST (pthread_mutexattr_getrobust, int,
+                       (const pthread_mutexattr_t *restrict attr,
+                        int *restrict robustp));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_getrobust);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutexattr_getrobust
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_GETROBUST
+_GL_WARN_ON_USE (pthread_mutexattr_getrobust, "pthread_mutexattr_getrobust is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEXATTR_SETROBUST@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_setrobust
+#   define pthread_mutexattr_setrobust rpl_pthread_mutexattr_setrobust
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_setrobust, int,
+                  (pthread_mutexattr_t *attr, int robust),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_setrobust, int,
+                  (pthread_mutexattr_t *attr, int robust));
+# else
+#  if !@HAVE_PTHREAD_MUTEXATTR_SETROBUST@
+_GL_FUNCDECL_SYS (pthread_mutexattr_setrobust, int,
+                  (pthread_mutexattr_t *attr, int robust),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutexattr_setrobust, int,
+                  (pthread_mutexattr_t *attr, int robust));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_setrobust);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutexattr_setrobust
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_SETROBUST
+_GL_WARN_ON_USE (pthread_mutexattr_setrobust, "pthread_mutexattr_setrobust is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEXATTR_DESTROY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutexattr_destroy
+#   define pthread_mutexattr_destroy rpl_pthread_mutexattr_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr),
+                                                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr));
+# else
+#  if !@HAVE_PTHREAD_MUTEXATTR_DESTROY@
+_GL_FUNCDECL_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr),
+                                                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutexattr_destroy, int, (pthread_mutexattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutexattr_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutexattr_destroy
+# if HAVE_RAW_DECL_PTHREAD_MUTEXATTR_DESTROY
+_GL_WARN_ON_USE (pthread_mutexattr_destroy, "pthread_mutexattr_destroy is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEX_LOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_lock
+#   define pthread_mutex_lock rpl_pthread_mutex_lock
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex),
+                                           _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_lock, int, (pthread_mutex_t *mutex));
+# else
+#  if !@HAVE_PTHREAD_MUTEX_LOCK@
+_GL_FUNCDECL_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex),
+                                           _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_lock, int, (pthread_mutex_t *mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_lock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutex_lock
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_LOCK
+_GL_WARN_ON_USE (pthread_mutex_lock, "pthread_mutex_lock is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEX_TRYLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_trylock
+#   define pthread_mutex_trylock rpl_pthread_mutex_trylock
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_trylock, int, (pthread_mutex_t *mutex));
+# else
+#  if !@HAVE_PTHREAD_MUTEX_TRYLOCK@
+_GL_FUNCDECL_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_trylock, int, (pthread_mutex_t *mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_trylock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutex_trylock
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_TRYLOCK
+_GL_WARN_ON_USE (pthread_mutex_trylock, "pthread_mutex_trylock is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX_TIMEDLOCK@
+# if @REPLACE_PTHREAD_MUTEX_TIMEDLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_timedlock
+#   define pthread_mutex_timedlock rpl_pthread_mutex_timedlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_timedlock, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_mutex_timedlock, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime));
+# else
+#  if !@HAVE_PTHREAD_MUTEX_TIMEDLOCK@
+_GL_FUNCDECL_SYS (pthread_mutex_timedlock, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_timedlock, int,
+                  (pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_timedlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutex_timedlock
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_TIMEDLOCK
+_GL_WARN_ON_USE (pthread_mutex_timedlock, "pthread_mutex_timedlock is not portable - "
+                 "use gnulib module pthread_mutex_timedlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEX_UNLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_unlock
+#   define pthread_mutex_unlock rpl_pthread_mutex_unlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_unlock, int, (pthread_mutex_t *mutex));
+# else
+#  if !@HAVE_PTHREAD_MUTEX_UNLOCK@
+_GL_FUNCDECL_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_unlock, int, (pthread_mutex_t *mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_unlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutex_unlock
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_UNLOCK
+_GL_WARN_ON_USE (pthread_mutex_unlock, "pthread_mutex_unlock is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_MUTEX@
+# if @REPLACE_PTHREAD_MUTEX_DESTROY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_mutex_destroy
+#   define pthread_mutex_destroy rpl_pthread_mutex_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_mutex_destroy, int, (pthread_mutex_t *mutex));
+# else
+#  if !@HAVE_PTHREAD_MUTEX_DESTROY@
+_GL_FUNCDECL_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_mutex_destroy, int, (pthread_mutex_t *mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_mutex_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_mutex_destroy
+# if HAVE_RAW_DECL_PTHREAD_MUTEX_DESTROY
+_GL_WARN_ON_USE (pthread_mutex_destroy, "pthread_mutex_destroy is not portable - "
+                 "use gnulib module pthread-mutex for portability");
+# endif
+#endif
+
+/* =========== Read-write lock functions =========== */
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_INIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_init
+#   define pthread_rwlock_init rpl_pthread_rwlock_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_init, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const pthread_rwlockattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_init, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const pthread_rwlockattr_t *restrict attr));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_INIT@
+_GL_FUNCDECL_SYS (pthread_rwlock_init, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const pthread_rwlockattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_init, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const pthread_rwlockattr_t *restrict attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_init
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_INIT
+_GL_WARN_ON_USE (pthread_rwlock_init, "pthread_rwlock_init is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCKATTR_INIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlockattr_init
+#   define pthread_rwlockattr_init rpl_pthread_rwlockattr_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr),
+                                                _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr));
+# else
+#  if !@HAVE_PTHREAD_RWLOCKATTR_INIT@
+_GL_FUNCDECL_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr),
+                                                _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlockattr_init, int, (pthread_rwlockattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlockattr_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlockattr_init
+# if HAVE_RAW_DECL_PTHREAD_RWLOCKATTR_INIT
+_GL_WARN_ON_USE (pthread_rwlockattr_init, "pthread_rwlockattr_init is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCKATTR_DESTROY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlockattr_destroy
+#   define pthread_rwlockattr_destroy rpl_pthread_rwlockattr_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlockattr_destroy, int,
+                  (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlockattr_destroy, int,
+                  (pthread_rwlockattr_t *attr));
+# else
+#  if !@HAVE_PTHREAD_RWLOCKATTR_DESTROY@
+_GL_FUNCDECL_SYS (pthread_rwlockattr_destroy, int,
+                  (pthread_rwlockattr_t *attr), _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlockattr_destroy, int,
+                  (pthread_rwlockattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlockattr_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlockattr_destroy
+# if HAVE_RAW_DECL_PTHREAD_RWLOCKATTR_DESTROY
+_GL_WARN_ON_USE (pthread_rwlockattr_destroy, "pthread_rwlockattr_destroy is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_RDLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_rdlock
+#   define pthread_rwlock_rdlock rpl_pthread_rwlock_rdlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_RDLOCK@
+_GL_FUNCDECL_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_rdlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_rdlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_rdlock
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_RDLOCK
+_GL_WARN_ON_USE (pthread_rwlock_rdlock, "pthread_rwlock_rdlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_WRLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_wrlock
+#   define pthread_rwlock_wrlock rpl_pthread_rwlock_wrlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_WRLOCK@
+_GL_FUNCDECL_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_wrlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_wrlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_wrlock
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_WRLOCK
+_GL_WARN_ON_USE (pthread_rwlock_wrlock, "pthread_rwlock_wrlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_TRYRDLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_tryrdlock
+#   define pthread_rwlock_tryrdlock rpl_pthread_rwlock_tryrdlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock),
+                                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_TRYRDLOCK@
+_GL_FUNCDECL_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock),
+                                                 _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_tryrdlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_tryrdlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_tryrdlock
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_TRYRDLOCK
+_GL_WARN_ON_USE (pthread_rwlock_tryrdlock, "pthread_rwlock_tryrdlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_TRYWRLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_trywrlock
+#   define pthread_rwlock_trywrlock rpl_pthread_rwlock_trywrlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock),
+                                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_TRYWRLOCK@
+_GL_FUNCDECL_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock),
+                                                 _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_trywrlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_trywrlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_trywrlock
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_TRYWRLOCK
+_GL_WARN_ON_USE (pthread_rwlock_trywrlock, "pthread_rwlock_trywrlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_TIMEDRDLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_timedrdlock
+#   define pthread_rwlock_timedrdlock rpl_pthread_rwlock_timedrdlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_timedrdlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_rwlock_timedrdlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_TIMEDRDLOCK@
+_GL_FUNCDECL_SYS (pthread_rwlock_timedrdlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_timedrdlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_timedrdlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_timedrdlock
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_TIMEDRDLOCK
+_GL_WARN_ON_USE (pthread_rwlock_timedrdlock, "pthread_rwlock_timedrdlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_TIMEDWRLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_timedwrlock
+#   define pthread_rwlock_timedwrlock rpl_pthread_rwlock_timedwrlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_timedwrlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_rwlock_timedwrlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK@
+_GL_FUNCDECL_SYS (pthread_rwlock_timedwrlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_timedwrlock, int,
+                  (pthread_rwlock_t *restrict lock,
+                   const struct timespec *restrict abstime));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_timedwrlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_timedwrlock
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_TIMEDWRLOCK
+_GL_WARN_ON_USE (pthread_rwlock_timedwrlock, "pthread_rwlock_timedwrlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_UNLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_unlock
+#   define pthread_rwlock_unlock rpl_pthread_rwlock_unlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_UNLOCK@
+_GL_FUNCDECL_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_unlock, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_unlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_unlock
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_UNLOCK
+_GL_WARN_ON_USE (pthread_rwlock_unlock, "pthread_rwlock_unlock is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_RWLOCK@
+# if @REPLACE_PTHREAD_RWLOCK_DESTROY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_rwlock_destroy
+#   define pthread_rwlock_destroy rpl_pthread_rwlock_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock),
+                                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_RWLOCK_DESTROY@
+_GL_FUNCDECL_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock),
+                                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_rwlock_destroy, int, (pthread_rwlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_rwlock_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_rwlock_destroy
+# if HAVE_RAW_DECL_PTHREAD_RWLOCK_DESTROY
+_GL_WARN_ON_USE (pthread_rwlock_destroy, "pthread_rwlock_destroy is not portable - "
+                 "use gnulib module pthread-rwlock for portability");
+# endif
+#endif
+
+/* =========== Condition variable functions =========== */
+
+#if @GNULIB_PTHREAD_COND@
+# if @REPLACE_PTHREAD_COND_INIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_init
+#   define pthread_cond_init rpl_pthread_cond_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_init, int,
+                  (pthread_cond_t *restrict cond,
+                   const pthread_condattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_cond_init, int,
+                  (pthread_cond_t *restrict cond,
+                   const pthread_condattr_t *restrict attr));
+# else
+#  if !@HAVE_PTHREAD_COND_INIT@
+_GL_FUNCDECL_SYS (pthread_cond_init, int,
+                  (pthread_cond_t *restrict cond,
+                   const pthread_condattr_t *restrict attr),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_init, int,
+                  (pthread_cond_t *restrict cond,
+                   const pthread_condattr_t *restrict attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_cond_init
+# if HAVE_RAW_DECL_PTHREAD_COND_INIT
+_GL_WARN_ON_USE (pthread_cond_init, "pthread_cond_init is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_COND@
+# if @REPLACE_PTHREAD_CONDATTR_INIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_condattr_init
+#   define pthread_condattr_init rpl_pthread_condattr_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr),
+                                              _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_condattr_init, int, (pthread_condattr_t *attr));
+# else
+#  if !@HAVE_PTHREAD_CONDATTR_INIT@
+_GL_FUNCDECL_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr),
+                                              _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_condattr_init, int, (pthread_condattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_condattr_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_condattr_init
+# if HAVE_RAW_DECL_PTHREAD_CONDATTR_INIT
+_GL_WARN_ON_USE (pthread_condattr_init, "pthread_condattr_init is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_COND@
+# if @REPLACE_PTHREAD_CONDATTR_DESTROY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_condattr_destroy
+#   define pthread_condattr_destroy rpl_pthread_condattr_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr),
+                                                 _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_condattr_destroy, int, (pthread_condattr_t *attr));
+# else
+#  if !@HAVE_PTHREAD_CONDATTR_DESTROY@
+_GL_FUNCDECL_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr),
+                                                 _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_condattr_destroy, int, (pthread_condattr_t *attr));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_condattr_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_condattr_destroy
+# if HAVE_RAW_DECL_PTHREAD_CONDATTR_DESTROY
+_GL_WARN_ON_USE (pthread_condattr_destroy, "pthread_condattr_destroy is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_COND@
+# if @REPLACE_PTHREAD_COND_WAIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_wait
+#   define pthread_cond_wait rpl_pthread_cond_wait
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_wait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (pthread_cond_wait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex));
+# else
+#  if !@HAVE_PTHREAD_COND_WAIT@
+_GL_FUNCDECL_SYS (pthread_cond_wait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex),
+                  _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_wait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_wait);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_cond_wait
+# if HAVE_RAW_DECL_PTHREAD_COND_WAIT
+_GL_WARN_ON_USE (pthread_cond_wait, "pthread_cond_wait is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_COND@
+# if @REPLACE_PTHREAD_COND_TIMEDWAIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_timedwait
+#   define pthread_cond_timedwait rpl_pthread_cond_timedwait
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_timedwait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+_GL_CXXALIAS_RPL (pthread_cond_timedwait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime));
+# else
+#  if !@HAVE_PTHREAD_COND_TIMEDWAIT@
+_GL_FUNCDECL_SYS (pthread_cond_timedwait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime),
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_timedwait, int,
+                  (pthread_cond_t *restrict cond,
+                   pthread_mutex_t *restrict mutex,
+                   const struct timespec *restrict abstime));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_timedwait);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_cond_timedwait
+# if HAVE_RAW_DECL_PTHREAD_COND_TIMEDWAIT
+_GL_WARN_ON_USE (pthread_cond_timedwait, "pthread_cond_timedwait is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_COND@
+# if @REPLACE_PTHREAD_COND_SIGNAL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_signal
+#   define pthread_cond_signal rpl_pthread_cond_signal
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_signal, int, (pthread_cond_t *cond),
+                                            _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_cond_signal, int, (pthread_cond_t *cond));
+# else
+#  if !@HAVE_PTHREAD_COND_SIGNAL@
+_GL_FUNCDECL_SYS (pthread_cond_signal, int, (pthread_cond_t *cond),
+                                            _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_signal, int, (pthread_cond_t *cond));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_signal);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_cond_signal
+# if HAVE_RAW_DECL_PTHREAD_COND_SIGNAL
+_GL_WARN_ON_USE (pthread_cond_signal, "pthread_cond_signal is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_COND@
+# if @REPLACE_PTHREAD_COND_BROADCAST@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_broadcast
+#   define pthread_cond_broadcast rpl_pthread_cond_broadcast
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond),
+                                               _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_cond_broadcast, int, (pthread_cond_t *cond));
+# else
+#  if !@HAVE_PTHREAD_COND_BROADCAST@
+_GL_FUNCDECL_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond),
+                                               _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_broadcast, int, (pthread_cond_t *cond));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_broadcast);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_cond_broadcast
+# if HAVE_RAW_DECL_PTHREAD_COND_BROADCAST
+_GL_WARN_ON_USE (pthread_cond_broadcast, "pthread_cond_broadcast is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_COND@
+# if @REPLACE_PTHREAD_COND_DESTROY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_cond_destroy
+#   define pthread_cond_destroy rpl_pthread_cond_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_cond_destroy, int, (pthread_cond_t *cond));
+# else
+#  if !@HAVE_PTHREAD_COND_DESTROY@
+_GL_FUNCDECL_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_cond_destroy, int, (pthread_cond_t *cond));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_cond_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_cond_destroy
+# if HAVE_RAW_DECL_PTHREAD_COND_DESTROY
+_GL_WARN_ON_USE (pthread_cond_destroy, "pthread_cond_destroy is not portable - "
+                 "use gnulib module pthread-cond for portability");
+# endif
+#endif
+
+/* =========== Thread-specific storage functions =========== */
+
+#if @GNULIB_PTHREAD_TSS@
+# if @REPLACE_PTHREAD_KEY_CREATE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_key_create
+#   define pthread_key_create rpl_pthread_key_create
+#  endif
+_GL_FUNCDECL_RPL (pthread_key_create, int,
+                  (pthread_key_t *keyp, void (*destructor) (void *)),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_key_create, int,
+                  (pthread_key_t *keyp, void (*destructor) (void *)));
+# else
+#  if !@HAVE_PTHREAD_KEY_CREATE@
+_GL_FUNCDECL_SYS (pthread_key_create, int,
+                  (pthread_key_t *keyp, void (*destructor) (void *)),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS_CAST (pthread_key_create, int,
+                       (pthread_key_t *keyp, void (*destructor) (void *)));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_key_create);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_key_create
+# if HAVE_RAW_DECL_PTHREAD_KEY_CREATE
+_GL_WARN_ON_USE (pthread_key_create, "pthread_key_create is not portable - "
+                 "use gnulib module pthread-tss for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_TSS@
+# if @REPLACE_PTHREAD_SETSPECIFIC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_setspecific
+#   define pthread_setspecific rpl_pthread_setspecific
+#  endif
+_GL_FUNCDECL_RPL (pthread_setspecific, int,
+                  (pthread_key_t key, const void *value), );
+_GL_CXXALIAS_RPL (pthread_setspecific, int,
+                  (pthread_key_t key, const void *value));
+# else
+#  if !@HAVE_PTHREAD_SETSPECIFIC@
+_GL_FUNCDECL_SYS (pthread_setspecific, int,
+                  (pthread_key_t key, const void *value), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_setspecific, int,
+                  (pthread_key_t key, const void *value));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_setspecific);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_setspecific
+# if HAVE_RAW_DECL_PTHREAD_SETSPECIFIC
+_GL_WARN_ON_USE (pthread_setspecific, "pthread_setspecific is not portable - "
+                 "use gnulib module pthread-tss for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_TSS@
+# if @REPLACE_PTHREAD_GETSPECIFIC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_getspecific
+#   define pthread_getspecific rpl_pthread_getspecific
+#  endif
+_GL_FUNCDECL_RPL (pthread_getspecific, void *, (pthread_key_t key), );
+_GL_CXXALIAS_RPL (pthread_getspecific, void *, (pthread_key_t key));
+# else
+#  if !@HAVE_PTHREAD_GETSPECIFIC@
+_GL_FUNCDECL_SYS (pthread_getspecific, void *, (pthread_key_t key), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_getspecific, void *, (pthread_key_t key));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_getspecific);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_getspecific
+# if HAVE_RAW_DECL_PTHREAD_GETSPECIFIC
+_GL_WARN_ON_USE (pthread_getspecific, "pthread_getspecific is not portable - "
+                 "use gnulib module pthread-tss for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_TSS@
+# if @REPLACE_PTHREAD_KEY_DELETE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_key_delete
+#   define pthread_key_delete rpl_pthread_key_delete
+#  endif
+_GL_FUNCDECL_RPL (pthread_key_delete, int, (pthread_key_t key), );
+_GL_CXXALIAS_RPL (pthread_key_delete, int, (pthread_key_t key));
+# else
+#  if !@HAVE_PTHREAD_KEY_DELETE@
+_GL_FUNCDECL_SYS (pthread_key_delete, int, (pthread_key_t key), );
+#  endif
+_GL_CXXALIAS_SYS (pthread_key_delete, int, (pthread_key_t key));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_key_delete);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_key_delete
+# if HAVE_RAW_DECL_PTHREAD_KEY_DELETE
+_GL_WARN_ON_USE (pthread_key_delete, "pthread_key_delete is not portable - "
+                 "use gnulib module pthread-tss for portability");
+# endif
+#endif
+
+/* =========== Spinlock functions =========== */
+
+#if @GNULIB_PTHREAD_SPIN@
+# if @REPLACE_PTHREAD_SPIN_INIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_init
+#   define pthread_spin_init rpl_pthread_spin_init
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_init, int,
+                  (pthread_spinlock_t *lock, int shared_across_processes),
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_init, int,
+                  (pthread_spinlock_t *lock, int shared_across_processes));
+# else
+#  if !@HAVE_PTHREAD_SPIN_INIT@
+_GL_FUNCDECL_SYS (pthread_spin_init, int,
+                  (pthread_spinlock_t *lock, int shared_across_processes),
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_init, int,
+                  (pthread_spinlock_t *lock, int shared_across_processes));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_init);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_spin_init
+# if HAVE_RAW_DECL_PTHREAD_SPIN_INIT
+_GL_WARN_ON_USE (pthread_spin_init, "pthread_spin_init is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_SPIN@
+# if @REPLACE_PTHREAD_SPIN_LOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_lock
+#   define pthread_spin_lock rpl_pthread_spin_lock
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock),
+                                          _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_lock, int, (pthread_spinlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_SPIN_LOCK@
+_GL_FUNCDECL_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock),
+                                          _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_lock, int, (pthread_spinlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_lock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_spin_lock
+# if HAVE_RAW_DECL_PTHREAD_SPIN_LOCK
+_GL_WARN_ON_USE (pthread_spin_lock, "pthread_spin_lock is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_SPIN@
+# if @REPLACE_PTHREAD_SPIN_TRYLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_trylock
+#   define pthread_spin_trylock rpl_pthread_spin_trylock
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_trylock, int, (pthread_spinlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_SPIN_TRYLOCK@
+_GL_FUNCDECL_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_trylock, int, (pthread_spinlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_trylock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_spin_trylock
+# if HAVE_RAW_DECL_PTHREAD_SPIN_TRYLOCK
+_GL_WARN_ON_USE (pthread_spin_trylock, "pthread_spin_trylock is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_SPIN@
+# if @REPLACE_PTHREAD_SPIN_UNLOCK@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_unlock
+#   define pthread_spin_unlock rpl_pthread_spin_unlock
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock),
+                                            _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_unlock, int, (pthread_spinlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_SPIN_UNLOCK@
+_GL_FUNCDECL_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock),
+                                            _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_unlock, int, (pthread_spinlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_unlock);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_spin_unlock
+# if HAVE_RAW_DECL_PTHREAD_SPIN_UNLOCK
+_GL_WARN_ON_USE (pthread_spin_unlock, "pthread_spin_unlock is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+#if @GNULIB_PTHREAD_SPIN@
+# if @REPLACE_PTHREAD_SPIN_DESTROY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pthread_spin_destroy
+#   define pthread_spin_destroy rpl_pthread_spin_destroy
+#  endif
+_GL_FUNCDECL_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock),
+                                             _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_RPL (pthread_spin_destroy, int, (pthread_spinlock_t *lock));
+# else
+#  if !@HAVE_PTHREAD_SPIN_DESTROY@
+_GL_FUNCDECL_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock),
+                                             _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (pthread_spin_destroy, int, (pthread_spinlock_t *lock));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (pthread_spin_destroy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef pthread_spin_destroy
+# if HAVE_RAW_DECL_PTHREAD_SPIN_DESTROY
+_GL_WARN_ON_USE (pthread_spin_destroy, "pthread_spin_destroy is not portable - "
+                 "use gnulib module pthread-spin for portability");
+# endif
+#endif
+
+
+#if defined __cplusplus && defined GNULIB_NAMESPACE && !@HAVE_PTHREAD_H@ && defined __MINGW32__
+/* Provide the symbols required by mingw's <bits/gthr-default.h>.  */
+using GNULIB_NAMESPACE::pthread_create;
+using GNULIB_NAMESPACE::pthread_self;
+using GNULIB_NAMESPACE::pthread_equal;
+using GNULIB_NAMESPACE::pthread_detach;
+using GNULIB_NAMESPACE::pthread_join;
+using GNULIB_NAMESPACE::pthread_once;
+using GNULIB_NAMESPACE::pthread_mutex_init;
+using GNULIB_NAMESPACE::pthread_mutexattr_init;
+using GNULIB_NAMESPACE::pthread_mutexattr_settype;
+using GNULIB_NAMESPACE::pthread_mutexattr_destroy;
+using GNULIB_NAMESPACE::pthread_mutex_lock;
+using GNULIB_NAMESPACE::pthread_mutex_trylock;
+using GNULIB_NAMESPACE::pthread_mutex_timedlock;
+using GNULIB_NAMESPACE::pthread_mutex_unlock;
+using GNULIB_NAMESPACE::pthread_mutex_destroy;
+using GNULIB_NAMESPACE::pthread_cond_wait;
+using GNULIB_NAMESPACE::pthread_cond_timedwait;
+using GNULIB_NAMESPACE::pthread_cond_signal;
+using GNULIB_NAMESPACE::pthread_cond_broadcast;
+using GNULIB_NAMESPACE::pthread_cond_destroy;
+using GNULIB_NAMESPACE::pthread_key_create;
+using GNULIB_NAMESPACE::pthread_setspecific;
+using GNULIB_NAMESPACE::pthread_getspecific;
+using GNULIB_NAMESPACE::pthread_key_delete;
+#endif
+
+
+#endif /* _@GUARD_PREFIX@_PTHREAD_H_ */
+#endif /* _@GUARD_PREFIX@_PTHREAD_H_ */
+#endif
diff --git a/gl/realloc.c b/gl/realloc.c
index 05731396..04a28561 100644
--- a/gl/realloc.c
+++ b/gl/realloc.c
@@ -1,6 +1,6 @@
 /* realloc() function that is glibc compatible.
 
-   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2024 Free Software
+   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2025 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -18,17 +18,21 @@
 
 /* written by Jim Meyering and Bruno Haible */
 
+/* Ensure that we call the system's realloc() below.  */
+#define _GL_USE_STDLIB_ALLOC 1
 #include <config.h>
 
+#define _GL_REALLOC_INLINE _GL_EXTERN_INLINE
 #include <stdlib.h>
 
 #include <errno.h>
+#include <stdckdint.h>
 
-#include "xalloc-oversized.h"
+#ifdef __CHERI_PURE_CAPABILITY__
+# include <cheri.h>
+#endif
 
-/* Call the system's realloc below.  This file does not define
-   _GL_USE_STDLIB_ALLOC because it needs Gnulib's malloc if present.  */
-#undef realloc
+#ifndef _GL_INLINE_RPL_REALLOC
 
 /* Change the size of an allocated block of memory P to N bytes,
    with error checking.  If P is NULL, use malloc.  Otherwise if N is zero,
@@ -37,27 +41,70 @@
 void *
 rpl_realloc (void *p, size_t n)
 {
-  if (p == NULL)
-    return malloc (n);
+  size_t n1 = n;
 
   if (n == 0)
     {
-      free (p);
-      return NULL;
+# if NEED_SANITIZED_REALLOC
+      /* When P is non-null, ISO C23 §7.24.3.7.(3) says realloc (P, 0) has
+         undefined behavior even though C17 and earlier partially defined
+         the behavior.  Let the programmer know.
+         When the undefined-behaviour sanitizers report this case, i.e. when
+         <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117233> and
+         <https://github.com/llvm/llvm-project/issues/113065>
+         have been closed and new releases of GCC and clang have been made,
+         we can revisit this code.  */
+      if (p != NULL)
+        abort ();
+# endif
+
+      /* realloc (NULL, 0) acts like glibc malloc (0), i.e., like malloc (1)
+         except the caller cannot dereference any non-null return.
+
+         realloc (P, 0) with non-null P is a messier situation.
+         As mentioned above, C23 says behavior is undefined.
+         POSIX.1-2024 extends C17 to say realloc (P, 0)
+         either fails by setting errno and returning a null pointer,
+         or succeeds by freeing P and then either:
+           (a) setting errno=EINVAL and returning a null pointer; or
+           (b) acting like a successful malloc (0).
+         glibc 1 through 2.1 realloc acted like (b),
+         which conforms to C17, to C23 and to POSIX.1-2024.
+         glibc 2.1.1+ realloc acts like (a) except it does not set errno;
+         this conforms to C17 and to C23 but not to POSIX.1-2024.
+         Quite possibly future versions of POSIX will change,
+         due either to C23 or to (a)'s semantics being messy.
+         Act like (b), as that's easy, matches GNU, BSD and V7 malloc,
+         matches BSD and V7 realloc, and requires no extra code at
+         caller sites.  */
+
+# if !HAVE_REALLOC_0_NONNULL
+      n1 = 1;
+# endif
     }
 
-  if (xalloc_oversized (n, 1))
+# if !HAVE_MALLOC_PTRDIFF
+  ptrdiff_t signed_n;
+  if (ckd_add (&signed_n, n, 0))
     {
       errno = ENOMEM;
       return NULL;
     }
+# endif
 
-  void *result = realloc (p, n);
+  void *result = realloc (p, n1);
 
-#if !HAVE_MALLOC_POSIX
+# if !HAVE_REALLOC_POSIX
   if (result == NULL)
     errno = ENOMEM;
-#endif
+# endif
+
+# ifdef __CHERI_PURE_CAPABILITY__
+  if (result != NULL)
+    result = cheri_bounds_set (result, n);
+# endif
 
   return result;
 }
+
+#endif
diff --git a/gl/reallocarray.c b/gl/reallocarray.c
index 09711a0e..77e8d84c 100644
--- a/gl/reallocarray.c
+++ b/gl/reallocarray.c
@@ -1,6 +1,6 @@
 /* reallocarray function that is glibc compatible.
 
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -33,6 +33,6 @@ reallocarray (void *ptr, size_t nmemb, size_t size)
       return NULL;
     }
 
-  /* Rely on the semantics of GNU realloc.  */
+  /* Call realloc, setting errno to ENOMEM on failure.  */
   return realloc (ptr, nbytes);
 }
diff --git a/gl/regcomp.c b/gl/regcomp.c
index 696cf813..878b65ba 100644
--- a/gl/regcomp.c
+++ b/gl/regcomp.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -831,7 +831,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
     if (table_size > pat_len)
       break;
 
-  dfa->state_table = calloc (sizeof (struct re_state_table_entry), table_size);
+  dfa->state_table = calloc (table_size, sizeof (struct re_state_table_entry));
   dfa->state_hash_mask = table_size - 1;
 
   dfa->mb_cur_max = MB_CUR_MAX;
@@ -862,7 +862,7 @@ init_dfa (re_dfa_t *dfa, size_t pat_len)
         {
           int i, j, ch;
 
-          dfa->sb_char = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
+          dfa->sb_char = (re_bitset_ptr_t) calloc (1, sizeof (bitset_t));
           if (__glibc_unlikely (dfa->sb_char == NULL))
             return REG_ESPACE;
 
@@ -1001,21 +1001,25 @@ create_initial_state (re_dfa_t *dfa)
             Idx dest_idx = dfa->edests[node_idx].elems[0];
             if (!re_node_set_contains (&init_nodes, dest_idx))
               {
-                reg_errcode_t merge_err
+                err
                   = re_node_set_merge (&init_nodes, dfa->eclosures + dest_idx);
-                if (merge_err != REG_NOERROR)
-                  return merge_err;
+                if (err != REG_NOERROR)
+                  break;
                 i = 0;
               }
           }
       }
 
   /* It must be the first time to invoke acquire_state.  */
-  dfa->init_state = re_acquire_state_context (&err, dfa, &init_nodes, 0);
-  /* We don't check ERR here, since the initial state must not be NULL.  */
+  dfa->init_state
+    = (err == REG_NOERROR
+       ? re_acquire_state_context (&err, dfa, &init_nodes, 0)
+       : NULL);
   if (__glibc_unlikely (dfa->init_state == NULL))
-    return err;
-  if (dfa->init_state->has_constraint)
+    {
+      /* Don't check ERR here, as the initial state must not be null.  */
+    }
+  else if (dfa->init_state->has_constraint)
     {
       dfa->init_state_word = re_acquire_state_context (&err, dfa, &init_nodes,
                                                        CONTEXT_WORD);
@@ -1025,17 +1029,13 @@ create_initial_state (re_dfa_t *dfa)
                                                          &init_nodes,
                                                          CONTEXT_NEWLINE
                                                          | CONTEXT_BEGBUF);
-      if (__glibc_unlikely (dfa->init_state_word == NULL
-                            || dfa->init_state_nl == NULL
-                            || dfa->init_state_begbuf == NULL))
-        return err;
     }
   else
     dfa->init_state_word = dfa->init_state_nl
       = dfa->init_state_begbuf = dfa->init_state;
 
   re_node_set_free (&init_nodes);
-  return REG_NOERROR;
+  return err;
 }
 
 /* If it is possible to do searching in single byte encoding instead of UTF-8
@@ -1677,12 +1677,11 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
     {
       err = duplicate_node_closure (dfa, node, node, node,
                                     dfa->nodes[node].constraint);
-      if (__glibc_unlikely (err != REG_NOERROR))
-        return err;
     }
 
   /* Expand each epsilon destination nodes.  */
-  if (IS_EPSILON_NODE(dfa->nodes[node].type))
+  if (__glibc_likely (err == REG_NOERROR)
+      && IS_EPSILON_NODE (dfa->nodes[node].type))
     for (i = 0; i < dfa->edests[node].nelem; ++i)
       {
         re_node_set eclosure_elem;
@@ -1700,14 +1699,14 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
           {
             err = calc_eclosure_iter (&eclosure_elem, dfa, edest, false);
             if (__glibc_unlikely (err != REG_NOERROR))
-              return err;
+              break;
           }
         else
           eclosure_elem = dfa->eclosures[edest];
         /* Merge the epsilon closure of 'edest'.  */
         err = re_node_set_merge (&eclosure, &eclosure_elem);
         if (__glibc_unlikely (err != REG_NOERROR))
-          return err;
+          break;
         /* If the epsilon closure of 'edest' is incomplete,
            the epsilon closure of this node is also incomplete.  */
         if (dfa->eclosures[edest].nelem == 0)
@@ -1717,12 +1716,18 @@ calc_eclosure_iter (re_node_set *new_set, re_dfa_t *dfa, Idx node, bool root)
           }
       }
 
-  if (incomplete && !root)
-    dfa->eclosures[node].nelem = 0;
+  if (err != REG_NOERROR)
+    re_node_set_free (&eclosure);
   else
-    dfa->eclosures[node] = eclosure;
-  *new_set = eclosure;
-  return REG_NOERROR;
+    {
+      if (incomplete && !root)
+        dfa->eclosures[node].nelem = 0;
+      else
+        dfa->eclosures[node] = eclosure;
+      *new_set = eclosure;
+    }
+
+  return err;
 }
 
 /* Functions for token which are used in the parser.  */
@@ -3055,8 +3060,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
                                                    _NL_COLLATE_SYMB_EXTRAMB);
     }
 #endif
-  sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
-  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
+  sbcset = (re_bitset_ptr_t) calloc (1, sizeof (bitset_t));
+  mbcset = (re_charset_t *) calloc (1, sizeof (re_charset_t));
   if (__glibc_unlikely (sbcset == NULL || mbcset == NULL))
     {
       re_free (sbcset);
@@ -3275,6 +3280,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
   else
     {
       free_charset (mbcset);
+      mbcset = NULL;
       /* Build a tree for simple bracket.  */
       br_token.type = SIMPLE_BRACKET;
       br_token.opr.sbcset = sbcset;
@@ -3288,7 +3294,8 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
   *err = REG_ESPACE;
  parse_bracket_exp_free_return:
   re_free (sbcset);
-  free_charset (mbcset);
+  if (__glibc_likely (mbcset != NULL))
+    free_charset (mbcset);
   return NULL;
 }
 
@@ -3548,13 +3555,13 @@ build_charclass_op (re_dfa_t *dfa, RE_TRANSLATE_TYPE trans,
   reg_errcode_t ret;
   bin_tree_t *tree;
 
-  sbcset = (re_bitset_ptr_t) calloc (sizeof (bitset_t), 1);
+  sbcset = (re_bitset_ptr_t) calloc (1, sizeof (bitset_t));
   if (__glibc_unlikely (sbcset == NULL))
     {
       *err = REG_ESPACE;
       return NULL;
     }
-  mbcset = (re_charset_t *) calloc (sizeof (re_charset_t), 1);
+  mbcset = (re_charset_t *) calloc (1, sizeof (re_charset_t));
   if (__glibc_unlikely (mbcset == NULL))
     {
       re_free (sbcset);
diff --git a/gl/regex.c b/gl/regex.c
index 4b1a6ed6..f5f65526 100644
--- a/gl/regex.c
+++ b/gl/regex.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
diff --git a/gl/regex.h b/gl/regex.h
index ccf40ceb..e9ab85e8 100644
--- a/gl/regex.h
+++ b/gl/regex.h
@@ -1,6 +1,6 @@
 /* Definitions for data structures and routines for the regular
    expression library.
-   Copyright (C) 1985, 1989-2024 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -66,15 +66,14 @@ typedef unsigned long int active_reg_t;
 
 /* The following bits are used to determine the regexp syntax we
    recognize.  The set/not-set meanings are chosen so that Emacs syntax
-   remains the value 0.  The bits are given in alphabetical order, and
-   the definitions shifted by one from the previous bit; thus, when we
-   add or remove a bit, only one other definition need change.  */
+   is the value 0 for Emacs 20 (2000) and earlier, and the value
+   RE_SYNTAX_EMACS for Emacs 21 (2001) and later.  */
 typedef unsigned long int reg_syntax_t;
 
 #ifdef __USE_GNU
 /* If this bit is not set, then \ inside a bracket expression is literal.
    If set, then such a \ quotes the following character.  */
-# define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
+# define RE_BACKSLASH_ESCAPE_IN_LISTS 1ul
 
 /* If this bit is not set, then + and ? are operators, and \+ and \? are
      literals.
@@ -215,7 +214,8 @@ extern reg_syntax_t re_syntax_options;
    (The [[[ comments delimit what gets put into the Texinfo file, so
    don't delete them!)  */
 /* [[[begin syntaxes]]] */
-# define RE_SYNTAX_EMACS 0
+# define RE_SYNTAX_EMACS                                                \
+  (RE_CHAR_CLASSES | RE_INTERVALS)
 
 # define RE_SYNTAX_AWK                                                  \
   (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL                     \
@@ -522,20 +522,6 @@ typedef struct
 
 /* Declarations for routines.  */
 
-#ifndef _REGEX_NELTS
-# if (defined __STDC_VERSION__ && 199901L <= __STDC_VERSION__ \
-        && !defined __STDC_NO_VLA__)
-#  define _REGEX_NELTS(n) n
-# else
-#  define _REGEX_NELTS(n)
-# endif
-#endif
-
-#if defined __GNUC__ && 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wvla"
-#endif
-
 #ifndef _Attr_access_
 # ifdef __attr_access
 #  define _Attr_access_(arg) __attr_access (arg)
@@ -647,10 +633,12 @@ extern int re_exec (const char *);
      || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \
      || __clang_major__ >= 3
 #  define _Restrict_ __restrict
-# elif 199901L <= __STDC_VERSION__ || defined restrict
-#  define _Restrict_ restrict
 # else
-#  define _Restrict_
+#  if 199901L <= __STDC_VERSION__ || defined restrict
+#   define _Restrict_ restrict
+#  else
+#   define _Restrict_
+#  endif
 # endif
 #endif
 /* For the ISO C99 syntax
@@ -661,13 +649,15 @@ extern int re_exec (const char *);
 #ifndef _Restrict_arr_
 # ifdef __restrict_arr
 #  define _Restrict_arr_ __restrict_arr
-# elif ((199901L <= __STDC_VERSION__ \
+# else
+#  if ((199901L <= __STDC_VERSION__ \
          || 3 < __GNUC__ + (1 <= __GNUC_MINOR__) \
          || __clang_major__ >= 3) \
         && !defined __cplusplus)
-#  define _Restrict_arr_ _Restrict_
-# else
-#  define _Restrict_arr_
+#   define _Restrict_arr_ _Restrict_
+#  else
+#   define _Restrict_arr_
+#  endif
 # endif
 #endif
 
@@ -678,8 +668,7 @@ extern int regcomp (regex_t *_Restrict_ __preg,
 
 extern int regexec (const regex_t *_Restrict_ __preg,
                     const char *_Restrict_ __String, size_t __nmatch,
-                    regmatch_t __pmatch[_Restrict_arr_
-                                        _REGEX_NELTS (__nmatch)],
+                    regmatch_t __pmatch[_Restrict_arr_],
                     int __eflags);
 
 extern size_t regerror (int __errcode, const regex_t *_Restrict_ __preg,
@@ -688,10 +677,6 @@ extern size_t regerror (int __errcode, const regex_t *_Restrict_ __preg,
 
 extern void regfree (regex_t *__preg);
 
-#if defined __GNUC__ && 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# pragma GCC diagnostic pop
-#endif
-
 #ifdef __cplusplus
 }
 #endif  /* C++ */
diff --git a/gl/regex_internal.c b/gl/regex_internal.c
index 8cd096eb..9b89cc93 100644
--- a/gl/regex_internal.c
+++ b/gl/regex_internal.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -937,8 +937,7 @@ re_node_set_alloc (re_node_set *set, Idx size)
   set->alloc = size;
   set->nelem = 0;
   set->elems = re_malloc (Idx, size);
-  if (__glibc_unlikely (set->elems == NULL)
-      && (MALLOC_0_IS_NONNULL || size != 0))
+  if (__glibc_unlikely (set->elems == NULL))
     return REG_ESPACE;
   return REG_NOERROR;
 }
@@ -1596,7 +1595,7 @@ create_ci_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
   reg_errcode_t err;
   re_dfastate_t *newstate;
 
-  newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1);
+  newstate = (re_dfastate_t *) calloc (1, sizeof (re_dfastate_t));
   if (__glibc_unlikely (newstate == NULL))
     return NULL;
   err = re_node_set_init_copy (&newstate->nodes, nodes);
@@ -1644,7 +1643,7 @@ create_cd_newstate (const re_dfa_t *dfa, const re_node_set *nodes,
   reg_errcode_t err;
   re_dfastate_t *newstate;
 
-  newstate = (re_dfastate_t *) calloc (sizeof (re_dfastate_t), 1);
+  newstate = (re_dfastate_t *) calloc (1, sizeof (re_dfastate_t));
   if (__glibc_unlikely (newstate == NULL))
     return NULL;
   err = re_node_set_init_copy (&newstate->nodes, nodes);
diff --git a/gl/regex_internal.h b/gl/regex_internal.h
index 6165cb17..1f297299 100644
--- a/gl/regex_internal.h
+++ b/gl/regex_internal.h
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -100,10 +100,12 @@
 /* This is for other GNU distributions with internationalized messages.  */
 #if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
 # include <libintl.h>
+# undef gettext
 # ifdef _LIBC
-#  undef gettext
 #  define gettext(msgid) \
   __dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
+# else
+#  define gettext(msgid) dgettext ("gnulib", msgid)
 # endif
 #else
 # undef gettext
@@ -436,12 +438,6 @@ typedef struct re_dfa_t re_dfa_t;
 #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
 #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
 
-#ifdef _LIBC
-# define MALLOC_0_IS_NONNULL 1
-#elif !defined MALLOC_0_IS_NONNULL
-# define MALLOC_0_IS_NONNULL 0
-#endif
-
 #ifndef MAX
 # define MAX(a,b) ((a) < (b) ? (b) : (a))
 #endif
diff --git a/gl/regexec.c b/gl/regexec.c
index 9f065dfa..0d14ac35 100644
--- a/gl/regexec.c
+++ b/gl/regexec.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -185,7 +185,7 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len);
 
 int
 regexec (const regex_t *__restrict preg, const char *__restrict string,
-         size_t nmatch, regmatch_t pmatch[_REGEX_NELTS (nmatch)], int eflags)
+         size_t nmatch, regmatch_t pmatch[], int eflags)
 {
   reg_errcode_t err;
   Idx start, length;
@@ -229,7 +229,7 @@ int
 attribute_compat_text_section
 __compat_regexec (const regex_t *__restrict preg,
                   const char *__restrict string, size_t nmatch,
-                  regmatch_t pmatch[_REGEX_NELTS (nmatch)], int eflags)
+                  regmatch_t pmatch[], int eflags)
 {
   return regexec (preg, string, nmatch, pmatch,
                   eflags & (REG_NOTBOL | REG_NOTEOL));
@@ -2271,7 +2271,7 @@ merge_state_with_log (reg_errcode_t *err, re_match_context_t *mctx,
          these destinations and the results of the transition table.  */
       pstate = mctx->state_log[cur_idx];
       log_nodes = pstate->entrance_nodes;
-      if (next_state != NULL)
+      if (next_state != NULL && next_state->entrance_nodes != NULL)
         {
           table_nodes = next_state->entrance_nodes;
           *err = re_node_set_init_union (&next_nodes, table_nodes,
@@ -2721,8 +2721,8 @@ get_subexp (re_match_context_t *mctx, Idx bkref_node, Idx bkref_str_idx)
             continue; /* No.  */
           if (sub_top->path == NULL)
             {
-              sub_top->path = calloc (sizeof (state_array_t),
-                                      sl_str - sub_top->str_idx + 1);
+              sub_top->path = calloc (sl_str - sub_top->str_idx + 1,
+                                      sizeof (state_array_t));
               if (sub_top->path == NULL)
                 return REG_ESPACE;
             }
@@ -3266,7 +3266,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
       if (ndests == 0)
         {
           state->trtable = (re_dfastate_t **)
-            calloc (sizeof (re_dfastate_t *), SBC_MAX);
+            calloc (SBC_MAX, sizeof (re_dfastate_t *));
           if (__glibc_unlikely (state->trtable == NULL))
             return false;
           return true;
@@ -3338,7 +3338,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
          discern by looking at the character code: allocate a
          256-entry transition table.  */
       trtable = state->trtable =
-        (re_dfastate_t **) calloc (sizeof (re_dfastate_t *), SBC_MAX);
+        (re_dfastate_t **) calloc (SBC_MAX, sizeof (re_dfastate_t *));
       if (__glibc_unlikely (trtable == NULL))
         goto out_free;
 
@@ -3369,7 +3369,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
          transition tables, one starting at trtable[0] and one
          starting at trtable[SBC_MAX].  */
       trtable = state->word_trtable =
-        (re_dfastate_t **) calloc (sizeof (re_dfastate_t *), 2 * SBC_MAX);
+        (re_dfastate_t **) calloc (2 * SBC_MAX, sizeof (re_dfastate_t *));
       if (__glibc_unlikely (trtable == NULL))
         goto out_free;
 
diff --git a/gl/sched.h b/gl/sched.h
new file mode 100644
index 00000000..4d9d546d
--- /dev/null
+++ b/gl/sched.h
@@ -0,0 +1,631 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* A GNU-like <sched.h>.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_SCHED_H
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+
+/* This file uses #include_next of a system file that defines time_t.
+   For the 'year2038' module to work right, <config.h> needs to have been
+   included before.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* The include_next requires a split double-inclusion guard.  */
+#if 1
+# if 1
+#  include <sys/cdefs.h>
+# endif
+# include_next <sched.h>
+#endif
+
+#ifndef _GL_SCHED_H
+#define _GL_SCHED_H
+
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* Get pid_t.
+   This is needed on glibc 2.11 (see
+   glibc bug <https://sourceware.org/PR13198>)
+   and Mac OS X 10.5.  */
+#include <sys/types.h>
+
+#ifdef __KLIBC__
+/* On OS/2 kLIBC, struct sched_param is in spawn.h.  */
+# include <spawn.h>
+#endif
+
+#ifdef __VMS
+/* On OpenVMS, struct sched_param is in <pthread.h>.  */
+# include <pthread.h>
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+/* C++ compatible function declaration macros.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* Begin/end the GNULIB_NAMESPACE namespace.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE {
+# define _GL_END_NAMESPACE }
+#else
+# define _GL_BEGIN_NAMESPACE
+# define _GL_END_NAMESPACE
+#endif
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_EXTERN_C_FUNC declaration;
+   performs the declaration of a function with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C_FUNC extern "C"
+#else
+/* In C mode, omit the 'extern' keyword, because attributes in bracket syntax
+   are not allowed between 'extern' and the return type (see gnulib-common.m4).
+ */
+# define _GL_EXTERN_C_FUNC
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters, [attributes]);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...),
+                                  _GL_ARG_NONNULL ((1)));
+
+   Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front
+   of a _GL_FUNCDECL_RPL invocation only in C mode, not in C++ mode.  (That's
+   because
+     [[...]] extern "C" <declaration>;
+   is invalid syntax in C++.)
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters,...) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters, __VA_ARGS__)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+
+/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
+   parenthesized func otherwise.  Parenthesization is needed in C23 if
+   the function is like strchr and so is a qualifier-generic macro
+   that expands to something more complicated.  */
+#ifdef __cplusplus
+# define _GL_FUNCDECL_SYS_NAME(func) func
+#else
+# define _GL_FUNCDECL_SYS_NAME(func) (func)
+#endif
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+
+   Wrapping rpl_func in an object with an inline conversion operator
+   avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::rpl_func;                                  \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_MDA (func, rettype, parameters);
+   is to be used when func is a Microsoft deprecated alias, on native Windows.
+   It declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to _func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_MDA(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, _##func, rettype, parameters)
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      static const struct _gl_ ## func ## _wrapper                 \
+      {                                                            \
+        typedef rettype (*type) parameters;                        \
+                                                                   \
+        inline operator type () const                              \
+        {                                                          \
+          return reinterpret_cast<type>(::rpl_func);               \
+        }                                                          \
+      } func = {};                                                 \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_MDA_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_MDA (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#define _GL_CXXALIAS_MDA_CAST(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_CAST_1 (func, _##func, rettype, parameters)
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+
+   Wrapping func in an object with an inline conversion operator
+   avoids a reference to func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS(func,rettype,parameters)            \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::func;                                      \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static const struct _gl_ ## func ## _wrapper      \
+      {                                                 \
+        typedef rettype (*type) parameters;             \
+                                                        \
+        inline operator type () const                   \
+        {                                               \
+          return reinterpret_cast<type>(::func);        \
+        }                                               \
+      } func = {};                                      \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static const struct _gl_ ## func ## _wrapper                            \
+      {                                                                       \
+        typedef rettype (*type) parameters;                                   \
+                                                                              \
+        inline operator type () const                                         \
+        {                                                                     \
+          return reinterpret_cast<type>((rettype2 (*) parameters2)(::func));  \
+        }                                                                     \
+      } func = {};                                                            \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <https://gcc.gnu.org/PR43881>,
+   we enable the warning only when not optimizing.  */
+# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__)
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <https://gcc.gnu.org/PR43881>,
+   we enable the warning only when not optimizing.  */
+# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__)
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+/* A C macro for emitting warnings if a function is used.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
+   for FUNCTION which will then trigger a compiler warning containing
+   the text of "literal string" anywhere that function is called, if
+   supported by the compiler.  If the compiler does not support this
+   feature, the macro expands to an unused extern declaration.
+
+   _GL_WARN_ON_USE_ATTRIBUTE ("literal string") expands to the
+   attribute used in _GL_WARN_ON_USE.  If the compiler does not support
+   this feature, it expands to empty.
+
+   These macros are useful for marking a function as a potential
+   portability trap, with the intent that "literal string" include
+   instructions on the replacement function that should be used
+   instead.
+   _GL_WARN_ON_USE is for functions with 'extern' linkage.
+   _GL_WARN_ON_USE_ATTRIBUTE is for functions with 'static' or 'inline'
+   linkage.
+
+   _GL_WARN_ON_USE should not be used more than once for a given function
+   in a given compilation unit (because this may generate a warning even
+   if the function is never called).
+
+   However, one of the reasons that a function is a portability trap is
+   if it has the wrong signature.  Declaring FUNCTION with a different
+   signature in C is a compilation error, so this macro must use the
+   same type as any existing declaration so that programs that avoid
+   the problematic FUNCTION do not fail to compile merely because they
+   included a header that poisoned the function.  But this implies that
+   _GL_WARN_ON_USE is only safe to use if FUNCTION is known to already
+   have a declaration.  Use of this macro implies that there must not
+   be any other macro hiding the declaration of FUNCTION; but
+   undefining FUNCTION first is part of the poisoning process anyway
+   (although for symbols that are provided only via a macro, the result
+   is a compilation error rather than a warning containing
+   "literal string").  Also note that in C++, it is only safe to use if
+   FUNCTION has no overloads.
+
+   For an example, it is possible to poison 'getline' by:
+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
+     [getline]) in configure.ac, which potentially defines
+     HAVE_RAW_DECL_GETLINE
+   - adding this code to a header that wraps the system <stdio.h>:
+     #undef getline
+     #if HAVE_RAW_DECL_GETLINE
+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
+       "not universally present; use the gnulib module getline");
+     #endif
+
+   It is not possible to directly poison global variables.  But it is
+   possible to write a wrapper accessor function, and poison that
+   (less common usage, like &environ, will cause a compilation error
+   rather than issue the nice warning, but the end result of informing
+   the developer about their portability problem is still achieved):
+     #if HAVE_RAW_DECL_ENVIRON
+     static char ***
+     rpl_environ (void) { return &environ; }
+     _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+     # undef environ
+     # define environ (*rpl_environ ())
+     #endif
+   or better (avoiding contradictory use of 'static' and 'extern'):
+     #if HAVE_RAW_DECL_ENVIRON
+     static char ***
+     _GL_WARN_ON_USE_ATTRIBUTE ("environ is not always properly declared")
+     rpl_environ (void) { return &environ; }
+     # undef environ
+     # define environ (*rpl_environ ())
+     #endif
+   */
+#ifndef _GL_WARN_ON_USE
+
+# if (4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)) && !defined __clang__
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function __attribute__ ((__warning__ (message)))
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message) \
+  __attribute__ ((__warning__ (message)))
+# elif __clang_major__ >= 4
+/* Another compiler attribute is available in clang.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function \
+  __attribute__ ((__diagnose_if__ (1, message, "warning")))
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message) \
+  __attribute__ ((__diagnose_if__ (1, message, "warning")))
+# elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message)
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message)
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype_gcc, rettype_clang, parameters_and_attributes, "message")
+   is like _GL_WARN_ON_USE (function, "message"), except that in C++ mode the
+   function is declared with the given prototype, consisting of return type,
+   parameters, and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if !defined __cplusplus
+#  define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+     _GL_WARN_ON_USE (function, msg)
+# else
+#  if (4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)) && !defined __clang__
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_gcc function parameters_and_attributes \
+  __attribute__ ((__warning__ (msg)))
+#  elif __clang_major__ >= 4
+/* Another compiler attribute is available in clang.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_clang function parameters_and_attributes \
+  __attribute__ ((__diagnose_if__ (1, msg, "warning")))
+#  elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_gcc function parameters_and_attributes
+#  else /* Unsupported.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+#  endif
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
+
+#if !1
+
+# if !GNULIB_defined_struct_sched_param
+struct sched_param
+{
+  int sched_priority;
+};
+#  define GNULIB_defined_struct_sched_param 1
+# endif
+
+#endif
+
+#if !(defined SCHED_FIFO && defined SCHED_RR && defined SCHED_OTHER)
+# define SCHED_FIFO   1
+# define SCHED_RR     2
+# define SCHED_OTHER  0
+#endif
+
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef sched_yield
+#   define sched_yield rpl_sched_yield
+#  endif
+_GL_FUNCDECL_RPL (sched_yield, int, (void), );
+_GL_CXXALIAS_RPL (sched_yield, int, (void));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (sched_yield, int, (void), );
+#  endif
+_GL_CXXALIAS_SYS (sched_yield, int, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (sched_yield);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_SCHED_YIELD
+_GL_WARN_ON_USE (sched_yield, "sched_yield is not portable - "
+                 "use gnulib module sched_yield for portability");
+# endif
+#endif
+
+#endif /* _GL_SCHED_H */
+#endif /* _GL_SCHED_H */
diff --git a/gl/sched.in.h b/gl/sched.in.h
new file mode 100644
index 00000000..5b4034c3
--- /dev/null
+++ b/gl/sched.in.h
@@ -0,0 +1,111 @@
+/* A GNU-like <sched.h>.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _@GUARD_PREFIX@_SCHED_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* This file uses #include_next of a system file that defines time_t.
+   For the 'year2038' module to work right, <config.h> needs to have been
+   included before.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_SCHED_H@
+# if @HAVE_SYS_CDEFS_H@
+#  include <sys/cdefs.h>
+# endif
+# @INCLUDE_NEXT@ @NEXT_SCHED_H@
+#endif
+
+#ifndef _@GUARD_PREFIX@_SCHED_H
+#define _@GUARD_PREFIX@_SCHED_H
+
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* Get pid_t.
+   This is needed on glibc 2.11 (see
+   glibc bug <https://sourceware.org/bugzilla/show_bug.cgi?id=13198>)
+   and Mac OS X 10.5.  */
+#include <sys/types.h>
+
+#ifdef __KLIBC__
+/* On OS/2 kLIBC, struct sched_param is in spawn.h.  */
+# include <spawn.h>
+#endif
+
+#ifdef __VMS
+/* On OpenVMS, struct sched_param is in <pthread.h>.  */
+# include <pthread.h>
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+#if !@HAVE_STRUCT_SCHED_PARAM@
+
+# if !GNULIB_defined_struct_sched_param
+struct sched_param
+{
+  int sched_priority;
+};
+#  define GNULIB_defined_struct_sched_param 1
+# endif
+
+#endif
+
+#if !(defined SCHED_FIFO && defined SCHED_RR && defined SCHED_OTHER)
+# define SCHED_FIFO   1
+# define SCHED_RR     2
+# define SCHED_OTHER  0
+#endif
+
+#if @GNULIB_SCHED_YIELD@
+# if @REPLACE_SCHED_YIELD@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef sched_yield
+#   define sched_yield rpl_sched_yield
+#  endif
+_GL_FUNCDECL_RPL (sched_yield, int, (void), );
+_GL_CXXALIAS_RPL (sched_yield, int, (void));
+# else
+#  if !@HAVE_SCHED_YIELD@
+_GL_FUNCDECL_SYS (sched_yield, int, (void), );
+#  endif
+_GL_CXXALIAS_SYS (sched_yield, int, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (sched_yield);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef sched_yield
+# if HAVE_RAW_DECL_SCHED_YIELD
+_GL_WARN_ON_USE (sched_yield, "sched_yield is not portable - "
+                 "use gnulib module sched_yield for portability");
+# endif
+#endif
+
+#endif /* _@GUARD_PREFIX@_SCHED_H */
+#endif /* _@GUARD_PREFIX@_SCHED_H */
diff --git a/gl/setenv.c b/gl/setenv.c
index 9e2e9e2f..ef301d41 100644
--- a/gl/setenv.c
+++ b/gl/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2024 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This file is free software: you can redistribute it and/or modify
@@ -38,11 +38,23 @@
 # include <unistd.h>
 #endif
 
+#if defined _WIN32 && ! defined __CYGWIN__
+# define WIN32_LEAN_AND_MEAN
+# include <windows.h>
+#endif
+
 #if !_LIBC
 # include "malloca.h"
 #endif
 
+#if defined _WIN32 && ! defined __CYGWIN__
+/* Don't assume that UNICODE is not defined.  */
+# undef SetEnvironmentVariable
+# define SetEnvironmentVariable SetEnvironmentVariableA
+#endif
+
 #if _LIBC || !HAVE_SETENV
+#if !HAVE_DECL__PUTENV
 
 #if !_LIBC
 # define __environ      environ
@@ -215,8 +227,7 @@ __add_to_environ (const char *name, const char *value, const char *combined,
         }
 
       if (__environ != last_environ)
-        memcpy ((char *) new_environ, (char *) __environ,
-                size * sizeof (char *));
+        memcpy (new_environ, __environ, size * sizeof (char *));
 
       new_environ[size + 1] = NULL;
 
@@ -343,6 +354,84 @@ weak_alias (__setenv, setenv)
 weak_alias (__clearenv, clearenv)
 #endif
 
+#else /* HAVE_DECL__PUTENV */
+/* Native Windows */
+
+int
+setenv (const char *name, const char *value, int replace)
+{
+  if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
+    {
+      errno = EINVAL;
+      return -1;
+    }
+
+  /* The Microsoft documentation
+     <https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/putenv-wputenv>
+     says:
+       "Don't change an environment entry directly: instead,
+        use _putenv or _wputenv to change it."
+     Note: Microsoft's _putenv updates not only the contents of _environ but
+     also the contents of _wenviron, so that both are in kept in sync.  */
+  const char *existing_value = getenv (name);
+  if (existing_value != NULL)
+    {
+      if (replace)
+        {
+          if (strcmp (existing_value, value) == 0)
+            /* No need to allocate memory.  */
+            return 0;
+        }
+      else
+        /* Keep the existing value.  */
+        return 0;
+    }
+  /* Allocate a new environment entry in the heap.  */
+  /* _putenv ("NAME=") unsets NAME, so if VALUE is the empty string, invoke
+     _putenv ("NAME= ") and fix up the result afterwards.  */
+  const char *value_ = (value[0] == '\0' ? " " : value);
+  size_t name_len = strlen (name);
+  size_t value_len = strlen (value_);
+  char *string = (char *) malloc (name_len + 1 + value_len + 1);
+  if (string == NULL)
+    return -1;
+  memcpy (string, name, name_len);
+  string[name_len] = '=';
+  memcpy (&string[name_len + 1], value_, value_len + 1);
+  /* Use _putenv.  */
+  if (_putenv (string) < 0)
+    return -1;
+  if (value[0] == '\0')
+    {
+      /* Fix up the result.  */
+      char *new_value = getenv (name);
+      if (new_value != NULL && new_value[0] == ' ' && new_value[1] == '\0')
+        new_value[0] = '\0';
+# if defined _WIN32 && ! defined __CYGWIN__
+      /* _putenv propagated "NAME= " into the subprocess environment;
+         fix that by calling SetEnvironmentVariable directly.  */
+      /* Documentation:
+         <https://learn.microsoft.com/en-us/windows/win32/api/winbase/nf-winbase-setenvironmentvariable>  */
+      if (!SetEnvironmentVariable (name, ""))
+        {
+          switch (GetLastError ())
+            {
+            case ERROR_NOT_ENOUGH_MEMORY:
+            case ERROR_OUTOFMEMORY:
+              errno = ENOMEM;
+              break;
+            default:
+              errno = EINVAL;
+              break;
+            }
+          return -1;
+        }
+# endif
+    }
+  return 0;
+}
+
+#endif /* HAVE_DECL__PUTENV */
 #endif /* _LIBC || !HAVE_SETENV */
 
 /* The rest of this file is called into use when replacing an existing
@@ -360,7 +449,7 @@ int
 rpl_setenv (const char *name, const char *value, int replace)
 {
   int result;
-  if (!name || !*name || strchr (name, '='))
+  if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
     {
       errno = EINVAL;
       return -1;
diff --git a/gl/setlocale-lock.c b/gl/setlocale-lock.c
index 192489c4..87e0048c 100644
--- a/gl/setlocale-lock.c
+++ b/gl/setlocale-lock.c
@@ -1,5 +1,5 @@
 /* Return the internal lock used by setlocale_null_r.
-   Copyright (C) 2019-2024 Free Software Foundation, Inc.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/setlocale_null-unlocked.c b/gl/setlocale_null-unlocked.c
index 0a86f0df..72729e6b 100644
--- a/gl/setlocale_null-unlocked.c
+++ b/gl/setlocale_null-unlocked.c
@@ -1,5 +1,5 @@
 /* Query the name of the current global locale, without locking.
-   Copyright (C) 2019-2024 Free Software Foundation, Inc.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/setlocale_null.c b/gl/setlocale_null.c
index 5ecf413d..29889642 100644
--- a/gl/setlocale_null.c
+++ b/gl/setlocale_null.c
@@ -1,5 +1,5 @@
 /* Query the name of the current global locale.
-   Copyright (C) 2019-2024 Free Software Foundation, Inc.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/setlocale_null.h b/gl/setlocale_null.h
index 966c53cf..3fcb7a82 100644
--- a/gl/setlocale_null.h
+++ b/gl/setlocale_null.h
@@ -1,5 +1,5 @@
 /* Query the name of the current global locale.
-   Copyright (C) 2019-2024 Free Software Foundation, Inc.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/sha256-stream.c b/gl/sha256-stream.c
index 08d24b7b..e2668078 100644
--- a/gl/sha256-stream.c
+++ b/gl/sha256-stream.c
@@ -1,7 +1,7 @@
 /* sha256.c - Functions to compute SHA256 and SHA224 message digest of files or
    memory blocks according to the NIST specification FIPS-180-2.
 
-   Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -23,9 +23,6 @@
 #include <config.h>
 
 /* Specification.  */
-#if HAVE_OPENSSL_SHA256
-# define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
-#endif
 #include "sha256.h"
 
 #include <stdlib.h>
@@ -136,10 +133,3 @@ sha224_stream (FILE *stream, void *resblock)
   return shaxxx_stream (stream, "sha224", resblock, SHA224_DIGEST_SIZE,
                         sha224_init_ctx, sha224_finish_ctx);
 }
-
-/*
- * Hey Emacs!
- * Local Variables:
- * coding: utf-8
- * End:
- */
diff --git a/gl/sha256.c b/gl/sha256.c
index fe7c5446..9358faff 100644
--- a/gl/sha256.c
+++ b/gl/sha256.c
@@ -1,7 +1,7 @@
 /* sha256.c - Functions to compute SHA256 and SHA224 message digest of files or
    memory blocks according to the NIST specification FIPS-180-2.
 
-   Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/sha256.h b/gl/sha256.h
index a9d7abb8..cd1a9fe3 100644
--- a/gl/sha256.h
+++ b/gl/sha256.h
@@ -1,6 +1,6 @@
 /* Declarations of functions and data types used for SHA256 and SHA224 sum
    library functions.
-   Copyright (C) 2005-2006, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/size_max.h b/gl/size_max.h
index bd2eb43e..93eb96a6 100644
--- a/gl/size_max.h
+++ b/gl/size_max.h
@@ -1,5 +1,5 @@
 /* size_max.h -- declare SIZE_MAX through system headers
-   Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2025 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/snprintf.c b/gl/snprintf.c
index c1b93562..edeee083 100644
--- a/gl/snprintf.c
+++ b/gl/snprintf.c
@@ -1,6 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2024 Free Software Foundation, Inc.
-   Written by Simon Josefsson and Paul Eggert.
+   Copyright (C) 2004, 2006-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -23,49 +22,25 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdint.h>
 
-#include "vasnprintf.h"
-
-/* Print formatted output to string STR.  Similar to sprintf, but
-   additional length SIZE limit how much is written into STR.  Returns
-   string length of formatted string (which may be larger than SIZE).
-   STR may be NULL, in which case nothing will be written.  On error,
-   return a negative value.  */
 int
 snprintf (char *str, size_t size, const char *format, ...)
 {
-  char *output;
-  size_t len;
-  size_t lenbuf = size;
   va_list args;
+  ptrdiff_t ret;
 
   va_start (args, format);
-  output = vasnprintf (str, &lenbuf, format, args);
-  len = lenbuf;
+  ret = vsnzprintf (str, size, format, args);
   va_end (args);
 
-  if (!output)
-    return -1;
-
-  if (output != str)
-    {
-      if (size)
-        {
-          size_t pruned_len = (len < size ? len : size - 1);
-          memcpy (str, output, pruned_len);
-          str[pruned_len] = '\0';
-        }
-
-      free (output);
-    }
-
-  if (INT_MAX < len)
+#if PTRDIFF_MAX > INT_MAX
+  if (ret > INT_MAX)
     {
       errno = EOVERFLOW;
       return -1;
     }
+#endif
 
-  return len;
+  return ret;
 }
diff --git a/gl/sockets.c b/gl/sockets.c
index 92beb7d3..7accfdd3 100644
--- a/gl/sockets.c
+++ b/gl/sockets.c
@@ -1,6 +1,6 @@
 /* sockets.c --- wrappers for Windows socket functions
 
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/sockets.h b/gl/sockets.h
index 55077ae9..5be5d3f6 100644
--- a/gl/sockets.h
+++ b/gl/sockets.h
@@ -1,6 +1,6 @@
 /* sockets.h - wrappers for Windows socket functions
 
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -52,7 +52,7 @@ int gl_sockets_cleanup (void)
 #endif
 
 
-/* This function is useful it you create a socket using gnulib's
+/* This function is useful if you create a socket using gnulib's
    Winsock wrappers but needs to pass on the socket handle to some
    other library that only accepts sockets. */
 #ifdef WINDOWS_SOCKETS
diff --git a/gl/stat-time.c b/gl/stat-time.c
index 1ab01f53..fa93e16c 100644
--- a/gl/stat-time.c
+++ b/gl/stat-time.c
@@ -1,6 +1,6 @@
 /* stat-related time functions.
 
-   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+   Copyright (C) 2012-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/stat-time.h b/gl/stat-time.h
index 3cd8478f..38315b9f 100644
--- a/gl/stat-time.h
+++ b/gl/stat-time.h
@@ -1,6 +1,6 @@
 /* stat-related time functions.
 
-   Copyright (C) 2005, 2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -117,6 +117,31 @@ get_stat_birthtime_ns (_GL_UNUSED struct stat const *st)
 # endif
 }
 
+/* Constructs a 'struct timespec' with the given contents.
+   This macro / function is private to stat-time.h.  */
+#if !defined __cplusplus
+/* Use a C99 compound literal.
+   This is guaranteed to initialize also the padding bits, for example on
+   platforms where tv_sec is 64 bits and tv_nsec is 32 bits, thus avoiding
+   gcc -Wuse-of-uninitialized-value warnings.  */
+# define _gl_make_timespec(sec,nsec) \
+    (struct timespec) { .tv_sec = (sec), .tv_nsec = (nsec) }
+#else
+/* C++ does not have C99 compound literals.
+   A constructor invocation
+     timespec { (sec), (nsec) }
+   would make assumptions about the order of the fields of 'struct timespec',
+   which are not guaranteed by POSIX.  So, use an inline function.  */
+static inline struct timespec
+_gl_make_timespec (time_t sec, long nsec)
+{
+  struct timespec ts;
+  ts.tv_sec = sec;
+  ts.tv_nsec = nsec;
+  return ts;
+}
+#endif
+
 /* Return *ST's access time.  */
 _GL_STAT_TIME_INLINE struct timespec _GL_ATTRIBUTE_PURE
 get_stat_atime (struct stat const *st)
@@ -124,8 +149,7 @@ get_stat_atime (struct stat const *st)
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_atim);
 #else
-  return (struct timespec) { .tv_sec = st->st_atime,
-                             .tv_nsec = get_stat_atime_ns (st) };
+  return _gl_make_timespec (st->st_atime, get_stat_atime_ns (st));
 #endif
 }
 
@@ -136,8 +160,7 @@ get_stat_ctime (struct stat const *st)
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_ctim);
 #else
-  return (struct timespec) { .tv_sec = st->st_ctime,
-                             .tv_nsec = get_stat_ctime_ns (st) };
+  return _gl_make_timespec (st->st_ctime, get_stat_ctime_ns (st));
 #endif
 }
 
@@ -148,8 +171,7 @@ get_stat_mtime (struct stat const *st)
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_mtim);
 #else
-  return (struct timespec) { .tv_sec = st->st_mtime,
-                             .tv_nsec = get_stat_mtime_ns (st) };
+  return _gl_make_timespec (st->st_mtime, get_stat_mtime_ns (st));
 #endif
 }
 
@@ -164,8 +186,7 @@ get_stat_birthtime (_GL_UNUSED struct stat const *st)
      || defined HAVE_STRUCT_STAT_ST_BIRTHTIM_TV_NSEC)
   t = STAT_TIMESPEC (st, st_birthtim);
 #elif defined HAVE_STRUCT_STAT_ST_BIRTHTIMENSEC
-  t = (struct timespec) { .tv_sec = st->st_birthtime,
-                          .tv_nsec = st->st_birthtimensec };
+  t = _gl_make_timespec (st->st_birthtime, st->st_birthtimensec);
 #elif defined _WIN32 && ! defined __CYGWIN__
   /* Native Windows platforms (but not Cygwin) put the "file creation
      time" in st_ctime (!).  See
@@ -173,11 +194,11 @@ get_stat_birthtime (_GL_UNUSED struct stat const *st)
 # if _GL_WINDOWS_STAT_TIMESPEC
   t = st->st_ctim;
 # else
-  t = (struct timespec) { .tv_sec = st->st_ctime };
+  t = _gl_make_timespec (st->st_ctime, 0);
 # endif
 #else
   /* Birth time is not supported.  */
-  t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 };
+  t = _gl_make_timespec (-1, -1);
 #endif
 
 #if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \
@@ -189,7 +210,7 @@ get_stat_birthtime (_GL_UNUSED struct stat const *st)
      sometimes returns junk in the birth time fields; work around this
      bug if it is detected.  */
   if (! (t.tv_sec && 0 <= t.tv_nsec && t.tv_nsec < 1000000000))
-    t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 };
+    t = _gl_make_timespec (-1, -1);
 #endif
 
   return t;
diff --git a/gl/stat-w32.c b/gl/stat-w32.c
index ddd6f598..8da8fe5c 100644
--- a/gl/stat-w32.c
+++ b/gl/stat-w32.c
@@ -1,5 +1,5 @@
 /* Core of implementation of fstat and stat for native Windows.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/stat-w32.h b/gl/stat-w32.h
index 392faed1..c70c1be3 100644
--- a/gl/stat-w32.h
+++ b/gl/stat-w32.h
@@ -1,5 +1,5 @@
 /* Core of implementation of fstat and stat for native Windows.
-   Copyright (C) 2017-2024 Free Software Foundation, Inc.
+   Copyright (C) 2017-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/stat.c b/gl/stat.c
index ecf9f9bb..66637837 100644
--- a/gl/stat.c
+++ b/gl/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -118,6 +118,10 @@ rpl_stat (char const *name, struct stat *buf)
      around length limitations
      <https://docs.microsoft.com/en-us/windows/desktop/FileIO/naming-a-file> ?  */
 
+  /* To ease portability.  Like in open.c.  */
+  if (strcmp (name, "/dev/null") == 0)
+    name = "NUL";
+
   /* POSIX <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap04.html#tag_04_13>
      specifies: "More than two leading <slash> characters shall be treated as
      a single <slash> character."  */
diff --git a/gl/stdckdint.in.h b/gl/stdckdint.in.h
index 91848806..bb9089b4 100644
--- a/gl/stdckdint.in.h
+++ b/gl/stdckdint.in.h
@@ -1,6 +1,6 @@
 /* stdckdint.h -- checked integer arithmetic
 
-   Copyright 2022-2024 Free Software Foundation, Inc.
+   Copyright 2022-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -15,10 +15,30 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-#ifndef _GL_STDCKDINT_H
-#define _GL_STDCKDINT_H
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
 
-#include "intprops-internal.h"
+#ifndef _@GUARD_PREFIX@_STDCKDINT_H
+
+/* The include_next requires a split double-inclusion guard.  */
+#if defined __cplusplus ? @HAVE_CXX_STDCKDINT_H@ : @HAVE_C_STDCKDINT_H@
+# @INCLUDE_NEXT@ @NEXT_STDCKDINT_H@
+#endif
+
+#ifndef _@GUARD_PREFIX@_STDCKDINT_H
+#define _@GUARD_PREFIX@_STDCKDINT_H
+
+/* Do nothing but include the system header if it works properly.  */
+# if defined __cplusplus ? !@HAVE_WORKING_CXX_STDCKDINT_H@ : !@HAVE_WORKING_C_STDCKDINT_H@
+
+/* Avoid redefining macros.  */
+#  undef ckd_add
+#  undef ckd_sub
+#  undef ckd_mul
+
+#  include "intprops-internal.h"
 
 /* Store into *R the low-order bits of A + B, A - B, A * B, respectively.
    Return 1 if the result overflows, 0 otherwise.
@@ -26,10 +46,13 @@
    bit-precise integer type, or an enumeration type.
 
    These are like the standard macros introduced in C23, except that
-   arguments should not have side effects.  */
+   arguments should not have side effects.  The C++26 standard is
+   expected to add this header and it's macros.  */
 
-#define ckd_add(r, a, b) ((bool) _GL_INT_ADD_WRAPV (a, b, r))
-#define ckd_sub(r, a, b) ((bool) _GL_INT_SUBTRACT_WRAPV (a, b, r))
-#define ckd_mul(r, a, b) ((bool) _GL_INT_MULTIPLY_WRAPV (a, b, r))
+#  define ckd_add(r, a, b) ((bool) _GL_INT_ADD_WRAPV (a, b, r))
+#  define ckd_sub(r, a, b) ((bool) _GL_INT_SUBTRACT_WRAPV (a, b, r))
+#  define ckd_mul(r, a, b) ((bool) _GL_INT_MULTIPLY_WRAPV (a, b, r))
 
-#endif /* _GL_STDCKDINT_H */
+# endif /* defined __cplusplus ? @HAVE_WORKING_CXX_STDCKDINT_H@ : @HAVE_WORKING_C_STDCKDINT_H@ */
+#endif /* _@GUARD_PREFIX@_STDCKDINT_H */
+#endif /* _@GUARD_PREFIX@_STDCKDINT_H */
diff --git a/gl/stddef.in.h b/gl/stddef.in.h
index fa8998d9..e8c55ff1 100644
--- a/gl/stddef.in.h
+++ b/gl/stddef.in.h
@@ -1,6 +1,6 @@
 /* A substitute for POSIX 2008 <stddef.h>, for platforms that have issues.
 
-   Copyright (C) 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -27,13 +27,21 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined __need_wchar_t || defined __need_size_t  \
-  || defined __need_ptrdiff_t || defined __need_NULL \
-  || defined __need_wint_t
+#if (defined __need_wchar_t || defined __need_size_t                \
+     || defined __need_ptrdiff_t || defined __need_NULL             \
+     || defined __need_wint_t)                                      \
+    /* Avoid warning triggered by "gcc -std=gnu23 -Wsystem-headers" \
+       in GCC 13.3 and 14.2                                         \
+       <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114870>.  */   \
+    && !@STDDEF_NOT_IDEMPOTENT@
 /* Special invocation convention inside gcc header files.  In
-   particular, gcc provides a version of <stddef.h> that blindly
-   redefines NULL even when __need_wint_t was defined, even though
-   wint_t is not normally provided by <stddef.h>.  Hence, we must
+   particular, <stddef.h> in some ancient versions of GCC blindly
+   redefined NULL when __need_wint_t was defined, even though wint_t
+   is not normally provided by <stddef.h>.
+   (FIXME: It's not clear what GCC versions those were - perhaps so
+   ancient that we can stop worrying about this?)
+   Although glibc 2.26 (2017) and later do not use __need_wint_t,
+   for portability to macOS, Cygwin, Haiku, and older Glibc + GCC,
    remember if special invocation has ever been used to obtain wint_t,
    in which case we need to clean up NULL yet again.  */
 
@@ -52,6 +60,13 @@
 # endif
 
 #else
+/* For @STDDEF_NOT_IDEMPOTENT@.  */
+# undef __need_wchar_t
+# undef __need_size_t
+# undef __need_ptrdiff_t
+# undef __need_NULL
+# undef __need_wint_t
+
 /* Normal invocation convention.  */
 
 # ifndef _@GUARD_PREFIX@_STDDEF_H
@@ -74,6 +89,12 @@ typedef long max_align_t;
 #   endif
 #  endif
 
+#  if !defined _GCC_NULLPTR_T && !@NULLPTR_T_NEEDS_STDDEF@
+    /* Suppress unwanted nullptr_t typedef.  See
+       <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114869>.  */
+#   define _GCC_NULLPTR_T
+#  endif
+
 /* The include_next requires a split double-inclusion guard.  */
 
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
@@ -110,7 +131,7 @@ typedef long max_align_t;
  */
 #ifndef _GL_ATTRIBUTE_NOTHROW
 # if defined __cplusplus
-#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major__ >= 4
 #   if __cplusplus >= 201103L
 #    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
 #   else
@@ -128,11 +149,6 @@ typedef long max_align_t;
 # endif
 #endif
 
-/* Some platforms lack wchar_t.  */
-#if !@HAVE_WCHAR_T@
-# define wchar_t int
-#endif
-
 /* Some platforms lack max_align_t.  The check for _GCC_MAX_ALIGN_T is
    a hack in case the configure-time test was done with g++ even though
    we are currently compiling with gcc.
@@ -172,38 +188,57 @@ typedef union
 #endif
 
 /* ISO C 23 § 7.21.1 The unreachable macro  */
-#ifndef unreachable
+/* This macro is only usable in C, not in C++.
+   There is no way to define it as a macro in C++, because that would break code
+   that does
+       #include <utility>
+       ... std::unreachable() ...
+   Similarly, there is no way to define it as an inline function in C++, because
+   that would break code that does
+       #include <utility>
+       using std::unreachable;
+   As a workaround, we define a macro gl_unreachable, that is like unreachable,
+   but is usable in both C and C++.  */
 
 /* Code borrowed from verify.h.  */
-# ifndef _GL_HAS_BUILTIN_UNREACHABLE
-#  if defined __clang_major__ && __clang_major__ < 5
-#   define _GL_HAS_BUILTIN_UNREACHABLE 0
-#  elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__)
-#   define _GL_HAS_BUILTIN_UNREACHABLE 1
-#  elif defined __has_builtin
-#   define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable)
-#  else
-#   define _GL_HAS_BUILTIN_UNREACHABLE 0
-#  endif
+#ifndef _GL_HAS_BUILTIN_UNREACHABLE
+# if defined __clang_major__ && __clang_major__ < 5
+#  define _GL_HAS_BUILTIN_UNREACHABLE 0
+# elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__) && !defined __clang__
+#  define _GL_HAS_BUILTIN_UNREACHABLE 1
+# elif defined __has_builtin
+#  define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable)
+# else
+#  define _GL_HAS_BUILTIN_UNREACHABLE 0
 # endif
+#endif
 
-# if _GL_HAS_BUILTIN_UNREACHABLE
-#  define unreachable() __builtin_unreachable ()
-# elif 1200 <= _MSC_VER
-#  define unreachable() __assume (0)
-# else
+#if _GL_HAS_BUILTIN_UNREACHABLE
+# define gl_unreachable() __builtin_unreachable ()
+#elif 1200 <= _MSC_VER
+# define gl_unreachable() __assume (0)
+#elif !defined __cplusplus && @HAVE_C_UNREACHABLE@
+# define gl_unreachable() unreachable ()
+#else
 /* Declare abort(), without including <stdlib.h>.  */
 extern
-#  if defined __cplusplus
+# if defined __cplusplus
 "C"
-#  endif
+# endif
 _Noreturn
 void abort (void)
-#  if defined __cplusplus && (__GLIBC__ >= 2)
+# if defined __cplusplus && (__GLIBC__ >= 2)
 _GL_ATTRIBUTE_NOTHROW
-#  endif
+# endif
 ;
-#  define unreachable() abort ()
+# define gl_unreachable() abort ()
+#endif
+
+#if !defined __cplusplus && !@HAVE_C_UNREACHABLE@
+/* In C, define unreachable as a macro.  */
+
+# ifndef unreachable
+#  define unreachable() gl_unreachable ()
 # endif
 
 #endif
diff --git a/gl/stdint.in.h b/gl/stdint.in.h
index fea7483b..ca566b30 100644
--- a/gl/stdint.in.h
+++ b/gl/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2024 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2025 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -80,7 +80,7 @@
 #define _@GUARD_PREFIX@_STDINT_H
 
 /* Get SCHAR_MIN, SCHAR_MAX, UCHAR_MAX, INT_MIN, INT_MAX,
-   LONG_MIN, LONG_MAX, ULONG_MAX, _GL_INTEGER_WIDTH.  */
+   LONG_MIN, LONG_MAX, ULONG_MAX, CHAR_BIT, _GL_INTEGER_WIDTH.  */
 #include <limits.h>
 
 /* Override WINT_MIN and WINT_MAX if gnulib's <wchar.h> or <wctype.h> overrides
@@ -189,6 +189,10 @@ typedef __int64 gl_int64_t;
 #   define int64_t gl_int64_t
 #   define GL_INT64_T
 #  else
+/* Verify that 'long long' has exactly 64 bits.  */
+typedef _gl_verify_int64_bits[
+        _STDINT_MAX (1, sizeof (long long) * CHAR_BIT, 0ll) >> 31 >> 31 == 1
+        ? 1 : -1];
 #   undef int64_t
 typedef long long int gl_int64_t;
 #   define int64_t gl_int64_t
@@ -210,6 +214,11 @@ typedef unsigned __int64 gl_uint64_t;
 #   define uint64_t gl_uint64_t
 #   define GL_UINT64_T
 #  else
+/* Verify that 'unsigned long long' has exactly 64 bits.  */
+typedef _gl_verify_uint64_bits[
+        _STDINT_MAX (0, sizeof (unsigned long long) * CHAR_BIT, 0ull)
+        >> 31 >> 31 >> 1 == 1
+        ? 1 : -1];
 #   undef uint64_t
 typedef unsigned long long int gl_uint64_t;
 #   define uint64_t gl_uint64_t
diff --git a/gl/stdio-consolesafe.c b/gl/stdio-consolesafe.c
new file mode 100644
index 00000000..80561a6d
--- /dev/null
+++ b/gl/stdio-consolesafe.c
@@ -0,0 +1,199 @@
+/* msvcrt workarounds.
+   Copyright (C) 2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <stdio.h>
+
+#include <stdckdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* Outputs N bytes starting at S to FP.
+   These N bytes are known to be followed by a NUL.
+   Finally frees the string at S.
+   Returns the number of written bytes.  */
+static size_t
+workaround_fwrite0 (char *s, size_t n, FILE *fp)
+{
+  const char *ptr = s;
+  /* Use fputs instead of fwrite, which is buggy in msvcrt.  */
+  size_t written = 0;
+  while (n > 0)
+    {
+      size_t l = strlen (ptr); /* 0 <= l <= n */
+      if (l > 0)
+        {
+          if (fputs (ptr, fp) == EOF)
+            break;
+          written += l;
+          n -= l;
+        }
+      if (n == 0)
+        break;
+      if (fputc ('\0', fp) == EOF)
+        break;
+      written++;
+      n--;
+      ptr += l + 1;
+    }
+  free (s);
+  return written;
+}
+
+size_t
+gl_consolesafe_fwrite (const void *ptr, size_t size, size_t nmemb, FILE *fp)
+{
+  size_t nbytes;
+  if (ckd_mul (&nbytes, size, nmemb) || nbytes == 0)
+    /* Overflow, or nothing to do.  */
+    return 0;
+  char *tmp = malloc (nbytes + 1);
+  if (tmp == NULL)
+    return 0;
+  memcpy (tmp, ptr, nbytes);
+  tmp[nbytes] = '\0';
+  size_t written = workaround_fwrite0 (tmp, nbytes, fp);
+  return written / size;
+}
+
+#if defined __MINGW32__ && __USE_MINGW_ANSI_STDIO
+
+# include "fseterr.h"
+# include <stdarg.h>
+
+# if !HAVE_VASPRINTF
+
+#  include <errno.h>
+
+/* The old mingw (before mingw-w64) does not have the vasprintf function.
+   Define a suitable replacement here, that supports the same format
+   specifiers as the mingw *printf functions.  */
+
+static int
+vasprintf (char **resultp, const char *format, va_list args)
+{
+  /* First try: Use a stack-allocated buffer.  */
+  char buf[2048];
+  size_t bufsize = sizeof (buf);
+  int ret = __mingw_vsnprintf (buf, bufsize, format, args);
+  if (ret < 0)
+    return -1;
+  size_t nbytes = ret;
+  char *mem = (char *) malloc (nbytes + 1);
+  if (mem == NULL)
+    {
+      errno = ENOMEM;
+      return -1;
+    }
+  if (ret < bufsize)
+    {
+      /* The buffer was sufficiently large.  */
+      memcpy (mem, buf, nbytes + 1);
+    }
+  else
+    {
+      /* Second try: Use the heap-allocated memory.  */
+      ret = __mingw_vsnprintf (mem, nbytes + 1, format, args);
+      if (ret < 0)
+        {
+          int saved_errno = errno;
+          free (mem);
+          errno = saved_errno;
+          return -1;
+        }
+      if (ret != nbytes)
+        abort ();
+    }
+  *resultp = mem;
+  return nbytes;
+}
+
+# endif
+
+/* Bypass the functions __mingw_[v][f]printf, that trigger a bug in msvcrt,
+   but without losing the support for modern format specifiers added by
+   __mingw_*printf.  */
+
+int
+gl_consolesafe_fprintf (FILE *restrict fp, const char *restrict format, ...)
+{
+  va_list args;
+  char *tmpstring;
+  va_start (args, format);
+  int result = vasprintf (&tmpstring, format, args);
+  va_end (args);
+  if (result >= 0)
+    {
+      if (workaround_fwrite0 (tmpstring, result, fp) < result)
+        result = -1;
+    }
+  else
+    fseterr (fp);
+  return result;
+}
+
+int
+gl_consolesafe_printf (const char *restrict format, ...)
+{
+  va_list args;
+  char *tmpstring;
+  va_start (args, format);
+  int result = vasprintf (&tmpstring, format, args);
+  va_end (args);
+  if (result >= 0)
+    {
+      if (workaround_fwrite0 (tmpstring, result, stdout) < result)
+        result = -1;
+    }
+  else
+    fseterr (stdout);
+  return result;
+}
+
+int
+gl_consolesafe_vfprintf (FILE *restrict fp,
+                         const char *restrict format, va_list args)
+{
+  char *tmpstring;
+  int result = vasprintf (&tmpstring, format, args);
+  if (result >= 0)
+    {
+      if (workaround_fwrite0 (tmpstring, result, fp) < result)
+        result = -1;
+    }
+  else
+    fseterr (fp);
+  return result;
+}
+
+int
+gl_consolesafe_vprintf (const char *restrict format, va_list args)
+{
+  char *tmpstring;
+  int result = vasprintf (&tmpstring, format, args);
+  if (result >= 0)
+    {
+      if (workaround_fwrite0 (tmpstring, result, stdout) < result)
+        result = -1;
+    }
+  else
+    fseterr (stdout);
+  return result;
+}
+
+#endif
diff --git a/gl/stdio-impl.h b/gl/stdio-impl.h
index 63ebf7c6..e4a69a8d 100644
--- a/gl/stdio-impl.h
+++ b/gl/stdio-impl.h
@@ -1,5 +1,5 @@
 /* Implementation details of FILE streams.
-   Copyright (C) 2007-2008, 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008, 2010-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -30,6 +30,49 @@
 # endif
 #endif
 
+/* Haiku stdio implementation.  */
+#if defined __HAIKU__
+# include <stdint.h>
+/* This FILE structure was made into an incomplete type in 2025.
+   See <https://cgit.haiku-os.org/haiku/tree/src/system/libroot/posix/glibc/libio/libio.h>.  */
+#  define fp_ ((struct { int _flags; \
+                         char *_IO_read_ptr; \
+                         char *_IO_read_end; \
+                         char *_IO_read_base; \
+                         char *_IO_write_base; \
+                         char *_IO_write_ptr; \
+                         char *_IO_write_end; \
+                         char *_IO_buf_base; \
+                         char *_IO_buf_end; \
+                         char *_IO_save_base; \
+                         char *_IO_backup_base; \
+                         char *_IO_save_end; \
+                         void *_markers; \
+                         void *_chain; \
+                         int _fileno; \
+                         int _flags2; \
+                         off_t _old_offset; \
+                         unsigned short _cur_column; \
+                         signed char _vtable_offset; \
+                         char _shortbuf[1]; \
+                         void *_lock; \
+                         int64_t _offset; \
+                         /* More fields, not relevant here.  */ \
+                       } *) fp)
+# if !defined _IO_UNBUFFERED
+#  define _IO_UNBUFFERED 0x2
+# endif
+# if !defined _IO_EOF_SEEN
+#  define _IO_EOF_SEEN 0x10
+# endif
+# if !defined _IO_IN_BACKUP
+#  define _IO_IN_BACKUP 0x100
+# endif
+# if !defined _IO_LINE_BUF
+#  define _IO_LINE_BUF 0x200
+# endif
+#endif
+
 /* BSD stdio derived implementations.  */
 
 #if defined __NetBSD__                         /* NetBSD */
@@ -39,7 +82,7 @@
 
 #include <errno.h>                             /* For detecting Plan9.  */
 
-#if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+#if defined __sferror || defined __OpenBSD__ || defined __DragonFly__ || defined __ANDROID__
   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
 
 # if defined __DragonFly__          /* DragonFly */
@@ -65,13 +108,59 @@
 #  define _flags pub._flags
 #  define _r pub._r
 #  define _w pub._w
-# elif defined __ANDROID__ /* Android */
-#  ifdef __LP64__
+# elif defined __OpenBSD__          /* OpenBSD */
+#  if defined __sferror             /* OpenBSD <= 7.7 */
+#   define _gl_flags_file_t short
+#  else                             /* OpenBSD >= 7.8 */
+#   define _gl_flags_file_t int
+#  endif
+  /* Up to this commit from 2025-07-16
+     <https://github.com/openbsd/src/commit/b7f6c2eb760a2da367dd51d539ef06f5f3553790>
+     the innards of FILE were public.  After this commit, the innards of FILE
+     are hidden.  In this commit
+     <https://github.com/openbsd/src/commit/9063a2f1ec94013fb0e2c7ec851495108e788a6e>
+     they were reshuffled.  */
+#  if defined __sferror             /* OpenBSD <= 7.7 */
+#   define fp_ ((struct { unsigned char *_p; \
+                          int _r; \
+                          int _w; \
+                          _gl_flags_file_t _flags; \
+                          _gl_flags_file_t _file; \
+                          struct { unsigned char *_base; size_t _size; } _bf; \
+                          int _lbfsize; \
+                          void *_cookie; \
+                          void *_close; \
+                          void *_read; \
+                          void *_seek; \
+                          void *_write; \
+                          struct { unsigned char *_base; size_t _size; } _ext; \
+                          unsigned char *_up; \
+                          int _ur; \
+                          unsigned char _ubuf[3]; \
+                          unsigned char _nbuf[1]; \
+                          struct { unsigned char *_base; size_t _size; } _lb; \
+                          int _blksize; \
+                          fpos_t _offset; \
+                          /* More fields, not relevant here.  */ \
+                        } *) fp)
+#  else                             /* OpenBSD >= 7.8 */
+#   define fp_ ((struct { _gl_flags_file_t _flags; \
+                          _gl_flags_file_t _file; \
+                          unsigned char *_p; \
+                          int _r; \
+                          int _w; \
+                          struct { unsigned char *_base; size_t _size; } _bf; \
+                          int _lbfsize; \
+                          /* More fields, not relevant here.  */ \
+                        } *) fp)
+#  endif
+# elif defined __ANDROID__          /* Android */
+#  if defined __LP64__
 #   define _gl_flags_file_t int
 #  else
 #   define _gl_flags_file_t short
 #  endif
-#  ifdef __LP64__
+#  if defined __LP64__
 #   define _gl_file_offset_t int64_t
 #  else
     /* see https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md */
@@ -79,7 +168,7 @@
 #  endif
   /* Up to this commit from 2015-10-12
      <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769d52fa76631a64741297a>
-     the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
+     the innards of FILE were public,
      see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/fileext.h>
      and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a5631ddfdfa8d7ec8326ee3/libc/stdio/local.h>.
      After this commit, the innards of FILE are hidden.  */
@@ -109,9 +198,8 @@
 #  define fp_ fp
 # endif
 
-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
-  /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
-     and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
+# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __minix /* NetBSD >= 1.5ZA, Minix 3 */
+  /* See <https://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&content-type=text/x-cvsweb-markup>
      and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/lib/libc/stdio/fileext.h> */
   struct __sfileext
     {
@@ -119,7 +207,7 @@
       /* More fields, not relevant here.  */
     };
 #  define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
-# elif defined __ANDROID__                     /* Android */
+# elif defined __ANDROID__ || defined __OpenBSD__ /* Android, OpenBSD */
   struct __sfileext
     {
       struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
@@ -132,9 +220,11 @@
 
 # define HASUB(fp) (fp_ub._base != NULL)
 
-# if defined __ANDROID__ /* Android */
-  /* Needed after this commit from 2016-01-25
-     <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7> */
+# if defined __ANDROID__ || defined __OpenBSD__ /* Android, OpenBSD */
+  /* Needed after this Android commit from 2016-01-25
+     <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5078c99307e08a7280de7>
+     And after this OpenBSD commit from 2025-07-16
+     <https://github.com/openbsd/src/commit/b7f6c2eb760a2da367dd51d539ef06f5f3553790>.  */
 #  ifndef __SEOF
 #   define __SLBF 1
 #   define __SNBF 2
diff --git a/gl/stdio-read.c b/gl/stdio-read.c
index 253b8aa4..70452b48 100644
--- a/gl/stdio-read.c
+++ b/gl/stdio-read.c
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream read function.
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/stdio-write.c b/gl/stdio-write.c
index ca6aa00c..59ba8fc4 100644
--- a/gl/stdio-write.c
+++ b/gl/stdio-write.c
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream write function.
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
@@ -162,6 +162,9 @@ vprintf (const char *format, va_list args)
 int
 vfprintf (FILE *stream, const char *format, va_list args)
 #undef vfprintf
+#if defined __MINGW32__ && !defined _UCRT && __USE_MINGW_ANSI_STDIO
+# define vfprintf gl_consolesafe_vfprintf
+#endif
 {
   CALL_WITH_SIGPIPE_EMULATION (int, vfprintf (stream, format, args), ret == EOF)
 }
@@ -198,6 +201,9 @@ puts (const char *string)
 size_t
 fwrite (const void *ptr, size_t s, size_t n, FILE *stream)
 #undef fwrite
+#if (defined _WIN32 && !defined __CYGWIN__) && !defined _UCRT
+# define fwrite gl_consolesafe_fwrite
+#endif
 {
   CALL_WITH_SIGPIPE_EMULATION (size_t, fwrite (ptr, s, n, stream), ret < n)
 }
diff --git a/gl/stdio.in.h b/gl/stdio.in.h
index 35b9f748..bc454454 100644
--- a/gl/stdio.in.h
+++ b/gl/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,7 +20,7 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined __need_FILE || defined __need___FILE || defined _GL_ALREADY_INCLUDING_STDIO_H
+#if defined __need_FILE || defined __need___FILE || defined _@GUARD_PREFIX@_ALREADY_INCLUDING_STDIO_H || defined _GL_SKIP_GNULIB_STDIO_H
 /* Special invocation convention:
    - Inside glibc header files.
    - On OSF/1 5.1 we have a sequence of nested includes
@@ -48,12 +48,12 @@
 # endif
 #endif
 
-#define _GL_ALREADY_INCLUDING_STDIO_H
+#define _@GUARD_PREFIX@_ALREADY_INCLUDING_STDIO_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STDIO_H@
 
-#undef _GL_ALREADY_INCLUDING_STDIO_H
+#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_STDIO_H
 
 #ifdef _GL_DEFINED__POSIX_C_SOURCE
 # undef _GL_DEFINED__POSIX_C_SOURCE
@@ -64,8 +64,8 @@
 #define _@GUARD_PREFIX@_STDIO_H
 
 /* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_FORMAT,
-   _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_NOTHROW, GNULIB_POSIXCHECK,
-   HAVE_RAW_DECL_*.  */
+   _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_NODISCARD, _GL_ATTRIBUTE_NOTHROW,
+   GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
 #if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
@@ -77,7 +77,8 @@
 
 /* Get off_t and ssize_t.  Needed on many systems, including glibc 2.8
    and eglibc 2.11.2.
-   May also define off_t to a 64-bit type on native Windows.  */
+   May also define off_t to a 64-bit type on native Windows.
+   Also defines off64_t on macOS, NetBSD, OpenBSD, MSVC, Cygwin, Haiku.  */
 #include <sys/types.h>
 
 /* Solaris 10 and NetBSD 7.0 declare renameat in <unistd.h>, not in <stdio.h>.  */
@@ -119,7 +120,7 @@
    that can be freed by passing them as the Ith argument to the
    function F.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC
-# if __GNUC__ >= 11
+# if __GNUC__ >= 11 && !defined __clang__
 #  define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
 # else
 #  define _GL_ATTRIBUTE_DEALLOC(f, i)
@@ -154,7 +155,7 @@
  */
 #ifndef _GL_ATTRIBUTE_NOTHROW
 # if defined __cplusplus
-#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major__ >= 4
 #   if __cplusplus >= 201103L
 #    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
 #   else
@@ -177,7 +178,7 @@
    standardized by ISO C99 and POSIX.
    _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD  */
 /* __gnu_printf__ is supported in GCC >= 4.4.  */
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)
+#if (__GNUC__ + (__GNUC_MINOR__ >= 4) > 4) && !defined __clang__
 # define _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD __gnu_printf__
 #else
 # define _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD __printf__
@@ -279,18 +280,64 @@
 #endif
 
 
+#if (defined _WIN32 && !defined __CYGWIN__) && !defined _UCRT
+/* Workarounds against msvcrt bugs.  */
+_GL_FUNCDECL_SYS (gl_consolesafe_fwrite, size_t,
+                  (const void *ptr, size_t size, size_t nmemb, FILE *fp),
+                  _GL_ARG_NONNULL ((1, 4)));
+# if defined __MINGW32__
+_GL_FUNCDECL_SYS (gl_consolesafe_fprintf, int,
+                  (FILE *restrict fp, const char *restrict format, ...),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_FUNCDECL_SYS (gl_consolesafe_printf, int,
+                  (const char *restrict format, ...),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2)
+                  _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (gl_consolesafe_vfprintf, int,
+                  (FILE *restrict fp,
+                   const char *restrict format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_FUNCDECL_SYS (gl_consolesafe_vprintf, int,
+                  (const char *restrict format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 0)
+                  _GL_ARG_NONNULL ((1)));
+# endif
+#endif
+
+
+#if @GNULIB_DZPRINTF@
+/* Prints formatted output to file descriptor FD.
+   Returns the number of bytes written to the file descriptor.  Upon
+   failure, returns -1 with errno set.
+   Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure codes are ENOMEM
+   and the possible failure codes from write(), excluding EINTR.  */
+_GL_FUNCDECL_SYS (dzprintf, off64_t,
+                  (int fd, const char *restrict format, ...),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_SYS (dzprintf, off64_t,
+                  (int fd, const char *restrict format, ...));
+#endif
+
 #if @GNULIB_DPRINTF@
+/* Prints formatted output to file descriptor FD.
+   Returns the number of bytes written to the file descriptor.  Upon
+   failure, returns a negative value.  */
 # if @REPLACE_DPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dprintf rpl_dprintf
 #  endif
-_GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *restrict format, ...)
+_GL_FUNCDECL_RPL (dprintf, int, (int fd, const char *restrict format, ...),
                                 _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
                                 _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (dprintf, int, (int fd, const char *restrict format, ...));
 # else
 #  if !@HAVE_DPRINTF@
-_GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *restrict format, ...)
+_GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *restrict format, ...),
                                 _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
                                 _GL_ARG_NONNULL ((2)));
 #  endif
@@ -313,7 +360,7 @@ _GL_WARN_ON_USE (dprintf, "dprintf is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define fclose rpl_fclose
 #  endif
-_GL_FUNCDECL_RPL (fclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (fclose, int, (FILE *stream), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fclose, int, (FILE *stream));
 # else
 _GL_CXXALIAS_SYS (fclose, int, (FILE *stream));
@@ -360,9 +407,10 @@ _GL_CXXALIASWARN (fcloseall);
 #   define fdopen rpl_fdopen
 #  endif
 _GL_FUNCDECL_RPL (fdopen, FILE *,
-                  (int fd, const char *mode)
+                  (int fd, const char *mode),
                   _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
-                  _GL_ATTRIBUTE_MALLOC);
+                  _GL_ATTRIBUTE_MALLOC
+                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -371,36 +419,38 @@ _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode));
 #  endif
 _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode));
 # else
-#  if __GNUC__ >= 11
+#  if __GNUC__ >= 11 && !defined __clang__
 /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose.  */
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (fdopen, FILE *,
-                  (int fd, const char *mode)
-                  _GL_ATTRIBUTE_NOTHROW
+                  (int fd, const char *mode),
                   _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
-                  _GL_ATTRIBUTE_MALLOC);
+                  _GL_ATTRIBUTE_MALLOC
+                  _GL_ATTRIBUTE_NODISCARD)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (fdopen, FILE *,
-                  (int fd, const char *mode)
+                  (int fd, const char *mode),
                   _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
-                  _GL_ATTRIBUTE_MALLOC);
+                  _GL_ATTRIBUTE_MALLOC
+                  _GL_ATTRIBUTE_NODISCARD);
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode));
 # endif
 _GL_CXXALIASWARN (fdopen);
 #else
-# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fdopen
+# if @GNULIB_FCLOSE@ && (__GNUC__ >= 11 && !defined __clang__) && !defined fdopen
 /* For -Wmismatched-dealloc: Associate fdopen with fclose or rpl_fclose.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (fdopen, FILE *,
-                  (int fd, const char *mode)
-                  _GL_ATTRIBUTE_NOTHROW
+                  (int fd, const char *mode),
                   _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
-                  _GL_ATTRIBUTE_MALLOC);
+                  _GL_ATTRIBUTE_MALLOC)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (fdopen, FILE *,
-                  (int fd, const char *mode)
+                  (int fd, const char *mode),
                   _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
                   _GL_ATTRIBUTE_MALLOC);
 #  endif
@@ -438,7 +488,7 @@ _GL_CXXALIASWARN (fdopen);
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define fflush rpl_fflush
 #  endif
-_GL_FUNCDECL_RPL (fflush, int, (FILE *gl_stream));
+_GL_FUNCDECL_RPL (fflush, int, (FILE *gl_stream), );
 _GL_CXXALIAS_RPL (fflush, int, (FILE *gl_stream));
 # else
 _GL_CXXALIAS_SYS (fflush, int, (FILE *gl_stream));
@@ -459,7 +509,7 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
 #   undef fgetc
 #   define fgetc rpl_fgetc
 #  endif
-_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fgetc, int, (FILE *stream));
 # else
 _GL_CXXALIAS_SYS (fgetc, int, (FILE *stream));
@@ -476,8 +526,8 @@ _GL_CXXALIASWARN (fgetc);
 #   define fgets rpl_fgets
 #  endif
 _GL_FUNCDECL_RPL (fgets, char *,
-                  (char *restrict s, int n, FILE *restrict stream)
-                  _GL_ARG_NONNULL ((1, 3)));
+                  (char *restrict s, int n, FILE *restrict stream),
+                  _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (fgets, char *,
                   (char *restrict s, int n, FILE *restrict stream));
 # else
@@ -513,17 +563,18 @@ _GL_CXXALIASWARN (fileno);
 #   define fopen rpl_fopen
 #  endif
 _GL_FUNCDECL_RPL (fopen, FILE *,
-                  (const char *restrict filename, const char *restrict mode)
+                  (const char *restrict filename, const char *restrict mode),
                   _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
-                  _GL_ATTRIBUTE_MALLOC);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (fopen, FILE *,
                   (const char *restrict filename, const char *restrict mode));
 # else
-#  if __GNUC__ >= 11
+#  if __GNUC__ >= 11 && !defined __clang__
 /* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose.  */
 _GL_FUNCDECL_SYS (fopen, FILE *,
-                  (const char *restrict filename, const char *restrict mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  (const char *restrict filename, const char *restrict mode),
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (fopen, FILE *,
                   (const char *restrict filename, const char *restrict mode));
@@ -532,10 +583,10 @@ _GL_CXXALIAS_SYS (fopen, FILE *,
 _GL_CXXALIASWARN (fopen);
 # endif
 #else
-# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined fopen
+# if @GNULIB_FCLOSE@ && (__GNUC__ >= 11 && !defined __clang__) && !defined fopen
 /* For -Wmismatched-dealloc: Associate fopen with fclose or rpl_fclose.  */
 _GL_FUNCDECL_SYS (fopen, FILE *,
-                  (const char *restrict filename, const char *restrict mode)
+                  (const char *restrict filename, const char *restrict mode),
                   _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
 # endif
 # if defined GNULIB_POSIXCHECK
@@ -546,7 +597,26 @@ _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX complian
 # endif
 #endif
 
+#if @GNULIB_FZPRINTF@
+/* Prints formatted output to stream FP.
+   Returns the number of bytes written to the stream.  Upon failure,
+   returns -1 with the stream's error indicator set.
+   Failure cause EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure causes are ENOMEM
+   and the possible failure causes from fwrite().  */
+_GL_FUNCDECL_SYS (fzprintf, off64_t,
+                  (FILE *restrict fp, const char *restrict format, ...),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_SYS (fzprintf, off64_t,
+                  (FILE *restrict fp, const char *restrict format, ...));
+#endif
+
 #if @GNULIB_FPRINTF_POSIX@ || @GNULIB_FPRINTF@
+/* Prints formatted output to stream FP.
+   Returns the number of bytes written to the stream.  Upon failure,
+   returns a negative value with the stream's error indicator set.  */
 # if (@GNULIB_FPRINTF_POSIX@ && @REPLACE_FPRINTF@) \
      || (@GNULIB_FPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -555,12 +625,12 @@ _GL_WARN_ON_USE (fopen, "fopen on native Windows platforms is not POSIX complian
 #  define GNULIB_overrides_fprintf 1
 #  if @GNULIB_FPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
 _GL_FUNCDECL_RPL (fprintf, int,
-                  (FILE *restrict fp, const char *restrict format, ...)
+                  (FILE *restrict fp, const char *restrict format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
                   _GL_ARG_NONNULL ((1, 2)));
 #  else
 _GL_FUNCDECL_RPL (fprintf, int,
-                  (FILE *restrict fp, const char *restrict format, ...)
+                  (FILE *restrict fp, const char *restrict format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 3)
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
@@ -573,6 +643,11 @@ _GL_CXXALIAS_SYS (fprintf, int,
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (fprintf);
 # endif
+#elif defined __MINGW32__ && !defined _UCRT && __USE_MINGW_ANSI_STDIO
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef fprintf
+#  define fprintf gl_consolesafe_fprintf
+# endif
 #endif
 #if !@GNULIB_FPRINTF_POSIX@ && defined GNULIB_POSIXCHECK
 # if !GNULIB_overrides_fprintf
@@ -595,15 +670,17 @@ _GL_WARN_ON_USE (fprintf, "fprintf is not always POSIX compliant - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define fpurge rpl_fpurge
 #  endif
-_GL_FUNCDECL_RPL (fpurge, int, (FILE *gl_stream) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fpurge, int, (FILE *gl_stream));
 # else
 #  if !@HAVE_DECL_FPURGE@
-_GL_FUNCDECL_SYS (fpurge, int, (FILE *gl_stream) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (fpurge, int, (FILE *gl_stream), _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (fpurge, int, (FILE *gl_stream));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (fpurge);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef fpurge
 # if HAVE_RAW_DECL_FPURGE
@@ -618,7 +695,7 @@ _GL_WARN_ON_USE (fpurge, "fpurge is not always present - "
 #   undef fputc
 #   define fputc rpl_fputc
 #  endif
-_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (fputc, int, (int c, FILE *stream));
 # else
 _GL_CXXALIAS_SYS (fputc, int, (int c, FILE *stream));
@@ -635,7 +712,7 @@ _GL_CXXALIASWARN (fputc);
 #   define fputs rpl_fputs
 #  endif
 _GL_FUNCDECL_RPL (fputs, int,
-                  (const char *restrict string, FILE *restrict stream)
+                  (const char *restrict string, FILE *restrict stream),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (fputs, int,
                   (const char *restrict string, FILE *restrict stream));
@@ -656,8 +733,8 @@ _GL_CXXALIASWARN (fputs);
 #  endif
 _GL_FUNCDECL_RPL (fread, size_t,
                   (void *restrict ptr, size_t s, size_t n,
-                   FILE *restrict stream)
-                  _GL_ARG_NONNULL ((4)));
+                   FILE *restrict stream),
+                  _GL_ARG_NONNULL ((4)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (fread, size_t,
                   (void *restrict ptr, size_t s, size_t n,
                    FILE *restrict stream));
@@ -679,8 +756,8 @@ _GL_CXXALIASWARN (fread);
 #  endif
 _GL_FUNCDECL_RPL (freopen, FILE *,
                   (const char *restrict filename, const char *restrict mode,
-                   FILE *restrict stream)
-                  _GL_ARG_NONNULL ((2, 3)));
+                   FILE *restrict stream),
+                  _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (freopen, FILE *,
                   (const char *restrict filename, const char *restrict mode,
                    FILE *restrict stream));
@@ -707,9 +784,9 @@ _GL_WARN_ON_USE (freopen,
 #   define fscanf rpl_fscanf
 #  endif
 _GL_FUNCDECL_RPL (fscanf, int,
-                  (FILE *restrict stream, const char *restrict format, ...)
+                  (FILE *restrict stream, const char *restrict format, ...),
                   _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 3)
-                  _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (fscanf, int,
                   (FILE *restrict stream, const char *restrict format, ...));
 # else
@@ -763,7 +840,7 @@ _GL_CXXALIASWARN (fscanf);
 #   undef fseek
 #   define fseek rpl_fseek
 #  endif
-_GL_FUNCDECL_RPL (fseek, int, (FILE *fp, long offset, int whence)
+_GL_FUNCDECL_RPL (fseek, int, (FILE *fp, long offset, int whence),
                               _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fseek, int, (FILE *fp, long offset, int whence));
 # else
@@ -786,12 +863,12 @@ _GL_CXXALIASWARN (fseek);
 #   undef fseeko
 #   define fseeko rpl_fseeko
 #  endif
-_GL_FUNCDECL_RPL (fseeko, int, (FILE *fp, off_t offset, int whence)
+_GL_FUNCDECL_RPL (fseeko, int, (FILE *fp, off_t offset, int whence),
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (fseeko, int, (FILE *fp, off_t offset, int whence));
 # else
 #  if ! @HAVE_DECL_FSEEKO@
-_GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence)
+_GL_FUNCDECL_SYS (fseeko, int, (FILE *fp, off_t offset, int whence),
                                _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (fseeko, int, (FILE *fp, off_t offset, int whence));
@@ -829,7 +906,8 @@ _GL_WARN_ON_USE (fseek, "fseek cannot handle files larger than 4 GB "
 #   undef ftell
 #   define ftell rpl_ftell
 #  endif
-_GL_FUNCDECL_RPL (ftell, long, (FILE *fp) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (ftell, long, (FILE *fp),
+                               _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (ftell, long, (FILE *fp));
 # else
 _GL_CXXALIAS_SYS (ftell, long, (FILE *fp));
@@ -849,11 +927,13 @@ _GL_CXXALIASWARN (ftell);
 #   undef ftello
 #   define ftello rpl_ftello
 #  endif
-_GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (ftello, off_t, (FILE *fp),
+                                 _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (ftello, off_t, (FILE *fp));
 # else
 #  if ! @HAVE_DECL_FTELLO@
-_GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (ftello, off_t, (FILE *fp),
+                                 _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (ftello, off_t, (FILE *fp));
 # endif
@@ -886,7 +966,7 @@ _GL_WARN_ON_USE (ftell, "ftell cannot handle files larger than 4 GB "
 #  endif
 _GL_FUNCDECL_RPL (fwrite, size_t,
                   (const void *restrict ptr, size_t s, size_t n,
-                   FILE *restrict stream)
+                   FILE *restrict stream),
                   _GL_ARG_NONNULL ((1, 4)));
 _GL_CXXALIAS_RPL (fwrite, size_t,
                   (const void *restrict ptr, size_t s, size_t n,
@@ -901,9 +981,9 @@ _GL_CXXALIAS_SYS (fwrite, size_t,
    which sometimes causes an unwanted diagnostic for fwrite calls.
    This affects only function declaration attributes under certain
    versions of gcc and clang, and is not needed for C++.  */
-#  if (0 < __USE_FORTIFY_LEVEL                                          \
+#  if (0 < __USE_FORTIFY_LEVEL                                            \
        && __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \
-       && 3 < __GNUC__ + (4 <= __GNUC_MINOR__)                          \
+       && (3 < __GNUC__ + (4 <= __GNUC_MINOR__) || defined __clang__)     \
        && !defined __cplusplus)
 #   undef fwrite
 #   undef fwrite_unlocked
@@ -922,6 +1002,11 @@ _GL_EXTERN_C size_t __REDIRECT (rpl_fwrite_unlocked,
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (fwrite);
 # endif
+#elif (defined _WIN32 && !defined __CYGWIN__) && !defined _UCRT
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef fwrite
+#  define fwrite gl_consolesafe_fwrite
+# endif
 #endif
 
 #if @GNULIB_GETC@
@@ -930,7 +1015,7 @@ _GL_CXXALIASWARN (fwrite);
 #   undef getc
 #   define getc rpl_fgetc
 #  endif
-_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (fgetc, int, (FILE *stream), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL_1 (getc, rpl_fgetc, int, (FILE *stream));
 # else
 _GL_CXXALIAS_SYS (getc, int, (FILE *stream));
@@ -946,7 +1031,7 @@ _GL_CXXALIASWARN (getc);
 #   undef getchar
 #   define getchar rpl_getchar
 #  endif
-_GL_FUNCDECL_RPL (getchar, int, (void));
+_GL_FUNCDECL_RPL (getchar, int, (void), );
 _GL_CXXALIAS_RPL (getchar, int, (void));
 # else
 _GL_CXXALIAS_SYS (getchar, int, (void));
@@ -971,8 +1056,8 @@ _GL_CXXALIASWARN (getchar);
 _GL_FUNCDECL_RPL (getdelim, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
                    int delimiter,
-                   FILE *restrict stream)
-                  _GL_ARG_NONNULL ((1, 2, 4)));
+                   FILE *restrict stream),
+                  _GL_ARG_NONNULL ((1, 2, 4)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (getdelim, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
                    int delimiter,
@@ -982,8 +1067,8 @@ _GL_CXXALIAS_RPL (getdelim, ssize_t,
 _GL_FUNCDECL_SYS (getdelim, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
                    int delimiter,
-                   FILE *restrict stream)
-                  _GL_ARG_NONNULL ((1, 2, 4)));
+                   FILE *restrict stream),
+                  _GL_ARG_NONNULL ((1, 2, 4)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (getdelim, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
@@ -1015,8 +1100,8 @@ _GL_WARN_ON_USE (getdelim, "getdelim is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (getline, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
-                   FILE *restrict stream)
-                  _GL_ARG_NONNULL ((1, 2, 3)));
+                   FILE *restrict stream),
+                  _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (getline, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
                    FILE *restrict stream));
@@ -1024,8 +1109,8 @@ _GL_CXXALIAS_RPL (getline, ssize_t,
 #  if !@HAVE_DECL_GETLINE@
 _GL_FUNCDECL_SYS (getline, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
-                   FILE *restrict stream)
-                  _GL_ARG_NONNULL ((1, 2, 3)));
+                   FILE *restrict stream),
+                  _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (getline, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
@@ -1064,7 +1149,7 @@ _GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream));
 #  if @HAVE_DECL_GETW@
 #   if defined __APPLE__ && defined __MACH__
 /* The presence of the declaration depends on _POSIX_C_SOURCE.  */
-_GL_FUNCDECL_SYS (getw, int, (FILE *restrict stream));
+_GL_FUNCDECL_SYS (getw, int, (FILE *restrict stream), );
 #   endif
 _GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream));
 #  endif
@@ -1074,19 +1159,45 @@ _GL_CXXALIASWARN (getw);
 # endif
 #endif
 
+#if @GNULIB_OBSTACK_ZPRINTF@
+struct obstack;
+/* Grows an obstack with formatted output.  Returns the number of
+   bytes added to OBS.  No trailing nul byte is added, and the
+   object should be closed with obstack_finish before use.
+   Upon memory allocation error, calls obstack_alloc_failed_handler.
+   Upon other error, returns -1 with errno set.
+
+   Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure code is through
+   obstack_alloc_failed_handler.  */
+_GL_FUNCDECL_SYS (obstack_zprintf, ptrdiff_t,
+                  (struct obstack *obs, const char *format, ...),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_SYS (obstack_zprintf, ptrdiff_t,
+                  (struct obstack *obs, const char *format, ...));
+_GL_FUNCDECL_SYS (obstack_vzprintf, ptrdiff_t,
+                  (struct obstack *obs, const char *format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_SYS (obstack_vzprintf, ptrdiff_t,
+                  (struct obstack *obs, const char *format, va_list args));
+#endif
+
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
 struct obstack;
-/* Grow an obstack with formatted output.  Return the number of
+/* Grows an obstack with formatted output.  Returns the number of
    bytes added to OBS.  No trailing nul byte is added, and the
-   object should be closed with obstack_finish before use.  Upon
-   memory allocation error, call obstack_alloc_failed_handler.  Upon
-   other error, return -1.  */
+   object should be closed with obstack_finish before use.
+   Upon memory allocation error, calls obstack_alloc_failed_handler.
+   Upon other error, returns -1.  */
 # if @REPLACE_OBSTACK_PRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define obstack_printf rpl_obstack_printf
 #  endif
 _GL_FUNCDECL_RPL (obstack_printf, int,
-                  (struct obstack *obs, const char *format, ...)
+                  (struct obstack *obs, const char *format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (obstack_printf, int,
@@ -1094,7 +1205,7 @@ _GL_CXXALIAS_RPL (obstack_printf, int,
 # else
 #  if !@HAVE_DECL_OBSTACK_PRINTF@
 _GL_FUNCDECL_SYS (obstack_printf, int,
-                  (struct obstack *obs, const char *format, ...)
+                  (struct obstack *obs, const char *format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
@@ -1107,7 +1218,7 @@ _GL_CXXALIASWARN (obstack_printf);
 #   define obstack_vprintf rpl_obstack_vprintf
 #  endif
 _GL_FUNCDECL_RPL (obstack_vprintf, int,
-                  (struct obstack *obs, const char *format, va_list args)
+                  (struct obstack *obs, const char *format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (obstack_vprintf, int,
@@ -1115,7 +1226,7 @@ _GL_CXXALIAS_RPL (obstack_vprintf, int,
 # else
 #  if !@HAVE_DECL_OBSTACK_PRINTF@
 _GL_FUNCDECL_SYS (obstack_vprintf, int,
-                  (struct obstack *obs, const char *format, va_list args)
+                  (struct obstack *obs, const char *format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
@@ -1127,7 +1238,7 @@ _GL_CXXALIASWARN (obstack_vprintf);
 
 #if @GNULIB_PCLOSE@
 # if !@HAVE_PCLOSE@
-_GL_FUNCDECL_SYS (pclose, int, (FILE *stream) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (pclose, int, (FILE *stream), _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (pclose, int, (FILE *stream));
 _GL_CXXALIASWARN (pclose);
@@ -1147,7 +1258,7 @@ _GL_WARN_ON_USE (pclose, "pclose is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define perror rpl_perror
 #  endif
-_GL_FUNCDECL_RPL (perror, void, (const char *string));
+_GL_FUNCDECL_RPL (perror, void, (const char *string), );
 _GL_CXXALIAS_RPL (perror, void, (const char *string));
 # else
 _GL_CXXALIAS_SYS (perror, void, (const char *string));
@@ -1169,25 +1280,26 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - "
 #   define popen rpl_popen
 #  endif
 _GL_FUNCDECL_RPL (popen, FILE *,
-                  (const char *cmd, const char *mode)
+                  (const char *cmd, const char *mode),
                   _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
-                  _GL_ATTRIBUTE_MALLOC);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode));
 # else
-#  if !@HAVE_POPEN@ || __GNUC__ >= 11
+#  if !@HAVE_POPEN@ || (__GNUC__ >= 11 && !defined __clang__)
 _GL_FUNCDECL_SYS (popen, FILE *,
-                  (const char *cmd, const char *mode)
+                  (const char *cmd, const char *mode),
                   _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
-                  _GL_ATTRIBUTE_MALLOC);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode));
 # endif
 _GL_CXXALIASWARN (popen);
 #else
-# if @GNULIB_PCLOSE@ && __GNUC__ >= 11 && !defined popen
+# if @GNULIB_PCLOSE@ \
+     && (__GNUC__ >= 11 && !defined __clang__) && !defined popen
 /* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose.  */
 _GL_FUNCDECL_SYS (popen, FILE *,
-                  (const char *cmd, const char *mode)
+                  (const char *cmd, const char *mode),
                   _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
                   _GL_ATTRIBUTE_MALLOC);
 # endif
@@ -1200,7 +1312,24 @@ _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - "
 # endif
 #endif
 
+#if @GNULIB_ZPRINTF@
+/* Prints formatted output to standard output.
+   Returns the number of bytes written to standard output.  Upon failure,
+   returns -1 with stdout's error indicator set.
+   Failure cause EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure causes are ENOMEM
+   and the possible failure causes from fwrite().  */
+_GL_FUNCDECL_SYS (zprintf, off64_t, (const char *restrict format, ...),
+                                    _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2)
+                                    _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_SYS (zprintf, off64_t, (const char *restrict format, ...));
+#endif
+
 #if @GNULIB_PRINTF_POSIX@ || @GNULIB_PRINTF@
+/* Prints formatted output to standard output.
+   Returns the number of bytes written to standard output.  Upon failure,
+   returns a negative value with stdout's error indicator set.  */
 # if (@GNULIB_PRINTF_POSIX@ && @REPLACE_PRINTF@) \
      || (@GNULIB_PRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
 #  if defined __GNUC__ || defined __clang__
@@ -1212,14 +1341,14 @@ _GL_WARN_ON_USE (popen, "popen is buggy on some platforms - "
 _GL_FUNCDECL_RPL_1 (__printf__, int,
                     (const char *restrict format, ...)
                     __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
+                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)),
                     _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2)
                     _GL_ARG_NONNULL ((1)));
 #   else
 _GL_FUNCDECL_RPL_1 (__printf__, int,
                     (const char *restrict format, ...)
                     __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf))
+                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_printf)),
                     _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 2)
                     _GL_ARG_NONNULL ((1)));
 #   endif
@@ -1229,7 +1358,7 @@ _GL_CXXALIAS_RPL_1 (printf, __printf__, int, (const char *format, ...));
 #    define printf rpl_printf
 #   endif
 _GL_FUNCDECL_RPL (printf, int,
-                  (const char *restrict format, ...)
+                  (const char *restrict format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 2)
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (printf, int, (const char *restrict format, ...));
@@ -1241,6 +1370,11 @@ _GL_CXXALIAS_SYS (printf, int, (const char *restrict format, ...));
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (printf);
 # endif
+#elif defined __MINGW32__ && !defined _UCRT && __USE_MINGW_ANSI_STDIO
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef printf
+#  define printf gl_consolesafe_printf
+# endif
 #endif
 #if !@GNULIB_PRINTF_POSIX@ && defined GNULIB_POSIXCHECK
 # if !GNULIB_overrides_printf
@@ -1258,7 +1392,7 @@ _GL_WARN_ON_USE (printf, "printf is not always POSIX compliant - "
 #   undef putc
 #   define putc rpl_fputc
 #  endif
-_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_RPL (fputc, int, (int c, FILE *stream), _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL_1 (putc, rpl_fputc, int, (int c, FILE *stream));
 # else
 _GL_CXXALIAS_SYS (putc, int, (int c, FILE *stream));
@@ -1274,7 +1408,7 @@ _GL_CXXALIASWARN (putc);
 #   undef putchar
 #   define putchar rpl_putchar
 #  endif
-_GL_FUNCDECL_RPL (putchar, int, (int c));
+_GL_FUNCDECL_RPL (putchar, int, (int c), );
 _GL_CXXALIAS_RPL (putchar, int, (int c));
 # else
 _GL_CXXALIAS_SYS (putchar, int, (int c));
@@ -1290,7 +1424,7 @@ _GL_CXXALIASWARN (putchar);
 #   undef puts
 #   define puts rpl_puts
 #  endif
-_GL_FUNCDECL_RPL (puts, int, (const char *string) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (puts, int, (const char *string), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (puts, int, (const char *string));
 # else
 _GL_CXXALIAS_SYS (puts, int, (const char *string));
@@ -1314,7 +1448,7 @@ _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream));
 #  if @HAVE_DECL_PUTW@
 #   if defined __APPLE__ && defined __MACH__
 /* The presence of the declaration depends on _POSIX_C_SOURCE.  */
-_GL_FUNCDECL_SYS (putw, int, (int w, FILE *restrict stream));
+_GL_FUNCDECL_SYS (putw, int, (int w, FILE *restrict stream), );
 #   endif
 _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream));
 #  endif
@@ -1330,7 +1464,7 @@ _GL_CXXALIASWARN (putw);
 #   undef remove
 #   define remove rpl_remove
 #  endif
-_GL_FUNCDECL_RPL (remove, int, (const char *name) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (remove, int, (const char *name), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (remove, int, (const char *name));
 # else
 _GL_CXXALIAS_SYS (remove, int, (const char *name));
@@ -1352,7 +1486,7 @@ _GL_WARN_ON_USE (remove, "remove cannot handle directories on some platforms - "
 #   define rename rpl_rename
 #  endif
 _GL_FUNCDECL_RPL (rename, int,
-                  (const char *old_filename, const char *new_filename)
+                  (const char *old_filename, const char *new_filename),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (rename, int,
                   (const char *old_filename, const char *new_filename));
@@ -1377,14 +1511,14 @@ _GL_WARN_ON_USE (rename, "rename is buggy on some platforms - "
 #   define renameat rpl_renameat
 #  endif
 _GL_FUNCDECL_RPL (renameat, int,
-                  (int fd1, char const *file1, int fd2, char const *file2)
+                  (int fd1, char const *file1, int fd2, char const *file2),
                   _GL_ARG_NONNULL ((2, 4)));
 _GL_CXXALIAS_RPL (renameat, int,
                   (int fd1, char const *file1, int fd2, char const *file2));
 # else
 #  if !@HAVE_RENAMEAT@
 _GL_FUNCDECL_SYS (renameat, int,
-                  (int fd1, char const *file1, int fd2, char const *file2)
+                  (int fd1, char const *file1, int fd2, char const *file2),
                   _GL_ARG_NONNULL ((2, 4)));
 #  endif
 _GL_CXXALIAS_SYS (renameat, int,
@@ -1410,18 +1544,18 @@ _GL_WARN_ON_USE (renameat, "renameat is not portable - "
 _GL_FUNCDECL_RPL_1 (__scanf__, int,
                     (const char *restrict format, ...)
                     __asm__ (@ASM_SYMBOL_PREFIX@
-                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf))
+                             _GL_STDIO_MACROEXPAND_AND_STRINGIZE(rpl_scanf)),
                     _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
-                    _GL_ARG_NONNULL ((1)));
+                    _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL_1 (scanf, __scanf__, int, (const char *restrict format, ...));
 #  else
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    undef scanf
 #    define scanf rpl_scanf
 #   endif
-_GL_FUNCDECL_RPL (scanf, int, (const char *restrict format, ...)
+_GL_FUNCDECL_RPL (scanf, int, (const char *restrict format, ...),
                               _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 2)
-                              _GL_ARG_NONNULL ((1)));
+                              _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (scanf, int, (const char *restrict format, ...));
 #  endif
 # else
@@ -1432,7 +1566,31 @@ _GL_CXXALIASWARN (scanf);
 # endif
 #endif
 
+#if @GNULIB_SNZPRINTF@
+/* Prints formatted output to string STR.  Similar to sprintf, but the
+   additional parameter SIZE limits how much is written into STR.
+   STR may be NULL, in which case nothing will be written.
+   Returns the string length of the formatted string (which may be larger
+   than SIZE).  Upon failure, returns -1 with errno set.
+   Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure code is ENOMEM.  */
+_GL_FUNCDECL_SYS (snzprintf, ptrdiff_t,
+                  (char *restrict str, size_t size,
+                   const char *restrict format, ...),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4)
+                  _GL_ARG_NONNULL ((3)));
+_GL_CXXALIAS_SYS (snzprintf, ptrdiff_t,
+                  (char *restrict str, size_t size,
+                   const char *restrict format, ...));
+#endif
+
 #if @GNULIB_SNPRINTF@
+/* Prints formatted output to string STR.  Similar to sprintf, but the
+   additional parameter SIZE limits how much is written into STR.
+   STR may be NULL, in which case nothing will be written.
+   Returns the string length of the formatted string (which may be larger
+   than SIZE).  Upon failure, returns a negative value.  */
 # if @REPLACE_SNPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define snprintf rpl_snprintf
@@ -1440,7 +1598,7 @@ _GL_CXXALIASWARN (scanf);
 #  define GNULIB_overrides_snprintf 1
 _GL_FUNCDECL_RPL (snprintf, int,
                   (char *restrict str, size_t size,
-                   const char *restrict format, ...)
+                   const char *restrict format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4)
                   _GL_ARG_NONNULL ((3)));
 _GL_CXXALIAS_RPL (snprintf, int,
@@ -1450,7 +1608,7 @@ _GL_CXXALIAS_RPL (snprintf, int,
 #  if !@HAVE_DECL_SNPRINTF@
 _GL_FUNCDECL_SYS (snprintf, int,
                   (char *restrict str, size_t size,
-                   const char *restrict format, ...)
+                   const char *restrict format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 4)
                   _GL_ARG_NONNULL ((3)));
 #  endif
@@ -1469,6 +1627,23 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
 # endif
 #endif
 
+#if @GNULIB_SZPRINTF@
+/* Prints formatted output to string STR.
+   Returns the string length of the formatted string.  Upon failure,
+   returns -1 with errno set.
+   Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure code is ENOMEM.  */
+_GL_FUNCDECL_SYS (szprintf, ptrdiff_t,
+                  (char *restrict str,
+                   const char *restrict format, ...),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_SYS (szprintf, ptrdiff_t,
+                  (char *restrict str,
+                   const char *restrict format, ...));
+#endif
+
 /* Some people would argue that all sprintf uses should be warned about
    (for example, OpenBSD issues a link warning for it),
    since it can cause security holes due to buffer overruns.
@@ -1479,13 +1654,16 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - "
    GNULIB_POSIXCHECK is defined.  */
 
 #if @GNULIB_SPRINTF_POSIX@
+/* Prints formatted output to string STR.
+   Returns the string length of the formatted string.  Upon failure,
+   returns a negative value.  */
 # if @REPLACE_SPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define sprintf rpl_sprintf
 #  endif
 #  define GNULIB_overrides_sprintf 1
 _GL_FUNCDECL_RPL (sprintf, int,
-                  (char *restrict str, const char *restrict format, ...)
+                  (char *restrict str, const char *restrict format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (sprintf, int,
@@ -1526,16 +1704,18 @@ _GL_CXXALIASWARN (tempnam);
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define tmpfile rpl_tmpfile
 #  endif
-_GL_FUNCDECL_RPL (tmpfile, FILE *, (void)
+_GL_FUNCDECL_RPL (tmpfile, FILE *, (void),
                                    _GL_ATTRIBUTE_DEALLOC (fclose, 1)
-                                   _GL_ATTRIBUTE_MALLOC);
+                                   _GL_ATTRIBUTE_MALLOC
+                                   _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (tmpfile, FILE *, (void));
 # else
-#  if __GNUC__ >= 11
+#  if __GNUC__ >= 11 && !defined __clang__
 /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose.  */
-_GL_FUNCDECL_SYS (tmpfile, FILE *, (void)
+_GL_FUNCDECL_SYS (tmpfile, FILE *, (void),
                                    _GL_ATTRIBUTE_DEALLOC (fclose, 1)
-                                   _GL_ATTRIBUTE_MALLOC);
+                                   _GL_ATTRIBUTE_MALLOC
+                                   _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (tmpfile, FILE *, (void));
 # endif
@@ -1543,9 +1723,10 @@ _GL_CXXALIAS_SYS (tmpfile, FILE *, (void));
 _GL_CXXALIASWARN (tmpfile);
 # endif
 #else
-# if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile
+# if @GNULIB_FCLOSE@ \
+     && (__GNUC__ >= 11 && !defined __clang__) && !defined tmpfile
 /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose.  */
-_GL_FUNCDECL_SYS (tmpfile, FILE *, (void)
+_GL_FUNCDECL_SYS (tmpfile, FILE *, (void),
                                    _GL_ATTRIBUTE_DEALLOC (fclose, 1)
                                    _GL_ATTRIBUTE_MALLOC);
 # endif
@@ -1558,6 +1739,31 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - "
 # endif
 #endif
 
+#if @GNULIB_VASZPRINTF@
+/* Prints formatted output to a string dynamically allocated with malloc().
+   If the memory allocation succeeds, it stores the address of the string in
+   *RESULT and returns the number of resulting bytes, excluding the trailing
+   NUL.  Upon memory allocation error, or some other error, it returns -1
+   with errno set.
+   Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure code is ENOMEM.  */
+_GL_FUNCDECL_SYS (aszprintf, ptrdiff_t,
+                  (char **result, const char *format, ...),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
+                  _GL_ARG_NONNULL ((1, 2))
+                  _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_SYS (aszprintf, ptrdiff_t,
+                  (char **result, const char *format, ...));
+_GL_FUNCDECL_SYS (vaszprintf, ptrdiff_t,
+                  (char **result, const char *format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
+                  _GL_ARG_NONNULL ((1, 2))
+                  _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_SYS (vaszprintf, ptrdiff_t,
+                  (char **result, const char *format, va_list args));
+#endif
+
 #if @GNULIB_VASPRINTF@
 /* Write formatted output to a string dynamically allocated with malloc().
    If the memory allocation succeeds, store the address of the string in
@@ -1569,17 +1775,19 @@ _GL_WARN_ON_USE (tmpfile, "tmpfile is not usable on mingw - "
 #  endif
 #  define GNULIB_overrides_asprintf
 _GL_FUNCDECL_RPL (asprintf, int,
-                  (char **result, const char *format, ...)
+                  (char **result, const char *format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
-                  _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ARG_NONNULL ((1, 2))
+                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (asprintf, int,
                   (char **result, const char *format, ...));
 # else
 #  if !@HAVE_VASPRINTF@
 _GL_FUNCDECL_SYS (asprintf, int,
-                  (char **result, const char *format, ...)
+                  (char **result, const char *format, ...),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 3)
-                  _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ARG_NONNULL ((1, 2))
+                  _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (asprintf, int,
                   (char **result, const char *format, ...));
@@ -1591,17 +1799,19 @@ _GL_CXXALIASWARN (asprintf);
 #  endif
 #  define GNULIB_overrides_vasprintf 1
 _GL_FUNCDECL_RPL (vasprintf, int,
-                  (char **result, const char *format, va_list args)
+                  (char **result, const char *format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
-                  _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ARG_NONNULL ((1, 2))
+                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (vasprintf, int,
                   (char **result, const char *format, va_list args));
 # else
 #  if !@HAVE_VASPRINTF@
 _GL_FUNCDECL_SYS (vasprintf, int,
-                  (char **result, const char *format, va_list args)
+                  (char **result, const char *format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
-                  _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ARG_NONNULL ((1, 2))
+                  _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (vasprintf, int,
                   (char **result, const char *format, va_list args));
@@ -1609,13 +1819,32 @@ _GL_CXXALIAS_SYS (vasprintf, int,
 _GL_CXXALIASWARN (vasprintf);
 #endif
 
+#if @GNULIB_VDZPRINTF@
+/* Prints formatted output to file descriptor FD.
+   Returns the number of bytes written to the file descriptor.  Upon
+   failure, returns -1 with errno set.
+   Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure codes are ENOMEM
+   and the possible failure codes from write(), excluding EINTR.  */
+_GL_FUNCDECL_SYS (vdzprintf, off64_t,
+                  (int fd, const char *restrict format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_SYS (vdzprintf, off64_t,
+                  (int fd, const char *restrict format, va_list args));
+#endif
+
 #if @GNULIB_VDPRINTF@
+/* Prints formatted output to file descriptor FD.
+   Returns the number of bytes written to the file descriptor.  Upon
+   failure, returns a negative value.  */
 # if @REPLACE_VDPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vdprintf rpl_vdprintf
 #  endif
 _GL_FUNCDECL_RPL (vdprintf, int,
-                  (int fd, const char *restrict format, va_list args)
+                  (int fd, const char *restrict format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (vdprintf, int,
@@ -1623,7 +1852,7 @@ _GL_CXXALIAS_RPL (vdprintf, int,
 # else
 #  if !@HAVE_VDPRINTF@
 _GL_FUNCDECL_SYS (vdprintf, int,
-                  (int fd, const char *restrict format, va_list args)
+                  (int fd, const char *restrict format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
                   _GL_ARG_NONNULL ((2)));
 #  endif
@@ -1643,7 +1872,28 @@ _GL_WARN_ON_USE (vdprintf, "vdprintf is unportable - "
 # endif
 #endif
 
+#if @GNULIB_VFZPRINTF@
+/* Prints formatted output to stream FP.
+   Returns the number of bytes written to the stream.  Upon failure,
+   returns -1 with the stream's error indicator set.
+   Failure cause EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure causes are ENOMEM
+   and the possible failure causes from fwrite().  */
+_GL_FUNCDECL_SYS (vfzprintf, off64_t,
+                  (FILE *restrict fp,
+                   const char *restrict format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_SYS (vfzprintf, off64_t,
+                  (FILE *restrict fp,
+                   const char *restrict format, va_list args));
+#endif
+
 #if @GNULIB_VFPRINTF_POSIX@ || @GNULIB_VFPRINTF@
+/* Prints formatted output to stream FP.
+   Returns the number of bytes written to the stream.  Upon failure,
+   returns a negative value with the stream's error indicator set.  */
 # if (@GNULIB_VFPRINTF_POSIX@ && @REPLACE_VFPRINTF@) \
      || (@GNULIB_VFPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1653,13 +1903,13 @@ _GL_WARN_ON_USE (vdprintf, "vdprintf is unportable - "
 #  if @GNULIB_VFPRINTF_POSIX@
 _GL_FUNCDECL_RPL (vfprintf, int,
                   (FILE *restrict fp,
-                   const char *restrict format, va_list args)
+                   const char *restrict format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
                   _GL_ARG_NONNULL ((1, 2)));
 #  else
 _GL_FUNCDECL_RPL (vfprintf, int,
                   (FILE *restrict fp,
-                   const char *restrict format, va_list args)
+                   const char *restrict format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (2, 0)
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
@@ -1677,6 +1927,11 @@ _GL_CXXALIAS_SYS_CAST (vfprintf, int,
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (vfprintf);
 # endif
+#elif defined __MINGW32__ && !defined _UCRT && __USE_MINGW_ANSI_STDIO
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef vfprintf
+#  define vfprintf gl_consolesafe_vfprintf
+# endif
 #endif
 #if !@GNULIB_VFPRINTF_POSIX@ && defined GNULIB_POSIXCHECK
 # if !GNULIB_overrides_vfprintf
@@ -1696,9 +1951,9 @@ _GL_WARN_ON_USE (vfprintf, "vfprintf is not always POSIX compliant - "
 #  endif
 _GL_FUNCDECL_RPL (vfscanf, int,
                   (FILE *restrict stream,
-                   const char *restrict format, va_list args)
+                   const char *restrict format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (2, 0)
-                  _GL_ARG_NONNULL ((1, 2)));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (vfscanf, int,
                   (FILE *restrict stream,
                    const char *restrict format, va_list args));
@@ -1712,7 +1967,26 @@ _GL_CXXALIASWARN (vfscanf);
 # endif
 #endif
 
+#if @GNULIB_VZPRINTF@
+/* Prints formatted output to standard output.
+   Returns the number of bytes written to standard output.  Upon failure,
+   returns -1 with stdout's error indicator set.
+   Failure cause EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure causes are ENOMEM
+   and the possible failure causes from fwrite().  */
+_GL_FUNCDECL_SYS (vzprintf, off64_t,
+                  (const char *restrict format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 0)
+                  _GL_ARG_NONNULL ((1)));
+_GL_CXXALIAS_SYS (vzprintf, off64_t,
+                  (const char *restrict format, va_list args));
+#endif
+
 #if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VPRINTF@
+/* Prints formatted output to standard output.
+   Returns the number of bytes written to standard output.  Upon failure,
+   returns a negative value with stdout's error indicator set.  */
 # if (@GNULIB_VPRINTF_POSIX@ && @REPLACE_VPRINTF@) \
      || (@GNULIB_VPRINTF@ && @REPLACE_STDIO_WRITE_FUNCS@ && (@GNULIB_STDIO_H_NONBLOCKING@ || @GNULIB_STDIO_H_SIGPIPE@))
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1720,11 +1994,11 @@ _GL_CXXALIASWARN (vfscanf);
 #  endif
 #  define GNULIB_overrides_vprintf 1
 #  if @GNULIB_VPRINTF_POSIX@ || @GNULIB_VFPRINTF_POSIX@
-_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args)
+_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args),
                                 _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (1, 0)
                                 _GL_ARG_NONNULL ((1)));
 #  else
-_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args)
+_GL_FUNCDECL_RPL (vprintf, int, (const char *restrict format, va_list args),
                                 _GL_ATTRIBUTE_FORMAT_PRINTF_SYSTEM (1, 0)
                                 _GL_ARG_NONNULL ((1)));
 #  endif
@@ -1739,6 +2013,11 @@ _GL_CXXALIAS_SYS_CAST (vprintf, int,
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (vprintf);
 # endif
+#elif defined __MINGW32__ && !defined _UCRT && __USE_MINGW_ANSI_STDIO
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef vprintf
+#  define vprintf gl_consolesafe_vprintf
+# endif
 #endif
 #if !@GNULIB_VPRINTF_POSIX@ && defined GNULIB_POSIXCHECK
 # if !GNULIB_overrides_vprintf
@@ -1756,9 +2035,9 @@ _GL_WARN_ON_USE (vprintf, "vprintf is not always POSIX compliant - "
 #   undef vscanf
 #   define vscanf rpl_vscanf
 #  endif
-_GL_FUNCDECL_RPL (vscanf, int, (const char *restrict format, va_list args)
+_GL_FUNCDECL_RPL (vscanf, int, (const char *restrict format, va_list args),
                                _GL_ATTRIBUTE_FORMAT_SCANF_SYSTEM (1, 0)
-                               _GL_ARG_NONNULL ((1)));
+                               _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (vscanf, int, (const char *restrict format, va_list args));
 # else
 _GL_CXXALIAS_SYS (vscanf, int, (const char *restrict format, va_list args));
@@ -1768,7 +2047,31 @@ _GL_CXXALIASWARN (vscanf);
 # endif
 #endif
 
+#if @GNULIB_VSNZPRINTF@
+/* Prints formatted output to string STR.  Similar to sprintf, but the
+   additional parameter SIZE limits how much is written into STR.
+   STR may be NULL, in which case nothing will be written.
+   Returns the string length of the formatted string (which may be larger
+   than SIZE).  Upon failure, returns -1 with errno set.
+   Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure code is ENOMEM.  */
+_GL_FUNCDECL_SYS (vsnzprintf, ptrdiff_t,
+                  (char *restrict str, size_t size,
+                   const char *restrict format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0)
+                  _GL_ARG_NONNULL ((3)));
+_GL_CXXALIAS_SYS (vsnzprintf, ptrdiff_t,
+                  (char *restrict str, size_t size,
+                   const char *restrict format, va_list args));
+#endif
+
 #if @GNULIB_VSNPRINTF@
+/* Prints formatted output to string STR.  Similar to vsprintf, but the
+   additional parameter SIZE limits how much is written into STR.
+   STR may be NULL, in which case nothing will be written.
+   Returns the string length of the formatted string (which may be larger
+   than SIZE).  Upon failure, returns a negative value.  */
 # if @REPLACE_VSNPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vsnprintf rpl_vsnprintf
@@ -1776,7 +2079,7 @@ _GL_CXXALIASWARN (vscanf);
 #  define GNULIB_overrides_vsnprintf 1
 _GL_FUNCDECL_RPL (vsnprintf, int,
                   (char *restrict str, size_t size,
-                   const char *restrict format, va_list args)
+                   const char *restrict format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0)
                   _GL_ARG_NONNULL ((3)));
 _GL_CXXALIAS_RPL (vsnprintf, int,
@@ -1786,7 +2089,7 @@ _GL_CXXALIAS_RPL (vsnprintf, int,
 #  if !@HAVE_DECL_VSNPRINTF@
 _GL_FUNCDECL_SYS (vsnprintf, int,
                   (char *restrict str, size_t size,
-                   const char *restrict format, va_list args)
+                   const char *restrict format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (3, 0)
                   _GL_ARG_NONNULL ((3)));
 #  endif
@@ -1805,7 +2108,27 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - "
 # endif
 #endif
 
+#if @GNULIB_VSZPRINTF@
+/* Prints formatted output to string STR.
+   Returns the string length of the formatted string.  Upon failure,
+   returns -1 with errno set.
+   Failure code EOVERFLOW can only occur when a width > INT_MAX is used.
+   Therefore, if the format string is valid and does not use %ls/%lc
+   directives nor widths, the only possible failure code is ENOMEM.  */
+_GL_FUNCDECL_SYS (vszprintf, ptrdiff_t,
+                  (char *restrict str,
+                   const char *restrict format, va_list args),
+                  _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_SYS (vszprintf, ptrdiff_t,
+                  (char *restrict str,
+                   const char *restrict format, va_list args));
+#endif
+
 #if @GNULIB_VSPRINTF_POSIX@
+/* Prints formatted output to string STR.
+   Returns the string length of the formatted string.  Upon failure,
+   returns a negative value.  */
 # if @REPLACE_VSPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define vsprintf rpl_vsprintf
@@ -1813,7 +2136,7 @@ _GL_WARN_ON_USE (vsnprintf, "vsnprintf is unportable - "
 #  define GNULIB_overrides_vsprintf 1
 _GL_FUNCDECL_RPL (vsprintf, int,
                   (char *restrict str,
-                   const char *restrict format, va_list args)
+                   const char *restrict format, va_list args),
                   _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD (2, 0)
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (vsprintf, int,
diff --git a/gl/stdlib.c b/gl/stdlib.c
new file mode 100644
index 00000000..6a06f5ba
--- /dev/null
+++ b/gl/stdlib.c
@@ -0,0 +1,21 @@
+/* Inline functions for <stdlib.h>.
+
+   Copyright (C) 2024-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define _GL_STDLIB_INLINE _GL_EXTERN_INLINE
+#include <config.h>
+
+#include <stdlib.h>
diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
index e74e7c18..1342db48 100644
--- a/gl/stdlib.in.h
+++ b/gl/stdlib.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdlib.h>.
 
-   Copyright (C) 1995, 2001-2004, 2006-2024 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,12 +20,27 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined __need_system_stdlib_h || defined __need_malloc_and_calloc
+#if ((defined __need_system_stdlib_h && !defined _GLIBCXX_STDLIB_H) \
+     || defined __need_malloc_and_calloc) \
+    && !defined __SUNPRO_CC
 /* Special invocation conventions inside some gnulib header files,
-   and inside some glibc header files, respectively.  */
+   and inside some glibc header files, respectively.
+   Do not recognize this special invocation convention when GCC's
+   c++/11/stdlib.h is being included or has been included. This is needed
+   to support the use of clang+llvm binaries on Ubuntu 22.04 with
+   CXX="$clangdir/bin/clang++ -I/usr/include/c++/11 \
+                              -I/usr/include/x86_64-linux-gnu/c++/11
+                              -L/usr/lib/gcc/x86_64-linux-gnu/11
+                              -Wl,-rpath,$clangdir/lib"
+   because in this case /usr/include/c++/11/stdlib.h (which does not support
+   the convention) is seen before the gnulib-generated stdlib.h.  */
 
 #@INCLUDE_NEXT@ @NEXT_STDLIB_H@
 
+/* Make sure that the macros that indicate the special invocation convention
+   get undefined.  This is needed at least on CentOS 7.  */
+#undef __need_malloc_and_calloc
+
 #else
 /* Normal invocation convention.  */
 
@@ -38,8 +53,8 @@
 #define _@GUARD_PREFIX@_STDLIB_H
 
 /* This file uses _Noreturn, _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC,
-   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
-   HAVE_RAW_DECL_*.  */
+   _GL_ATTRIBUTE_NODISCARD, _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE,
+   _GL_INLINE_HEADER_BEGIN, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
 #if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
@@ -47,8 +62,9 @@
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
-/* MirBSD 10 defines WEXITSTATUS in <sys/wait.h>, not in <stdlib.h>.  */
-#if @GNULIB_SYSTEM_POSIX@ && !defined WEXITSTATUS
+/* MirBSD 10 defines WEXITSTATUS in <sys/wait.h>, not in <stdlib.h>.
+   glibc 2.41 defines WCOREDUMP in <sys/wait.h>, not in <stdlib.h>.  */
+#if @GNULIB_SYSTEM_POSIX@ && !(defined WEXITSTATUS && defined WCOREDUMP)
 # include <sys/wait.h>
 #endif
 
@@ -104,11 +120,30 @@ struct random_data
 # include <unistd.h>
 #endif
 
+#if ((@GNULIB_STRTOL@ && @REPLACE_STRTOL@) || (@GNULIB_STRTOLL@ && @REPLACE_STRTOLL@) || (@GNULIB_STRTOUL@ && @REPLACE_STRTOUL@) || (@GNULIB_STRTOULL@ && @REPLACE_STRTOULL@)) && defined __cplusplus && !defined GNULIB_NAMESPACE && defined __GNUG__ && !defined __clang__ && (defined __sun || defined _AIX)
+/* When strtol, strtoll, strtoul, or strtoull is going to be defined as a macro
+   below, this may cause compilation errors later in the libstdc++ header files
+   (that are part of GCC), such as:
+     error: 'rpl_strtol' is not a member of 'std'
+   To avoid this, include the relevant header files here, before these symbols
+   get defined as macros.  But do so only on Solaris 11 and AIX (where it is
+   needed), not on mingw (where it would cause other compilation errors).  */
+# include <string>
+#endif
+
+_GL_INLINE_HEADER_BEGIN
+#ifndef _GL_STDLIB_INLINE
+# define _GL_STDLIB_INLINE _GL_INLINE
+#endif
+#ifndef _GL_REALLOC_INLINE
+# define _GL_REALLOC_INLINE _GL_INLINE
+#endif
+
 /* _GL_ATTRIBUTE_DEALLOC (F, I) declares that the function returns pointers
    that can be freed by passing them as the Ith argument to the
    function F.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC
-# if __GNUC__ >= 11
+# if __GNUC__ >= 11 && !defined __clang__
 #  define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
 # else
 #  define _GL_ATTRIBUTE_DEALLOC(f, i)
@@ -133,11 +168,23 @@ struct random_data
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NONNULL_IF_NONZERO (NP, NI) declares that the argument NP
+   (a pointer) must not be NULL if the argument NI (an integer) is != 0.  */
+/* Applies to: functions.  */
+#ifndef _GL_ATTRIBUTE_NONNULL_IF_NONZERO
+# if __GNUC__ >= 15 && !defined __clang__
+#  define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni) \
+     __attribute__ ((__nonnull_if_nonzero__ (np, ni)))
+# else
+#  define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni)
+# endif
+#endif
+
 /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
  */
 #ifndef _GL_ATTRIBUTE_NOTHROW
 # if defined __cplusplus
-#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major__ >= 4
 #   if __cplusplus >= 201103L
 #    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
 #   else
@@ -188,6 +235,18 @@ struct random_data
 #endif
 
 
+/* Declarations for ISO C N3322.  */
+#if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+_GL_EXTERN_C void *bsearch (const void *__key,
+                            const void *__base, size_t __nmemb, size_t __size,
+                            int (*__compare) (const void *, const void *))
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3) _GL_ARG_NONNULL ((5));
+_GL_EXTERN_C void qsort (void *__base, size_t __nmemb, size_t __size,
+                         int (*__compare) (const void *, const void *))
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2) _GL_ARG_NONNULL ((4));
+#endif
+
+
 #if @GNULIB__EXIT@
 /* Terminate the current process with the given return code, without running
    the 'atexit' handlers.  */
@@ -196,11 +255,11 @@ struct random_data
 #   undef _Exit
 #   define _Exit rpl__Exit
 #  endif
-_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status));
+_GL_FUNCDECL_RPL (_Exit, _Noreturn void, (int status), );
 _GL_CXXALIAS_RPL (_Exit, void, (int status));
 # else
 #  if !@HAVE__EXIT@
-_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status));
+_GL_FUNCDECL_SYS (_Exit, _Noreturn void, (int status), );
 #  endif
 _GL_CXXALIAS_SYS (_Exit, void, (int status));
 # endif
@@ -216,6 +275,26 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
 #endif
 
 
+#if @GNULIB_ABORT_DEBUG@
+/* Terminates the current process with signal SIGABRT.
+   Note: While the original abort() function is safe to call in signal handlers,
+   the overridden abort() function is not.  */
+# if @REPLACE_ABORT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef abort
+#   define abort rpl_abort
+#  endif
+_GL_FUNCDECL_RPL (abort, _Noreturn void, (void), );
+_GL_CXXALIAS_RPL (abort, void, (void));
+# else
+_GL_CXXALIAS_SYS (abort, void, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (abort);
+# endif
+#endif
+
+
 #if @GNULIB_FREE_POSIX@
 # if @REPLACE_FREE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -223,9 +302,9 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - "
 #   define free rpl_free
 #  endif
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_FUNCDECL_RPL (free, void, (void *ptr) _GL_ATTRIBUTE_NOTHROW);
+_GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW;
 #  else
-_GL_FUNCDECL_RPL (free, void, (void *ptr));
+_GL_FUNCDECL_RPL (free, void, (void *ptr), );
 #  endif
 _GL_CXXALIAS_RPL (free, void, (void *ptr));
 # else
@@ -237,8 +316,8 @@ _GL_CXXALIASWARN (free);
 #elif defined GNULIB_POSIXCHECK
 # undef free
 /* Assume free is always declared.  */
-_GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - "
-                 "use gnulib module free for portability");
+_GL_WARN_ON_USE (free, "free is not POSIX:2024 compliant everywhere - "
+                 "use gnulib module free-posix for portability");
 #endif
 
 
@@ -250,22 +329,25 @@ _GL_WARN_ON_USE (free, "free is not future POSIX compliant everywhere - "
 #   define aligned_alloc rpl_aligned_alloc
 #  endif
 _GL_FUNCDECL_RPL (aligned_alloc, void *,
-                  (size_t alignment, size_t size)
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t alignment, size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size));
 # else
 #  if @HAVE_ALIGNED_ALLOC@
-#   if __GNUC__ >= 11
+#   if __GNUC__ >= 11 && !defined __clang__
 /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free.  */
 #    if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
-                  (size_t alignment, size_t size)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t alignment, size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD)
+                  _GL_ATTRIBUTE_NOTHROW;
 #    else
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
-                  (size_t alignment, size_t size)
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t alignment, size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD);
 #    endif
 #   endif
 _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size));
@@ -275,16 +357,17 @@ _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size));
 _GL_CXXALIASWARN (aligned_alloc);
 # endif
 #else
-# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined aligned_alloc
+# if @GNULIB_FREE_POSIX@ \
+     && (__GNUC__ >= 11 && !defined __clang__) && !defined aligned_alloc
 /* For -Wmismatched-dealloc: Associate aligned_alloc with free or rpl_free.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
-                  (size_t alignment, size_t size)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t alignment, size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
-                  (size_t alignment, size_t size)
+                  (size_t alignment, size_t size),
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #  endif
 # endif
@@ -301,9 +384,10 @@ _GL_WARN_ON_USE (aligned_alloc, "aligned_alloc is not portable - "
 /* Parse a signed decimal integer.
    Returns the value of the integer.  Errors are not detected.  */
 # if !@HAVE_ATOLL@
-_GL_FUNCDECL_SYS (atoll, long long, (const char *string)
-                                    _GL_ATTRIBUTE_PURE
-                                    _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (atoll, long long,
+                  (const char *string),
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 # endif
 _GL_CXXALIAS_SYS (atoll, long long, (const char *string));
 _GL_CXXALIASWARN (atoll);
@@ -316,28 +400,32 @@ _GL_WARN_ON_USE (atoll, "atoll is unportable - "
 #endif
 
 #if @GNULIB_CALLOC_POSIX@
-# if (@GNULIB_CALLOC_POSIX@ && @REPLACE_CALLOC_FOR_CALLOC_POSIX@) \
+# if @REPLACE_CALLOC_FOR_CALLOC_POSIX@ \
      || (@GNULIB_CALLOC_GNU@ && @REPLACE_CALLOC_FOR_CALLOC_GNU@)
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
+        || _GL_USE_STDLIB_ALLOC)
 #   undef calloc
 #   define calloc rpl_calloc
 #  endif
 _GL_FUNCDECL_RPL (calloc, void *,
-                  (size_t nmemb, size_t size)
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t nmemb, size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size));
 # else
-#  if __GNUC__ >= 11
+#  if __GNUC__ >= 11 && !defined __clang__
 /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free.  */
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (calloc, void *,
-                  (size_t nmemb, size_t size)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t nmemb, size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (calloc, void *,
-                  (size_t nmemb, size_t size)
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t nmemb, size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD);
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size));
@@ -346,16 +434,17 @@ _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size));
 _GL_CXXALIASWARN (calloc);
 # endif
 #else
-# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined calloc
+# if @GNULIB_FREE_POSIX@ \
+     && (__GNUC__ >= 11 && !defined __clang__) && !defined calloc
 /* For -Wmismatched-dealloc: Associate calloc with free or rpl_free.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (calloc, void *,
-                  (size_t nmemb, size_t size)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t nmemb, size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (calloc, void *,
-                  (size_t nmemb, size_t size)
+                  (size_t nmemb, size_t size),
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #  endif
 # endif
@@ -373,23 +462,26 @@ _GL_WARN_ON_USE (calloc, "calloc is not POSIX compliant everywhere - "
 #   define canonicalize_file_name rpl_canonicalize_file_name
 #  endif
 _GL_FUNCDECL_RPL (canonicalize_file_name, char *,
-                  (const char *name)
+                  (const char *name),
                   _GL_ARG_NONNULL ((1))
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name));
 # else
-#  if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11
+#  if !@HAVE_CANONICALIZE_FILE_NAME@ || (__GNUC__ >= 11 && !defined __clang__)
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
-                  (const char *name)
-                  _GL_ATTRIBUTE_NOTHROW
+                  (const char *name),
                   _GL_ARG_NONNULL ((1))
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
-                  (const char *name)
+                  (const char *name),
                   _GL_ARG_NONNULL ((1))
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD);
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name));
@@ -400,18 +492,19 @@ _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name));
 # endif
 _GL_CXXALIASWARN (canonicalize_file_name);
 #else
-# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined canonicalize_file_name
+# if @GNULIB_FREE_POSIX@ \
+     && (__GNUC__ >= 11 && !defined __clang__) && !defined canonicalize_file_name
 /* For -Wmismatched-dealloc: Associate canonicalize_file_name with free or
    rpl_free.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
-                  (const char *name)
-                  _GL_ATTRIBUTE_NOTHROW
+                  (const char *name),
                   _GL_ARG_NONNULL ((1))
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
-                  (const char *name)
+                  (const char *name),
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #  endif
@@ -503,12 +596,12 @@ _GL_CXXALIASWARN (gcvt);
 #   undef getloadavg
 #   define getloadavg rpl_getloadavg
 #  endif
-_GL_FUNCDECL_RPL (getloadavg, int, (double loadavg[], int nelem)
+_GL_FUNCDECL_RPL (getloadavg, int, (double loadavg[], int nelem),
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (getloadavg, int, (double loadavg[], int nelem));
 # else
 #  if !@HAVE_DECL_GETLOADAVG@
-_GL_FUNCDECL_SYS (getloadavg, int, (double loadavg[], int nelem)
+_GL_FUNCDECL_SYS (getloadavg, int, (double loadavg[], int nelem),
                                    _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem));
@@ -533,17 +626,17 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - "
 #   define getprogname rpl_getprogname
 #  endif
 #  if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
-_GL_FUNCDECL_RPL (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE);
 #  else
-_GL_FUNCDECL_RPL (getprogname, const char *, (void));
+_GL_FUNCDECL_RPL (getprogname, const char *, (void), );
 #  endif
 _GL_CXXALIAS_RPL (getprogname, const char *, (void));
 # else
 #  if !@HAVE_GETPROGNAME@
 #   if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
-_GL_FUNCDECL_SYS (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (getprogname, const char *, (void), _GL_ATTRIBUTE_PURE);
 #   else
-_GL_FUNCDECL_SYS (getprogname, const char *, (void));
+_GL_FUNCDECL_SYS (getprogname, const char *, (void), );
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (getprogname, const char *, (void));
@@ -577,15 +670,15 @@ _GL_WARN_ON_USE (getprogname, "getprogname is unportable - "
 #   define getsubopt rpl_getsubopt
 #  endif
 _GL_FUNCDECL_RPL (getsubopt, int,
-                  (char **optionp, char *const *tokens, char **valuep)
-                  _GL_ARG_NONNULL ((1, 2, 3)));
+                  (char **optionp, char *const *tokens, char **valuep),
+                  _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (getsubopt, int,
                   (char **optionp, char *const *tokens, char **valuep));
 # else
 #  if !@HAVE_GETSUBOPT@
 _GL_FUNCDECL_SYS (getsubopt, int,
-                  (char **optionp, char *const *tokens, char **valuep)
-                  _GL_ARG_NONNULL ((1, 2, 3)));
+                  (char **optionp, char *const *tokens, char **valuep),
+                  _GL_ARG_NONNULL ((1, 2, 3)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (getsubopt, int,
                   (char **optionp, char *const *tokens, char **valuep));
@@ -605,7 +698,7 @@ _GL_WARN_ON_USE (getsubopt, "getsubopt is unportable - "
 /* Change the ownership and access permission of the slave side of the
    pseudo-terminal whose master side is specified by FD.  */
 # if !@HAVE_GRANTPT@
-_GL_FUNCDECL_SYS (grantpt, int, (int fd));
+_GL_FUNCDECL_SYS (grantpt, int, (int fd), );
 # endif
 _GL_CXXALIAS_SYS (grantpt, int, (int fd));
 _GL_CXXALIASWARN (grantpt);
@@ -622,7 +715,7 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - "
    by never specifying a zero size), so it does not need malloc or
    realloc to be redefined.  */
 #if @GNULIB_MALLOC_POSIX@
-# if (@GNULIB_MALLOC_POSIX@ && @REPLACE_MALLOC_FOR_MALLOC_POSIX@) \
+# if @REPLACE_MALLOC_FOR_MALLOC_POSIX@ \
      || (@GNULIB_MALLOC_GNU@ && @REPLACE_MALLOC_FOR_MALLOC_GNU@)
 #  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
         || _GL_USE_STDLIB_ALLOC)
@@ -630,21 +723,24 @@ _GL_WARN_ON_USE (grantpt, "grantpt is not portable - "
 #   define malloc rpl_malloc
 #  endif
 _GL_FUNCDECL_RPL (malloc, void *,
-                  (size_t size)
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (malloc, void *, (size_t size));
 # else
-#  if __GNUC__ >= 11
+#  if __GNUC__ >= 11 && !defined __clang__
 /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free.  */
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (malloc, void *,
-                  (size_t size)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (malloc, void *,
-                  (size_t size)
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE
+                  _GL_ATTRIBUTE_NODISCARD);
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
@@ -653,16 +749,17 @@ _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
 _GL_CXXALIASWARN (malloc);
 # endif
 #else
-# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined malloc
+# if @GNULIB_FREE_POSIX@ \
+     && (__GNUC__ >= 11 && !defined __clang__) && !defined malloc
 /* For -Wmismatched-dealloc: Associate malloc with free or rpl_free.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (malloc, void *,
-                  (size_t size)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (size_t size),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (malloc, void *,
-                  (size_t size)
+                  (size_t size),
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #  endif
 # endif
@@ -674,14 +771,20 @@ _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
 # endif
 #endif
 
-/* Return maximum number of bytes of a multibyte character.  */
+/* Return maximum number of bytes in a multibyte character in the
+   current locale.  */
 #if @REPLACE_MB_CUR_MAX@
 # if !GNULIB_defined_MB_CUR_MAX
-static inline
-int gl_MB_CUR_MAX (void)
+_GL_STDLIB_INLINE size_t
+gl_MB_CUR_MAX (void)
 {
+#  if 0 < @REPLACE_MB_CUR_MAX@
+  return @REPLACE_MB_CUR_MAX@;
+#  else
   /* Turn the value 3 to the value 4, as needed for the UTF-8 encoding.  */
-  return MB_CUR_MAX + (MB_CUR_MAX == 3);
+  int gl_mb_cur_max = MB_CUR_MAX;
+  return gl_mb_cur_max == 3 ? 4 : gl_mb_cur_max;
+#  endif
 }
 #  undef MB_CUR_MAX
 #  define MB_CUR_MAX gl_MB_CUR_MAX ()
@@ -698,7 +801,7 @@ int gl_MB_CUR_MAX (void)
 #  endif
 _GL_FUNCDECL_RPL (mbstowcs, size_t,
                   (wchar_t *restrict dest, const char *restrict src,
-                   size_t len)
+                   size_t len),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (mbstowcs, size_t,
                   (wchar_t *restrict dest, const char *restrict src,
@@ -727,13 +830,13 @@ _GL_WARN_ON_USE (mbstowcs, "mbstowcs is unportable - "
 #   define mbtowc rpl_mbtowc
 #  endif
 _GL_FUNCDECL_RPL (mbtowc, int,
-                  (wchar_t *restrict pwc, const char *restrict s, size_t n));
+                  (wchar_t *restrict pwc, const char *restrict s, size_t n), );
 _GL_CXXALIAS_RPL (mbtowc, int,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n));
 # else
 #  if !@HAVE_MBTOWC@
 _GL_FUNCDECL_SYS (mbtowc, int,
-                  (wchar_t *restrict pwc, const char *restrict s, size_t n));
+                  (wchar_t *restrict pwc, const char *restrict s, size_t n), );
 #  endif
 _GL_CXXALIAS_SYS (mbtowc, int,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n));
@@ -756,7 +859,9 @@ _GL_WARN_ON_USE (mbtowc, "mbtowc is not portable - "
    Returns TEMPLATE, or a null pointer if it cannot get a unique name.
    The directory is created mode 700.  */
 # if !@HAVE_MKDTEMP@
-_GL_FUNCDECL_SYS (mkdtemp, char *, (char * /*template*/) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (mkdtemp, char *,
+                  (char * /*template*/),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 # endif
 _GL_CXXALIAS_SYS (mkdtemp, char *, (char * /*template*/));
 _GL_CXXALIASWARN (mkdtemp);
@@ -786,13 +891,13 @@ _GL_WARN_ON_USE (mkdtemp, "mkdtemp is unportable - "
 #   undef mkostemp
 #   define mkostemp rpl_mkostemp
 #  endif
-_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/)
-                                 _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/),
+                                 _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (mkostemp, int, (char * /*template*/, int /*flags*/));
 # else
 #  if !@HAVE_MKOSTEMP@
-_GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/)
-                                 _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (mkostemp, int, (char * /*template*/, int /*flags*/),
+                                 _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/));
 # endif
@@ -827,15 +932,15 @@ _GL_WARN_ON_USE (mkostemp, "mkostemp is unportable - "
 #   define mkostemps rpl_mkostemps
 #  endif
 _GL_FUNCDECL_RPL (mkostemps, int,
-                  (char * /*template*/, int /*suffixlen*/, int /*flags*/)
-                  _GL_ARG_NONNULL ((1)));
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (mkostemps, int,
                   (char * /*template*/, int /*suffixlen*/, int /*flags*/));
 # else
 #  if !@HAVE_MKOSTEMPS@
 _GL_FUNCDECL_SYS (mkostemps, int,
-                  (char * /*template*/, int /*suffixlen*/, int /*flags*/)
-                  _GL_ARG_NONNULL ((1)));
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (mkostemps, int,
                   (char * /*template*/, int /*suffixlen*/, int /*flags*/));
@@ -865,11 +970,13 @@ _GL_WARN_ON_USE (mkostemps, "mkostemps is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mkstemp rpl_mkstemp
 #  endif
-_GL_FUNCDECL_RPL (mkstemp, int, (char * /*template*/) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (mkstemp, int, (char * /*template*/),
+                                _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (mkstemp, int, (char * /*template*/));
 # else
 #  if ! @HAVE_MKSTEMP@
-_GL_FUNCDECL_SYS (mkstemp, int, (char * /*template*/) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (mkstemp, int, (char * /*template*/),
+                                _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (mkstemp, int, (char * /*template*/));
 # endif
@@ -894,8 +1001,8 @@ _GL_WARN_ON_USE (mkstemp, "mkstemp is unportable - "
    Returns the open file descriptor if successful, otherwise -1 and errno
    set.  */
 # if !@HAVE_MKSTEMPS@
-_GL_FUNCDECL_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/)
-                                 _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/),
+                                 _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 # endif
 _GL_CXXALIAS_SYS (mkstemps, int, (char * /*template*/, int /*suffixlen*/));
 _GL_CXXALIASWARN (mkstemps);
@@ -931,8 +1038,8 @@ _GL_CXXALIASWARN (mktemp);
 #   define posix_memalign rpl_posix_memalign
 #  endif
 _GL_FUNCDECL_RPL (posix_memalign, int,
-                  (void **memptr, size_t alignment, size_t size)
-                  _GL_ARG_NONNULL ((1)));
+                  (void **memptr, size_t alignment, size_t size),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (posix_memalign, int,
                   (void **memptr, size_t alignment, size_t size));
 # else
@@ -960,11 +1067,11 @@ _GL_WARN_ON_USE (posix_memalign, "posix_memalign is not portable - "
 #   undef posix_openpt
 #   define posix_openpt rpl_posix_openpt
 #  endif
-_GL_FUNCDECL_RPL (posix_openpt, int, (int flags));
+_GL_FUNCDECL_RPL (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (posix_openpt, int, (int flags));
 # else
 #  if !@HAVE_POSIX_OPENPT@
-_GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
+_GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
 # endif
@@ -987,11 +1094,11 @@ _GL_WARN_ON_USE (posix_openpt, "posix_openpt is not portable - "
 #   undef ptsname
 #   define ptsname rpl_ptsname
 #  endif
-_GL_FUNCDECL_RPL (ptsname, char *, (int fd));
+_GL_FUNCDECL_RPL (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (ptsname, char *, (int fd));
 # else
 #  if !@HAVE_PTSNAME@
-_GL_FUNCDECL_SYS (ptsname, char *, (int fd));
+_GL_FUNCDECL_SYS (ptsname, char *, (int fd), _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (ptsname, char *, (int fd));
 # endif
@@ -1013,11 +1120,11 @@ _GL_WARN_ON_USE (ptsname, "ptsname is not portable - "
 #   undef ptsname_r
 #   define ptsname_r rpl_ptsname_r
 #  endif
-_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
+_GL_FUNCDECL_RPL (ptsname_r, int, (int fd, char *buf, size_t len), );
 _GL_CXXALIAS_RPL (ptsname_r, int, (int fd, char *buf, size_t len));
 # else
 #  if !@HAVE_PTSNAME_R@
-_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
+_GL_FUNCDECL_SYS (ptsname_r, int, (int fd, char *buf, size_t len), );
 #  endif
 _GL_CXXALIAS_SYS (ptsname_r, int, (int fd, char *buf, size_t len));
 # endif
@@ -1039,7 +1146,7 @@ _GL_WARN_ON_USE (ptsname_r, "ptsname_r is not portable - "
 #   undef putenv
 #   define putenv rpl_putenv
 #  endif
-_GL_FUNCDECL_RPL (putenv, int, (char *string) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (putenv, int, (char *string), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (putenv, int, (char *string));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1098,7 +1205,9 @@ typedef int (*_gl_qsort_r_compar_fn) (void const *, void const *, void *);
 #  endif
 _GL_FUNCDECL_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
                                   _gl_qsort_r_compar_fn compare,
-                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
+                                  void *arg),
+                                 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2)
+                                 _GL_ARG_NONNULL ((4)));
 _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
                                   _gl_qsort_r_compar_fn compare,
                                   void *arg));
@@ -1106,7 +1215,9 @@ _GL_CXXALIAS_RPL (qsort_r, void, (void *base, size_t nmemb, size_t size,
 #  if !@HAVE_QSORT_R@
 _GL_FUNCDECL_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
                                   _gl_qsort_r_compar_fn compare,
-                                  void *arg) _GL_ARG_NONNULL ((1, 4)));
+                                  void *arg),
+                                 _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2)
+                                 _GL_ARG_NONNULL ((4)));
 #  endif
 _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
                                   _gl_qsort_r_compar_fn compare,
@@ -1137,7 +1248,7 @@ _GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - "
 #   undef rand
 #   define rand rpl_rand
 #  endif
-_GL_FUNCDECL_RPL (rand, int, (void));
+_GL_FUNCDECL_RPL (rand, int, (void), );
 _GL_CXXALIAS_RPL (rand, int, (void));
 # else
 _GL_CXXALIAS_SYS (rand, int, (void));
@@ -1154,11 +1265,11 @@ _GL_CXXALIASWARN (rand);
 #   undef random
 #   define random rpl_random
 #  endif
-_GL_FUNCDECL_RPL (random, long, (void));
+_GL_FUNCDECL_RPL (random, long, (void), );
 _GL_CXXALIAS_RPL (random, long, (void));
 # else
 #  if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (random, long, (void));
+_GL_FUNCDECL_SYS (random, long, (void), );
 #  endif
 /* Need to cast, because on Haiku, the return type is
                                int.  */
@@ -1181,11 +1292,11 @@ _GL_WARN_ON_USE (random, "random is unportable - "
 #   undef srandom
 #   define srandom rpl_srandom
 #  endif
-_GL_FUNCDECL_RPL (srandom, void, (unsigned int seed));
+_GL_FUNCDECL_RPL (srandom, void, (unsigned int seed), );
 _GL_CXXALIAS_RPL (srandom, void, (unsigned int seed));
 # else
 #  if !@HAVE_RANDOM@
-_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
+_GL_FUNCDECL_SYS (srandom, void, (unsigned int seed), );
 #  endif
 /* Need to cast, because on FreeBSD, the first parameter is
                                        unsigned long seed.  */
@@ -1209,14 +1320,14 @@ _GL_WARN_ON_USE (srandom, "srandom is unportable - "
 #   define initstate rpl_initstate
 #  endif
 _GL_FUNCDECL_RPL (initstate, char *,
-                  (unsigned int seed, char *buf, size_t buf_size)
+                  (unsigned int seed, char *buf, size_t buf_size),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (initstate, char *,
                   (unsigned int seed, char *buf, size_t buf_size));
 # else
 #  if !@HAVE_INITSTATE@ || !@HAVE_DECL_INITSTATE@
 _GL_FUNCDECL_SYS (initstate, char *,
-                  (unsigned int seed, char *buf, size_t buf_size)
+                  (unsigned int seed, char *buf, size_t buf_size),
                   _GL_ARG_NONNULL ((2)));
 #  endif
 /* Need to cast, because on FreeBSD, the first parameter is
@@ -1241,11 +1352,11 @@ _GL_WARN_ON_USE (initstate, "initstate is unportable - "
 #   undef setstate
 #   define setstate rpl_setstate
 #  endif
-_GL_FUNCDECL_RPL (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (setstate, char *, (char *arg_state));
 # else
 #  if !@HAVE_SETSTATE@ || !@HAVE_DECL_SETSTATE@
-_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (setstate, char *, (char *arg_state), _GL_ARG_NONNULL ((1)));
 #  endif
 /* Need to cast, because on Mac OS X 10.13, HP-UX, Solaris the first parameter
    is                                     const char *arg_state.  */
@@ -1269,12 +1380,12 @@ _GL_WARN_ON_USE (setstate, "setstate is unportable - "
 #   undef random_r
 #   define random_r rpl_random_r
 #  endif
-_GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result)
+_GL_FUNCDECL_RPL (random_r, int, (struct random_data *buf, int32_t *result),
                                  _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (random_r, int, (struct random_data *buf, int32_t *result));
 # else
 #  if !@HAVE_RANDOM_R@
-_GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result)
+_GL_FUNCDECL_SYS (random_r, int, (struct random_data *buf, int32_t *result),
                                  _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (random_r, int, (struct random_data *buf, int32_t *result));
@@ -1295,14 +1406,14 @@ _GL_WARN_ON_USE (random_r, "random_r is unportable - "
 #   define srandom_r rpl_srandom_r
 #  endif
 _GL_FUNCDECL_RPL (srandom_r, int,
-                  (unsigned int seed, struct random_data *rand_state)
+                  (unsigned int seed, struct random_data *rand_state),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (srandom_r, int,
                   (unsigned int seed, struct random_data *rand_state));
 # else
 #  if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (srandom_r, int,
-                  (unsigned int seed, struct random_data *rand_state)
+                  (unsigned int seed, struct random_data *rand_state),
                   _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (srandom_r, int,
@@ -1325,7 +1436,7 @@ _GL_WARN_ON_USE (srandom_r, "srandom_r is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
-                   struct random_data *rand_state)
+                   struct random_data *rand_state),
                   _GL_ARG_NONNULL ((2, 4)));
 _GL_CXXALIAS_RPL (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
@@ -1334,7 +1445,7 @@ _GL_CXXALIAS_RPL (initstate_r, int,
 #  if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (initstate_r, int,
                   (unsigned int seed, char *buf, size_t buf_size,
-                   struct random_data *rand_state)
+                   struct random_data *rand_state),
                   _GL_ARG_NONNULL ((2, 4)));
 #  endif
 /* Need to cast, because on Haiku, the third parameter is
@@ -1359,14 +1470,14 @@ _GL_WARN_ON_USE (initstate_r, "initstate_r is unportable - "
 #   define setstate_r rpl_setstate_r
 #  endif
 _GL_FUNCDECL_RPL (setstate_r, int,
-                  (char *arg_state, struct random_data *rand_state)
+                  (char *arg_state, struct random_data *rand_state),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (setstate_r, int,
                   (char *arg_state, struct random_data *rand_state));
 # else
 #  if !@HAVE_RANDOM_R@
 _GL_FUNCDECL_SYS (setstate_r, int,
-                  (char *arg_state, struct random_data *rand_state)
+                  (char *arg_state, struct random_data *rand_state),
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 /* Need to cast, because on Haiku, the first parameter is
@@ -1385,28 +1496,44 @@ _GL_WARN_ON_USE (setstate_r, "setstate_r is unportable - "
 
 
 #if @GNULIB_REALLOC_POSIX@
-# if (@GNULIB_REALLOC_POSIX@ && @REPLACE_REALLOC_FOR_REALLOC_POSIX@) \
-     || (@GNULIB_REALLOC_GNU@ && @REPLACE_REALLOC_FOR_REALLOC_GNU@)
+# if @REPLACE_REALLOC_FOR_REALLOC_POSIX@
+#  if @REPLACE_REALLOC_FOR_REALLOC_POSIX@ == 2
+#   define _GL_INLINE_RPL_REALLOC 1
+#   ifdef __cplusplus
+extern "C" {
+#   endif
+_GL_REALLOC_INLINE void *
+rpl_realloc (void *ptr, size_t size)
+{
+  return realloc (ptr, size ? size : 1);
+}
+#   ifdef __cplusplus
+}
+#   endif
+#  endif
 #  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
         || _GL_USE_STDLIB_ALLOC)
 #   undef realloc
 #   define realloc rpl_realloc
 #  endif
-_GL_FUNCDECL_RPL (realloc, void *, (void *ptr, size_t size)
-                                   _GL_ATTRIBUTE_DEALLOC_FREE);
+#  if !defined _GL_INLINE_RPL_REALLOC
+_GL_FUNCDECL_RPL (realloc, void *,
+                  (void *ptr, size_t size),
+                  _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD);
+#  endif
 _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size));
 # else
-#  if __GNUC__ >= 11
+#  if __GNUC__ >= 11 && !defined __clang__
 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free.  */
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (realloc, void *,
-                  (void *ptr, size_t size)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (void *ptr, size_t size),
+                  _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (realloc, void *,
-                  (void *ptr, size_t size)
-                  _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (void *ptr, size_t size),
+                  _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_NODISCARD);
 #   endif
 #  endif
 _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
@@ -1415,16 +1542,17 @@ _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
 _GL_CXXALIASWARN (realloc);
 # endif
 #else
-# if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc
+# if @GNULIB_FREE_POSIX@ \
+     && (__GNUC__ >= 11 && !defined __clang__) && !defined realloc
 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
 _GL_FUNCDECL_SYS (realloc, void *,
-                  (void *ptr, size_t size)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (void *ptr, size_t size),
+                  _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (realloc, void *,
-                  (void *ptr, size_t size)
+                  (void *ptr, size_t size),
                   _GL_ATTRIBUTE_DEALLOC_FREE);
 #  endif
 # endif
@@ -1444,13 +1572,15 @@ _GL_WARN_ON_USE (realloc, "realloc is not POSIX compliant everywhere - "
 #   define reallocarray rpl_reallocarray
 #  endif
 _GL_FUNCDECL_RPL (reallocarray, void *,
-                  (void *ptr, size_t nmemb, size_t size));
+                  (void *ptr, size_t nmemb, size_t size),
+                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (reallocarray, void *,
                   (void *ptr, size_t nmemb, size_t size));
 # else
 #  if ! @HAVE_REALLOCARRAY@
 _GL_FUNCDECL_SYS (reallocarray, void *,
-                  (void *ptr, size_t nmemb, size_t size));
+                  (void *ptr, size_t nmemb, size_t size),
+                  _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (reallocarray, void *,
                   (void *ptr, size_t nmemb, size_t size));
@@ -1472,15 +1602,15 @@ _GL_WARN_ON_USE (reallocarray, "reallocarray is not portable - "
 #   define realpath rpl_realpath
 #  endif
 _GL_FUNCDECL_RPL (realpath, char *,
-                  (const char *restrict name, char *restrict resolved)
-                  _GL_ARG_NONNULL ((1)));
+                  (const char *restrict name, char *restrict resolved),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (realpath, char *,
                   (const char *restrict name, char *restrict resolved));
 # else
 #  if !@HAVE_REALPATH@
 _GL_FUNCDECL_SYS (realpath, char *,
-                  (const char *restrict name, char *restrict resolved)
-                  _GL_ARG_NONNULL ((1)));
+                  (const char *restrict name, char *restrict resolved),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (realpath, char *,
                   (const char *restrict name, char *restrict resolved));
@@ -1498,7 +1628,8 @@ _GL_WARN_ON_USE (realpath, "realpath is unportable - use gnulib module "
 /* Test a user response to a question.
    Return 1 if it is affirmative, 0 if it is negative, or -1 if not clear.  */
 # if !@HAVE_RPMATCH@
-_GL_FUNCDECL_SYS (rpmatch, int, (const char *response) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (rpmatch, int, (const char *response),
+                                _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 # endif
 _GL_CXXALIAS_SYS (rpmatch, int, (const char *response));
 _GL_CXXALIASWARN (rpmatch);
@@ -1514,7 +1645,8 @@ _GL_WARN_ON_USE (rpmatch, "rpmatch is unportable - "
 /* Look up NAME in the environment, returning 0 in insecure situations.  */
 # if !@HAVE_SECURE_GETENV@
 _GL_FUNCDECL_SYS (secure_getenv, char *,
-                  (char const *name) _GL_ARG_NONNULL ((1)));
+                  (char const *name),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 # endif
 _GL_CXXALIAS_SYS (secure_getenv, char *, (char const *name));
 _GL_CXXALIASWARN (secure_getenv);
@@ -1535,14 +1667,14 @@ _GL_WARN_ON_USE (secure_getenv, "secure_getenv is unportable - "
 #   define setenv rpl_setenv
 #  endif
 _GL_FUNCDECL_RPL (setenv, int,
-                  (const char *name, const char *value, int replace)
+                  (const char *name, const char *value, int replace),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (setenv, int,
                   (const char *name, const char *value, int replace));
 # else
 #  if !@HAVE_DECL_SETENV@
 _GL_FUNCDECL_SYS (setenv, int,
-                  (const char *name, const char *value, int replace)
+                  (const char *name, const char *value, int replace),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (setenv, int,
@@ -1559,6 +1691,19 @@ _GL_WARN_ON_USE (setenv, "setenv is unportable - "
 # endif
 #endif
 
+#if @GNULIB_STACK_TRACE@
+/* Prints a stack trace of the current thread to standard error,
+   if possible.  */
+# if @CAN_PRINT_STACK_TRACE@
+_GL_EXTERN_C void print_stack_trace (void);
+# else
+#  if !GNULIB_defined_print_stack_trace
+#   define print_stack_trace() /* nothing */
+#   define GNULIB_defined_print_stack_trace 1
+#  endif
+# endif
+#endif
+
 #if @GNULIB_STRTOD@
  /* Parse a double from STRING, updating ENDP if appropriate.  */
 # if @REPLACE_STRTOD@
@@ -1567,14 +1712,14 @@ _GL_WARN_ON_USE (setenv, "setenv is unportable - "
 #  endif
 #  define GNULIB_defined_strtod_function 1
 _GL_FUNCDECL_RPL (strtod, double,
-                  (const char *restrict str, char **restrict endp)
+                  (const char *restrict str, char **restrict endp),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtod, double,
                   (const char *restrict str, char **restrict endp));
 # else
 #  if !@HAVE_STRTOD@
 _GL_FUNCDECL_SYS (strtod, double,
-                  (const char *restrict str, char **restrict endp)
+                  (const char *restrict str, char **restrict endp),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtod, double,
@@ -1599,14 +1744,14 @@ _GL_WARN_ON_USE (strtod, "strtod is unportable - "
 #  endif
 #  define GNULIB_defined_strtof_function 1
 _GL_FUNCDECL_RPL (strtof, float,
-                  (const char *restrict str, char **restrict endp)
+                  (const char *restrict str, char **restrict endp),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtof, float,
                   (const char *restrict str, char **restrict endp));
 # else
 #  if !@HAVE_STRTOF@
 _GL_FUNCDECL_SYS (strtof, float,
-                  (const char *restrict str, char **restrict endp)
+                  (const char *restrict str, char **restrict endp),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtof, float,
@@ -1631,14 +1776,14 @@ _GL_WARN_ON_USE (strtof, "strtof is unportable - "
 #  endif
 #  define GNULIB_defined_strtold_function 1
 _GL_FUNCDECL_RPL (strtold, long double,
-                  (const char *restrict str, char **restrict endp)
+                  (const char *restrict str, char **restrict endp),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtold, long double,
                   (const char *restrict str, char **restrict endp));
 # else
 #  if !@HAVE_STRTOLD@
 _GL_FUNCDECL_SYS (strtold, long double,
-                  (const char *restrict str, char **restrict endp)
+                  (const char *restrict str, char **restrict endp),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtold, long double,
@@ -1669,7 +1814,7 @@ _GL_WARN_ON_USE (strtold, "strtold is unportable - "
 #  define GNULIB_defined_strtol_function 1
 _GL_FUNCDECL_RPL (strtol, long,
                   (const char *restrict string, char **restrict endptr,
-                   int base)
+                   int base),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtol, long,
                   (const char *restrict string, char **restrict endptr,
@@ -1678,7 +1823,7 @@ _GL_CXXALIAS_RPL (strtol, long,
 #  if !@HAVE_STRTOL@
 _GL_FUNCDECL_SYS (strtol, long,
                   (const char *restrict string, char **restrict endptr,
-                   int base)
+                   int base),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtol, long,
@@ -1712,7 +1857,7 @@ _GL_WARN_ON_USE (strtol, "strtol is unportable - "
 #  define GNULIB_defined_strtoll_function 1
 _GL_FUNCDECL_RPL (strtoll, long long,
                   (const char *restrict string, char **restrict endptr,
-                   int base)
+                   int base),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtoll, long long,
                   (const char *restrict string, char **restrict endptr,
@@ -1721,7 +1866,7 @@ _GL_CXXALIAS_RPL (strtoll, long long,
 #  if !@HAVE_STRTOLL@
 _GL_FUNCDECL_SYS (strtoll, long long,
                   (const char *restrict string, char **restrict endptr,
-                   int base)
+                   int base),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtoll, long long,
@@ -1752,7 +1897,7 @@ _GL_WARN_ON_USE (strtoll, "strtoll is unportable - "
 #  define GNULIB_defined_strtoul_function 1
 _GL_FUNCDECL_RPL (strtoul, unsigned long,
                   (const char *restrict string, char **restrict endptr,
-                   int base)
+                   int base),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtoul, unsigned long,
                   (const char *restrict string, char **restrict endptr,
@@ -1761,7 +1906,7 @@ _GL_CXXALIAS_RPL (strtoul, unsigned long,
 #  if !@HAVE_STRTOUL@
 _GL_FUNCDECL_SYS (strtoul, unsigned long,
                   (const char *restrict string, char **restrict endptr,
-                   int base)
+                   int base),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtoul, unsigned long,
@@ -1795,7 +1940,7 @@ _GL_WARN_ON_USE (strtoul, "strtoul is unportable - "
 #  define GNULIB_defined_strtoull_function 1
 _GL_FUNCDECL_RPL (strtoull, unsigned long long,
                   (const char *restrict string, char **restrict endptr,
-                   int base)
+                   int base),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strtoull, unsigned long long,
                   (const char *restrict string, char **restrict endptr,
@@ -1804,7 +1949,7 @@ _GL_CXXALIAS_RPL (strtoull, unsigned long long,
 #  if !@HAVE_STRTOULL@
 _GL_FUNCDECL_SYS (strtoull, unsigned long long,
                   (const char *restrict string, char **restrict endptr,
-                   int base)
+                   int base),
                   _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (strtoull, unsigned long long,
@@ -1824,7 +1969,7 @@ _GL_WARN_ON_USE (strtoull, "strtoull is unportable - "
 /* Unlock the slave side of the pseudo-terminal whose master side is specified
    by FD, so that it can be opened.  */
 # if !@HAVE_UNLOCKPT@
-_GL_FUNCDECL_SYS (unlockpt, int, (int fd));
+_GL_FUNCDECL_SYS (unlockpt, int, (int fd), );
 # endif
 _GL_CXXALIAS_SYS (unlockpt, int, (int fd));
 _GL_CXXALIASWARN (unlockpt);
@@ -1843,11 +1988,11 @@ _GL_WARN_ON_USE (unlockpt, "unlockpt is not portable - "
 #   undef unsetenv
 #   define unsetenv rpl_unsetenv
 #  endif
-_GL_FUNCDECL_RPL (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (unsetenv, int, (const char *name));
 # else
 #  if !@HAVE_DECL_UNSETENV@
-_GL_FUNCDECL_SYS (unsetenv, int, (const char *name) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (unsetenv, int, (const char *name), _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (unsetenv, int, (const char *name));
 # endif
@@ -1869,7 +2014,7 @@ _GL_WARN_ON_USE (unsetenv, "unsetenv is unportable - "
 #   undef wctomb
 #   define wctomb rpl_wctomb
 #  endif
-_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc));
+_GL_FUNCDECL_RPL (wctomb, int, (char *s, wchar_t wc), );
 _GL_CXXALIAS_RPL (wctomb, int, (char *s, wchar_t wc));
 # else
 _GL_CXXALIAS_SYS (wctomb, int, (char *s, wchar_t wc));
@@ -1880,6 +2025,8 @@ _GL_CXXALIASWARN (wctomb);
 #endif
 
 
+_GL_INLINE_HEADER_END
+
 #endif /* _@GUARD_PREFIX@_STDLIB_H */
 #endif /* _@GUARD_PREFIX@_STDLIB_H */
 #endif
diff --git a/gl/str-two-way.h b/gl/str-two-way.h
index cf85e268..d13fb298 100644
--- a/gl/str-two-way.h
+++ b/gl/str-two-way.h
@@ -1,5 +1,5 @@
 /* Byte-wise substring search, using the Two-Way algorithm.
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Eric Blake <ebb9@byu.net>, 2008.
 
diff --git a/gl/strcasecmp.c b/gl/strcasecmp.c
index 7939b404..16626d4d 100644
--- a/gl/strcasecmp.c
+++ b/gl/strcasecmp.c
@@ -1,5 +1,5 @@
-/* Case-insensitive string comparison function.
-   Copyright (C) 1998-1999, 2005-2007, 2009-2024 Free Software Foundation, Inc.
+/* Case-insensitive string comparison function for unibyte locales.
+   Copyright (C) 1998-1999, 2005-2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
 #include <config.h>
 
 /* Specification.  */
-#include <string.h>
+#include <strings.h>
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/gl/strcasestr.c b/gl/strcasestr.c
index b8c0479d..fd0e2c3e 100644
--- a/gl/strcasestr.c
+++ b/gl/strcasestr.c
@@ -1,5 +1,5 @@
 /* Case-insensitive searching in a string.
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/streq.h b/gl/streq.h
index 8593de6d..1f1ff38f 100644
--- a/gl/streq.h
+++ b/gl/streq.h
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -26,7 +26,7 @@ extern "C" {
 #endif
 
 
-/* STREQ_OPT allows to optimize string comparison with a small literal string.
+/* STREQ_OPT optimizes string comparison with a small literal string.
      STREQ_OPT (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
    is semantically equivalent to
      strcmp (s, "EUC-KR") == 0
diff --git a/gl/strerror-override.c b/gl/strerror-override.c
index b9c1c7ab..3cc25905 100644
--- a/gl/strerror-override.c
+++ b/gl/strerror-override.c
@@ -1,6 +1,6 @@
 /* strerror-override.c --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -298,6 +298,11 @@ strerror_override (int errnum)
       return "Invalid or incomplete multibyte or wide character";
 # endif
 
+# if GNULIB_defined_ESOCKTNOSUPPORT
+    case ESOCKTNOSUPPORT:
+      return "Socket type not supported";
+# endif
+
     default:
       return NULL;
     }
diff --git a/gl/strerror-override.h b/gl/strerror-override.h
index a1734a24..653ea0ad 100644
--- a/gl/strerror-override.h
+++ b/gl/strerror-override.h
@@ -1,6 +1,6 @@
 /* strerror-override.h --- POSIX compatible system error routine
 
-   Copyright (C) 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -57,7 +57,8 @@ extern "C" {
     || GNULIB_defined_ECANCELED \
     || GNULIB_defined_EOWNERDEAD \
     || GNULIB_defined_ENOTRECOVERABLE \
-    || GNULIB_defined_EILSEQ
+    || GNULIB_defined_EILSEQ \
+    || GNULIB_defined_ESOCKTNOSUPPORT
 extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST;
 #else
 # define strerror_override(ignored) NULL
diff --git a/gl/strerror.c b/gl/strerror.c
index 6b760ff4..72572ae4 100644
--- a/gl/strerror.c
+++ b/gl/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -31,6 +31,12 @@
 /* Use the system functions, not the gnulib overrides in this file.  */
 #undef sprintf
 
+/* macOS 12's "warning: 'sprintf' is deprecated" is pointless,
+   as sprintf is used safely here.  */
+#if defined __APPLE__ && defined __MACH__ && _GL_GNUC_PREREQ (4, 2)
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 char *
 strerror (int n)
 #undef strerror
diff --git a/gl/string.in.h b/gl/string.in.h
index 44ec2e7e..25e6a087 100644
--- a/gl/string.in.h
+++ b/gl/string.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <string.h>.
 
-   Copyright (C) 1995-1996, 2001-2024 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -20,7 +20,7 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined _GL_ALREADY_INCLUDING_STRING_H
+#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_STRING_H
 /* Special invocation convention:
    - On OS X/NetBSD we have a sequence of nested includes
        <string.h> -> <strings.h> -> "string.h"
@@ -34,12 +34,12 @@
 
 #ifndef _@GUARD_PREFIX@_STRING_H
 
-#define _GL_ALREADY_INCLUDING_STRING_H
+#define _@GUARD_PREFIX@_ALREADY_INCLUDING_STRING_H
 
 /* The include_next requires a split double-inclusion guard.  */
 #@INCLUDE_NEXT@ @NEXT_STRING_H@
 
-#undef _GL_ALREADY_INCLUDING_STRING_H
+#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_STRING_H
 
 #ifndef _@GUARD_PREFIX@_STRING_H
 #define _@GUARD_PREFIX@_STRING_H
@@ -54,6 +54,11 @@
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
+#if @GNULIB_STRERROR_L@
+/* Get locale_t.  */
+# include <locale.h>
+#endif
+
 /* MirBSD defines mbslen as a macro.  */
 #if @GNULIB_MBSLEN@ && defined __MirBSD__
 # include <wchar.h>
@@ -79,7 +84,7 @@
    that can be freed by passing them as the Ith argument to the
    function F.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC
-# if __GNUC__ >= 11
+# if __GNUC__ >= 11 && !defined __clang__
 #  define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
 # else
 #  define _GL_ATTRIBUTE_DEALLOC(f, i)
@@ -111,11 +116,23 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NONNULL_IF_NONZERO (NP, NI) declares that the argument NP
+   (a pointer) must not be NULL if the argument NI (an integer) is != 0.  */
+/* Applies to: functions.  */
+#ifndef _GL_ATTRIBUTE_NONNULL_IF_NONZERO
+# if __GNUC__ >= 15 && !defined __clang__
+#  define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni) \
+     __attribute__ ((__nonnull_if_nonzero__ (np, ni)))
+# else
+#  define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni)
+# endif
+#endif
+
 /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
  */
 #ifndef _GL_ATTRIBUTE_NOTHROW
 # if defined __cplusplus
-#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major__ >= 4
 #   if __cplusplus >= 201103L
 #    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
 #   else
@@ -149,6 +166,7 @@
 
 /* The definition of _GL_WARN_ON_USE is copied here.  */
 
+
 /* Make _GL_ATTRIBUTE_DEALLOC_FREE work, even though <stdlib.h> may not have
    been included yet.  */
 #if @GNULIB_FREE_POSIX@
@@ -193,12 +211,97 @@ _GL_EXTERN_C void free (void *);
 # endif
 #endif
 
+
+/* Declarations for ISO C N3322.  */
+#if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+# ifndef memcpy
+_GL_EXTERN_C void *memcpy (void *__dest, const void *__src, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+# endif
+# ifndef memccpy
+_GL_EXTERN_C void *memccpy (void *__dest, const void *__src, int __c, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 4)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 4);
+# endif
+# ifndef memmove
+_GL_EXTERN_C void *memmove (void *__dest, const void *__src, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+# endif
+# ifndef strncpy
+_GL_EXTERN_C char *strncpy (char *__dest, const char *__src, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+# endif
+# ifndef strndup
+_GL_EXTERN_C char *strndup (const char *__s, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2);
+# endif
+# ifndef strncat
+_GL_EXTERN_C char *strncat (char *__dest, const char *__src, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+# endif
+# ifndef memcmp
+_GL_EXTERN_C int memcmp (const void *__s1, const void *__s2, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+# endif
+# ifndef strncmp
+_GL_EXTERN_C int strncmp (const char *__s1, const char *__s2, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+# endif
+# if !defined memchr && !defined __cplusplus
+_GL_EXTERN_C void *memchr (const void *__s, int __c, size_t __n)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+_GL_EXTERN_C void *memrchr (const void *__s, int __c, size_t __n)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+# endif
+# ifndef memset
+_GL_EXTERN_C void *memset (void *__s, int __c, size_t __n)
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+#  endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+# endif
+# ifndef memset_explicit
+_GL_EXTERN_C void *memset_explicit (void *__s, int __c, size_t __n)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+# endif
+#endif
+
+
 /* Clear a block of memory.  The compiler will not delete a call to
    this function, even if the block is dead after the call.  */
 #if @GNULIB_EXPLICIT_BZERO@
 # if ! @HAVE_EXPLICIT_BZERO@
 _GL_FUNCDECL_SYS (explicit_bzero, void,
-                  (void *__dest, size_t __n) _GL_ARG_NONNULL ((1)));
+                  (void *__dest, size_t __n), _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (explicit_bzero, void, (void *__dest, size_t __n));
 _GL_CXXALIASWARN (explicit_bzero);
@@ -210,10 +313,11 @@ _GL_WARN_ON_USE (explicit_bzero, "explicit_bzero is unportable - "
 # endif
 #endif
 
+
 /* Find the index of the least-significant set bit.  */
 #if @GNULIB_FFSL@
 # if !@HAVE_FFSL@
-_GL_FUNCDECL_SYS (ffsl, int, (long int i));
+_GL_FUNCDECL_SYS (ffsl, int, (long int i), );
 # endif
 _GL_CXXALIAS_SYS (ffsl, int, (long int i));
 _GL_CXXALIASWARN (ffsl);
@@ -231,11 +335,11 @@ _GL_WARN_ON_USE (ffsl, "ffsl is not portable - use the ffsl module");
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define ffsll rpl_ffsll
 #  endif
-_GL_FUNCDECL_RPL (ffsll, int, (long long int i));
+_GL_FUNCDECL_RPL (ffsll, int, (long long int i), );
 _GL_CXXALIAS_RPL (ffsll, int, (long long int i));
 # else
 #  if !@HAVE_FFSLL@
-_GL_FUNCDECL_SYS (ffsll, int, (long long int i));
+_GL_FUNCDECL_SYS (ffsll, int, (long long int i), );
 #  endif
 _GL_CXXALIAS_SYS (ffsll, int, (long long int i));
 # endif
@@ -274,9 +378,9 @@ _GL_CXXALIASWARN (memccpy);
 #   undef memchr
 #   define memchr rpl_memchr
 #  endif
-_GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n)
+_GL_FUNCDECL_RPL (memchr, void *, (void const *__s, int __c, size_t __n),
                                   _GL_ATTRIBUTE_PURE
-                                  _GL_ARG_NONNULL ((1)));
+                                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3));
 _GL_CXXALIAS_RPL (memchr, void *, (void const *__s, int __c, size_t __n));
 # else
   /* On some systems, this function is defined as an overloaded function:
@@ -301,8 +405,10 @@ _GL_CXXALIASWARN (memchr);
 #elif defined GNULIB_POSIXCHECK
 # undef memchr
 /* Assume memchr is always declared.  */
-_GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - "
-                 "use gnulib module memchr for portability" );
+_GL_WARN_ON_USE_CXX (memchr,
+                     const void *, void *, (void const *, int, size_t),
+                     "memchr has platform-specific bugs - "
+                     "use gnulib module memchr for portability" );
 #endif
 
 /* Return the first occurrence of NEEDLE in HAYSTACK.  */
@@ -313,7 +419,7 @@ _GL_WARN_ON_USE (memchr, "memchr has platform-specific bugs - "
 #  endif
 _GL_FUNCDECL_RPL (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
-                   void const *__needle, size_t __needle_len)
+                   void const *__needle, size_t __needle_len),
                   _GL_ATTRIBUTE_PURE
                   _GL_ARG_NONNULL ((1, 3)));
 _GL_CXXALIAS_RPL (memmem, void *,
@@ -323,7 +429,7 @@ _GL_CXXALIAS_RPL (memmem, void *,
 #  if ! @HAVE_DECL_MEMMEM@
 _GL_FUNCDECL_SYS (memmem, void *,
                   (void const *__haystack, size_t __haystack_len,
-                   void const *__needle, size_t __needle_len)
+                   void const *__needle, size_t __needle_len),
                   _GL_ATTRIBUTE_PURE
                   _GL_ARG_NONNULL ((1, 3)));
 #  endif
@@ -351,7 +457,7 @@ _GL_WARN_ON_USE (memmem, "memmem is unportable and often quadratic - "
 #  endif
 _GL_FUNCDECL_RPL (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
-                   size_t __n)
+                   size_t __n),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
@@ -360,7 +466,7 @@ _GL_CXXALIAS_RPL (mempcpy, void *,
 #  if !@HAVE_MEMPCPY@
 _GL_FUNCDECL_SYS (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
-                   size_t __n)
+                   size_t __n),
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (mempcpy, void *,
@@ -381,9 +487,9 @@ _GL_WARN_ON_USE (mempcpy, "mempcpy is unportable - "
 /* Search backwards through a block for a byte (specified as an int).  */
 #if @GNULIB_MEMRCHR@
 # if ! @HAVE_DECL_MEMRCHR@
-_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t)
+_GL_FUNCDECL_SYS (memrchr, void *, (void const *, int, size_t),
                                    _GL_ATTRIBUTE_PURE
-                                   _GL_ARG_NONNULL ((1)));
+                                   _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3));
 # endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" { const void * std::memrchr (const void *, int, size_t); }
@@ -420,16 +526,20 @@ _GL_WARN_ON_USE (memrchr, "memrchr is unportable - "
 #   define memset_explicit rpl_memset_explicit
 #  endif
 _GL_FUNCDECL_RPL (memset_explicit, void *,
-                  (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
+                  (void *__dest, int __c, size_t __n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3));
 _GL_CXXALIAS_RPL (memset_explicit, void *, (void *__dest, int __c, size_t __n));
 # else
 #  if !@HAVE_MEMSET_EXPLICIT@
 _GL_FUNCDECL_SYS (memset_explicit, void *,
-                  (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
+                  (void *__dest, int __c, size_t __n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3));
 #  endif
 _GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (memset_explicit);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef memset_explicit
 # if HAVE_RAW_DECL_MEMSET_EXPLICIT
@@ -443,7 +553,7 @@ _GL_WARN_ON_USE (memset_explicit, "memset_explicit is unportable - "
    occur within N bytes.  */
 #if @GNULIB_RAWMEMCHR@
 # if ! @HAVE_RAWMEMCHR@
-_GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in)
+_GL_FUNCDECL_SYS (rawmemchr, void *, (void const *__s, int __c_in),
                                      _GL_ATTRIBUTE_PURE
                                      _GL_ARG_NONNULL ((1)));
 # endif
@@ -481,14 +591,14 @@ _GL_WARN_ON_USE (rawmemchr, "rawmemchr is unportable - "
 #   define stpcpy rpl_stpcpy
 #  endif
 _GL_FUNCDECL_RPL (stpcpy, char *,
-                  (char *restrict __dst, char const *restrict __src)
+                  (char *restrict __dst, char const *restrict __src),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (stpcpy, char *,
                   (char *restrict __dst, char const *restrict __src));
 # else
 #  if !@HAVE_STPCPY@
 _GL_FUNCDECL_SYS (stpcpy, char *,
-                  (char *restrict __dst, char const *restrict __src)
+                  (char *restrict __dst, char const *restrict __src),
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (stpcpy, char *,
@@ -515,7 +625,7 @@ _GL_WARN_ON_USE (stpcpy, "stpcpy is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (stpncpy, char *,
                   (char *restrict __dst, char const *restrict __src,
-                   size_t __n)
+                   size_t __n),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (stpncpy, char *,
                   (char *restrict __dst, char const *restrict __src,
@@ -524,7 +634,7 @@ _GL_CXXALIAS_RPL (stpncpy, char *,
 #  if ! @HAVE_STPNCPY@
 _GL_FUNCDECL_SYS (stpncpy, char *,
                   (char *restrict __dst, char const *restrict __src,
-                   size_t __n)
+                   size_t __n),
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (stpncpy, char *,
@@ -560,14 +670,14 @@ _GL_WARN_ON_USE_CXX (strchr,
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define strchrnul rpl_strchrnul
 #  endif
-_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in)
+_GL_FUNCDECL_RPL (strchrnul, char *, (const char *__s, int __c_in),
                                      _GL_ATTRIBUTE_PURE
                                      _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strchrnul, char *,
                   (const char *str, int ch));
 # else
 #  if ! @HAVE_STRCHRNUL@
-_GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in)
+_GL_FUNCDECL_SYS (strchrnul, char *, (char const *__s, int __c_in),
                                      _GL_ATTRIBUTE_PURE
                                      _GL_ARG_NONNULL ((1)));
 #  endif
@@ -606,7 +716,7 @@ _GL_WARN_ON_USE (strchrnul, "strchrnul is unportable - "
 #   define strdup rpl_strdup
 #  endif
 _GL_FUNCDECL_RPL (strdup, char *,
-                  (char const *__s)
+                  (char const *__s),
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 _GL_CXXALIAS_RPL (strdup, char *, (char const *__s));
@@ -621,16 +731,17 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s));
     /* strdup exists as a function and as a macro.  Get rid of the macro.  */
 #   undef strdup
 #  endif
-#  if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup
+#  if (!@HAVE_DECL_STRDUP@ || (__GNUC__ >= 11 && !defined __clang__)) \
+      && !defined strdup
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strdup, char *,
-                  (char const *__s)
-                  _GL_ATTRIBUTE_NOTHROW
+                  (char const *__s),
                   _GL_ARG_NONNULL ((1))
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (strdup, char *,
-                  (char const *__s)
+                  (char const *__s),
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #   endif
@@ -639,17 +750,17 @@ _GL_CXXALIAS_SYS (strdup, char *, (char const *__s));
 # endif
 _GL_CXXALIASWARN (strdup);
 #else
-# if __GNUC__ >= 11 && !defined strdup
+# if (__GNUC__ >= 11 && !defined __clang__) && !defined strdup
 /* For -Wmismatched-dealloc: Associate strdup with free or rpl_free.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strdup, char *,
-                  (char const *__s)
-                  _GL_ATTRIBUTE_NOTHROW
+                  (char const *__s),
                   _GL_ARG_NONNULL ((1))
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (strdup, char *,
-                  (char const *__s)
+                  (char const *__s),
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #  endif
@@ -688,8 +799,9 @@ _GL_CXXALIASWARN (strdup);
 #   define strncat rpl_strncat
 #  endif
 _GL_FUNCDECL_RPL (strncat, char *,
-                  (char *restrict dest, const char *restrict src, size_t n)
-                  _GL_ARG_NONNULL ((1, 2)));
+                  (char *restrict dest, const char *restrict src, size_t n),
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 _GL_CXXALIAS_RPL (strncat, char *,
                   (char *restrict dest, const char *restrict src, size_t n));
 # else
@@ -707,6 +819,35 @@ _GL_WARN_ON_USE (strncat, "strncat is unportable - "
 # endif
 #endif
 
+/* Copy no more than N bytes of SRC to DST, returning DST.  */
+#if @GNULIB_STRNCPY@
+# if @REPLACE_STRNCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strncpy
+#   define strncpy rpl_strncpy
+#  endif
+_GL_FUNCDECL_RPL (strncpy, char *,
+                  (char *restrict __dst, char const *restrict __src,
+                   size_t __n),
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (strncpy, char *,
+                  (char *restrict __dst, char const *restrict __src,
+                   size_t __n));
+# else
+_GL_CXXALIAS_SYS (strncpy, char *,
+                  (char *restrict __dst, char const *restrict __src,
+                   size_t __n));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (strncpy);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_STRNCPY
+_GL_WARN_ON_USE (strncpy, "strncpy is unportable - "
+                 "use gnulib module strncpy for portability");
+# endif
+#endif
+
 /* Return a newly allocated copy of at most N bytes of STRING.  */
 #if @GNULIB_STRNDUP@
 # if @REPLACE_STRNDUP@
@@ -715,22 +856,23 @@ _GL_WARN_ON_USE (strncat, "strncat is unportable - "
 #   define strndup rpl_strndup
 #  endif
 _GL_FUNCDECL_RPL (strndup, char *,
-                  (char const *__s, size_t __n)
-                  _GL_ARG_NONNULL ((1))
+                  (char const *__s, size_t __n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
 # else
-#  if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup)
+#  if !@HAVE_DECL_STRNDUP@ \
+      || ((__GNUC__ >= 11 && !defined __clang__) && !defined strndup)
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strndup, char *,
-                  (char const *__s, size_t __n)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ARG_NONNULL ((1))
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (char const *__s, size_t __n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (strndup, char *,
-                  (char const *__s, size_t __n)
-                  _GL_ARG_NONNULL ((1))
+                  (char const *__s, size_t __n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #   endif
 #  endif
@@ -738,18 +880,18 @@ _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
 # endif
 _GL_CXXALIASWARN (strndup);
 #else
-# if __GNUC__ >= 11 && !defined strndup
+# if (__GNUC__ >= 11 && !defined __clang__) && !defined strndup
 /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (strndup, char *,
-                  (char const *__s, size_t __n)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ARG_NONNULL ((1))
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (char const *__s, size_t __n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (strndup, char *,
-                  (char const *__s, size_t __n)
-                  _GL_ARG_NONNULL ((1))
+                  (char const *__s, size_t __n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 2)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #  endif
 # endif
@@ -771,13 +913,13 @@ _GL_WARN_ON_USE (strndup, "strndup is unportable - "
 #   undef strnlen
 #   define strnlen rpl_strnlen
 #  endif
-_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen)
+_GL_FUNCDECL_RPL (strnlen, size_t, (char const *__s, size_t __maxlen),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (strnlen, size_t, (char const *__s, size_t __maxlen));
 # else
 #  if ! @HAVE_DECL_STRNLEN@
-_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen)
+_GL_FUNCDECL_SYS (strnlen, size_t, (char const *__s, size_t __maxlen),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 #  endif
@@ -807,7 +949,7 @@ _GL_WARN_ON_USE (strcspn, "strcspn cannot work correctly on character strings "
 /* Find the first occurrence in S of any character in ACCEPT.  */
 #if @GNULIB_STRPBRK@
 # if ! @HAVE_STRPBRK@
-_GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept)
+_GL_FUNCDECL_SYS (strpbrk, char *, (char const *__s, char const *__accept),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 # endif
@@ -892,7 +1034,7 @@ _GL_WARN_ON_USE_CXX (strrchr,
 #if @GNULIB_STRSEP@
 # if ! @HAVE_STRSEP@
 _GL_FUNCDECL_SYS (strsep, char *,
-                  (char **restrict __stringp, char const *restrict __delim)
+                  (char **restrict __stringp, char const *restrict __delim),
                   _GL_ARG_NONNULL ((1, 2)));
 # endif
 _GL_CXXALIAS_SYS (strsep, char *,
@@ -917,7 +1059,7 @@ _GL_WARN_ON_USE (strsep, "strsep is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define strstr rpl_strstr
 #  endif
-_GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle)
+_GL_FUNCDECL_RPL (strstr, char *, (const char *haystack, const char *needle),
                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strstr, char *, (const char *haystack, const char *needle));
@@ -948,11 +1090,13 @@ _GL_CXXALIASWARN (strstr);
    as a sequence of bytes, not of characters.  */
 # undef strstr
 /* Assume strstr is always declared.  */
-_GL_WARN_ON_USE (strstr, "strstr is quadratic on many systems, and cannot "
-                 "work correctly on character strings in most "
-                 "multibyte locales - "
-                 "use mbsstr if you care about internationalization, "
-                 "or use strstr if you care about speed");
+_GL_WARN_ON_USE_CXX (strstr,
+                     const char *, char *, (const char *, const char *),
+                     "strstr is quadratic on many systems, and cannot "
+                     "work correctly on character strings in most "
+                     "multibyte locales - "
+                     "use mbsstr if you care about internationalization, "
+                     "or use strstr if you care about speed");
 #endif
 
 /* Find the first occurrence of NEEDLE in HAYSTACK, using case-insensitive
@@ -963,7 +1107,7 @@ _GL_WARN_ON_USE (strstr, "strstr is quadratic on many systems, and cannot "
 #   define strcasestr rpl_strcasestr
 #  endif
 _GL_FUNCDECL_RPL (strcasestr, char *,
-                  (const char *haystack, const char *needle)
+                  (const char *haystack, const char *needle),
                   _GL_ATTRIBUTE_PURE
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strcasestr, char *,
@@ -971,7 +1115,7 @@ _GL_CXXALIAS_RPL (strcasestr, char *,
 # else
 #  if ! @HAVE_STRCASESTR@
 _GL_FUNCDECL_SYS (strcasestr, char *,
-                  (const char *haystack, const char *needle)
+                  (const char *haystack, const char *needle),
                   _GL_ATTRIBUTE_PURE
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
@@ -1038,7 +1182,7 @@ _GL_WARN_ON_USE (strcasestr, "strcasestr does work correctly on character "
 #  endif
 _GL_FUNCDECL_RPL (strtok_r, char *,
                   (char *restrict s, char const *restrict delim,
-                   char **restrict save_ptr)
+                   char **restrict save_ptr),
                   _GL_ARG_NONNULL ((2, 3)));
 _GL_CXXALIAS_RPL (strtok_r, char *,
                   (char *restrict s, char const *restrict delim,
@@ -1050,7 +1194,7 @@ _GL_CXXALIAS_RPL (strtok_r, char *,
 #  if ! @HAVE_DECL_STRTOK_R@
 _GL_FUNCDECL_SYS (strtok_r, char *,
                   (char *restrict s, char const *restrict delim,
-                   char **restrict save_ptr)
+                   char **restrict save_ptr),
                   _GL_ARG_NONNULL ((2, 3)));
 #  endif
 _GL_CXXALIAS_SYS (strtok_r, char *,
@@ -1075,6 +1219,22 @@ _GL_WARN_ON_USE (strtok_r, "strtok_r is unportable - "
 /* The following functions are not specified by POSIX.  They are gnulib
    extensions.  */
 
+#if @GNULIB_STR_STARTSWITH@
+/* Returns true if STRING starts with PREFIX.
+   Returns false otherwise.  */
+_GL_EXTERN_C bool str_startswith (const char *string, const char *prefix)
+     _GL_ATTRIBUTE_PURE
+     _GL_ARG_NONNULL ((1, 2));
+#endif
+
+#if @GNULIB_STR_ENDSWITH@
+/* Returns true if STRING ends with SUFFIX.
+   Returns false otherwise.  */
+_GL_EXTERN_C bool str_endswith (const char *string, const char *prefix)
+     _GL_ATTRIBUTE_PURE
+     _GL_ARG_NONNULL ((1, 2));
+#endif
+
 #if @GNULIB_MBSLEN@
 /* Return the number of multibyte characters in the character string STRING.
    This considers multibyte characters, unlike strlen, which counts bytes.  */
@@ -1085,12 +1245,12 @@ _GL_WARN_ON_USE (strtok_r, "strtok_r is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbslen rpl_mbslen
 #  endif
-_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string)
+_GL_FUNCDECL_RPL (mbslen, size_t, (const char *string),
                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbslen, size_t, (const char *string));
 # else
-_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string)
+_GL_FUNCDECL_SYS (mbslen, size_t, (const char *string),
                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbslen, size_t, (const char *string));
@@ -1117,12 +1277,12 @@ _GL_EXTERN_C size_t mbsnlen (const char *string, size_t len)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbschr rpl_mbschr /* avoid collision with HP-UX function */
 #  endif
-_GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c)
+_GL_FUNCDECL_RPL (mbschr, char *, (const char *string, int c),
                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbschr, char *, (const char *string, int c));
 # else
-_GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c)
+_GL_FUNCDECL_SYS (mbschr, char *, (const char *string, int c),
                                   _GL_ATTRIBUTE_PURE
                                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbschr, char *, (const char *string, int c));
@@ -1139,12 +1299,12 @@ _GL_CXXALIASWARN (mbschr);
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbsrchr rpl_mbsrchr /* avoid collision with system function */
 #  endif
-_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c)
+_GL_FUNCDECL_RPL (mbsrchr, char *, (const char *string, int c),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mbsrchr, char *, (const char *string, int c));
 # else
-_GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c)
+_GL_FUNCDECL_SYS (mbsrchr, char *, (const char *string, int c),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (mbsrchr, char *, (const char *string, int c));
@@ -1160,6 +1320,33 @@ _GL_CXXALIASWARN (mbsrchr);
 _GL_EXTERN_C char * mbsstr (const char *haystack, const char *needle)
      _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
+# ifndef _GL_NO_CONST_GENERICS
+/* Don't silently convert a 'const char *' to a 'char *'.  Programmers want
+   compiler warnings for 'const' related mistakes.  */
+#  ifdef __cplusplus
+extern "C++" { /* needed for AIX */
+template <typename T>
+  T * mbsstr_template (T* haystack, const char *needle);
+template <>
+  inline char * mbsstr_template (char *haystack, const char *needle)
+  { return mbsstr (haystack, needle); }
+template <>
+  inline const char * mbsstr_template (const char *haystack, const char *needle)
+  { return mbsstr (haystack, needle); }
+}
+#   undef mbsstr
+#   define mbsstr mbsstr_template
+#  elif !defined mbsstr
+#   if ((__GNUC__ + (__GNUC_MINOR__ >= 9) > 4) || (__clang_major__ >= 3) \
+        || defined __ICC  || defined __TINYC__ \
+        || (__STDC_VERSION__ >= 201112L && !(defined __GNUC__ || defined __clang__)))
+#    define mbsstr(h,n) \
+       _Generic ((h), \
+                 char const *: (char const *) mbsstr ((h), (n)), \
+                 default     :                mbsstr ((h), (n)))
+#   endif
+#  endif
+# endif
 #endif
 
 #if @GNULIB_MBSCASECMP@
@@ -1201,6 +1388,33 @@ _GL_EXTERN_C int mbsncasecmp (const char *s1, const char *s2, size_t n)
 _GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix)
      _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
+# ifndef _GL_NO_CONST_GENERICS
+/* Don't silently convert a 'const char *' to a 'char *'.  Programmers want
+   compiler warnings for 'const' related mistakes.  */
+#  ifdef __cplusplus
+extern "C++" { /* needed for AIX */
+template <typename T>
+  T * mbspcasecmp_template (T* string, const char *prefix);
+template <>
+  inline char * mbspcasecmp_template (char *string, const char *prefix)
+  { return mbspcasecmp (string, prefix); }
+template <>
+  inline const char * mbspcasecmp_template (const char *string, const char *prefix)
+  { return mbspcasecmp (string, prefix); }
+}
+#   undef mbspcasecmp
+#   define mbspcasecmp mbspcasecmp_template
+#  elif !defined mbspcasecmp
+#   if ((__GNUC__ + (__GNUC_MINOR__ >= 9) > 4) || (__clang_major__ >= 3) \
+        || defined __ICC  || defined __TINYC__ \
+        || (__STDC_VERSION__ >= 201112L && !(defined __GNUC__ || defined __clang__)))
+#    define mbspcasecmp(s,p) \
+       _Generic ((s), \
+                 char const *: (char const *) mbspcasecmp ((s), (p)), \
+                 default     :                mbspcasecmp ((s), (p)))
+#   endif
+#  endif
+# endif
 #endif
 
 #if @GNULIB_MBSCASESTR@
@@ -1212,6 +1426,33 @@ _GL_EXTERN_C char * mbspcasecmp (const char *string, const char *prefix)
 _GL_EXTERN_C char * mbscasestr (const char *haystack, const char *needle)
      _GL_ATTRIBUTE_PURE
      _GL_ARG_NONNULL ((1, 2));
+# ifndef _GL_NO_CONST_GENERICS
+/* Don't silently convert a 'const char *' to a 'char *'.  Programmers want
+   compiler warnings for 'const' related mistakes.  */
+#  ifdef __cplusplus
+extern "C++" { /* needed for AIX */
+template <typename T>
+  T * mbscasestr_template (T* haystack, const char *needle);
+template <>
+  inline char * mbscasestr_template (char *haystack, const char *needle)
+  { return mbscasestr (haystack, needle); }
+template <>
+  inline const char * mbscasestr_template (const char *haystack, const char *needle)
+  { return mbscasestr (haystack, needle); }
+}
+#   undef mbscasestr
+#   define mbscasestr mbscasestr_template
+#  elif !defined mbscasestr
+#   if ((__GNUC__ + (__GNUC_MINOR__ >= 9) > 4) || (__clang_major__ >= 3) \
+        || defined __ICC  || defined __TINYC__ \
+        || (__STDC_VERSION__ >= 201112L && !(defined __GNUC__ || defined __clang__)))
+#    define mbscasestr(h,n) \
+       _Generic ((h), \
+                 char const *: (char const *) mbscasestr ((h), (n)), \
+                 default     :                mbscasestr ((h), (n)))
+#   endif
+#  endif
+# endif
 #endif
 
 #if @GNULIB_MBSCSPN@
@@ -1234,12 +1475,12 @@ _GL_EXTERN_C size_t mbscspn (const char *string, const char *accept)
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define mbspbrk rpl_mbspbrk /* avoid collision with HP-UX function */
 #  endif
-_GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept)
+_GL_FUNCDECL_RPL (mbspbrk, char *, (const char *string, const char *accept),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (mbspbrk, char *, (const char *string, const char *accept));
 # else
-_GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept)
+_GL_FUNCDECL_SYS (mbspbrk, char *, (const char *string, const char *accept),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_SYS (mbspbrk, char *, (const char *string, const char *accept));
@@ -1299,6 +1540,26 @@ _GL_EXTERN_C char * mbstok_r (char *restrict string, const char *delim,
      _GL_ARG_NONNULL ((2, 3));
 #endif
 
+#if @GNULIB_MBS_STARTSWITH@
+/* Returns true if STRING starts with PREFIX.
+   Returns false otherwise.  */
+_GL_EXTERN_C bool mbs_startswith (const char *string, const char *prefix)
+     _GL_ATTRIBUTE_PURE
+     _GL_ARG_NONNULL ((1, 2));
+/* No extra code is needed for multibyte locales for this function.  */
+# define mbs_startswith str_startswith
+#endif
+
+#if @GNULIB_MBS_ENDSWITH@
+/* Returns true if STRING ends with SUFFIX.
+   Returns false otherwise.
+   Unlike str_endswith(), this function works correctly in multibyte locales.
+ */
+_GL_EXTERN_C bool mbs_endswith (const char *string, const char *suffix)
+     _GL_ATTRIBUTE_PURE
+     _GL_ARG_NONNULL ((1, 2));
+#endif
+
 /* Map any int, typically from errno, into an error message.  */
 #if @GNULIB_STRERROR@
 # if @REPLACE_STRERROR@
@@ -1306,7 +1567,7 @@ _GL_EXTERN_C char * mbstok_r (char *restrict string, const char *delim,
 #   undef strerror
 #   define strerror rpl_strerror
 #  endif
-_GL_FUNCDECL_RPL (strerror, char *, (int));
+_GL_FUNCDECL_RPL (strerror, char *, (int), );
 _GL_CXXALIAS_RPL (strerror, char *, (int));
 # else
 _GL_CXXALIAS_SYS (strerror, char *, (int));
@@ -1329,12 +1590,12 @@ _GL_WARN_ON_USE (strerror, "strerror is unportable - "
 #   undef strerror_r
 #   define strerror_r rpl_strerror_r
 #  endif
-_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen)
+_GL_FUNCDECL_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen),
                                    _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (strerror_r, int, (int errnum, char *buf, size_t buflen));
 # else
 #  if !@HAVE_DECL_STRERROR_R@
-_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)
+_GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen),
                                    _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
@@ -1350,6 +1611,44 @@ _GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - "
 # endif
 #endif
 
+/* Map any int, typically from errno, into an error message.
+   With locale_t argument.  */
+#if @GNULIB_STRERROR_L@
+# if @REPLACE_STRERROR_L@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strerror_l
+#   define strerror_l rpl_strerror_l
+#  endif
+_GL_FUNCDECL_RPL (strerror_l, char *, (int errnum, locale_t locale),
+                                                   _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (strerror_l, char *, (int errnum, locale_t locale));
+# else
+#  if !@HAVE_STRERROR_L@
+_GL_FUNCDECL_SYS (strerror_l, char *, (int errnum, locale_t locale),
+                                                   _GL_ARG_NONNULL ((2)));
+#  endif
+_GL_CXXALIAS_SYS (strerror_l, char *, (int errnum, locale_t locale));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (strerror_l);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strerror_l
+# if HAVE_RAW_DECL_STRERROR_L
+_GL_WARN_ON_USE (strerror_l, "strerror_l is unportable - "
+                 "use gnulib module strerror_l for portability");
+# endif
+#endif
+
+/* Map any int, typically from errno, into an error message.  Multithread-safe,
+   with locale_t argument.
+   Not portable! Only provided by gnulib.  */
+#if @GNULIB_STRERROR_L@
+_GL_FUNCDECL_SYS (strerror_l_r, int,
+                  (int errnum, char *buf, size_t buflen, locale_t locale),
+                  _GL_ARG_NONNULL ((2, 4)));
+#endif
+
 /* Return the name of the system error code ERRNUM.  */
 #if @GNULIB_STRERRORNAME_NP@
 # if @REPLACE_STRERRORNAME_NP@
@@ -1357,15 +1656,17 @@ _GL_WARN_ON_USE (strerror_r, "strerror_r is unportable - "
 #   undef strerrorname_np
 #   define strerrorname_np rpl_strerrorname_np
 #  endif
-_GL_FUNCDECL_RPL (strerrorname_np, const char *, (int errnum));
+_GL_FUNCDECL_RPL (strerrorname_np, const char *, (int errnum), );
 _GL_CXXALIAS_RPL (strerrorname_np, const char *, (int errnum));
 # else
 #  if !@HAVE_STRERRORNAME_NP@
-_GL_FUNCDECL_SYS (strerrorname_np, const char *, (int errnum));
+_GL_FUNCDECL_SYS (strerrorname_np, const char *, (int errnum), );
 #  endif
 _GL_CXXALIAS_SYS (strerrorname_np, const char *, (int errnum));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (strerrorname_np);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef strerrorname_np
 # if HAVE_RAW_DECL_STRERRORNAME_NP
@@ -1377,7 +1678,7 @@ _GL_WARN_ON_USE (strerrorname_np, "strerrorname_np is unportable - "
 /* Return an abbreviation string for the signal number SIG.  */
 #if @GNULIB_SIGABBREV_NP@
 # if ! @HAVE_SIGABBREV_NP@
-_GL_FUNCDECL_SYS (sigabbrev_np, const char *, (int sig));
+_GL_FUNCDECL_SYS (sigabbrev_np, const char *, (int sig), );
 # endif
 _GL_CXXALIAS_SYS (sigabbrev_np, const char *, (int sig));
 _GL_CXXALIASWARN (sigabbrev_np);
@@ -1392,7 +1693,7 @@ _GL_WARN_ON_USE (sigabbrev_np, "sigabbrev_np is unportable - "
 /* Return an English description string for the signal number SIG.  */
 #if @GNULIB_SIGDESCR_NP@
 # if ! @HAVE_SIGDESCR_NP@
-_GL_FUNCDECL_SYS (sigdescr_np, const char *, (int sig));
+_GL_FUNCDECL_SYS (sigdescr_np, const char *, (int sig), );
 # endif
 _GL_CXXALIAS_SYS (sigdescr_np, const char *, (int sig));
 _GL_CXXALIASWARN (sigdescr_np);
@@ -1409,11 +1710,11 @@ _GL_WARN_ON_USE (sigdescr_np, "sigdescr_np is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define strsignal rpl_strsignal
 #  endif
-_GL_FUNCDECL_RPL (strsignal, char *, (int __sig));
+_GL_FUNCDECL_RPL (strsignal, char *, (int __sig), );
 _GL_CXXALIAS_RPL (strsignal, char *, (int __sig));
 # else
 #  if ! @HAVE_DECL_STRSIGNAL@
-_GL_FUNCDECL_SYS (strsignal, char *, (int __sig));
+_GL_FUNCDECL_SYS (strsignal, char *, (int __sig), );
 #  endif
 /* Need to cast, because on Cygwin 1.5.x systems, the return type is
    'const char *'.  */
@@ -1433,13 +1734,13 @@ _GL_WARN_ON_USE (strsignal, "strsignal is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define strverscmp rpl_strverscmp
 #  endif
-_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *)
+_GL_FUNCDECL_RPL (strverscmp, int, (const char *, const char *),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (strverscmp, int, (const char *, const char *));
 # else
 #  if !@HAVE_STRVERSCMP@
-_GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *)
+_GL_FUNCDECL_SYS (strverscmp, int, (const char *, const char *),
                                    _GL_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
 #  endif
diff --git a/gl/strings.in.h b/gl/strings.in.h
index 2b3e062a..40c891d7 100644
--- a/gl/strings.in.h
+++ b/gl/strings.in.h
@@ -1,6 +1,6 @@
 /* A substitute <strings.h>.
 
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -36,7 +36,7 @@
 #ifndef _@GUARD_PREFIX@_STRINGS_H
 #define _@GUARD_PREFIX@_STRINGS_H
 
-/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+/* This file uses _GL_ARG_NONNULL, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
 #if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
@@ -46,6 +46,16 @@
 # include <stddef.h>
 #endif
 
+#if @GNULIB_STRCASECMP_L@ || @GNULIB_STRNCASECMP_L@
+/* Get locale_t.  */
+# include <locale.h>
+# if ((__GLIBC__ == 2 && __GLIBC_MINOR__ < 10) \
+      || (defined __APPLE__ && defined __MACH__))
+/* Get the declaration of strcasecmp_l.  */
+#  include <string.h>
+# endif
+#endif
+
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
@@ -58,10 +68,10 @@ extern "C" {
 #endif
 
 
-  /* Find the index of the least-significant set bit.  */
 #if @GNULIB_FFS@
+/* Find the index of the least-significant set bit.  */
 # if !@HAVE_FFS@
-_GL_FUNCDECL_SYS (ffs, int, (int i));
+_GL_FUNCDECL_SYS (ffs, int, (int i), );
 # endif
 _GL_CXXALIAS_SYS (ffs, int, (int i));
 _GL_CXXALIASWARN (ffs);
@@ -72,52 +82,152 @@ _GL_WARN_ON_USE (ffs, "ffs is not portable - use the ffs module");
 # endif
 #endif
 
+#if @GNULIB_STRCASECMP@
 /* Compare strings S1 and S2, ignoring case, returning less than, equal to or
    greater than zero if S1 is lexicographically less than, equal to or greater
    than S2.
    Note: This function does not work in multibyte locales.  */
-#if ! @HAVE_STRCASECMP@
-extern int strcasecmp (char const *s1, char const *s2)
-     _GL_ARG_NONNULL ((1, 2));
-#endif
-#if defined GNULIB_POSIXCHECK
+# if @REPLACE_STRCASECMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strcasecmp
+#   define strcasecmp rpl_strcasecmp
+#  endif
+_GL_FUNCDECL_RPL (strcasecmp, int, (const char *, const char *),
+                                   _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (strcasecmp, int, (const char *, const char *));
+# else
+#  if !@HAVE_STRCASECMP@
+_GL_FUNCDECL_SYS (strcasecmp, int, (const char *, const char *),
+                                   _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (strcasecmp, int, (const char *, const char *));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (strcasecmp);
+# endif
+#elif defined GNULIB_POSIXCHECK
 /* strcasecmp() does not work with multibyte strings:
    POSIX says that it operates on "strings", and "string" in POSIX is defined
    as a sequence of bytes, not of characters.   */
 # undef strcasecmp
 # if HAVE_RAW_DECL_STRCASECMP
 _GL_WARN_ON_USE (strcasecmp, "strcasecmp cannot work correctly on character "
-                 "strings in multibyte locales - "
+                 "strings in multibyte locales and is unportable - "
                  "use mbscasecmp if you care about "
-                 "internationalization, or use c_strcasecmp , "
-                 "gnulib module c-strcase) if you want a locale "
+                 "internationalization, or use c_strcasecmp "
+                 "(gnulib module c-strcasecmp) if you want a locale "
                  "independent function");
 # endif
 #endif
 
+#if @GNULIB_STRCASECMP_L@
+# if @REPLACE_STRCASECMP_L@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strcasecmp_l
+#   define strcasecmp_l rpl_strcasecmp_l
+#  endif
+_GL_FUNCDECL_RPL (strcasecmp_l, int,
+                  (const char *s1, const char *s2, locale_t locale),
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+_GL_CXXALIAS_RPL (strcasecmp_l, int,
+                  (const char *s1, const char *s2, locale_t locale));
+# else
+#  if !@HAVE_STRCASECMP_L@
+_GL_FUNCDECL_SYS (strcasecmp_l, int,
+                  (const char *s1, const char *s2, locale_t locale),
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+#  endif
+_GL_CXXALIAS_SYS (strcasecmp_l, int,
+                  (const char *s1, const char *s2, locale_t locale));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (strcasecmp_l);
+# endif
+#elif defined GNULIB_POSIXCHECK
+/* strcasecmp_l() does not work with multibyte strings:
+   POSIX says that it operates on "strings", and "string" in POSIX is defined
+   as a sequence of bytes, not of characters.   */
+# undef strcasecmp_l
+# if HAVE_RAW_DECL_STRCASECMP_L
+_GL_WARN_ON_USE (strcasecmp_l, "strcasecmp_l cannot work correctly on "
+                 "character strings in multibyte locales and is unportable - "
+                 "use gnulib module strcasecmp_l for portability");
+# endif
+#endif
+
+#if @GNULIB_STRNCASECMP@
 /* Compare no more than N bytes of strings S1 and S2, ignoring case,
    returning less than, equal to or greater than zero if S1 is
    lexicographically less than, equal to or greater than S2.
    Note: This function cannot work correctly in multibyte locales.  */
-#if ! @HAVE_DECL_STRNCASECMP@
-extern int strncasecmp (char const *s1, char const *s2, size_t n)
-     _GL_ARG_NONNULL ((1, 2));
-#endif
-#if defined GNULIB_POSIXCHECK
+# if @REPLACE_STRNCASECMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strncasecmp
+#   define strncasecmp rpl_strncasecmp
+#  endif
+_GL_FUNCDECL_RPL (strncasecmp, int, (const char *, const char *, size_t),
+                                    _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (strncasecmp, int, (const char *, const char *, size_t));
+# else
+#  if !@HAVE_DECL_STRNCASECMP@
+_GL_FUNCDECL_SYS (strncasecmp, int, (const char *, const char *, size_t),
+                                    _GL_ARG_NONNULL ((1, 2)));
+#  endif
+_GL_CXXALIAS_SYS (strncasecmp, int, (const char *, const char *, size_t));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (strncasecmp);
+# endif
+#elif defined GNULIB_POSIXCHECK
 /* strncasecmp() does not work with multibyte strings:
    POSIX says that it operates on "strings", and "string" in POSIX is defined
    as a sequence of bytes, not of characters.  */
 # undef strncasecmp
 # if HAVE_RAW_DECL_STRNCASECMP
 _GL_WARN_ON_USE (strncasecmp, "strncasecmp cannot work correctly on character "
-                 "strings in multibyte locales - "
+                 "strings in multibyte locales and is unportable - "
                  "use mbsncasecmp or mbspcasecmp if you care about "
-                 "internationalization, or use c_strncasecmp , "
-                 "gnulib module c-strcase) if you want a locale "
+                 "internationalization, or use c_strncasecmp "
+                 "(gnulib module c-strncasecmp) if you want a locale "
                  "independent function");
 # endif
 #endif
 
+#if @GNULIB_STRNCASECMP_L@
+# if @REPLACE_STRNCASECMP_L@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef strncasecmp_l
+#   define strncasecmp_l rpl_strncasecmp_l
+#  endif
+_GL_FUNCDECL_RPL (strncasecmp_l, int,
+                  (const char *s1, const char *s2, size_t n, locale_t locale),
+                  _GL_ARG_NONNULL ((1, 2, 4)));
+_GL_CXXALIAS_RPL (strncasecmp_l, int,
+                  (const char *s1, const char *s2, size_t n, locale_t locale));
+# else
+#  if !@HAVE_STRNCASECMP_L@
+_GL_FUNCDECL_SYS (strncasecmp_l, int,
+                  (const char *s1, const char *s2, size_t n, locale_t locale),
+                  _GL_ARG_NONNULL ((1, 2, 4)));
+#  endif
+_GL_CXXALIAS_SYS (strncasecmp_l, int,
+                  (const char *s1, const char *s2, size_t n, locale_t locale));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (strncasecmp_l);
+# endif
+#elif defined GNULIB_POSIXCHECK
+/* strncasecmp_l() does not work with multibyte strings:
+   POSIX says that it operates on "strings", and "string" in POSIX is defined
+   as a sequence of bytes, not of characters.   */
+# undef strncasecmp_l
+# if HAVE_RAW_DECL_STRNCASECMP_L
+_GL_WARN_ON_USE (strncasecmp_l, "strncasecmp_l cannot work correctly on "
+                 "character strings in multibyte locales and is unportable - "
+                 "use gnulib module strncasecmp_l for portability");
+# endif
+#endif
+
 
 #ifdef __cplusplus
 }
diff --git a/gl/stripslash.c b/gl/stripslash.c
index c127ce7e..d5b07bca 100644
--- a/gl/stripslash.c
+++ b/gl/stripslash.c
@@ -1,6 +1,6 @@
 /* stripslash.c -- remove redundant trailing slashes from a file name
 
-   Copyright (C) 1990, 2001, 2003-2006, 2009-2024 Free Software Foundation,
+   Copyright (C) 1990, 2001, 2003-2006, 2009-2025 Free Software Foundation,
    Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/strncasecmp.c b/gl/strncasecmp.c
index c79161f3..7d7c5b7f 100644
--- a/gl/strncasecmp.c
+++ b/gl/strncasecmp.c
@@ -1,5 +1,5 @@
-/* strncasecmp.c -- case insensitive string comparator
-   Copyright (C) 1998-1999, 2005-2007, 2009-2024 Free Software Foundation, Inc.
+/* Case-insensitive string comparison function for unibyte locales.
+   Copyright (C) 1998-1999, 2005-2007, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
 #include <config.h>
 
 /* Specification.  */
-#include <string.h>
+#include <strings.h>
 
 #include <ctype.h>
 #include <limits.h>
diff --git a/gl/strncpy.c b/gl/strncpy.c
new file mode 100644
index 00000000..1b680046
--- /dev/null
+++ b/gl/strncpy.c
@@ -0,0 +1,38 @@
+/* Copy a size-bounded string.
+   Copyright (C) 1999, 2011-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation, either version 3 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 1999.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <string.h>
+
+char *
+strncpy (char *dest, const char *src, size_t n)
+{
+  char *destptr = dest;
+
+  for (; n > 0 && (*destptr = *src) != '\0'; src++, destptr++, n--)
+    ;
+
+  /* This behavior is rarely useful, but it is specified by the ISO C
+     standard.  */
+  for (; n > 0; n--)
+    *destptr++ = '\0';
+
+  return dest;
+}
diff --git a/gl/strsep.c b/gl/strsep.c
index eefd85e2..5a489d11 100644
--- a/gl/strsep.c
+++ b/gl/strsep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2007, 2009-2024 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2007, 2009-2025 Free Software Foundation, Inc.
 
    Written by Yoann Vandoorselaere <yoann@prelude-ids.org>.
 
diff --git a/gl/strstr.c b/gl/strstr.c
index 7ea28603..d6953f90 100644
--- a/gl/strstr.c
+++ b/gl/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2024 Free Software
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2025 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/gl/sys-limits.h b/gl/sys-limits.h
index d2f29d80..a556dfeb 100644
--- a/gl/sys-limits.h
+++ b/gl/sys-limits.h
@@ -1,6 +1,6 @@
 /* System call limits
 
-   Copyright 2018-2024 Free Software Foundation, Inc.
+   Copyright 2018-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/sys_socket.c b/gl/sys_socket.c
index 672d3aac..efd36610 100644
--- a/gl/sys_socket.c
+++ b/gl/sys_socket.c
@@ -1,6 +1,6 @@
 /* Inline functions for <sys/socket.h>.
 
-   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+   Copyright (C) 2012-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+#define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE
 #include <config.h>
 
-#define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE
 #include <sys/socket.h>
 typedef int dummy;
diff --git a/gl/sys_socket.in.h b/gl/sys_socket.in.h
index 13833c0f..8632c66d 100644
--- a/gl/sys_socket.in.h
+++ b/gl/sys_socket.in.h
@@ -1,6 +1,6 @@
 /* Provide a sys/socket header file for systems lacking it (read: MinGW)
    and for systems where it is incomplete.
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This file is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
 #endif
 @PRAGMA_COLUMNS@
 
-#if defined _GL_ALREADY_INCLUDING_SYS_SOCKET_H
+#if defined _@GUARD_PREFIX@_ALREADY_INCLUDING_SYS_SOCKET_H
 /* Special invocation convention:
    - On Cygwin 1.5.x we have a sequence of nested includes
      <sys/socket.h> -> <cygwin/socket.h> -> <asm/socket.h> -> <cygwin/if.h>,
@@ -43,7 +43,7 @@
 
 #if @HAVE_SYS_SOCKET_H@
 
-# define _GL_ALREADY_INCLUDING_SYS_SOCKET_H
+# define _@GUARD_PREFIX@_ALREADY_INCLUDING_SYS_SOCKET_H
 
 /* On many platforms, <sys/socket.h> assumes prior inclusion of
    <sys/types.h>.  */
@@ -56,7 +56,7 @@
 /* The include_next requires a split double-inclusion guard.  */
 # @INCLUDE_NEXT@ @NEXT_SYS_SOCKET_H@
 
-# undef _GL_ALREADY_INCLUDING_SYS_SOCKET_H
+# undef _@GUARD_PREFIX@_ALREADY_INCLUDING_SYS_SOCKET_H
 
 #endif
 
@@ -202,6 +202,7 @@ struct sockaddr_storage
 
 /* Rudimentary 'struct msghdr'; this works as long as you don't try to
    access msg_control or msg_controllen.  */
+# if !defined GNULIB_defined_struct_msghdr
 struct msghdr {
   void *msg_name;
   socklen_t msg_namelen;
@@ -209,6 +210,8 @@ struct msghdr {
   int msg_iovlen;
   int msg_flags;
 };
+#  define GNULIB_defined_struct_msghdr 1
+# endif
 
 #endif
 
@@ -289,15 +292,17 @@ rpl_fd_isset (SOCKET fd, fd_set * set)
 #   undef socket
 #   define socket rpl_socket
 #  endif
-_GL_FUNCDECL_RPL (socket, int, (int domain, int type, int protocol));
+_GL_FUNCDECL_RPL (socket, int, (int domain, int type, int protocol), );
 _GL_CXXALIAS_RPL (socket, int, (int domain, int type, int protocol));
 # else
 _GL_CXXALIAS_SYS (socket, int, (int domain, int type, int protocol));
 # endif
 _GL_CXXALIASWARN (socket);
 #elif @HAVE_WINSOCK2_H@
-# undef socket
-# define socket socket_used_without_requesting_gnulib_module_socket
+# if !GNULIB_SOCKET
+#  undef socket
+#  define socket socket_used_without_requesting_gnulib_module_socket
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef socket
 # if HAVE_RAW_DECL_SOCKET
@@ -313,7 +318,7 @@ _GL_WARN_ON_USE (socket, "socket is not always POSIX compliant - "
 #   define connect rpl_connect
 #  endif
 _GL_FUNCDECL_RPL (connect, int,
-                  (int fd, const struct sockaddr *addr, socklen_t addrlen)
+                  (int fd, const struct sockaddr *addr, socklen_t addrlen),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (connect, int,
                   (int fd, const struct sockaddr *addr, socklen_t addrlen));
@@ -326,8 +331,10 @@ _GL_CXXALIAS_SYS_CAST (connect, int,
 # endif
 _GL_CXXALIASWARN (connect);
 #elif @HAVE_WINSOCK2_H@
-# undef connect
-# define connect socket_used_without_requesting_gnulib_module_connect
+# if !GNULIB_CONNECT
+#  undef connect
+#  define connect connect_used_without_requesting_gnulib_module_connect
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef connect
 # if HAVE_RAW_DECL_CONNECT
@@ -345,7 +352,7 @@ _GL_WARN_ON_USE (connect, "connect is not always POSIX compliant - "
 _GL_FUNCDECL_RPL (accept, int,
                   (int fd,
                    struct sockaddr *restrict addr,
-                   socklen_t *restrict addrlen));
+                   socklen_t *restrict addrlen), );
 _GL_CXXALIAS_RPL (accept, int,
                   (int fd,
                    struct sockaddr *restrict addr,
@@ -362,8 +369,10 @@ _GL_CXXALIAS_SYS_CAST (accept, int,
 _GL_CXXALIASWARN (accept);
 # endif
 #elif @HAVE_WINSOCK2_H@
-# undef accept
-# define accept accept_used_without_requesting_gnulib_module_accept
+# if !GNULIB_ACCEPT
+#  undef accept
+#  define accept accept_used_without_requesting_gnulib_module_accept
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef accept
 # if HAVE_RAW_DECL_ACCEPT
@@ -379,7 +388,7 @@ _GL_WARN_ON_USE (accept, "accept is not always POSIX compliant - "
 #   define bind rpl_bind
 #  endif
 _GL_FUNCDECL_RPL (bind, int,
-                  (int fd, const struct sockaddr *addr, socklen_t addrlen)
+                  (int fd, const struct sockaddr *addr, socklen_t addrlen),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (bind, int,
                   (int fd, const struct sockaddr *addr, socklen_t addrlen));
@@ -392,8 +401,10 @@ _GL_CXXALIAS_SYS_CAST (bind, int,
 # endif
 _GL_CXXALIASWARN (bind);
 #elif @HAVE_WINSOCK2_H@
-# undef bind
-# define bind bind_used_without_requesting_gnulib_module_bind
+# if !GNULIB_BIND
+#  undef bind
+#  define bind bind_used_without_requesting_gnulib_module_bind
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef bind
 # if HAVE_RAW_DECL_BIND
@@ -410,7 +421,7 @@ _GL_WARN_ON_USE (bind, "bind is not always POSIX compliant - "
 #  endif
 _GL_FUNCDECL_RPL (getpeername, int,
                   (int fd, struct sockaddr *restrict addr,
-                   socklen_t *restrict addrlen)
+                   socklen_t *restrict addrlen),
                   _GL_ARG_NONNULL ((2, 3)));
 _GL_CXXALIAS_RPL (getpeername, int,
                   (int fd, struct sockaddr *restrict addr,
@@ -426,8 +437,10 @@ _GL_CXXALIAS_SYS_CAST (getpeername, int,
 _GL_CXXALIASWARN (getpeername);
 # endif
 #elif @HAVE_WINSOCK2_H@
-# undef getpeername
-# define getpeername getpeername_used_without_requesting_gnulib_module_getpeername
+# if !GNULIB_GETPEERNAME
+#  undef getpeername
+#  define getpeername getpeername_used_without_requesting_gnulib_module_getpeername
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getpeername
 # if HAVE_RAW_DECL_GETPEERNAME
@@ -444,7 +457,7 @@ _GL_WARN_ON_USE (getpeername, "getpeername is not always POSIX compliant - "
 #  endif
 _GL_FUNCDECL_RPL (getsockname, int,
                   (int fd, struct sockaddr *restrict addr,
-                   socklen_t *restrict addrlen)
+                   socklen_t *restrict addrlen),
                   _GL_ARG_NONNULL ((2, 3)));
 _GL_CXXALIAS_RPL (getsockname, int,
                   (int fd, struct sockaddr *restrict addr,
@@ -460,8 +473,10 @@ _GL_CXXALIAS_SYS_CAST (getsockname, int,
 _GL_CXXALIASWARN (getsockname);
 # endif
 #elif @HAVE_WINSOCK2_H@
-# undef getsockname
-# define getsockname getsockname_used_without_requesting_gnulib_module_getsockname
+# if !GNULIB_GETSOCKNAME
+#  undef getsockname
+#  define getsockname getsockname_used_without_requesting_gnulib_module_getsockname
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getsockname
 # if HAVE_RAW_DECL_GETSOCKNAME
@@ -478,7 +493,7 @@ _GL_WARN_ON_USE (getsockname, "getsockname is not always POSIX compliant - "
 #  endif
 _GL_FUNCDECL_RPL (getsockopt, int,
                   (int fd, int level, int optname,
-                   void *restrict optval, socklen_t *restrict optlen)
+                   void *restrict optval, socklen_t *restrict optlen),
                   _GL_ARG_NONNULL ((4, 5)));
 _GL_CXXALIAS_RPL (getsockopt, int,
                   (int fd, int level, int optname,
@@ -492,8 +507,10 @@ _GL_CXXALIAS_SYS_CAST (getsockopt, int,
 # endif
 _GL_CXXALIASWARN (getsockopt);
 #elif @HAVE_WINSOCK2_H@
-# undef getsockopt
-# define getsockopt getsockopt_used_without_requesting_gnulib_module_getsockopt
+# if !GNULIB_GETSOCKOPT
+#  undef getsockopt
+#  define getsockopt getsockopt_used_without_requesting_gnulib_module_getsockopt
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getsockopt
 # if HAVE_RAW_DECL_GETSOCKOPT
@@ -508,15 +525,17 @@ _GL_WARN_ON_USE (getsockopt, "getsockopt is not always POSIX compliant - "
 #   undef listen
 #   define listen rpl_listen
 #  endif
-_GL_FUNCDECL_RPL (listen, int, (int fd, int backlog));
+_GL_FUNCDECL_RPL (listen, int, (int fd, int backlog), );
 _GL_CXXALIAS_RPL (listen, int, (int fd, int backlog));
 # else
 _GL_CXXALIAS_SYS (listen, int, (int fd, int backlog));
 # endif
 _GL_CXXALIASWARN (listen);
 #elif @HAVE_WINSOCK2_H@
-# undef listen
-# define listen listen_used_without_requesting_gnulib_module_listen
+# if !GNULIB_LISTEN
+#  undef listen
+#  define listen listen_used_without_requesting_gnulib_module_listen
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef listen
 # if HAVE_RAW_DECL_LISTEN
@@ -531,7 +550,7 @@ _GL_WARN_ON_USE (listen, "listen is not always POSIX compliant - "
 #   undef recv
 #   define recv rpl_recv
 #  endif
-_GL_FUNCDECL_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags)
+_GL_FUNCDECL_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags),
                                  _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (recv, ssize_t, (int fd, void *buf, size_t len, int flags));
 # else
@@ -542,8 +561,10 @@ _GL_CXXALIAS_SYS_CAST (recv, ssize_t, (int fd, void *buf, size_t len, int flags)
 # endif
 _GL_CXXALIASWARN (recv);
 #elif @HAVE_WINSOCK2_H@
-# undef recv
-# define recv recv_used_without_requesting_gnulib_module_recv
+# if !GNULIB_RECV
+#  undef recv
+#  define recv recv_used_without_requesting_gnulib_module_recv
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef recv
 # if HAVE_RAW_DECL_RECV
@@ -559,7 +580,7 @@ _GL_WARN_ON_USE (recv, "recv is not always POSIX compliant - "
 #   define send rpl_send
 #  endif
 _GL_FUNCDECL_RPL (send, ssize_t,
-                  (int fd, const void *buf, size_t len, int flags)
+                  (int fd, const void *buf, size_t len, int flags),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (send, ssize_t,
                   (int fd, const void *buf, size_t len, int flags));
@@ -572,8 +593,10 @@ _GL_CXXALIAS_SYS_CAST (send, ssize_t,
 # endif
 _GL_CXXALIASWARN (send);
 #elif @HAVE_WINSOCK2_H@
-# undef send
-# define send send_used_without_requesting_gnulib_module_send
+# if !GNULIB_SEND
+#  undef send
+#  define send send_used_without_requesting_gnulib_module_send
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef send
 # if HAVE_RAW_DECL_SEND
@@ -591,7 +614,7 @@ _GL_WARN_ON_USE (send, "send is not always POSIX compliant - "
 _GL_FUNCDECL_RPL (recvfrom, ssize_t,
                   (int fd, void *restrict buf, size_t len, int flags,
                    struct sockaddr *restrict from,
-                   socklen_t *restrict fromlen)
+                   socklen_t *restrict fromlen),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (recvfrom, ssize_t,
                   (int fd, void *restrict buf, size_t len, int flags,
@@ -609,8 +632,10 @@ _GL_CXXALIAS_SYS_CAST (recvfrom, ssize_t,
 _GL_CXXALIASWARN (recvfrom);
 # endif
 #elif @HAVE_WINSOCK2_H@
-# undef recvfrom
-# define recvfrom recvfrom_used_without_requesting_gnulib_module_recvfrom
+# if !GNULIB_RECVFROM
+#  undef recvfrom
+#  define recvfrom recvfrom_used_without_requesting_gnulib_module_recvfrom
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef recvfrom
 # if HAVE_RAW_DECL_RECVFROM
@@ -627,7 +652,7 @@ _GL_WARN_ON_USE (recvfrom, "recvfrom is not always POSIX compliant - "
 #  endif
 _GL_FUNCDECL_RPL (sendto, ssize_t,
                   (int fd, const void *buf, size_t len, int flags,
-                   const struct sockaddr *to, socklen_t tolen)
+                   const struct sockaddr *to, socklen_t tolen),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (sendto, ssize_t,
                   (int fd, const void *buf, size_t len, int flags,
@@ -641,8 +666,10 @@ _GL_CXXALIAS_SYS_CAST (sendto, ssize_t,
 # endif
 _GL_CXXALIASWARN (sendto);
 #elif @HAVE_WINSOCK2_H@
-# undef sendto
-# define sendto sendto_used_without_requesting_gnulib_module_sendto
+# if !GNULIB_SENDTO
+#  undef sendto
+#  define sendto sendto_used_without_requesting_gnulib_module_sendto
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef sendto
 # if HAVE_RAW_DECL_SENDTO
@@ -658,7 +685,7 @@ _GL_WARN_ON_USE (sendto, "sendto is not always POSIX compliant - "
 #   define setsockopt rpl_setsockopt
 #  endif
 _GL_FUNCDECL_RPL (setsockopt, int, (int fd, int level, int optname,
-                                    const void * optval, socklen_t optlen)
+                                    const void * optval, socklen_t optlen),
                                    _GL_ARG_NONNULL ((4)));
 _GL_CXXALIAS_RPL (setsockopt, int, (int fd, int level, int optname,
                                     const void * optval, socklen_t optlen));
@@ -671,8 +698,10 @@ _GL_CXXALIAS_SYS_CAST (setsockopt, int,
 # endif
 _GL_CXXALIASWARN (setsockopt);
 #elif @HAVE_WINSOCK2_H@
-# undef setsockopt
-# define setsockopt setsockopt_used_without_requesting_gnulib_module_setsockopt
+# if !GNULIB_SETSOCKOPT
+#  undef setsockopt
+#  define setsockopt setsockopt_used_without_requesting_gnulib_module_setsockopt
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef setsockopt
 # if HAVE_RAW_DECL_SETSOCKOPT
@@ -687,15 +716,17 @@ _GL_WARN_ON_USE (setsockopt, "setsockopt is not always POSIX compliant - "
 #   undef shutdown
 #   define shutdown rpl_shutdown
 #  endif
-_GL_FUNCDECL_RPL (shutdown, int, (int fd, int how));
+_GL_FUNCDECL_RPL (shutdown, int, (int fd, int how), );
 _GL_CXXALIAS_RPL (shutdown, int, (int fd, int how));
 # else
 _GL_CXXALIAS_SYS (shutdown, int, (int fd, int how));
 # endif
 _GL_CXXALIASWARN (shutdown);
 #elif @HAVE_WINSOCK2_H@
-# undef shutdown
-# define shutdown shutdown_used_without_requesting_gnulib_module_shutdown
+# if !GNULIB_SHUTDOWN
+#  undef shutdown
+#  define shutdown shutdown_used_without_requesting_gnulib_module_shutdown
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef shutdown
 # if HAVE_RAW_DECL_SHUTDOWN
@@ -716,14 +747,14 @@ _GL_WARN_ON_USE (shutdown, "shutdown is not always POSIX compliant - "
 #  endif
 _GL_FUNCDECL_RPL (accept4, int,
                   (int sockfd, struct sockaddr *addr, socklen_t *addrlen,
-                   int flags));
+                   int flags), );
 _GL_CXXALIAS_RPL (accept4, int,
                   (int sockfd, struct sockaddr *addr, socklen_t *addrlen,
                    int flags));
 # else
 _GL_FUNCDECL_SYS (accept4, int,
                   (int sockfd, struct sockaddr *addr, socklen_t *addrlen,
-                   int flags));
+                   int flags), );
 _GL_CXXALIAS_SYS (accept4, int,
                   (int sockfd, struct sockaddr *addr, socklen_t *addrlen,
                    int flags));
diff --git a/gl/sys_stat.in.h b/gl/sys_stat.in.h
index bf08f335..c3c38fd6 100644
--- a/gl/sys_stat.in.h
+++ b/gl/sys_stat.in.h
@@ -1,5 +1,5 @@
 /* Provide a more complete sys/stat.h header file.
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -55,7 +55,8 @@
 #ifndef _@GUARD_PREFIX@_SYS_STAT_H
 #define _@GUARD_PREFIX@_SYS_STAT_H
 
-/* This file uses _GL_ATTRIBUTE_NOTHROW, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+/* This file uses _GL_ATTRIBUTE_NODISCARD, _GL_ATTRIBUTE_NOTHROW,
+   GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
 #if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
@@ -65,7 +66,7 @@
  */
 #ifndef _GL_ATTRIBUTE_NOTHROW
 # if defined __cplusplus
-#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major__ >= 4
 #   if __cplusplus >= 201103L
 #    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
 #   else
@@ -122,9 +123,11 @@
 # if @GNULIB_STAT@
 #  define stat rpl_stat
 # else
-   /* Provoke a clear link error if stat() is used as a function and
-      module 'stat' is not in use.  */
-#  define stat stat_used_without_requesting_gnulib_module_stat
+#  if !GNULIB_STAT
+    /* Provoke a clear link error if stat() is used as a function and
+       module 'stat' is not in use.  */
+#   define stat stat_used_without_requesting_gnulib_module_stat
+#  endif
 # endif
 
 # if !GNULIB_defined_struct_stat
@@ -433,7 +436,7 @@ struct stat
 #   undef chmod
 #   define chmod rpl_chmod
 #  endif
-_GL_FUNCDECL_RPL (chmod, int, (const char *filename, mode_t mode)
+_GL_FUNCDECL_RPL (chmod, int, (const char *filename, mode_t mode),
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (chmod, int, (const char *filename, mode_t mode));
 # elif defined _WIN32 && !defined __CYGWIN__
@@ -478,15 +481,15 @@ _GL_CXXALIASWARN (chmod);
 #   define fchmodat rpl_fchmodat
 #  endif
 _GL_FUNCDECL_RPL (fchmodat, int,
-                  (int fd, char const *file, mode_t mode, int flag)
-                  _GL_ARG_NONNULL ((2)));
+                  (int fd, char const *file, mode_t mode, int flag),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (fchmodat, int,
                   (int fd, char const *file, mode_t mode, int flag));
 # else
 #  if !@HAVE_FCHMODAT@
 _GL_FUNCDECL_SYS (fchmodat, int,
-                  (int fd, char const *file, mode_t mode, int flag)
-                  _GL_ARG_NONNULL ((2)));
+                  (int fd, char const *file, mode_t mode, int flag),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (fchmodat, int,
                   (int fd, char const *file, mode_t mode, int flag));
@@ -507,7 +510,8 @@ _GL_WARN_ON_USE (fchmodat, "fchmodat is not portable - "
 #   undef fstat
 #   define fstat rpl_fstat
 #  endif
-_GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf) _GL_ARG_NONNULL ((2)));
+_GL_FUNCDECL_RPL (fstat, int, (int fd, struct stat *buf),
+                              _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (fstat, int, (int fd, struct stat *buf));
 # else
 _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
@@ -516,8 +520,10 @@ _GL_CXXALIAS_SYS (fstat, int, (int fd, struct stat *buf));
 _GL_CXXALIASWARN (fstat);
 # endif
 #elif @GNULIB_OVERRIDES_STRUCT_STAT@
-# undef fstat
-# define fstat fstat_used_without_requesting_gnulib_module_fstat
+# if !GNULIB_FSTAT
+#  undef fstat
+#  define fstat fstat_used_without_requesting_gnulib_module_fstat
+# endif
 #elif @WINDOWS_64_BIT_ST_SIZE@
 /* Above, we define stat to _stati64.  */
 # define fstat _fstati64
@@ -538,7 +544,7 @@ _GL_WARN_ON_USE (fstat, "fstat has portability problems - "
 #  endif
 _GL_FUNCDECL_RPL (fstatat, int,
                   (int fd, char const *restrict name, struct stat *restrict st,
-                   int flags)
+                   int flags),
                   _GL_ARG_NONNULL ((2, 3)));
 _GL_CXXALIAS_RPL (fstatat, int,
                   (int fd, char const *restrict name, struct stat *restrict st,
@@ -547,7 +553,7 @@ _GL_CXXALIAS_RPL (fstatat, int,
 #  if !@HAVE_FSTATAT@
 _GL_FUNCDECL_SYS (fstatat, int,
                   (int fd, char const *restrict name, struct stat *restrict st,
-                   int flags)
+                   int flags),
                   _GL_ARG_NONNULL ((2, 3)));
 #  endif
 _GL_CXXALIAS_SYS (fstatat, int,
@@ -556,8 +562,10 @@ _GL_CXXALIAS_SYS (fstatat, int,
 # endif
 _GL_CXXALIASWARN (fstatat);
 #elif @GNULIB_OVERRIDES_STRUCT_STAT@
-# undef fstatat
-# define fstatat fstatat_used_without_requesting_gnulib_module_fstatat
+# if !GNULIB_FSTATAT
+#  undef fstatat
+#  define fstatat fstatat_used_without_requesting_gnulib_module_fstatat
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef fstatat
 # if HAVE_RAW_DECL_FSTATAT
@@ -577,11 +585,11 @@ _GL_WARN_ON_USE (fstatat, "fstatat is not portable - "
 #   undef futimens
 #   define futimens rpl_futimens
 #  endif
-_GL_FUNCDECL_RPL (futimens, int, (int fd, struct timespec const times[2]));
+_GL_FUNCDECL_RPL (futimens, int, (int fd, struct timespec const times[2]), );
 _GL_CXXALIAS_RPL (futimens, int, (int fd, struct timespec const times[2]));
 # else
 #  if !@HAVE_FUTIMENS@
-_GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2]));
+_GL_FUNCDECL_SYS (futimens, int, (int fd, struct timespec const times[2]), );
 #  endif
 _GL_CXXALIAS_SYS (futimens, int, (int fd, struct timespec const times[2]));
 # endif
@@ -600,9 +608,9 @@ _GL_WARN_ON_USE (futimens, "futimens is not portable - "
 #if @GNULIB_GETUMASK@
 # if !@HAVE_GETUMASK@
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
-_GL_FUNCDECL_SYS (getumask, mode_t, (void) _GL_ATTRIBUTE_NOTHROW);
+_GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW;
 #  else
-_GL_FUNCDECL_SYS (getumask, mode_t, (void));
+_GL_FUNCDECL_SYS (getumask, mode_t, (void), );
 #  endif
 # endif
 _GL_CXXALIAS_SYS (getumask, mode_t, (void));
@@ -622,7 +630,7 @@ _GL_WARN_ON_USE (getumask, "getumask is not portable - "
 /* Change the mode of FILENAME to MODE, without dereferencing it if FILENAME
    denotes a symbolic link.  */
 # if !@HAVE_LCHMOD@ || defined __hpux
-_GL_FUNCDECL_SYS (lchmod, int, (const char *filename, mode_t mode)
+_GL_FUNCDECL_SYS (lchmod, int, (const char *filename, mode_t mode),
                                _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (lchmod, int, (const char *filename, mode_t mode));
@@ -642,7 +650,7 @@ _GL_WARN_ON_USE (lchmod, "lchmod is unportable - "
 #   undef mkdir
 #   define mkdir rpl_mkdir
 #  endif
-_GL_FUNCDECL_RPL (mkdir, int, (char const *name, mode_t mode)
+_GL_FUNCDECL_RPL (mkdir, int, (char const *name, mode_t mode),
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode));
 # elif defined _WIN32 && !defined __CYGWIN__
@@ -667,12 +675,6 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode));
 _GL_CXXALIAS_SYS (mkdir, int, (char const *name, mode_t mode));
 # endif
 _GL_CXXALIASWARN (mkdir);
-#elif defined GNULIB_POSIXCHECK
-# undef mkdir
-# if HAVE_RAW_DECL_MKDIR
-_GL_WARN_ON_USE (mkdir, "mkdir does not always support two parameters - "
-                 "use gnulib module mkdir for portability");
-# endif
 #elif @GNULIB_MDA_MKDIR@
 /* On native Windows, map 'mkdir' to '_mkdir', so that -loldnames is not
    required.  In C++ with GNULIB_NAMESPACE, avoid differences between
@@ -695,12 +697,18 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode));
 _GL_CXXALIAS_SYS (mkdir, int, (char const *name, mode_t mode));
 # endif
 _GL_CXXALIASWARN (mkdir);
+#elif defined GNULIB_POSIXCHECK
+# undef mkdir
+# if HAVE_RAW_DECL_MKDIR
+_GL_WARN_ON_USE (mkdir, "mkdir does not always support two parameters - "
+                 "use gnulib module mkdir for portability");
+# endif
 #endif
 
 
 #if @GNULIB_MKDIRAT@
 # if !@HAVE_MKDIRAT@
-_GL_FUNCDECL_SYS (mkdirat, int, (int fd, char const *file, mode_t mode)
+_GL_FUNCDECL_SYS (mkdirat, int, (int fd, char const *file, mode_t mode),
                                 _GL_ARG_NONNULL ((2)));
 # endif
 _GL_CXXALIAS_SYS (mkdirat, int, (int fd, char const *file, mode_t mode));
@@ -720,12 +728,12 @@ _GL_WARN_ON_USE (mkdirat, "mkdirat is not portable - "
 #   undef mkfifo
 #   define mkfifo rpl_mkfifo
 #  endif
-_GL_FUNCDECL_RPL (mkfifo, int, (char const *file, mode_t mode)
+_GL_FUNCDECL_RPL (mkfifo, int, (char const *file, mode_t mode),
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mkfifo, int, (char const *file, mode_t mode));
 # else
 #  if !@HAVE_MKFIFO@
-_GL_FUNCDECL_SYS (mkfifo, int, (char const *file, mode_t mode)
+_GL_FUNCDECL_SYS (mkfifo, int, (char const *file, mode_t mode),
                                _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (mkfifo, int, (char const *file, mode_t mode));
@@ -746,12 +754,12 @@ _GL_WARN_ON_USE (mkfifo, "mkfifo is not portable - "
 #   undef mkfifoat
 #   define mkfifoat rpl_mkfifoat
 #  endif
-_GL_FUNCDECL_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode)
+_GL_FUNCDECL_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode),
                                  _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (mkfifoat, int, (int fd, char const *file, mode_t mode));
 # else
 #  if !@HAVE_MKFIFOAT@
-_GL_FUNCDECL_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode)
+_GL_FUNCDECL_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode),
                                  _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode));
@@ -774,12 +782,12 @@ _GL_WARN_ON_USE (mkfifoat, "mkfifoat is not portable - "
 #   undef mknod
 #   define mknod rpl_mknod
 #  endif
-_GL_FUNCDECL_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev)
+_GL_FUNCDECL_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev),
                               _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mknod, int, (char const *file, mode_t mode, dev_t dev));
 # else
 #  if !@HAVE_MKNOD@
-_GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev)
+_GL_FUNCDECL_SYS (mknod, int, (char const *file, mode_t mode, dev_t dev),
                               _GL_ARG_NONNULL ((1)));
 #  endif
 /* Need to cast, because on OSF/1 5.1, the third parameter is '...'.  */
@@ -802,14 +810,14 @@ _GL_WARN_ON_USE (mknod, "mknod is not portable - "
 #   define mknodat rpl_mknodat
 #  endif
 _GL_FUNCDECL_RPL (mknodat, int,
-                  (int fd, char const *file, mode_t mode, dev_t dev)
+                  (int fd, char const *file, mode_t mode, dev_t dev),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (mknodat, int,
                   (int fd, char const *file, mode_t mode, dev_t dev));
 # else
 #  if !@HAVE_MKNODAT@
 _GL_FUNCDECL_SYS (mknodat, int,
-                  (int fd, char const *file, mode_t mode, dev_t dev)
+                  (int fd, char const *file, mode_t mode, dev_t dev),
                   _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (mknodat, int,
@@ -841,7 +849,11 @@ _GL_WARN_ON_USE (mknodat, "mknodat is not portable - "
 #   elif @WINDOWS_64_BIT_ST_SIZE@
      /* Above, we define stat to _stati64.  */
 #    if defined __MINGW32__ && defined _stati64
-#     ifndef _USE_32BIT_TIME_T
+#     ifdef _USE_32BIT_TIME_T
+       /* The system headers possibly define _stati64 to _stat32i64.  */
+#      undef _stat32i64
+#      define _stat32i64(name, st) rpl_stat (name, st)
+#     else
        /* The system headers define _stati64 to _stat64.  */
 #      undef _stat64
 #      define _stat64(name, st) rpl_stat (name, st)
@@ -916,7 +928,7 @@ _GL_CXXALIAS_RPL_1 (lstat, stat, int,
 #   define lstat rpl_lstat
 #  endif
 _GL_FUNCDECL_RPL (lstat, int,
-                  (const char *restrict name, struct stat *restrict buf)
+                  (const char *restrict name, struct stat *restrict buf),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (lstat, int,
                   (const char *restrict name, struct stat *restrict buf));
@@ -928,8 +940,10 @@ _GL_CXXALIAS_SYS (lstat, int,
 _GL_CXXALIASWARN (lstat);
 # endif
 #elif @GNULIB_OVERRIDES_STRUCT_STAT@
-# undef lstat
-# define lstat lstat_used_without_requesting_gnulib_module_lstat
+# if !GNULIB_LSTAT
+#  undef lstat
+#  define lstat lstat_used_without_requesting_gnulib_module_lstat
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef lstat
 # if HAVE_RAW_DECL_LSTAT
@@ -968,14 +982,14 @@ _GL_CXXALIASWARN (umask);
 #   define utimensat rpl_utimensat
 #  endif
 _GL_FUNCDECL_RPL (utimensat, int, (int fd, char const *name,
-                                   struct timespec const times[2], int flag)
+                                   struct timespec const times[2], int flag),
                                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (utimensat, int, (int fd, char const *name,
                                    struct timespec const times[2], int flag));
 # else
 #  if !@HAVE_UTIMENSAT@
 _GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name,
-                                   struct timespec const times[2], int flag)
+                                   struct timespec const times[2], int flag),
                                   _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name,
diff --git a/gl/sys_types.in.h b/gl/sys_types.in.h
index 0a0ccc3c..acf9b2f7 100644
--- a/gl/sys_types.in.h
+++ b/gl/sys_types.in.h
@@ -1,6 +1,6 @@
 /* Provide a more complete sys/types.h.
 
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -60,6 +60,15 @@
 # define _GL_WINDOWS_64_BIT_OFF_T 1
 #endif
 
+/* Define the off64_t type.  */
+#if !@HAVE_OFF64_T@
+# if !GNULIB_defined_off64_t
+/* Define off64_t to int64_t always.  */
+typedef long long off64_t;
+#  define GNULIB_defined_off64_t 1
+# endif
+#endif
+
 /* Override dev_t and ino_t if distinguishable inodes support is requested
    on native Windows.  */
 #if @WINDOWS_STAT_INODES@
@@ -108,6 +117,22 @@ typedef unsigned long long int rpl_ino_t;
 # include <stddef.h>
 #endif
 
+/* Define blksize_t, required by POSIX:2024.  */
+#if !@HAVE_BLKSIZE_T@
+# if !defined GNULIB_defined_blksize_t
+typedef int blksize_t;
+#  define GNULIB_defined_blksize_t 1
+# endif
+#endif
+
+/* Define blkcnt_t, required by POSIX:2024.  */
+#if !@HAVE_BLKCNT_T@
+# if !defined GNULIB_defined_blkcnt_t
+typedef long long blkcnt_t;
+#  define GNULIB_defined_blkcnt_t 1
+# endif
+#endif
+
 #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
 #endif /* _@GUARD_PREFIX@_SYS_TYPES_H */
 #endif /* __need_XXX */
diff --git a/gl/sys_uio.in.h b/gl/sys_uio.in.h
index 5e71859d..fec3a70a 100644
--- a/gl/sys_uio.in.h
+++ b/gl/sys_uio.in.h
@@ -1,5 +1,5 @@
 /* Substitute for <sys/uio.h>.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/time.in.h b/gl/time.in.h
index df99c8ab..3ff16e3b 100644
--- a/gl/time.in.h
+++ b/gl/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -122,6 +122,23 @@ struct __time_t_must_be_integral {
 #  endif
 # endif
 
+# if @GNULIB_TZNAME@
+/* tzname[0..1]: Abbreviated time zone names, set by the tzset() function.  */
+#  if NEED_DECL_TZNAME
+extern
+#   ifdef __cplusplus
+  "C"
+#   endif
+  char *tzname[];
+#  endif
+#  if defined _WIN32 && !defined __CYGWIN__
+/* On native Windows, map 'tzname' to '_tzname' etc., so that -loldnames is not
+   required.  */
+#   undef tzname
+#   define tzname _tzname
+#  endif
+# endif
+
 /* Set *TS to the current time, and return BASE.
    Upon failure, return 0.  */
 # if @GNULIB_TIMESPEC_GET@
@@ -130,12 +147,12 @@ struct __time_t_must_be_integral {
 #    undef timespec_get
 #    define timespec_get rpl_timespec_get
 #   endif
-_GL_FUNCDECL_RPL (timespec_get, int, (struct timespec *ts, int base)
+_GL_FUNCDECL_RPL (timespec_get, int, (struct timespec *ts, int base),
                                      _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (timespec_get, int, (struct timespec *ts, int base));
 #  else
 #   if !@HAVE_TIMESPEC_GET@
-_GL_FUNCDECL_SYS (timespec_get, int, (struct timespec *ts, int base)
+_GL_FUNCDECL_SYS (timespec_get, int, (struct timespec *ts, int base),
                                      _GL_ARG_NONNULL ((1)));
 #   endif
 _GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base));
@@ -159,17 +176,19 @@ _GL_WARN_ON_USE (timespec_get, "timespec_get is unportable - "
 #    undef timespec_getres
 #    define timespec_getres rpl_timespec_getres
 #   endif
-_GL_FUNCDECL_RPL (timespec_getres, int, (struct timespec *ts, int base)
+_GL_FUNCDECL_RPL (timespec_getres, int, (struct timespec *ts, int base),
                                         _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (timespec_getres, int, (struct timespec *ts, int base));
 #  else
 #   if !@HAVE_TIMESPEC_GETRES@
-_GL_FUNCDECL_SYS (timespec_getres, int, (struct timespec *ts, int base)
+_GL_FUNCDECL_SYS (timespec_getres, int, (struct timespec *ts, int base),
                                         _GL_ARG_NONNULL ((1)));
 #   endif
 _GL_CXXALIAS_SYS (timespec_getres, int, (struct timespec *ts, int base));
 #  endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (timespec_getres);
+# endif
 # elif defined GNULIB_POSIXCHECK
 #  undef timespec_getres
 #  if HAVE_RAW_DECL_TIMESPEC_GETRES
@@ -184,7 +203,7 @@ _GL_WARN_ON_USE (timespec_getres, "timespec_getres is unportable - "
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    define time rpl_time
 #   endif
-_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp));
+_GL_FUNCDECL_RPL (time, time_t, (time_t *__tp), );
 _GL_CXXALIAS_RPL (time, time_t, (time_t *__tp));
 #  else
 _GL_CXXALIAS_SYS (time, time_t, (time_t *__tp));
@@ -209,14 +228,14 @@ _GL_WARN_ON_USE (time, "time has consistency problems - "
 #    define nanosleep rpl_nanosleep
 #   endif
 _GL_FUNCDECL_RPL (nanosleep, int,
-                  (struct timespec const *__rqtp, struct timespec *__rmtp)
+                  (struct timespec const *__rqtp, struct timespec *__rmtp),
                   _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (nanosleep, int,
                   (struct timespec const *__rqtp, struct timespec *__rmtp));
 #  else
 #   if ! @HAVE_NANOSLEEP@
 _GL_FUNCDECL_SYS (nanosleep, int,
-                  (struct timespec const *__rqtp, struct timespec *__rmtp)
+                  (struct timespec const *__rqtp, struct timespec *__rmtp),
                   _GL_ARG_NONNULL ((1)));
 #   endif
 _GL_CXXALIAS_SYS (nanosleep, int,
@@ -238,7 +257,7 @@ _GL_WARN_ON_USE (nanosleep, "nanosleep is unportable - "
 #    undef tzset
 #    define tzset rpl_tzset
 #   endif
-_GL_FUNCDECL_RPL (tzset, void, (void));
+_GL_FUNCDECL_RPL (tzset, void, (void), );
 _GL_CXXALIAS_RPL (tzset, void, (void));
 #  elif defined _WIN32 && !defined __CYGWIN__
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -278,7 +297,7 @@ _GL_WARN_ON_USE (tzset, "tzset has portability problems - "
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    define mktime rpl_mktime
 #   endif
-_GL_FUNCDECL_RPL (mktime, time_t, (struct tm *__tp) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (mktime, time_t, (struct tm *__tp), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (mktime, time_t, (struct tm *__tp));
 #  else
 _GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp));
@@ -304,14 +323,14 @@ _GL_WARN_ON_USE (mktime, "mktime has portability problems - "
 #    define localtime_r rpl_localtime_r
 #   endif
 _GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
-                                             struct tm *restrict __result)
+                                             struct tm *restrict __result),
                                             _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
 #  else
 #   if ! @HAVE_DECL_LOCALTIME_R@
 _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
-                                             struct tm *restrict __result)
+                                             struct tm *restrict __result),
                                             _GL_ARG_NONNULL ((1, 2)));
 #   endif
 _GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
@@ -326,14 +345,14 @@ _GL_CXXALIASWARN (localtime_r);
 #    define gmtime_r rpl_gmtime_r
 #   endif
 _GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
-                                          struct tm *restrict __result)
+                                          struct tm *restrict __result),
                                          _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
 #  else
 #   if ! @HAVE_DECL_LOCALTIME_R@
 _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
-                                          struct tm *restrict __result)
+                                          struct tm *restrict __result),
                                          _GL_ARG_NONNULL ((1, 2)));
 #   endif
 _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
@@ -364,7 +383,7 @@ _GL_WARN_ON_USE (gmtime_r, "gmtime_r is unportable - "
 #    undef localtime
 #    define localtime rpl_localtime
 #   endif
-_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer)
+_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer),
                                           _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer));
 #  else
@@ -387,7 +406,7 @@ _GL_WARN_ON_USE (localtime, "localtime has portability problems - "
 #    undef gmtime
 #    define gmtime rpl_gmtime
 #   endif
-_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer)
+_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer),
                                        _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer));
 #  else
@@ -403,7 +422,7 @@ _GL_CXXALIASWARN (gmtime);
 #  if ! @HAVE_STRPTIME@
 _GL_FUNCDECL_SYS (strptime, char *, (char const *restrict __buf,
                                      char const *restrict __format,
-                                     struct tm *restrict __tm)
+                                     struct tm *restrict __tm),
                                     _GL_ARG_NONNULL ((1, 2, 3)));
 #  endif
 _GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf,
@@ -428,7 +447,7 @@ _GL_WARN_ON_USE (strptime, "strptime is unportable - "
 #   ifndef __cplusplus
 _GL_ATTRIBUTE_DEPRECATED
 #   endif
-_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp)
+_GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp),
                                  _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp));
 #  else
@@ -450,7 +469,7 @@ _GL_CXXALIASWARN (ctime);
 #   endif
 _GL_FUNCDECL_RPL (strftime, size_t,
                   (char *restrict __buf, size_t __bufsize,
-                   const char *restrict __fmt, const struct tm *restrict __tp)
+                   const char *restrict __fmt, const struct tm *restrict __tp),
                   _GL_ARG_NONNULL ((1, 3, 4)));
 _GL_CXXALIAS_RPL (strftime, size_t,
                   (char *restrict __buf, size_t __bufsize,
@@ -471,14 +490,24 @@ _GL_WARN_ON_USE (strftime, "strftime has portability problems - "
 #  endif
 # endif
 
-# if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@
+# if @GNULIB_TIME_RZ@
 /* Functions that use a first-class time zone data type, instead of
    relying on an implicit global time zone.
    Inspired by NetBSD.  */
 
 /* Represents a time zone.
    (timezone_t) NULL stands for UTC.  */
+#  if !@HAVE_TZALLOC@
+#   if !GNULIB_defined_timezone_t
+#    if !@HAVE_TIMEZONE_T@
 typedef struct tm_zone *timezone_t;
+#    else
+typedef struct tm_zone *rpl_timezone_t;
+#     define timezone_t rpl_timezone_t
+#    endif
+#    define GNULIB_defined_timezone_t 1
+#   endif
+#  endif
 
 /* tzalloc (name)
    Returns a time zone object for the given time zone NAME.  This object
@@ -488,37 +517,72 @@ typedef struct tm_zone *timezone_t;
    would use it the TZ environment variable was unset.
    May return NULL if NAME is invalid (this is platform dependent) or
    upon memory allocation failure.  */
-_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name));
+#  if !@HAVE_TZALLOC@
+_GL_FUNCDECL_SYS (tzalloc, timezone_t, (char const *__name), );
 _GL_CXXALIAS_SYS (tzalloc, timezone_t, (char const *__name));
+#  endif
 
 /* tzfree (tz)
    Frees a time zone object.
    The argument must have been returned by tzalloc().  */
-_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz));
+#  if !@HAVE_TZALLOC@
+_GL_FUNCDECL_SYS (tzfree, void, (timezone_t __tz), );
 _GL_CXXALIAS_SYS (tzfree, void, (timezone_t __tz));
+#  endif
 
 /* localtime_rz (tz, &t, &result)
    Converts an absolute time T to a broken-down time RESULT, assuming the
    time zone TZ.
    This function is like 'localtime_r', but relies on the argument TZ instead
    of an implicit global time zone.  */
+#  if @REPLACE_LOCALTIME_RZ@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef localtime_rz
+#    define localtime_rz rpl_localtime_rz
+#   endif
+_GL_FUNCDECL_RPL (localtime_rz, struct tm *,
+                  (timezone_t __tz, time_t const *restrict __timer,
+                   struct tm *restrict __result),
+                  _GL_ARG_NONNULL ((2, 3)));
+_GL_CXXALIAS_RPL (localtime_rz, struct tm *,
+                  (timezone_t __tz, time_t const *restrict __timer,
+                   struct tm *restrict __result));
+#  else
+#   if !@HAVE_TZALLOC@
 _GL_FUNCDECL_SYS (localtime_rz, struct tm *,
                   (timezone_t __tz, time_t const *restrict __timer,
-                   struct tm *restrict __result) _GL_ARG_NONNULL ((2, 3)));
+                   struct tm *restrict __result),
+                  _GL_ARG_NONNULL ((2, 3)));
+#   endif
 _GL_CXXALIAS_SYS (localtime_rz, struct tm *,
                   (timezone_t __tz, time_t const *restrict __timer,
                    struct tm *restrict __result));
+#  endif
 
 /* mktime_z (tz, &tm)
    Normalizes the broken-down time TM and converts it to an absolute time,
    assuming the time zone TZ.  Returns the absolute time.
    This function is like 'mktime', but relies on the argument TZ instead
    of an implicit global time zone.  */
+#  if @REPLACE_MKTIME_Z@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef mktime_z
+#    define mktime_z rpl_mktime_z
+#   endif
+_GL_FUNCDECL_RPL (mktime_z, time_t,
+                  (timezone_t __tz, struct tm *restrict __tm),
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (mktime_z, time_t,
+                  (timezone_t __tz, struct tm *restrict __tm));
+#  else
+#   if !@HAVE_TZALLOC@
 _GL_FUNCDECL_SYS (mktime_z, time_t,
-                  (timezone_t __tz, struct tm *restrict __tm)
+                  (timezone_t __tz, struct tm *restrict __tm),
                   _GL_ARG_NONNULL ((2)));
+#   endif
 _GL_CXXALIAS_SYS (mktime_z, time_t,
                   (timezone_t __tz, struct tm *restrict __tm));
+#  endif
 
 /* Time zone abbreviation strings (returned by 'localtime_rz' or 'mktime_z'
    in the 'tm_zone' member of 'struct tm') are valid as long as
@@ -535,11 +599,11 @@ _GL_CXXALIAS_SYS (mktime_z, time_t,
 #    undef timegm
 #    define timegm rpl_timegm
 #   endif
-_GL_FUNCDECL_RPL (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (timegm, time_t, (struct tm *__tm));
 #  else
 #   if ! @HAVE_TIMEGM@
-_GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm), _GL_ARG_NONNULL ((1)));
 #   endif
 _GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm));
 #  endif
diff --git a/gl/time_r.c b/gl/time_r.c
index b724f3b3..15d65d59 100644
--- a/gl/time_r.c
+++ b/gl/time_r.c
@@ -1,6 +1,6 @@
 /* Reentrant time functions like localtime_r.
 
-   Copyright (C) 2003, 2006-2007, 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2010-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/timegm.c b/gl/timegm.c
index e5cf30c0..4c2615b9 100644
--- a/gl/timegm.c
+++ b/gl/timegm.c
@@ -1,6 +1,6 @@
 /* Convert UTC calendar time to simple time.  Like mktime but assumes UTC.
 
-   Copyright (C) 1994-2024 Free Software Foundation, Inc.
+   Copyright (C) 1994-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,8 +30,7 @@ __time64_t
 __timegm64 (struct tm *tmp)
 {
   static mktime_offset_t gmtime_offset;
-  tmp->tm_isdst = 0;
-  return __mktime_internal (tmp, __gmtime64_r, &gmtime_offset);
+  return __mktime_internal (tmp, false, &gmtime_offset);
 }
 
 #if defined _LIBC && __TIMESIZE != 64
diff --git a/gl/uchar.h b/gl/uchar.h
new file mode 100644
index 00000000..abc636c5
--- /dev/null
+++ b/gl/uchar.h
@@ -0,0 +1,1456 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* <uchar.h> substitute - 16-bit and 32-bit wide character types.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2019.  */
+
+/*
+ * ISO C 23 <uchar.h> for platforms that lack it.
+ */
+
+#ifndef _GL_UCHAR_H
+
+#if __GNUC__ >= 3
+#pragma GCC system_header
+#endif
+
+
+/* The include_next requires a split double-inclusion guard.  */
+#if (defined __cplusplus ? 0 : 1)
+# if defined __HAIKU__
+/* Work around <https://dev.haiku-os.org/ticket/17040>.  */
+#  include <stdint.h>
+# endif
+/* On AIX 7.2 with xlclang++, /usr/include/uchar.h produces compilation errors
+   because it contains typedef definitions of char16_t and char32_t, however
+   char16_t and char32_t are keywords in this situation.  To work around it,
+   define char16_t and char32_t as macros.  */
+# if defined __cplusplus && defined _AIX && defined __ibmxl__ && defined __clang__
+#  define char16_t gl_char16_t
+#  define char32_t gl_char32_t
+# endif
+# include_next <uchar.h>
+#endif
+
+#ifndef _GL_UCHAR_H
+#define _GL_UCHAR_H
+
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_BEGIN_C_LINKAGE,
+   _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* Get uint_least16_t, uint_least32_t.  */
+#include <stdint.h>
+
+/* Get mbstate_t, size_t.  */
+#include <wchar.h>
+
+/* For the inline functions.  */
+#include <string.h>
+#include <wctype.h>
+
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The attribute __pure__ was added in gcc 2.96.  */
+#ifndef _GL_ATTRIBUTE_PURE
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__
+#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _GL_ATTRIBUTE_PURE /* empty */
+# endif
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+/* C++ compatible function declaration macros.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _GL_CXXDEFS_H
+#define _GL_CXXDEFS_H
+
+/* Begin/end the GNULIB_NAMESPACE namespace.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_BEGIN_NAMESPACE namespace GNULIB_NAMESPACE {
+# define _GL_END_NAMESPACE }
+#else
+# define _GL_BEGIN_NAMESPACE
+# define _GL_END_NAMESPACE
+#endif
+
+/* The three most frequent use cases of these macros are:
+
+   * For providing a substitute for a function that is missing on some
+     platforms, but is declared and works fine on the platforms on which
+     it exists:
+
+       #if @GNULIB_FOO@
+       # if !@HAVE_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       # endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on all platforms,
+     but is broken/insufficient and needs to be replaced on some platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+
+   * For providing a replacement for a function that exists on some platforms
+     but is broken/insufficient and needs to be replaced on some of them and
+     is additionally either missing or undeclared on some other platforms:
+
+       #if @GNULIB_FOO@
+       # if @REPLACE_FOO@
+       #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+       #   undef foo
+       #   define foo rpl_foo
+       #  endif
+       _GL_FUNCDECL_RPL (foo, ...);
+       _GL_CXXALIAS_RPL (foo, ...);
+       # else
+       #  if !@HAVE_FOO@   or   if !@HAVE_DECL_FOO@
+       _GL_FUNCDECL_SYS (foo, ...);
+       #  endif
+       _GL_CXXALIAS_SYS (foo, ...);
+       # endif
+       _GL_CXXALIASWARN (foo);
+       #elif defined GNULIB_POSIXCHECK
+       ...
+       #endif
+*/
+
+/* _GL_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C extern "C"
+#else
+# define _GL_EXTERN_C extern
+#endif
+
+/* _GL_EXTERN_C_FUNC declaration;
+   performs the declaration of a function with C linkage.  */
+#if defined __cplusplus
+# define _GL_EXTERN_C_FUNC extern "C"
+#else
+/* In C mode, omit the 'extern' keyword, because attributes in bracket syntax
+   are not allowed between 'extern' and the return type (see gnulib-common.m4).
+ */
+# define _GL_EXTERN_C_FUNC
+#endif
+
+/* _GL_FUNCDECL_RPL (func, rettype, parameters, [attributes]);
+   declares a replacement function, named rpl_func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_RPL (free, void, (void *ptr), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_RPL (open, int, (const char *filename, int flags, ...),
+                                  _GL_ARG_NONNULL ((1)));
+
+   Note: Attributes, such as _GL_ATTRIBUTE_DEPRECATED, are supported in front
+   of a _GL_FUNCDECL_RPL invocation only in C mode, not in C++ mode.  (That's
+   because
+     [[...]] extern "C" <declaration>;
+   is invalid syntax in C++.)
+ */
+#define _GL_FUNCDECL_RPL(func,rettype,parameters,...) \
+  _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters, __VA_ARGS__)
+#define _GL_FUNCDECL_RPL_1(rpl_func,rettype,parameters,...) \
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype rpl_func parameters
+
+/* _GL_FUNCDECL_SYS_NAME (func) expands to plain func if C++, and to
+   parenthesized func otherwise.  Parenthesization is needed in C23 if
+   the function is like strchr and so is a qualifier-generic macro
+   that expands to something more complicated.  */
+#ifdef __cplusplus
+# define _GL_FUNCDECL_SYS_NAME(func) func
+#else
+# define _GL_FUNCDECL_SYS_NAME(func) (func)
+#endif
+
+/* _GL_FUNCDECL_SYS (func, rettype, parameters, [attributes]);
+   declares the system function, named func, with the given prototype,
+   consisting of return type, parameters, and attributes.
+   Although attributes are optional, the comma before them is required
+   for portability to C17 and earlier.  The attribute _GL_ATTRIBUTE_NOTHROW,
+   if needed, must be placed after the _GL_FUNCDECL_RPL invocation,
+   at the end of the declaration.
+   Examples:
+     _GL_FUNCDECL_SYS (getumask, mode_t, (void), ) _GL_ATTRIBUTE_NOTHROW;
+     _GL_FUNCDECL_SYS (posix_openpt, int, (int flags), _GL_ATTRIBUTE_NODISCARD);
+ */
+#define _GL_FUNCDECL_SYS(func,rettype,parameters,...) \
+  _GL_EXTERN_C_FUNC __VA_ARGS__ rettype _GL_FUNCDECL_SYS_NAME (func) parameters
+
+/* _GL_CXXALIAS_RPL (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to rpl_func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_RPL (open, int, (const char *filename, int flags, ...));
+
+   Wrapping rpl_func in an object with an inline conversion operator
+   avoids a reference to rpl_func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#define _GL_CXXALIAS_RPL(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, rpl_##func, rettype, parameters)
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::rpl_func;                                  \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_MDA (func, rettype, parameters);
+   is to be used when func is a Microsoft deprecated alias, on native Windows.
+   It declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to _func, if GNULIB_NAMESPACE is defined.
+   Example:
+     _GL_CXXALIAS_MDA (open, int, (const char *filename, int flags, ...));
+ */
+#define _GL_CXXALIAS_MDA(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_1 (func, _##func, rettype, parameters)
+
+/* _GL_CXXALIAS_RPL_CAST_1 (func, rpl_func, rettype, parameters);
+   is like  _GL_CXXALIAS_RPL_1 (func, rpl_func, rettype, parameters);
+   except that the C function rpl_func may have a slightly different
+   declaration.  A cast is used to silence the "invalid conversion" error
+   that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                                     \
+    {                                                              \
+      static const struct _gl_ ## func ## _wrapper                 \
+      {                                                            \
+        typedef rettype (*type) parameters;                        \
+                                                                   \
+        inline operator type () const                              \
+        {                                                          \
+          return reinterpret_cast<type>(::rpl_func);               \
+        }                                                          \
+      } func = {};                                                 \
+    }                                                              \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_RPL_CAST_1(func,rpl_func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_MDA_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_MDA (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#define _GL_CXXALIAS_MDA_CAST(func,rettype,parameters) \
+  _GL_CXXALIAS_RPL_CAST_1 (func, _##func, rettype, parameters)
+
+/* _GL_CXXALIAS_SYS (func, rettype, parameters);
+   declares a C++ alias called GNULIB_NAMESPACE::func
+   that redirects to the system provided function func, if GNULIB_NAMESPACE
+   is defined.
+   Example:
+     _GL_CXXALIAS_SYS (open, int, (const char *filename, int flags, ...));
+
+   Wrapping func in an object with an inline conversion operator
+   avoids a reference to func unless GNULIB_NAMESPACE::func is
+   actually used in the program.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS(func,rettype,parameters)            \
+    namespace GNULIB_NAMESPACE                                \
+    {                                                         \
+      static const struct _gl_ ## func ## _wrapper            \
+      {                                                       \
+        typedef rettype (*type) parameters;                   \
+                                                              \
+        inline operator type () const                         \
+        {                                                     \
+          return ::func;                                      \
+        }                                                     \
+      } func = {};                                            \
+    }                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST (func, rettype, parameters);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function func may have a slightly different declaration.
+   A cast is used to silence the "invalid conversion" error that would
+   otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    namespace GNULIB_NAMESPACE                          \
+    {                                                   \
+      static const struct _gl_ ## func ## _wrapper      \
+      {                                                 \
+        typedef rettype (*type) parameters;             \
+                                                        \
+        inline operator type () const                   \
+        {                                               \
+          return reinterpret_cast<type>(::func);        \
+        }                                               \
+      } func = {};                                      \
+    }                                                   \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST(func,rettype,parameters) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIAS_SYS_CAST2 (func, rettype, parameters, rettype2, parameters2);
+   is like  _GL_CXXALIAS_SYS (func, rettype, parameters);
+   except that the C function is picked among a set of overloaded functions,
+   namely the one with rettype2 and parameters2.  Two consecutive casts
+   are used to silence the "cannot find a match" and "invalid conversion"
+   errors that would otherwise occur.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+  /* The outer cast must be a reinterpret_cast.
+     The inner cast: When the function is defined as a set of overloaded
+     functions, it works as a static_cast<>, choosing the designated variant.
+     When the function is defined as a single variant, it works as a
+     reinterpret_cast<>. The parenthesized cast syntax works both ways.  */
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    namespace GNULIB_NAMESPACE                                                \
+    {                                                                         \
+      static const struct _gl_ ## func ## _wrapper                            \
+      {                                                                       \
+        typedef rettype (*type) parameters;                                   \
+                                                                              \
+        inline operator type () const                                         \
+        {                                                                     \
+          return reinterpret_cast<type>((rettype2 (*) parameters2)(::func));  \
+        }                                                                     \
+      } func = {};                                                            \
+    }                                                                         \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#else
+# define _GL_CXXALIAS_SYS_CAST2(func,rettype,parameters,rettype2,parameters2) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN (func);
+   causes a warning to be emitted when ::func is used but not when
+   GNULIB_NAMESPACE::func is used.  func must be defined without overloaded
+   variants.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN(func) \
+   _GL_CXXALIASWARN_1 (func, GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN_1(func,namespace) \
+   _GL_CXXALIASWARN_2 (func, namespace)
+/* To work around GCC bug <https://gcc.gnu.org/PR43881>,
+   we enable the warning only when not optimizing.  */
+# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__)
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+    _GL_WARN_ON_USE (func, \
+                     "The symbol ::" #func " refers to the system function. " \
+                     "Use " #namespace "::" #func " instead.")
+# elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     extern __typeof__ (func) func
+# else
+#  define _GL_CXXALIASWARN_2(func,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN(func) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+/* _GL_CXXALIASWARN1 (func, rettype, parameters_and_attributes);
+   causes a warning to be emitted when the given overloaded variant of ::func
+   is used but not when GNULIB_NAMESPACE::func is used.  */
+#if defined __cplusplus && defined GNULIB_NAMESPACE
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+   _GL_CXXALIASWARN1_1 (func, rettype, parameters_and_attributes, \
+                        GNULIB_NAMESPACE)
+# define _GL_CXXALIASWARN1_1(func,rettype,parameters_and_attributes,namespace) \
+   _GL_CXXALIASWARN1_2 (func, rettype, parameters_and_attributes, namespace)
+/* To work around GCC bug <https://gcc.gnu.org/PR43881>,
+   we enable the warning only when not optimizing.  */
+# if !(defined __GNUC__ && !defined __clang__ && __OPTIMIZE__)
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+    _GL_WARN_ON_USE_CXX (func, rettype, rettype, parameters_and_attributes, \
+                         "The symbol ::" #func " refers to the system function. " \
+                         "Use " #namespace "::" #func " instead.")
+# else
+#  define _GL_CXXALIASWARN1_2(func,rettype,parameters_and_attributes,namespace) \
+     _GL_EXTERN_C int _gl_cxxalias_dummy
+# endif
+#else
+# define _GL_CXXALIASWARN1(func,rettype,parameters_and_attributes) \
+    _GL_EXTERN_C int _gl_cxxalias_dummy
+#endif
+
+#endif /* _GL_CXXDEFS_H */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+/* A C macro for declaring that specific arguments must not be NULL.
+   Copyright (C) 2009-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* _GL_ARG_NONNULL((n,...,m)) tells the compiler and static analyzer tools
+   that the values passed as arguments n, ..., m must be non-NULL pointers.
+   n = 1 stands for the first argument, n = 2 for the second argument etc.  */
+#ifndef _GL_ARG_NONNULL
+# if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) || defined __clang__
+#  define _GL_ARG_NONNULL(params) __attribute__ ((__nonnull__ params))
+# else
+#  define _GL_ARG_NONNULL(params)
+# endif
+#endif
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+/* A C macro for emitting warnings if a function is used.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU Lesser General Public License as published
+   by the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* _GL_WARN_ON_USE (function, "literal string") issues a declaration
+   for FUNCTION which will then trigger a compiler warning containing
+   the text of "literal string" anywhere that function is called, if
+   supported by the compiler.  If the compiler does not support this
+   feature, the macro expands to an unused extern declaration.
+
+   _GL_WARN_ON_USE_ATTRIBUTE ("literal string") expands to the
+   attribute used in _GL_WARN_ON_USE.  If the compiler does not support
+   this feature, it expands to empty.
+
+   These macros are useful for marking a function as a potential
+   portability trap, with the intent that "literal string" include
+   instructions on the replacement function that should be used
+   instead.
+   _GL_WARN_ON_USE is for functions with 'extern' linkage.
+   _GL_WARN_ON_USE_ATTRIBUTE is for functions with 'static' or 'inline'
+   linkage.
+
+   _GL_WARN_ON_USE should not be used more than once for a given function
+   in a given compilation unit (because this may generate a warning even
+   if the function is never called).
+
+   However, one of the reasons that a function is a portability trap is
+   if it has the wrong signature.  Declaring FUNCTION with a different
+   signature in C is a compilation error, so this macro must use the
+   same type as any existing declaration so that programs that avoid
+   the problematic FUNCTION do not fail to compile merely because they
+   included a header that poisoned the function.  But this implies that
+   _GL_WARN_ON_USE is only safe to use if FUNCTION is known to already
+   have a declaration.  Use of this macro implies that there must not
+   be any other macro hiding the declaration of FUNCTION; but
+   undefining FUNCTION first is part of the poisoning process anyway
+   (although for symbols that are provided only via a macro, the result
+   is a compilation error rather than a warning containing
+   "literal string").  Also note that in C++, it is only safe to use if
+   FUNCTION has no overloads.
+
+   For an example, it is possible to poison 'getline' by:
+   - adding a call to gl_WARN_ON_USE_PREPARE([[#include <stdio.h>]],
+     [getline]) in configure.ac, which potentially defines
+     HAVE_RAW_DECL_GETLINE
+   - adding this code to a header that wraps the system <stdio.h>:
+     #undef getline
+     #if HAVE_RAW_DECL_GETLINE
+     _GL_WARN_ON_USE (getline, "getline is required by POSIX 2008, but"
+       "not universally present; use the gnulib module getline");
+     #endif
+
+   It is not possible to directly poison global variables.  But it is
+   possible to write a wrapper accessor function, and poison that
+   (less common usage, like &environ, will cause a compilation error
+   rather than issue the nice warning, but the end result of informing
+   the developer about their portability problem is still achieved):
+     #if HAVE_RAW_DECL_ENVIRON
+     static char ***
+     rpl_environ (void) { return &environ; }
+     _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
+     # undef environ
+     # define environ (*rpl_environ ())
+     #endif
+   or better (avoiding contradictory use of 'static' and 'extern'):
+     #if HAVE_RAW_DECL_ENVIRON
+     static char ***
+     _GL_WARN_ON_USE_ATTRIBUTE ("environ is not always properly declared")
+     rpl_environ (void) { return &environ; }
+     # undef environ
+     # define environ (*rpl_environ ())
+     #endif
+   */
+#ifndef _GL_WARN_ON_USE
+
+# if (4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)) && !defined __clang__
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function __attribute__ ((__warning__ (message)))
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message) \
+  __attribute__ ((__warning__ (message)))
+# elif __clang_major__ >= 4
+/* Another compiler attribute is available in clang.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function \
+  __attribute__ ((__diagnose_if__ (1, message, "warning")))
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message) \
+  __attribute__ ((__diagnose_if__ (1, message, "warning")))
+# elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C __typeof__ (function) function
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message)
+# else /* Unsupported.  */
+#  define _GL_WARN_ON_USE(function, message) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+#  define _GL_WARN_ON_USE_ATTRIBUTE(message)
+# endif
+#endif
+
+/* _GL_WARN_ON_USE_CXX (function, rettype_gcc, rettype_clang, parameters_and_attributes, "message")
+   is like _GL_WARN_ON_USE (function, "message"), except that in C++ mode the
+   function is declared with the given prototype, consisting of return type,
+   parameters, and attributes.
+   This variant is useful for overloaded functions in C++. _GL_WARN_ON_USE does
+   not work in this case.  */
+#ifndef _GL_WARN_ON_USE_CXX
+# if !defined __cplusplus
+#  define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+     _GL_WARN_ON_USE (function, msg)
+# else
+#  if (4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)) && !defined __clang__
+/* A compiler attribute is available in gcc versions 4.3.0 and later.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_gcc function parameters_and_attributes \
+  __attribute__ ((__warning__ (msg)))
+#  elif __clang_major__ >= 4
+/* Another compiler attribute is available in clang.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_clang function parameters_and_attributes \
+  __attribute__ ((__diagnose_if__ (1, msg, "warning")))
+#  elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
+/* Verify the existence of the function.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+extern rettype_gcc function parameters_and_attributes
+#  else /* Unsupported.  */
+#   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
+_GL_WARN_EXTERN_C int _gl_warn_on_use
+#  endif
+# endif
+#endif
+
+/* _GL_WARN_EXTERN_C declaration;
+   performs the declaration with C linkage.  */
+#ifndef _GL_WARN_EXTERN_C
+# if defined __cplusplus
+#  define _GL_WARN_EXTERN_C extern "C"
+# else
+#  define _GL_WARN_EXTERN_C extern
+# endif
+#endif
+
+
+_GL_INLINE_HEADER_BEGIN
+
+
+#if !(defined __cplusplus ? 0 || 0 : 1)
+
+/* An 8-bit variant of wchar_t.
+   Note: This type is only mandated by ISO C 23 or newer, and it does
+   denote UTF-8 units.  */
+typedef unsigned char char8_t;
+
+#elif 0
+
+typedef unsigned char gl_char8_t;
+# define char8_t gl_char8_t
+
+#endif
+
+#if !(defined __cplusplus ? 0 || 0 : 1)
+
+/* A 16-bit variant of wchar_t.
+   Note: This type is only mandated by ISO C 11 or newer.  In ISO C 23
+   and newer, it denotes UTF-16 units; in older versions of ISO C it did
+   so only on platforms on which __STDC_UTF_16__ was defined.  */
+typedef uint_least16_t char16_t;
+
+#elif 0
+
+typedef uint_least16_t gl_char16_t;
+# define char16_t gl_char16_t
+
+#endif
+
+#if !(defined __cplusplus ? 0 || 0 : 1)
+
+/* A 32-bit variant of wchar_t.
+   Note: This type is only mandated by ISO C 11 or newer.  In ISO C 23
+   and newer, it denotes UTF-32 code points; in older versions of ISO C
+   it did so only on platforms on which __STDC_UTF_32__ was defined.
+   In gnulib, we guarantee that it denotes UTF-32 code points if and
+   only if the module 'uchar-h-c23' is in use.  */
+typedef uint_least32_t char32_t;
+
+#elif 0
+
+typedef uint_least32_t gl_char32_t;
+# define char32_t gl_char32_t
+
+#endif
+
+/* Define if a 'char32_t' can hold more characters than a 'wchar_t'.  */
+#if 0                    /* 32-bit AIX, Cygwin, native Windows */
+# define _GL_SMALL_WCHAR_T 1
+#endif
+
+/* Define if 'wchar_t', like 'char32_t',
+     - is a 32-bit type, and
+     - represents Unicode code points.
+   For this test, we can use __STDC_ISO_10646__ (defined by glibc, musl libc,
+   Cygwin) but need to consider _GL_SMALL_WCHAR_T, so as to exclude Cygwin.
+   We cannot use __STDC_UTF_16__ or __STDC_UTF_32__
+     - because these macros provide info about char16_t and char32_t (not
+       wchar_t!), and
+     - because GCC >= 4.9 defines these macros on all platforms, even on
+       FreeBSD and Solaris.
+   We should better not use __STD_UTF_16__, __STD_UTF_32__ either, because
+   these macros are misspellings, only defined by Android's <uchar.h>.  */
+#if defined __STDC_ISO_10646__ && !_GL_SMALL_WCHAR_T
+/* glibc, musl libc */
+# define _GL_WCHAR_T_IS_UCS4 1
+#endif
+#if _GL_WCHAR_T_IS_UCS4
+static_assert (sizeof (char32_t) == sizeof (wchar_t));
+#endif
+
+
+/* Convert a single-byte character to a 32-bit wide character.  */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_BTOC32
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ATTRIBUTE_PURE wint_t
+btoc32 (int c)
+{
+  return
+#  if 1 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         btowc (c);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (btoc32, wint_t, (int c), _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (btoc32, wint_t, (int c));
+_GL_CXXALIASWARN (btoc32);
+#endif
+
+
+/* Test a specific property of a 32-bit wide character.  */
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISALNUM
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isalnum (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswalnum (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isalnum, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isalnum, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isalnum);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISALPHA
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isalpha (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswalpha (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isalpha, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isalpha, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isalpha);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISBLANK
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isblank (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswblank (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isblank, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isblank, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isblank);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISCNTRL
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32iscntrl (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswcntrl (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32iscntrl, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32iscntrl, int, (wint_t wc));
+_GL_CXXALIASWARN (c32iscntrl);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISDIGIT
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isdigit (wint_t wc)
+{
+  return
+#  if 1 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswdigit (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isdigit, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isdigit, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isdigit);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISGRAPH
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isgraph (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswgraph (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isgraph, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isgraph, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isgraph);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISLOWER
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32islower (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswlower (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32islower, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32islower, int, (wint_t wc));
+_GL_CXXALIASWARN (c32islower);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISPRINT
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isprint (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswprint (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isprint, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isprint, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isprint);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISPUNCT
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32ispunct (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswpunct (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32ispunct, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32ispunct, int, (wint_t wc));
+_GL_CXXALIASWARN (c32ispunct);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISSPACE
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isspace (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswspace (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isspace, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isspace, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isspace);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISUPPER
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isupper (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswupper (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isupper, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isupper, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isupper);
+#endif
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISXDIGIT
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isxdigit (wint_t wc)
+{
+  return
+#  if 1 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswxdigit (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isxdigit, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isxdigit, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isxdigit);
+#endif
+
+
+/* Case mapping of a 32-bit wide character.  */
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32TOLOWER
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE wint_t
+c32tolower (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         towlower (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32tolower, wint_t, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32tolower, wint_t, (wint_t wc));
+_GL_CXXALIASWARN (c32tolower);
+#endif
+#if 0
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32TOUPPER
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE wint_t
+c32toupper (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         towupper (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32toupper, wint_t, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32toupper, wint_t, (wint_t wc));
+_GL_CXXALIASWARN (c32toupper);
+#endif
+
+
+/* Number of screen columns needed for a 32-bit wide character.  */
+#if 1
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32WIDTH
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32width (char32_t wc)
+{
+  return
+#  if 1 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wcwidth (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32width, int, (char32_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32width, int, (char32_t wc));
+_GL_CXXALIASWARN (c32width);
+#endif
+
+
+/* Converts a 32-bit wide character to a multibyte character.  */
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef c32rtomb
+#   define c32rtomb rpl_c32rtomb
+#  endif
+_GL_FUNCDECL_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps), );
+_GL_CXXALIAS_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps), );
+#  endif
+_GL_CXXALIAS_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
+# endif
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
+_GL_CXXALIASWARN (c32rtomb);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_C32RTOMB
+_GL_WARN_ON_USE (c32rtomb, "c32rtomb is not portable - "
+                 "use gnulib module c32rtomb for portability");
+# endif
+#endif
+
+
+/* Convert a 32-bit wide string to a string.  */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32SNRTOMBS
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+c32snrtombs (char *dest, const char32_t **srcp, size_t srclen, size_t len,
+             mbstate_t *ps)
+{
+  return
+#  if 0 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wcsnrtombs (dest, (const wchar_t **) srcp, srclen, len, ps);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32snrtombs, size_t,
+                  (char *dest, const char32_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32snrtombs, size_t,
+                  (char *dest, const char32_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+_GL_CXXALIASWARN (c32snrtombs);
+#endif
+
+
+/* Convert a 32-bit wide string to a string.  */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32SRTOMBS
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+c32srtombs (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps)
+{
+  return
+#  if 0 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wcsrtombs (dest, (const wchar_t **) srcp, len, ps);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32srtombs, size_t,
+                  (char *dest, const char32_t **srcp, size_t len,
+                   mbstate_t *ps),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32srtombs, size_t,
+                  (char *dest, const char32_t **srcp, size_t len,
+                   mbstate_t *ps));
+_GL_CXXALIASWARN (c32srtombs);
+#endif
+
+
+/* Convert a 32-bit wide string to a string.  */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32STOMBS
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+c32stombs (char *dest, const char32_t *src, size_t len)
+{
+  mbstate_t state;
+
+  mbszero (&state);
+  return c32srtombs (dest, &src, len, &state);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32stombs, size_t,
+                  (char *dest, const char32_t *src, size_t len),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32stombs, size_t,
+                  (char *dest, const char32_t *src, size_t len));
+_GL_CXXALIASWARN (c32stombs);
+#endif
+
+
+/* Number of screen columns needed for a size-bounded 32-bit wide string.  */
+#if 0
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32SWIDTH
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((1)) int
+c32swidth (const char32_t *s, size_t n)
+{
+  return
+#  if 0 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wcswidth ((const wchar_t *) s, n);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32swidth, int, (const char32_t *s, size_t n),
+                                  _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (c32swidth, int, (const char32_t *s, size_t n));
+_GL_CXXALIASWARN (c32swidth);
+#endif
+
+
+/* Converts a 32-bit wide character to unibyte character.
+   Returns the single-byte representation of WC if it exists,
+   or EOF otherwise.  */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32TOB
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32tob (wint_t wc)
+{
+  return
+#  if 0 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wctob (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32tob, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32tob, int, (wint_t wc));
+_GL_CXXALIASWARN (c32tob);
+#endif
+
+
+/* Converts a multibyte character to a 32-bit wide character.  */
+#if 1
+# if 1
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbrtoc32
+#   define mbrtoc32 rpl_mbrtoc32
+#  endif
+_GL_FUNCDECL_RPL (mbrtoc32, size_t,
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps), );
+_GL_CXXALIAS_RPL (mbrtoc32, size_t,
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (mbrtoc32, size_t,
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps), );
+#  endif
+_GL_CXXALIAS_SYS (mbrtoc32, size_t,
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps));
+# endif
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
+_GL_CXXALIASWARN (mbrtoc32);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_MBRTOC32
+_GL_WARN_ON_USE (mbrtoc32, "mbrtoc32 is not portable - "
+                 "use gnulib module mbrtoc32 for portability");
+# endif
+#endif
+
+
+/* Converts a multibyte character and returns the next 16-bit wide
+   character.  */
+#if 0
+# if 0
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbrtoc16
+#   define mbrtoc16 rpl_mbrtoc16
+#  endif
+_GL_FUNCDECL_RPL (mbrtoc16, size_t,
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps), );
+_GL_CXXALIAS_RPL (mbrtoc16, size_t,
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps));
+# else
+#  if !1
+_GL_FUNCDECL_SYS (mbrtoc16, size_t,
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps), );
+#  endif
+_GL_CXXALIAS_SYS (mbrtoc16, size_t,
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps));
+# endif
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
+_GL_CXXALIASWARN (mbrtoc16);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# if HAVE_RAW_DECL_MBRTOC16
+_GL_WARN_ON_USE (mbrtoc16, "mbrtoc16 is not portable - "
+                 "use gnulib module mbrtoc16 for portability");
+# endif
+#endif
+
+
+/* Convert a string to a 32-bit wide string.  */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSNRTOC32S
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+mbsnrtoc32s (char32_t *dest, const char **srcp, size_t srclen, size_t len,
+             mbstate_t *ps)
+{
+  return
+#  if 0 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         mbsnrtowcs ((wchar_t *) dest, srcp, srclen, len, ps);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (mbsnrtoc32s, size_t,
+                  (char32_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mbsnrtoc32s, size_t,
+                  (char32_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+_GL_CXXALIASWARN (mbsnrtoc32s);
+#endif
+
+
+/* Convert a string to a 32-bit wide string.  */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSRTOC32S
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+mbsrtoc32s (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+{
+  return
+#  if 0 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         mbsrtowcs ((wchar_t *) dest, srcp, len, ps);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (mbsrtoc32s, size_t,
+                  (char32_t *dest, const char **srcp, size_t len,
+                   mbstate_t *ps),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mbsrtoc32s, size_t,
+                  (char32_t *dest, const char **srcp, size_t len,
+                   mbstate_t *ps));
+_GL_CXXALIASWARN (mbsrtoc32s);
+#endif
+
+
+/* Convert a string to a 32-bit wide string.  */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSTOC32S
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+mbstoc32s (char32_t *dest, const char *src, size_t len)
+{
+  mbstate_t state;
+
+  mbszero (&state);
+  return mbsrtoc32s (dest, &src, len, &state);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (mbstoc32s, size_t,
+                  (char32_t *dest, const char *src, size_t len),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mbstoc32s, size_t,
+                  (char32_t *dest, const char *src, size_t len));
+_GL_CXXALIASWARN (mbstoc32s);
+#endif
+
+
+#if 0 || 0
+/* A scalar type.  Instances of this type, other than (c32_type_test_t) 0,
+   represent a character property, sometimes also viewed as a "character class".
+   It can be applied to 32-bit wide characters.  It is the counterpart of
+   type 'wctype_t' for wide characters.
+   To test whether a given character has a certain property, use the function
+   'c32_apply_type_test'.  */
+# if _GL_WCHAR_T_IS_UCS4
+typedef wctype_t c32_type_test_t;
+# else
+typedef /*bool*/int (*c32_type_test_t) (wint_t wc);
+# endif
+#endif
+
+/* Return a character property with the given name, or (c32_type_test_t) 0
+   if the designated property does not exist.
+   This function is the counterpart of function 'wctype' for wide characters.
+ */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_GET_TYPE_TEST
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((1)) c32_type_test_t
+c32_get_type_test (const char *name)
+{
+  return
+#  if 1 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wctype (name);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32_get_type_test, c32_type_test_t, (const char *name),
+                                                      _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (c32_get_type_test, c32_type_test_t, (const char *name));
+_GL_CXXALIASWARN (c32_get_type_test);
+#endif
+
+/* Test whether a given 32-bit wide character has the specified character
+   property.
+   Return non-zero if true, zero if false or if the argument is WEOF.
+   This function is the counterpart of function 'iswctype' for wide characters.
+ */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4
+#  if !defined IN_C32_APPLY_TYPE_TEST
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32_apply_type_test (wint_t wc, c32_type_test_t property)
+{
+  return
+#  if 1 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswctype (wc, property);
+}
+_GL_END_C_LINKAGE
+#  else
+_GL_FUNCDECL_SYS (c32_apply_type_test, int,
+                  (wint_t wc, c32_type_test_t property), );
+#  endif
+# else
+_GL_FUNCDECL_SYS (c32_apply_type_test, int,
+                  (wint_t wc, c32_type_test_t property),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32_apply_type_test, int,
+                  (wint_t wc, c32_type_test_t property));
+_GL_CXXALIASWARN (c32_apply_type_test);
+#endif
+
+
+#if 0 || 0
+/* A scalar type.  Instances of this type, other than (c32_mapping_t) 0,
+   represent a character mapping.  It can be applied to 32-bit wide characters.
+   It is the counterpart of type 'wctrans_t' for wide characters.
+   To apply a certain mapping to a given character, use the function
+   'c32_apply_mapping'.  */
+# if _GL_WCHAR_T_IS_UCS4
+typedef wctrans_t c32_mapping_t;
+# else
+typedef wint_t (*c32_mapping_t) (wint_t wc);
+# endif
+#endif
+
+/* Return a character mapping with the given name, or (c32_mapping_t) 0
+   if the designated mapping does not exist.
+   This function is the counterpart of function 'wctrans' for wide characters.
+ */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_GET_MAPPING
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((1)) c32_mapping_t
+c32_get_mapping (const char *name)
+{
+  return
+#  if 0 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wctrans (name);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32_get_mapping, c32_mapping_t, (const char *name),
+                                                  _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (c32_get_mapping, c32_mapping_t, (const char *name));
+_GL_CXXALIASWARN (c32_get_mapping);
+#endif
+
+/* Apply the specified character mapping to a given 32-bit wide character.
+   Return the result of this mapping.  Return the WC argument unchanged if it is
+   WEOF.
+   This function is the counterpart of function 'towctrans' for wide characters.
+ */
+#if 0
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_APPLY_MAPPING
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) wint_t
+c32_apply_mapping (wint_t wc, c32_mapping_t mapping)
+{
+  return
+#  if 0 && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         towctrans (wc, mapping);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32_apply_mapping, wint_t,
+                  (wint_t wc, c32_mapping_t mapping),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32_apply_mapping, wint_t,
+                  (wint_t wc, c32_mapping_t mapping));
+_GL_CXXALIASWARN (c32_apply_mapping);
+#endif
+
+
+_GL_INLINE_HEADER_END
+
+#endif /* _GL_UCHAR_H */
+#endif /* _GL_UCHAR_H */
diff --git a/gl/uchar.in.h b/gl/uchar.in.h
new file mode 100644
index 00000000..9a65ac37
--- /dev/null
+++ b/gl/uchar.in.h
@@ -0,0 +1,912 @@
+/* <uchar.h> substitute - 16-bit and 32-bit wide character types.
+   Copyright (C) 2019-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2019.  */
+
+/*
+ * ISO C 23 <uchar.h> for platforms that lack it.
+ */
+
+#ifndef _@GUARD_PREFIX@_UCHAR_H
+
+#if __GNUC__ >= 3
+@PRAGMA_SYSTEM_HEADER@
+#endif
+@PRAGMA_COLUMNS@
+
+/* The include_next requires a split double-inclusion guard.  */
+#if (defined __cplusplus ? @CXX_HAVE_UCHAR_H@ : @HAVE_UCHAR_H@)
+# if defined __HAIKU__
+/* Work around <https://dev.haiku-os.org/ticket/17040>.  */
+#  include <stdint.h>
+# endif
+/* On AIX 7.2 with xlclang++, /usr/include/uchar.h produces compilation errors
+   because it contains typedef definitions of char16_t and char32_t, however
+   char16_t and char32_t are keywords in this situation.  To work around it,
+   define char16_t and char32_t as macros.  */
+# if defined __cplusplus && defined _AIX && defined __ibmxl__ && defined __clang__
+#  define char16_t gl_char16_t
+#  define char32_t gl_char32_t
+# endif
+# @INCLUDE_NEXT@ @NEXT_UCHAR_H@
+#endif
+
+#ifndef _@GUARD_PREFIX@_UCHAR_H
+#define _@GUARD_PREFIX@_UCHAR_H
+
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_BEGIN_C_LINKAGE,
+   _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* Get uint_least16_t, uint_least32_t.  */
+#include <stdint.h>
+
+/* Get mbstate_t, size_t.  */
+#include <wchar.h>
+
+/* For the inline functions.  */
+#include <string.h>
+#include <wctype.h>
+
+/* The __attribute__ feature is available in gcc versions 2.5 and later.
+   The attribute __pure__ was added in gcc 2.96.  */
+#ifndef _GL_ATTRIBUTE_PURE
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__
+#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _GL_ATTRIBUTE_PURE /* empty */
+# endif
+#endif
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+/* The definition of _GL_ARG_NONNULL is copied here.  */
+
+/* The definition of _GL_WARN_ON_USE is copied here.  */
+
+
+_GL_INLINE_HEADER_BEGIN
+
+
+#if !(defined __cplusplus ? @CXX_HAVE_UCHAR_H@ || @CXX_HAS_CHAR8_TYPE@ : @HAVE_UCHAR_H@)
+
+/* An 8-bit variant of wchar_t.
+   Note: This type is only mandated by ISO C 23 or newer, and it does
+   denote UTF-8 units.  */
+typedef unsigned char char8_t;
+
+#elif @GNULIBHEADERS_OVERRIDE_CHAR8_T@
+
+typedef unsigned char gl_char8_t;
+# define char8_t gl_char8_t
+
+#endif
+
+#if !(defined __cplusplus ? @CXX_HAVE_UCHAR_H@ || @CXX_HAS_UCHAR_TYPES@ : @HAVE_UCHAR_H@)
+
+/* A 16-bit variant of wchar_t.
+   Note: This type is only mandated by ISO C 11 or newer.  In ISO C 23
+   and newer, it denotes UTF-16 units; in older versions of ISO C it did
+   so only on platforms on which __STDC_UTF_16__ was defined.  */
+typedef uint_least16_t char16_t;
+
+#elif @GNULIBHEADERS_OVERRIDE_CHAR16_T@
+
+typedef uint_least16_t gl_char16_t;
+# define char16_t gl_char16_t
+
+#endif
+
+#if !(defined __cplusplus ? @CXX_HAVE_UCHAR_H@ || @CXX_HAS_UCHAR_TYPES@ : @HAVE_UCHAR_H@)
+
+/* A 32-bit variant of wchar_t.
+   Note: This type is only mandated by ISO C 11 or newer.  In ISO C 23
+   and newer, it denotes UTF-32 code points; in older versions of ISO C
+   it did so only on platforms on which __STDC_UTF_32__ was defined.
+   In gnulib, we guarantee that it denotes UTF-32 code points if and
+   only if the module 'uchar-h-c23' is in use.  */
+typedef uint_least32_t char32_t;
+
+#elif @GNULIBHEADERS_OVERRIDE_CHAR32_T@
+
+typedef uint_least32_t gl_char32_t;
+# define char32_t gl_char32_t
+
+#endif
+
+/* Define if a 'char32_t' can hold more characters than a 'wchar_t'.  */
+#if @SMALL_WCHAR_T@                    /* 32-bit AIX, Cygwin, native Windows */
+# define _GL_SMALL_WCHAR_T 1
+#endif
+
+/* Define if 'wchar_t', like 'char32_t',
+     - is a 32-bit type, and
+     - represents Unicode code points.
+   For this test, we can use __STDC_ISO_10646__ (defined by glibc, musl libc,
+   Cygwin) but need to consider _GL_SMALL_WCHAR_T, so as to exclude Cygwin.
+   We cannot use __STDC_UTF_16__ or __STDC_UTF_32__
+     - because these macros provide info about char16_t and char32_t (not
+       wchar_t!), and
+     - because GCC >= 4.9 defines these macros on all platforms, even on
+       FreeBSD and Solaris.
+   We should better not use __STD_UTF_16__, __STD_UTF_32__ either, because
+   these macros are misspellings, only defined by Android's <uchar.h>.  */
+#if defined __STDC_ISO_10646__ && !_GL_SMALL_WCHAR_T
+/* glibc, musl libc */
+# define _GL_WCHAR_T_IS_UCS4 1
+#endif
+#if _GL_WCHAR_T_IS_UCS4
+static_assert (sizeof (char32_t) == sizeof (wchar_t));
+#endif
+
+
+/* Convert a single-byte character to a 32-bit wide character.  */
+#if @GNULIB_BTOC32@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_BTOC32
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ATTRIBUTE_PURE wint_t
+btoc32 (int c)
+{
+  return
+#  if @GNULIB_BTOWC@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         btowc (c);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (btoc32, wint_t, (int c), _GL_ATTRIBUTE_PURE);
+# endif
+_GL_CXXALIAS_SYS (btoc32, wint_t, (int c));
+_GL_CXXALIASWARN (btoc32);
+#endif
+
+
+/* Test a specific property of a 32-bit wide character.  */
+#if @GNULIB_C32ISALNUM@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISALNUM
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isalnum (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswalnum (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isalnum, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isalnum, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isalnum);
+#endif
+#if @GNULIB_C32ISALPHA@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISALPHA
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isalpha (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswalpha (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isalpha, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isalpha, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isalpha);
+#endif
+#if @GNULIB_C32ISBLANK@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISBLANK
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isblank (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswblank (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isblank, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isblank, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isblank);
+#endif
+#if @GNULIB_C32ISCNTRL@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISCNTRL
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32iscntrl (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswcntrl (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32iscntrl, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32iscntrl, int, (wint_t wc));
+_GL_CXXALIASWARN (c32iscntrl);
+#endif
+#if @GNULIB_C32ISDIGIT@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISDIGIT
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isdigit (wint_t wc)
+{
+  return
+#  if @GNULIB_ISWDIGIT@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswdigit (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isdigit, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isdigit, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isdigit);
+#endif
+#if @GNULIB_C32ISGRAPH@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISGRAPH
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isgraph (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswgraph (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isgraph, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isgraph, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isgraph);
+#endif
+#if @GNULIB_C32ISLOWER@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISLOWER
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32islower (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswlower (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32islower, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32islower, int, (wint_t wc));
+_GL_CXXALIASWARN (c32islower);
+#endif
+#if @GNULIB_C32ISPRINT@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISPRINT
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isprint (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswprint (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isprint, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isprint, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isprint);
+#endif
+#if @GNULIB_C32ISPUNCT@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISPUNCT
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32ispunct (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswpunct (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32ispunct, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32ispunct, int, (wint_t wc));
+_GL_CXXALIASWARN (c32ispunct);
+#endif
+#if @GNULIB_C32ISSPACE@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISSPACE
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isspace (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswspace (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isspace, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isspace, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isspace);
+#endif
+#if @GNULIB_C32ISUPPER@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISUPPER
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isupper (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswupper (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isupper, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isupper, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isupper);
+#endif
+#if @GNULIB_C32ISXDIGIT@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32ISXDIGIT
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32isxdigit (wint_t wc)
+{
+  return
+#  if @GNULIB_ISWXDIGIT@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswxdigit (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32isxdigit, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32isxdigit, int, (wint_t wc));
+_GL_CXXALIASWARN (c32isxdigit);
+#endif
+
+
+/* Case mapping of a 32-bit wide character.  */
+#if @GNULIB_C32TOLOWER@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32TOLOWER
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE wint_t
+c32tolower (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         towlower (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32tolower, wint_t, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32tolower, wint_t, (wint_t wc));
+_GL_CXXALIASWARN (c32tolower);
+#endif
+#if @GNULIB_C32TOUPPER@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32TOUPPER
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE wint_t
+c32toupper (wint_t wc)
+{
+  return
+#  if defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         towupper (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32toupper, wint_t, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32toupper, wint_t, (wint_t wc));
+_GL_CXXALIASWARN (c32toupper);
+#endif
+
+
+/* Number of screen columns needed for a 32-bit wide character.  */
+#if @GNULIB_C32WIDTH@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32WIDTH
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32width (char32_t wc)
+{
+  return
+#  if @GNULIB_WCWIDTH@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wcwidth (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32width, int, (char32_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32width, int, (char32_t wc));
+_GL_CXXALIASWARN (c32width);
+#endif
+
+
+/* Converts a 32-bit wide character to a multibyte character.  */
+#if @GNULIB_C32RTOMB@
+# if @REPLACE_C32RTOMB@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef c32rtomb
+#   define c32rtomb rpl_c32rtomb
+#  endif
+_GL_FUNCDECL_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps), );
+_GL_CXXALIAS_RPL (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
+# else
+#  if !@HAVE_C32RTOMB@
+_GL_FUNCDECL_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps), );
+#  endif
+_GL_CXXALIAS_SYS (c32rtomb, size_t, (char *s, char32_t wc, mbstate_t *ps));
+# endif
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
+_GL_CXXALIASWARN (c32rtomb);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef c32rtomb
+# if HAVE_RAW_DECL_C32RTOMB
+_GL_WARN_ON_USE (c32rtomb, "c32rtomb is not portable - "
+                 "use gnulib module c32rtomb for portability");
+# endif
+#endif
+
+
+/* Convert a 32-bit wide string to a string.  */
+#if @GNULIB_C32SNRTOMBS@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32SNRTOMBS
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+c32snrtombs (char *dest, const char32_t **srcp, size_t srclen, size_t len,
+             mbstate_t *ps)
+{
+  return
+#  if @GNULIB_WCSNRTOMBS@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wcsnrtombs (dest, (const wchar_t **) srcp, srclen, len, ps);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32snrtombs, size_t,
+                  (char *dest, const char32_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32snrtombs, size_t,
+                  (char *dest, const char32_t **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+_GL_CXXALIASWARN (c32snrtombs);
+#endif
+
+
+/* Convert a 32-bit wide string to a string.  */
+#if @GNULIB_C32SRTOMBS@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32SRTOMBS
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+c32srtombs (char *dest, const char32_t **srcp, size_t len, mbstate_t *ps)
+{
+  return
+#  if @GNULIB_WCSRTOMBS@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wcsrtombs (dest, (const wchar_t **) srcp, len, ps);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32srtombs, size_t,
+                  (char *dest, const char32_t **srcp, size_t len,
+                   mbstate_t *ps),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32srtombs, size_t,
+                  (char *dest, const char32_t **srcp, size_t len,
+                   mbstate_t *ps));
+_GL_CXXALIASWARN (c32srtombs);
+#endif
+
+
+/* Convert a 32-bit wide string to a string.  */
+#if @GNULIB_C32STOMBS@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32STOMBS
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+c32stombs (char *dest, const char32_t *src, size_t len)
+{
+  mbstate_t state;
+
+  mbszero (&state);
+  return c32srtombs (dest, &src, len, &state);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32stombs, size_t,
+                  (char *dest, const char32_t *src, size_t len),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32stombs, size_t,
+                  (char *dest, const char32_t *src, size_t len));
+_GL_CXXALIASWARN (c32stombs);
+#endif
+
+
+/* Number of screen columns needed for a size-bounded 32-bit wide string.  */
+#if @GNULIB_C32SWIDTH@
+# if (_GL_WCHAR_T_IS_UCS4 && !GNULIB_defined_mbstate_t) && !defined IN_C32SWIDTH
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((1)) int
+c32swidth (const char32_t *s, size_t n)
+{
+  return
+#  if @GNULIB_WCSWIDTH@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wcswidth ((const wchar_t *) s, n);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32swidth, int, (const char32_t *s, size_t n),
+                                  _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (c32swidth, int, (const char32_t *s, size_t n));
+_GL_CXXALIASWARN (c32swidth);
+#endif
+
+
+/* Converts a 32-bit wide character to unibyte character.
+   Returns the single-byte representation of WC if it exists,
+   or EOF otherwise.  */
+#if @GNULIB_C32TOB@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32TOB
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32tob (wint_t wc)
+{
+  return
+#  if @GNULIB_WCTOB@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wctob (wc);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32tob, int, (wint_t wc), );
+# endif
+_GL_CXXALIAS_SYS (c32tob, int, (wint_t wc));
+_GL_CXXALIASWARN (c32tob);
+#endif
+
+
+/* Converts a multibyte character to a 32-bit wide character.  */
+#if @GNULIB_MBRTOC32@
+# if @REPLACE_MBRTOC32@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbrtoc32
+#   define mbrtoc32 rpl_mbrtoc32
+#  endif
+_GL_FUNCDECL_RPL (mbrtoc32, size_t,
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps), );
+_GL_CXXALIAS_RPL (mbrtoc32, size_t,
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps));
+# else
+#  if !@HAVE_MBRTOC32@
+_GL_FUNCDECL_SYS (mbrtoc32, size_t,
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps), );
+#  endif
+_GL_CXXALIAS_SYS (mbrtoc32, size_t,
+                  (char32_t *pc, const char *s, size_t n, mbstate_t *ps));
+# endif
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
+_GL_CXXALIASWARN (mbrtoc32);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mbrtoc32
+# if HAVE_RAW_DECL_MBRTOC32
+_GL_WARN_ON_USE (mbrtoc32, "mbrtoc32 is not portable - "
+                 "use gnulib module mbrtoc32 for portability");
+# endif
+#endif
+
+
+/* Converts a multibyte character and returns the next 16-bit wide
+   character.  */
+#if @GNULIB_MBRTOC16@
+# if @REPLACE_MBRTOC16@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbrtoc16
+#   define mbrtoc16 rpl_mbrtoc16
+#  endif
+_GL_FUNCDECL_RPL (mbrtoc16, size_t,
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps), );
+_GL_CXXALIAS_RPL (mbrtoc16, size_t,
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps));
+# else
+#  if !@HAVE_MBRTOC16@
+_GL_FUNCDECL_SYS (mbrtoc16, size_t,
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps), );
+#  endif
+_GL_CXXALIAS_SYS (mbrtoc16, size_t,
+                  (char16_t *pc, const char *s, size_t n, mbstate_t *ps));
+# endif
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 16) > 2
+_GL_CXXALIASWARN (mbrtoc16);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mbrtoc16
+# if HAVE_RAW_DECL_MBRTOC16
+_GL_WARN_ON_USE (mbrtoc16, "mbrtoc16 is not portable - "
+                 "use gnulib module mbrtoc16 for portability");
+# endif
+#endif
+
+
+/* Convert a string to a 32-bit wide string.  */
+#if @GNULIB_MBSNRTOC32S@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSNRTOC32S
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+mbsnrtoc32s (char32_t *dest, const char **srcp, size_t srclen, size_t len,
+             mbstate_t *ps)
+{
+  return
+#  if @GNULIB_MBSNRTOWCS@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         mbsnrtowcs ((wchar_t *) dest, srcp, srclen, len, ps);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (mbsnrtoc32s, size_t,
+                  (char32_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mbsnrtoc32s, size_t,
+                  (char32_t *dest, const char **srcp, size_t srclen, size_t len,
+                   mbstate_t *ps));
+_GL_CXXALIASWARN (mbsnrtoc32s);
+#endif
+
+
+/* Convert a string to a 32-bit wide string.  */
+#if @GNULIB_MBSRTOC32S@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSRTOC32S
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+mbsrtoc32s (char32_t *dest, const char **srcp, size_t len, mbstate_t *ps)
+{
+  return
+#  if @GNULIB_MBSRTOWCS@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         mbsrtowcs ((wchar_t *) dest, srcp, len, ps);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (mbsrtoc32s, size_t,
+                  (char32_t *dest, const char **srcp, size_t len,
+                   mbstate_t *ps),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mbsrtoc32s, size_t,
+                  (char32_t *dest, const char **srcp, size_t len,
+                   mbstate_t *ps));
+_GL_CXXALIASWARN (mbsrtoc32s);
+#endif
+
+
+/* Convert a string to a 32-bit wide string.  */
+#if @GNULIB_MBSTOC32S@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_MBSTOC32S
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) size_t
+mbstoc32s (char32_t *dest, const char *src, size_t len)
+{
+  mbstate_t state;
+
+  mbszero (&state);
+  return mbsrtoc32s (dest, &src, len, &state);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (mbstoc32s, size_t,
+                  (char32_t *dest, const char *src, size_t len),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (mbstoc32s, size_t,
+                  (char32_t *dest, const char *src, size_t len));
+_GL_CXXALIASWARN (mbstoc32s);
+#endif
+
+
+#if @GNULIB_C32_GET_TYPE_TEST@ || @GNULIB_C32_APPLY_TYPE_TEST@
+/* A scalar type.  Instances of this type, other than (c32_type_test_t) 0,
+   represent a character property, sometimes also viewed as a "character class".
+   It can be applied to 32-bit wide characters.  It is the counterpart of
+   type 'wctype_t' for wide characters.
+   To test whether a given character has a certain property, use the function
+   'c32_apply_type_test'.  */
+# if _GL_WCHAR_T_IS_UCS4
+typedef wctype_t c32_type_test_t;
+# else
+typedef /*bool*/int (*c32_type_test_t) (wint_t wc);
+# endif
+#endif
+
+/* Return a character property with the given name, or (c32_type_test_t) 0
+   if the designated property does not exist.
+   This function is the counterpart of function 'wctype' for wide characters.
+ */
+#if @GNULIB_C32_GET_TYPE_TEST@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_GET_TYPE_TEST
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((1)) c32_type_test_t
+c32_get_type_test (const char *name)
+{
+  return
+#  if @GNULIB_WCTYPE@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wctype (name);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32_get_type_test, c32_type_test_t, (const char *name),
+                                                      _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (c32_get_type_test, c32_type_test_t, (const char *name));
+_GL_CXXALIASWARN (c32_get_type_test);
+#endif
+
+/* Test whether a given 32-bit wide character has the specified character
+   property.
+   Return non-zero if true, zero if false or if the argument is WEOF.
+   This function is the counterpart of function 'iswctype' for wide characters.
+ */
+#if @GNULIB_C32_APPLY_TYPE_TEST@
+# if _GL_WCHAR_T_IS_UCS4
+#  if !defined IN_C32_APPLY_TYPE_TEST
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE int
+c32_apply_type_test (wint_t wc, c32_type_test_t property)
+{
+  return
+#  if @GNULIB_ISWCTYPE@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         iswctype (wc, property);
+}
+_GL_END_C_LINKAGE
+#  else
+_GL_FUNCDECL_SYS (c32_apply_type_test, int,
+                  (wint_t wc, c32_type_test_t property), );
+#  endif
+# else
+_GL_FUNCDECL_SYS (c32_apply_type_test, int,
+                  (wint_t wc, c32_type_test_t property),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32_apply_type_test, int,
+                  (wint_t wc, c32_type_test_t property));
+_GL_CXXALIASWARN (c32_apply_type_test);
+#endif
+
+
+#if @GNULIB_C32_GET_MAPPING@ || @GNULIB_C32_APPLY_MAPPING@
+/* A scalar type.  Instances of this type, other than (c32_mapping_t) 0,
+   represent a character mapping.  It can be applied to 32-bit wide characters.
+   It is the counterpart of type 'wctrans_t' for wide characters.
+   To apply a certain mapping to a given character, use the function
+   'c32_apply_mapping'.  */
+# if _GL_WCHAR_T_IS_UCS4
+typedef wctrans_t c32_mapping_t;
+# else
+typedef wint_t (*c32_mapping_t) (wint_t wc);
+# endif
+#endif
+
+/* Return a character mapping with the given name, or (c32_mapping_t) 0
+   if the designated mapping does not exist.
+   This function is the counterpart of function 'wctrans' for wide characters.
+ */
+#if @GNULIB_C32_GET_MAPPING@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_GET_MAPPING
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((1)) c32_mapping_t
+c32_get_mapping (const char *name)
+{
+  return
+#  if @GNULIB_WCTRANS@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         wctrans (name);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32_get_mapping, c32_mapping_t, (const char *name),
+                                                  _GL_ARG_NONNULL ((1)));
+# endif
+_GL_CXXALIAS_SYS (c32_get_mapping, c32_mapping_t, (const char *name));
+_GL_CXXALIASWARN (c32_get_mapping);
+#endif
+
+/* Apply the specified character mapping to a given 32-bit wide character.
+   Return the result of this mapping.  Return the WC argument unchanged if it is
+   WEOF.
+   This function is the counterpart of function 'towctrans' for wide characters.
+ */
+#if @GNULIB_C32_APPLY_MAPPING@
+# if _GL_WCHAR_T_IS_UCS4 && !defined IN_C32_APPLY_MAPPING
+_GL_BEGIN_C_LINKAGE
+_GL_INLINE _GL_ARG_NONNULL ((2)) wint_t
+c32_apply_mapping (wint_t wc, c32_mapping_t mapping)
+{
+  return
+#  if @GNULIB_TOWCTRANS@ && defined __cplusplus && defined GNULIB_NAMESPACE
+         GNULIB_NAMESPACE::
+#  endif
+         towctrans (wc, mapping);
+}
+_GL_END_C_LINKAGE
+# else
+_GL_FUNCDECL_SYS (c32_apply_mapping, wint_t,
+                  (wint_t wc, c32_mapping_t mapping),
+                  _GL_ARG_NONNULL ((2)));
+# endif
+_GL_CXXALIAS_SYS (c32_apply_mapping, wint_t,
+                  (wint_t wc, c32_mapping_t mapping));
+_GL_CXXALIASWARN (c32_apply_mapping);
+#endif
+
+
+_GL_INLINE_HEADER_END
+
+#endif /* _@GUARD_PREFIX@_UCHAR_H */
+#endif /* _@GUARD_PREFIX@_UCHAR_H */
diff --git a/gl/unicase.h b/gl/unicase.h
new file mode 100644
index 00000000..507a83d0
--- /dev/null
+++ b/gl/unicase.h
@@ -0,0 +1,472 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Unicode character case mappings.
+   Copyright (C) 2002, 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNICASE_H
+#define _UNICASE_H
+
+#include "unitypes.h"
+
+/* Get bool.  */
+#include <stdbool.h>
+
+/* Get size_t.  */
+#include <stddef.h>
+
+/* Get uninorm_t.  */
+#include "uninorm.h"
+
+#if 0
+# include <unistring/woe32dll.h>
+#else
+# define LIBUNISTRING_DLL_VARIABLE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ========================================================================= */
+
+/* Character case mappings.
+   These mappings are locale and context independent.
+   WARNING! These functions are not sufficient for languages such as German.
+   Better use the functions below that treat an entire string at once and are
+   language aware.  */
+
+/* Return the uppercase mapping of a Unicode character.  */
+extern ucs4_t
+       uc_toupper (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the lowercase mapping of a Unicode character.  */
+extern ucs4_t
+       uc_tolower (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the titlecase mapping of a Unicode character.  */
+extern ucs4_t
+       uc_totitle (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* String case mappings.  */
+
+/* These functions are locale dependent.  The iso639_language argument
+   identifies the language (e.g. "tr" for Turkish).  NULL means to use
+   locale independent case mappings.  */
+
+/* Return the ISO 639 language code of the current locale.
+   Return "" if it is unknown, or in the "C" locale.  */
+extern const char *
+       uc_locale_language (void)
+       _UC_ATTRIBUTE_PURE;
+
+/* Conventions:
+
+   All functions prefixed with u8_ operate on UTF-8 encoded strings.
+   Their unit is an uint8_t (1 byte).
+
+   All functions prefixed with u16_ operate on UTF-16 encoded strings.
+   Their unit is an uint16_t (a 2-byte word).
+
+   All functions prefixed with u32_ operate on UCS-4 encoded strings.
+   Their unit is an uint32_t (a 4-byte word).
+
+   All argument pairs (s, n) denote a Unicode string s[0..n-1] with exactly
+   n units.
+
+   Functions returning a string result take a (resultbuf, lengthp) argument
+   pair.  If resultbuf is not NULL and the result fits into *lengthp units,
+   it is put in resultbuf, and resultbuf is returned.  Otherwise, a freshly
+   allocated string is returned.  In both cases, *lengthp is set to the
+   length (number of units) of the returned string.  In case of error,
+   NULL is returned and errno is set.  */
+
+/* Return the uppercase mapping of a string.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.  */
+extern uint8_t *
+       u8_toupper (const uint8_t *s, size_t n, const char *iso639_language,
+                   uninorm_t nf,
+                   uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_toupper (const uint16_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_toupper (const uint32_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the lowercase mapping of a string.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.  */
+extern uint8_t *
+       u8_tolower (const uint8_t *s, size_t n, const char *iso639_language,
+                   uninorm_t nf,
+                   uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_tolower (const uint16_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_tolower (const uint32_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the titlecase mapping of a string.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.  */
+extern uint8_t *
+       u8_totitle (const uint8_t *s, size_t n, const char *iso639_language,
+                   uninorm_t nf,
+                   uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_totitle (const uint16_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_totitle (const uint32_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* The case-mapping context given by a prefix string.  */
+typedef struct casing_prefix_context
+        {
+          /* These fields are private, undocumented.  */
+          uint32_t last_char_except_ignorable;
+          uint32_t last_char_normal_or_above;
+        }
+        casing_prefix_context_t;
+/* The case-mapping context of the empty prefix string.  */
+extern LIBUNISTRING_DLL_VARIABLE const casing_prefix_context_t unicase_empty_prefix_context;
+/* Return the case-mapping context of a given prefix string.  */
+extern casing_prefix_context_t
+       u8_casing_prefix_context (const uint8_t *s, size_t n);
+extern casing_prefix_context_t
+       u16_casing_prefix_context (const uint16_t *s, size_t n);
+extern casing_prefix_context_t
+       u32_casing_prefix_context (const uint32_t *s, size_t n);
+/* Return the case-mapping context of the prefix concat(A, S), given the
+   case-mapping context of the prefix A.  */
+extern casing_prefix_context_t
+       u8_casing_prefixes_context (const uint8_t *s, size_t n,
+                                   casing_prefix_context_t a_context);
+extern casing_prefix_context_t
+       u16_casing_prefixes_context (const uint16_t *s, size_t n,
+                                    casing_prefix_context_t a_context);
+extern casing_prefix_context_t
+       u32_casing_prefixes_context (const uint32_t *s, size_t n,
+                                    casing_prefix_context_t a_context);
+
+/* The case-mapping context given by a suffix string.  */
+typedef struct casing_suffix_context
+        {
+          /* These fields are private, undocumented.  */
+          uint32_t first_char_except_ignorable;
+          uint32_t bits;
+        }
+        casing_suffix_context_t;
+/* The case-mapping context of the empty suffix string.  */
+extern LIBUNISTRING_DLL_VARIABLE const casing_suffix_context_t unicase_empty_suffix_context;
+/* Return the case-mapping context of a given suffix string.  */
+extern casing_suffix_context_t
+       u8_casing_suffix_context (const uint8_t *s, size_t n);
+extern casing_suffix_context_t
+       u16_casing_suffix_context (const uint16_t *s, size_t n);
+extern casing_suffix_context_t
+       u32_casing_suffix_context (const uint32_t *s, size_t n);
+/* Return the case-mapping context of the suffix concat(S, A), given the
+   case-mapping context of the suffix A.  */
+extern casing_suffix_context_t
+       u8_casing_suffixes_context (const uint8_t *s, size_t n,
+                                   casing_suffix_context_t a_context);
+extern casing_suffix_context_t
+       u16_casing_suffixes_context (const uint16_t *s, size_t n,
+                                    casing_suffix_context_t a_context);
+extern casing_suffix_context_t
+       u32_casing_suffixes_context (const uint32_t *s, size_t n,
+                                    casing_suffix_context_t a_context);
+
+/* Return the uppercase mapping of a string that is surrounded by a prefix
+   and a suffix.  */
+extern uint8_t *
+       u8_ct_toupper (const uint8_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_ct_toupper (const uint16_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_ct_toupper (const uint32_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the lowercase mapping of a string that is surrounded by a prefix
+   and a suffix.  */
+extern uint8_t *
+       u8_ct_tolower (const uint8_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_ct_tolower (const uint16_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_ct_tolower (const uint32_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the titlecase mapping of a string that is surrounded by a prefix
+   and a suffix.  */
+extern uint8_t *
+       u8_ct_totitle (const uint8_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_ct_totitle (const uint16_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_ct_totitle (const uint32_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the case folded string.
+   Comparing uN_casefold (S1) and uN_casefold (S2) with uN_cmp2() is equivalent
+   to comparing S1 and S2 with uN_casecmp().
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.  */
+extern uint8_t *
+       u8_casefold (const uint8_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_casefold (const uint16_t *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_casefold (const uint32_t *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+/* Likewise, for a string that is surrounded by a prefix and a suffix.  */
+extern uint8_t *
+       u8_ct_casefold (const uint8_t *s, size_t n,
+                       casing_prefix_context_t prefix_context,
+                       casing_suffix_context_t suffix_context,
+                       const char *iso639_language,
+                       uninorm_t nf,
+                       uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_ct_casefold (const uint16_t *s, size_t n,
+                        casing_prefix_context_t prefix_context,
+                        casing_suffix_context_t suffix_context,
+                        const char *iso639_language,
+                        uninorm_t nf,
+                        uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_ct_casefold (const uint32_t *s, size_t n,
+                        casing_prefix_context_t prefix_context,
+                        casing_suffix_context_t suffix_context,
+                        const char *iso639_language,
+                        uninorm_t nf,
+                        uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Compare S1 and S2, ignoring differences in case and normalization.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_casecmp (const uint8_t *s1, size_t n1,
+                   const uint8_t *s2, size_t n2,
+                   const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       u16_casecmp (const uint16_t *s1, size_t n1,
+                    const uint16_t *s2, size_t n2,
+                    const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       u32_casecmp (const uint32_t *s1, size_t n1,
+                    const uint32_t *s2, size_t n2,
+                    const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       ulc_casecmp (const char *s1, size_t n1,
+                    const char *s2, size_t n2,
+                    const char *iso639_language, uninorm_t nf, int *resultp);
+
+/* Convert the string S of length N to a NUL-terminated byte sequence, in such
+   a way that comparing uN_casexfrm (S1) and uN_casexfrm (S2) with the gnulib
+   function memcmp2() is equivalent to comparing S1 and S2 with uN_casecoll().
+   NF must be either UNINORM_NFC, UNINORM_NFKC, or NULL for no normalization.  */
+extern char *
+       u8_casexfrm (const uint8_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    char *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern char *
+       u16_casexfrm (const uint16_t *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     char *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern char *
+       u32_casexfrm (const uint32_t *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     char *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern char *
+       ulc_casexfrm (const char *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     char *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Compare S1 and S2, ignoring differences in case and normalization, using the
+   collation rules of the current locale.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It must be either UNINORM_NFC or UNINORM_NFKC.  It can also
+   be NULL, for no normalization.
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_casecoll (const uint8_t *s1, size_t n1,
+                    const uint8_t *s2, size_t n2,
+                    const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       u16_casecoll (const uint16_t *s1, size_t n1,
+                     const uint16_t *s2, size_t n2,
+                     const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       u32_casecoll (const uint32_t *s1, size_t n1,
+                     const uint32_t *s2, size_t n2,
+                     const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       ulc_casecoll (const char *s1, size_t n1,
+                     const char *s2, size_t n2,
+                     const char *iso639_language, uninorm_t nf, int *resultp);
+
+
+/* Set *RESULTP to true if mapping NFD(S) to upper case is a no-op, or to false
+   otherwise, and return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_uppercase (const uint8_t *s, size_t n,
+                        const char *iso639_language,
+                        bool *resultp);
+extern int
+       u16_is_uppercase (const uint16_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+extern int
+       u32_is_uppercase (const uint32_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+
+/* Set *RESULTP to true if mapping NFD(S) to lower case is a no-op, or to false
+   otherwise, and return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_lowercase (const uint8_t *s, size_t n,
+                        const char *iso639_language,
+                        bool *resultp);
+extern int
+       u16_is_lowercase (const uint16_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+extern int
+       u32_is_lowercase (const uint32_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+
+/* Set *RESULTP to true if mapping NFD(S) to title case is a no-op, or to false
+   otherwise, and return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_titlecase (const uint8_t *s, size_t n,
+                        const char *iso639_language,
+                        bool *resultp);
+extern int
+       u16_is_titlecase (const uint16_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+extern int
+       u32_is_titlecase (const uint32_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+
+/* Set *RESULTP to true if applying case folding to NFD(S) is a no-op, or to
+   false otherwise, and return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_casefolded (const uint8_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+extern int
+       u16_is_casefolded (const uint16_t *s, size_t n,
+                          const char *iso639_language,
+                          bool *resultp);
+extern int
+       u32_is_casefolded (const uint32_t *s, size_t n,
+                          const char *iso639_language,
+                          bool *resultp);
+
+/* Set *RESULTP to true if case matters for S, that is, if mapping NFD(S) to
+   either upper case or lower case or title case is not a no-op.
+   Set *RESULTP to false if NFD(S) maps to itself under the upper case mapping,
+   under the lower case mapping, and under the title case mapping; in other
+   words, when NFD(S) consists entirely of caseless characters.
+   Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_cased (const uint8_t *s, size_t n,
+                    const char *iso639_language,
+                    bool *resultp);
+extern int
+       u16_is_cased (const uint16_t *s, size_t n,
+                     const char *iso639_language,
+                     bool *resultp);
+extern int
+       u32_is_cased (const uint32_t *s, size_t n,
+                     const char *iso639_language,
+                     bool *resultp);
+
+
+/* ========================================================================= */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNICASE_H */
diff --git a/gl/unicase.in.h b/gl/unicase.in.h
new file mode 100644
index 00000000..c6df04b3
--- /dev/null
+++ b/gl/unicase.in.h
@@ -0,0 +1,471 @@
+/* Unicode character case mappings.
+   Copyright (C) 2002, 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNICASE_H
+#define _UNICASE_H
+
+#include "unitypes.h"
+
+/* Get bool.  */
+#include <stdbool.h>
+
+/* Get size_t.  */
+#include <stddef.h>
+
+/* Get uninorm_t.  */
+#include "uninorm.h"
+
+#if @HAVE_UNISTRING_WOE32DLL_H@
+# include <unistring/woe32dll.h>
+#else
+# define LIBUNISTRING_DLL_VARIABLE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ========================================================================= */
+
+/* Character case mappings.
+   These mappings are locale and context independent.
+   WARNING! These functions are not sufficient for languages such as German.
+   Better use the functions below that treat an entire string at once and are
+   language aware.  */
+
+/* Return the uppercase mapping of a Unicode character.  */
+extern ucs4_t
+       uc_toupper (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the lowercase mapping of a Unicode character.  */
+extern ucs4_t
+       uc_tolower (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the titlecase mapping of a Unicode character.  */
+extern ucs4_t
+       uc_totitle (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* String case mappings.  */
+
+/* These functions are locale dependent.  The iso639_language argument
+   identifies the language (e.g. "tr" for Turkish).  NULL means to use
+   locale independent case mappings.  */
+
+/* Return the ISO 639 language code of the current locale.
+   Return "" if it is unknown, or in the "C" locale.  */
+extern const char *
+       uc_locale_language (void)
+       _UC_ATTRIBUTE_PURE;
+
+/* Conventions:
+
+   All functions prefixed with u8_ operate on UTF-8 encoded strings.
+   Their unit is an uint8_t (1 byte).
+
+   All functions prefixed with u16_ operate on UTF-16 encoded strings.
+   Their unit is an uint16_t (a 2-byte word).
+
+   All functions prefixed with u32_ operate on UCS-4 encoded strings.
+   Their unit is an uint32_t (a 4-byte word).
+
+   All argument pairs (s, n) denote a Unicode string s[0..n-1] with exactly
+   n units.
+
+   Functions returning a string result take a (resultbuf, lengthp) argument
+   pair.  If resultbuf is not NULL and the result fits into *lengthp units,
+   it is put in resultbuf, and resultbuf is returned.  Otherwise, a freshly
+   allocated string is returned.  In both cases, *lengthp is set to the
+   length (number of units) of the returned string.  In case of error,
+   NULL is returned and errno is set.  */
+
+/* Return the uppercase mapping of a string.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.  */
+extern uint8_t *
+       u8_toupper (const uint8_t *s, size_t n, const char *iso639_language,
+                   uninorm_t nf,
+                   uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_toupper (const uint16_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_toupper (const uint32_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the lowercase mapping of a string.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.  */
+extern uint8_t *
+       u8_tolower (const uint8_t *s, size_t n, const char *iso639_language,
+                   uninorm_t nf,
+                   uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_tolower (const uint16_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_tolower (const uint32_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the titlecase mapping of a string.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.  */
+extern uint8_t *
+       u8_totitle (const uint8_t *s, size_t n, const char *iso639_language,
+                   uninorm_t nf,
+                   uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_totitle (const uint16_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_totitle (const uint32_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* The case-mapping context given by a prefix string.  */
+typedef struct casing_prefix_context
+        {
+          /* These fields are private, undocumented.  */
+          uint32_t last_char_except_ignorable;
+          uint32_t last_char_normal_or_above;
+        }
+        casing_prefix_context_t;
+/* The case-mapping context of the empty prefix string.  */
+extern @GNULIB_UNICASE_EMPTY_PREFIX_CONTEXT_DLL_VARIABLE@ const casing_prefix_context_t unicase_empty_prefix_context;
+/* Return the case-mapping context of a given prefix string.  */
+extern casing_prefix_context_t
+       u8_casing_prefix_context (const uint8_t *s, size_t n);
+extern casing_prefix_context_t
+       u16_casing_prefix_context (const uint16_t *s, size_t n);
+extern casing_prefix_context_t
+       u32_casing_prefix_context (const uint32_t *s, size_t n);
+/* Return the case-mapping context of the prefix concat(A, S), given the
+   case-mapping context of the prefix A.  */
+extern casing_prefix_context_t
+       u8_casing_prefixes_context (const uint8_t *s, size_t n,
+                                   casing_prefix_context_t a_context);
+extern casing_prefix_context_t
+       u16_casing_prefixes_context (const uint16_t *s, size_t n,
+                                    casing_prefix_context_t a_context);
+extern casing_prefix_context_t
+       u32_casing_prefixes_context (const uint32_t *s, size_t n,
+                                    casing_prefix_context_t a_context);
+
+/* The case-mapping context given by a suffix string.  */
+typedef struct casing_suffix_context
+        {
+          /* These fields are private, undocumented.  */
+          uint32_t first_char_except_ignorable;
+          uint32_t bits;
+        }
+        casing_suffix_context_t;
+/* The case-mapping context of the empty suffix string.  */
+extern @GNULIB_UNICASE_EMPTY_SUFFIX_CONTEXT_DLL_VARIABLE@ const casing_suffix_context_t unicase_empty_suffix_context;
+/* Return the case-mapping context of a given suffix string.  */
+extern casing_suffix_context_t
+       u8_casing_suffix_context (const uint8_t *s, size_t n);
+extern casing_suffix_context_t
+       u16_casing_suffix_context (const uint16_t *s, size_t n);
+extern casing_suffix_context_t
+       u32_casing_suffix_context (const uint32_t *s, size_t n);
+/* Return the case-mapping context of the suffix concat(S, A), given the
+   case-mapping context of the suffix A.  */
+extern casing_suffix_context_t
+       u8_casing_suffixes_context (const uint8_t *s, size_t n,
+                                   casing_suffix_context_t a_context);
+extern casing_suffix_context_t
+       u16_casing_suffixes_context (const uint16_t *s, size_t n,
+                                    casing_suffix_context_t a_context);
+extern casing_suffix_context_t
+       u32_casing_suffixes_context (const uint32_t *s, size_t n,
+                                    casing_suffix_context_t a_context);
+
+/* Return the uppercase mapping of a string that is surrounded by a prefix
+   and a suffix.  */
+extern uint8_t *
+       u8_ct_toupper (const uint8_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_ct_toupper (const uint16_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_ct_toupper (const uint32_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the lowercase mapping of a string that is surrounded by a prefix
+   and a suffix.  */
+extern uint8_t *
+       u8_ct_tolower (const uint8_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_ct_tolower (const uint16_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_ct_tolower (const uint32_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the titlecase mapping of a string that is surrounded by a prefix
+   and a suffix.  */
+extern uint8_t *
+       u8_ct_totitle (const uint8_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_ct_totitle (const uint16_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_ct_totitle (const uint32_t *s, size_t n,
+                      casing_prefix_context_t prefix_context,
+                      casing_suffix_context_t suffix_context,
+                      const char *iso639_language,
+                      uninorm_t nf,
+                      uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Return the case folded string.
+   Comparing uN_casefold (S1) and uN_casefold (S2) with uN_cmp2() is equivalent
+   to comparing S1 and S2 with uN_casecmp().
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.  */
+extern uint8_t *
+       u8_casefold (const uint8_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_casefold (const uint16_t *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_casefold (const uint32_t *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+/* Likewise, for a string that is surrounded by a prefix and a suffix.  */
+extern uint8_t *
+       u8_ct_casefold (const uint8_t *s, size_t n,
+                       casing_prefix_context_t prefix_context,
+                       casing_suffix_context_t suffix_context,
+                       const char *iso639_language,
+                       uninorm_t nf,
+                       uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_ct_casefold (const uint16_t *s, size_t n,
+                        casing_prefix_context_t prefix_context,
+                        casing_suffix_context_t suffix_context,
+                        const char *iso639_language,
+                        uninorm_t nf,
+                        uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_ct_casefold (const uint32_t *s, size_t n,
+                        casing_prefix_context_t prefix_context,
+                        casing_suffix_context_t suffix_context,
+                        const char *iso639_language,
+                        uninorm_t nf,
+                        uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Compare S1 and S2, ignoring differences in case and normalization.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It can also be NULL, for no normalization.
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_casecmp (const uint8_t *s1, size_t n1,
+                   const uint8_t *s2, size_t n2,
+                   const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       u16_casecmp (const uint16_t *s1, size_t n1,
+                    const uint16_t *s2, size_t n2,
+                    const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       u32_casecmp (const uint32_t *s1, size_t n1,
+                    const uint32_t *s2, size_t n2,
+                    const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       ulc_casecmp (const char *s1, size_t n1,
+                    const char *s2, size_t n2,
+                    const char *iso639_language, uninorm_t nf, int *resultp);
+
+/* Convert the string S of length N to a NUL-terminated byte sequence, in such
+   a way that comparing uN_casexfrm (S1) and uN_casexfrm (S2) with the gnulib
+   function memcmp2() is equivalent to comparing S1 and S2 with uN_casecoll().
+   NF must be either UNINORM_NFC, UNINORM_NFKC, or NULL for no normalization.  */
+extern char *
+       u8_casexfrm (const uint8_t *s, size_t n, const char *iso639_language,
+                    uninorm_t nf,
+                    char *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern char *
+       u16_casexfrm (const uint16_t *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     char *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern char *
+       u32_casexfrm (const uint32_t *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     char *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern char *
+       ulc_casexfrm (const char *s, size_t n, const char *iso639_language,
+                     uninorm_t nf,
+                     char *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+/* Compare S1 and S2, ignoring differences in case and normalization, using the
+   collation rules of the current locale.
+   The nf argument identifies the normalization form to apply after the
+   case-mapping.  It must be either UNINORM_NFC or UNINORM_NFKC.  It can also
+   be NULL, for no normalization.
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_casecoll (const uint8_t *s1, size_t n1,
+                    const uint8_t *s2, size_t n2,
+                    const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       u16_casecoll (const uint16_t *s1, size_t n1,
+                     const uint16_t *s2, size_t n2,
+                     const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       u32_casecoll (const uint32_t *s1, size_t n1,
+                     const uint32_t *s2, size_t n2,
+                     const char *iso639_language, uninorm_t nf, int *resultp);
+extern int
+       ulc_casecoll (const char *s1, size_t n1,
+                     const char *s2, size_t n2,
+                     const char *iso639_language, uninorm_t nf, int *resultp);
+
+
+/* Set *RESULTP to true if mapping NFD(S) to upper case is a no-op, or to false
+   otherwise, and return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_uppercase (const uint8_t *s, size_t n,
+                        const char *iso639_language,
+                        bool *resultp);
+extern int
+       u16_is_uppercase (const uint16_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+extern int
+       u32_is_uppercase (const uint32_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+
+/* Set *RESULTP to true if mapping NFD(S) to lower case is a no-op, or to false
+   otherwise, and return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_lowercase (const uint8_t *s, size_t n,
+                        const char *iso639_language,
+                        bool *resultp);
+extern int
+       u16_is_lowercase (const uint16_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+extern int
+       u32_is_lowercase (const uint32_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+
+/* Set *RESULTP to true if mapping NFD(S) to title case is a no-op, or to false
+   otherwise, and return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_titlecase (const uint8_t *s, size_t n,
+                        const char *iso639_language,
+                        bool *resultp);
+extern int
+       u16_is_titlecase (const uint16_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+extern int
+       u32_is_titlecase (const uint32_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+
+/* Set *RESULTP to true if applying case folding to NFD(S) is a no-op, or to
+   false otherwise, and return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_casefolded (const uint8_t *s, size_t n,
+                         const char *iso639_language,
+                         bool *resultp);
+extern int
+       u16_is_casefolded (const uint16_t *s, size_t n,
+                          const char *iso639_language,
+                          bool *resultp);
+extern int
+       u32_is_casefolded (const uint32_t *s, size_t n,
+                          const char *iso639_language,
+                          bool *resultp);
+
+/* Set *RESULTP to true if case matters for S, that is, if mapping NFD(S) to
+   either upper case or lower case or title case is not a no-op.
+   Set *RESULTP to false if NFD(S) maps to itself under the upper case mapping,
+   under the lower case mapping, and under the title case mapping; in other
+   words, when NFD(S) consists entirely of caseless characters.
+   Upon failure, return -1 with errno set.  */
+extern int
+       u8_is_cased (const uint8_t *s, size_t n,
+                    const char *iso639_language,
+                    bool *resultp);
+extern int
+       u16_is_cased (const uint16_t *s, size_t n,
+                     const char *iso639_language,
+                     bool *resultp);
+extern int
+       u32_is_cased (const uint32_t *s, size_t n,
+                     const char *iso639_language,
+                     bool *resultp);
+
+
+/* ========================================================================= */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNICASE_H */
diff --git a/gl/unicase/.deps/.dirstamp b/gl/unicase/.deps/.dirstamp
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gl/unicase/.deps/.dirstamp
diff --git a/gl/unicase/.deps/libgnu_a-tolower.Po b/gl/unicase/.deps/libgnu_a-tolower.Po
new file mode 100644
index 00000000..1ba6bacb
--- /dev/null
+++ b/gl/unicase/.deps/libgnu_a-tolower.Po
@@ -0,0 +1,49 @@
+unicase/libgnu_a-tolower.o: unicase/tolower.c /usr/include/stdc-predef.h \
+ ../config.h unicase.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h uninorm.h \
+ unicase/tolower.h unicase/simple-mapping.h
+/usr/include/stdc-predef.h:
+../config.h:
+unicase.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+uninorm.h:
+unicase/tolower.h:
+unicase/simple-mapping.h:
diff --git a/gl/unicase/.dirstamp b/gl/unicase/.dirstamp
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gl/unicase/.dirstamp
diff --git a/gl/unicase/simple-mapping.h b/gl/unicase/simple-mapping.h
new file mode 100644
index 00000000..0c4c75b3
--- /dev/null
+++ b/gl/unicase/simple-mapping.h
@@ -0,0 +1,39 @@
+/* Simple case mapping for Unicode characters.
+   Copyright (C) 2002, 2006, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+ucs4_t
+FUNC (ucs4_t uc)
+{
+  unsigned int index1 = uc >> mapping_header_0;
+  if (index1 < mapping_header_1)
+    {
+      int lookup1 = u_mapping.level1[index1];
+      if (lookup1 >= 0)
+        {
+          unsigned int index2 = (uc >> mapping_header_2) & mapping_header_3;
+          int lookup2 = u_mapping.level2[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc & mapping_header_4);
+              int lookup3 = u_mapping.level3[lookup2 + index3];
+
+              return uc + lookup3;
+            }
+        }
+    }
+  return uc;
+}
diff --git a/gl/unicase/tolower.c b/gl/unicase/tolower.c
new file mode 100644
index 00000000..a1c898ef
--- /dev/null
+++ b/gl/unicase/tolower.c
@@ -0,0 +1,27 @@
+/* Lowercase mapping for Unicode characters (locale and context independent).
+   Copyright (C) 2002, 2006, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unicase.h"
+
+/* Define u_mapping table.  */
+#include "tolower.h"
+
+#define FUNC uc_tolower
+#include "simple-mapping.h"
diff --git a/gl/unicase/tolower.h b/gl/unicase/tolower.h
new file mode 100644
index 00000000..794f4c0c
--- /dev/null
+++ b/gl/unicase/tolower.h
@@ -0,0 +1,743 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Simple character mapping of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define mapping_header_0 16
+#define mapping_header_1 2
+#define mapping_header_2 7
+#define mapping_header_3 511
+#define mapping_header_4 127
+static const
+struct
+  {
+    int level1[2];
+    short level2[2 << 9];
+    int level3[36 << 7];
+  }
+u_mapping =
+{
+  {     0,   512 },
+  {
+        0,   128,   256,   384,   512,    -1,   640,   768,
+      896,  1024,  1152,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  1280,    -1,    -1,    -1,    -1,    -1,  1408,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  1536,    -1,    -1,  1664,  1792,  1920,  2048,
+       -1,    -1,  2176,  2304,    -1,    -1,    -1,    -1,
+       -1,  2432,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     2560,  2688,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  2816,  2944,  3072,  3200,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,  3328,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+     3456,  3584,  3712,  3840,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  3968,  4096,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,  4224,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,  4352,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,  4480,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1
+  },
+  {
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,     0,
+       32,    32,    32,    32,    32,    32,    32,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+     -199,     0,     1,     0,     1,     0,     1,     0,
+        0,     1,     0,     1,     0,     1,     0,     1,
+        0,     1,     0,     1,     0,     1,     0,     1,
+        0,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+     -121,     1,     0,     1,     0,     1,     0,     0,
+        0,   210,     1,     0,     1,     0,   206,     1,
+        0,   205,   205,     1,     0,     0,    79,   202,
+      203,     1,     0,   205,   207,     0,   211,   209,
+        1,     0,     0,     0,   211,   213,     0,   214,
+        1,     0,     1,     0,     1,     0,   218,     1,
+        0,   218,     0,     0,     1,     0,   218,     1,
+        0,   217,   217,     1,     0,     1,     0,   219,
+        1,     0,     0,     0,     1,     0,     0,     0,
+        0,     0,     0,     0,     2,     1,     0,     2,
+        1,     0,     2,     1,     0,     1,     0,     1,
+        0,     1,     0,     1,     0,     1,     0,     1,
+        0,     1,     0,     1,     0,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        0,     2,     1,     0,     1,     0,   -97,   -56,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+     -130,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     0,     0,     0,     0,
+        0,     0, 10795,     1,     0,  -163, 10792,     0,
+        0,     1,     0,  -195,    69,    71,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     0,     0,     1,     0,
+        0,     0,     0,     0,     0,     0,     0,   116,
+        0,     0,     0,     0,     0,     0,    38,     0,
+       37,    37,    37,     0,    64,     0,    63,    63,
+        0,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,     0,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        0,     0,     0,     0,   -60,     0,     0,     1,
+        0,    -7,     1,     0,     0,  -130,  -130,  -130,
+       80,    80,    80,    80,    80,    80,    80,    80,
+       80,    80,    80,    80,    80,    80,    80,    80,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+       15,     1,     0,     1,     0,     1,     0,     1,
+        0,     1,     0,     1,     0,     1,     0,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        0,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+     7264,  7264,  7264,  7264,  7264,  7264,  7264,  7264,
+     7264,  7264,  7264,  7264,  7264,  7264,  7264,  7264,
+     7264,  7264,  7264,  7264,  7264,  7264,  7264,  7264,
+     7264,  7264,  7264,  7264,  7264,  7264,  7264,  7264,
+     7264,  7264,  7264,  7264,  7264,  7264,     0,  7264,
+        0,     0,     0,     0,     0,  7264,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+    38864, 38864, 38864, 38864, 38864, 38864, 38864, 38864,
+        8,     8,     8,     8,     8,     8,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     1,     0,     0,     0,     0,     0,     0,
+    -3008, -3008, -3008, -3008, -3008, -3008, -3008, -3008,
+    -3008, -3008, -3008, -3008, -3008, -3008, -3008, -3008,
+    -3008, -3008, -3008, -3008, -3008, -3008, -3008, -3008,
+    -3008, -3008, -3008, -3008, -3008, -3008, -3008, -3008,
+    -3008, -3008, -3008, -3008, -3008, -3008, -3008, -3008,
+    -3008, -3008, -3008,     0,     0, -3008, -3008, -3008,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     0,     0,
+        0,     0,     0,     0,     0,     0, -7615,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,    -8,     0,    -8,     0,    -8,     0,    -8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,    -8,    -8,    -8,    -8,    -8,    -8,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,   -74,   -74,    -9,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+      -86,   -86,   -86,   -86,    -9,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,  -100,  -100,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       -8,    -8,  -112,  -112,    -7,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+     -128,  -128,  -126,  -126,    -9,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0, -7517,     0,
+        0,     0, -8383, -8262,     0,     0,     0,     0,
+        0,     0,    28,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       16,    16,    16,    16,    16,    16,    16,    16,
+       16,    16,    16,    16,    16,    16,    16,    16,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     1,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,    26,    26,
+       26,    26,    26,    26,    26,    26,    26,    26,
+       26,    26,    26,    26,    26,    26,    26,    26,
+       26,    26,    26,    26,    26,    26,    26,    26,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       48,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,    48,
+       48,    48,    48,    48,    48,    48,    48,    48,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        1,     0, -10743, -3814, -10727,     0,     0,     1,
+        0,     1,     0,     1,     0, -10780, -10749, -10783,
+    -10782,     0,     1,     0,     0,     1,     0,     0,
+        0,     0,     0,     0,     0,     0, -10815, -10815,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     0,     0,     0,     0,
+        0,     0,     0,     1,     0,     1,     0,     0,
+        0,     0,     1,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        0,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     1,     0,     1,     0, -35332,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        0,     0,     0,     1,     0, -42280,     0,     0,
+        1,     0,     1,     0,     0,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0, -42308, -42319, -42315, -42305, -42308,     0,
+    -42258, -42282, -42261,   928,     1,     0,     1,     0,
+        1,     0,     1,     0,     1,     0,     1,     0,
+        1,     0,     1,     0,   -48, -42307, -35384,     1,
+        0,     1,     0, -42343,     1,     0,     0,     0,
+        1,     0,     0,     0,     0,     0,     1,     0,
+        1,     0,     1,     0, -42561,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     1,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       40,    40,    40,    40,    40,    40,    40,    40,
+       40,    40,    40,    40,    40,    40,    40,    40,
+       40,    40,    40,    40,    40,    40,    40,    40,
+       40,    40,    40,    40,    40,    40,    40,    40,
+       40,    40,    40,    40,    40,    40,    40,    40,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       40,    40,    40,    40,    40,    40,    40,    40,
+       40,    40,    40,    40,    40,    40,    40,    40,
+       40,    40,    40,    40,    40,    40,    40,    40,
+       40,    40,    40,    40,    40,    40,    40,    40,
+       40,    40,    40,    40,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       39,    39,    39,    39,    39,    39,    39,    39,
+       39,    39,    39,     0,    39,    39,    39,    39,
+       39,    39,    39,    39,    39,    39,    39,    39,
+       39,    39,    39,     0,    39,    39,    39,    39,
+       39,    39,    39,     0,    39,    39,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       64,    64,    64,    64,    64,    64,    64,    64,
+       64,    64,    64,    64,    64,    64,    64,    64,
+       64,    64,    64,    64,    64,    64,    64,    64,
+       64,    64,    64,    64,    64,    64,    64,    64,
+       64,    64,    64,    64,    64,    64,    64,    64,
+       64,    64,    64,    64,    64,    64,    64,    64,
+       64,    64,    64,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+       32,    32,    32,    32,    32,    32,    32,    32,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+       34,    34,    34,    34,    34,    34,    34,    34,
+       34,    34,    34,    34,    34,    34,    34,    34,
+       34,    34,    34,    34,    34,    34,    34,    34,
+       34,    34,    34,    34,    34,    34,    34,    34,
+       34,    34,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,     0,     0,     0,     0
+  }
+};
diff --git a/gl/unictype.h b/gl/unictype.h
new file mode 100644
index 00000000..78072c2a
--- /dev/null
+++ b/gl/unictype.h
@@ -0,0 +1,1148 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Unicode character classification and properties.
+   Copyright (C) 2002, 2005-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNICTYPE_H
+#define _UNICTYPE_H
+
+#include "unitypes.h"
+
+/* Get bool.  */
+#include <stdbool.h>
+
+/* Get size_t.  */
+#include <stddef.h>
+
+#if 0
+# include <unistring/woe32dll.h>
+#else
+# define LIBUNISTRING_DLL_VARIABLE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ========================================================================= */
+
+/* Field 1 of Unicode Character Database: Character name.
+   See "uniname.h".  */
+
+/* ========================================================================= */
+
+/* Field 2 of Unicode Character Database: General category.  */
+
+/* Data type denoting a General category value.  This is not just a bitmask,
+   but rather a bitmask and a pointer to the lookup table, so that programs
+   that use only the predefined bitmasks (i.e. don't combine bitmasks with &
+   and |) don't have a link-time dependency towards the big general table.  */
+typedef struct
+{
+  uint32_t bitmask : 31;
+  /*bool*/ unsigned int generic : 1;
+  union
+  {
+    const void *table;                               /* when generic is 0 */
+    bool (*lookup_fn) (ucs4_t uc, uint32_t bitmask); /* when generic is 1 */
+  } lookup;
+}
+uc_general_category_t;
+
+/* Bits and bit masks denoting General category values.  UnicodeData-3.2.0.html
+   says a 32-bit integer will always suffice to represent them.
+   These bit masks can only be used with the uc_is_general_category_withtable
+   function.  */
+enum
+{
+  UC_CATEGORY_MASK_L  = 0x0000001f,
+  UC_CATEGORY_MASK_LC = 0x00000007,
+  UC_CATEGORY_MASK_Lu = 0x00000001,
+  UC_CATEGORY_MASK_Ll = 0x00000002,
+  UC_CATEGORY_MASK_Lt = 0x00000004,
+  UC_CATEGORY_MASK_Lm = 0x00000008,
+  UC_CATEGORY_MASK_Lo = 0x00000010,
+  UC_CATEGORY_MASK_M  = 0x000000e0,
+  UC_CATEGORY_MASK_Mn = 0x00000020,
+  UC_CATEGORY_MASK_Mc = 0x00000040,
+  UC_CATEGORY_MASK_Me = 0x00000080,
+  UC_CATEGORY_MASK_N  = 0x00000700,
+  UC_CATEGORY_MASK_Nd = 0x00000100,
+  UC_CATEGORY_MASK_Nl = 0x00000200,
+  UC_CATEGORY_MASK_No = 0x00000400,
+  UC_CATEGORY_MASK_P  = 0x0003f800,
+  UC_CATEGORY_MASK_Pc = 0x00000800,
+  UC_CATEGORY_MASK_Pd = 0x00001000,
+  UC_CATEGORY_MASK_Ps = 0x00002000,
+  UC_CATEGORY_MASK_Pe = 0x00004000,
+  UC_CATEGORY_MASK_Pi = 0x00008000,
+  UC_CATEGORY_MASK_Pf = 0x00010000,
+  UC_CATEGORY_MASK_Po = 0x00020000,
+  UC_CATEGORY_MASK_S  = 0x003c0000,
+  UC_CATEGORY_MASK_Sm = 0x00040000,
+  UC_CATEGORY_MASK_Sc = 0x00080000,
+  UC_CATEGORY_MASK_Sk = 0x00100000,
+  UC_CATEGORY_MASK_So = 0x00200000,
+  UC_CATEGORY_MASK_Z  = 0x01c00000,
+  UC_CATEGORY_MASK_Zs = 0x00400000,
+  UC_CATEGORY_MASK_Zl = 0x00800000,
+  UC_CATEGORY_MASK_Zp = 0x01000000,
+  UC_CATEGORY_MASK_C  = 0x3e000000,
+  UC_CATEGORY_MASK_Cc = 0x02000000,
+  UC_CATEGORY_MASK_Cf = 0x04000000,
+  UC_CATEGORY_MASK_Cs = 0x08000000,
+  UC_CATEGORY_MASK_Co = 0x10000000,
+  UC_CATEGORY_MASK_Cn = 0x20000000
+};
+
+/* Predefined General category values.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_L;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_LC;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Lu;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Ll;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Lt;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Lm;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Lo;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_M;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Mn;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Mc;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Me;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_N;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Nd;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Nl;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_No;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_P;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Pc;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Pd;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Ps;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Pe;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Pi;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Pf;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Po;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_S;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Sm;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Sc;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Sk;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_So;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Z;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Zs;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Zl;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Zp;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_C;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Cc;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Cf;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Cs;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Co;
+extern LIBUNISTRING_DLL_VARIABLE const uc_general_category_t UC_CATEGORY_Cn;
+/* Non-public.  */
+extern const uc_general_category_t _UC_CATEGORY_NONE;
+
+/* Alias names for predefined General category values.  */
+#define UC_LETTER                    UC_CATEGORY_L
+#define UC_CASED_LETTER              UC_CATEGORY_LC
+#define UC_UPPERCASE_LETTER          UC_CATEGORY_Lu
+#define UC_LOWERCASE_LETTER          UC_CATEGORY_Ll
+#define UC_TITLECASE_LETTER          UC_CATEGORY_Lt
+#define UC_MODIFIER_LETTER           UC_CATEGORY_Lm
+#define UC_OTHER_LETTER              UC_CATEGORY_Lo
+#define UC_MARK                      UC_CATEGORY_M
+#define UC_NON_SPACING_MARK          UC_CATEGORY_Mn
+#define UC_COMBINING_SPACING_MARK    UC_CATEGORY_Mc
+#define UC_ENCLOSING_MARK            UC_CATEGORY_Me
+#define UC_NUMBER                    UC_CATEGORY_N
+#define UC_DECIMAL_DIGIT_NUMBER      UC_CATEGORY_Nd
+#define UC_LETTER_NUMBER             UC_CATEGORY_Nl
+#define UC_OTHER_NUMBER              UC_CATEGORY_No
+#define UC_PUNCTUATION               UC_CATEGORY_P
+#define UC_CONNECTOR_PUNCTUATION     UC_CATEGORY_Pc
+#define UC_DASH_PUNCTUATION          UC_CATEGORY_Pd
+#define UC_OPEN_PUNCTUATION          UC_CATEGORY_Ps /* a.k.a. UC_START_PUNCTUATION */
+#define UC_CLOSE_PUNCTUATION         UC_CATEGORY_Pe /* a.k.a. UC_END_PUNCTUATION */
+#define UC_INITIAL_QUOTE_PUNCTUATION UC_CATEGORY_Pi
+#define UC_FINAL_QUOTE_PUNCTUATION   UC_CATEGORY_Pf
+#define UC_OTHER_PUNCTUATION         UC_CATEGORY_Po
+#define UC_SYMBOL                    UC_CATEGORY_S
+#define UC_MATH_SYMBOL               UC_CATEGORY_Sm
+#define UC_CURRENCY_SYMBOL           UC_CATEGORY_Sc
+#define UC_MODIFIER_SYMBOL           UC_CATEGORY_Sk
+#define UC_OTHER_SYMBOL              UC_CATEGORY_So
+#define UC_SEPARATOR                 UC_CATEGORY_Z
+#define UC_SPACE_SEPARATOR           UC_CATEGORY_Zs
+#define UC_LINE_SEPARATOR            UC_CATEGORY_Zl
+#define UC_PARAGRAPH_SEPARATOR       UC_CATEGORY_Zp
+#define UC_OTHER                     UC_CATEGORY_C
+#define UC_CONTROL                   UC_CATEGORY_Cc
+#define UC_FORMAT                    UC_CATEGORY_Cf
+#define UC_SURROGATE                 UC_CATEGORY_Cs /* all of them are invalid characters */
+#define UC_PRIVATE_USE               UC_CATEGORY_Co
+#define UC_UNASSIGNED                UC_CATEGORY_Cn /* some of them are invalid characters */
+
+/* Return the union of two general categories.
+   This corresponds to the unions of the two sets of characters.  */
+extern uc_general_category_t
+       uc_general_category_or (uc_general_category_t category1,
+                               uc_general_category_t category2);
+
+/* Return the intersection of two general categories as bit masks.
+   This *does*not* correspond to the intersection of the two sets of
+   characters.  */
+extern uc_general_category_t
+       uc_general_category_and (uc_general_category_t category1,
+                                uc_general_category_t category2);
+
+/* Return the intersection of a general category with the complement of a
+   second general category, as bit masks.
+   This *does*not* correspond to the intersection with complement, when
+   viewing the categories as sets of characters.  */
+extern uc_general_category_t
+       uc_general_category_and_not (uc_general_category_t category1,
+                                    uc_general_category_t category2);
+
+/* Return the name of a general category.  */
+extern const char *
+       uc_general_category_name (uc_general_category_t category)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the long name of a general category.  */
+extern const char *
+       uc_general_category_long_name (uc_general_category_t category)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the general category given by name, e.g. "Lu", or by long name,
+   e.g. "Uppercase Letter".  */
+extern uc_general_category_t
+       uc_general_category_byname (const char *category_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the general category of a Unicode character.  */
+extern uc_general_category_t
+       uc_general_category (ucs4_t uc)
+       _UC_ATTRIBUTE_PURE;
+
+/* Test whether a Unicode character belongs to a given category.
+   The CATEGORY argument can be the combination of several predefined
+   general categories.  */
+extern bool
+       uc_is_general_category (ucs4_t uc, uc_general_category_t category)
+       _UC_ATTRIBUTE_PURE;
+/* Likewise.  This function uses a big table comprising all categories.  */
+extern bool
+       uc_is_general_category_withtable (ucs4_t uc, uint32_t bitmask)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 3 of Unicode Character Database: Canonical combining class.  */
+
+/* The possible results of uc_combining_class (0..255) are described in
+   UCD.html.  The list here is not definitive; more values can be added
+   in future versions.  */
+enum
+{
+  UC_CCC_NR   =   0, /* Not Reordered */
+  UC_CCC_OV   =   1, /* Overlay */
+  UC_CCC_NK   =   7, /* Nukta */
+  UC_CCC_KV   =   8, /* Kana Voicing */
+  UC_CCC_VR   =   9, /* Virama */
+  UC_CCC_ATBL = 200, /* Attached Below Left */
+  UC_CCC_ATB  = 202, /* Attached Below */
+  UC_CCC_ATA  = 214, /* Attached Above */
+  UC_CCC_ATAR = 216, /* Attached Above Right */
+  UC_CCC_BL   = 218, /* Below Left */
+  UC_CCC_B    = 220, /* Below */
+  UC_CCC_BR   = 222, /* Below Right */
+  UC_CCC_L    = 224, /* Left */
+  UC_CCC_R    = 226, /* Right */
+  UC_CCC_AL   = 228, /* Above Left */
+  UC_CCC_A    = 230, /* Above */
+  UC_CCC_AR   = 232, /* Above Right */
+  UC_CCC_DB   = 233, /* Double Below */
+  UC_CCC_DA   = 234, /* Double Above */
+  UC_CCC_IS   = 240  /* Iota Subscript */
+};
+
+/* Return the canonical combining class of a Unicode character.  */
+extern int
+       uc_combining_class (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the name of a canonical combining class.  */
+extern const char *
+       uc_combining_class_name (int ccc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the long name of a canonical combining class.  */
+extern const char *
+       uc_combining_class_long_name (int ccc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the canonical combining class given by name, e.g. "BL", or by long
+   name, e.g. "Below Left".  */
+extern int
+       uc_combining_class_byname (const char *ccc_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* ========================================================================= */
+
+/* Field 4 of Unicode Character Database: Bidi class.
+   Before Unicode 4.0, this field was called "Bidirectional category".  */
+
+enum
+{
+  UC_BIDI_L,   /* Left-to-Right */
+  UC_BIDI_LRE, /* Left-to-Right Embedding */
+  UC_BIDI_LRO, /* Left-to-Right Override */
+  UC_BIDI_R,   /* Right-to-Left */
+  UC_BIDI_AL,  /* Right-to-Left Arabic */
+  UC_BIDI_RLE, /* Right-to-Left Embedding */
+  UC_BIDI_RLO, /* Right-to-Left Override */
+  UC_BIDI_PDF, /* Pop Directional Format */
+  UC_BIDI_EN,  /* European Number */
+  UC_BIDI_ES,  /* European Number Separator */
+  UC_BIDI_ET,  /* European Number Terminator */
+  UC_BIDI_AN,  /* Arabic Number */
+  UC_BIDI_CS,  /* Common Number Separator */
+  UC_BIDI_NSM, /* Non-Spacing Mark */
+  UC_BIDI_BN,  /* Boundary Neutral */
+  UC_BIDI_B,   /* Paragraph Separator */
+  UC_BIDI_S,   /* Segment Separator */
+  UC_BIDI_WS,  /* Whitespace */
+  UC_BIDI_ON,  /* Other Neutral */
+  UC_BIDI_LRI, /* Left-to-Right Isolate */
+  UC_BIDI_RLI, /* Right-to-Left Isolate */
+  UC_BIDI_FSI, /* First Strong Isolate */
+  UC_BIDI_PDI  /* Pop Directional Isolate */
+};
+
+/* Return the name of a bidi class.  */
+extern const char *
+       uc_bidi_class_name (int bidi_class)
+       _UC_ATTRIBUTE_CONST;
+/* Same; obsolete function name.  */
+extern const char *
+       uc_bidi_category_name (int category)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the long name of a bidi class.  */
+extern const char *
+       uc_bidi_class_long_name (int bidi_class)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the bidi class given by name, e.g. "LRE", or by long name, e.g.
+   "Left-to-Right Embedding".  */
+extern int
+       uc_bidi_class_byname (const char *bidi_class_name)
+       _UC_ATTRIBUTE_PURE;
+/* Same; obsolete function name.  */
+extern int
+       uc_bidi_category_byname (const char *category_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the bidi class of a Unicode character.  */
+extern int
+       uc_bidi_class (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+/* Same; obsolete function name.  */
+extern int
+       uc_bidi_category (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test whether a Unicode character belongs to a given bidi class.  */
+extern bool
+       uc_is_bidi_class (ucs4_t uc, int bidi_class)
+       _UC_ATTRIBUTE_CONST;
+/* Same; obsolete function name.  */
+extern bool
+       uc_is_bidi_category (ucs4_t uc, int category)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 5 of Unicode Character Database: Character decomposition mapping.
+   See "uninorm.h".  */
+
+/* ========================================================================= */
+
+/* Field 6 of Unicode Character Database: Decimal digit value.  */
+
+/* Return the decimal digit value of a Unicode character.  */
+extern int
+       uc_decimal_value (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 7 of Unicode Character Database: Digit value.  */
+
+/* Return the digit value of a Unicode character.  */
+extern int
+       uc_digit_value (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 8 of Unicode Character Database: Numeric value.  */
+
+/* Return the numeric value of a Unicode character.  */
+typedef struct
+{
+  int numerator;
+  int denominator;
+}
+uc_fraction_t;
+extern uc_fraction_t
+       uc_numeric_value (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 9 of Unicode Character Database: Mirrored.  */
+
+/* Return the mirrored character of a Unicode character UC in *PUC.  */
+extern bool
+       uc_mirror_char (ucs4_t uc, ucs4_t *puc);
+
+/* ========================================================================= */
+
+/* Field 10 of Unicode Character Database: Unicode 1.0 Name.
+   Not available in this library.  */
+
+/* ========================================================================= */
+
+/* Field 11 of Unicode Character Database: ISO 10646 comment.
+   Not available in this library.  */
+
+/* ========================================================================= */
+
+/* Field 12, 13, 14 of Unicode Character Database: Uppercase mapping,
+   lowercase mapping, titlecase mapping.  See "unicase.h".  */
+
+/* ========================================================================= */
+
+/* Field 2 of the file ArabicShaping.txt in the Unicode Character Database.  */
+
+/* Possible joining types.  */
+enum
+{
+  UC_JOINING_TYPE_U, /* Non_Joining */
+  UC_JOINING_TYPE_T, /* Transparent */
+  UC_JOINING_TYPE_C, /* Join_Causing */
+  UC_JOINING_TYPE_L, /* Left_Joining */
+  UC_JOINING_TYPE_R, /* Right_Joining */
+  UC_JOINING_TYPE_D  /* Dual_Joining */
+};
+
+/* Return the name of a joining type.  */
+extern const char *
+       uc_joining_type_name (int joining_type)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the long name of a joining type.  */
+extern const char *
+       uc_joining_type_long_name (int joining_type)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the joining type given by name, e.g. "D", or by long name, e.g.
+   "Dual Joining".  */
+extern int
+       uc_joining_type_byname (const char *joining_type_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the joining type of a Unicode character.  */
+extern int
+       uc_joining_type (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 3 of the file ArabicShaping.txt in the Unicode Character Database.  */
+
+/* Possible joining groups.
+   This enumeration may be extended in the future.  */
+enum
+{
+  UC_JOINING_GROUP_NONE,                     /* No_Joining_Group */
+  UC_JOINING_GROUP_AIN,                      /* Ain */
+  UC_JOINING_GROUP_ALAPH,                    /* Alaph */
+  UC_JOINING_GROUP_ALEF,                     /* Alef */
+  UC_JOINING_GROUP_BEH,                      /* Beh */
+  UC_JOINING_GROUP_BETH,                     /* Beth */
+  UC_JOINING_GROUP_BURUSHASKI_YEH_BARREE,    /* Burushaski_Yeh_Barree */
+  UC_JOINING_GROUP_DAL,                      /* Dal */
+  UC_JOINING_GROUP_DALATH_RISH,              /* Dalath_Rish */
+  UC_JOINING_GROUP_E,                        /* E */
+  UC_JOINING_GROUP_FARSI_YEH,                /* Farsi_Yeh */
+  UC_JOINING_GROUP_FE,                       /* Fe */
+  UC_JOINING_GROUP_FEH,                      /* Feh */
+  UC_JOINING_GROUP_FINAL_SEMKATH,            /* Final_Semkath */
+  UC_JOINING_GROUP_GAF,                      /* Gaf */
+  UC_JOINING_GROUP_GAMAL,                    /* Gamal */
+  UC_JOINING_GROUP_HAH,                      /* Hah */
+  UC_JOINING_GROUP_HE,                       /* He */
+  UC_JOINING_GROUP_HEH,                      /* Heh */
+  UC_JOINING_GROUP_HEH_GOAL,                 /* Heh_Goal */
+  UC_JOINING_GROUP_HETH,                     /* Heth */
+  UC_JOINING_GROUP_KAF,                      /* Kaf */
+  UC_JOINING_GROUP_KAPH,                     /* Kaph */
+  UC_JOINING_GROUP_KHAPH,                    /* Khaph */
+  UC_JOINING_GROUP_KNOTTED_HEH,              /* Knotted_Heh */
+  UC_JOINING_GROUP_LAM,                      /* Lam */
+  UC_JOINING_GROUP_LAMADH,                   /* Lamadh */
+  UC_JOINING_GROUP_MEEM,                     /* Meem */
+  UC_JOINING_GROUP_MIM,                      /* Mim */
+  UC_JOINING_GROUP_NOON,                     /* Noon */
+  UC_JOINING_GROUP_NUN,                      /* Nun */
+  UC_JOINING_GROUP_NYA,                      /* Nya */
+  UC_JOINING_GROUP_PE,                       /* Pe */
+  UC_JOINING_GROUP_QAF,                      /* Qaf */
+  UC_JOINING_GROUP_QAPH,                     /* Qaph */
+  UC_JOINING_GROUP_REH,                      /* Reh */
+  UC_JOINING_GROUP_REVERSED_PE,              /* Reversed_Pe */
+  UC_JOINING_GROUP_SAD,                      /* Sad */
+  UC_JOINING_GROUP_SADHE,                    /* Sadhe */
+  UC_JOINING_GROUP_SEEN,                     /* Seen */
+  UC_JOINING_GROUP_SEMKATH,                  /* Semkath */
+  UC_JOINING_GROUP_SHIN,                     /* Shin */
+  UC_JOINING_GROUP_SWASH_KAF,                /* Swash_Kaf */
+  UC_JOINING_GROUP_SYRIAC_WAW,               /* Syriac_Waw */
+  UC_JOINING_GROUP_TAH,                      /* Tah */
+  UC_JOINING_GROUP_TAW,                      /* Taw */
+  UC_JOINING_GROUP_TEH_MARBUTA,              /* Teh_Marbuta */
+  UC_JOINING_GROUP_TEH_MARBUTA_GOAL,         /* Teh_Marbuta_Goal */
+  UC_JOINING_GROUP_TETH,                     /* Teth */
+  UC_JOINING_GROUP_WAW,                      /* Waw */
+  UC_JOINING_GROUP_YEH,                      /* Yeh */
+  UC_JOINING_GROUP_YEH_BARREE,               /* Yeh_Barree */
+  UC_JOINING_GROUP_YEH_WITH_TAIL,            /* Yeh_With_Tail */
+  UC_JOINING_GROUP_YUDH,                     /* Yudh */
+  UC_JOINING_GROUP_YUDH_HE,                  /* Yudh_He */
+  UC_JOINING_GROUP_ZAIN,                     /* Zain */
+  UC_JOINING_GROUP_ZHAIN,                    /* Zhain */
+  UC_JOINING_GROUP_ROHINGYA_YEH,             /* Rohingya_Yeh */
+  UC_JOINING_GROUP_STRAIGHT_WAW,             /* Straight_Waw */
+  UC_JOINING_GROUP_MANICHAEAN_ALEPH,         /* Manichaean_Aleph */
+  UC_JOINING_GROUP_MANICHAEAN_BETH,          /* Manichaean_Beth */
+  UC_JOINING_GROUP_MANICHAEAN_GIMEL,         /* Manichaean_Gimel */
+  UC_JOINING_GROUP_MANICHAEAN_DALETH,        /* Manichaean_Daleth */
+  UC_JOINING_GROUP_MANICHAEAN_WAW,           /* Manichaean_Waw */
+  UC_JOINING_GROUP_MANICHAEAN_ZAYIN,         /* Manichaean_Zayin */
+  UC_JOINING_GROUP_MANICHAEAN_HETH,          /* Manichaean_Heth */
+  UC_JOINING_GROUP_MANICHAEAN_TETH,          /* Manichaean_Teth */
+  UC_JOINING_GROUP_MANICHAEAN_YODH,          /* Manichaean_Yodh */
+  UC_JOINING_GROUP_MANICHAEAN_KAPH,          /* Manichaean_Kaph */
+  UC_JOINING_GROUP_MANICHAEAN_LAMEDH,        /* Manichaean_Lamedh */
+  UC_JOINING_GROUP_MANICHAEAN_DHAMEDH,       /* Manichaean_Dhamedh */
+  UC_JOINING_GROUP_MANICHAEAN_THAMEDH,       /* Manichaean_Thamedh */
+  UC_JOINING_GROUP_MANICHAEAN_MEM,           /* Manichaean_Mem */
+  UC_JOINING_GROUP_MANICHAEAN_NUN,           /* Manichaean_Nun */
+  UC_JOINING_GROUP_MANICHAEAN_SAMEKH,        /* Manichaean_Aleph */
+  UC_JOINING_GROUP_MANICHAEAN_AYIN,          /* Manichaean_Ayin */
+  UC_JOINING_GROUP_MANICHAEAN_PE,            /* Manichaean_Pe */
+  UC_JOINING_GROUP_MANICHAEAN_SADHE,         /* Manichaean_Sadhe */
+  UC_JOINING_GROUP_MANICHAEAN_QOPH,          /* Manichaean_Qoph */
+  UC_JOINING_GROUP_MANICHAEAN_RESH,          /* Manichaean_Resh */
+  UC_JOINING_GROUP_MANICHAEAN_TAW,           /* Manichaean_Taw */
+  UC_JOINING_GROUP_MANICHAEAN_ONE,           /* Manichaean_One */
+  UC_JOINING_GROUP_MANICHAEAN_FIVE,          /* Manichaean_Five */
+  UC_JOINING_GROUP_MANICHAEAN_TEN,           /* Manichaean_Ten */
+  UC_JOINING_GROUP_MANICHAEAN_TWENTY,        /* Manichaean_Twenty */
+  UC_JOINING_GROUP_MANICHAEAN_HUNDRED,       /* Manichaean_Hundred */
+  UC_JOINING_GROUP_AFRICAN_FEH,              /* African_Feh */
+  UC_JOINING_GROUP_AFRICAN_QAF,              /* African_Qaf */
+  UC_JOINING_GROUP_AFRICAN_NOON,             /* African_Noon */
+  UC_JOINING_GROUP_MALAYALAM_NGA,            /* Malayalam_Nga */
+  UC_JOINING_GROUP_MALAYALAM_JA,             /* Malayalam_Ja */
+  UC_JOINING_GROUP_MALAYALAM_NYA,            /* Malayalam_Nya */
+  UC_JOINING_GROUP_MALAYALAM_TTA,            /* Malayalam_Tta */
+  UC_JOINING_GROUP_MALAYALAM_NNA,            /* Malayalam_Nna */
+  UC_JOINING_GROUP_MALAYALAM_NNNA,           /* Malayalam_Nnna */
+  UC_JOINING_GROUP_MALAYALAM_BHA,            /* Malayalam_Bha */
+  UC_JOINING_GROUP_MALAYALAM_RA,             /* Malayalam_Ra */
+  UC_JOINING_GROUP_MALAYALAM_LLA,            /* Malayalam_Lla */
+  UC_JOINING_GROUP_MALAYALAM_LLLA,           /* Malayalam_Llla */
+  UC_JOINING_GROUP_MALAYALAM_SSA,            /* Malayalam_Ssa */
+  UC_JOINING_GROUP_HANIFI_ROHINGYA_PA,       /* Hanifi_Rohingya_Pa */
+  UC_JOINING_GROUP_HANIFI_ROHINGYA_KINNA_YA, /* Hanifi_Rohingya_Kinna_Ya */
+  UC_JOINING_GROUP_THIN_YEH,                 /* Thin_Yeh */
+  UC_JOINING_GROUP_VERTICAL_TAIL,            /* Vertical_Tail */
+  UC_JOINING_GROUP_KASHMIRI_YEH,             /* Kashmiri_Yeh */
+  UC_JOINING_GROUP_THIN_NOON                 /* Thin_Noon */
+};
+
+/* Return the name of a joining group.  */
+extern const char *
+       uc_joining_group_name (int joining_group)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the joining group given by name, e.g. "Teh_Marbuta".  */
+extern int
+       uc_joining_group_byname (const char *joining_group_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the joining group of a Unicode character.  */
+extern int
+       uc_joining_group (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Common API for properties.  */
+
+/* Data type denoting a property.  This is not just a number, but rather a
+   pointer to the test functions, so that programs that use only few of the
+   properties don't have a link-time dependency towards all the tables.  */
+typedef struct
+{
+  bool (*test_fn) (ucs4_t uc);
+}
+uc_property_t;
+
+/* Predefined properties.  */
+/* General.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_WHITE_SPACE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_ALPHABETIC;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_OTHER_ALPHABETIC;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_NOT_A_CHARACTER;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_DEPRECATED;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_LOGICAL_ORDER_EXCEPTION;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_VARIATION_SELECTOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_PRIVATE_USE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_UNASSIGNED_CODE_VALUE;
+/* Case.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_UPPERCASE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_OTHER_UPPERCASE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_LOWERCASE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_OTHER_LOWERCASE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_TITLECASE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_CASED;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_CASE_IGNORABLE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_CHANGES_WHEN_LOWERCASED;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_CHANGES_WHEN_UPPERCASED;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_CHANGES_WHEN_TITLECASED;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEFOLDED;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEMAPPED;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_SOFT_DOTTED;
+/* Identifiers.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_ID_START;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_OTHER_ID_START;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_ID_CONTINUE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_OTHER_ID_CONTINUE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_XID_START;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_XID_CONTINUE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_ID_COMPAT_MATH_START;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_ID_COMPAT_MATH_CONTINUE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_PATTERN_WHITE_SPACE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_PATTERN_SYNTAX;
+/* Shaping and rendering.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_JOIN_CONTROL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_GRAPHEME_BASE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_GRAPHEME_EXTEND;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_OTHER_GRAPHEME_EXTEND;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_GRAPHEME_LINK;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_MODIFIER_COMBINING_MARK;
+/* Bidi.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_CONTROL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_LEFT_TO_RIGHT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_EUROPEAN_DIGIT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_SEPARATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_TERMINATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_ARABIC_DIGIT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_COMMON_SEPARATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_BLOCK_SEPARATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_SEGMENT_SEPARATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_WHITESPACE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_NON_SPACING_MARK;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_BOUNDARY_NEUTRAL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_PDF;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_BIDI_OTHER_NEUTRAL;
+/* Numeric.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_HEX_DIGIT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_ASCII_HEX_DIGIT;
+/* CJK.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_IDEOGRAPHIC;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_UNIFIED_IDEOGRAPH;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_RADICAL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_IDS_UNARY_OPERATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_IDS_BINARY_OPERATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_IDS_TRINARY_OPERATOR;
+/* Emoji.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_EMOJI;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_EMOJI_PRESENTATION;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_EMOJI_MODIFIER;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_EMOJI_MODIFIER_BASE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_EMOJI_COMPONENT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_EXTENDED_PICTOGRAPHIC;
+/* Misc.  */
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_ZERO_WIDTH;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_SPACE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_NON_BREAK;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_ISO_CONTROL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_FORMAT_CONTROL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_PREPENDED_CONCATENATION_MARK;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_DASH;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_HYPHEN;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_PUNCTUATION;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_LINE_SEPARATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_PARAGRAPH_SEPARATOR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_QUOTATION_MARK;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_SENTENCE_TERMINAL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_TERMINAL_PUNCTUATION;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_CURRENCY_SYMBOL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_MATH;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_OTHER_MATH;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_PAIRED_PUNCTUATION;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_LEFT_OF_PAIR;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_COMBINING;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_COMPOSITE;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_DECIMAL_DIGIT;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_NUMERIC;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_DIACRITIC;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_EXTENDER;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_IGNORABLE_CONTROL;
+extern LIBUNISTRING_DLL_VARIABLE const uc_property_t UC_PROPERTY_REGIONAL_INDICATOR;
+
+/* Return the property given by name, e.g. "White space".  */
+extern uc_property_t
+       uc_property_byname (const char *property_name);
+
+/* Test whether a property is valid.  */
+#define uc_property_is_valid(property) ((property).test_fn != NULL)
+
+/* Test whether a Unicode character has a given property.  */
+extern bool
+       uc_is_property (ucs4_t uc, uc_property_t property);
+extern bool uc_is_property_white_space (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_alphabetic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_alphabetic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_not_a_character (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_default_ignorable_code_point (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_default_ignorable_code_point (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_deprecated (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_logical_order_exception (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_variation_selector (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_private_use (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_unassigned_code_value (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_uppercase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_uppercase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_lowercase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_lowercase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_titlecase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_cased (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_case_ignorable (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_lowercased (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_uppercased (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_titlecased (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_casefolded (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_casemapped (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_soft_dotted (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_id_start (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_id_start (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_id_continue (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_id_continue (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_xid_start (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_xid_continue (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_id_compat_math_start (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_id_compat_math_continue (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_pattern_white_space (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_pattern_syntax (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_join_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_grapheme_base (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_grapheme_extend (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_grapheme_extend (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_grapheme_link (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_modifier_combining_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_left_to_right (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_hebrew_right_to_left (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_arabic_right_to_left (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_european_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_eur_num_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_eur_num_terminator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_arabic_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_common_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_block_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_segment_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_whitespace (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_non_spacing_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_boundary_neutral (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_pdf (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_embedding_or_override (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_other_neutral (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_hex_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ascii_hex_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ideographic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_unified_ideograph (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_radical (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ids_unary_operator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ids_binary_operator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ids_trinary_operator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji_presentation (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji_modifier (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji_modifier_base (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji_component (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_extended_pictographic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_zero_width (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_space (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_non_break (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_iso_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_format_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_prepended_concatenation_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_dash (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_hyphen (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_punctuation (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_line_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_paragraph_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_quotation_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_sentence_terminal (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_terminal_punctuation (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_currency_symbol (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_math (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_math (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_paired_punctuation (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_left_of_pair (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_combining (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_composite (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_decimal_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_numeric (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_diacritic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_extender (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ignorable_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_regional_indicator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Other attributes.  */
+
+/* ------------------------------------------------------------------------- */
+
+/* Indic_Conjunct_Break (InCB): from the file DerivedCoreProperties.txt
+   in the Unicode Character Database.  */
+
+/* Possible values of the Indic_Conjunct_Break attribute.
+   This enumeration may be extended in the future.  */
+enum
+{
+  UC_INDIC_CONJUNCT_BREAK_NONE,              /* None */
+  UC_INDIC_CONJUNCT_BREAK_CONSONANT,         /* Consonant */
+  UC_INDIC_CONJUNCT_BREAK_LINKER,            /* Linker */
+  UC_INDIC_CONJUNCT_BREAK_EXTEND             /* Extend */
+};
+
+/* Return the name of an Indic_Conjunct_Break value.  */
+extern const char *
+       uc_indic_conjunct_break_name (int indic_conjunct_break)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the Indic_Conjunct_Break value given by name, e.g. "Consonant".  */
+extern int
+       uc_indic_conjunct_break_byname (const char *indic_conjunct_break_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the Indic_Conjunct_Break attribute of a Unicode character.  */
+extern int
+       uc_indic_conjunct_break (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Subdivision of the Unicode characters into scripts.  */
+
+typedef struct
+{
+  unsigned int code : 21;
+  unsigned int start : 1;
+  unsigned int end : 1;
+}
+uc_interval_t;
+typedef struct
+{
+  unsigned int nintervals;
+  const uc_interval_t *intervals;
+  const char *name;
+}
+uc_script_t;
+
+/* Return the script of a Unicode character.  */
+extern const uc_script_t *
+       uc_script (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the script given by name, e.g. "HAN".  */
+extern const uc_script_t *
+       uc_script_byname (const char *script_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Test whether a Unicode character belongs to a given script.  */
+extern bool
+       uc_is_script (ucs4_t uc, const uc_script_t *script)
+       _UC_ATTRIBUTE_PURE;
+
+/* Get the list of all scripts.  */
+extern void
+       uc_all_scripts (const uc_script_t **scripts, size_t *count);
+
+/* ========================================================================= */
+
+/* Subdivision of the Unicode character range into blocks.  */
+
+typedef struct
+{
+  ucs4_t start;
+  ucs4_t end;
+  const char *name;
+}
+uc_block_t;
+
+/* Return the block a character belongs to.  */
+extern const uc_block_t *
+       uc_block (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test whether a Unicode character belongs to a given block.  */
+extern bool
+       uc_is_block (ucs4_t uc, const uc_block_t *block)
+       _UC_ATTRIBUTE_PURE;
+
+/* Get the list of all blocks.  */
+extern void
+       uc_all_blocks (const uc_block_t **blocks, size_t *count);
+
+/* ========================================================================= */
+
+/* Properties taken from language standards.  */
+
+/* Test whether a Unicode character is considered whitespace in ISO C 99.  */
+extern bool
+       uc_is_c_whitespace (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test whether a Unicode character is considered whitespace in Java.  */
+extern bool
+       uc_is_java_whitespace (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+enum
+{
+  UC_IDENTIFIER_START,    /* valid as first or subsequent character */
+  UC_IDENTIFIER_VALID,    /* valid as subsequent character only */
+  UC_IDENTIFIER_INVALID,  /* not valid */
+  UC_IDENTIFIER_IGNORABLE /* ignorable (Java only) */
+};
+
+/* Return the categorization of a Unicode character w.r.t. the ISO C 99
+   identifier syntax.  */
+extern int
+       uc_c_ident_category (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the categorization of a Unicode character w.r.t. the Java
+   identifier syntax.  */
+extern int
+       uc_java_ident_category (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Like ISO C <ctype.h> and <wctype.h>.  These functions are deprecated,
+   because this set of functions was designed with ASCII in mind and cannot
+   reflect the more diverse reality of the Unicode character set.  But they
+   can be a quick-and-dirty porting aid when migrating from wchar_t APIs
+   to Unicode strings.  */
+
+/* Test for any character for which 'uc_is_alpha' or 'uc_is_digit' is true.  */
+extern bool
+       uc_is_alnum (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character for which 'uc_is_upper' or 'uc_is_lower' is true,
+   or any character that is one of a locale-specific set of characters for
+   which none of 'uc_is_cntrl', 'uc_is_digit', 'uc_is_punct', or 'uc_is_space'
+   is true.  */
+extern bool
+       uc_is_alpha (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any control character.  */
+extern bool
+       uc_is_cntrl (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to a decimal-digit character.  */
+extern bool
+       uc_is_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character for which 'uc_is_print' is true and 'uc_is_space'
+   is false.  */
+extern bool
+       uc_is_graph (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to a lowercase letter or is one
+   of a locale-specific set of characters for which none of 'uc_is_cntrl',
+   'uc_is_digit', 'uc_is_punct', or 'uc_is_space' is true.  */
+extern bool
+       uc_is_lower (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any printing character.  */
+extern bool
+       uc_is_print (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any printing character that is one of a locale-specific set of
+   characters for which neither 'uc_is_space' nor 'uc_is_alnum' is true.  */
+extern bool
+       uc_is_punct (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to a locale-specific set of
+   characters for which none of 'uc_is_alnum', 'uc_is_graph', or 'uc_is_punct'
+   is true.  */
+extern bool
+       uc_is_space (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to an uppercase letter or is one
+   of a locale-specific set of character for which none of 'uc_is_cntrl',
+   'uc_is_digit', 'uc_is_punct', or 'uc_is_space' is true.  */
+extern bool
+       uc_is_upper (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to a hexadecimal-digit
+   character.  */
+extern bool
+       uc_is_xdigit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* GNU extension. */
+/* Test for any character that corresponds to a standard blank character or
+   a locale-specific set of characters for which 'uc_is_alnum' is false.  */
+extern bool
+       uc_is_blank (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNICTYPE_H */
diff --git a/gl/unictype.in.h b/gl/unictype.in.h
new file mode 100644
index 00000000..3818da91
--- /dev/null
+++ b/gl/unictype.in.h
@@ -0,0 +1,1146 @@
+/* Unicode character classification and properties.
+   Copyright (C) 2002, 2005-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNICTYPE_H
+#define _UNICTYPE_H
+
+#include "unitypes.h"
+
+/* Get bool.  */
+#include <stdbool.h>
+
+/* Get size_t.  */
+#include <stddef.h>
+
+#if @HAVE_UNISTRING_WOE32DLL_H@
+# include <unistring/woe32dll.h>
+#else
+# define LIBUNISTRING_DLL_VARIABLE
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ========================================================================= */
+
+/* Field 1 of Unicode Character Database: Character name.
+   See "uniname.h".  */
+
+/* ========================================================================= */
+
+/* Field 2 of Unicode Character Database: General category.  */
+
+/* Data type denoting a General category value.  This is not just a bitmask,
+   but rather a bitmask and a pointer to the lookup table, so that programs
+   that use only the predefined bitmasks (i.e. don't combine bitmasks with &
+   and |) don't have a link-time dependency towards the big general table.  */
+typedef struct
+{
+  uint32_t bitmask : 31;
+  /*bool*/ unsigned int generic : 1;
+  union
+  {
+    const void *table;                               /* when generic is 0 */
+    bool (*lookup_fn) (ucs4_t uc, uint32_t bitmask); /* when generic is 1 */
+  } lookup;
+}
+uc_general_category_t;
+
+/* Bits and bit masks denoting General category values.  UnicodeData-3.2.0.html
+   says a 32-bit integer will always suffice to represent them.
+   These bit masks can only be used with the uc_is_general_category_withtable
+   function.  */
+enum
+{
+  UC_CATEGORY_MASK_L  = 0x0000001f,
+  UC_CATEGORY_MASK_LC = 0x00000007,
+  UC_CATEGORY_MASK_Lu = 0x00000001,
+  UC_CATEGORY_MASK_Ll = 0x00000002,
+  UC_CATEGORY_MASK_Lt = 0x00000004,
+  UC_CATEGORY_MASK_Lm = 0x00000008,
+  UC_CATEGORY_MASK_Lo = 0x00000010,
+  UC_CATEGORY_MASK_M  = 0x000000e0,
+  UC_CATEGORY_MASK_Mn = 0x00000020,
+  UC_CATEGORY_MASK_Mc = 0x00000040,
+  UC_CATEGORY_MASK_Me = 0x00000080,
+  UC_CATEGORY_MASK_N  = 0x00000700,
+  UC_CATEGORY_MASK_Nd = 0x00000100,
+  UC_CATEGORY_MASK_Nl = 0x00000200,
+  UC_CATEGORY_MASK_No = 0x00000400,
+  UC_CATEGORY_MASK_P  = 0x0003f800,
+  UC_CATEGORY_MASK_Pc = 0x00000800,
+  UC_CATEGORY_MASK_Pd = 0x00001000,
+  UC_CATEGORY_MASK_Ps = 0x00002000,
+  UC_CATEGORY_MASK_Pe = 0x00004000,
+  UC_CATEGORY_MASK_Pi = 0x00008000,
+  UC_CATEGORY_MASK_Pf = 0x00010000,
+  UC_CATEGORY_MASK_Po = 0x00020000,
+  UC_CATEGORY_MASK_S  = 0x003c0000,
+  UC_CATEGORY_MASK_Sm = 0x00040000,
+  UC_CATEGORY_MASK_Sc = 0x00080000,
+  UC_CATEGORY_MASK_Sk = 0x00100000,
+  UC_CATEGORY_MASK_So = 0x00200000,
+  UC_CATEGORY_MASK_Z  = 0x01c00000,
+  UC_CATEGORY_MASK_Zs = 0x00400000,
+  UC_CATEGORY_MASK_Zl = 0x00800000,
+  UC_CATEGORY_MASK_Zp = 0x01000000,
+  UC_CATEGORY_MASK_C  = 0x3e000000,
+  UC_CATEGORY_MASK_Cc = 0x02000000,
+  UC_CATEGORY_MASK_Cf = 0x04000000,
+  UC_CATEGORY_MASK_Cs = 0x08000000,
+  UC_CATEGORY_MASK_Co = 0x10000000,
+  UC_CATEGORY_MASK_Cn = 0x20000000
+};
+
+/* Predefined General category values.  */
+extern @GNULIB_UNICTYPE_CATEGORY_L_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_L;
+extern @GNULIB_UNICTYPE_CATEGORY_LC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_LC;
+extern @GNULIB_UNICTYPE_CATEGORY_LU_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lu;
+extern @GNULIB_UNICTYPE_CATEGORY_LL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Ll;
+extern @GNULIB_UNICTYPE_CATEGORY_LT_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lt;
+extern @GNULIB_UNICTYPE_CATEGORY_LM_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lm;
+extern @GNULIB_UNICTYPE_CATEGORY_LO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Lo;
+extern @GNULIB_UNICTYPE_CATEGORY_M_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_M;
+extern @GNULIB_UNICTYPE_CATEGORY_MN_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Mn;
+extern @GNULIB_UNICTYPE_CATEGORY_MC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Mc;
+extern @GNULIB_UNICTYPE_CATEGORY_ME_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Me;
+extern @GNULIB_UNICTYPE_CATEGORY_N_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_N;
+extern @GNULIB_UNICTYPE_CATEGORY_ND_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Nd;
+extern @GNULIB_UNICTYPE_CATEGORY_NL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Nl;
+extern @GNULIB_UNICTYPE_CATEGORY_NO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_No;
+extern @GNULIB_UNICTYPE_CATEGORY_P_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_P;
+extern @GNULIB_UNICTYPE_CATEGORY_PC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pc;
+extern @GNULIB_UNICTYPE_CATEGORY_PD_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pd;
+extern @GNULIB_UNICTYPE_CATEGORY_PS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Ps;
+extern @GNULIB_UNICTYPE_CATEGORY_PE_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pe;
+extern @GNULIB_UNICTYPE_CATEGORY_PI_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pi;
+extern @GNULIB_UNICTYPE_CATEGORY_PF_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Pf;
+extern @GNULIB_UNICTYPE_CATEGORY_PO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Po;
+extern @GNULIB_UNICTYPE_CATEGORY_S_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_S;
+extern @GNULIB_UNICTYPE_CATEGORY_SM_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sm;
+extern @GNULIB_UNICTYPE_CATEGORY_SC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sc;
+extern @GNULIB_UNICTYPE_CATEGORY_SK_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Sk;
+extern @GNULIB_UNICTYPE_CATEGORY_SO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_So;
+extern @GNULIB_UNICTYPE_CATEGORY_Z_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Z;
+extern @GNULIB_UNICTYPE_CATEGORY_ZS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zs;
+extern @GNULIB_UNICTYPE_CATEGORY_ZL_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zl;
+extern @GNULIB_UNICTYPE_CATEGORY_ZP_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Zp;
+extern @GNULIB_UNICTYPE_CATEGORY_C_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_C;
+extern @GNULIB_UNICTYPE_CATEGORY_CC_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cc;
+extern @GNULIB_UNICTYPE_CATEGORY_CF_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cf;
+extern @GNULIB_UNICTYPE_CATEGORY_CS_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cs;
+extern @GNULIB_UNICTYPE_CATEGORY_CO_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Co;
+extern @GNULIB_UNICTYPE_CATEGORY_CN_DLL_VARIABLE@ const uc_general_category_t UC_CATEGORY_Cn;
+/* Non-public.  */
+extern const uc_general_category_t _UC_CATEGORY_NONE;
+
+/* Alias names for predefined General category values.  */
+#define UC_LETTER                    UC_CATEGORY_L
+#define UC_CASED_LETTER              UC_CATEGORY_LC
+#define UC_UPPERCASE_LETTER          UC_CATEGORY_Lu
+#define UC_LOWERCASE_LETTER          UC_CATEGORY_Ll
+#define UC_TITLECASE_LETTER          UC_CATEGORY_Lt
+#define UC_MODIFIER_LETTER           UC_CATEGORY_Lm
+#define UC_OTHER_LETTER              UC_CATEGORY_Lo
+#define UC_MARK                      UC_CATEGORY_M
+#define UC_NON_SPACING_MARK          UC_CATEGORY_Mn
+#define UC_COMBINING_SPACING_MARK    UC_CATEGORY_Mc
+#define UC_ENCLOSING_MARK            UC_CATEGORY_Me
+#define UC_NUMBER                    UC_CATEGORY_N
+#define UC_DECIMAL_DIGIT_NUMBER      UC_CATEGORY_Nd
+#define UC_LETTER_NUMBER             UC_CATEGORY_Nl
+#define UC_OTHER_NUMBER              UC_CATEGORY_No
+#define UC_PUNCTUATION               UC_CATEGORY_P
+#define UC_CONNECTOR_PUNCTUATION     UC_CATEGORY_Pc
+#define UC_DASH_PUNCTUATION          UC_CATEGORY_Pd
+#define UC_OPEN_PUNCTUATION          UC_CATEGORY_Ps /* a.k.a. UC_START_PUNCTUATION */
+#define UC_CLOSE_PUNCTUATION         UC_CATEGORY_Pe /* a.k.a. UC_END_PUNCTUATION */
+#define UC_INITIAL_QUOTE_PUNCTUATION UC_CATEGORY_Pi
+#define UC_FINAL_QUOTE_PUNCTUATION   UC_CATEGORY_Pf
+#define UC_OTHER_PUNCTUATION         UC_CATEGORY_Po
+#define UC_SYMBOL                    UC_CATEGORY_S
+#define UC_MATH_SYMBOL               UC_CATEGORY_Sm
+#define UC_CURRENCY_SYMBOL           UC_CATEGORY_Sc
+#define UC_MODIFIER_SYMBOL           UC_CATEGORY_Sk
+#define UC_OTHER_SYMBOL              UC_CATEGORY_So
+#define UC_SEPARATOR                 UC_CATEGORY_Z
+#define UC_SPACE_SEPARATOR           UC_CATEGORY_Zs
+#define UC_LINE_SEPARATOR            UC_CATEGORY_Zl
+#define UC_PARAGRAPH_SEPARATOR       UC_CATEGORY_Zp
+#define UC_OTHER                     UC_CATEGORY_C
+#define UC_CONTROL                   UC_CATEGORY_Cc
+#define UC_FORMAT                    UC_CATEGORY_Cf
+#define UC_SURROGATE                 UC_CATEGORY_Cs /* all of them are invalid characters */
+#define UC_PRIVATE_USE               UC_CATEGORY_Co
+#define UC_UNASSIGNED                UC_CATEGORY_Cn /* some of them are invalid characters */
+
+/* Return the union of two general categories.
+   This corresponds to the unions of the two sets of characters.  */
+extern uc_general_category_t
+       uc_general_category_or (uc_general_category_t category1,
+                               uc_general_category_t category2);
+
+/* Return the intersection of two general categories as bit masks.
+   This *does*not* correspond to the intersection of the two sets of
+   characters.  */
+extern uc_general_category_t
+       uc_general_category_and (uc_general_category_t category1,
+                                uc_general_category_t category2);
+
+/* Return the intersection of a general category with the complement of a
+   second general category, as bit masks.
+   This *does*not* correspond to the intersection with complement, when
+   viewing the categories as sets of characters.  */
+extern uc_general_category_t
+       uc_general_category_and_not (uc_general_category_t category1,
+                                    uc_general_category_t category2);
+
+/* Return the name of a general category.  */
+extern const char *
+       uc_general_category_name (uc_general_category_t category)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the long name of a general category.  */
+extern const char *
+       uc_general_category_long_name (uc_general_category_t category)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the general category given by name, e.g. "Lu", or by long name,
+   e.g. "Uppercase Letter".  */
+extern uc_general_category_t
+       uc_general_category_byname (const char *category_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the general category of a Unicode character.  */
+extern uc_general_category_t
+       uc_general_category (ucs4_t uc)
+       _UC_ATTRIBUTE_PURE;
+
+/* Test whether a Unicode character belongs to a given category.
+   The CATEGORY argument can be the combination of several predefined
+   general categories.  */
+extern bool
+       uc_is_general_category (ucs4_t uc, uc_general_category_t category)
+       _UC_ATTRIBUTE_PURE;
+/* Likewise.  This function uses a big table comprising all categories.  */
+extern bool
+       uc_is_general_category_withtable (ucs4_t uc, uint32_t bitmask)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 3 of Unicode Character Database: Canonical combining class.  */
+
+/* The possible results of uc_combining_class (0..255) are described in
+   UCD.html.  The list here is not definitive; more values can be added
+   in future versions.  */
+enum
+{
+  UC_CCC_NR   =   0, /* Not Reordered */
+  UC_CCC_OV   =   1, /* Overlay */
+  UC_CCC_NK   =   7, /* Nukta */
+  UC_CCC_KV   =   8, /* Kana Voicing */
+  UC_CCC_VR   =   9, /* Virama */
+  UC_CCC_ATBL = 200, /* Attached Below Left */
+  UC_CCC_ATB  = 202, /* Attached Below */
+  UC_CCC_ATA  = 214, /* Attached Above */
+  UC_CCC_ATAR = 216, /* Attached Above Right */
+  UC_CCC_BL   = 218, /* Below Left */
+  UC_CCC_B    = 220, /* Below */
+  UC_CCC_BR   = 222, /* Below Right */
+  UC_CCC_L    = 224, /* Left */
+  UC_CCC_R    = 226, /* Right */
+  UC_CCC_AL   = 228, /* Above Left */
+  UC_CCC_A    = 230, /* Above */
+  UC_CCC_AR   = 232, /* Above Right */
+  UC_CCC_DB   = 233, /* Double Below */
+  UC_CCC_DA   = 234, /* Double Above */
+  UC_CCC_IS   = 240  /* Iota Subscript */
+};
+
+/* Return the canonical combining class of a Unicode character.  */
+extern int
+       uc_combining_class (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the name of a canonical combining class.  */
+extern const char *
+       uc_combining_class_name (int ccc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the long name of a canonical combining class.  */
+extern const char *
+       uc_combining_class_long_name (int ccc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the canonical combining class given by name, e.g. "BL", or by long
+   name, e.g. "Below Left".  */
+extern int
+       uc_combining_class_byname (const char *ccc_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* ========================================================================= */
+
+/* Field 4 of Unicode Character Database: Bidi class.
+   Before Unicode 4.0, this field was called "Bidirectional category".  */
+
+enum
+{
+  UC_BIDI_L,   /* Left-to-Right */
+  UC_BIDI_LRE, /* Left-to-Right Embedding */
+  UC_BIDI_LRO, /* Left-to-Right Override */
+  UC_BIDI_R,   /* Right-to-Left */
+  UC_BIDI_AL,  /* Right-to-Left Arabic */
+  UC_BIDI_RLE, /* Right-to-Left Embedding */
+  UC_BIDI_RLO, /* Right-to-Left Override */
+  UC_BIDI_PDF, /* Pop Directional Format */
+  UC_BIDI_EN,  /* European Number */
+  UC_BIDI_ES,  /* European Number Separator */
+  UC_BIDI_ET,  /* European Number Terminator */
+  UC_BIDI_AN,  /* Arabic Number */
+  UC_BIDI_CS,  /* Common Number Separator */
+  UC_BIDI_NSM, /* Non-Spacing Mark */
+  UC_BIDI_BN,  /* Boundary Neutral */
+  UC_BIDI_B,   /* Paragraph Separator */
+  UC_BIDI_S,   /* Segment Separator */
+  UC_BIDI_WS,  /* Whitespace */
+  UC_BIDI_ON,  /* Other Neutral */
+  UC_BIDI_LRI, /* Left-to-Right Isolate */
+  UC_BIDI_RLI, /* Right-to-Left Isolate */
+  UC_BIDI_FSI, /* First Strong Isolate */
+  UC_BIDI_PDI  /* Pop Directional Isolate */
+};
+
+/* Return the name of a bidi class.  */
+extern const char *
+       uc_bidi_class_name (int bidi_class)
+       _UC_ATTRIBUTE_CONST;
+/* Same; obsolete function name.  */
+extern const char *
+       uc_bidi_category_name (int category)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the long name of a bidi class.  */
+extern const char *
+       uc_bidi_class_long_name (int bidi_class)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the bidi class given by name, e.g. "LRE", or by long name, e.g.
+   "Left-to-Right Embedding".  */
+extern int
+       uc_bidi_class_byname (const char *bidi_class_name)
+       _UC_ATTRIBUTE_PURE;
+/* Same; obsolete function name.  */
+extern int
+       uc_bidi_category_byname (const char *category_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the bidi class of a Unicode character.  */
+extern int
+       uc_bidi_class (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+/* Same; obsolete function name.  */
+extern int
+       uc_bidi_category (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test whether a Unicode character belongs to a given bidi class.  */
+extern bool
+       uc_is_bidi_class (ucs4_t uc, int bidi_class)
+       _UC_ATTRIBUTE_CONST;
+/* Same; obsolete function name.  */
+extern bool
+       uc_is_bidi_category (ucs4_t uc, int category)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 5 of Unicode Character Database: Character decomposition mapping.
+   See "uninorm.h".  */
+
+/* ========================================================================= */
+
+/* Field 6 of Unicode Character Database: Decimal digit value.  */
+
+/* Return the decimal digit value of a Unicode character.  */
+extern int
+       uc_decimal_value (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 7 of Unicode Character Database: Digit value.  */
+
+/* Return the digit value of a Unicode character.  */
+extern int
+       uc_digit_value (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 8 of Unicode Character Database: Numeric value.  */
+
+/* Return the numeric value of a Unicode character.  */
+typedef struct
+{
+  int numerator;
+  int denominator;
+}
+uc_fraction_t;
+extern uc_fraction_t
+       uc_numeric_value (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 9 of Unicode Character Database: Mirrored.  */
+
+/* Return the mirrored character of a Unicode character UC in *PUC.  */
+extern bool
+       uc_mirror_char (ucs4_t uc, ucs4_t *puc);
+
+/* ========================================================================= */
+
+/* Field 10 of Unicode Character Database: Unicode 1.0 Name.
+   Not available in this library.  */
+
+/* ========================================================================= */
+
+/* Field 11 of Unicode Character Database: ISO 10646 comment.
+   Not available in this library.  */
+
+/* ========================================================================= */
+
+/* Field 12, 13, 14 of Unicode Character Database: Uppercase mapping,
+   lowercase mapping, titlecase mapping.  See "unicase.h".  */
+
+/* ========================================================================= */
+
+/* Field 2 of the file ArabicShaping.txt in the Unicode Character Database.  */
+
+/* Possible joining types.  */
+enum
+{
+  UC_JOINING_TYPE_U, /* Non_Joining */
+  UC_JOINING_TYPE_T, /* Transparent */
+  UC_JOINING_TYPE_C, /* Join_Causing */
+  UC_JOINING_TYPE_L, /* Left_Joining */
+  UC_JOINING_TYPE_R, /* Right_Joining */
+  UC_JOINING_TYPE_D  /* Dual_Joining */
+};
+
+/* Return the name of a joining type.  */
+extern const char *
+       uc_joining_type_name (int joining_type)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the long name of a joining type.  */
+extern const char *
+       uc_joining_type_long_name (int joining_type)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the joining type given by name, e.g. "D", or by long name, e.g.
+   "Dual Joining".  */
+extern int
+       uc_joining_type_byname (const char *joining_type_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the joining type of a Unicode character.  */
+extern int
+       uc_joining_type (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Field 3 of the file ArabicShaping.txt in the Unicode Character Database.  */
+
+/* Possible joining groups.
+   This enumeration may be extended in the future.  */
+enum
+{
+  UC_JOINING_GROUP_NONE,                     /* No_Joining_Group */
+  UC_JOINING_GROUP_AIN,                      /* Ain */
+  UC_JOINING_GROUP_ALAPH,                    /* Alaph */
+  UC_JOINING_GROUP_ALEF,                     /* Alef */
+  UC_JOINING_GROUP_BEH,                      /* Beh */
+  UC_JOINING_GROUP_BETH,                     /* Beth */
+  UC_JOINING_GROUP_BURUSHASKI_YEH_BARREE,    /* Burushaski_Yeh_Barree */
+  UC_JOINING_GROUP_DAL,                      /* Dal */
+  UC_JOINING_GROUP_DALATH_RISH,              /* Dalath_Rish */
+  UC_JOINING_GROUP_E,                        /* E */
+  UC_JOINING_GROUP_FARSI_YEH,                /* Farsi_Yeh */
+  UC_JOINING_GROUP_FE,                       /* Fe */
+  UC_JOINING_GROUP_FEH,                      /* Feh */
+  UC_JOINING_GROUP_FINAL_SEMKATH,            /* Final_Semkath */
+  UC_JOINING_GROUP_GAF,                      /* Gaf */
+  UC_JOINING_GROUP_GAMAL,                    /* Gamal */
+  UC_JOINING_GROUP_HAH,                      /* Hah */
+  UC_JOINING_GROUP_HE,                       /* He */
+  UC_JOINING_GROUP_HEH,                      /* Heh */
+  UC_JOINING_GROUP_HEH_GOAL,                 /* Heh_Goal */
+  UC_JOINING_GROUP_HETH,                     /* Heth */
+  UC_JOINING_GROUP_KAF,                      /* Kaf */
+  UC_JOINING_GROUP_KAPH,                     /* Kaph */
+  UC_JOINING_GROUP_KHAPH,                    /* Khaph */
+  UC_JOINING_GROUP_KNOTTED_HEH,              /* Knotted_Heh */
+  UC_JOINING_GROUP_LAM,                      /* Lam */
+  UC_JOINING_GROUP_LAMADH,                   /* Lamadh */
+  UC_JOINING_GROUP_MEEM,                     /* Meem */
+  UC_JOINING_GROUP_MIM,                      /* Mim */
+  UC_JOINING_GROUP_NOON,                     /* Noon */
+  UC_JOINING_GROUP_NUN,                      /* Nun */
+  UC_JOINING_GROUP_NYA,                      /* Nya */
+  UC_JOINING_GROUP_PE,                       /* Pe */
+  UC_JOINING_GROUP_QAF,                      /* Qaf */
+  UC_JOINING_GROUP_QAPH,                     /* Qaph */
+  UC_JOINING_GROUP_REH,                      /* Reh */
+  UC_JOINING_GROUP_REVERSED_PE,              /* Reversed_Pe */
+  UC_JOINING_GROUP_SAD,                      /* Sad */
+  UC_JOINING_GROUP_SADHE,                    /* Sadhe */
+  UC_JOINING_GROUP_SEEN,                     /* Seen */
+  UC_JOINING_GROUP_SEMKATH,                  /* Semkath */
+  UC_JOINING_GROUP_SHIN,                     /* Shin */
+  UC_JOINING_GROUP_SWASH_KAF,                /* Swash_Kaf */
+  UC_JOINING_GROUP_SYRIAC_WAW,               /* Syriac_Waw */
+  UC_JOINING_GROUP_TAH,                      /* Tah */
+  UC_JOINING_GROUP_TAW,                      /* Taw */
+  UC_JOINING_GROUP_TEH_MARBUTA,              /* Teh_Marbuta */
+  UC_JOINING_GROUP_TEH_MARBUTA_GOAL,         /* Teh_Marbuta_Goal */
+  UC_JOINING_GROUP_TETH,                     /* Teth */
+  UC_JOINING_GROUP_WAW,                      /* Waw */
+  UC_JOINING_GROUP_YEH,                      /* Yeh */
+  UC_JOINING_GROUP_YEH_BARREE,               /* Yeh_Barree */
+  UC_JOINING_GROUP_YEH_WITH_TAIL,            /* Yeh_With_Tail */
+  UC_JOINING_GROUP_YUDH,                     /* Yudh */
+  UC_JOINING_GROUP_YUDH_HE,                  /* Yudh_He */
+  UC_JOINING_GROUP_ZAIN,                     /* Zain */
+  UC_JOINING_GROUP_ZHAIN,                    /* Zhain */
+  UC_JOINING_GROUP_ROHINGYA_YEH,             /* Rohingya_Yeh */
+  UC_JOINING_GROUP_STRAIGHT_WAW,             /* Straight_Waw */
+  UC_JOINING_GROUP_MANICHAEAN_ALEPH,         /* Manichaean_Aleph */
+  UC_JOINING_GROUP_MANICHAEAN_BETH,          /* Manichaean_Beth */
+  UC_JOINING_GROUP_MANICHAEAN_GIMEL,         /* Manichaean_Gimel */
+  UC_JOINING_GROUP_MANICHAEAN_DALETH,        /* Manichaean_Daleth */
+  UC_JOINING_GROUP_MANICHAEAN_WAW,           /* Manichaean_Waw */
+  UC_JOINING_GROUP_MANICHAEAN_ZAYIN,         /* Manichaean_Zayin */
+  UC_JOINING_GROUP_MANICHAEAN_HETH,          /* Manichaean_Heth */
+  UC_JOINING_GROUP_MANICHAEAN_TETH,          /* Manichaean_Teth */
+  UC_JOINING_GROUP_MANICHAEAN_YODH,          /* Manichaean_Yodh */
+  UC_JOINING_GROUP_MANICHAEAN_KAPH,          /* Manichaean_Kaph */
+  UC_JOINING_GROUP_MANICHAEAN_LAMEDH,        /* Manichaean_Lamedh */
+  UC_JOINING_GROUP_MANICHAEAN_DHAMEDH,       /* Manichaean_Dhamedh */
+  UC_JOINING_GROUP_MANICHAEAN_THAMEDH,       /* Manichaean_Thamedh */
+  UC_JOINING_GROUP_MANICHAEAN_MEM,           /* Manichaean_Mem */
+  UC_JOINING_GROUP_MANICHAEAN_NUN,           /* Manichaean_Nun */
+  UC_JOINING_GROUP_MANICHAEAN_SAMEKH,        /* Manichaean_Aleph */
+  UC_JOINING_GROUP_MANICHAEAN_AYIN,          /* Manichaean_Ayin */
+  UC_JOINING_GROUP_MANICHAEAN_PE,            /* Manichaean_Pe */
+  UC_JOINING_GROUP_MANICHAEAN_SADHE,         /* Manichaean_Sadhe */
+  UC_JOINING_GROUP_MANICHAEAN_QOPH,          /* Manichaean_Qoph */
+  UC_JOINING_GROUP_MANICHAEAN_RESH,          /* Manichaean_Resh */
+  UC_JOINING_GROUP_MANICHAEAN_TAW,           /* Manichaean_Taw */
+  UC_JOINING_GROUP_MANICHAEAN_ONE,           /* Manichaean_One */
+  UC_JOINING_GROUP_MANICHAEAN_FIVE,          /* Manichaean_Five */
+  UC_JOINING_GROUP_MANICHAEAN_TEN,           /* Manichaean_Ten */
+  UC_JOINING_GROUP_MANICHAEAN_TWENTY,        /* Manichaean_Twenty */
+  UC_JOINING_GROUP_MANICHAEAN_HUNDRED,       /* Manichaean_Hundred */
+  UC_JOINING_GROUP_AFRICAN_FEH,              /* African_Feh */
+  UC_JOINING_GROUP_AFRICAN_QAF,              /* African_Qaf */
+  UC_JOINING_GROUP_AFRICAN_NOON,             /* African_Noon */
+  UC_JOINING_GROUP_MALAYALAM_NGA,            /* Malayalam_Nga */
+  UC_JOINING_GROUP_MALAYALAM_JA,             /* Malayalam_Ja */
+  UC_JOINING_GROUP_MALAYALAM_NYA,            /* Malayalam_Nya */
+  UC_JOINING_GROUP_MALAYALAM_TTA,            /* Malayalam_Tta */
+  UC_JOINING_GROUP_MALAYALAM_NNA,            /* Malayalam_Nna */
+  UC_JOINING_GROUP_MALAYALAM_NNNA,           /* Malayalam_Nnna */
+  UC_JOINING_GROUP_MALAYALAM_BHA,            /* Malayalam_Bha */
+  UC_JOINING_GROUP_MALAYALAM_RA,             /* Malayalam_Ra */
+  UC_JOINING_GROUP_MALAYALAM_LLA,            /* Malayalam_Lla */
+  UC_JOINING_GROUP_MALAYALAM_LLLA,           /* Malayalam_Llla */
+  UC_JOINING_GROUP_MALAYALAM_SSA,            /* Malayalam_Ssa */
+  UC_JOINING_GROUP_HANIFI_ROHINGYA_PA,       /* Hanifi_Rohingya_Pa */
+  UC_JOINING_GROUP_HANIFI_ROHINGYA_KINNA_YA, /* Hanifi_Rohingya_Kinna_Ya */
+  UC_JOINING_GROUP_THIN_YEH,                 /* Thin_Yeh */
+  UC_JOINING_GROUP_VERTICAL_TAIL,            /* Vertical_Tail */
+  UC_JOINING_GROUP_KASHMIRI_YEH              /* Kashmiri_Yeh */
+};
+
+/* Return the name of a joining group.  */
+extern const char *
+       uc_joining_group_name (int joining_group)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the joining group given by name, e.g. "Teh_Marbuta".  */
+extern int
+       uc_joining_group_byname (const char *joining_group_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the joining group of a Unicode character.  */
+extern int
+       uc_joining_group (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Common API for properties.  */
+
+/* Data type denoting a property.  This is not just a number, but rather a
+   pointer to the test functions, so that programs that use only few of the
+   properties don't have a link-time dependency towards all the tables.  */
+typedef struct
+{
+  bool (*test_fn) (ucs4_t uc);
+}
+uc_property_t;
+
+/* Predefined properties.  */
+/* General.  */
+extern @GNULIB_UNICTYPE_PROPERTY_WHITE_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_WHITE_SPACE;
+extern @GNULIB_UNICTYPE_PROPERTY_ALPHABETIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ALPHABETIC;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ALPHABETIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ALPHABETIC;
+extern @GNULIB_UNICTYPE_PROPERTY_NOT_A_CHARACTER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NOT_A_CHARACTER;
+extern @GNULIB_UNICTYPE_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DEFAULT_IGNORABLE_CODE_POINT;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_DEFAULT_IGNORABLE_CODE_POINT;
+extern @GNULIB_UNICTYPE_PROPERTY_DEPRECATED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DEPRECATED;
+extern @GNULIB_UNICTYPE_PROPERTY_LOGICAL_ORDER_EXCEPTION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LOGICAL_ORDER_EXCEPTION;
+extern @GNULIB_UNICTYPE_PROPERTY_VARIATION_SELECTOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_VARIATION_SELECTOR;
+extern @GNULIB_UNICTYPE_PROPERTY_PRIVATE_USE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PRIVATE_USE;
+extern @GNULIB_UNICTYPE_PROPERTY_UNASSIGNED_CODE_VALUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UNASSIGNED_CODE_VALUE;
+/* Case.  */
+extern @GNULIB_UNICTYPE_PROPERTY_UPPERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UPPERCASE;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_UPPERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_UPPERCASE;
+extern @GNULIB_UNICTYPE_PROPERTY_LOWERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LOWERCASE;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_LOWERCASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_LOWERCASE;
+extern @GNULIB_UNICTYPE_PROPERTY_TITLECASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_TITLECASE;
+extern @GNULIB_UNICTYPE_PROPERTY_CASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CASED;
+extern @GNULIB_UNICTYPE_PROPERTY_CASE_IGNORABLE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CASE_IGNORABLE;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_LOWERCASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_LOWERCASED;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_UPPERCASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_UPPERCASED;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_TITLECASED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_TITLECASED;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEFOLDED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEFOLDED;
+extern @GNULIB_UNICTYPE_PROPERTY_CHANGES_WHEN_CASEMAPPED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CHANGES_WHEN_CASEMAPPED;
+extern @GNULIB_UNICTYPE_PROPERTY_SOFT_DOTTED_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SOFT_DOTTED;
+/* Identifiers.  */
+extern @GNULIB_UNICTYPE_PROPERTY_ID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_START;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ID_START;
+extern @GNULIB_UNICTYPE_PROPERTY_ID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_CONTINUE;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_ID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_ID_CONTINUE;
+extern @GNULIB_UNICTYPE_PROPERTY_XID_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_XID_START;
+extern @GNULIB_UNICTYPE_PROPERTY_XID_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_XID_CONTINUE;
+extern @GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_START_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_COMPAT_MATH_START;
+extern @GNULIB_UNICTYPE_PROPERTY_ID_COMPAT_MATH_CONTINUE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ID_COMPAT_MATH_CONTINUE;
+extern @GNULIB_UNICTYPE_PROPERTY_PATTERN_WHITE_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PATTERN_WHITE_SPACE;
+extern @GNULIB_UNICTYPE_PROPERTY_PATTERN_SYNTAX_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PATTERN_SYNTAX;
+/* Shaping and rendering.  */
+extern @GNULIB_UNICTYPE_PROPERTY_JOIN_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_JOIN_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_BASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_BASE;
+extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_EXTEND_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_EXTEND;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_GRAPHEME_EXTEND_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_GRAPHEME_EXTEND;
+extern @GNULIB_UNICTYPE_PROPERTY_GRAPHEME_LINK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_GRAPHEME_LINK;
+extern @GNULIB_UNICTYPE_PROPERTY_MODIFIER_COMBINING_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_MODIFIER_COMBINING_MARK;
+/* Bidi.  */
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_LEFT_TO_RIGHT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_LEFT_TO_RIGHT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_HEBREW_RIGHT_TO_LEFT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_ARABIC_RIGHT_TO_LEFT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUROPEAN_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUROPEAN_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EUR_NUM_TERMINATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EUR_NUM_TERMINATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_ARABIC_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_ARABIC_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_COMMON_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_COMMON_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_BLOCK_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_BLOCK_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_SEGMENT_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_SEGMENT_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_WHITESPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_WHITESPACE;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_NON_SPACING_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_NON_SPACING_MARK;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_BOUNDARY_NEUTRAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_BOUNDARY_NEUTRAL;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_PDF_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_PDF;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_EMBEDDING_OR_OVERRIDE;
+extern @GNULIB_UNICTYPE_PROPERTY_BIDI_OTHER_NEUTRAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_BIDI_OTHER_NEUTRAL;
+/* Numeric.  */
+extern @GNULIB_UNICTYPE_PROPERTY_HEX_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_HEX_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_ASCII_HEX_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ASCII_HEX_DIGIT;
+/* CJK.  */
+extern @GNULIB_UNICTYPE_PROPERTY_IDEOGRAPHIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDEOGRAPHIC;
+extern @GNULIB_UNICTYPE_PROPERTY_UNIFIED_IDEOGRAPH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_UNIFIED_IDEOGRAPH;
+extern @GNULIB_UNICTYPE_PROPERTY_RADICAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_RADICAL;
+extern @GNULIB_UNICTYPE_PROPERTY_IDS_UNARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_UNARY_OPERATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_IDS_BINARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_BINARY_OPERATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_IDS_TRINARY_OPERATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IDS_TRINARY_OPERATOR;
+/* Emoji.  */
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_PRESENTATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_PRESENTATION;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_MODIFIER;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_MODIFIER_BASE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_MODIFIER_BASE;
+extern @GNULIB_UNICTYPE_PROPERTY_EMOJI_COMPONENT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EMOJI_COMPONENT;
+extern @GNULIB_UNICTYPE_PROPERTY_EXTENDED_PICTOGRAPHIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EXTENDED_PICTOGRAPHIC;
+/* Misc.  */
+extern @GNULIB_UNICTYPE_PROPERTY_ZERO_WIDTH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ZERO_WIDTH;
+extern @GNULIB_UNICTYPE_PROPERTY_SPACE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SPACE;
+extern @GNULIB_UNICTYPE_PROPERTY_NON_BREAK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NON_BREAK;
+extern @GNULIB_UNICTYPE_PROPERTY_ISO_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_ISO_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_FORMAT_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_FORMAT_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_PREPENDED_CONCATENATION_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PREPENDED_CONCATENATION_MARK;
+extern @GNULIB_UNICTYPE_PROPERTY_DASH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DASH;
+extern @GNULIB_UNICTYPE_PROPERTY_HYPHEN_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_HYPHEN;
+extern @GNULIB_UNICTYPE_PROPERTY_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PUNCTUATION;
+extern @GNULIB_UNICTYPE_PROPERTY_LINE_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LINE_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_PARAGRAPH_SEPARATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PARAGRAPH_SEPARATOR;
+extern @GNULIB_UNICTYPE_PROPERTY_QUOTATION_MARK_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_QUOTATION_MARK;
+extern @GNULIB_UNICTYPE_PROPERTY_SENTENCE_TERMINAL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_SENTENCE_TERMINAL;
+extern @GNULIB_UNICTYPE_PROPERTY_TERMINAL_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_TERMINAL_PUNCTUATION;
+extern @GNULIB_UNICTYPE_PROPERTY_CURRENCY_SYMBOL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_CURRENCY_SYMBOL;
+extern @GNULIB_UNICTYPE_PROPERTY_MATH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_MATH;
+extern @GNULIB_UNICTYPE_PROPERTY_OTHER_MATH_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_OTHER_MATH;
+extern @GNULIB_UNICTYPE_PROPERTY_PAIRED_PUNCTUATION_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_PAIRED_PUNCTUATION;
+extern @GNULIB_UNICTYPE_PROPERTY_LEFT_OF_PAIR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_LEFT_OF_PAIR;
+extern @GNULIB_UNICTYPE_PROPERTY_COMBINING_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_COMBINING;
+extern @GNULIB_UNICTYPE_PROPERTY_COMPOSITE_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_COMPOSITE;
+extern @GNULIB_UNICTYPE_PROPERTY_DECIMAL_DIGIT_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DECIMAL_DIGIT;
+extern @GNULIB_UNICTYPE_PROPERTY_NUMERIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_NUMERIC;
+extern @GNULIB_UNICTYPE_PROPERTY_DIACRITIC_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_DIACRITIC;
+extern @GNULIB_UNICTYPE_PROPERTY_EXTENDER_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_EXTENDER;
+extern @GNULIB_UNICTYPE_PROPERTY_IGNORABLE_CONTROL_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_IGNORABLE_CONTROL;
+extern @GNULIB_UNICTYPE_PROPERTY_REGIONAL_INDICATOR_DLL_VARIABLE@ const uc_property_t UC_PROPERTY_REGIONAL_INDICATOR;
+
+/* Return the property given by name, e.g. "White space".  */
+extern uc_property_t
+       uc_property_byname (const char *property_name);
+
+/* Test whether a property is valid.  */
+#define uc_property_is_valid(property) ((property).test_fn != NULL)
+
+/* Test whether a Unicode character has a given property.  */
+extern bool
+       uc_is_property (ucs4_t uc, uc_property_t property);
+extern bool uc_is_property_white_space (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_alphabetic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_alphabetic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_not_a_character (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_default_ignorable_code_point (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_default_ignorable_code_point (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_deprecated (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_logical_order_exception (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_variation_selector (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_private_use (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_unassigned_code_value (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_uppercase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_uppercase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_lowercase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_lowercase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_titlecase (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_cased (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_case_ignorable (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_lowercased (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_uppercased (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_titlecased (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_casefolded (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_changes_when_casemapped (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_soft_dotted (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_id_start (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_id_start (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_id_continue (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_id_continue (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_xid_start (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_xid_continue (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_id_compat_math_start (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_id_compat_math_continue (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_pattern_white_space (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_pattern_syntax (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_join_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_grapheme_base (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_grapheme_extend (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_grapheme_extend (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_grapheme_link (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_modifier_combining_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_left_to_right (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_hebrew_right_to_left (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_arabic_right_to_left (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_european_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_eur_num_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_eur_num_terminator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_arabic_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_common_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_block_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_segment_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_whitespace (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_non_spacing_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_boundary_neutral (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_pdf (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_embedding_or_override (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_bidi_other_neutral (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_hex_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ascii_hex_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ideographic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_unified_ideograph (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_radical (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ids_unary_operator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ids_binary_operator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ids_trinary_operator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji_presentation (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji_modifier (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji_modifier_base (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_emoji_component (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_extended_pictographic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_zero_width (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_space (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_non_break (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_iso_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_format_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_prepended_concatenation_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_dash (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_hyphen (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_punctuation (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_line_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_paragraph_separator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_quotation_mark (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_sentence_terminal (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_terminal_punctuation (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_currency_symbol (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_math (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_other_math (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_paired_punctuation (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_left_of_pair (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_combining (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_composite (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_decimal_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_numeric (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_diacritic (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_extender (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_ignorable_control (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+extern bool uc_is_property_regional_indicator (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Other attributes.  */
+
+/* ------------------------------------------------------------------------- */
+
+/* Indic_Conjunct_Break (InCB): from the file DerivedCoreProperties.txt
+   in the Unicode Character Database.  */
+
+/* Possible values of the Indic_Conjunct_Break attribute.
+   This enumeration may be extended in the future.  */
+enum
+{
+  UC_INDIC_CONJUNCT_BREAK_NONE,              /* None */
+  UC_INDIC_CONJUNCT_BREAK_CONSONANT,         /* Consonant */
+  UC_INDIC_CONJUNCT_BREAK_LINKER,            /* Linker */
+  UC_INDIC_CONJUNCT_BREAK_EXTEND             /* Extend */
+};
+
+/* Return the name of an Indic_Conjunct_Break value.  */
+extern const char *
+       uc_indic_conjunct_break_name (int indic_conjunct_break)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the Indic_Conjunct_Break value given by name, e.g. "Consonant".  */
+extern int
+       uc_indic_conjunct_break_byname (const char *indic_conjunct_break_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Return the Indic_Conjunct_Break attribute of a Unicode character.  */
+extern int
+       uc_indic_conjunct_break (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Subdivision of the Unicode characters into scripts.  */
+
+typedef struct
+{
+  unsigned int code : 21;
+  unsigned int start : 1;
+  unsigned int end : 1;
+}
+uc_interval_t;
+typedef struct
+{
+  unsigned int nintervals;
+  const uc_interval_t *intervals;
+  const char *name;
+}
+uc_script_t;
+
+/* Return the script of a Unicode character.  */
+extern const uc_script_t *
+       uc_script (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the script given by name, e.g. "HAN".  */
+extern const uc_script_t *
+       uc_script_byname (const char *script_name)
+       _UC_ATTRIBUTE_PURE;
+
+/* Test whether a Unicode character belongs to a given script.  */
+extern bool
+       uc_is_script (ucs4_t uc, const uc_script_t *script)
+       _UC_ATTRIBUTE_PURE;
+
+/* Get the list of all scripts.  */
+extern void
+       uc_all_scripts (const uc_script_t **scripts, size_t *count);
+
+/* ========================================================================= */
+
+/* Subdivision of the Unicode character range into blocks.  */
+
+typedef struct
+{
+  ucs4_t start;
+  ucs4_t end;
+  const char *name;
+}
+uc_block_t;
+
+/* Return the block a character belongs to.  */
+extern const uc_block_t *
+       uc_block (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test whether a Unicode character belongs to a given block.  */
+extern bool
+       uc_is_block (ucs4_t uc, const uc_block_t *block)
+       _UC_ATTRIBUTE_PURE;
+
+/* Get the list of all blocks.  */
+extern void
+       uc_all_blocks (const uc_block_t **blocks, size_t *count);
+
+/* ========================================================================= */
+
+/* Properties taken from language standards.  */
+
+/* Test whether a Unicode character is considered whitespace in ISO C 99.  */
+extern bool
+       uc_is_c_whitespace (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test whether a Unicode character is considered whitespace in Java.  */
+extern bool
+       uc_is_java_whitespace (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+enum
+{
+  UC_IDENTIFIER_START,    /* valid as first or subsequent character */
+  UC_IDENTIFIER_VALID,    /* valid as subsequent character only */
+  UC_IDENTIFIER_INVALID,  /* not valid */
+  UC_IDENTIFIER_IGNORABLE /* ignorable (Java only) */
+};
+
+/* Return the categorization of a Unicode character w.r.t. the ISO C 99
+   identifier syntax.  */
+extern int
+       uc_c_ident_category (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Return the categorization of a Unicode character w.r.t. the Java
+   identifier syntax.  */
+extern int
+       uc_java_ident_category (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+/* Like ISO C <ctype.h> and <wctype.h>.  These functions are deprecated,
+   because this set of functions was designed with ASCII in mind and cannot
+   reflect the more diverse reality of the Unicode character set.  But they
+   can be a quick-and-dirty porting aid when migrating from wchar_t APIs
+   to Unicode strings.  */
+
+/* Test for any character for which 'uc_is_alpha' or 'uc_is_digit' is true.  */
+extern bool
+       uc_is_alnum (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character for which 'uc_is_upper' or 'uc_is_lower' is true,
+   or any character that is one of a locale-specific set of characters for
+   which none of 'uc_is_cntrl', 'uc_is_digit', 'uc_is_punct', or 'uc_is_space'
+   is true.  */
+extern bool
+       uc_is_alpha (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any control character.  */
+extern bool
+       uc_is_cntrl (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to a decimal-digit character.  */
+extern bool
+       uc_is_digit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character for which 'uc_is_print' is true and 'uc_is_space'
+   is false.  */
+extern bool
+       uc_is_graph (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to a lowercase letter or is one
+   of a locale-specific set of characters for which none of 'uc_is_cntrl',
+   'uc_is_digit', 'uc_is_punct', or 'uc_is_space' is true.  */
+extern bool
+       uc_is_lower (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any printing character.  */
+extern bool
+       uc_is_print (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any printing character that is one of a locale-specific set of
+   characters for which neither 'uc_is_space' nor 'uc_is_alnum' is true.  */
+extern bool
+       uc_is_punct (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to a locale-specific set of
+   characters for which none of 'uc_is_alnum', 'uc_is_graph', or 'uc_is_punct'
+   is true.  */
+extern bool
+       uc_is_space (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to an uppercase letter or is one
+   of a locale-specific set of character for which none of 'uc_is_cntrl',
+   'uc_is_digit', 'uc_is_punct', or 'uc_is_space' is true.  */
+extern bool
+       uc_is_upper (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* Test for any character that corresponds to a hexadecimal-digit
+   character.  */
+extern bool
+       uc_is_xdigit (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* GNU extension. */
+/* Test for any character that corresponds to a standard blank character or
+   a locale-specific set of characters for which 'uc_is_alnum' is false.  */
+extern bool
+       uc_is_blank (ucs4_t uc)
+       _UC_ATTRIBUTE_CONST;
+
+/* ========================================================================= */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNICTYPE_H */
diff --git a/gl/unictype/.deps/.dirstamp b/gl/unictype/.deps/.dirstamp
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gl/unictype/.deps/.dirstamp
diff --git a/gl/unictype/.deps/libgnu_a-ctype_alnum.Po b/gl/unictype/.deps/libgnu_a-ctype_alnum.Po
new file mode 100644
index 00000000..429d1968
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_alnum.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_alnum.o: unictype/ctype_alnum.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_alnum.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_alnum.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_alpha.Po b/gl/unictype/.deps/libgnu_a-ctype_alpha.Po
new file mode 100644
index 00000000..f2d01713
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_alpha.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_alpha.o: unictype/ctype_alpha.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_alpha.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_alpha.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_blank.Po b/gl/unictype/.deps/libgnu_a-ctype_blank.Po
new file mode 100644
index 00000000..82be4126
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_blank.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_blank.o: unictype/ctype_blank.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_blank.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_blank.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_cntrl.Po b/gl/unictype/.deps/libgnu_a-ctype_cntrl.Po
new file mode 100644
index 00000000..dfb2233d
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_cntrl.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_cntrl.o: unictype/ctype_cntrl.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_cntrl.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_cntrl.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_digit.Po b/gl/unictype/.deps/libgnu_a-ctype_digit.Po
new file mode 100644
index 00000000..d243fcc1
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_digit.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_digit.o: unictype/ctype_digit.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_digit.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_digit.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_graph.Po b/gl/unictype/.deps/libgnu_a-ctype_graph.Po
new file mode 100644
index 00000000..9850fe6f
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_graph.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_graph.o: unictype/ctype_graph.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_graph.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_graph.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_lower.Po b/gl/unictype/.deps/libgnu_a-ctype_lower.Po
new file mode 100644
index 00000000..6447d3e4
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_lower.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_lower.o: unictype/ctype_lower.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_lower.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_lower.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_print.Po b/gl/unictype/.deps/libgnu_a-ctype_print.Po
new file mode 100644
index 00000000..f592e16c
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_print.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_print.o: unictype/ctype_print.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_print.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_print.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_punct.Po b/gl/unictype/.deps/libgnu_a-ctype_punct.Po
new file mode 100644
index 00000000..245e5396
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_punct.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_punct.o: unictype/ctype_punct.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_punct.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_punct.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_space.Po b/gl/unictype/.deps/libgnu_a-ctype_space.Po
new file mode 100644
index 00000000..2b51c518
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_space.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_space.o: unictype/ctype_space.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_space.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_space.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_upper.Po b/gl/unictype/.deps/libgnu_a-ctype_upper.Po
new file mode 100644
index 00000000..3395834f
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_upper.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_upper.o: unictype/ctype_upper.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_upper.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_upper.h:
diff --git a/gl/unictype/.deps/libgnu_a-ctype_xdigit.Po b/gl/unictype/.deps/libgnu_a-ctype_xdigit.Po
new file mode 100644
index 00000000..3c05b331
--- /dev/null
+++ b/gl/unictype/.deps/libgnu_a-ctype_xdigit.Po
@@ -0,0 +1,48 @@
+unictype/libgnu_a-ctype_xdigit.o: unictype/ctype_xdigit.c \
+ /usr/include/stdc-predef.h ../config.h unictype.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h unictype/bitmap.h \
+ unictype/ctype_xdigit.h
+/usr/include/stdc-predef.h:
+../config.h:
+unictype.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdbool.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+unictype/bitmap.h:
+unictype/ctype_xdigit.h:
diff --git a/gl/unictype/.dirstamp b/gl/unictype/.dirstamp
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gl/unictype/.dirstamp
diff --git a/gl/unictype/bitmap.h b/gl/unictype/bitmap.h
new file mode 100644
index 00000000..869ac066
--- /dev/null
+++ b/gl/unictype/bitmap.h
@@ -0,0 +1,48 @@
+/* Three-level bitmap lookup.
+   Copyright (C) 2000-2002, 2005-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2000-2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+static inline int bitmap_lookup (const void *table, ucs4_t uc);
+
+/* These values are currently hardcoded into gen-uni-tables.c, function
+   output_predicate().  */
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+
+static inline int
+bitmap_lookup (const void *table, ucs4_t uc)
+{
+  unsigned int index1 = uc >> header_0;
+  if (index1 < ((const int *) table)[0])
+    {
+      int lookup1 = ((const int *) table)[1 + index1];
+      if (lookup1 >= 0)
+        {
+          unsigned int index2 = (uc >> header_2) & header_3;
+          int lookup2 = ((const short *) table)[lookup1 + index2];
+          if (lookup2 >= 0)
+            {
+              unsigned int index3 = (uc >> 5) & header_4;
+              unsigned int lookup3 = ((const unsigned int *) table)[lookup2 + index3];
+
+              return (lookup3 >> (uc & 0x1f)) & 1;
+            }
+        }
+    }
+  return 0;
+}
diff --git a/gl/unictype/ctype_alnum.c b/gl/unictype/ctype_alnum.c
new file mode 100644
index 00000000..f58f4310
--- /dev/null
+++ b/gl/unictype/ctype_alnum.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_alnum table.  */
+#include "ctype_alnum.h"
+
+bool
+uc_is_alnum (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_alnum, uc);
+}
diff --git a/gl/unictype/ctype_alnum.h b/gl/unictype/ctype_alnum.h
new file mode 100644
index 00000000..3ee771ab
--- /dev/null
+++ b/gl/unictype/ctype_alnum.h
@@ -0,0 +1,897 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[4];
+    short level2[4 << 7];
+    unsigned int level3[85 << 4];
+  }
+u_is_alnum =
+{
+  { 4 },
+  {
+        5 * sizeof (int) / sizeof (short) +     0,
+        5 * sizeof (int) / sizeof (short) +   128,
+        5 * sizeof (int) / sizeof (short) +   256,
+        5 * sizeof (int) / sizeof (short) +   384
+  },
+  {
+        5 +   512 * sizeof (short) / sizeof (int) +     0,
+        5 +   512 * sizeof (short) / sizeof (int) +    16,
+        5 +   512 * sizeof (short) / sizeof (int) +    32,
+        5 +   512 * sizeof (short) / sizeof (int) +    48,
+        5 +   512 * sizeof (short) / sizeof (int) +    64,
+        5 +   512 * sizeof (short) / sizeof (int) +    80,
+        5 +   512 * sizeof (short) / sizeof (int) +    96,
+        5 +   512 * sizeof (short) / sizeof (int) +   112,
+        5 +   512 * sizeof (short) / sizeof (int) +   128,
+        5 +   512 * sizeof (short) / sizeof (int) +   144,
+        5 +   512 * sizeof (short) / sizeof (int) +   160,
+        5 +   512 * sizeof (short) / sizeof (int) +   176,
+        5 +   512 * sizeof (short) / sizeof (int) +   192,
+        5 +   512 * sizeof (short) / sizeof (int) +   208,
+        5 +   512 * sizeof (short) / sizeof (int) +   224,
+        5 +   512 * sizeof (short) / sizeof (int) +   240,
+        5 +   512 * sizeof (short) / sizeof (int) +   256,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   272,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   288,
+        5 +   512 * sizeof (short) / sizeof (int) +   304,
+        5 +   512 * sizeof (short) / sizeof (int) +   320,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   352,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   368,
+        5 +   512 * sizeof (short) / sizeof (int) +   384,
+        5 +   512 * sizeof (short) / sizeof (int) +   400,
+        5 +   512 * sizeof (short) / sizeof (int) +   416,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   432,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   448,
+        5 +   512 * sizeof (short) / sizeof (int) +   464,
+        5 +   512 * sizeof (short) / sizeof (int) +   480,
+        5 +   512 * sizeof (short) / sizeof (int) +   496,
+        5 +   512 * sizeof (short) / sizeof (int) +   512,
+        5 +   512 * sizeof (short) / sizeof (int) +   528,
+        5 +   512 * sizeof (short) / sizeof (int) +   544,
+        5 +   512 * sizeof (short) / sizeof (int) +   560,
+        5 +   512 * sizeof (short) / sizeof (int) +   576,
+        5 +   512 * sizeof (short) / sizeof (int) +   592,
+        5 +   512 * sizeof (short) / sizeof (int) +   608,
+        5 +   512 * sizeof (short) / sizeof (int) +   624,
+        5 +   512 * sizeof (short) / sizeof (int) +   640,
+        5 +   512 * sizeof (short) / sizeof (int) +   656,
+        5 +   512 * sizeof (short) / sizeof (int) +   672,
+        5 +   512 * sizeof (short) / sizeof (int) +   688,
+        5 +   512 * sizeof (short) / sizeof (int) +   704,
+        5 +   512 * sizeof (short) / sizeof (int) +   720,
+        5 +   512 * sizeof (short) / sizeof (int) +   736,
+        5 +   512 * sizeof (short) / sizeof (int) +   752,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   768,
+        5 +   512 * sizeof (short) / sizeof (int) +   784,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   800,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   816,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   832,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   848,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   864,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   880,
+        5 +   512 * sizeof (short) / sizeof (int) +   896,
+        5 +   512 * sizeof (short) / sizeof (int) +   912,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   928,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   944,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   960,
+        5 +   512 * sizeof (short) / sizeof (int) +   976,
+        5 +   512 * sizeof (short) / sizeof (int) +   992,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1008,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1024,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1040,
+        5 +   512 * sizeof (short) / sizeof (int) +  1056,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1072,
+        5 +   512 * sizeof (short) / sizeof (int) +  1088,
+        5 +   512 * sizeof (short) / sizeof (int) +  1104,
+        5 +   512 * sizeof (short) / sizeof (int) +  1120,
+        5 +   512 * sizeof (short) / sizeof (int) +  1136,
+        5 +   512 * sizeof (short) / sizeof (int) +  1152,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1168,
+        5 +   512 * sizeof (short) / sizeof (int) +  1184,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1200,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1216,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1232,
+        5 +   512 * sizeof (short) / sizeof (int) +  1248,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1264,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1280,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1296,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1312,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1328,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1344,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0x00000000U, 0x03FF0000U, 0x07FFFFFEU, 0x07FFFFFEU,
+    0x00000000U, 0x04200400U, 0xFF7FFFFFU, 0xFF7FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0003FFC3U, 0x0000501FU,
+    0x00000000U, 0x00000000U, 0x00000020U, 0xBCDF0000U,
+    0xFFFFD740U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFBFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFC03U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFEFFFFU, 0x027FFFFFU, 0xFFFFFFFFU,
+    0x000001FFU, 0x00000000U, 0xFFFF0000U, 0x000787FFU,
+    0x00000000U, 0xFFFFFFFFU, 0x000007FFU, 0xFFFEC3FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9FFFC060U,
+    0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0002003FU, 0xFFFFFFFFU, 0x043007FFU,
+    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0xFFFF07FFU,
+    0x00007EFFU, 0xFFFFFFFFU, 0x000003FFU, 0x00000000U,
+    0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFEFFC3U,
+    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x1003FFC3U,
+    0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001CFFC0U,
+    0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x0200FFC3U,
+    0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x0002FFC3U,
+    0xD63DC7E8U, 0x03FFC718U, 0x00010000U, 0x0000FFC0U,
+    0xFFFDDFE0U, 0x23FFFDFFU, 0x27000000U, 0x0000FFC3U,
+    0xFFFDDFE1U, 0x23EFFDFFU, 0x60000000U, 0x0006FFC3U,
+    0xFFFDDFF0U, 0x27FFFFFFU, 0x80704000U, 0xFC00FFC3U,
+    0xFC7FFFE0U, 0x2FFBFFFFU, 0x0000007FU, 0x0000FFC0U,
+    0xFFFFFFFEU, 0x07FF7FFFU, 0x03FF7FBFU, 0x00000000U,
+    0xFFFFF7D6U, 0x200DFFAFU, 0xF3FF005FU, 0x00000000U,
+    0x00000001U, 0x000003FFU, 0xFFFFFEFFU, 0x00001FFFU,
+    0x00001F00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x800007FFU, 0x3C3F03FFU, 0xFFE1C062U,
+    0x03FF4003U, 0xFFFFFFFFU, 0xFFFF20BFU, 0xF7FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3D7F3DFFU, 0xFFFFFFFFU,
+    0xFFFF3DFFU, 0x7F3DFFFFU, 0xFF7FFF3DU, 0xFFFFFFFFU,
+    0xFF3DFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU, 0x00000000U,
+    0x0000FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU,
+    0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF9FFFU,
+    0x07FFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFC7FFU,
+    0x8003FFFFU, 0x0003FFFFU, 0x0003FFFFU, 0x0001DFFFU,
+    0xFFFFFFFFU, 0x000FFFFFU, 0x10800000U, 0x000003FFU,
+    0x03FF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFF9FU, 0xFFFF05FFU, 0xFFFFFFFFU, 0x003FFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0xFFFFFFC0U, 0x001F3FFFU,
+    0xFFFFFFFFU, 0xFFFF0FFFU, 0x03FF03FFU, 0x00000000U,
+    0x007FFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
+    0x03FF03FFU, 0x00000080U, 0x00000000U, 0x00000000U,
+    0xFFFFFFE0U, 0x000FFFFFU, 0x03FF1FE0U, 0x00000000U,
+    0xFFFFFFF8U, 0xFFFFC001U, 0xFFFFFFFFU, 0x0000003FU,
+    0xFFFFFFFFU, 0x0000000FU, 0xFFFFE3FFU, 0x3FFFFFFFU,
+    0xFFFF07FFU, 0xE7FFFFFFU, 0x00000000U, 0x046FDE00U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
+    0xFFFFFFFFU, 0x5FDFFFFFU, 0x0FCF1FDCU, 0x1FDC1FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x80020000U,
+    0x1FFF0000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3E2FFC84U, 0xF3FFBF50U, 0x000043E0U, 0xFFFFFFFFU,
+    0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xF0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000C781FU,
+    0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x000080FFU,
+    0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0x00000000U,
+    0x00000000U, 0x00008000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
+    0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
+    0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00007FFFU, 0xFFFFFFFFU, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFF1FFFU, 0x00000FFFU, 0xFFFFFFFFU, 0x80007FFFU,
+    0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0xFF800000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFF9FFU, 0xFFFFFFFFU, 0x1FEB3FFFU, 0xFFFC0000U,
+    0xFFFFF7BBU, 0x00000007U, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFCU, 0x000FFFFFU, 0x03FF0000U, 0x68FC0000U,
+    0xFFFFFFFFU, 0xFFFF003FU, 0x0000007FU, 0x1FFFFFFFU,
+    0xFFFFFFF0U, 0x0007FFFFU, 0x03FF8000U, 0x7FFFFFDFU,
+    0xFFFFFFFFU, 0x000001FFU, 0x03FF0FF7U, 0xC47FFFFFU,
+    0xFFFFFFFFU, 0x3E62FFFFU, 0x38000005U, 0x001C07FFU,
+    0x007E7E7EU, 0xFFFF7F7FU, 0xF7FFFFFFU, 0xFFFF03FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF0007U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF000FU, 0xFFFFF87FU, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF3FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U,
+    0xA0F8007FU, 0x5F7FFDFFU, 0xFFFFFFDBU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0003FFFFU, 0xFFF80000U, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x3FFFFFFFU, 0xFFFF0000U, 0xFFFFFFFFU,
+    0xFFFCFFFFU, 0xFFFFFFFFU, 0x000000FFU, 0x0FFF0000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFDF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFFFFFFU,
+    0x03FF0000U, 0x07FFFFFEU, 0x07FFFFFEU, 0xFFFFFFC0U,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0x1CFCFCFCU, 0x00000000U,
+    0xFFFFEFFFU, 0xB7FFFF7FU, 0x3FFF3FFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x001FFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x003FFFFFU,
+    0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF000FU,
+    0xFFB7F7FFU, 0x1BFBFFFBU, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU,
+    0xFFFFFFBFU, 0x07FDFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFD3FU, 0x91BFFFFFU, 0x003FFFFFU, 0x007FFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0x0037FFFFU,
+    0x003FFFFFU, 0x03FFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xC0FFFFFFU, 0x00000000U, 0x00000000U,
+    0xFEEF0001U, 0x003FFFFFU, 0x00000000U, 0x1FFFFFFFU,
+    0x1FFFFFFFU, 0x00000000U, 0xFFFFFEFFU, 0x0000001FU,
+    0xFFFFFFFFU, 0x003FFFFFU, 0x003FFFFFU, 0x0007FFFFU,
+    0x0003FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U,
+    0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
+    0xFFFFFFFFU, 0x03FF000FU, 0xFFFFFFFFU, 0xFFFF803FU,
+    0x0000003FU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x000303FFU, 0x0000001CU, 0x00000000U,
+    0x1FFFFFFFU, 0xFFFF0080U, 0x0000003FU, 0xFFFF0000U,
+    0x00000003U, 0xFFFF0000U, 0x0000001FU, 0x007FFFFFU,
+    0xFFFFFFF8U, 0x00FFFFFFU, 0x00000000U, 0x0026FFC0U,
+    0xFFFFFFF8U, 0x0000FFFFU, 0xFFFF0000U, 0x03FF01FFU,
+    0xFFFFFFF8U, 0xFFC0007FU, 0xFFFF0090U, 0x0047FFFFU,
+    0xFFFFFFF8U, 0x0007FFFFU, 0x17FF001EU, 0x00000000U,
+    0xFFFBFFFFU, 0x80000FFFU, 0x00000001U, 0x00000000U,
+    0xBFFFBD7FU, 0xFFFF01FFU, 0x7FFFFFFFU, 0x03FF0000U,
+    0xFFF99FE0U, 0x23EDFDFFU, 0xE0010000U, 0x00000003U,
+    0xFFFF4BFFU, 0x00BFFFFFU, 0x000A0000U, 0x00000000U,
+    0xFFFFFFFFU, 0x001FFFFFU, 0x83FF0780U, 0x00000003U,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x03FF00B0U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x00007FFFU, 0x0F000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x03FF0010U, 0x00000000U,
+    0xFFFFFFFFU, 0x010007FFU, 0xFFFF03FFU, 0x0000000FU,
+    0x07FFFFFFU, 0x03FF0000U, 0x0000007FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x00000FFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800003FFU,
+    0xFF6FF27FU, 0x8000FFFFU, 0x03FF0002U, 0x00000000U,
+    0x00000000U, 0xFFFFFCFFU, 0x0001FFFFU, 0x0000000AU,
+    0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
+    0x200003FFU, 0xFFFF0000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FF0001U,
+    0xFFFFFDFFU, 0x00007FFFU, 0x03FF0001U, 0xFFFC0000U,
+    0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x03FF0040U, 0xFFFFFDBFU,
+    0x010003FFU, 0x000003FFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0007FFFFU,
+    0xFFFDFFF4U, 0x000FFFFFU, 0x03FF0000U, 0x00000000U,
+    0x00000000U, 0x00010000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x03FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00007FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x0000007EU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3FFFFFFFU, 0x03FF0000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x00003FFFU,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x03FF000FU, 0xE0FFFFF8U,
+    0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FF1FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000107FFU, 0x00000000U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x0000000BU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x80000000U,
+    0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00040007U, 0x00270000U, 0xFFFF00F0U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
+    0x03FF01FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFC00000U, 0x03FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFFFFFFU,
+    0xDFFFFFFFU, 0xEBFFDE64U, 0xFFFFFFEFU, 0xFFFFFFFFU,
+    0xDFDFE7BFU, 0x7BFFFFFFU, 0xFFFDFC5FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFF3FU, 0xF7FFFFFDU, 0xF7FFFFFFU,
+    0xFFDFFFFFU, 0xFFDFFFFFU, 0xFFFF7FFFU, 0xFFFF7FFFU,
+    0xFFFFFDFFU, 0xFFFFFDFFU, 0xFFFFCFF7U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x7FFFFFFFU, 0x000007E0U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU, 0x00003FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x3F801FFFU, 0x000043FFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0x00003FFFU, 0xFFFFFFFFU, 0x03FF0FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FF0FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x07FF3FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x7FFF6F7FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF080FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFEFU, 0x0AF7FE96U, 0xAA96EA84U, 0x5EF7F796U,
+    0x0FFFFBFFU, 0x0FFFFBEEU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0xFFFF1FFFU, 0xFFFF03FFU, 0xFFFF03FFU,
+    0x000007FFU, 0x00000020U, 0x00000000U, 0xFFFFFFC0U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0001U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unictype/ctype_alpha.c b/gl/unictype/ctype_alpha.c
new file mode 100644
index 00000000..c422fec6
--- /dev/null
+++ b/gl/unictype/ctype_alpha.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_alpha table.  */
+#include "ctype_alpha.h"
+
+bool
+uc_is_alpha (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_alpha, uc);
+}
diff --git a/gl/unictype/ctype_alpha.h b/gl/unictype/ctype_alpha.h
new file mode 100644
index 00000000..cd129cb9
--- /dev/null
+++ b/gl/unictype/ctype_alpha.h
@@ -0,0 +1,897 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[4];
+    short level2[4 << 7];
+    unsigned int level3[85 << 4];
+  }
+u_is_alpha =
+{
+  { 4 },
+  {
+        5 * sizeof (int) / sizeof (short) +     0,
+        5 * sizeof (int) / sizeof (short) +   128,
+        5 * sizeof (int) / sizeof (short) +   256,
+        5 * sizeof (int) / sizeof (short) +   384
+  },
+  {
+        5 +   512 * sizeof (short) / sizeof (int) +     0,
+        5 +   512 * sizeof (short) / sizeof (int) +    16,
+        5 +   512 * sizeof (short) / sizeof (int) +    32,
+        5 +   512 * sizeof (short) / sizeof (int) +    48,
+        5 +   512 * sizeof (short) / sizeof (int) +    64,
+        5 +   512 * sizeof (short) / sizeof (int) +    80,
+        5 +   512 * sizeof (short) / sizeof (int) +    96,
+        5 +   512 * sizeof (short) / sizeof (int) +   112,
+        5 +   512 * sizeof (short) / sizeof (int) +   128,
+        5 +   512 * sizeof (short) / sizeof (int) +   144,
+        5 +   512 * sizeof (short) / sizeof (int) +   160,
+        5 +   512 * sizeof (short) / sizeof (int) +   176,
+        5 +   512 * sizeof (short) / sizeof (int) +   192,
+        5 +   512 * sizeof (short) / sizeof (int) +   208,
+        5 +   512 * sizeof (short) / sizeof (int) +   224,
+        5 +   512 * sizeof (short) / sizeof (int) +   240,
+        5 +   512 * sizeof (short) / sizeof (int) +   256,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   272,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   288,
+        5 +   512 * sizeof (short) / sizeof (int) +   304,
+        5 +   512 * sizeof (short) / sizeof (int) +   320,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   352,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   368,
+        5 +   512 * sizeof (short) / sizeof (int) +   384,
+        5 +   512 * sizeof (short) / sizeof (int) +   400,
+        5 +   512 * sizeof (short) / sizeof (int) +   416,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   432,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   448,
+        5 +   512 * sizeof (short) / sizeof (int) +   464,
+        5 +   512 * sizeof (short) / sizeof (int) +   480,
+        5 +   512 * sizeof (short) / sizeof (int) +   496,
+        5 +   512 * sizeof (short) / sizeof (int) +   512,
+        5 +   512 * sizeof (short) / sizeof (int) +   528,
+        5 +   512 * sizeof (short) / sizeof (int) +   544,
+        5 +   512 * sizeof (short) / sizeof (int) +   560,
+        5 +   512 * sizeof (short) / sizeof (int) +   576,
+        5 +   512 * sizeof (short) / sizeof (int) +   592,
+        5 +   512 * sizeof (short) / sizeof (int) +   608,
+        5 +   512 * sizeof (short) / sizeof (int) +   624,
+        5 +   512 * sizeof (short) / sizeof (int) +   640,
+        5 +   512 * sizeof (short) / sizeof (int) +   656,
+        5 +   512 * sizeof (short) / sizeof (int) +   672,
+        5 +   512 * sizeof (short) / sizeof (int) +   688,
+        5 +   512 * sizeof (short) / sizeof (int) +   704,
+        5 +   512 * sizeof (short) / sizeof (int) +   720,
+        5 +   512 * sizeof (short) / sizeof (int) +   736,
+        5 +   512 * sizeof (short) / sizeof (int) +   752,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   768,
+        5 +   512 * sizeof (short) / sizeof (int) +   784,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   800,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   816,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   832,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   848,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   864,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   880,
+        5 +   512 * sizeof (short) / sizeof (int) +   896,
+        5 +   512 * sizeof (short) / sizeof (int) +   912,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   928,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   944,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   960,
+        5 +   512 * sizeof (short) / sizeof (int) +   976,
+        5 +   512 * sizeof (short) / sizeof (int) +   992,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1008,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1024,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1040,
+        5 +   512 * sizeof (short) / sizeof (int) +  1056,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1072,
+        5 +   512 * sizeof (short) / sizeof (int) +  1088,
+        5 +   512 * sizeof (short) / sizeof (int) +  1104,
+        5 +   512 * sizeof (short) / sizeof (int) +  1120,
+        5 +   512 * sizeof (short) / sizeof (int) +  1136,
+        5 +   512 * sizeof (short) / sizeof (int) +  1152,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1168,
+        5 +   512 * sizeof (short) / sizeof (int) +  1184,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +  1200,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1216,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1232,
+        5 +   512 * sizeof (short) / sizeof (int) +  1248,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1264,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1280,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1296,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1312,
+       -1,
+       -1,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1328,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +   336,
+        5 +   512 * sizeof (short) / sizeof (int) +  1344,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0x00000000U, 0x00000000U, 0x07FFFFFEU, 0x07FFFFFEU,
+    0x00000000U, 0x04200400U, 0xFF7FFFFFU, 0xFF7FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0003FFC3U, 0x0000501FU,
+    0x00000000U, 0x00000000U, 0x00000020U, 0xBCDF0000U,
+    0xFFFFD740U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFBFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFC03U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFEFFFFU, 0x027FFFFFU, 0xFFFFFFFFU,
+    0x000001FFU, 0x00000000U, 0xFFFF0000U, 0x000787FFU,
+    0x00000000U, 0xFFFFFFFFU, 0x000007FFU, 0xFFFEC3FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x002FFFFFU, 0x9FFFC060U,
+    0xFFFD0000U, 0x0000FFFFU, 0xFFFFE000U, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0002003FU, 0xFFFFFFFFU, 0x043007FFU,
+    0x043FFFFFU, 0x00000110U, 0x01FFFFFFU, 0xFFFF07FFU,
+    0x00007EFFU, 0xFFFFFFFFU, 0x000003FFU, 0x00000000U,
+    0xFFFFFFF0U, 0x23FFFFFFU, 0xFF010000U, 0xFFFEFFC3U,
+    0xFFF99FE1U, 0x23C5FDFFU, 0xB0004000U, 0x1003FFC3U,
+    0xFFF987E0U, 0x036DFDFFU, 0x5E000000U, 0x001CFFC0U,
+    0xFFFBBFE0U, 0x23EDFDFFU, 0x00010000U, 0x0200FFC3U,
+    0xFFF99FE0U, 0x23EDFDFFU, 0xB0000000U, 0x0002FFC3U,
+    0xD63DC7E8U, 0x03FFC718U, 0x00010000U, 0x0000FFC0U,
+    0xFFFDDFE0U, 0x23FFFDFFU, 0x27000000U, 0x0000FFC3U,
+    0xFFFDDFE1U, 0x23EFFDFFU, 0x60000000U, 0x0006FFC3U,
+    0xFFFDDFF0U, 0x27FFFFFFU, 0x80704000U, 0xFC00FFC3U,
+    0xFC7FFFE0U, 0x2FFBFFFFU, 0x0000007FU, 0x0000FFC0U,
+    0xFFFFFFFEU, 0x07FF7FFFU, 0x03FF7FBFU, 0x00000000U,
+    0xFFFFF7D6U, 0x200DFFAFU, 0xF3FF005FU, 0x00000000U,
+    0x00000001U, 0x000003FFU, 0xFFFFFEFFU, 0x00001FFFU,
+    0x00001F00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x800007FFU, 0x3C3F03FFU, 0xFFE1C062U,
+    0x03FF4003U, 0xFFFFFFFFU, 0xFFFF20BFU, 0xF7FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3D7F3DFFU, 0xFFFFFFFFU,
+    0xFFFF3DFFU, 0x7F3DFFFFU, 0xFF7FFF3DU, 0xFFFFFFFFU,
+    0xFF3DFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU, 0x00000000U,
+    0x0000FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU,
+    0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF9FFFU,
+    0x07FFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFC7FFU,
+    0x8003FFFFU, 0x0003FFFFU, 0x0003FFFFU, 0x0001DFFFU,
+    0xFFFFFFFFU, 0x000FFFFFU, 0x10800000U, 0x000003FFU,
+    0x03FF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFF9FU, 0xFFFF05FFU, 0xFFFFFFFFU, 0x003FFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0xFFFFFFC0U, 0x001F3FFFU,
+    0xFFFFFFFFU, 0xFFFF0FFFU, 0x03FF03FFU, 0x00000000U,
+    0x007FFFFFU, 0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U,
+    0x03FF03FFU, 0x00000080U, 0x00000000U, 0x00000000U,
+    0xFFFFFFE0U, 0x000FFFFFU, 0x03FF1FE0U, 0x00000000U,
+    0xFFFFFFF8U, 0xFFFFC001U, 0xFFFFFFFFU, 0x0000003FU,
+    0xFFFFFFFFU, 0x0000000FU, 0xFFFFE3FFU, 0x3FFFFFFFU,
+    0xFFFF07FFU, 0xE7FFFFFFU, 0x00000000U, 0x046FDE00U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
+    0xFFFFFFFFU, 0x5FDFFFFFU, 0x0FCF1FDCU, 0x1FDC1FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x80020000U,
+    0x1FFF0000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3E2FFC84U, 0xF3FFBF50U, 0x000043E0U, 0xFFFFFFFFU,
+    0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xF0000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000003FFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000C781FU,
+    0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x000080FFU,
+    0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0x00000000U,
+    0x00000000U, 0x00008000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x000000E0U, 0x1F3E03FEU, 0xFFFFFFFEU, 0xFFFFFFFFU,
+    0xE07FFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU, 0xF7FFFFFFU,
+    0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00007FFFU, 0xFFFFFFFFU, 0x00000000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00001FFFU, 0x00000000U, 0xFFFF0000U, 0x3FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFF1FFFU, 0x00000FFFU, 0xFFFFFFFFU, 0x80007FFFU,
+    0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0xFF800000U, 0xFFFFFFFCU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFF9FFU, 0xFFFFFFFFU, 0x1FEB3FFFU, 0xFFFC0000U,
+    0xFFFFF7BBU, 0x00000007U, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFCU, 0x000FFFFFU, 0x03FF0000U, 0x68FC0000U,
+    0xFFFFFFFFU, 0xFFFF003FU, 0x0000007FU, 0x1FFFFFFFU,
+    0xFFFFFFF0U, 0x0007FFFFU, 0x03FF8000U, 0x7FFFFFDFU,
+    0xFFFFFFFFU, 0x000001FFU, 0x03FF0FF7U, 0xC47FFFFFU,
+    0xFFFFFFFFU, 0x3E62FFFFU, 0x38000005U, 0x001C07FFU,
+    0x007E7E7EU, 0xFFFF7F7FU, 0xF7FFFFFFU, 0xFFFF03FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF0007U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF000FU, 0xFFFFF87FU, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF3FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U,
+    0xA0F8007FU, 0x5F7FFDFFU, 0xFFFFFFDBU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0003FFFFU, 0xFFF80000U, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x3FFFFFFFU, 0xFFFF0000U, 0xFFFFFFFFU,
+    0xFFFCFFFFU, 0xFFFFFFFFU, 0x000000FFU, 0x0FFF0000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFDF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFFFFFFU,
+    0x03FF0000U, 0x07FFFFFEU, 0x07FFFFFEU, 0xFFFFFFC0U,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0x1CFCFCFCU, 0x00000000U,
+    0xFFFFEFFFU, 0xB7FFFF7FU, 0x3FFF3FFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x001FFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFE000U, 0xFFFF07FFU, 0x003FFFFFU,
+    0x3FFFFFFFU, 0xFFFFFFFFU, 0x003EFF0FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF000FU,
+    0xFFB7F7FFU, 0x1BFBFFFBU, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU,
+    0xFFFFFFBFU, 0x07FDFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFD3FU, 0x91BFFFFFU, 0x003FFFFFU, 0x007FFFFFU,
+    0x7FFFFFFFU, 0x00000000U, 0x00000000U, 0x0037FFFFU,
+    0x003FFFFFU, 0x03FFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xC0FFFFFFU, 0x00000000U, 0x00000000U,
+    0xFEEF0001U, 0x003FFFFFU, 0x00000000U, 0x1FFFFFFFU,
+    0x1FFFFFFFU, 0x00000000U, 0xFFFFFEFFU, 0x0000001FU,
+    0xFFFFFFFFU, 0x003FFFFFU, 0x003FFFFFU, 0x0007FFFFU,
+    0x0003FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U,
+    0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
+    0xFFFFFFFFU, 0x03FF000FU, 0xFFFFFFFFU, 0xFFFF803FU,
+    0x0000003FU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x000303FFU, 0x0000001CU, 0x00000000U,
+    0x1FFFFFFFU, 0xFFFF0080U, 0x0000003FU, 0xFFFF0000U,
+    0x00000003U, 0xFFFF0000U, 0x0000001FU, 0x007FFFFFU,
+    0xFFFFFFF8U, 0x00FFFFFFU, 0x00000000U, 0x0026FFC0U,
+    0xFFFFFFF8U, 0x0000FFFFU, 0xFFFF0000U, 0x03FF01FFU,
+    0xFFFFFFF8U, 0xFFC0007FU, 0xFFFF0090U, 0x0047FFFFU,
+    0xFFFFFFF8U, 0x0007FFFFU, 0x17FF001EU, 0x00000000U,
+    0xFFFBFFFFU, 0x80000FFFU, 0x00000001U, 0x00000000U,
+    0xBFFFBD7FU, 0xFFFF01FFU, 0x7FFFFFFFU, 0x03FF0000U,
+    0xFFF99FE0U, 0x23EDFDFFU, 0xE0010000U, 0x00000003U,
+    0xFFFF4BFFU, 0x00BFFFFFU, 0x000A0000U, 0x00000000U,
+    0xFFFFFFFFU, 0x001FFFFFU, 0x83FF0780U, 0x00000003U,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x03FF00B0U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x00007FFFU, 0x0F000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x03FF0010U, 0x00000000U,
+    0xFFFFFFFFU, 0x010007FFU, 0xFFFF03FFU, 0x0000000FU,
+    0x07FFFFFFU, 0x03FF0000U, 0x0000007FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x00000FFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x800003FFU,
+    0xFF6FF27FU, 0x8000FFFFU, 0x03FF0002U, 0x00000000U,
+    0x00000000U, 0xFFFFFCFFU, 0x0001FFFFU, 0x0000000AU,
+    0xFFFFF801U, 0x0407FFFFU, 0xF0010000U, 0xFFFFFFFFU,
+    0x200003FFU, 0xFFFF0000U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FF0001U,
+    0xFFFFFDFFU, 0x00007FFFU, 0x03FF0001U, 0xFFFC0000U,
+    0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0x0001FFFFU, 0x03FF0040U, 0xFFFFFDBFU,
+    0x010003FFU, 0x000003FFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0007FFFFU,
+    0xFFFDFFF4U, 0x000FFFFFU, 0x03FF0000U, 0x00000000U,
+    0x00000000U, 0x00010000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x03FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00007FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x0000007EU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3FFFFFFFU, 0x03FF0000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x00003FFFU,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x03FF000FU, 0xE0FFFFF8U,
+    0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FF1FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000107FFU, 0x00000000U,
+    0xFFF80000U, 0x00000000U, 0x00000000U, 0x0000000BU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x80000000U,
+    0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00040007U, 0x00270000U, 0xFFFF00F0U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
+    0x03FF01FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFC00000U, 0x03FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFFFFFFU,
+    0xDFFFFFFFU, 0xEBFFDE64U, 0xFFFFFFEFU, 0xFFFFFFFFU,
+    0xDFDFE7BFU, 0x7BFFFFFFU, 0xFFFDFC5FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFF3FU, 0xF7FFFFFDU, 0xF7FFFFFFU,
+    0xFFDFFFFFU, 0xFFDFFFFFU, 0xFFFF7FFFU, 0xFFFF7FFFU,
+    0xFFFFFDFFU, 0xFFFFFDFFU, 0xFFFFCFF7U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x7FFFFFFFU, 0x000007E0U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU, 0x00003FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x3F801FFFU, 0x000043FFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0x00003FFFU, 0xFFFFFFFFU, 0x03FF0FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FF0FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x07FF3FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x7FFF6F7FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000001FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF080FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFEFU, 0x0AF7FE96U, 0xAA96EA84U, 0x5EF7F796U,
+    0x0FFFFBFFU, 0x0FFFFBEEU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0xFFFF1FFFU, 0xFFFF03FFU, 0xFFFF03FFU,
+    0x000007FFU, 0x00000020U, 0x00000000U, 0xFFFFFFC0U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x03FF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0001U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unictype/ctype_blank.c b/gl/unictype/ctype_blank.c
new file mode 100644
index 00000000..25a08013
--- /dev/null
+++ b/gl/unictype/ctype_blank.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_blank table.  */
+#include "ctype_blank.h"
+
+bool
+uc_is_blank (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_blank, uc);
+}
diff --git a/gl/unictype/ctype_blank.h b/gl/unictype/ctype_blank.h
new file mode 100644
index 00000000..23fac0f3
--- /dev/null
+++ b/gl/unictype/ctype_blank.h
@@ -0,0 +1,184 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[1];
+    short level2[1 << 7];
+    unsigned int level3[4 << 4];
+  }
+u_is_blank =
+{
+  { 1 },
+  {     2 * sizeof (int) / sizeof (short) +     0 },
+  {
+        2 +   128 * sizeof (short) / sizeof (int) +     0,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        2 +   128 * sizeof (short) / sizeof (int) +    16,
+       -1,
+       -1,
+       -1,
+       -1,
+        2 +   128 * sizeof (short) / sizeof (int) +    32,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        2 +   128 * sizeof (short) / sizeof (int) +    48,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0x00000200U, 0x00000001U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0000077FU, 0x00000000U, 0x80000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unictype/ctype_cntrl.c b/gl/unictype/ctype_cntrl.c
new file mode 100644
index 00000000..eb7467dd
--- /dev/null
+++ b/gl/unictype/ctype_cntrl.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_cntrl table.  */
+#include "ctype_cntrl.h"
+
+bool
+uc_is_cntrl (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_cntrl, uc);
+}
diff --git a/gl/unictype/ctype_cntrl.h b/gl/unictype/ctype_cntrl.h
new file mode 100644
index 00000000..58df7e76
--- /dev/null
+++ b/gl/unictype/ctype_cntrl.h
@@ -0,0 +1,176 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[1];
+    short level2[1 << 7];
+    unsigned int level3[2 << 4];
+  }
+u_is_cntrl =
+{
+  { 1 },
+  {     2 * sizeof (int) / sizeof (short) +     0 },
+  {
+        2 +   128 * sizeof (short) / sizeof (int) +     0,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        2 +   128 * sizeof (short) / sizeof (int) +    16,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0xFFFFFFFFU, 0x00000000U, 0x00000000U, 0x80000000U,
+    0xFFFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000300U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unictype/ctype_digit.c b/gl/unictype/ctype_digit.c
new file mode 100644
index 00000000..a82b3bb0
--- /dev/null
+++ b/gl/unictype/ctype_digit.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_digit table.  */
+#include "ctype_digit.h"
+
+bool
+uc_is_digit (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_digit, uc);
+}
diff --git a/gl/unictype/ctype_digit.h b/gl/unictype/ctype_digit.h
new file mode 100644
index 00000000..2f7d1822
--- /dev/null
+++ b/gl/unictype/ctype_digit.h
@@ -0,0 +1,172 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[1];
+    short level2[1 << 7];
+    unsigned int level3[1 << 4];
+  }
+u_is_digit =
+{
+  { 1 },
+  {     2 * sizeof (int) / sizeof (short) +     0 },
+  {
+        2 +   128 * sizeof (short) / sizeof (int) +     0,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0x00000000U, 0x03FF0000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unictype/ctype_graph.c b/gl/unictype/ctype_graph.c
new file mode 100644
index 00000000..2c41c794
--- /dev/null
+++ b/gl/unictype/ctype_graph.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_graph table.  */
+#include "ctype_graph.h"
+
+bool
+uc_is_graph (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_graph, uc);
+}
diff --git a/gl/unictype/ctype_graph.h b/gl/unictype/ctype_graph.h
new file mode 100644
index 00000000..5627ad0f
--- /dev/null
+++ b/gl/unictype/ctype_graph.h
@@ -0,0 +1,1202 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[17];
+    short level2[6 << 7];
+    unsigned int level3[94 << 4];
+  }
+u_is_graph =
+{
+  { 17 },
+  {
+       18 * sizeof (int) / sizeof (short) +     0,
+       18 * sizeof (int) / sizeof (short) +   128,
+       18 * sizeof (int) / sizeof (short) +   256,
+       18 * sizeof (int) / sizeof (short) +   384,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 * sizeof (int) / sizeof (short) +   512,
+       18 * sizeof (int) / sizeof (short) +   640,
+       18 * sizeof (int) / sizeof (short) +   640
+  },
+  {
+       18 +   768 * sizeof (short) / sizeof (int) +     0,
+       18 +   768 * sizeof (short) / sizeof (int) +    16,
+       18 +   768 * sizeof (short) / sizeof (int) +    32,
+       18 +   768 * sizeof (short) / sizeof (int) +    48,
+       18 +   768 * sizeof (short) / sizeof (int) +    64,
+       18 +   768 * sizeof (short) / sizeof (int) +    80,
+       18 +   768 * sizeof (short) / sizeof (int) +    96,
+       18 +   768 * sizeof (short) / sizeof (int) +   112,
+       18 +   768 * sizeof (short) / sizeof (int) +   128,
+       18 +   768 * sizeof (short) / sizeof (int) +   144,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   176,
+       18 +   768 * sizeof (short) / sizeof (int) +   192,
+       18 +   768 * sizeof (short) / sizeof (int) +   208,
+       18 +   768 * sizeof (short) / sizeof (int) +   224,
+       18 +   768 * sizeof (short) / sizeof (int) +   240,
+       18 +   768 * sizeof (short) / sizeof (int) +   256,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   272,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   288,
+       18 +   768 * sizeof (short) / sizeof (int) +   304,
+       18 +   768 * sizeof (short) / sizeof (int) +   320,
+       18 +   768 * sizeof (short) / sizeof (int) +   336,
+       18 +   768 * sizeof (short) / sizeof (int) +   352,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   368,
+       18 +   768 * sizeof (short) / sizeof (int) +   384,
+       18 +   768 * sizeof (short) / sizeof (int) +   400,
+       18 +   768 * sizeof (short) / sizeof (int) +   416,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   432,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   448,
+       18 +   768 * sizeof (short) / sizeof (int) +   464,
+       18 +   768 * sizeof (short) / sizeof (int) +   480,
+       18 +   768 * sizeof (short) / sizeof (int) +   496,
+       18 +   768 * sizeof (short) / sizeof (int) +   512,
+       18 +   768 * sizeof (short) / sizeof (int) +   528,
+       18 +   768 * sizeof (short) / sizeof (int) +   544,
+       18 +   768 * sizeof (short) / sizeof (int) +   560,
+       18 +   768 * sizeof (short) / sizeof (int) +   576,
+       18 +   768 * sizeof (short) / sizeof (int) +   592,
+       18 +   768 * sizeof (short) / sizeof (int) +   608,
+       18 +   768 * sizeof (short) / sizeof (int) +   624,
+       18 +   768 * sizeof (short) / sizeof (int) +   640,
+       18 +   768 * sizeof (short) / sizeof (int) +   656,
+       18 +   768 * sizeof (short) / sizeof (int) +   672,
+       18 +   768 * sizeof (short) / sizeof (int) +   688,
+       18 +   768 * sizeof (short) / sizeof (int) +   704,
+       18 +   768 * sizeof (short) / sizeof (int) +   720,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   768,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   784,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   800,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   816,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   832,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   848,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   864,
+       18 +   768 * sizeof (short) / sizeof (int) +   880,
+       18 +   768 * sizeof (short) / sizeof (int) +   896,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   912,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   928,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   944,
+       18 +   768 * sizeof (short) / sizeof (int) +   960,
+       18 +   768 * sizeof (short) / sizeof (int) +   976,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   992,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +  1008,
+       18 +   768 * sizeof (short) / sizeof (int) +  1024,
+       18 +   768 * sizeof (short) / sizeof (int) +  1040,
+       18 +   768 * sizeof (short) / sizeof (int) +  1056,
+       18 +   768 * sizeof (short) / sizeof (int) +  1072,
+       18 +   768 * sizeof (short) / sizeof (int) +  1088,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1104,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +  1120,
+       18 +   768 * sizeof (short) / sizeof (int) +  1136,
+       18 +   768 * sizeof (short) / sizeof (int) +  1152,
+       18 +   768 * sizeof (short) / sizeof (int) +  1168,
+       18 +   768 * sizeof (short) / sizeof (int) +  1184,
+       18 +   768 * sizeof (short) / sizeof (int) +  1200,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +  1216,
+       18 +   768 * sizeof (short) / sizeof (int) +  1232,
+       18 +   768 * sizeof (short) / sizeof (int) +  1248,
+       18 +   768 * sizeof (short) / sizeof (int) +  1264,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1280,
+       18 +   768 * sizeof (short) / sizeof (int) +  1296,
+       18 +   768 * sizeof (short) / sizeof (int) +  1312,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1328,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1344,
+       18 +   768 * sizeof (short) / sizeof (int) +  1360,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1376,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1392,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1408,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1424,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1440,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1456,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +  1472,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1488
+  },
+  {
+    0x00000000U, 0xFFFFFFFEU, 0xFFFFFFFFU, 0x7FFFFFFFU,
+    0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFCFFFFFFU,
+    0xFFFFD7F0U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFEFFFFU, 0xFE7FFFFFU, 0xFFFFFFFFU,
+    0xFFFEE7FFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0x001F87FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFBFFFU, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU,
+    0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0xFFFF07FFU,
+    0xFF837FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x7FFFFFCFU,
+    0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x007FFFC0U,
+    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0xFE03FFCFU,
+    0xFFF99FEEU, 0xF3EDFDFFU, 0xB0E0399FU, 0x00FFFFCFU,
+    0xD63DC7ECU, 0xC3FFC718U, 0x00813DC7U, 0x07FFFFC0U,
+    0xFFFDDFFFU, 0xF3FFFDFFU, 0x27603DDFU, 0xFF80FFCFU,
+    0xFFFDDFFFU, 0xF3EFFDFFU, 0x60603DDFU, 0x000EFFCFU,
+    0xFFFDDFFFU, 0xFFFFFFFFU, 0xFFF0FDDFU, 0xFFFFFFCFU,
+    0xFC7FFFEEU, 0x2FFBFFFFU, 0xFF5F847FU, 0x001CFFC0U,
+    0xFFFFFFFEU, 0x87FFFFFFU, 0x0FFFFFFFU, 0x00000000U,
+    0xFFFFF7D6U, 0x3FFFFFAFU, 0xF3FF7F5FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFEFFU, 0xFFFE1FFFU,
+    0xFEFFFFFFU, 0xDFFFFFFFU, 0x07FFDFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3D7F3DFFU, 0xFFFFFFFFU,
+    0xFFFF3DFFU, 0x7F3DFFFFU, 0xFF7FFF3DU, 0xFFFFFFFFU,
+    0xFF3DFFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU, 0x1FFFFFFFU,
+    0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x1FFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0x803FFFFFU, 0x007FFFFFU, 0x000FFFFFU, 0x000DDFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x03FF03FFU,
+    0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU, 0x003FFFFFU,
+    0x7FFFFFFFU, 0x0FFF0FFFU, 0xFFFFFFF1U, 0x001F3FFFU,
+    0xFFFFFFFFU, 0xFFFF0FFFU, 0xC7FF03FFU, 0xFFFFFFFFU,
+    0xCFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU, 0x9FFFFFFFU,
+    0x03FF03FFU, 0xFFFF3FFFU, 0x00007FFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFDFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF00FFFFFU,
+    0xFFFFFFFFU, 0xF8FFFFFFU, 0xFFFFE3FFU, 0xFFFFFFFFU,
+    0xFFFF07FFU, 0xE7FFFFFFU, 0xFFFF00FFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
+    0xFFFFFFFFU, 0xFFDFFFFFU, 0xEFCFFFDFU, 0x7FDCFFFFU,
+    0xFFFFF880U, 0xFFFFFCFFU, 0x7FFFFFFFU, 0xFFF3FFDFU,
+    0x1FFF7FFFU, 0xFFFFFFFFU, 0xFFFF0001U, 0x0001FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x000003FFU, 0x000007FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
+    0xFFBFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFE0FFFFFU,
+    0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x800180FFU,
+    0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U,
+    0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFF0000U,
+    0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
+    0xFE7FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF803FU,
+    0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFF1FFFU, 0xFFFFFFFFU, 0xFFFF007FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00000FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FEB3FFFU, 0xFFFC0000U,
+    0xFFFFFFFFU, 0x03FF1FFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFC03FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x800FFFFFU, 0x1FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xC3FFBFFFU, 0x7FFFFFFFU,
+    0xFFFFFFFFU, 0x007FFFFFU, 0xF3FF3FFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xF8000007U, 0x007FFFFFU,
+    0x007E7E7EU, 0xFFFF7F7FU, 0xFFFFFFFFU, 0xFFFF0FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF3FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF000FU, 0xFFFFF87FU, 0x0FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF3FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U,
+    0xE0F8007FU, 0x5F7FFFFFU, 0xFFFFFFDBU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFF80007U, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFCFFFFU, 0xFFFFFFFFU, 0x000080FFU, 0xFFFF0000U,
+    0x03FFFFFFU, 0xFFFFFFFFU, 0xFFF7FFFFU, 0xFFDF0F7FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x9FFFFFFFU,
+    0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0x1CFCFCFCU, 0x3E007F7FU,
+    0xFFFFEFFFU, 0xB7FFFF7FU, 0x3FFF3FFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFF87U, 0xFF8FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x1FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x3FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x0FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFE00FU, 0xFFFF07FFU, 0x07FFFFFFU,
+    0xBFFFFFFFU, 0xFFFFFFFFU, 0x003FFF0FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF800FU,
+    0xFFB7F7FFU, 0x1BFBFFFBU, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU,
+    0xFFFFFFBFU, 0x07FDFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFD3FU, 0x91BFFFFFU, 0xFFBFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x0000FF80U, 0x00000000U, 0xF837FFFFU,
+    0x8FFFFFFFU, 0x83FFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xF0FFFFFFU, 0xFFFCFFFFU, 0xFFFFFFFFU,
+    0xFEEFF06FU, 0x873FFFFFU, 0x01FF01FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00000000U, 0xFFFFFFFFU, 0x007FF87FU,
+    0xFFFFFFFFU, 0xFE3FFFFFU, 0xFF3FFFFFU, 0xFF07FFFFU,
+    0x1E03FFFFU, 0x0000FE00U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U,
+    0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0xFC07FFFFU,
+    0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU, 0xFFFFFE3FU,
+    0x0000C03FU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x7FFFFFFFU,
+    0xFFFFFFFFU, 0x00033BFFU, 0x0000001CU, 0xF0000000U,
+    0xFFFFFFFFU, 0xFFFF00FFU, 0x03FFFFFFU, 0xFFFF0000U,
+    0x000003FFU, 0xFFFF0000U, 0x00000FFFU, 0x007FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFC3FFFU, 0x803FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF2007U, 0x03FF01FFU,
+    0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFF00FFU, 0x007FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFEU,
+    0xFFFBFFFFU, 0xFFFFFFFFU, 0x00000003U, 0x00000000U,
+    0xBFFFBD7FU, 0xFFFF03FFU, 0xFFFFFFFFU, 0x03FF07FFU,
+    0xFFF99FEFU, 0xFBEDFDFFU, 0xE081399FU, 0x001F1FCFU,
+    0xFFFF4BFFU, 0xFFBFFFFFU, 0x01BFF7A5U, 0x00000006U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xEFFFFFFFU, 0x00000003U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFF3FFFFFU, 0x3FFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF001FU, 0x00001FFFU,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFF03FFU, 0x0000000FU,
+    0xE7FFFFFFU, 0xFFFF0FFFU, 0x0000007FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x0FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x8007FFFFU,
+    0xFF6FF27FU, 0xF9BFFFFFU, 0x03FF007FU, 0x00000000U,
+    0x00000000U, 0xFFFFFCFFU, 0xFCFFFFFFU, 0x0000001FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF0007U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0x000003FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FF0003U,
+    0xFFFFFDFFU, 0xFF7FFFFFU, 0xFFFF003FU, 0xFFFF1FFFU,
+    0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0xFFFFFDBFU,
+    0x01FB7FFFU, 0x000003FFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x01FFFFFFU,
+    0xFFFDFFFFU, 0xC7FFFFFFU, 0x07FFFFFFU, 0x00000000U,
+    0x00000000U, 0x00010000U, 0xFFFFFFFFU, 0x8003FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x03FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x001F7FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFFC3FFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x003F3FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFF003FU, 0xE0FFFFFBU,
+    0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x07FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF87FFU, 0xFFFFFFFFU,
+    0xFFFF80FFU, 0x00000000U, 0x00000000U, 0x0003001FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x80000000U,
+    0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00040007U, 0x00270000U, 0xFFFF00F0U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
+    0xF3FF01FFU, 0x0000000FU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x000FFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF3FFFU, 0xFFFF007FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFE7FU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000003FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x000FFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x01FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFFFFFFU,
+    0xDFFFFFFFU, 0xEBFFDE64U, 0xFFFFFFEFU, 0xFFFFFFFFU,
+    0xDFDFE7BFU, 0x7BFFFFFFU, 0xFFFDFC5FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFF3FU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFCFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xF8000FFFU, 0x0000FFFEU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x7FFFFFFFU, 0x000007E0U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xF9FFFF7FU, 0xFFFF07DBU, 0xFFFFFFFFU, 0x00003FFFU,
+    0x00008000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x3FFF1FFFU, 0x0000C3FFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0x00007FFFU, 0xFFFFFFFFU, 0x83FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x87FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x7FFF6F7FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFF9FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xC3FF0FFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFE0000U,
+    0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFEU, 0x3FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFEFU, 0x0AF7FE96U, 0xAA96EA84U, 0x5EF7F796U,
+    0x0FFFFBFFU, 0x0FFFFBEEU, 0x00000000U, 0x00030000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00003FFFU, 0x00000000U, 0xFFFFFFC0U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xF0FFFFFFU, 0x1FFF1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF87FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00010FFFU,
+    0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
+    0xFFFF00FFU, 0x0FFF3FFFU, 0x00000003U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, 0x1FFF3FFFU,
+    0xFFFF83FFU, 0xFFFFFFFFU, 0x9FFFC07FU, 0x01FF03FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFF7FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0001U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x00000000U,
+    0x00000002U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU
+  }
+};
diff --git a/gl/unictype/ctype_lower.c b/gl/unictype/ctype_lower.c
new file mode 100644
index 00000000..99a05e09
--- /dev/null
+++ b/gl/unictype/ctype_lower.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_lower table.  */
+#include "ctype_lower.h"
+
+bool
+uc_is_lower (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_lower, uc);
+}
diff --git a/gl/unictype/ctype_lower.h b/gl/unictype/ctype_lower.h
new file mode 100644
index 00000000..cbf7d26d
--- /dev/null
+++ b/gl/unictype/ctype_lower.h
@@ -0,0 +1,371 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[2];
+    short level2[2 << 7];
+    unsigned int level3[18 << 4];
+  }
+u_is_lower =
+{
+  { 2 },
+  {
+        3 * sizeof (int) / sizeof (short) +     0,
+        3 * sizeof (int) / sizeof (short) +   128
+  },
+  {
+        3 +   256 * sizeof (short) / sizeof (int) +     0,
+        3 +   256 * sizeof (short) / sizeof (int) +    16,
+        3 +   256 * sizeof (short) / sizeof (int) +    32,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +    48,
+        3 +   256 * sizeof (short) / sizeof (int) +    64,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +    80,
+        3 +   256 * sizeof (short) / sizeof (int) +    96,
+        3 +   256 * sizeof (short) / sizeof (int) +   112,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   128,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   144,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   160,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   176,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   192,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   208,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   224,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   240,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   256,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   272,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0x00000000U, 0x00000000U, 0x00000000U, 0x07FFFFFEU,
+    0x00000000U, 0x00200000U, 0x80000000U, 0xFF7FFFFFU,
+    0xAAAAAAAAU, 0x54AAAAAAU, 0xAAAAA955U, 0xD4AAAAAAU,
+    0x4E241129U, 0xA251212AU, 0xB5555B60U, 0xAA2CAAAAU,
+    0xAAAAAAAAU, 0x900AAAA8U, 0x1ADFAA85U, 0x20269F7BU,
+    0x60041F8DU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000020U, 0x388A0000U,
+    0x00000000U, 0xFFFEF000U, 0xAAE37FFFU, 0x092FAAAAU,
+    0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU, 0xAAAAAAAAU,
+    0xAAAAA802U, 0xAAAAAAAAU, 0xAAAAD554U, 0xAAAAAAAAU,
+    0xAAAAAAAAU, 0x0000AAAAU, 0x00000000U, 0xFFFFFFFEU,
+    0x0000007FU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0xE7FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x3F000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x000005FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x22000000U,
+    0x00004000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xAAAAAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU,
+    0x082AAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU,
+    0x003F00FFU, 0x00FF00FFU, 0x00AA003FU, 0x3FFF00FFU,
+    0x00FF00FFU, 0x400B00FFU, 0x00030008U, 0x00080023U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00004000U, 0xFFFF0000U,
+    0x00000010U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x000003FFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFF0000U, 0xFFFFFFFFU, 0x00481562U,
+    0xAAAAAAAAU, 0xAAAAAAAAU, 0xAAAAAAAAU, 0x0008500AU,
+    0xFFFFFFFFU, 0x000020BFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xAAAAAAAAU, 0x00002AAAU,
+    0x0AAAAAAAU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xAAA8AAA8U, 0xAAAAAAAAU, 0x9400AAAAU,
+    0xAA9A10AAU, 0xAAA002AAU, 0x0A82250AU, 0x00400000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00080000U, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x07FFFFFEU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFF00U, 0x0000FFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFF000000U, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFF800000U, 0x1BFBFFFBU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x0007FFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFF0000U,
+    0x0000003FU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFCU, 0x0000000FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unictype/ctype_print.c b/gl/unictype/ctype_print.c
new file mode 100644
index 00000000..0197d496
--- /dev/null
+++ b/gl/unictype/ctype_print.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_print table.  */
+#include "ctype_print.h"
+
+bool
+uc_is_print (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_print, uc);
+}
diff --git a/gl/unictype/ctype_print.h b/gl/unictype/ctype_print.h
new file mode 100644
index 00000000..b7007828
--- /dev/null
+++ b/gl/unictype/ctype_print.h
@@ -0,0 +1,1202 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[17];
+    short level2[6 << 7];
+    unsigned int level3[94 << 4];
+  }
+u_is_print =
+{
+  { 17 },
+  {
+       18 * sizeof (int) / sizeof (short) +     0,
+       18 * sizeof (int) / sizeof (short) +   128,
+       18 * sizeof (int) / sizeof (short) +   256,
+       18 * sizeof (int) / sizeof (short) +   384,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 * sizeof (int) / sizeof (short) +   512,
+       18 * sizeof (int) / sizeof (short) +   640,
+       18 * sizeof (int) / sizeof (short) +   640
+  },
+  {
+       18 +   768 * sizeof (short) / sizeof (int) +     0,
+       18 +   768 * sizeof (short) / sizeof (int) +    16,
+       18 +   768 * sizeof (short) / sizeof (int) +    32,
+       18 +   768 * sizeof (short) / sizeof (int) +    48,
+       18 +   768 * sizeof (short) / sizeof (int) +    64,
+       18 +   768 * sizeof (short) / sizeof (int) +    80,
+       18 +   768 * sizeof (short) / sizeof (int) +    96,
+       18 +   768 * sizeof (short) / sizeof (int) +   112,
+       18 +   768 * sizeof (short) / sizeof (int) +   128,
+       18 +   768 * sizeof (short) / sizeof (int) +   144,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   176,
+       18 +   768 * sizeof (short) / sizeof (int) +   192,
+       18 +   768 * sizeof (short) / sizeof (int) +   208,
+       18 +   768 * sizeof (short) / sizeof (int) +   224,
+       18 +   768 * sizeof (short) / sizeof (int) +   240,
+       18 +   768 * sizeof (short) / sizeof (int) +   256,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   272,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   288,
+       18 +   768 * sizeof (short) / sizeof (int) +   304,
+       18 +   768 * sizeof (short) / sizeof (int) +   320,
+       18 +   768 * sizeof (short) / sizeof (int) +   336,
+       18 +   768 * sizeof (short) / sizeof (int) +   352,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   368,
+       18 +   768 * sizeof (short) / sizeof (int) +   384,
+       18 +   768 * sizeof (short) / sizeof (int) +   400,
+       18 +   768 * sizeof (short) / sizeof (int) +   416,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   432,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   448,
+       18 +   768 * sizeof (short) / sizeof (int) +   464,
+       18 +   768 * sizeof (short) / sizeof (int) +   480,
+       18 +   768 * sizeof (short) / sizeof (int) +   496,
+       18 +   768 * sizeof (short) / sizeof (int) +   512,
+       18 +   768 * sizeof (short) / sizeof (int) +   528,
+       18 +   768 * sizeof (short) / sizeof (int) +   544,
+       18 +   768 * sizeof (short) / sizeof (int) +   560,
+       18 +   768 * sizeof (short) / sizeof (int) +   576,
+       18 +   768 * sizeof (short) / sizeof (int) +   592,
+       18 +   768 * sizeof (short) / sizeof (int) +   608,
+       18 +   768 * sizeof (short) / sizeof (int) +   624,
+       18 +   768 * sizeof (short) / sizeof (int) +   640,
+       18 +   768 * sizeof (short) / sizeof (int) +   656,
+       18 +   768 * sizeof (short) / sizeof (int) +   672,
+       18 +   768 * sizeof (short) / sizeof (int) +   688,
+       18 +   768 * sizeof (short) / sizeof (int) +   704,
+       18 +   768 * sizeof (short) / sizeof (int) +   720,
+       18 +   768 * sizeof (short) / sizeof (int) +   736,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   752,
+       18 +   768 * sizeof (short) / sizeof (int) +   768,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   784,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   800,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   816,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   832,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   848,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   864,
+       18 +   768 * sizeof (short) / sizeof (int) +   880,
+       18 +   768 * sizeof (short) / sizeof (int) +   896,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   912,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   928,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   944,
+       18 +   768 * sizeof (short) / sizeof (int) +   960,
+       18 +   768 * sizeof (short) / sizeof (int) +   976,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   992,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +  1008,
+       18 +   768 * sizeof (short) / sizeof (int) +  1024,
+       18 +   768 * sizeof (short) / sizeof (int) +  1040,
+       18 +   768 * sizeof (short) / sizeof (int) +  1056,
+       18 +   768 * sizeof (short) / sizeof (int) +  1072,
+       18 +   768 * sizeof (short) / sizeof (int) +  1088,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1104,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +  1120,
+       18 +   768 * sizeof (short) / sizeof (int) +  1136,
+       18 +   768 * sizeof (short) / sizeof (int) +  1152,
+       18 +   768 * sizeof (short) / sizeof (int) +  1168,
+       18 +   768 * sizeof (short) / sizeof (int) +  1184,
+       18 +   768 * sizeof (short) / sizeof (int) +  1200,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +  1216,
+       18 +   768 * sizeof (short) / sizeof (int) +  1232,
+       18 +   768 * sizeof (short) / sizeof (int) +  1248,
+       18 +   768 * sizeof (short) / sizeof (int) +  1264,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1280,
+       18 +   768 * sizeof (short) / sizeof (int) +  1296,
+       18 +   768 * sizeof (short) / sizeof (int) +  1312,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1328,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1344,
+       18 +   768 * sizeof (short) / sizeof (int) +  1360,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1376,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1392,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1408,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1424,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1440,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1456,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +  1472,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +   160,
+       18 +   768 * sizeof (short) / sizeof (int) +  1488
+  },
+  {
+    0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU,
+    0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFCFFFFFFU,
+    0xFFFFD7F0U, 0xFFFFFFFBU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFEFFFFU, 0xFE7FFFFFU, 0xFFFFFFFFU,
+    0xFFFEE7FFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0x001F87FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFBFFFU, 0xFFFFFFFFU, 0xFFFFE7FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0003FFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU,
+    0xFFFFFFFFU, 0x7FFF3FFFU, 0x4FFFFFFFU, 0xFFFF07FFU,
+    0xFF837FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFF99FEFU, 0xF3C5FDFFU, 0xB080799FU, 0x7FFFFFCFU,
+    0xFFF987EEU, 0xD36DFDFFU, 0x5E023987U, 0x007FFFC0U,
+    0xFFFBBFEEU, 0xF3EDFDFFU, 0x00013BBFU, 0xFE03FFCFU,
+    0xFFF99FEEU, 0xF3EDFDFFU, 0xB0E0399FU, 0x00FFFFCFU,
+    0xD63DC7ECU, 0xC3FFC718U, 0x00813DC7U, 0x07FFFFC0U,
+    0xFFFDDFFFU, 0xF3FFFDFFU, 0x27603DDFU, 0xFF80FFCFU,
+    0xFFFDDFFFU, 0xF3EFFDFFU, 0x60603DDFU, 0x000EFFCFU,
+    0xFFFDDFFFU, 0xFFFFFFFFU, 0xFFF0FDDFU, 0xFFFFFFCFU,
+    0xFC7FFFEEU, 0x2FFBFFFFU, 0xFF5F847FU, 0x001CFFC0U,
+    0xFFFFFFFEU, 0x87FFFFFFU, 0x0FFFFFFFU, 0x00000000U,
+    0xFFFFF7D6U, 0x3FFFFFAFU, 0xF3FF7F5FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFEFFU, 0xFFFE1FFFU,
+    0xFEFFFFFFU, 0xDFFFFFFFU, 0x07FFDFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3D7F3DFFU, 0xFFFFFFFFU,
+    0xFFFF3DFFU, 0x7F3DFFFFU, 0xFF7FFF3DU, 0xFFFFFFFFU,
+    0xFF3DFFFFU, 0xFFFFFFFFU, 0xE7FFFFFFU, 0x1FFFFFFFU,
+    0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3F3FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x1FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0x803FFFFFU, 0x007FFFFFU, 0x000FFFFFU, 0x000DDFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x03FF03FFU,
+    0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU, 0x003FFFFFU,
+    0x7FFFFFFFU, 0x0FFF0FFFU, 0xFFFFFFF1U, 0x001F3FFFU,
+    0xFFFFFFFFU, 0xFFFF0FFFU, 0xC7FF03FFU, 0xFFFFFFFFU,
+    0xCFFFFFFFU, 0xFFFFFFFFU, 0x7FFFFFFFU, 0x9FFFFFFFU,
+    0x03FF03FFU, 0xFFFF3FFFU, 0x00007FFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFDFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF00FFFFFU,
+    0xFFFFFFFFU, 0xF8FFFFFFU, 0xFFFFE3FFU, 0xFFFFFFFFU,
+    0xFFFF07FFU, 0xE7FFFFFFU, 0xFFFF00FFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3F3FFFFFU, 0xFFFFFFFFU, 0xAAFF3F3FU, 0x3FFFFFFFU,
+    0xFFFFFFFFU, 0xFFDFFFFFU, 0xEFCFFFDFU, 0x7FDCFFFFU,
+    0xFFFFFFFFU, 0xFFFFFCFFU, 0xFFFFFFFFU, 0xFFF3FFDFU,
+    0x1FFF7FFFU, 0xFFFFFFFFU, 0xFFFF0001U, 0x0001FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x000003FFU, 0x000007FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
+    0xFFBFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFE0FFFFFU,
+    0xFFFFFFFFU, 0xFFFF20BFU, 0xFFFFFFFFU, 0x800180FFU,
+    0x007FFFFFU, 0x7F7F7F7FU, 0x7F7F7F7FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U,
+    0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFEU, 0xFFFFFFFFU,
+    0xFE7FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFE0U, 0xFFFEFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFF7FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF803FU,
+    0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFF1FFFU, 0xFFFFFFFFU, 0xFFFF007FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00000FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FEB3FFFU, 0xFFFC0000U,
+    0xFFFFFFFFU, 0x03FF1FFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFC03FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x800FFFFFU, 0x1FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xC3FFBFFFU, 0x7FFFFFFFU,
+    0xFFFFFFFFU, 0x007FFFFFU, 0xF3FF3FFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xF8000007U, 0x007FFFFFU,
+    0x007E7E7EU, 0xFFFF7F7FU, 0xFFFFFFFFU, 0xFFFF0FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF3FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF000FU, 0xFFFFF87FU, 0x0FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF3FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U,
+    0xE0F8007FU, 0x5F7FFFFFU, 0xFFFFFFDBU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFF80007U, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFCFFFFU, 0xFFFFFFFFU, 0x000080FFU, 0xFFFF0000U,
+    0x03FFFFFFU, 0xFFFFFFFFU, 0xFFF7FFFFU, 0xFFDF0F7FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x9FFFFFFFU,
+    0xFFFFFFFEU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0x1CFCFCFCU, 0x3E007F7FU,
+    0xFFFFEFFFU, 0xB7FFFF7FU, 0x3FFF3FFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFF87U, 0xFF8FFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x1FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x3FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x1FFFFFFFU, 0xFFFFFFFFU, 0x0001FFFFU, 0x0FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFE00FU, 0xFFFF07FFU, 0x07FFFFFFU,
+    0xBFFFFFFFU, 0xFFFFFFFFU, 0x003FFF0FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3FFFFFFFU, 0xFFFF03FFU, 0xFF0FFFFFU, 0x0FFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU, 0xF7FF800FU,
+    0xFFB7F7FFU, 0x1BFBFFFBU, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x007FFFFFU, 0x003FFFFFU, 0x000000FFU,
+    0xFFFFFFBFU, 0x07FDFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFD3FU, 0x91BFFFFFU, 0xFFBFFFFFU, 0xFFFFFFFFU,
+    0x7FFFFFFFU, 0x0000FF80U, 0x00000000U, 0xF837FFFFU,
+    0x8FFFFFFFU, 0x83FFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xF0FFFFFFU, 0xFFFCFFFFU, 0xFFFFFFFFU,
+    0xFEEFF06FU, 0x873FFFFFU, 0x01FF01FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00000000U, 0xFFFFFFFFU, 0x007FF87FU,
+    0xFFFFFFFFU, 0xFE3FFFFFU, 0xFF3FFFFFU, 0xFF07FFFFU,
+    0x1E03FFFFU, 0x0000FE00U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000001FFU, 0x00000000U,
+    0xFFFFFFFFU, 0x0007FFFFU, 0xFFFFFFFFU, 0xFC07FFFFU,
+    0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU, 0xFFFFFE3FU,
+    0x0000C03FU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x7FFFFFFFU,
+    0xFFFFFFFFU, 0x00033BFFU, 0x0000001CU, 0xF0000000U,
+    0xFFFFFFFFU, 0xFFFF00FFU, 0x03FFFFFFU, 0xFFFF0000U,
+    0x000003FFU, 0xFFFF0000U, 0x00000FFFU, 0x007FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFC3FFFU, 0x803FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF2007U, 0x03FF01FFU,
+    0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFF00FFU, 0x007FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x001FFFFEU,
+    0xFFFBFFFFU, 0xFFFFFFFFU, 0x00000003U, 0x00000000U,
+    0xBFFFBD7FU, 0xFFFF03FFU, 0xFFFFFFFFU, 0x03FF07FFU,
+    0xFFF99FEFU, 0xFBEDFDFFU, 0xE081399FU, 0x001F1FCFU,
+    0xFFFF4BFFU, 0xFFBFFFFFU, 0x01BFF7A5U, 0x00000006U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xEFFFFFFFU, 0x00000003U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFF3FFFFFU, 0x3FFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FF001FU, 0x00001FFFU,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFF03FFU, 0x0000000FU,
+    0xE7FFFFFFU, 0xFFFF0FFFU, 0x0000007FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x0FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x8007FFFFU,
+    0xFF6FF27FU, 0xF9BFFFFFU, 0x03FF007FU, 0x00000000U,
+    0x00000000U, 0xFFFFFCFFU, 0xFCFFFFFFU, 0x0000001FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF0007U, 0xFFFFFFFFU, 0x01FFFFFFU,
+    0x000003FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FF0003U,
+    0xFFFFFDFFU, 0xFF7FFFFFU, 0xFFFF003FU, 0xFFFF1FFFU,
+    0xFFFCFFFFU, 0x007FFEFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFB7FU, 0xB47FFFFFU, 0x03FF00FFU, 0xFFFFFDBFU,
+    0x01FB7FFFU, 0x000003FFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x01FFFFFFU,
+    0xFFFDFFFFU, 0xC7FFFFFFU, 0x07FFFFFFU, 0x00000000U,
+    0x00000000U, 0x00010000U, 0xFFFFFFFFU, 0x8003FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x03FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x001F7FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0007FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x07FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000007FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x01FFFFFFU, 0x7FFFFFFFU, 0xFFFFC3FFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFF03FFU, 0x003F3FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFBFF003FU, 0xE0FFFFFBU,
+    0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x03FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x07FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF87FFU, 0xFFFFFFFFU,
+    0xFFFF80FFU, 0x00000000U, 0x00000000U, 0x0003001FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x80000000U,
+    0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00040007U, 0x00270000U, 0xFFFF00F0U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x1FFF07FFU,
+    0xF3FF01FFU, 0x0000000FU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x000FFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF3FFFU, 0xFFFF007FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFE7FU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000003FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x000FFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x01FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFDFFFFFU, 0xFFFFFFFFU,
+    0xDFFFFFFFU, 0xEBFFDE64U, 0xFFFFFFEFU, 0xFFFFFFFFU,
+    0xDFDFE7BFU, 0x7BFFFFFFU, 0xFFFDFC5FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFF3FU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFCFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xF8000FFFU, 0x0000FFFEU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x7FFFFFFFU, 0x000007E0U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xF9FFFF7FU, 0xFFFF07DBU, 0xFFFFFFFFU, 0x00003FFFU,
+    0x00008000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x3FFF1FFFU, 0x0000C3FFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0x00007FFFU, 0xFFFFFFFFU, 0x83FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x03FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x87FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x7FFF6F7FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFF9FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xC3FF0FFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFE0000U,
+    0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFEU, 0x3FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFEFU, 0x0AF7FE96U, 0xAA96EA84U, 0x5EF7F796U,
+    0x0FFFFBFFU, 0x0FFFFBEEU, 0x00000000U, 0x00030000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00003FFFU, 0x00000000U, 0xFFFFFFC0U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xF0FFFFFFU, 0x1FFF1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF87FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00010FFFU,
+    0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
+    0xFFFF00FFU, 0x0FFF3FFFU, 0x00000003U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, 0x1FFF3FFFU,
+    0xFFFF83FFU, 0xFFFFFFFFU, 0x9FFFC07FU, 0x01FF03FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFF7FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x03FFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x3FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF0003U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF0001U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x3FFFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF07FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x00000000U,
+    0x00000002U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU
+  }
+};
diff --git a/gl/unictype/ctype_punct.c b/gl/unictype/ctype_punct.c
new file mode 100644
index 00000000..f2d647de
--- /dev/null
+++ b/gl/unictype/ctype_punct.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_punct table.  */
+#include "ctype_punct.h"
+
+bool
+uc_is_punct (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_punct, uc);
+}
diff --git a/gl/unictype/ctype_punct.h b/gl/unictype/ctype_punct.h
new file mode 100644
index 00000000..cb252114
--- /dev/null
+++ b/gl/unictype/ctype_punct.h
@@ -0,0 +1,870 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[17];
+    short level2[4 << 7];
+    unsigned int level3[75 << 4];
+  }
+u_is_punct =
+{
+  { 17 },
+  {
+       18 * sizeof (int) / sizeof (short) +     0,
+       18 * sizeof (int) / sizeof (short) +   128,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 * sizeof (int) / sizeof (short) +   256,
+       18 * sizeof (int) / sizeof (short) +   384,
+       18 * sizeof (int) / sizeof (short) +   384
+  },
+  {
+       18 +   512 * sizeof (short) / sizeof (int) +     0,
+       18 +   512 * sizeof (short) / sizeof (int) +    16,
+       18 +   512 * sizeof (short) / sizeof (int) +    32,
+       18 +   512 * sizeof (short) / sizeof (int) +    48,
+       18 +   512 * sizeof (short) / sizeof (int) +    64,
+       18 +   512 * sizeof (short) / sizeof (int) +    80,
+       18 +   512 * sizeof (short) / sizeof (int) +    96,
+       18 +   512 * sizeof (short) / sizeof (int) +   112,
+       18 +   512 * sizeof (short) / sizeof (int) +   128,
+       18 +   512 * sizeof (short) / sizeof (int) +   144,
+       18 +   512 * sizeof (short) / sizeof (int) +   160,
+       18 +   512 * sizeof (short) / sizeof (int) +   176,
+       18 +   512 * sizeof (short) / sizeof (int) +   192,
+       18 +   512 * sizeof (short) / sizeof (int) +   208,
+       18 +   512 * sizeof (short) / sizeof (int) +   224,
+       18 +   512 * sizeof (short) / sizeof (int) +   240,
+       18 +   512 * sizeof (short) / sizeof (int) +   256,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   288,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   304,
+       18 +   512 * sizeof (short) / sizeof (int) +   320,
+       18 +   512 * sizeof (short) / sizeof (int) +   336,
+       18 +   512 * sizeof (short) / sizeof (int) +   352,
+       18 +   512 * sizeof (short) / sizeof (int) +   368,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   384,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   400,
+       18 +   512 * sizeof (short) / sizeof (int) +   416,
+       18 +   512 * sizeof (short) / sizeof (int) +   432,
+       18 +   512 * sizeof (short) / sizeof (int) +   448,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   464,
+       18 +   512 * sizeof (short) / sizeof (int) +   480,
+       18 +   512 * sizeof (short) / sizeof (int) +   496,
+       18 +   512 * sizeof (short) / sizeof (int) +   512,
+       18 +   512 * sizeof (short) / sizeof (int) +   528,
+       18 +   512 * sizeof (short) / sizeof (int) +   544,
+       18 +   512 * sizeof (short) / sizeof (int) +   560,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   576,
+       18 +   512 * sizeof (short) / sizeof (int) +   592,
+       18 +   512 * sizeof (short) / sizeof (int) +   608,
+       18 +   512 * sizeof (short) / sizeof (int) +   624,
+       18 +   512 * sizeof (short) / sizeof (int) +   640,
+       18 +   512 * sizeof (short) / sizeof (int) +   656,
+       18 +   512 * sizeof (short) / sizeof (int) +   672,
+       18 +   512 * sizeof (short) / sizeof (int) +   688,
+       18 +   512 * sizeof (short) / sizeof (int) +   704,
+       18 +   512 * sizeof (short) / sizeof (int) +   720,
+       18 +   512 * sizeof (short) / sizeof (int) +   736,
+       18 +   512 * sizeof (short) / sizeof (int) +   752,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   768,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   784,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   800,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   816,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   832,
+       18 +   512 * sizeof (short) / sizeof (int) +   848,
+       18 +   512 * sizeof (short) / sizeof (int) +   864,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   880,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   896,
+       18 +   512 * sizeof (short) / sizeof (int) +   912,
+       18 +   512 * sizeof (short) / sizeof (int) +   928,
+       18 +   512 * sizeof (short) / sizeof (int) +   944,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   960,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   976,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   992,
+       18 +   512 * sizeof (short) / sizeof (int) +  1008,
+       18 +   512 * sizeof (short) / sizeof (int) +  1024,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +  1040,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +  1056,
+       18 +   512 * sizeof (short) / sizeof (int) +  1072,
+       18 +   512 * sizeof (short) / sizeof (int) +  1088,
+       18 +   512 * sizeof (short) / sizeof (int) +  1104,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +  1120,
+       18 +   512 * sizeof (short) / sizeof (int) +  1136,
+       18 +   512 * sizeof (short) / sizeof (int) +  1152,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +  1168,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +   272,
+       18 +   512 * sizeof (short) / sizeof (int) +  1184
+  },
+  {
+    0x00000000U, 0xFC00FFFEU, 0xF8000001U, 0x78000001U,
+    0x00000000U, 0xFBDFFBFFU, 0x00800000U, 0x00800000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFC003CU, 0xFFFFAFE0U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFDFU, 0x4020FFFFU,
+    0x000000B0U, 0x00000000U, 0x00000000U, 0x00400000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x000003FCU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFC000000U, 0x00000000U,
+    0xFFFEE600U, 0xFFFFFFFFU, 0x000000FFU, 0x00180000U,
+    0xFFFFFFFFU, 0x00000000U, 0xFFFFF800U, 0x00013C00U,
+    0x00000000U, 0x00000000U, 0xFFD00000U, 0x60003F9FU,
+    0x0002BFFFU, 0xFFFF0000U, 0x000007FFU, 0x00000000U,
+    0x00000000U, 0x0001FFC0U, 0x00000000U, 0xE3CFF800U,
+    0xFBC00000U, 0x7FFF3EEFU, 0x4E000000U, 0x00000000U,
+    0xFF830100U, 0x00000000U, 0xFFFFFC00U, 0xFFFFFFFFU,
+    0x0000000FU, 0xDC000000U, 0x00FEFFFFU, 0x0001003CU,
+    0x0000000EU, 0xD0000000U, 0x0080399FU, 0x6FFC000CU,
+    0x0000000EU, 0xD0000000U, 0x00023987U, 0x00630000U,
+    0x0000000EU, 0xD0000000U, 0x00003BBFU, 0xFC03000CU,
+    0x0000000EU, 0xD0000000U, 0x00E0399FU, 0x00FD000CU,
+    0x00000004U, 0xC0000000U, 0x00803DC7U, 0x07FF0000U,
+    0x0000001FU, 0xD0000000U, 0x00603DDFU, 0xFF80000CU,
+    0x0000001EU, 0xD0000000U, 0x00603DDFU, 0x0008000CU,
+    0x0000000FU, 0xD8000000U, 0x7F80BDDFU, 0x03FF000CU,
+    0x0000000EU, 0x00000000U, 0xFF5F8400U, 0x001C0000U,
+    0x00000000U, 0x80008000U, 0x0C008040U, 0x00000000U,
+    0x00000000U, 0x1FF20000U, 0x00007F00U, 0x00000000U,
+    0xFFFFFFFEU, 0xFFFFFC00U, 0x00000000U, 0xFFFE0000U,
+    0xFEFFE0FFU, 0xDFFFFFFFU, 0x07FFDFFFU, 0x00000000U,
+    0x00000000U, 0x7FFFF800U, 0xC3C0FC00U, 0x001E3F9DU,
+    0xFC00BFFCU, 0x00000000U, 0x00000000U, 0x08000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xE0000000U, 0x1FFFFFFFU,
+    0x03FF0000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00006000U,
+    0x18000000U, 0x00000000U, 0x00000000U, 0x00003800U,
+    0x003C0000U, 0x007C0000U, 0x000C0000U, 0x000C0000U,
+    0x00000000U, 0xFFF00000U, 0x2F7FFFFFU, 0x03FF0000U,
+    0x0000FFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000060U, 0x00000200U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x0FFF0FFFU, 0x00000031U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xC4000000U, 0xFFFFFFFFU,
+    0xCF800000U, 0x00000000U, 0x7FE00000U, 0x9FFFFFFFU,
+    0x00000000U, 0xFFFF3F7FU, 0x00007FFFU, 0x00000000U,
+    0x0000001FU, 0xFFF00000U, 0xFC00C01FU, 0xFFFFFFFFU,
+    0x00000007U, 0x00003FFEU, 0x00000000U, 0xF00FFFC0U,
+    0x00000000U, 0xF8FFFFF0U, 0x00000000U, 0xC0000000U,
+    0x00000000U, 0x00000000U, 0xFFFF00FFU, 0x039021FFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xA0000000U, 0xE000E003U, 0x6000E000U,
+    0xFFFFF880U, 0xFFFFFCFFU, 0x7FFFFFFFU, 0x7FF1FFDFU,
+    0x00007FFFU, 0xFFFFFFFFU, 0xFFFF0001U, 0x0001FFFFU,
+    0xC1D0037BU, 0x0C0040AFU, 0xFFFFBC1FU, 0x00000000U,
+    0xFFFF0E00U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x000003FFU, 0x000007FFU, 0xFFFFFFFFU,
+    0x0FFFFFFFU, 0x00000000U, 0x00000000U, 0xFFFFFC00U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFCFFFFFU,
+    0xFFBFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFE0387E0U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x80010000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFF7FFFU, 0x3FFFFFFFU, 0x00000000U,
+    0xFBFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0xFFFF0000U,
+    0xFFFFFF1EU, 0xE0C1FC01U, 0x00000000U, 0x00000000U,
+    0x1E000000U, 0x00000001U, 0x00000000U, 0x08000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0x00000000U, 0xFFFFFFFFU, 0x0000803FU,
+    0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0xFFFFFFFFU, 0x0000007FU, 0xC0000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0000E000U, 0x00000000U, 0x00000000U, 0x7FFF8000U,
+    0xC0000000U, 0x00000000U, 0x00000000U, 0x00FF0000U,
+    0x007FFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
+    0x00000600U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000844U, 0x03FF1FF8U, 0x00000000U, 0x00F00000U,
+    0x00000003U, 0xFFF00000U, 0x0000C03FU, 0x9703FFFFU,
+    0x00000000U, 0x0000FFC0U, 0x800FFF80U, 0x00000000U,
+    0x0000000FU, 0xFFF80000U, 0xC0003FFFU, 0x00000020U,
+    0x00000000U, 0x007FFE00U, 0xF0003008U, 0x3B800000U,
+    0x00000000U, 0xC19D0000U, 0xC0000002U, 0x0063F800U,
+    0x00000000U, 0x00000000U, 0x08000000U, 0x00000C00U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00003FF8U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x40000000U, 0x00000200U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFC0000U, 0x00000007U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xC0000000U, 0x0000FFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00008000U, 0xF0000000U,
+    0x03FFFFFFU, 0xFFFFFFFFU, 0xFFF7FFFFU, 0x00000F7FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x80000000U,
+    0xFC00FFFEU, 0xF8000001U, 0xF8000001U, 0x0000003FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x3E007F7FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFF87U, 0xFF8FFFFFU, 0x00000000U, 0xFFE00000U,
+    0x1FFF7FFFU, 0x00000001U, 0xFFFF0000U, 0x3FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0FFFFFFFU,
+    0x00000000U, 0x0000000FU, 0x00000000U, 0x07C00000U,
+    0x80000000U, 0x00000000U, 0x00010000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00008000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFF800000U, 0xFF800000U,
+    0x00000000U, 0x0000FF80U, 0x00000000U, 0xF8000000U,
+    0x8FC00000U, 0x80000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x30000000U, 0xFFFCFFFFU, 0xFFFFFFFFU,
+    0x0000F06EU, 0x87000000U, 0x01FF01FFU, 0xE0000000U,
+    0xE0000000U, 0x00000000U, 0x00000100U, 0x007FF860U,
+    0x00000000U, 0xFE000000U, 0xFF000000U, 0xFF000000U,
+    0x1E000000U, 0x0000FE00U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFC000000U,
+    0x00000000U, 0x000000F0U, 0x00000000U, 0x00007E00U,
+    0x0000C000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x7FFFFFFFU,
+    0x00000000U, 0x00003800U, 0x00000000U, 0xF0000000U,
+    0xE0000000U, 0x0000007FU, 0x03FFFFC0U, 0x00000000U,
+    0x000003FCU, 0x00000000U, 0x00000FE0U, 0x00000000U,
+    0x00000007U, 0xFF000000U, 0xFFFC3FFFU, 0x8019003FU,
+    0x00000007U, 0xFFFF0000U, 0x00002007U, 0x00000000U,
+    0x00000007U, 0x001FFF80U, 0x0000006FU, 0x00380000U,
+    0x00000007U, 0xFFF80000U, 0xE800FFE1U, 0x001FFFFEU,
+    0x00000000U, 0x7FFFF000U, 0x00000002U, 0x00000000U,
+    0x00000000U, 0x00000200U, 0x80000000U, 0x000007FFU,
+    0x0000000FU, 0xD8000000U, 0x0080399FU, 0x001F1FCCU,
+    0x00000000U, 0xFF000000U, 0x01B5F7A5U, 0x00000006U,
+    0x00000000U, 0xFFE00000U, 0x6C00F87FU, 0x00000000U,
+    0x00000000U, 0xFFFF0000U, 0x0000004FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFF3F8000U, 0x30FFFFFFU, 0x00000000U,
+    0x00000000U, 0xFFFF0000U, 0x0000000FU, 0x00001FFFU,
+    0x00000000U, 0x02FFF800U, 0x00000000U, 0x00000000U,
+    0xE0000000U, 0xFC000FFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x0FFFF000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0007FC00U,
+    0x00000000U, 0x79BF0000U, 0x0000007DU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFCFE0000U, 0x00000015U,
+    0x000007FEU, 0xFBF80000U, 0x0FFE00FFU, 0x00000000U,
+    0xDFFFFC00U, 0x00000007U, 0x00000000U, 0x00000000U,
+    0x000003FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000002U,
+    0x00000000U, 0xFF7F8000U, 0xFC00003EU, 0x00031FFFU,
+    0xFFFC0000U, 0x007FFEFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xB47E0000U, 0x000000BFU, 0x00000000U,
+    0x00FB7C00U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x01F80000U,
+    0x0000000BU, 0xC7F00000U, 0x0400FFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x8003FFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x001F0000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00060000U,
+    0x00000000U, 0xFFFF0000U, 0x003FFF81U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xC0000000U, 0x0000FFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0000C000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x003F0000U,
+    0x00000000U, 0xFFFF0000U, 0xF8000030U, 0x00000003U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0000E000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x07FFFFFFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFE8000U, 0xFFFFFFFFU,
+    0x000780FFU, 0x00000000U, 0x00000000U, 0x00030014U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xF0000000U, 0x0000000FU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x000FFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF3FFFU, 0xFFFF007FU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000000FU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFE7FU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x000007FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000003FU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x000FFFFFU, 0x000FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x007FFFFFU, 0x01FFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x08000002U, 0x08000000U,
+    0x00200000U, 0x00200000U, 0x00008000U, 0x00008000U,
+    0x00000200U, 0x00000200U, 0x00000008U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xF8000FFFU, 0x0000FFFEU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xF9FFFF7FU, 0x000007DBU, 0x00000000U, 0x00000000U,
+    0x00008000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x007F0000U, 0x00008000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00004000U, 0x00000000U, 0x8000F000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0000F000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x8000C000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x007FFF80U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xC00007F0U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xFFFE0000U,
+    0xFFFFFFFFU, 0x001FFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFEU, 0x3FFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00030000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFF0FFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x000FFFFFU, 0xFFFE7FFFU, 0xFFFEFFFEU, 0x003FFFFFU,
+    0x0000FFFFU, 0x0000E000U, 0x0000FC00U, 0x0000FC00U,
+    0xFFFFF800U, 0x00003FDFU, 0x00000000U, 0x00000000U,
+    0xFFFF0007U, 0x0FFFFFFFU, 0x000301FFU, 0x0000003FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xF0FFFFFFU, 0x1FFF1FFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xF87FFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x03FFFFFFU, 0x00010FFFU,
+    0xFFFF0FFFU, 0xFFFFFFFFU, 0x03FF00FFU, 0xFFFFFFFFU,
+    0xFFFF00FFU, 0x0FFF3FFFU, 0x00000003U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x000FFFFFU, 0x1FFF3FFFU,
+    0xFFFF83FFU, 0xFFFFFFFFU, 0x9FFFC07FU, 0x01FF03FFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFF7FFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0x00000002U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x3FFFFFFFU
+  }
+};
diff --git a/gl/unictype/ctype_space.c b/gl/unictype/ctype_space.c
new file mode 100644
index 00000000..4c032398
--- /dev/null
+++ b/gl/unictype/ctype_space.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_space table.  */
+#include "ctype_space.h"
+
+bool
+uc_is_space (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_space, uc);
+}
diff --git a/gl/unictype/ctype_space.h b/gl/unictype/ctype_space.h
new file mode 100644
index 00000000..93ed2467
--- /dev/null
+++ b/gl/unictype/ctype_space.h
@@ -0,0 +1,184 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[1];
+    short level2[1 << 7];
+    unsigned int level3[4 << 4];
+  }
+u_is_space =
+{
+  { 1 },
+  {     2 * sizeof (int) / sizeof (short) +     0 },
+  {
+        2 +   128 * sizeof (short) / sizeof (int) +     0,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        2 +   128 * sizeof (short) / sizeof (int) +    16,
+       -1,
+       -1,
+       -1,
+       -1,
+        2 +   128 * sizeof (short) / sizeof (int) +    32,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        2 +   128 * sizeof (short) / sizeof (int) +    48,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0x00003E00U, 0x00000001U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0000077FU, 0x00000300U, 0x80000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000001U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unictype/ctype_upper.c b/gl/unictype/ctype_upper.c
new file mode 100644
index 00000000..af2c3fe6
--- /dev/null
+++ b/gl/unictype/ctype_upper.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_upper table.  */
+#include "ctype_upper.h"
+
+bool
+uc_is_upper (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_upper, uc);
+}
diff --git a/gl/unictype/ctype_upper.h b/gl/unictype/ctype_upper.h
new file mode 100644
index 00000000..ef527809
--- /dev/null
+++ b/gl/unictype/ctype_upper.h
@@ -0,0 +1,367 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[2];
+    short level2[2 << 7];
+    unsigned int level3[17 << 4];
+  }
+u_is_upper =
+{
+  { 2 },
+  {
+        3 * sizeof (int) / sizeof (short) +     0,
+        3 * sizeof (int) / sizeof (short) +   128
+  },
+  {
+        3 +   256 * sizeof (short) / sizeof (int) +     0,
+        3 +   256 * sizeof (short) / sizeof (int) +    16,
+        3 +   256 * sizeof (short) / sizeof (int) +    32,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +    48,
+        3 +   256 * sizeof (short) / sizeof (int) +    64,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +    80,
+        3 +   256 * sizeof (short) / sizeof (int) +    96,
+        3 +   256 * sizeof (short) / sizeof (int) +   112,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   128,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   144,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   160,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   176,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   192,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   208,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   224,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   240,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        3 +   256 * sizeof (short) / sizeof (int) +   256,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0x00000000U, 0x00000000U, 0x07FFFFFEU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x7F7FFFFFU, 0x00000000U,
+    0x55555555U, 0xAA555555U, 0x555554AAU, 0x2B555555U,
+    0xB1DBCED6U, 0x11AED2D5U, 0x4AAAADB0U, 0x55D65555U,
+    0x55555555U, 0x6C055555U, 0x0000557AU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x80450000U,
+    0xFFFED740U, 0x00000FFBU, 0x55008000U, 0xE6905555U,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0x55555555U,
+    0x55555401U, 0x55555555U, 0x55552AABU, 0x55555555U,
+    0x55555555U, 0xFFFE5555U, 0x007FFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0x000020BFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0200U, 0xE7FFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x55555555U, 0x55555555U, 0x55555555U, 0x55555555U,
+    0x40155555U, 0x55555555U, 0x55555555U, 0x55555555U,
+    0x3F00FF00U, 0xFF00FF00U, 0xAA003F00U, 0x0000FF00U,
+    0xFF00FF00U, 0x1F00FF00U, 0x0F001F00U, 0x1F001F00U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00040C40U, 0x00000000U, 0x0000FFFFU,
+    0x00000008U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFC00000U, 0x0000FFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U, 0xC025EA9DU,
+    0x55555555U, 0x55555555U, 0x55555555U, 0x00042805U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x55555555U, 0x00001555U,
+    0x05555555U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x55545554U, 0x55555555U, 0x6A005555U,
+    0x55452855U, 0x555F7D55U, 0x15411AF5U, 0x00200000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x07FFFFFEU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x000000FFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFF0000U, 0x000FFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0xF7FF0000U,
+    0x0037F7FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x0007FFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFF0000U, 0x0000003FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0xFFFFFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0x00000003U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unictype/ctype_xdigit.c b/gl/unictype/ctype_xdigit.c
new file mode 100644
index 00000000..ee4b2ea4
--- /dev/null
+++ b/gl/unictype/ctype_xdigit.c
@@ -0,0 +1,32 @@
+/* ISO C <ctype.h> like properties of Unicode characters.
+   Copyright (C) 2002, 2006-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "unictype.h"
+
+#include "bitmap.h"
+
+/* Define u_is_xdigit table.  */
+#include "ctype_xdigit.h"
+
+bool
+uc_is_xdigit (ucs4_t uc)
+{
+  return bitmap_lookup (&u_is_xdigit, uc);
+}
diff --git a/gl/unictype/ctype_xdigit.h b/gl/unictype/ctype_xdigit.h
new file mode 100644
index 00000000..c0b2ac05
--- /dev/null
+++ b/gl/unictype/ctype_xdigit.h
@@ -0,0 +1,172 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* ISO C <ctype.h> like properties of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[1];
+    short level2[1 << 7];
+    unsigned int level3[1 << 4];
+  }
+u_is_xdigit =
+{
+  { 1 },
+  {     2 * sizeof (int) / sizeof (short) +     0 },
+  {
+        2 +   128 * sizeof (short) / sizeof (int) +     0,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1
+  },
+  {
+    0x00000000U, 0x03FF0000U, 0x0000007EU, 0x0000007EU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/uninorm.h b/gl/uninorm.h
new file mode 100644
index 00000000..f6815c49
--- /dev/null
+++ b/gl/uninorm.h
@@ -0,0 +1,256 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Normalization forms (composition and decomposition) of Unicode strings.
+   Copyright (C) 2001-2002, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNINORM_H
+#define _UNINORM_H
+
+/* Get size_t.  */
+#include <stddef.h>
+
+#include "unitypes.h"
+
+#if 0
+# include <unistring/woe32dll.h>
+#else
+# define LIBUNISTRING_DLL_VARIABLE
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Conventions:
+
+   All functions prefixed with u8_ operate on UTF-8 encoded strings.
+   Their unit is an uint8_t (1 byte).
+
+   All functions prefixed with u16_ operate on UTF-16 encoded strings.
+   Their unit is an uint16_t (a 2-byte word).
+
+   All functions prefixed with u32_ operate on UCS-4 encoded strings.
+   Their unit is an uint32_t (a 4-byte word).
+
+   All argument pairs (s, n) denote a Unicode string s[0..n-1] with exactly
+   n units.
+
+   Functions returning a string result take a (resultbuf, lengthp) argument
+   pair.  If resultbuf is not NULL and the result fits into *lengthp units,
+   it is put in resultbuf, and resultbuf is returned.  Otherwise, a freshly
+   allocated string is returned.  In both cases, *lengthp is set to the
+   length (number of units) of the returned string.  In case of error,
+   NULL is returned and errno is set.  */
+
+
+enum
+{
+  UC_DECOMP_CANONICAL,/*            Canonical decomposition.                  */
+  UC_DECOMP_FONT,    /*   <font>    A font variant (e.g. a blackletter form). */
+  UC_DECOMP_NOBREAK, /* <noBreak>   A no-break version of a space or hyphen.  */
+  UC_DECOMP_INITIAL, /* <initial>   An initial presentation form (Arabic).    */
+  UC_DECOMP_MEDIAL,  /*  <medial>   A medial presentation form (Arabic).      */
+  UC_DECOMP_FINAL,   /*  <final>    A final presentation form (Arabic).       */
+  UC_DECOMP_ISOLATED,/* <isolated>  An isolated presentation form (Arabic).   */
+  UC_DECOMP_CIRCLE,  /*  <circle>   An encircled form.                        */
+  UC_DECOMP_SUPER,   /*  <super>    A superscript form.                       */
+  UC_DECOMP_SUB,     /*   <sub>     A subscript form.                         */
+  UC_DECOMP_VERTICAL,/* <vertical>  A vertical layout presentation form.      */
+  UC_DECOMP_WIDE,    /*   <wide>    A wide (or zenkaku) compatibility character. */
+  UC_DECOMP_NARROW,  /*  <narrow>   A narrow (or hankaku) compatibility character. */
+  UC_DECOMP_SMALL,   /*  <small>    A small variant form (CNS compatibility). */
+  UC_DECOMP_SQUARE,  /*  <square>   A CJK squared font variant.               */
+  UC_DECOMP_FRACTION,/* <fraction>  A vulgar fraction form.                   */
+  UC_DECOMP_COMPAT   /*  <compat>   Otherwise unspecified compatibility character. */
+};
+
+/* Maximum size of decomposition of a single Unicode character.  */
+#define UC_DECOMPOSITION_MAX_LENGTH 32
+
+/* Return the character decomposition mapping of a Unicode character.
+   DECOMPOSITION must point to an array of at least UC_DECOMPOSITION_MAX_LENGTH
+   ucs_t elements.
+   When a decomposition exists, DECOMPOSITION[0..N-1] and *DECOMP_TAG are
+   filled and N is returned.  Otherwise -1 is returned.  */
+extern int
+       uc_decomposition (ucs4_t uc, int *decomp_tag, ucs4_t *decomposition);
+
+/* Return the canonical character decomposition mapping of a Unicode character.
+   DECOMPOSITION must point to an array of at least UC_DECOMPOSITION_MAX_LENGTH
+   ucs_t elements.
+   When a decomposition exists, DECOMPOSITION[0..N-1] is filled and N is
+   returned.  Otherwise -1 is returned.  */
+extern int
+       uc_canonical_decomposition (ucs4_t uc, ucs4_t *decomposition);
+
+
+/* Attempt to combine the Unicode characters uc1, uc2.
+   uc1 is known to have canonical combining class 0.
+   Return the combination of uc1 and uc2, if it exists.
+   Return 0 otherwise.
+   Not all decompositions can be recombined using this function.  See the
+   Unicode file CompositionExclusions.txt for details.  */
+extern ucs4_t
+       uc_composition (ucs4_t uc1, ucs4_t uc2)
+       _UC_ATTRIBUTE_CONST;
+
+
+/* An object of type uninorm_t denotes a Unicode normalization form.  */
+struct unicode_normalization_form;
+typedef const struct unicode_normalization_form *uninorm_t;
+
+/* UNINORM_NFD: Normalization form D: canonical decomposition.  */
+extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form uninorm_nfd;
+#define UNINORM_NFD (&uninorm_nfd)
+
+/* UNINORM_NFC: Normalization form C: canonical decomposition, then
+   canonical composition.  */
+extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form uninorm_nfc;
+#define UNINORM_NFC (&uninorm_nfc)
+
+/* UNINORM_NFKD: Normalization form KD: compatibility decomposition.  */
+extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form uninorm_nfkd;
+#define UNINORM_NFKD (&uninorm_nfkd)
+
+/* UNINORM_NFKC: Normalization form KC: compatibility decomposition, then
+   canonical composition.  */
+extern LIBUNISTRING_DLL_VARIABLE const struct unicode_normalization_form uninorm_nfkc;
+#define UNINORM_NFKC (&uninorm_nfkc)
+
+/* Test whether a normalization form does compatibility decomposition.  */
+#define uninorm_is_compat_decomposing(nf) \
+  ((* (const unsigned int *) (nf) >> 0) & 1)
+
+/* Test whether a normalization form includes canonical composition.  */
+#define uninorm_is_composing(nf) \
+  ((* (const unsigned int *) (nf) >> 1) & 1)
+
+/* Return the decomposing variant of a normalization form.
+   This maps NFC,NFD -> NFD and NFKC,NFKD -> NFKD.  */
+extern uninorm_t
+       uninorm_decomposing_form (uninorm_t nf)
+       _UC_ATTRIBUTE_PURE;
+
+
+/* Return the specified normalization form of a string.  */
+extern uint8_t *
+       u8_normalize (uninorm_t nf, const uint8_t *s, size_t n,
+                     uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_normalize (uninorm_t nf, const uint16_t *s, size_t n,
+                      uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_normalize (uninorm_t nf, const uint32_t *s, size_t n,
+                      uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+
+/* Compare S1 and S2, ignoring differences in normalization.
+   NF must be either UNINORM_NFD or UNINORM_NFKD.
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_normcmp (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2,
+                   uninorm_t nf, int *resultp);
+extern int
+       u16_normcmp (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2,
+                    uninorm_t nf, int *resultp);
+extern int
+       u32_normcmp (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2,
+                    uninorm_t nf, int *resultp);
+
+
+/* Converts the string S of length N to a NUL-terminated byte sequence, in such
+   a way that comparing uN_normxfrm (S1) and uN_normxfrm (S2) with uN_cmp2() is
+   equivalent to comparing S1 and S2 with uN_normcoll().
+   NF must be either UNINORM_NFC or UNINORM_NFKC.  */
+extern char *
+       u8_normxfrm (const uint8_t *s, size_t n, uninorm_t nf,
+                    char *resultbuf, size_t *lengthp);
+extern char *
+       u16_normxfrm (const uint16_t *s, size_t n, uninorm_t nf,
+                     char *resultbuf, size_t *lengthp);
+extern char *
+       u32_normxfrm (const uint32_t *s, size_t n, uninorm_t nf,
+                     char *resultbuf, size_t *lengthp);
+
+
+/* Compare S1 and S2, ignoring differences in normalization, using the
+   collation rules of the current locale.
+   NF must be either UNINORM_NFC or UNINORM_NFKC.
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_normcoll (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2,
+                    uninorm_t nf, int *resultp);
+extern int
+       u16_normcoll (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2,
+                     uninorm_t nf, int *resultp);
+extern int
+       u32_normcoll (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2,
+                     uninorm_t nf, int *resultp);
+
+
+/* Normalization of a stream of Unicode characters.
+
+   A "stream of Unicode characters" is essentially a function that accepts an
+   ucs4_t argument repeatedly, optionally combined with a function that
+   "flushes" the stream.  */
+
+/* Data type of a stream of Unicode characters that normalizes its input
+   according to a given normalization form and passes the normalized character
+   sequence to the encapsulated stream of Unicode characters.  */
+struct uninorm_filter;
+
+/* Bring data buffered in the filter to its destination, the encapsulated
+   stream, then close and free the filter.
+   Return 0 if successful, or -1 with errno set upon failure.  */
+extern int
+       uninorm_filter_free (struct uninorm_filter *filter);
+
+/* Create and return a normalization filter for Unicode characters.
+   The pair (stream_func, stream_data) is the encapsulated stream.
+   stream_func (stream_data, uc) receives the Unicode character uc
+   and returns 0 if successful, or -1 with errno set upon failure.
+   Return the new filter, or NULL with errno set upon failure.  */
+extern struct uninorm_filter *
+       uninorm_filter_create (uninorm_t nf,
+                              int (*stream_func) (void *stream_data, ucs4_t uc),
+                              void *stream_data)
+       _GL_ATTRIBUTE_DEALLOC (uninorm_filter_free, 1);
+
+/* Stuff a Unicode character into a normalizing filter.
+   Return 0 if successful, or -1 with errno set upon failure.  */
+extern int
+       uninorm_filter_write (struct uninorm_filter *filter, ucs4_t uc);
+
+/* Bring data buffered in the filter to its destination, the encapsulated
+   stream.
+   Return 0 if successful, or -1 with errno set upon failure.
+   Note! If after calling this function, additional characters are written
+   into the filter, the resulting character sequence in the encapsulated stream
+   will not necessarily be normalized.  */
+extern int
+       uninorm_filter_flush (struct uninorm_filter *filter);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _UNINORM_H */
diff --git a/gl/uninorm.in.h b/gl/uninorm.in.h
new file mode 100644
index 00000000..76ab32b6
--- /dev/null
+++ b/gl/uninorm.in.h
@@ -0,0 +1,255 @@
+/* Normalization forms (composition and decomposition) of Unicode strings.
+   Copyright (C) 2001-2002, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2009.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNINORM_H
+#define _UNINORM_H
+
+/* Get size_t.  */
+#include <stddef.h>
+
+#include "unitypes.h"
+
+#if @HAVE_UNISTRING_WOE32DLL_H@
+# include <unistring/woe32dll.h>
+#else
+# define LIBUNISTRING_DLL_VARIABLE
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Conventions:
+
+   All functions prefixed with u8_ operate on UTF-8 encoded strings.
+   Their unit is an uint8_t (1 byte).
+
+   All functions prefixed with u16_ operate on UTF-16 encoded strings.
+   Their unit is an uint16_t (a 2-byte word).
+
+   All functions prefixed with u32_ operate on UCS-4 encoded strings.
+   Their unit is an uint32_t (a 4-byte word).
+
+   All argument pairs (s, n) denote a Unicode string s[0..n-1] with exactly
+   n units.
+
+   Functions returning a string result take a (resultbuf, lengthp) argument
+   pair.  If resultbuf is not NULL and the result fits into *lengthp units,
+   it is put in resultbuf, and resultbuf is returned.  Otherwise, a freshly
+   allocated string is returned.  In both cases, *lengthp is set to the
+   length (number of units) of the returned string.  In case of error,
+   NULL is returned and errno is set.  */
+
+
+enum
+{
+  UC_DECOMP_CANONICAL,/*            Canonical decomposition.                  */
+  UC_DECOMP_FONT,    /*   <font>    A font variant (e.g. a blackletter form). */
+  UC_DECOMP_NOBREAK, /* <noBreak>   A no-break version of a space or hyphen.  */
+  UC_DECOMP_INITIAL, /* <initial>   An initial presentation form (Arabic).    */
+  UC_DECOMP_MEDIAL,  /*  <medial>   A medial presentation form (Arabic).      */
+  UC_DECOMP_FINAL,   /*  <final>    A final presentation form (Arabic).       */
+  UC_DECOMP_ISOLATED,/* <isolated>  An isolated presentation form (Arabic).   */
+  UC_DECOMP_CIRCLE,  /*  <circle>   An encircled form.                        */
+  UC_DECOMP_SUPER,   /*  <super>    A superscript form.                       */
+  UC_DECOMP_SUB,     /*   <sub>     A subscript form.                         */
+  UC_DECOMP_VERTICAL,/* <vertical>  A vertical layout presentation form.      */
+  UC_DECOMP_WIDE,    /*   <wide>    A wide (or zenkaku) compatibility character. */
+  UC_DECOMP_NARROW,  /*  <narrow>   A narrow (or hankaku) compatibility character. */
+  UC_DECOMP_SMALL,   /*  <small>    A small variant form (CNS compatibility). */
+  UC_DECOMP_SQUARE,  /*  <square>   A CJK squared font variant.               */
+  UC_DECOMP_FRACTION,/* <fraction>  A vulgar fraction form.                   */
+  UC_DECOMP_COMPAT   /*  <compat>   Otherwise unspecified compatibility character. */
+};
+
+/* Maximum size of decomposition of a single Unicode character.  */
+#define UC_DECOMPOSITION_MAX_LENGTH 32
+
+/* Return the character decomposition mapping of a Unicode character.
+   DECOMPOSITION must point to an array of at least UC_DECOMPOSITION_MAX_LENGTH
+   ucs_t elements.
+   When a decomposition exists, DECOMPOSITION[0..N-1] and *DECOMP_TAG are
+   filled and N is returned.  Otherwise -1 is returned.  */
+extern int
+       uc_decomposition (ucs4_t uc, int *decomp_tag, ucs4_t *decomposition);
+
+/* Return the canonical character decomposition mapping of a Unicode character.
+   DECOMPOSITION must point to an array of at least UC_DECOMPOSITION_MAX_LENGTH
+   ucs_t elements.
+   When a decomposition exists, DECOMPOSITION[0..N-1] is filled and N is
+   returned.  Otherwise -1 is returned.  */
+extern int
+       uc_canonical_decomposition (ucs4_t uc, ucs4_t *decomposition);
+
+
+/* Attempt to combine the Unicode characters uc1, uc2.
+   uc1 is known to have canonical combining class 0.
+   Return the combination of uc1 and uc2, if it exists.
+   Return 0 otherwise.
+   Not all decompositions can be recombined using this function.  See the
+   Unicode file CompositionExclusions.txt for details.  */
+extern ucs4_t
+       uc_composition (ucs4_t uc1, ucs4_t uc2)
+       _UC_ATTRIBUTE_CONST;
+
+
+/* An object of type uninorm_t denotes a Unicode normalization form.  */
+struct unicode_normalization_form;
+typedef const struct unicode_normalization_form *uninorm_t;
+
+/* UNINORM_NFD: Normalization form D: canonical decomposition.  */
+extern @GNULIB_UNINORM_NFD_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfd;
+#define UNINORM_NFD (&uninorm_nfd)
+
+/* UNINORM_NFC: Normalization form C: canonical decomposition, then
+   canonical composition.  */
+extern @GNULIB_UNINORM_NFC_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfc;
+#define UNINORM_NFC (&uninorm_nfc)
+
+/* UNINORM_NFKD: Normalization form KD: compatibility decomposition.  */
+extern @GNULIB_UNINORM_NFKD_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfkd;
+#define UNINORM_NFKD (&uninorm_nfkd)
+
+/* UNINORM_NFKC: Normalization form KC: compatibility decomposition, then
+   canonical composition.  */
+extern @GNULIB_UNINORM_NFKC_DLL_VARIABLE@ const struct unicode_normalization_form uninorm_nfkc;
+#define UNINORM_NFKC (&uninorm_nfkc)
+
+/* Test whether a normalization form does compatibility decomposition.  */
+#define uninorm_is_compat_decomposing(nf) \
+  ((* (const unsigned int *) (nf) >> 0) & 1)
+
+/* Test whether a normalization form includes canonical composition.  */
+#define uninorm_is_composing(nf) \
+  ((* (const unsigned int *) (nf) >> 1) & 1)
+
+/* Return the decomposing variant of a normalization form.
+   This maps NFC,NFD -> NFD and NFKC,NFKD -> NFKD.  */
+extern uninorm_t
+       uninorm_decomposing_form (uninorm_t nf)
+       _UC_ATTRIBUTE_PURE;
+
+
+/* Return the specified normalization form of a string.  */
+extern uint8_t *
+       u8_normalize (uninorm_t nf, const uint8_t *s, size_t n,
+                     uint8_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint16_t *
+       u16_normalize (uninorm_t nf, const uint16_t *s, size_t n,
+                      uint16_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+extern uint32_t *
+       u32_normalize (uninorm_t nf, const uint32_t *s, size_t n,
+                      uint32_t *_UC_RESTRICT resultbuf, size_t *lengthp);
+
+
+/* Compare S1 and S2, ignoring differences in normalization.
+   NF must be either UNINORM_NFD or UNINORM_NFKD.
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_normcmp (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2,
+                   uninorm_t nf, int *resultp);
+extern int
+       u16_normcmp (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2,
+                    uninorm_t nf, int *resultp);
+extern int
+       u32_normcmp (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2,
+                    uninorm_t nf, int *resultp);
+
+
+/* Converts the string S of length N to a NUL-terminated byte sequence, in such
+   a way that comparing uN_normxfrm (S1) and uN_normxfrm (S2) with uN_cmp2() is
+   equivalent to comparing S1 and S2 with uN_normcoll().
+   NF must be either UNINORM_NFC or UNINORM_NFKC.  */
+extern char *
+       u8_normxfrm (const uint8_t *s, size_t n, uninorm_t nf,
+                    char *resultbuf, size_t *lengthp);
+extern char *
+       u16_normxfrm (const uint16_t *s, size_t n, uninorm_t nf,
+                     char *resultbuf, size_t *lengthp);
+extern char *
+       u32_normxfrm (const uint32_t *s, size_t n, uninorm_t nf,
+                     char *resultbuf, size_t *lengthp);
+
+
+/* Compare S1 and S2, ignoring differences in normalization, using the
+   collation rules of the current locale.
+   NF must be either UNINORM_NFC or UNINORM_NFKC.
+   If successful, set *RESULTP to -1 if S1 < S2, 0 if S1 = S2, 1 if S1 > S2, and
+   return 0.  Upon failure, return -1 with errno set.  */
+extern int
+       u8_normcoll (const uint8_t *s1, size_t n1, const uint8_t *s2, size_t n2,
+                    uninorm_t nf, int *resultp);
+extern int
+       u16_normcoll (const uint16_t *s1, size_t n1, const uint16_t *s2, size_t n2,
+                     uninorm_t nf, int *resultp);
+extern int
+       u32_normcoll (const uint32_t *s1, size_t n1, const uint32_t *s2, size_t n2,
+                     uninorm_t nf, int *resultp);
+
+
+/* Normalization of a stream of Unicode characters.
+
+   A "stream of Unicode characters" is essentially a function that accepts an
+   ucs4_t argument repeatedly, optionally combined with a function that
+   "flushes" the stream.  */
+
+/* Data type of a stream of Unicode characters that normalizes its input
+   according to a given normalization form and passes the normalized character
+   sequence to the encapsulated stream of Unicode characters.  */
+struct uninorm_filter;
+
+/* Bring data buffered in the filter to its destination, the encapsulated
+   stream, then close and free the filter.
+   Return 0 if successful, or -1 with errno set upon failure.  */
+extern int
+       uninorm_filter_free (struct uninorm_filter *filter);
+
+/* Create and return a normalization filter for Unicode characters.
+   The pair (stream_func, stream_data) is the encapsulated stream.
+   stream_func (stream_data, uc) receives the Unicode character uc
+   and returns 0 if successful, or -1 with errno set upon failure.
+   Return the new filter, or NULL with errno set upon failure.  */
+extern struct uninorm_filter *
+       uninorm_filter_create (uninorm_t nf,
+                              int (*stream_func) (void *stream_data, ucs4_t uc),
+                              void *stream_data)
+       _GL_ATTRIBUTE_DEALLOC (uninorm_filter_free, 1);
+
+/* Stuff a Unicode character into a normalizing filter.
+   Return 0 if successful, or -1 with errno set upon failure.  */
+extern int
+       uninorm_filter_write (struct uninorm_filter *filter, ucs4_t uc);
+
+/* Bring data buffered in the filter to its destination, the encapsulated
+   stream.
+   Return 0 if successful, or -1 with errno set upon failure.
+   Note! If after calling this function, additional characters are written
+   into the filter, the resulting character sequence in the encapsulated stream
+   will not necessarily be normalized.  */
+extern int
+       uninorm_filter_flush (struct uninorm_filter *filter);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* _UNINORM_H */
diff --git a/gl/unistd.c b/gl/unistd.c
index f3b3f7bd..e6625589 100644
--- a/gl/unistd.c
+++ b/gl/unistd.c
@@ -1,6 +1,6 @@
 /* Inline functions for <unistd.h>.
 
-   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+   Copyright (C) 2012-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
 #include <config.h>
 
-#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
 #include <unistd.h>
 typedef int dummy;
diff --git a/gl/unistd.in.h b/gl/unistd.in.h
index b4129663..9f057d30 100644
--- a/gl/unistd.in.h
+++ b/gl/unistd.in.h
@@ -1,5 +1,5 @@
 /* Substitute for and wrapper around <unistd.h>.
-   Copyright (C) 2003-2024 Free Software Foundation, Inc.
+   Copyright (C) 2003-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -69,8 +69,8 @@
 #if !defined _@GUARD_PREFIX@_UNISTD_H && !defined _GL_INCLUDING_WINSOCK2_H
 #define _@GUARD_PREFIX@_UNISTD_H
 
-/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, GNULIB_POSIXCHECK,
-   HAVE_RAW_DECL_*.  */
+/* This file uses _GL_ATTRIBUTE_NODISCARD, _GL_INLINE_HEADER_BEGIN, _GL_INLINE,
+   GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
 #if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
@@ -95,12 +95,24 @@
 # include <stdio.h>
 #endif
 
+/* Native Windows platforms declare _chdir, _getcwd, _rmdir in
+   <io.h> and/or <direct.h>, not in <unistd.h>.
+   They also declare _access(), _chmod(), _close(), _dup(), _dup2(), _isatty(),
+   _lseek(), _read(), _unlink(), _write() in <io.h>.  */
+#if defined _WIN32 && !defined __CYGWIN__
+# include <io.h>
+# include <direct.h>
+#endif
+
+/* FreeBSD 14.0, NetBSD 10.0, OpenBSD 7.5, Solaris 11.4, and glibc 2.41
+   do not define O_CLOEXEC in <unistd.h>.  */
 /* Cygwin 1.7.1 and Android 4.3 declare unlinkat in <fcntl.h>, not in
    <unistd.h>.  */
 /* But avoid namespace pollution on glibc systems.  */
-#if (@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) \
-    && (defined __CYGWIN__ || defined __ANDROID__) \
-    && ! defined __GLIBC__
+#if ! defined O_CLOEXEC \
+    || ((@GNULIB_UNLINKAT@ || defined GNULIB_POSIXCHECK) \
+         && (defined __CYGWIN__ || defined __ANDROID__) \
+         && ! defined __GLIBC__)
 # include <fcntl.h>
 #endif
 
@@ -117,15 +129,6 @@
 # undef __need_system_stdlib_h
 #endif
 
-/* Native Windows platforms declare _chdir, _getcwd, _rmdir in
-   <io.h> and/or <direct.h>, not in <unistd.h>.
-   They also declare _access(), _chmod(), _close(), _dup(), _dup2(), _isatty(),
-   _lseek(), _read(), _unlink(), _write() in <io.h>.  */
-#if defined _WIN32 && !defined __CYGWIN__
-# include <io.h>
-# include <direct.h>
-#endif
-
 /* Native Windows platforms declare _execl*, _execv* in <process.h>.  */
 #if defined _WIN32 && !defined __CYGWIN__
 # include <process.h>
@@ -159,8 +162,9 @@
 #endif
 
 /* MSVC defines off_t in <sys/types.h>.
-   May also define off_t to a 64-bit type on native Windows.  */
-/* Get off_t, ssize_t, mode_t.  */
+   May also define off_t to a 64-bit type on native Windows.
+   Also defines off64_t on macOS, NetBSD, OpenBSD, MSVC, Cygwin, Haiku.  */
+/* Get off_t, off64_t, ssize_t, mode_t.  */
 #include <sys/types.h>
 
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
@@ -180,6 +184,9 @@ _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_UNISTD_INLINE
 # define _GL_UNISTD_INLINE _GL_INLINE
 #endif
+#ifndef _GL_GETPAGESIZE_INLINE
+# define _GL_GETPAGESIZE_INLINE _GL_INLINE
+#endif
 
 /* Hide some function declarations from <winsock2.h>.  */
 
@@ -286,7 +293,7 @@ _GL_INLINE_HEADER_BEGIN
 #   undef access
 #   define access rpl_access
 #  endif
-_GL_FUNCDECL_RPL (access, int, (const char *file, int mode)
+_GL_FUNCDECL_RPL (access, int, (const char *file, int mode),
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (access, int, (const char *file, int mode));
 # elif defined _WIN32 && !defined __CYGWIN__
@@ -339,7 +346,7 @@ _GL_CXXALIASWARN (chdir);
 #elif defined GNULIB_POSIXCHECK
 # undef chdir
 # if HAVE_RAW_DECL_CHDIR
-_GL_WARN_ON_USE (chown, "chdir is not always in <unistd.h> - "
+_GL_WARN_ON_USE (chdir, "chdir is not always in <unistd.h> - "
                  "use gnulib module chdir for portability");
 # endif
 #elif @GNULIB_MDA_CHDIR@
@@ -370,13 +377,13 @@ _GL_CXXALIASWARN (chdir);
 #   undef chown
 #   define chown rpl_chown
 #  endif
-_GL_FUNCDECL_RPL (chown, int, (const char *file, uid_t uid, gid_t gid)
-                              _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (chown, int, (const char *file, uid_t uid, gid_t gid),
+                              _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (chown, int, (const char *file, uid_t uid, gid_t gid));
 # else
 #  if !@HAVE_CHOWN@
-_GL_FUNCDECL_SYS (chown, int, (const char *file, uid_t uid, gid_t gid)
-                              _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (chown, int, (const char *file, uid_t uid, gid_t gid),
+                              _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (chown, int, (const char *file, uid_t uid, gid_t gid));
 # endif
@@ -398,7 +405,7 @@ _GL_WARN_ON_USE (chown, "chown fails to follow symlinks on some systems and "
 #   undef close
 #   define close rpl_close
 #  endif
-_GL_FUNCDECL_RPL (close, int, (int fd));
+_GL_FUNCDECL_RPL (close, int, (int fd), );
 _GL_CXXALIAS_RPL (close, int, (int fd));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -411,8 +418,10 @@ _GL_CXXALIAS_SYS (close, int, (int fd));
 # endif
 _GL_CXXALIASWARN (close);
 #elif @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@
-# undef close
-# define close close_used_without_requesting_gnulib_module_close
+# if !GNULIB_CLOSE
+#  undef close
+#  define close close_used_without_requesting_gnulib_module_close
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef close
 /* Assume close is always declared.  */
@@ -443,7 +452,7 @@ _GL_CXXALIASWARN (close);
 #  endif
 _GL_FUNCDECL_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos,
                                              int ofd, off_t *opos,
-                                             size_t len, unsigned flags));
+                                             size_t len, unsigned flags), );
 _GL_CXXALIAS_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos,
                                              int ofd, off_t *opos,
                                              size_t len, unsigned flags));
@@ -451,13 +460,15 @@ _GL_CXXALIAS_RPL (copy_file_range, ssize_t, (int ifd, off_t *ipos,
 #  if !@HAVE_COPY_FILE_RANGE@
 _GL_FUNCDECL_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos,
                                              int ofd, off_t *opos,
-                                             size_t len, unsigned flags));
+                                             size_t len, unsigned flags), );
 #  endif
 _GL_CXXALIAS_SYS (copy_file_range, ssize_t, (int ifd, off_t *ipos,
                                              int ofd, off_t *opos,
                                              size_t len, unsigned flags));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (copy_file_range);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef copy_file_range
 # if HAVE_RAW_DECL_COPY_FILE_RANGE
@@ -473,7 +484,7 @@ _GL_WARN_ON_USE (copy_file_range,
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dup rpl_dup
 #  endif
-_GL_FUNCDECL_RPL (dup, int, (int oldfd));
+_GL_FUNCDECL_RPL (dup, int, (int oldfd), _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (dup, int, (int oldfd));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -518,7 +529,7 @@ _GL_CXXALIASWARN (dup);
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define dup2 rpl_dup2
 #  endif
-_GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd));
+_GL_FUNCDECL_RPL (dup2, int, (int oldfd, int newfd), );
 _GL_CXXALIAS_RPL (dup2, int, (int oldfd, int newfd));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -567,11 +578,11 @@ _GL_CXXALIASWARN (dup2);
 #   undef dup3
 #   define dup3 rpl_dup3
 #  endif
-_GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags));
+_GL_FUNCDECL_RPL (dup3, int, (int oldfd, int newfd, int flags), );
 _GL_CXXALIAS_RPL (dup3, int, (int oldfd, int newfd, int flags));
 # else
 #  if !@HAVE_DUP3@
-_GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags));
+_GL_FUNCDECL_SYS (dup3, int, (int oldfd, int newfd, int flags), );
 #  endif
 _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags));
 # endif
@@ -636,7 +647,7 @@ rpl_environ (void)
 /* Like access(), except that it uses the effective user id and group id of
    the current process.  */
 # if !@HAVE_EUIDACCESS@
-_GL_FUNCDECL_SYS (euidaccess, int, (const char *filename, int mode)
+_GL_FUNCDECL_SYS (euidaccess, int, (const char *filename, int mode),
                                    _GL_ARG_NONNULL ((1)));
 # endif
 _GL_CXXALIAS_SYS (euidaccess, int, (const char *filename, int mode));
@@ -661,7 +672,7 @@ _GL_WARN_ON_USE (euidaccess, "euidaccess is unportable - "
 #   undef execl
 #   define execl rpl_execl
 #  endif
-_GL_FUNCDECL_RPL (execl, int, (const char *program, const char *arg, ...)
+_GL_FUNCDECL_RPL (execl, int, (const char *program, const char *arg, ...),
                               _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (execl, int, (const char *program, const char *arg, ...));
 # else
@@ -696,7 +707,7 @@ _GL_CXXALIASWARN (execl);
 #   undef execle
 #   define execle rpl_execle
 #  endif
-_GL_FUNCDECL_RPL (execle, int, (const char *program, const char *arg, ...)
+_GL_FUNCDECL_RPL (execle, int, (const char *program, const char *arg, ...),
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (execle, int, (const char *program, const char *arg, ...));
 # else
@@ -732,7 +743,7 @@ _GL_CXXALIASWARN (execle);
 #   undef execlp
 #   define execlp rpl_execlp
 #  endif
-_GL_FUNCDECL_RPL (execlp, int, (const char *program, const char *arg, ...)
+_GL_FUNCDECL_RPL (execlp, int, (const char *program, const char *arg, ...),
                                _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (execlp, int, (const char *program, const char *arg, ...));
 # else
@@ -769,7 +780,7 @@ _GL_CXXALIASWARN (execlp);
 #   undef execv
 #   define execv rpl_execv
 #  endif
-_GL_FUNCDECL_RPL (execv, int, (const char *program, char * const *argv)
+_GL_FUNCDECL_RPL (execv, int, (const char *program, char * const *argv),
                               _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (execv, int, (const char *program, char * const *argv));
 # else
@@ -806,7 +817,7 @@ _GL_CXXALIASWARN (execv);
 #   define execve rpl_execve
 #  endif
 _GL_FUNCDECL_RPL (execve, int,
-                  (const char *program, char * const *argv, char * const *env)
+                  (const char *program, char * const *argv, char * const *env),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (execve, int,
                   (const char *program, char * const *argv, char * const *env));
@@ -846,7 +857,7 @@ _GL_CXXALIASWARN (execve);
 #   undef execvp
 #   define execvp rpl_execvp
 #  endif
-_GL_FUNCDECL_RPL (execvp, int, (const char *program, char * const *argv)
+_GL_FUNCDECL_RPL (execvp, int, (const char *program, char * const *argv),
                                _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (execvp, int, (const char *program, char * const *argv));
 # else
@@ -883,14 +894,14 @@ _GL_CXXALIASWARN (execvp);
 #   define execvpe rpl_execvpe
 #  endif
 _GL_FUNCDECL_RPL (execvpe, int,
-                  (const char *program, char * const *argv, char * const *env)
+                  (const char *program, char * const *argv, char * const *env),
                   _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (execvpe, int,
                   (const char *program, char * const *argv, char * const *env));
 # else
 #  if !@HAVE_DECL_EXECVPE@
 _GL_FUNCDECL_SYS (execvpe, int,
-                  (const char *program, char * const *argv, char * const *env)
+                  (const char *program, char * const *argv, char * const *env),
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (execvpe, int,
@@ -921,7 +932,7 @@ _GL_CXXALIAS_MDA_CAST (execvpe, intptr_t,
 # elif @HAVE_EXECVPE@
 #  if !@HAVE_DECL_EXECVPE@
 _GL_FUNCDECL_SYS (execvpe, int,
-                  (const char *program, char * const *argv, char * const *env)
+                  (const char *program, char * const *argv, char * const *env),
                   _GL_ARG_NONNULL ((1, 2)));
 #  endif
 _GL_CXXALIAS_SYS (execvpe, int,
@@ -940,15 +951,15 @@ _GL_CXXALIASWARN (execvpe);
 #   define faccessat rpl_faccessat
 #  endif
 _GL_FUNCDECL_RPL (faccessat, int,
-                  (int fd, char const *name, int mode, int flag)
-                  _GL_ARG_NONNULL ((2)));
+                  (int fd, char const *name, int mode, int flag),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (faccessat, int,
                   (int fd, char const *name, int mode, int flag));
 # else
 #  if !@HAVE_FACCESSAT@
 _GL_FUNCDECL_SYS (faccessat, int,
-                  (int fd, char const *file, int mode, int flag)
-                  _GL_ARG_NONNULL ((2)));
+                  (int fd, char const *file, int mode, int flag),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (faccessat, int,
                   (int fd, char const *file, int mode, int flag));
@@ -976,11 +987,11 @@ _GL_WARN_ON_USE (faccessat, "faccessat is not portable - "
 #   undef fchdir
 #   define fchdir rpl_fchdir
 #  endif
-_GL_FUNCDECL_RPL (fchdir, int, (int /*fd*/));
+_GL_FUNCDECL_RPL (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (fchdir, int, (int /*fd*/));
 # else
 #  if !@HAVE_FCHDIR@ || !@HAVE_DECL_FCHDIR@
-_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
+_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/), _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
 # endif
@@ -1009,15 +1020,15 @@ _GL_WARN_ON_USE (fchdir, "fchdir is unportable - "
 #   define fchownat rpl_fchownat
 #  endif
 _GL_FUNCDECL_RPL (fchownat, int, (int fd, char const *file,
-                                  uid_t owner, gid_t group, int flag)
-                                 _GL_ARG_NONNULL ((2)));
+                                  uid_t owner, gid_t group, int flag),
+                                 _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (fchownat, int, (int fd, char const *file,
                                   uid_t owner, gid_t group, int flag));
 # else
 #  if !@HAVE_FCHOWNAT@
 _GL_FUNCDECL_SYS (fchownat, int, (int fd, char const *file,
-                                  uid_t owner, gid_t group, int flag)
-                                 _GL_ARG_NONNULL ((2)));
+                                  uid_t owner, gid_t group, int flag),
+                                 _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (fchownat, int, (int fd, char const *file,
                                   uid_t owner, gid_t group, int flag));
@@ -1042,11 +1053,11 @@ _GL_WARN_ON_USE (fchownat, "fchownat is not portable - "
 #   undef fdatasync
 #   define fdatasync rpl_fdatasync
 #  endif
-_GL_FUNCDECL_RPL (fdatasync, int, (int fd));
+_GL_FUNCDECL_RPL (fdatasync, int, (int fd), );
 _GL_CXXALIAS_RPL (fdatasync, int, (int fd));
 # else
 #  if !@HAVE_FDATASYNC@|| !@HAVE_DECL_FDATASYNC@
-_GL_FUNCDECL_SYS (fdatasync, int, (int fd));
+_GL_FUNCDECL_SYS (fdatasync, int, (int fd), );
 #  endif
 _GL_CXXALIAS_SYS (fdatasync, int, (int fd));
 # endif
@@ -1068,7 +1079,7 @@ _GL_WARN_ON_USE (fdatasync, "fdatasync is unportable - "
    See POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fsync.html>.  */
 # if !@HAVE_FSYNC@
-_GL_FUNCDECL_SYS (fsync, int, (int fd));
+_GL_FUNCDECL_SYS (fsync, int, (int fd), );
 # endif
 _GL_CXXALIAS_SYS (fsync, int, (int fd));
 _GL_CXXALIASWARN (fsync);
@@ -1091,13 +1102,17 @@ _GL_WARN_ON_USE (fsync, "fsync is unportable - "
 #   undef ftruncate
 #   define ftruncate rpl_ftruncate
 #  endif
-_GL_FUNCDECL_RPL (ftruncate, int, (int fd, off_t length));
-_GL_CXXALIAS_RPL (ftruncate, int, (int fd, off_t length));
+_GL_FUNCDECL_RPL (ftruncate, int,
+                  (int fd, off_t length), _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_RPL (ftruncate, int,
+                  (int fd, off_t length));
 # else
 #  if !@HAVE_FTRUNCATE@
-_GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length));
+_GL_FUNCDECL_SYS (ftruncate, int,
+                  (int fd, off_t length), _GL_ATTRIBUTE_NODISCARD);
 #  endif
-_GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
+_GL_CXXALIAS_SYS (ftruncate, int,
+                  (int fd, off_t length));
 # endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ftruncate);
@@ -1126,7 +1141,8 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getcwd rpl_getcwd
 #  endif
-_GL_FUNCDECL_RPL (getcwd, char *, (char *buf, size_t size));
+_GL_FUNCDECL_RPL (getcwd, char *, (char *buf, size_t size),
+                                  _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (getcwd, char *, (char *buf, size_t size));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1181,15 +1197,19 @@ _GL_CXXALIASWARN (getcwd);
 #   undef getdomainname
 #   define getdomainname rpl_getdomainname
 #  endif
-_GL_FUNCDECL_RPL (getdomainname, int, (char *name, size_t len)
-                                      _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (getdomainname, int, (char *name, size_t len));
+_GL_FUNCDECL_RPL (getdomainname, int,
+                  (char *name, size_t len),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_RPL (getdomainname, int,
+                  (char *name, size_t len));
 # else
 #  if !@HAVE_DECL_GETDOMAINNAME@
-_GL_FUNCDECL_SYS (getdomainname, int, (char *name, size_t len)
-                                      _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (getdomainname, int,
+                  (char *name, size_t len),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
-_GL_CXXALIAS_SYS (getdomainname, int, (char *name, size_t len));
+_GL_CXXALIAS_SYS (getdomainname, int,
+                  (char *name, size_t len));
 # endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getdomainname);
@@ -1211,11 +1231,11 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is unportable - "
 #   undef getdtablesize
 #   define getdtablesize rpl_getdtablesize
 #  endif
-_GL_FUNCDECL_RPL (getdtablesize, int, (void));
+_GL_FUNCDECL_RPL (getdtablesize, int, (void), );
 _GL_CXXALIAS_RPL (getdtablesize, int, (void));
 # else
 #  if !@HAVE_GETDTABLESIZE@
-_GL_FUNCDECL_SYS (getdtablesize, int, (void));
+_GL_FUNCDECL_SYS (getdtablesize, int, (void), );
 #  endif
 /* Need to cast, because on AIX, the parameter list is
                                            (...).  */
@@ -1238,13 +1258,17 @@ _GL_WARN_ON_USE (getdtablesize, "getdtablesize is unportable - "
 #   undef getentropy
 #   define getentropy rpl_getentropy
 #  endif
-_GL_FUNCDECL_RPL (getentropy, int, (void *buffer, size_t length));
-_GL_CXXALIAS_RPL (getentropy, int, (void *buffer, size_t length));
+_GL_FUNCDECL_RPL (getentropy, int,
+                  (void *buffer, size_t length), _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_RPL (getentropy, int,
+                  (void *buffer, size_t length));
 # else
 #  if !@HAVE_GETENTROPY@
-_GL_FUNCDECL_SYS (getentropy, int, (void *buffer, size_t length));
+_GL_FUNCDECL_SYS (getentropy, int,
+                  (void *buffer, size_t length), _GL_ATTRIBUTE_NODISCARD);
 #  endif
-_GL_CXXALIAS_SYS (getentropy, int, (void *buffer, size_t length));
+_GL_CXXALIAS_SYS (getentropy, int,
+                  (void *buffer, size_t length));
 # endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getentropy);
@@ -1269,13 +1293,17 @@ _GL_WARN_ON_USE (getentropy, "getentropy is unportable - "
 #   undef getgroups
 #   define getgroups rpl_getgroups
 #  endif
-_GL_FUNCDECL_RPL (getgroups, int, (int n, gid_t *groups));
-_GL_CXXALIAS_RPL (getgroups, int, (int n, gid_t *groups));
+_GL_FUNCDECL_RPL (getgroups, int,
+                  (int n, gid_t *groups), _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_RPL (getgroups, int,
+                  (int n, gid_t *groups));
 # else
 #  if !@HAVE_GETGROUPS@
-_GL_FUNCDECL_SYS (getgroups, int, (int n, gid_t *groups));
+_GL_FUNCDECL_SYS (getgroups, int,
+                  (int n, gid_t *groups), _GL_ATTRIBUTE_NODISCARD);
 #  endif
-_GL_CXXALIAS_SYS (getgroups, int, (int n, gid_t *groups));
+_GL_CXXALIAS_SYS (getgroups, int,
+                  (int n, gid_t *groups));
 # endif
 _GL_CXXALIASWARN (getgroups);
 #elif defined GNULIB_POSIXCHECK
@@ -1300,12 +1328,12 @@ _GL_WARN_ON_USE (getgroups, "getgroups is unportable - "
 #   undef gethostname
 #   define gethostname rpl_gethostname
 #  endif
-_GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len)
+_GL_FUNCDECL_RPL (gethostname, int, (char *name, size_t len),
                                     _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (gethostname, int, (char *name, size_t len));
 # else
 #  if !@HAVE_GETHOSTNAME@
-_GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len)
+_GL_FUNCDECL_SYS (gethostname, int, (char *name, size_t len),
                                     _GL_ARG_NONNULL ((1)));
 #  endif
 /* Need to cast, because on Solaris 10 and OSF/1 5.1 systems, the second
@@ -1315,8 +1343,10 @@ _GL_CXXALIAS_SYS_CAST (gethostname, int, (char *name, size_t len));
 # endif
 _GL_CXXALIASWARN (gethostname);
 #elif @UNISTD_H_HAVE_WINSOCK2_H@
-# undef gethostname
-# define gethostname gethostname_used_without_requesting_gnulib_module_gethostname
+# if !GNULIB_GETHOSTNAME
+#  undef gethostname
+#  define gethostname gethostname_used_without_requesting_gnulib_module_gethostname
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef gethostname
 # if HAVE_RAW_DECL_GETHOSTNAME
@@ -1337,11 +1367,21 @@ _GL_WARN_ON_USE (gethostname, "gethostname is unportable - "
      ${LOGNAME-$USER}        on Unix platforms,
      $USERNAME               on native Windows platforms.
  */
-# if !@HAVE_DECL_GETLOGIN@
-_GL_FUNCDECL_SYS (getlogin, char *, (void));
-# endif
+# if @REPLACE_GETLOGIN@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define getlogin rpl_getlogin
+#  endif
+_GL_FUNCDECL_RPL (getlogin, char *, (void), );
+_GL_CXXALIAS_RPL (getlogin, char *, (void));
+# else
+#  if !@HAVE_DECL_GETLOGIN@
+_GL_FUNCDECL_SYS (getlogin, char *, (void), );
+#  endif
 _GL_CXXALIAS_SYS (getlogin, char *, (void));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getlogin);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getlogin
 # if HAVE_RAW_DECL_GETLOGIN
@@ -1370,12 +1410,12 @@ _GL_WARN_ON_USE (getlogin, "getlogin is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getlogin_r rpl_getlogin_r
 #  endif
-_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size)
+_GL_FUNCDECL_RPL (getlogin_r, int, (char *name, size_t size),
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (getlogin_r, int, (char *name, size_t size));
 # else
 #  if !@HAVE_DECL_GETLOGIN_R@
-_GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size)
+_GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size),
                                    _GL_ARG_NONNULL ((1)));
 #  endif
 /* Need to cast, because on Solaris 10 systems, the second argument is
@@ -1399,13 +1439,13 @@ _GL_WARN_ON_USE (getlogin_r, "getlogin_r is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getpagesize rpl_getpagesize
 #  endif
-_GL_FUNCDECL_RPL (getpagesize, int, (void));
+_GL_FUNCDECL_RPL (getpagesize, int, (void), );
 _GL_CXXALIAS_RPL (getpagesize, int, (void));
 # else
 /* On HP-UX, getpagesize exists, but it is not declared in <unistd.h> even if
    the compiler options -D_HPUX_SOURCE -D_XOPEN_SOURCE=600 are used.  */
 #  if defined __hpux
-_GL_FUNCDECL_SYS (getpagesize, int, (void));
+_GL_FUNCDECL_SYS (getpagesize, int, (void), );
 #  endif
 #  if !@HAVE_GETPAGESIZE@
 #   if !defined getpagesize
@@ -1456,7 +1496,7 @@ _GL_FUNCDECL_SYS (getpagesize, int, (void));
 #     define getpagesize() _gl_getpagesize ()
 #    else
 #     if !GNULIB_defined_getpagesize_function
-_GL_UNISTD_INLINE int
+_GL_GETPAGESIZE_INLINE int
 getpagesize ()
 {
   return _gl_getpagesize ();
@@ -1492,12 +1532,12 @@ _GL_WARN_ON_USE (getpagesize, "getpagesize is unportable - "
 #   undef getpass
 #   define getpass rpl_getpass
 #  endif
-_GL_FUNCDECL_RPL (getpass, char *, (const char *prompt)
+_GL_FUNCDECL_RPL (getpass, char *, (const char *prompt),
                                    _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (getpass, char *, (const char *prompt));
 # else
 #  if !@HAVE_GETPASS@
-_GL_FUNCDECL_SYS (getpass, char *, (const char *prompt)
+_GL_FUNCDECL_SYS (getpass, char *, (const char *prompt),
                                    _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (getpass, char *, (const char *prompt));
@@ -1530,12 +1570,21 @@ _GL_CXXALIASWARN (getpid);
 
 
 #if @GNULIB_GETUSERSHELL@
+# if @REPLACE_GETUSERSHELL@
 /* Return the next valid login shell on the system, or NULL when the end of
    the list has been reached.  */
-# if !@HAVE_DECL_GETUSERSHELL@
-_GL_FUNCDECL_SYS (getusershell, char *, (void));
-# endif
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef getusershell
+#    define getusershell rpl_getusershell
+#  endif
+_GL_FUNCDECL_RPL (getusershell, char *, (void), );
+_GL_CXXALIAS_RPL (getusershell, char *, (void));
+# else
+#  if !@HAVE_DECL_GETUSERSHELL@
+_GL_FUNCDECL_SYS (getusershell, char *, (void), );
+#  endif
 _GL_CXXALIAS_SYS (getusershell, char *, (void));
+# endif
 _GL_CXXALIASWARN (getusershell);
 #elif defined GNULIB_POSIXCHECK
 # undef getusershell
@@ -1547,10 +1596,19 @@ _GL_WARN_ON_USE (getusershell, "getusershell is unportable - "
 
 #if @GNULIB_GETUSERSHELL@
 /* Rewind to pointer that is advanced at each getusershell() call.  */
-# if !@HAVE_DECL_GETUSERSHELL@
-_GL_FUNCDECL_SYS (setusershell, void, (void));
-# endif
+# if @REPLACE_GETUSERSHELL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef setusershell
+#    define setusershell rpl_setusershell
+#  endif
+_GL_FUNCDECL_RPL (setusershell, void, (void), );
+_GL_CXXALIAS_RPL (setusershell, void, (void));
+# else
+#  if !@HAVE_DECL_GETUSERSHELL@
+_GL_FUNCDECL_SYS (setusershell, void, (void), );
+#  endif
 _GL_CXXALIAS_SYS (setusershell, void, (void));
+# endif
 _GL_CXXALIASWARN (setusershell);
 #elif defined GNULIB_POSIXCHECK
 # undef setusershell
@@ -1563,10 +1621,19 @@ _GL_WARN_ON_USE (setusershell, "setusershell is unportable - "
 #if @GNULIB_GETUSERSHELL@
 /* Free the pointer that is advanced at each getusershell() call and
    associated resources.  */
-# if !@HAVE_DECL_GETUSERSHELL@
-_GL_FUNCDECL_SYS (endusershell, void, (void));
-# endif
+# if @REPLACE_GETUSERSHELL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef endusershell
+#    define endusershell rpl_endusershell
+#  endif
+_GL_FUNCDECL_RPL (endusershell, void, (void), );
+_GL_CXXALIAS_RPL (endusershell, void, (void));
+# else
+#  if !@HAVE_DECL_GETUSERSHELL@
+_GL_FUNCDECL_SYS (endusershell, void, (void), );
+#  endif
 _GL_CXXALIAS_SYS (endusershell, void, (void));
+# endif
 _GL_CXXALIASWARN (endusershell);
 #elif defined GNULIB_POSIXCHECK
 # undef endusershell
@@ -1580,7 +1647,7 @@ _GL_WARN_ON_USE (endusershell, "endusershell is unportable - "
 #if @GNULIB_GROUP_MEMBER@
 /* Determine whether group id is in calling user's group list.  */
 # if !@HAVE_GROUP_MEMBER@
-_GL_FUNCDECL_SYS (group_member, int, (gid_t gid));
+_GL_FUNCDECL_SYS (group_member, int, (gid_t gid), );
 # endif
 _GL_CXXALIAS_SYS (group_member, int, (gid_t gid));
 _GL_CXXALIASWARN (group_member);
@@ -1600,7 +1667,7 @@ _GL_WARN_ON_USE (group_member, "group_member is unportable - "
 #   define isatty rpl_isatty
 #  endif
 #  define GNULIB_defined_isatty 1
-_GL_FUNCDECL_RPL (isatty, int, (int fd));
+_GL_FUNCDECL_RPL (isatty, int, (int fd), );
 _GL_CXXALIAS_RPL (isatty, int, (int fd));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1646,13 +1713,13 @@ _GL_CXXALIASWARN (isatty);
 #   undef lchown
 #   define lchown rpl_lchown
 #  endif
-_GL_FUNCDECL_RPL (lchown, int, (char const *file, uid_t owner, gid_t group)
-                               _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (lchown, int, (char const *file, uid_t owner, gid_t group),
+                               _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (lchown, int, (char const *file, uid_t owner, gid_t group));
 # else
 #  if !@HAVE_LCHOWN@
-_GL_FUNCDECL_SYS (lchown, int, (char const *file, uid_t owner, gid_t group)
-                               _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (lchown, int, (char const *file, uid_t owner, gid_t group),
+                               _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (lchown, int, (char const *file, uid_t owner, gid_t group));
 # endif
@@ -1675,13 +1742,13 @@ _GL_WARN_ON_USE (lchown, "lchown is unportable to pre-POSIX.1-2001 systems - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define link rpl_link
 #  endif
-_GL_FUNCDECL_RPL (link, int, (const char *path1, const char *path2)
-                             _GL_ARG_NONNULL ((1, 2)));
+_GL_FUNCDECL_RPL (link, int, (const char *path1, const char *path2),
+                             _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (link, int, (const char *path1, const char *path2));
 # else
 #  if !@HAVE_LINK@
-_GL_FUNCDECL_SYS (link, int, (const char *path1, const char *path2)
-                             _GL_ARG_NONNULL ((1, 2)));
+_GL_FUNCDECL_SYS (link, int, (const char *path1, const char *path2),
+                             _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (link, int, (const char *path1, const char *path2));
 # endif
@@ -1706,8 +1773,8 @@ _GL_WARN_ON_USE (link, "link is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (linkat, int,
                   (int fd1, const char *path1, int fd2, const char *path2,
-                   int flag)
-                  _GL_ARG_NONNULL ((2, 4)));
+                   int flag),
+                  _GL_ARG_NONNULL ((2, 4)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (linkat, int,
                   (int fd1, const char *path1, int fd2, const char *path2,
                    int flag));
@@ -1715,8 +1782,8 @@ _GL_CXXALIAS_RPL (linkat, int,
 #  if !@HAVE_LINKAT@
 _GL_FUNCDECL_SYS (linkat, int,
                   (int fd1, const char *path1, int fd2, const char *path2,
-                   int flag)
-                  _GL_ARG_NONNULL ((2, 4)));
+                   int flag),
+                  _GL_ARG_NONNULL ((2, 4)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (linkat, int,
                   (int fd1, const char *path1, int fd2, const char *path2,
@@ -1743,7 +1810,7 @@ _GL_WARN_ON_USE (linkat, "linkat is unportable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define lseek rpl_lseek
 #  endif
-_GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence));
+_GL_FUNCDECL_RPL (lseek, off_t, (int fd, off_t offset, int whence), );
 _GL_CXXALIAS_RPL (lseek, off_t, (int fd, off_t offset, int whence));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1783,7 +1850,8 @@ _GL_CXXALIASWARN (lseek);
    Store the read-end as fd[0] and the write-end as fd[1].
    Return 0 upon success, or -1 with errno set upon failure.  */
 # if !@HAVE_PIPE@
-_GL_FUNCDECL_SYS (pipe, int, (int fd[2]) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (pipe, int, (int fd[2]),
+                             _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 # endif
 _GL_CXXALIAS_SYS (pipe, int, (int fd[2]));
 _GL_CXXALIASWARN (pipe);
@@ -1810,10 +1878,12 @@ _GL_WARN_ON_USE (pipe, "pipe is unportable - "
 #   undef pipe2
 #   define pipe2 rpl_pipe2
 #  endif
-_GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags),
+                              _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (pipe2, int, (int fd[2], int flags));
 # else
-_GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags),
+                              _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags));
 # endif
 # if __GLIBC__ >= 2
@@ -1840,15 +1910,15 @@ _GL_WARN_ON_USE (pipe2, "pipe2 is unportable - "
 #   define pread rpl_pread
 #  endif
 _GL_FUNCDECL_RPL (pread, ssize_t,
-                  (int fd, void *buf, size_t bufsize, off_t offset)
-                  _GL_ARG_NONNULL ((2)));
+                  (int fd, void *buf, size_t bufsize, off_t offset),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (pread, ssize_t,
                   (int fd, void *buf, size_t bufsize, off_t offset));
 # else
 #  if !@HAVE_PREAD@
 _GL_FUNCDECL_SYS (pread, ssize_t,
-                  (int fd, void *buf, size_t bufsize, off_t offset)
-                  _GL_ARG_NONNULL ((2)));
+                  (int fd, void *buf, size_t bufsize, off_t offset),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (pread, ssize_t,
                   (int fd, void *buf, size_t bufsize, off_t offset));
@@ -1877,15 +1947,15 @@ _GL_WARN_ON_USE (pread, "pread is unportable - "
 #   define pwrite rpl_pwrite
 #  endif
 _GL_FUNCDECL_RPL (pwrite, ssize_t,
-                  (int fd, const void *buf, size_t bufsize, off_t offset)
-                  _GL_ARG_NONNULL ((2)));
+                  (int fd, const void *buf, size_t bufsize, off_t offset),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (pwrite, ssize_t,
                   (int fd, const void *buf, size_t bufsize, off_t offset));
 # else
 #  if !@HAVE_PWRITE@
 _GL_FUNCDECL_SYS (pwrite, ssize_t,
-                  (int fd, const void *buf, size_t bufsize, off_t offset)
-                  _GL_ARG_NONNULL ((2)));
+                  (int fd, const void *buf, size_t bufsize, off_t offset),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (pwrite, ssize_t,
                   (int fd, const void *buf, size_t bufsize, off_t offset));
@@ -1911,8 +1981,9 @@ _GL_WARN_ON_USE (pwrite, "pwrite is unportable - "
 #   undef read
 #   define read rpl_read
 #  endif
-_GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count)
-                                 _GL_ARG_NONNULL ((2)));
+
+_GL_FUNCDECL_RPL (read, ssize_t, (int fd, void *buf, size_t count),
+                                 _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (read, ssize_t, (int fd, void *buf, size_t count));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -1933,11 +2004,7 @@ _GL_CXXALIASWARN (read);
 #   undef read
 #   define read _read
 #  endif
-#  ifdef __MINGW32__
-_GL_CXXALIAS_MDA (read, int, (int fd, void *buf, unsigned int count));
-#  else
-_GL_CXXALIAS_MDA (read, ssize_t, (int fd, void *buf, unsigned int count));
-#  endif
+_GL_CXXALIAS_MDA_CAST (read, ssize_t, (int fd, void *buf, unsigned int count));
 # else
 _GL_CXXALIAS_SYS (read, ssize_t, (int fd, void *buf, size_t count));
 # endif
@@ -1957,8 +2024,8 @@ _GL_CXXALIASWARN (read);
 #  endif
 _GL_FUNCDECL_RPL (readlink, ssize_t,
                   (const char *restrict file,
-                   char *restrict buf, size_t bufsize)
-                  _GL_ARG_NONNULL ((1, 2)));
+                   char *restrict buf, size_t bufsize),
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (readlink, ssize_t,
                   (const char *restrict file,
                    char *restrict buf, size_t bufsize));
@@ -1966,8 +2033,8 @@ _GL_CXXALIAS_RPL (readlink, ssize_t,
 #  if !@HAVE_READLINK@
 _GL_FUNCDECL_SYS (readlink, ssize_t,
                   (const char *restrict file,
-                   char *restrict buf, size_t bufsize)
-                  _GL_ARG_NONNULL ((1, 2)));
+                   char *restrict buf, size_t bufsize),
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (readlink, ssize_t,
                   (const char *restrict file,
@@ -1990,8 +2057,8 @@ _GL_WARN_ON_USE (readlink, "readlink is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (readlinkat, ssize_t,
                   (int fd, char const *restrict file,
-                   char *restrict buf, size_t len)
-                  _GL_ARG_NONNULL ((2, 3)));
+                   char *restrict buf, size_t len),
+                  _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (readlinkat, ssize_t,
                   (int fd, char const *restrict file,
                    char *restrict buf, size_t len));
@@ -1999,8 +2066,8 @@ _GL_CXXALIAS_RPL (readlinkat, ssize_t,
 #  if !@HAVE_READLINKAT@
 _GL_FUNCDECL_SYS (readlinkat, ssize_t,
                   (int fd, char const *restrict file,
-                   char *restrict buf, size_t len)
-                  _GL_ARG_NONNULL ((2, 3)));
+                   char *restrict buf, size_t len),
+                  _GL_ARG_NONNULL ((2, 3)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (readlinkat, ssize_t,
                   (int fd, char const *restrict file,
@@ -2024,7 +2091,7 @@ _GL_WARN_ON_USE (readlinkat, "readlinkat is not portable - "
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define rmdir rpl_rmdir
 #  endif
-_GL_FUNCDECL_RPL (rmdir, int, (char const *name) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (rmdir, int, (char const *name), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (rmdir, int, (char const *name));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -2073,18 +2140,22 @@ _GL_CXXALIASWARN (rmdir);
 #   undef sethostname
 #   define sethostname rpl_sethostname
 #  endif
-_GL_FUNCDECL_RPL (sethostname, int, (const char *name, size_t len)
-                                    _GL_ARG_NONNULL ((1)));
-_GL_CXXALIAS_RPL (sethostname, int, (const char *name, size_t len));
+_GL_FUNCDECL_RPL (sethostname, int,
+                  (const char *name, size_t len),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_RPL (sethostname, int,
+                  (const char *name, size_t len));
 # else
 #  if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
-_GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
-                                    _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (sethostname, int,
+                  (const char *name, size_t len),
+                  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 /* Need to cast, because on Solaris 11 2011-10, Mac OS X 10.5, IRIX 6.5
    and FreeBSD 6.4 the second parameter is int.  On Solaris 11
    2011-10, the first parameter is not const.  */
-_GL_CXXALIAS_SYS_CAST (sethostname, int, (const char *name, size_t len));
+_GL_CXXALIAS_SYS_CAST (sethostname, int,
+                       (const char *name, size_t len));
 # endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (sethostname);
@@ -2108,11 +2179,11 @@ _GL_WARN_ON_USE (sethostname, "sethostname is unportable - "
 #   undef sleep
 #   define sleep rpl_sleep
 #  endif
-_GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n));
+_GL_FUNCDECL_RPL (sleep, unsigned int, (unsigned int n), );
 _GL_CXXALIAS_RPL (sleep, unsigned int, (unsigned int n));
 # else
 #  if !@HAVE_SLEEP@
-_GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n));
+_GL_FUNCDECL_SYS (sleep, unsigned int, (unsigned int n), );
 #  endif
 _GL_CXXALIAS_SYS (sleep, unsigned int, (unsigned int n));
 # endif
@@ -2157,15 +2228,19 @@ _GL_CXXALIASWARN (swab);
 #   undef symlink
 #   define symlink rpl_symlink
 #  endif
-_GL_FUNCDECL_RPL (symlink, int, (char const *contents, char const *file)
-                                _GL_ARG_NONNULL ((1, 2)));
-_GL_CXXALIAS_RPL (symlink, int, (char const *contents, char const *file));
+_GL_FUNCDECL_RPL (symlink, int,
+                  (char const *contents, char const *file),
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_RPL (symlink, int,
+                  (char const *contents, char const *file));
 # else
 #  if !@HAVE_SYMLINK@
-_GL_FUNCDECL_SYS (symlink, int, (char const *contents, char const *file)
-                                _GL_ARG_NONNULL ((1, 2)));
+_GL_FUNCDECL_SYS (symlink, int,
+                  (char const *contents, char const *file),
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
-_GL_CXXALIAS_SYS (symlink, int, (char const *contents, char const *file));
+_GL_CXXALIAS_SYS (symlink, int,
+                  (char const *contents, char const *file));
 # endif
 _GL_CXXALIASWARN (symlink);
 #elif defined GNULIB_POSIXCHECK
@@ -2184,15 +2259,15 @@ _GL_WARN_ON_USE (symlink, "symlink is not portable - "
 #   define symlinkat rpl_symlinkat
 #  endif
 _GL_FUNCDECL_RPL (symlinkat, int,
-                  (char const *contents, int fd, char const *file)
-                  _GL_ARG_NONNULL ((1, 3)));
+                  (char const *contents, int fd, char const *file),
+                  _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (symlinkat, int,
                   (char const *contents, int fd, char const *file));
 # else
 #  if !@HAVE_SYMLINKAT@
 _GL_FUNCDECL_SYS (symlinkat, int,
-                  (char const *contents, int fd, char const *file)
-                  _GL_ARG_NONNULL ((1, 3)));
+                  (char const *contents, int fd, char const *file),
+                  _GL_ARG_NONNULL ((1, 3)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file));
@@ -2219,13 +2294,13 @@ _GL_WARN_ON_USE (symlinkat, "symlinkat is not portable - "
 #   undef truncate
 #   define truncate rpl_truncate
 #  endif
-_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length)
-                                 _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (truncate, int, (const char *filename, off_t length),
+                                 _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (truncate, int, (const char *filename, off_t length));
 # else
 #  if !@HAVE_DECL_TRUNCATE@
-_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length)
-                                 _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length),
+                                 _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length));
 # endif
@@ -2250,13 +2325,15 @@ _GL_WARN_ON_USE (truncate, "truncate is unportable - "
 #   define ttyname_r rpl_ttyname_r
 #  endif
 _GL_FUNCDECL_RPL (ttyname_r, int,
-                  (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
+                  (int fd, char *buf, size_t buflen),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 _GL_CXXALIAS_RPL (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
 # else
 #  if !@HAVE_DECL_TTYNAME_R@
 _GL_FUNCDECL_SYS (ttyname_r, int,
-                  (int fd, char *buf, size_t buflen) _GL_ARG_NONNULL ((2)));
+                  (int fd, char *buf, size_t buflen),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
 #  endif
 _GL_CXXALIAS_SYS (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
@@ -2279,7 +2356,7 @@ _GL_WARN_ON_USE (ttyname_r, "ttyname_r is not portable - "
 #   undef unlink
 #   define unlink rpl_unlink
 #  endif
-_GL_FUNCDECL_RPL (unlink, int, (char const *file) _GL_ARG_NONNULL ((1)));
+_GL_FUNCDECL_RPL (unlink, int, (char const *file), _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (unlink, int, (char const *file));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -2320,12 +2397,12 @@ _GL_CXXALIASWARN (unlink);
 #   undef unlinkat
 #   define unlinkat rpl_unlinkat
 #  endif
-_GL_FUNCDECL_RPL (unlinkat, int, (int fd, char const *file, int flag)
+_GL_FUNCDECL_RPL (unlinkat, int, (int fd, char const *file, int flag),
                                  _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (unlinkat, int, (int fd, char const *file, int flag));
 # else
 #  if !@HAVE_UNLINKAT@
-_GL_FUNCDECL_SYS (unlinkat, int, (int fd, char const *file, int flag)
+_GL_FUNCDECL_SYS (unlinkat, int, (int fd, char const *file, int flag),
                                  _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (unlinkat, int, (int fd, char const *file, int flag));
@@ -2343,18 +2420,18 @@ _GL_WARN_ON_USE (unlinkat, "unlinkat is not portable - "
 #if @GNULIB_USLEEP@
 /* Pause the execution of the current thread for N microseconds.
    Returns 0 on completion, or -1 on range error.
-   See the POSIX:2001 specification
+   See the POSIX.1-2004 specification
    <https://pubs.opengroup.org/onlinepubs/009695399/functions/usleep.html>.  */
 # if @REPLACE_USLEEP@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef usleep
 #   define usleep rpl_usleep
 #  endif
-_GL_FUNCDECL_RPL (usleep, int, (useconds_t n));
+_GL_FUNCDECL_RPL (usleep, int, (useconds_t n), );
 _GL_CXXALIAS_RPL (usleep, int, (useconds_t n));
 # else
 #  if !@HAVE_USLEEP@
-_GL_FUNCDECL_SYS (usleep, int, (useconds_t n));
+_GL_FUNCDECL_SYS (usleep, int, (useconds_t n), );
 #  endif
 /* Need to cast, because on Haiku, the first parameter is
                                      unsigned int n.  */
@@ -2379,17 +2456,21 @@ _GL_WARN_ON_USE (usleep, "usleep is unportable - "
 #   undef write
 #   define write rpl_write
 #  endif
-_GL_FUNCDECL_RPL (write, ssize_t, (int fd, const void *buf, size_t count)
-                                  _GL_ARG_NONNULL ((2)));
-_GL_CXXALIAS_RPL (write, ssize_t, (int fd, const void *buf, size_t count));
+_GL_FUNCDECL_RPL (write, ssize_t,
+                  (int fd, const void *buf, size_t count),
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_NODISCARD);
+_GL_CXXALIAS_RPL (write, ssize_t,
+                  (int fd, const void *buf, size_t count));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef write
 #   define write _write
 #  endif
-_GL_CXXALIAS_MDA (write, ssize_t, (int fd, const void *buf, size_t count));
+_GL_CXXALIAS_MDA (write, ssize_t,
+                  (int fd, const void *buf, size_t count));
 # else
-_GL_CXXALIAS_SYS (write, ssize_t, (int fd, const void *buf, size_t count));
+_GL_CXXALIAS_SYS (write, ssize_t,
+                  (int fd, const void *buf, size_t count));
 # endif
 _GL_CXXALIASWARN (write);
 #elif @GNULIB_MDA_WRITE@
@@ -2401,13 +2482,11 @@ _GL_CXXALIASWARN (write);
 #   undef write
 #   define write _write
 #  endif
-#  ifdef __MINGW32__
-_GL_CXXALIAS_MDA (write, int, (int fd, const void *buf, unsigned int count));
-#  else
-_GL_CXXALIAS_MDA (write, ssize_t, (int fd, const void *buf, unsigned int count));
-#  endif
+_GL_CXXALIAS_MDA_CAST (write, ssize_t,
+                       (int fd, const void *buf, unsigned int count));
 # else
-_GL_CXXALIAS_SYS (write, ssize_t, (int fd, const void *buf, size_t count));
+_GL_CXXALIAS_SYS (write, ssize_t,
+                  (int fd, const void *buf, size_t count));
 # endif
 _GL_CXXALIASWARN (write);
 #endif
diff --git a/gl/unitypes.h b/gl/unitypes.h
new file mode 100644
index 00000000..83a91750
--- /dev/null
+++ b/gl/unitypes.h
@@ -0,0 +1,72 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Elementary types and macros for the GNU UniString library.
+   Copyright (C) 2002, 2005-2006, 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNITYPES_H
+#define _UNITYPES_H
+
+/* Get uint8_t, uint16_t, uint32_t.  */
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Type representing a Unicode character.  */
+typedef uint32_t ucs4_t;
+
+/* Attribute of a function whose result depends only on the arguments
+   (not pointers!) and which has no side effects.  */
+#ifndef _UC_ATTRIBUTE_CONST
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined __clang__
+#  define _UC_ATTRIBUTE_CONST __attribute__ ((__const__))
+# else
+#  define _UC_ATTRIBUTE_CONST
+# endif
+#endif
+
+/* Attribute of a function whose result depends only on the arguments
+   (possibly pointers) and global memory, and which has no side effects.  */
+#ifndef _UC_ATTRIBUTE_PURE
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__
+#  define _UC_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _UC_ATTRIBUTE_PURE
+# endif
+#endif
+
+/* Qualifier in a function declaration, that asserts that the caller must
+   pass a pointer to a different object in the specified pointer argument
+   than in the other pointer arguments.  */
+#ifndef _UC_RESTRICT
+# if defined __restrict \
+     || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \
+     || __clang_major__ >= 3
+#  define _UC_RESTRICT __restrict
+# elif 199901L <= __STDC_VERSION__ || defined restrict
+#  define _UC_RESTRICT restrict
+# else
+#  define _UC_RESTRICT
+# endif
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNITYPES_H */
diff --git a/gl/unitypes.in.h b/gl/unitypes.in.h
new file mode 100644
index 00000000..776d90e9
--- /dev/null
+++ b/gl/unitypes.in.h
@@ -0,0 +1,71 @@
+/* Elementary types and macros for the GNU UniString library.
+   Copyright (C) 2002, 2005-2006, 2009-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNITYPES_H
+#define _UNITYPES_H
+
+/* Get uint8_t, uint16_t, uint32_t.  */
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Type representing a Unicode character.  */
+typedef uint32_t ucs4_t;
+
+/* Attribute of a function whose result depends only on the arguments
+   (not pointers!) and which has no side effects.  */
+#ifndef _UC_ATTRIBUTE_CONST
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) || defined __clang__
+#  define _UC_ATTRIBUTE_CONST __attribute__ ((__const__))
+# else
+#  define _UC_ATTRIBUTE_CONST
+# endif
+#endif
+
+/* Attribute of a function whose result depends only on the arguments
+   (possibly pointers) and global memory, and which has no side effects.  */
+#ifndef _UC_ATTRIBUTE_PURE
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96) || defined __clang__
+#  define _UC_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+#  define _UC_ATTRIBUTE_PURE
+# endif
+#endif
+
+/* Qualifier in a function declaration, that asserts that the caller must
+   pass a pointer to a different object in the specified pointer argument
+   than in the other pointer arguments.  */
+#ifndef _UC_RESTRICT
+# if defined __restrict \
+     || 2 < __GNUC__ + (95 <= __GNUC_MINOR__) \
+     || __clang_major__ >= 3
+#  define _UC_RESTRICT __restrict
+# elif 199901L <= __STDC_VERSION__ || defined restrict
+#  define _UC_RESTRICT restrict
+# else
+#  define _UC_RESTRICT
+# endif
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNITYPES_H */
diff --git a/gl/uniwidth.h b/gl/uniwidth.h
new file mode 100644
index 00000000..b88df2bf
--- /dev/null
+++ b/gl/uniwidth.h
@@ -0,0 +1,73 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Display width functions.
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2025 Free Software Foundation,
+   Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNIWIDTH_H
+#define _UNIWIDTH_H
+
+#include "unitypes.h"
+
+/* Get size_t.  */
+#include <stddef.h>
+
+/* Get locale_charset() declaration.  */
+#include "localcharset.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Display width.  */
+
+/* These functions are locale dependent.  The encoding argument identifies
+   the encoding (e.g. "ISO-8859-2" for Polish).  */
+
+/* Determine number of column positions required for UC.  */
+extern int
+       uc_width (ucs4_t uc, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+
+/* Determine number of column positions required for first N units
+   (or fewer if S ends before this) in S.  */
+extern int
+       u8_width (const uint8_t *s, size_t n, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+extern int
+       u16_width (const uint16_t *s, size_t n, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+extern int
+       u32_width (const uint32_t *s, size_t n, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+
+/* Determine number of column positions required for S.  */
+extern int
+       u8_strwidth (const uint8_t *s, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+extern int
+       u16_strwidth (const uint16_t *s, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+extern int
+       u32_strwidth (const uint32_t *s, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNIWIDTH_H */
diff --git a/gl/uniwidth.in.h b/gl/uniwidth.in.h
new file mode 100644
index 00000000..49c7ce05
--- /dev/null
+++ b/gl/uniwidth.in.h
@@ -0,0 +1,72 @@
+/* Display width functions.
+   Copyright (C) 2001-2002, 2005, 2007, 2009-2025 Free Software Foundation,
+   Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef _UNIWIDTH_H
+#define _UNIWIDTH_H
+
+#include "unitypes.h"
+
+/* Get size_t.  */
+#include <stddef.h>
+
+/* Get locale_charset() declaration.  */
+#include "localcharset.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Display width.  */
+
+/* These functions are locale dependent.  The encoding argument identifies
+   the encoding (e.g. "ISO-8859-2" for Polish).  */
+
+/* Determine number of column positions required for UC.  */
+extern int
+       uc_width (ucs4_t uc, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+
+/* Determine number of column positions required for first N units
+   (or fewer if S ends before this) in S.  */
+extern int
+       u8_width (const uint8_t *s, size_t n, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+extern int
+       u16_width (const uint16_t *s, size_t n, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+extern int
+       u32_width (const uint32_t *s, size_t n, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+
+/* Determine number of column positions required for S.  */
+extern int
+       u8_strwidth (const uint8_t *s, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+extern int
+       u16_strwidth (const uint16_t *s, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+extern int
+       u32_strwidth (const uint32_t *s, const char *encoding)
+       _UC_ATTRIBUTE_PURE;
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _UNIWIDTH_H */
diff --git a/gl/uniwidth/.deps/.dirstamp b/gl/uniwidth/.deps/.dirstamp
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gl/uniwidth/.deps/.dirstamp
diff --git a/gl/uniwidth/.deps/libgnu_a-width.Po b/gl/uniwidth/.deps/libgnu_a-width.Po
new file mode 100644
index 00000000..f3f0e3fd
--- /dev/null
+++ b/gl/uniwidth/.deps/libgnu_a-width.Po
@@ -0,0 +1,60 @@
+uniwidth/libgnu_a-width.o: uniwidth/width.c /usr/include/stdc-predef.h \
+ ../config.h uniwidth.h unitypes.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h /usr/include/stdint.h \
+ /usr/include/x86_64-linux-gnu/bits/libc-header-start.h \
+ /usr/include/features.h /usr/include/features-time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wordsize.h \
+ /usr/include/x86_64-linux-gnu/bits/timesize.h \
+ /usr/include/x86_64-linux-gnu/sys/cdefs.h \
+ /usr/include/x86_64-linux-gnu/bits/long-double.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs.h \
+ /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
+ /usr/include/x86_64-linux-gnu/bits/types.h \
+ /usr/include/x86_64-linux-gnu/bits/typesizes.h \
+ /usr/include/x86_64-linux-gnu/bits/time64.h \
+ /usr/include/x86_64-linux-gnu/bits/wchar.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-intn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-uintn.h \
+ /usr/include/x86_64-linux-gnu/bits/stdint-least.h stddef.h \
+ /usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h localcharset.h \
+ uniwidth/cjk.h streq.h string.h /usr/include/string.h \
+ /usr/include/x86_64-linux-gnu/bits/types/locale_t.h \
+ /usr/include/x86_64-linux-gnu/bits/types/__locale_t.h strings.h \
+ /usr/include/strings.h uniwidth/width0.h uniwidth/width2.h \
+ unictype/bitmap.h
+/usr/include/stdc-predef.h:
+../config.h:
+uniwidth.h:
+unitypes.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stdint.h:
+/usr/include/stdint.h:
+/usr/include/x86_64-linux-gnu/bits/libc-header-start.h:
+/usr/include/features.h:
+/usr/include/features-time64.h:
+/usr/include/x86_64-linux-gnu/bits/wordsize.h:
+/usr/include/x86_64-linux-gnu/bits/timesize.h:
+/usr/include/x86_64-linux-gnu/sys/cdefs.h:
+/usr/include/x86_64-linux-gnu/bits/long-double.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs.h:
+/usr/include/x86_64-linux-gnu/gnu/stubs-64.h:
+/usr/include/x86_64-linux-gnu/bits/types.h:
+/usr/include/x86_64-linux-gnu/bits/typesizes.h:
+/usr/include/x86_64-linux-gnu/bits/time64.h:
+/usr/include/x86_64-linux-gnu/bits/wchar.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-intn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h:
+/usr/include/x86_64-linux-gnu/bits/stdint-least.h:
+stddef.h:
+/usr/lib/gcc/x86_64-linux-gnu/15/include/stddef.h:
+localcharset.h:
+uniwidth/cjk.h:
+streq.h:
+string.h:
+/usr/include/string.h:
+/usr/include/x86_64-linux-gnu/bits/types/locale_t.h:
+/usr/include/x86_64-linux-gnu/bits/types/__locale_t.h:
+strings.h:
+/usr/include/strings.h:
+uniwidth/width0.h:
+uniwidth/width2.h:
+unictype/bitmap.h:
diff --git a/gl/uniwidth/.dirstamp b/gl/uniwidth/.dirstamp
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/gl/uniwidth/.dirstamp
diff --git a/gl/uniwidth/cjk.h b/gl/uniwidth/cjk.h
new file mode 100644
index 00000000..af41f637
--- /dev/null
+++ b/gl/uniwidth/cjk.h
@@ -0,0 +1,37 @@
+/* Test for CJK encoding.
+   Copyright (C) 2001-2002, 2005-2007, 2009-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include "streq.h"
+
+static int
+is_cjk_encoding (const char *encoding)
+{
+  if (0
+      /* Legacy Japanese encodings */
+      || STREQ_OPT (encoding, "EUC-JP", 'E', 'U', 'C', '-', 'J', 'P', 0, 0, 0)
+      /* Legacy Chinese encodings */
+      || STREQ_OPT (encoding, "GB2312", 'G', 'B', '2', '3', '1', '2', 0, 0, 0)
+      || STREQ_OPT (encoding, "GBK", 'G', 'B', 'K', 0, 0, 0, 0, 0, 0)
+      || STREQ_OPT (encoding, "EUC-TW", 'E', 'U', 'C', '-', 'T', 'W', 0, 0, 0)
+      || STREQ_OPT (encoding, "BIG5", 'B', 'I', 'G', '5', 0, 0, 0, 0, 0)
+      /* Legacy Korean encodings */
+      || STREQ_OPT (encoding, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
+      || STREQ_OPT (encoding, "CP949", 'C', 'P', '9', '4', '9', 0, 0, 0, 0)
+      || STREQ_OPT (encoding, "JOHAB", 'J', 'O', 'H', 'A', 'B', 0, 0, 0, 0))
+    return 1;
+  return 0;
+}
diff --git a/gl/uniwidth/width.c b/gl/uniwidth/width.c
new file mode 100644
index 00000000..c99a74cb
--- /dev/null
+++ b/gl/uniwidth/width.c
@@ -0,0 +1,95 @@
+/* Determine display width of Unicode character.
+   Copyright (C) 2001-2002, 2006-2025 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2002.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "uniwidth.h"
+
+#include "cjk.h"
+
+/* The non-spacing attribute table consists of:
+   * Non-spacing characters; generated from PropList.txt or
+     "grep '^[^;]*;[^;]*;[^;]*;[^;]*;NSM;' UnicodeData.txt"
+   * Format control characters; generated from
+     "grep '^[^;]*;[^;]*;Cf;' UnicodeData.txt"
+   * Zero width characters; generated from
+     "grep '^[^;]*;ZERO WIDTH ' UnicodeData.txt"
+   * Hangul Jamo characters that have conjoining behaviour:
+       - jungseong = syllable-middle vowels
+       - jongseong = syllable-final consonants
+     Rationale:
+     1) These characters act like combining characters. They have no
+     equivalent in legacy character sets. Therefore the EastAsianWidth.txt
+     file does not really matter for them; UAX #11 East Asian Width
+     <https://www.unicode.org/reports/tr11/> makes it clear that it focus
+     is on compatibility with traditional Japanese layout.
+     By contrast, the same glyphs without conjoining behaviour are available
+     in the U+3130..U+318F block, and these characters are mapped to legacy
+     character sets, and traditional Japanese layout matters for them.
+     2) glibc does the same thing, see
+     <https://sourceware.org/bugzilla/show_bug.cgi?id=21750>
+     <https://sourceware.org/bugzilla/show_bug.cgi?id=26120>
+ */
+#include "uniwidth/width0.h"
+
+#include "uniwidth/width2.h"
+#include "unictype/bitmap.h"
+
+#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
+
+
+/* Determine number of column positions required for UC.  */
+int
+uc_width (ucs4_t uc, const char *encoding)
+{
+  /* Test for non-spacing or control character.  */
+  if ((uc >> 9) < SIZEOF (nonspacing_table_ind))
+    {
+      int ind = nonspacing_table_ind[uc >> 9];
+      if (ind >= 0)
+        if ((nonspacing_table_data[64*ind + ((uc >> 3) & 63)] >> (uc & 7)) & 1)
+          {
+            if (uc > 0 && uc < 0xa0)
+              return -1;
+            else
+              return 0;
+          }
+    }
+  else if ((uc >> 9) == (0xe0000 >> 9))
+    {
+      if (uc >= 0xe0100)
+        {
+          if (uc <= 0xe01ef)
+            return 0;
+        }
+      else
+        {
+          if (uc >= 0xe0020 ? uc <= 0xe007f : uc == 0xe0001)
+            return 0;
+        }
+    }
+  /* Test for double-width character.  */
+  if (bitmap_lookup (&u_width2, uc))
+    return 2;
+  /* In ancient CJK encodings, Cyrillic and most other characters are
+     double-width as well.  */
+  if (uc >= 0x00A1 && uc < 0xFF61 && uc != 0x20A9
+      && is_cjk_encoding (encoding))
+    return 2;
+  return 1;
+}
diff --git a/gl/uniwidth/width0.h b/gl/uniwidth/width0.h
new file mode 100644
index 00000000..2edbe240
--- /dev/null
+++ b/gl/uniwidth/width0.h
@@ -0,0 +1,495 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Table of non-spacing or control characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+static const unsigned char nonspacing_table_data[49*64] = {
+  /* 0x0000-0x01ff */
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0000-0x003f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x0040-0x007f */
+  0xff, 0xff, 0xff, 0xff, 0x00, 0x20, 0x00, 0x00, /* 0x0080-0x00bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x00c0-0x00ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0100-0x013f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0140-0x017f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0180-0x01bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x01c0-0x01ff */
+  /* 0x0200-0x03ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0200-0x023f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0240-0x027f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0280-0x02bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x02c0-0x02ff */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x0300-0x033f */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, /* 0x0340-0x037f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0380-0x03bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x03c0-0x03ff */
+  /* 0x0400-0x05ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0400-0x043f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0440-0x047f */
+  0xf8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0480-0x04bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x04c0-0x04ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0500-0x053f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0540-0x057f */
+  0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xbf, /* 0x0580-0x05bf */
+  0xb6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x05c0-0x05ff */
+  /* 0x0600-0x07ff */
+  0x00, 0x00, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, /* 0x0600-0x063f */
+  0x00, 0xf8, 0xff, 0xff, 0x00, 0x00, 0x01, 0x00, /* 0x0640-0x067f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0680-0x06bf */
+  0x00, 0x00, 0xc0, 0x9f, 0x9f, 0x3d, 0x00, 0x00, /* 0x06c0-0x06ff */
+  0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x0700-0x073f */
+  0xff, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0740-0x077f */
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0xff, 0x01, 0x00, /* 0x0780-0x07bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x20, /* 0x07c0-0x07ff */
+  /* 0x0800-0x09ff */
+  0x00, 0x00, 0xc0, 0xfb, 0xef, 0x3e, 0x00, 0x00, /* 0x0800-0x083f */
+  0x00, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x0840-0x087f */
+  0x00, 0x00, 0x80, 0xff, 0x00, 0x00, 0x00, 0x00, /* 0x0880-0x08bf */
+  0x00, 0xfc, 0xff, 0xff, 0xfb, 0xff, 0xff, 0xff, /* 0x08c0-0x08ff */
+  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, /* 0x0900-0x093f */
+  0xfe, 0x21, 0xfe, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0940-0x097f */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0980-0x09bf */
+  0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x40, /* 0x09c0-0x09ff */
+  /* 0x0a00-0x0bff */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a00-0x0a3f */
+  0x86, 0x39, 0x02, 0x00, 0x00, 0x00, 0x23, 0x00, /* 0x0a40-0x0a7f */
+  0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0a80-0x0abf */
+  0xbe, 0x21, 0x00, 0x00, 0x0c, 0x00, 0x00, 0xfc, /* 0x0ac0-0x0aff */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x90, /* 0x0b00-0x0b3f */
+  0x1e, 0x20, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0b40-0x0b7f */
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0b80-0x0bbf */
+  0x01, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0bc0-0x0bff */
+  /* 0x0c00-0x0dff */
+  0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, /* 0x0c00-0x0c3f */
+  0xc1, 0x3d, 0x60, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0c40-0x0c7f */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0x0c80-0x0cbf */
+  0x00, 0x30, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0cc0-0x0cff */
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, /* 0x0d00-0x0d3f */
+  0x1e, 0x20, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, /* 0x0d40-0x0d7f */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0d80-0x0dbf */
+  0x00, 0x04, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0dc0-0x0dff */
+  /* 0x0e00-0x0fff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x07, /* 0x0e00-0x0e3f */
+  0x80, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0e40-0x0e7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf2, 0x1f, /* 0x0e80-0x0ebf */
+  0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0ec0-0x0eff */
+  0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0xa0, 0x02, /* 0x0f00-0x0f3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, /* 0x0f40-0x0f7f */
+  0xdf, 0xe0, 0xff, 0xfe, 0xff, 0xff, 0xff, 0x1f, /* 0x0f80-0x0fbf */
+  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x0fc0-0x0fff */
+  /* 0x1000-0x11ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xfd, 0x66, /* 0x1000-0x103f */
+  0x00, 0x00, 0x00, 0xc3, 0x01, 0x00, 0x1e, 0x00, /* 0x1040-0x107f */
+  0x64, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x1080-0x10bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c0-0x10ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1100-0x113f */
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x1140-0x117f */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x1180-0x11bf */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x11c0-0x11ff */
+  /* 0x1200-0x13ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1200-0x123f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1240-0x127f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1280-0x12bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x12c0-0x12ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1300-0x133f */
+  0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, 0x00, /* 0x1340-0x137f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1380-0x13bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13c0-0x13ff */
+  /* 0x1600-0x17ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1600-0x163f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1640-0x167f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1680-0x16bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16c0-0x16ff */
+  0x00, 0x00, 0x1c, 0x00, 0x00, 0x00, 0x0c, 0x00, /* 0x1700-0x173f */
+  0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, /* 0x1740-0x177f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x3f, /* 0x1780-0x17bf */
+  0x40, 0xfe, 0x0f, 0x20, 0x00, 0x00, 0x00, 0x00, /* 0x17c0-0x17ff */
+  /* 0x1800-0x19ff */
+  0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1800-0x183f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1840-0x187f */
+  0x60, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, /* 0x1880-0x18bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x18c0-0x18ff */
+  0x00, 0x00, 0x00, 0x00, 0x87, 0x01, 0x04, 0x0e, /* 0x1900-0x193f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1940-0x197f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1980-0x19bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x19c0-0x19ff */
+  /* 0x1a00-0x1bff */
+  0x00, 0x00, 0x80, 0x09, 0x00, 0x00, 0x00, 0x00, /* 0x1a00-0x1a3f */
+  0x00, 0x00, 0x40, 0x7f, 0xe5, 0x1f, 0xf8, 0x9f, /* 0x1a40-0x1a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x1a80-0x1abf */
+  0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ac0-0x1aff */
+  0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x17, /* 0x1b00-0x1b3f */
+  0x04, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x0f, 0x00, /* 0x1b40-0x1b7f */
+  0x03, 0x00, 0x00, 0x00, 0x3c, 0x3b, 0x00, 0x00, /* 0x1b80-0x1bbf */
+  0x00, 0x00, 0x00, 0x00, 0x40, 0xa3, 0x03, 0x00, /* 0x1bc0-0x1bff */
+  /* 0x1c00-0x1dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xcf, 0x00, /* 0x1c00-0x1c3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c40-0x1c7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1c80-0x1cbf */
+  0x00, 0x00, 0xf7, 0xff, 0xfd, 0x21, 0x10, 0x03, /* 0x1cc0-0x1cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d00-0x1d3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d40-0x1d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d80-0x1dbf */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 0x1dc0-0x1dff */
+  /* 0x2000-0x21ff */
+  0x00, 0xf8, 0x00, 0x00, 0x00, 0x7c, 0x00, 0x00, /* 0x2000-0x203f */
+  0x00, 0x00, 0x00, 0x00, 0xdf, 0xff, 0x00, 0x00, /* 0x2040-0x207f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2080-0x20bf */
+  0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, /* 0x20c0-0x20ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2100-0x213f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2140-0x217f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2180-0x21bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x21c0-0x21ff */
+  /* 0x2c00-0x2dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c00-0x2c3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c40-0x2c7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2c80-0x2cbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, /* 0x2cc0-0x2cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d00-0x2d3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0x2d40-0x2d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x2d80-0x2dbf */
+  0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, /* 0x2dc0-0x2dff */
+  /* 0x3000-0x31ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x3000-0x303f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3040-0x307f */
+  0x00, 0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, /* 0x3080-0x30bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x30c0-0x30ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3100-0x313f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3140-0x317f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x3180-0x31bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x31c0-0x31ff */
+  /* 0xa600-0xa7ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa600-0xa63f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xf7, 0x3f, /* 0xa640-0xa67f */
+  0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, /* 0xa680-0xa6bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, /* 0xa6c0-0xa6ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa700-0xa73f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa740-0xa77f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa780-0xa7bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa7c0-0xa7ff */
+  /* 0xa800-0xa9ff */
+  0x44, 0x08, 0x00, 0x00, 0x60, 0x10, 0x00, 0x00, /* 0xa800-0xa83f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa840-0xa87f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa880-0xa8bf */
+  0x30, 0x00, 0x00, 0x00, 0xff, 0xff, 0x03, 0x80, /* 0xa8c0-0xa8ff */
+  0x00, 0x00, 0x00, 0x00, 0xc0, 0x3f, 0x00, 0x00, /* 0xa900-0xa93f */
+  0x80, 0xff, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xa940-0xa97f */
+  0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x33, /* 0xa980-0xa9bf */
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, /* 0xa9c0-0xa9ff */
+  /* 0xaa00-0xabff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0x66, 0x00, /* 0xaa00-0xaa3f */
+  0x08, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, /* 0xaa40-0xaa7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9d, 0xc1, /* 0xaa80-0xaabf */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x30, 0x40, 0x00, /* 0xaac0-0xaaff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab00-0xab3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab40-0xab7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xab80-0xabbf */
+  0x00, 0x00, 0x00, 0x00, 0x20, 0x21, 0x00, 0x00, /* 0xabc0-0xabff */
+  /* 0xd600-0xd7ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd600-0xd63f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd640-0xd67f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd680-0xd6bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd6c0-0xd6ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd700-0xd73f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xd740-0xd77f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0xd780-0xd7bf */
+  0x7f, 0xf8, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, /* 0xd7c0-0xd7ff */
+  /* 0xfa00-0xfbff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa00-0xfa3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa40-0xfa7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfa80-0xfabf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfac0-0xfaff */
+  0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0xfb00-0xfb3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb40-0xfb7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfb80-0xfbbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfbc0-0xfbff */
+  /* 0xfe00-0xffff */
+  0xff, 0xff, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, /* 0xfe00-0xfe3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe40-0xfe7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xfe80-0xfebf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, /* 0xfec0-0xfeff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff00-0xff3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff40-0xff7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0xff80-0xffbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, /* 0xffc0-0xffff */
+  /* 0x10000-0x101ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10000-0x1003f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10040-0x1007f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10080-0x100bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x100c0-0x100ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10100-0x1013f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10140-0x1017f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10180-0x101bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, /* 0x101c0-0x101ff */
+  /* 0x10200-0x103ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10200-0x1023f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10240-0x1027f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10280-0x102bf */
+  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, /* 0x102c0-0x102ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10300-0x1033f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x07, /* 0x10340-0x1037f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10380-0x103bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x103c0-0x103ff */
+  /* 0x10a00-0x10bff */
+  0x6e, 0xf0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x87, /* 0x10a00-0x10a3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a40-0x10a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10a80-0x10abf */
+  0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, /* 0x10ac0-0x10aff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b00-0x10b3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b40-0x10b7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10b80-0x10bbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10bc0-0x10bff */
+  /* 0x10c00-0x10dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c00-0x10c3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c40-0x10c7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10c80-0x10cbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10cc0-0x10cff */
+  0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, /* 0x10d00-0x10d3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x3e, 0x00, 0x00, /* 0x10d40-0x10d7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10d80-0x10dbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10dc0-0x10dff */
+  /* 0x10e00-0x10fff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10e00-0x10e3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10e40-0x10e7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, /* 0x10e80-0x10ebf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, /* 0x10ec0-0x10eff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10f00-0x10f3f */
+  0xc0, 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10f40-0x10f7f */
+  0x3c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10f80-0x10fbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x10fc0-0x10fff */
+  /* 0x11000-0x111ff */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11000-0x1103f */
+  0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x80, /* 0x11040-0x1107f */
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0x06, /* 0x11080-0x110bf */
+  0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x110c0-0x110ff */
+  0x07, 0x00, 0x00, 0x00, 0x80, 0xef, 0x1f, 0x00, /* 0x11100-0x1113f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, /* 0x11140-0x1117f */
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x7f, /* 0x11180-0x111bf */
+  0x00, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x111c0-0x111ff */
+  /* 0x11200-0x113ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xd3, 0x40, /* 0x11200-0x1123f */
+  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11240-0x1127f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11280-0x112bf */
+  0x00, 0x00, 0x00, 0x80, 0xf8, 0x07, 0x00, 0x00, /* 0x112c0-0x112ff */
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, /* 0x11300-0x1133f */
+  0x01, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0x1f, 0x00, /* 0x11340-0x1137f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, /* 0x11380-0x113bf */
+  0x01, 0x40, 0x05, 0x00, 0x06, 0x00, 0x00, 0x00, /* 0x113c0-0x113ff */
+  /* 0x11400-0x115ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, /* 0x11400-0x1143f */
+  0x5c, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00, /* 0x11440-0x1147f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x85, /* 0x11480-0x114bf */
+  0x0d, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x114c0-0x114ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11500-0x1153f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11540-0x1157f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x3c, 0xb0, /* 0x11580-0x115bf */
+  0x01, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, /* 0x115c0-0x115ff */
+  /* 0x11600-0x117ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xa7, /* 0x11600-0x1163f */
+  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11640-0x1167f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0xbf, 0x00, /* 0x11680-0x116bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x116c0-0x116ff */
+  0x00, 0x00, 0x00, 0xa0, 0xbc, 0x0f, 0x00, 0x00, /* 0x11700-0x1173f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11740-0x1177f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11780-0x117bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x117c0-0x117ff */
+  /* 0x11800-0x119ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0xff, 0x06, /* 0x11800-0x1183f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11840-0x1187f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11880-0x118bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x118c0-0x118ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x58, /* 0x11900-0x1193f */
+  0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11940-0x1197f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11980-0x119bf */
+  0x00, 0x00, 0xf0, 0x0c, 0x01, 0x00, 0x00, 0x00, /* 0x119c0-0x119ff */
+  /* 0x11a00-0x11bff */
+  0x7e, 0x06, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x79, /* 0x11a00-0x11a3f */
+  0x80, 0x00, 0x7e, 0x0e, 0x00, 0x00, 0x00, 0x00, /* 0x11a40-0x11a7f */
+  0x00, 0xfc, 0x7f, 0x03, 0x00, 0x00, 0x00, 0x00, /* 0x11a80-0x11abf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11ac0-0x11aff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11b00-0x11b3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11b40-0x11b7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11b80-0x11bbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11bc0-0x11bff */
+  /* 0x11c00-0x11dff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x3f, /* 0x11c00-0x11c3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11c40-0x11c7f */
+  0x00, 0x00, 0xfc, 0xff, 0xff, 0xfc, 0x6d, 0x00, /* 0x11c80-0x11cbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11cc0-0x11cff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7e, 0xb4, /* 0x11d00-0x11d3f */
+  0xbf, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d40-0x11d7f */
+  0x00, 0x00, 0xa3, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11d80-0x11dbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11dc0-0x11dff */
+  /* 0x11e00-0x11fff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11e00-0x11e3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11e40-0x11e7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11e80-0x11ebf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, /* 0x11ec0-0x11eff */
+  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x07, /* 0x11f00-0x11f3f */
+  0x05, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, /* 0x11f40-0x11f7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11f80-0x11fbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x11fc0-0x11fff */
+  /* 0x13400-0x135ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, /* 0x13400-0x1343f */
+  0x81, 0xff, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13440-0x1347f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13480-0x134bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x134c0-0x134ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13500-0x1353f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13540-0x1357f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x13580-0x135bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x135c0-0x135ff */
+  /* 0x16000-0x161ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16000-0x1603f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16040-0x1607f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16080-0x160bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x160c0-0x160ff */
+  0x00, 0x00, 0x00, 0xc0, 0xff, 0xe3, 0x00, 0x00, /* 0x16100-0x1613f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16140-0x1617f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16180-0x161bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x161c0-0x161ff */
+  /* 0x16a00-0x16bff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a00-0x16a3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a40-0x16a7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16a80-0x16abf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, /* 0x16ac0-0x16aff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, /* 0x16b00-0x16b3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16b40-0x16b7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16b80-0x16bbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16bc0-0x16bff */
+  /* 0x16e00-0x16fff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16e00-0x16e3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16e40-0x16e7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16e80-0x16ebf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16ec0-0x16eff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16f00-0x16f3f */
+  0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16f40-0x16f7f */
+  0x00, 0x80, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x16f80-0x16fbf */
+  0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, /* 0x16fc0-0x16fff */
+  /* 0x1bc00-0x1bdff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc00-0x1bc3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bc40-0x1bc7f */
+  0x00, 0x00, 0x00, 0x60, 0x0f, 0x00, 0x00, 0x00, /* 0x1bc80-0x1bcbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bcc0-0x1bcff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bd00-0x1bd3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bd40-0x1bd7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bd80-0x1bdbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1bdc0-0x1bdff */
+  /* 0x1ce00-0x1cfff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ce00-0x1ce3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ce40-0x1ce7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1ce80-0x1cebf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cec0-0x1ceff */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x3f, 0xff, 0xff, /* 0x1cf00-0x1cf3f */
+  0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cf40-0x1cf7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cf80-0x1cfbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1cfc0-0x1cfff */
+  /* 0x1d000-0x1d1ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d000-0x1d03f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d040-0x1d07f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d080-0x1d0bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d0c0-0x1d0ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d100-0x1d13f */
+  0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0xf8, 0xff, /* 0x1d140-0x1d17f */
+  0xe7, 0x0f, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x00, /* 0x1d180-0x1d1bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d1c0-0x1d1ff */
+  /* 0x1d200-0x1d3ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d200-0x1d23f */
+  0x1c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d240-0x1d27f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d280-0x1d2bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d2c0-0x1d2ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d300-0x1d33f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d340-0x1d37f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d380-0x1d3bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1d3c0-0x1d3ff */
+  /* 0x1da00-0x1dbff */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0xf8, /* 0x1da00-0x1da3f */
+  0xff, 0xff, 0xff, 0xff, 0xff, 0x1f, 0x20, 0x00, /* 0x1da40-0x1da7f */
+  0x10, 0x00, 0x00, 0xf8, 0xfe, 0xff, 0x00, 0x00, /* 0x1da80-0x1dabf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1dac0-0x1daff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db00-0x1db3f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db40-0x1db7f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1db80-0x1dbbf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1dbc0-0x1dbff */
+  /* 0x1e000-0x1e1ff */
+  0x7f, 0xff, 0xff, 0xf9, 0xdb, 0x07, 0x00, 0x00, /* 0x1e000-0x1e03f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e040-0x1e07f */
+  0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e080-0x1e0bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e0c0-0x1e0ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0x00, /* 0x1e100-0x1e13f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e140-0x1e17f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e180-0x1e1bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e1c0-0x1e1ff */
+  /* 0x1e200-0x1e3ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e200-0x1e23f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e240-0x1e27f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, /* 0x1e280-0x1e2bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, /* 0x1e2c0-0x1e2ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e300-0x1e33f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e340-0x1e37f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e380-0x1e3bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e3c0-0x1e3ff */
+  /* 0x1e400-0x1e5ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e400-0x1e43f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e440-0x1e47f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e480-0x1e4bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x00, 0x00, /* 0x1e4c0-0x1e4ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e500-0x1e53f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e540-0x1e57f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e580-0x1e5bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, /* 0x1e5c0-0x1e5ff */
+  /* 0x1e800-0x1e9ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e800-0x1e83f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e840-0x1e87f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e880-0x1e8bf */
+  0x00, 0x00, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e8c0-0x1e8ff */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e900-0x1e93f */
+  0xf0, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e940-0x1e97f */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x1e980-0x1e9bf */
+  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00  /* 0x1e9c0-0x1e9ff */
+};
+static const signed char nonspacing_table_ind[248] = {
+   0,  1,  2,  3,  4,  5,  6,  7, /* 0x0000-0x0fff */
+   8,  9, -1, 10, 11, 12, 13, -1, /* 0x1000-0x1fff */
+  14, -1, -1, -1, -1, -1, 15, -1, /* 0x2000-0x2fff */
+  16, -1, -1, -1, -1, -1, -1, -1, /* 0x3000-0x3fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x4000-0x4fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x5000-0x5fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x6000-0x6fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x7000-0x7fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x8000-0x8fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x9000-0x9fff */
+  -1, -1, -1, 17, 18, 19, -1, -1, /* 0xa000-0xafff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xb000-0xbfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xc000-0xcfff */
+  -1, -1, -1, 20, -1, -1, -1, -1, /* 0xd000-0xdfff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0xe000-0xefff */
+  -1, -1, -1, -1, -1, 21, -1, 22, /* 0xf000-0xffff */
+  23, 24, -1, -1, -1, 25, 26, 27, /* 0x10000-0x10fff */
+  28, 29, 30, 31, 32, 33, 34, 35, /* 0x11000-0x11fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x12000-0x12fff */
+  -1, -1, 36, -1, -1, -1, -1, -1, /* 0x13000-0x13fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x14000-0x14fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x15000-0x15fff */
+  37, -1, -1, -1, -1, 38, -1, 39, /* 0x16000-0x16fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x17000-0x17fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x18000-0x18fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x19000-0x19fff */
+  -1, -1, -1, -1, -1, -1, -1, -1, /* 0x1a000-0x1afff */
+  -1, -1, -1, -1, -1, -1, 40, -1, /* 0x1b000-0x1bfff */
+  -1, -1, -1, -1, -1, -1, -1, 41, /* 0x1c000-0x1cfff */
+  42, 43, -1, -1, -1, 44, -1, -1, /* 0x1d000-0x1dfff */
+  45, 46, 47, -1, 48, -1, -1, -1  /* 0x1e000-0x1efff */
+};
diff --git a/gl/uniwidth/width2.h b/gl/uniwidth/width2.h
new file mode 100644
index 00000000..f919989b
--- /dev/null
+++ b/gl/uniwidth/width2.h
@@ -0,0 +1,541 @@
+/* DO NOT EDIT! GENERATED AUTOMATICALLY! */
+/* Width 2 property of Unicode characters.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 16.0.0.  */
+
+/* Copyright (C) 2000-2024 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#define header_0 16
+#define header_2 9
+#define header_3 127
+#define header_4 15
+static const
+struct
+  {
+    int header[1];
+    int level1[4];
+    short level2[3 << 7];
+    unsigned int level3[28 << 4];
+  }
+u_width2 =
+{
+  { 4 },
+  {
+        5 * sizeof (int) / sizeof (short) +     0,
+        5 * sizeof (int) / sizeof (short) +   128,
+        5 * sizeof (int) / sizeof (short) +   256,
+        5 * sizeof (int) / sizeof (short) +   256
+  },
+  {
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +     0,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +    16,
+        5 +   384 * sizeof (short) / sizeof (int) +    32,
+        5 +   384 * sizeof (short) / sizeof (int) +    48,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +    64,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +    80,
+        5 +   384 * sizeof (short) / sizeof (int) +    96,
+        5 +   384 * sizeof (short) / sizeof (int) +   112,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   144,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   160,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +   176,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   192,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +   208,
+        5 +   384 * sizeof (short) / sizeof (int) +   224,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +   240,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +   256,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   272,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   288,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +   304,
+        5 +   384 * sizeof (short) / sizeof (int) +   320,
+        5 +   384 * sizeof (short) / sizeof (int) +   336,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +   352,
+        5 +   384 * sizeof (short) / sizeof (int) +   368,
+        5 +   384 * sizeof (short) / sizeof (int) +   384,
+        5 +   384 * sizeof (short) / sizeof (int) +   400,
+        5 +   384 * sizeof (short) / sizeof (int) +   416,
+        5 +   384 * sizeof (short) / sizeof (int) +   432,
+       -1,
+       -1,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128,
+        5 +   384 * sizeof (short) / sizeof (int) +   128
+  },
+  {
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x0C000000U, 0x00000600U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00091E00U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x60000000U,
+    0x00300000U, 0x00000000U, 0x000FFF00U, 0x80000000U,
+    0x00080000U, 0x60000C02U, 0x00104030U, 0x242C0400U,
+    0x00000C20U, 0x00000100U, 0x00B85000U, 0x00000000U,
+    0x00E00000U, 0x80010000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x18000000U, 0x00000000U, 0x00210000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFF00FFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x1FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x0000000FU, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFF0000U, 0xFFFF0000U, 0xFFFFFFFFU, 0x0000FFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00000001U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0000007FU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x0003000FU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x00FFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x003FFFFFU, 0x00000000U,
+    0x000001FFU, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x6FEF0000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0x00000007U, 0x00070000U, 0xFFFF00F0U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x0FFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000010U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00008000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x07FE4000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFBFE001U, 0xFFFFFFFFU, 0xDFFFFFFFU,
+    0x000FFFFFU, 0xFFFFFFFFU, 0x000F87FFU, 0xFF11FFFFU,
+    0xFFFFFFFFU, 0x7FFFFFFFU, 0xFFFFFFFDU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0x9FFFFFFFU,
+    0xFFFFFFFFU, 0x3FFFFFFFU, 0xFFFF7800U, 0x040000FFU,
+    0x00600000U, 0x00000010U, 0x00000000U, 0xF8000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0x0000FFFFU, 0x00000000U,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xE0E7103FU, 0x1FF01800U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00010FFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0xFFFFF000U, 0xF7FFFFFFU, 0xFFFFFFBFU, 0xFFFFFFFFU,
+    0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x1F1F0000U,
+    0xFFFF007FU, 0x07FF1FFFU, 0x03FF003FU, 0x007F00FFU,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U,
+    0x00000000U, 0x00000000U, 0x00000000U, 0x00000000U
+  }
+};
diff --git a/gl/unlocked-io.h b/gl/unlocked-io.h
index 0cd9bbf3..69ea6641 100644
--- a/gl/unlocked-io.h
+++ b/gl/unlocked-io.h
@@ -1,6 +1,6 @@
 /* Prefer faster, non-thread-safe stdio functions if available.
 
-   Copyright (C) 2001-2004, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gl/unsetenv.c b/gl/unsetenv.c
index d8ada2aa..d38ed37a 100644
--- a/gl/unsetenv.c
+++ b/gl/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2024 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2025 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This file is free software: you can redistribute it and/or modify
@@ -57,7 +57,6 @@ int
 unsetenv (const char *name)
 {
   size_t len;
-  char **ep;
 
   if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
     {
@@ -67,9 +66,37 @@ unsetenv (const char *name)
 
   len = strlen (name);
 
+#if HAVE_DECL__PUTENV /* native Windows */
+  /* The Microsoft documentation
+     <https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/putenv-wputenv>
+     says:
+       "Don't change an environment entry directly: instead,
+        use _putenv or _wputenv to change it."
+     Note: Microsoft's _putenv updates not only the contents of _environ but
+     also the contents of _wenviron, so that both are in kept in sync.
+
+     The way to remove an environment variable is to pass to _putenv a string
+     of the form "NAME=".  (NB: This is a different convention than with glibc
+     putenv, which expects a string of the form "NAME"!)  */
+  {
+    int putenv_result;
+    char *name_ = malloc (len + 2);
+    if (name_ == NULL)
+      return -1;
+    memcpy (name_, name, len);
+    name_[len] = '=';
+    name_[len + 1] = 0;
+    putenv_result = _putenv (name_);
+    /* In this particular case it is OK to free() the argument passed to
+       _putenv.  */
+    free (name_);
+    return putenv_result;
+  }
+#else
+
   LOCK;
 
-  ep = __environ;
+  char **ep = __environ;
   while (*ep != NULL)
     if (!strncmp (*ep, name, len) && (*ep)[len] == '=')
       {
@@ -87,6 +114,7 @@ unsetenv (const char *name)
   UNLOCK;
 
   return 0;
+#endif
 }
 
 #ifdef _LIBC
diff --git a/gl/vasnprintf.c b/gl/vasnprintf.c
index de204458..f46e8701 100644
--- a/gl/vasnprintf.c
+++ b/gl/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -29,6 +29,7 @@
                         Depends on FCHAR_T.
      DCHAR_CPY          memcpy like function for DCHAR_T[] arrays.
      DCHAR_SET          memset like function for DCHAR_T[] arrays.
+     DCHAR_STRLEN       strlen like function for DCHAR_T[] arrays.
      DCHAR_MBSNLEN      mbsnlen like function for DCHAR_T[] arrays.
      SNPRINTF           The system's snprintf (or similar) function.
                         This may be either snprintf or swprintf.
@@ -64,7 +65,7 @@
 /* As of GCC 11.2.1, gcc -Wanalyzer-too-complex reports that main's
    use of CHECK macros expands to code that is too complicated for gcc
    -fanalyzer.  Suppress the resulting bogus warnings.  */
-#if 10 <= __GNUC__
+#if _GL_GNUC_PREREQ (10, 0)
 # pragma GCC diagnostic ignored "-Wanalyzer-null-argument"
 #endif
 
@@ -80,14 +81,15 @@
 #endif
 
 #include <locale.h>     /* localeconv() */
+#include <stdint.h>     /* PTRDIFF_MAX */
 #include <stdio.h>      /* snprintf(), sprintf() */
 #include <stdlib.h>     /* abort(), malloc(), realloc(), free() */
 #include <string.h>     /* memcpy(), strlen() */
 #include <wchar.h>      /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb(), mbszero() */
 #include <errno.h>      /* errno */
-#include <limits.h>     /* CHAR_BIT, INT_WIDTH, LONG_WIDTH */
-#include <float.h>      /* DBL_MAX_EXP, LDBL_MAX_EXP */
-#if HAVE_NL_LANGINFO
+#include <limits.h>     /* CHAR_BIT, INT_MAX, INT_WIDTH, LONG_WIDTH */
+#include <float.h>      /* DBL_MAX_EXP, LDBL_MAX_EXP, LDBL_MANT_DIG */
+#if HAVE_NL_LANGINFO || __GLIBC__ >= 2 || defined __CYGWIN__
 # include <langinfo.h>
 #endif
 #ifndef VASNPRINTF
@@ -182,6 +184,20 @@
 #   define TCHAR_T char
 # endif
 #endif
+#ifndef DCHAR_STRLEN
+# if WIDE_CHAR_VERSION
+#  define DCHAR_STRLEN local_wcslen
+# else
+#  define DCHAR_STRLEN strlen
+# endif
+#endif
+#ifndef DCHAR_MBSNLEN
+# if WIDE_CHAR_VERSION
+#  define DCHAR_MBSNLEN wcsnlen
+# else
+#  define DCHAR_MBSNLEN mbsnlen
+# endif
+#endif
 #if !WIDE_CHAR_VERSION || !DCHAR_IS_TCHAR
   /* TCHAR_T is char.  */
   /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'.
@@ -216,6 +232,12 @@
 /* Here we need to call the native sprintf, not rpl_sprintf.  */
 #undef sprintf
 
+/* macOS 12's "warning: 'sprintf' is deprecated" is pointless,
+   as sprintf is used safely here.  */
+#if defined __APPLE__ && defined __MACH__ && _GL_GNUC_PREREQ (4, 2)
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 /* GCC >= 4.0 with -Wall emits unjustified "... may be used uninitialized"
    warnings in this file.  Use -Dlint to suppress them.  */
 #if defined GCC_LINT || defined lint
@@ -224,6 +246,11 @@
 # define IF_LINT(Code) /* empty */
 #endif
 
+/* Here we need only the most basic fields of 'struct lconv', and can
+   therefore use the system's localeconv() function, without needing a
+   dependency on module 'localeconv'.  */
+#undef localeconv
+
 /* Avoid some warnings from "gcc -Wshadow".
    This file doesn't use the exp() and remainder() functions.  */
 #undef exp
@@ -231,7 +258,7 @@
 #undef remainder
 #define remainder rem
 
-#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && !WIDE_CHAR_VERSION
+#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (PTRDIFF_MAX > INT_MAX)) && !WIDE_CHAR_VERSION
 # if (HAVE_STRNLEN && !defined _AIX)
 #  define local_strnlen strnlen
 # else
@@ -247,7 +274,7 @@ local_strnlen (const char *string, size_t maxlen)
 # endif
 #endif
 
-#if (((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_WPRINTF_DIRECTIVE_LC) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T
+#if ((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (PTRDIFF_MAX > INT_MAX) || !DCHAR_IS_TCHAR || NEED_WPRINTF_DIRECTIVE_LC) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || (PTRDIFF_MAX > INT_MAX) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)
 # if HAVE_WCSLEN
 #  define local_wcslen wcslen
 # else
@@ -270,7 +297,7 @@ local_wcslen (const wchar_t *s)
 # endif
 #endif
 
-#if (!USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION
+#if (!USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION
 # if HAVE_WCSNLEN && HAVE_DECL_WCSNLEN
 #  define local_wcsnlen wcsnlen
 # else
@@ -289,7 +316,7 @@ local_wcsnlen (const wchar_t *s, size_t maxlen)
 # endif
 #endif
 
-#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T) || ((NEED_PRINTF_DIRECTIVE_LC || ENABLE_WCHAR_FALLBACK) && HAVE_WINT_T)) && !WIDE_CHAR_VERSION
+#if ((!USE_SNPRINTF || (PTRDIFF_MAX > INT_MAX) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) || ((NEED_PRINTF_DIRECTIVE_LC || ENABLE_WCHAR_FALLBACK) && HAVE_WINT_T)) && !WIDE_CHAR_VERSION
 # if ENABLE_WCHAR_FALLBACK
 static size_t
 wctomb_fallback (char *s, wchar_t wc)
@@ -357,7 +384,7 @@ local_wctomb (char *s, wchar_t wc)
 # endif
 #endif
 
-#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION)
+#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION) || (NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT)
 /* Determine the decimal-point character according to the current locale.  */
 # ifndef decimal_point_char_defined
 #  define decimal_point_char_defined 1
@@ -384,6 +411,217 @@ decimal_point_char (void)
 # endif
 #endif
 
+#if (!WIDE_CHAR_VERSION && (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE)) || ((!WIDE_CHAR_VERSION || !DCHAR_IS_TCHAR) && (NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT))
+/* Determine the thousands-separator character according to the current
+   locale.
+   It is a single multibyte character.
+   In glibc: 35x ".", 90x ",", 23x U+202F, 1x U+2019, 1x U+066C, on other
+   systems also U+00A0.  */
+# ifndef thousands_separator_char_defined
+#  define thousands_separator_char_defined 1
+static const char *
+thousands_separator_char (char stackbuf[10])
+{
+  /* Determine it in a multithread-safe way.
+     We know nl_langinfo is multithread-safe on glibc systems, on Mac OS X
+     systems, and on NetBSD, but is not required to be multithread-safe by
+     POSIX.
+     localeconv() is not guaranteed to be multithread-safe by POSIX either;
+     however, on native Windows it is (cf. test-localeconv-mt).
+     sprintf(), however, is multithread-safe.  */
+#  if HAVE_NL_LANGINFO && (__GLIBC__ || defined __UCLIBC__ || (defined __APPLE__ && defined __MACH__) || defined __NetBSD__)
+  return nl_langinfo (THOUSEP);
+#  elif defined _WIN32 && !defined __CYGWIN__
+  return localeconv () -> thousands_sep;
+#  else
+  sprintf (stackbuf, "%'.0f", 1000.0);
+  /* Now stackbuf = "1<thousep>000".  */
+  stackbuf[strlen (stackbuf) - 3] = '\0';
+#   if defined __sun
+  /* Solaris specific hack: Replace wrong result (0xC2 means U+00A0).  */
+  if (strcmp (&stackbuf[1], "\302") == 0)
+    strcpy (&stackbuf[1], MB_CUR_MAX > 1 ? "\302\240" : "\240");
+#   endif
+  return &stackbuf[1];
+#  endif
+}
+# endif
+#endif
+#if !WIDE_CHAR_VERSION && defined DCHAR_CONV_FROM_ENCODING && (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE)
+/* Determine the thousands-separator character, as a DCHAR_T[] array,
+   according to the current locale.
+   It is a single Unicode character.  */
+# ifndef thousands_separator_DCHAR_defined
+#  define thousands_separator_DCHAR_defined 1
+static const DCHAR_T *
+thousands_separator_DCHAR (DCHAR_T stackbuf[10])
+{
+  /* Determine it in a multithread-safe way.  */
+  char tmpbuf[10];
+  const char *tmp = thousands_separator_char (tmpbuf);
+  if (*tmp != '\0')
+    {
+      /* Convert it from char[] to DCHAR_T[].  */
+      size_t converted_len = 10;
+      DCHAR_T *converted =
+        DCHAR_CONV_FROM_ENCODING (locale_charset (),
+                                  iconveh_question_mark,
+                                  tmp, strlen (tmp) + 1,
+                                  NULL,
+                                  stackbuf, &converted_len);
+      if (converted != NULL)
+        {
+          if (converted != stackbuf)
+            /* It should not be so long.  */
+            abort ();
+          return stackbuf;
+        }
+    }
+  stackbuf[0] = 0;
+  return stackbuf;
+}
+# endif
+#endif
+/* Maximum number of 'char' in the char[] or DCHAR_T[] representation of the
+   thousands separator.  */
+#define THOUSEP_CHAR_MAXLEN 3
+
+#if WIDE_CHAR_VERSION && ((NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) || ((NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT) && DCHAR_IS_TCHAR))
+/* Determine the thousands-separator character, as a wide character, according
+   to the current locale.
+   It is a single wide character.  */
+# ifndef thousands_separator_wchar_defined
+#  define thousands_separator_wchar_defined 1
+static const wchar_t *
+thousands_separator_wchar (wchar_t stackbuf[10])
+{
+#  if __GLIBC__ >= 2 || defined __CYGWIN__
+  /* On glibc, in the unibyte locale fr_FR, the *wprintf routines use U+202F
+     as separator, which cannot be represented in the locale encoding.  */
+  stackbuf[0] =
+    (wchar_t) (unsigned long) nl_langinfo (_NL_NUMERIC_THOUSANDS_SEP_WC);
+  stackbuf[1] = L'\0';
+  return stackbuf;
+#  elif defined _WIN32 && !defined __CYGWIN__
+  const char *tmp = localeconv () -> thousands_sep;
+  if (*tmp != '\0')
+    {
+      mbstate_t state;
+      mbszero (&state);
+      if ((int) mbrtowc (&stackbuf[0], tmp, strlen (tmp), &state) > 0)
+        stackbuf[1] = L'\0';
+      else
+        stackbuf[0] = L'\0';
+    }
+  else
+    stackbuf[0] = L'\0';
+  return stackbuf;
+#  elif defined __sun
+  /* Use sprintf, because swprintf retrieves a wrong value for the
+     thousands-separator wide character (e.g. (wchar_t) 0xffffffa0).  */
+  char tmp[10];
+  sprintf (tmp, "%'.0f", 1000.0);
+  /* Now tmp = L"1<thousep>000".  */
+  tmp[strlen (tmp) - 3] = '\0';
+  /* Solaris specific hack: Replace wrong result (0xC2 means U+00A0).  */
+  if (strcmp (&tmp[1], "\302") == 0)
+    strcpy (&tmp[1], MB_CUR_MAX > 1 ? "\302\240" : "\240");
+  if (tmp[1] != '\0')
+    {
+      mbstate_t state;
+      mbszero (&state);
+      if ((int) mbrtowc (&stackbuf[0], &tmp[1], strlen (&tmp[1]), &state) > 0)
+        stackbuf[1] = L'\0';
+      else
+        stackbuf[0] = L'\0';
+    }
+  else
+    stackbuf[0] = L'\0';
+  return stackbuf;
+#  else
+  swprintf (stackbuf, 10, L"%'.0f", 1000.0);
+  /* Now stackbuf = L"1<thousep>000".  */
+  stackbuf[local_wcslen (stackbuf) - 3] = '\0';
+  return &stackbuf[1];
+#  endif
+}
+# endif
+#endif
+/* Maximum number of 'wchar_t' in the wchar_t[] representation of the thousands
+   separator.  */
+#define THOUSEP_WCHAR_MAXLEN 1
+
+#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) || (NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT)
+# ifndef grouping_rule_defined
+#  define grouping_rule_defined 1
+/* Determine the grouping rule.
+ * As specified in POSIX
+ * <https://pubs.opengroup.org/onlinepubs/9799919799/functions/localeconv.html>
+ * <https://pubs.opengroup.org/onlinepubs/9799919799/basedefs/V1_chap07.html#tag_07_03_04>
+ * it is a string whose elements are 'signed char' values, where
+ * "Each integer specifies the number of digits in each group, with the initial
+ *  integer defining the size of the group immediately preceding the decimal
+ *  delimiter, and the following integers defining the preceding groups.  If
+ *  the last integer is not -1, then the size of the previous group (if any)
+ *  shall be repeatedly used for the remainder of the digits.  If the last
+ *  integer is -1, then no further grouping shall be performed."
+ * Platforms that have locales with grouping:
+ *   glibc, FreeBSD, NetBSD, AIX, Solaris, Cygwin, Haiku.
+ * Platforms that don't:
+ *   musl libc, macOS, OpenBSD, Android, mingw, MSVC.
+ * Typical grouping rules on glibc:
+ *   136x 3     (fr_FR etc.)
+ *   4x 4       (cmn_TW etc.)
+ *   9x 3;2     (ta_IN etc.)
+ *   1x 2;2;2;3 (umn_US)
+ *   21x -1     (C etc.)
+ */
+static const signed char *
+grouping_rule (void)
+{
+  /* We know nl_langinfo is multithread-safe on glibc systems and on Cygwin,
+     but is not required to be multithread-safe by POSIX.
+     localeconv() is not guaranteed to be multithread-safe by POSIX either;
+     however, on all known systems it is (cf. test-localeconv-mt).  */
+#  if __GLIBC__ >= 2
+  return (const signed char *) nl_langinfo (GROUPING);
+#  elif defined __CYGWIN__
+  return (const signed char *) nl_langinfo (_NL_NUMERIC_GROUPING);
+#  else
+  return (const signed char *) localeconv () -> grouping;
+#  endif
+}
+/* Determines the number of thousands-separators to be inserted in a digit
+   sequence with ndigits digits (before the decimal point).  */
+static size_t
+num_thousands_separators (const signed char *grouping, size_t ndigits)
+{
+  const signed char *g = grouping;
+  int h = *g;
+  if (h <= 0 || ndigits == 0)
+    return 0;
+  size_t insert = 0;
+  for (;;)
+    {
+      /* Invariant: here h == *g, h > 0, ndigits > 0.  */
+      if (g[1] == 0)
+        /* h repeats endlessly.  */
+        return insert + (ndigits - 1) / h;
+      /* h does not repeat.  */
+      if (ndigits <= h)
+        return insert;
+      ndigits -= h;
+      insert++;
+      g++;
+      h = *g;
+      if (h < 0)
+        /* No further grouping.  */
+        return insert;
+    }
+}
+# endif
+#endif
+
 #if NEED_PRINTF_INFINITE_DOUBLE && !NEED_PRINTF_DOUBLE
 
 /* Equivalent to !isfinite(x) || x == 0, but does not require libm.  */
@@ -406,8 +644,45 @@ is_infinite_or_zerol (long double x)
 
 #endif
 
+#if NEED_PRINTF_LONG_DOUBLE
+
+/* Like frexpl, except that it supports even "unsupported" numbers.  */
+# if (LDBL_MANT_DIG == 64 && (defined __ia64 || (defined __x86_64__ || defined __amd64__) || (defined __i386 || defined __i386__ || defined _I386 || defined _M_IX86 || defined _X86_))) && (defined __APPLE__ && defined __MACH__)
+/* Don't assume that frexpl can handle pseudo-denormals; it does not on
+   macOS 12/x86_64.  Therefore test for a pseudo-denormal explicitly.  */
+
+static
+long double safe_frexpl (long double x, int *exp)
+{
+  union
+    {
+      long double value;
+      struct { unsigned int mant_word[2]; unsigned short sign_exp_word; } r;
+    }
+  u;
+  u.value = x;
+  if (u.r.sign_exp_word == 0 && (u.r.mant_word[1] & 0x80000000u) != 0)
+    {
+      /* Pseudo-Denormal.  */
+      *exp = LDBL_MIN_EXP;
+      u.r.sign_exp_word = 1 - LDBL_MIN_EXP;
+      return u.value;
+    }
+  else
+    return frexpl (x, exp);
+}
+
+# else
+#  define safe_frexpl frexpl
+# endif
+
+#endif
+
 #if NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE
 
+/* An indicator for a failed memory allocation.  */
+# define NOMEM_PTR ((void *) (-1))
+
 /* Converting 'long double' to decimal without rare rounding bugs requires
    real bignums.  We use the naming conventions of GNU gmp, but vastly simpler
    (and slower) algorithms.  */
@@ -428,8 +703,8 @@ typedef struct
 } mpn_t;
 
 /* Compute the product of two bignums >= 0.
-   Return the allocated memory in case of success, NULL in case of memory
-   allocation failure.  */
+   Return the allocated memory (possibly NULL) in case of success, NOMEM_PTR
+   in case of memory allocation failure.  */
 static void *
 multiply (mpn_t src1, mpn_t src2, mpn_t *dest)
 {
@@ -457,7 +732,7 @@ multiply (mpn_t src1, mpn_t src2, mpn_t *dest)
     {
       /* src1 or src2 is zero.  */
       dest->nlimbs = 0;
-      dest->limbs = (mp_limb_t *) malloc (1);
+      dest->limbs = NULL;
     }
   else
     {
@@ -469,7 +744,7 @@ multiply (mpn_t src1, mpn_t src2, mpn_t *dest)
       dlen = len1 + len2;
       dp = (mp_limb_t *) malloc (dlen * sizeof (mp_limb_t));
       if (dp == NULL)
-        return NULL;
+        return NOMEM_PTR;
       for (k = len2; k > 0; )
         dp[--k] = 0;
       for (i = 0; i < len1; i++)
@@ -500,8 +775,8 @@ multiply (mpn_t src1, mpn_t src2, mpn_t *dest)
    the remainder.
    Finally, round-to-even is performed: If r > b/2 or if r = b/2 and q is odd,
    q is incremented.
-   Return the allocated memory in case of success, NULL in case of memory
-   allocation failure.  */
+   Return the allocated memory (possibly NULL) in case of success, NOMEM_PTR
+   in case of memory allocation failure.  */
 static void *
 divide (mpn_t a, mpn_t b, mpn_t *q)
 {
@@ -572,7 +847,7 @@ divide (mpn_t a, mpn_t b, mpn_t *q)
      final rounding of q.)  */
   roomptr = (mp_limb_t *) malloc ((a_len + 2) * sizeof (mp_limb_t));
   if (roomptr == NULL)
-    return NULL;
+    return NOMEM_PTR;
 
   /* Normalise a.  */
   while (a_len > 0 && a_ptr[a_len - 1] == 0)
@@ -708,7 +983,7 @@ divide (mpn_t a, mpn_t b, mpn_t *q)
           if (tmp_roomptr == NULL)
             {
               free (roomptr);
-              return NULL;
+              return NOMEM_PTR;
             }
           {
             const mp_limb_t *sourceptr = b_ptr;
@@ -930,7 +1205,7 @@ divide (mpn_t a, mpn_t b, mpn_t *q)
 /* Avoid pointless GCC warning "argument 1 value '18446744073709551615' exceeds
    maximum object size 9223372036854775807", triggered by the use of xsum as
    argument of malloc.  */
-# if __GNUC__ >= 7
+# if _GL_GNUC_PREREQ (7, 0)
 #  pragma GCC diagnostic push
 #  pragma GCC diagnostic ignored "-Walloc-size-larger-than="
 # endif
@@ -991,7 +1266,7 @@ convert_to_decimal (mpn_t a, size_t extra_zeroes)
   return c_ptr;
 }
 
-# if __GNUC__ >= 7
+# if _GL_GNUC_PREREQ (7, 0)
 #  pragma GCC diagnostic pop
 # endif
 
@@ -1015,7 +1290,7 @@ decode_long_double (long double x, int *ep, mpn_t *mp)
   if (m.limbs == NULL)
     return NULL;
   /* Split into exponential part and mantissa.  */
-  y = frexpl (x, &exp);
+  y = safe_frexpl (x, &exp);
   if (!(y >= 0.0L && y < 1.0L))
     abort ();
   /* x = 2^exp * y = 2^(exp - LDBL_MANT_BIT) * (y * 2^LDBL_MANT_BIT), and the
@@ -1306,7 +1581,7 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *memory, int n)
           mpn_t denominator;
           void *tmp_memory;
           tmp_memory = multiply (m, pow5, &numerator);
-          if (tmp_memory == NULL)
+          if (tmp_memory == NOMEM_PTR)
             {
               free (pow5_ptr);
               free (memory);
@@ -1379,7 +1654,7 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *memory, int n)
 
   /* Here y = round (x * 10^n) = z * 10^extra_zeroes.  */
 
-  if (z_memory == NULL)
+  if (z_memory == NOMEM_PTR)
     return NULL;
   digits = convert_to_decimal (z, extra_zeroes);
   free (z_memory);
@@ -1442,7 +1717,7 @@ floorlog10l (long double x)
   double l;
 
   /* Split into exponential part and mantissa.  */
-  y = frexpl (x, &exp);
+  y = safe_frexpl (x, &exp);
   if (!(y >= 0.0L && y < 1.0L))
     abort ();
   if (y == 0.0L)
@@ -1801,8 +2076,17 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
         }
       if (tmp_length < precision)
         tmp_length = precision;
-      /* Multiply by 2, as an estimate for FLAG_GROUP.  */
-      tmp_length = xsum (tmp_length, tmp_length);
+      /* Account for thousands separators.  */
+      if (flags & FLAG_GROUP)
+        {
+          /* A thousands separator needs to be inserted at most every 2 digits.
+             This is the case in the ta_IN locale.  */
+# if WIDE_CHAR_VERSION
+          tmp_length = xsum (tmp_length, tmp_length / 2 * THOUSEP_WCHAR_MAXLEN);
+# else
+          tmp_length = xsum (tmp_length, tmp_length / 2 * THOUSEP_CHAR_MAXLEN);
+# endif
+        }
       /* Add 1, to account for a leading sign.  */
       tmp_length = xsum (tmp_length, 1);
       break;
@@ -2050,12 +2334,18 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
       tmp_length = xsum (tmp_length, 2);
       break;
 
+    case 'e': case 'E':
+      tmp_length =
+        12; /* sign, decimal point, exponent etc. */
+      tmp_length = xsum (tmp_length, precision);
+      break;
+
     case 'f': case 'F':
       if (type == TYPE_LONGDOUBLE)
         tmp_length =
           (unsigned int) (LDBL_MAX_EXP
                           * 0.30103 /* binary -> decimal */
-                          * 2 /* estimate for FLAG_GROUP */
+                          * 0.5 * 3 /* estimate for FLAG_GROUP */
                          )
           + 1 /* turn floor into ceil */
           + 10; /* sign, decimal point etc. */
@@ -2063,17 +2353,20 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
         tmp_length =
           (unsigned int) (DBL_MAX_EXP
                           * 0.30103 /* binary -> decimal */
-                          * 2 /* estimate for FLAG_GROUP */
+                          * 0.5 * 3 /* estimate for FLAG_GROUP */
                          )
           + 1 /* turn floor into ceil */
           + 10; /* sign, decimal point etc. */
       tmp_length = xsum (tmp_length, precision);
       break;
 
-    case 'e': case 'E': case 'g': case 'G':
+    case 'g': case 'G':
       tmp_length =
         12; /* sign, decimal point, exponent etc. */
-      tmp_length = xsum (tmp_length, precision);
+      tmp_length = xsum (tmp_length,
+                         precision
+                         * 0.5 * 3 /* estimate for FLAG_GROUP */
+                        );
       break;
 
     case 'a': case 'A':
@@ -2111,10 +2404,9 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
       break;
 
     case 's':
-# if HAVE_WCHAR_T
       if (type == TYPE_WIDE_STRING)
         {
-#  if WIDE_CHAR_VERSION
+# if WIDE_CHAR_VERSION
           /* ISO C says about %ls in fwprintf:
                "If the precision is not specified or is greater than the size
                 of the array, the array shall contain a null wide character."
@@ -2125,7 +2417,7 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
             tmp_length = local_wcsnlen (arg, precision);
           else
             tmp_length = local_wcslen (arg);
-#  else
+# else
           /* ISO C says about %ls in fprintf:
                "If a precision is specified, no more than that many bytes are
                 written (including shift sequences, if any), and the array
@@ -2136,10 +2428,9 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
              So if there is a precision, we must not use wcslen.  */
           /* This case has already been handled separately in VASNPRINTF.  */
           abort ();
-#  endif
+# endif
         }
       else
-# endif
         {
 # if WIDE_CHAR_VERSION
           /* ISO C says about %s in fwprintf:
@@ -2226,7 +2517,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
     TCHAR_T *buf;
     TCHAR_T *buf_malloced;
     const FCHAR_T *cp;
-    size_t i;
+    size_t di;
     DIRECTIVE *dp;
     /* Output string accumulator.  */
     DCHAR_T *result;
@@ -2290,7 +2581,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #define ENSURE_ALLOCATION(needed) \
   ENSURE_ALLOCATION_ELSE((needed), goto out_of_memory; )
 
-    for (cp = format, i = 0, dp = &d.dir[0]; ; cp = dp->dir_end, i++, dp++)
+    for (cp = format, di = 0, dp = &d.dir[0]; ; cp = dp->dir_end, di++, dp++)
       {
         if (cp != dp->dir_start)
           {
@@ -2313,7 +2604,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                 while (--n > 0);
               }
           }
-        if (i == d.count)
+        if (di == d.count)
           break;
 
         /* Execute a single directive.  */
@@ -2423,6 +2714,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
                     has_width = 1;
                   }
 
@@ -2501,7 +2794,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         {
                           /* Use the entire string.  */
                           arg_end = arg + u8_strlen (arg);
-                          /* The number of characters doesn't matter.  */
+                          /* The number of characters doesn't matter,
+                             because !has_width and therefore width==0.  */
                           characters = 0;
                         }
 
@@ -2542,7 +2836,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         if (converted != result + length)
                           {
                             ENSURE_ALLOCATION_ELSE (xsum (length, converted_len),
-                                                    { free (converted); goto out_of_memory; });
+                              { free (converted); goto out_of_memory; });
                             DCHAR_CPY (result + length, converted, converted_len);
                             free (converted);
                           }
@@ -2603,7 +2897,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         {
                           /* Use the entire string.  */
                           arg_end = arg + u16_strlen (arg);
-                          /* The number of characters doesn't matter.  */
+                          /* The number of characters doesn't matter,
+                             because !has_width and therefore width==0.  */
                           characters = 0;
                         }
 
@@ -2644,7 +2939,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         if (converted != result + length)
                           {
                             ENSURE_ALLOCATION_ELSE (xsum (length, converted_len),
-                                                    { free (converted); goto out_of_memory; });
+                              { free (converted); goto out_of_memory; });
                             DCHAR_CPY (result + length, converted, converted_len);
                             free (converted);
                           }
@@ -2705,7 +3000,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         {
                           /* Use the entire string.  */
                           arg_end = arg + u32_strlen (arg);
-                          /* The number of characters doesn't matter.  */
+                          /* The number of characters doesn't matter,
+                             because !has_width and therefore width==0.  */
                           characters = 0;
                         }
 
@@ -2746,7 +3042,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         if (converted != result + length)
                           {
                             ENSURE_ALLOCATION_ELSE (xsum (length, converted_len),
-                                                    { free (converted); goto out_of_memory; });
+                              { free (converted); goto out_of_memory; });
                             DCHAR_CPY (result + length, converted, converted_len);
                             free (converted);
                           }
@@ -2769,7 +3065,190 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   }
               }
 #endif
-#if WIDE_CHAR_VERSION && (!DCHAR_IS_TCHAR || NEED_WPRINTF_DIRECTIVE_LC)
+#if !WIDE_CHAR_VERSION && (PTRDIFF_MAX > INT_MAX)
+            else if (dp->conversion == 's'
+                     && a.arg[dp->arg_index].type != TYPE_WIDE_STRING)
+              {
+                /* %s in vasnprintf.  See the specification of fprintf.
+                   We handle it ourselves here, because the string may be longer
+                   than INT_MAX characters, whence snprintf or sprintf would
+                   fail to process it.  */
+                int flags = dp->flags;
+                int has_width;
+                size_t width;
+                int has_precision;
+                size_t precision;
+
+                has_width = 0;
+                width = 0;
+                if (dp->width_start != dp->width_end)
+                  {
+                    if (dp->width_arg_index != ARG_NONE)
+                      {
+                        int arg;
+
+                        if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
+                          abort ();
+                        arg = a.arg[dp->width_arg_index].a.a_int;
+                        width = arg;
+                        if (arg < 0)
+                          {
+                            /* "A negative field width is taken as a '-' flag
+                                followed by a positive field width."  */
+                            flags |= FLAG_LEFT;
+                            width = -width;
+                          }
+                      }
+                    else
+                      {
+                        const FCHAR_T *digitp = dp->width_start;
+
+                        do
+                          width = xsum (xtimes (width, 10), *digitp++ - '0');
+                        while (digitp != dp->width_end);
+                      }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
+                    has_width = 1;
+                  }
+
+                has_precision = 0;
+                precision = 6;
+                if (dp->precision_start != dp->precision_end)
+                  {
+                    if (dp->precision_arg_index != ARG_NONE)
+                      {
+                        int arg;
+
+                        if (!(a.arg[dp->precision_arg_index].type == TYPE_INT))
+                          abort ();
+                        arg = a.arg[dp->precision_arg_index].a.a_int;
+                        /* "A negative precision is taken as if the precision
+                            were omitted."  */
+                        if (arg >= 0)
+                          {
+                            precision = arg;
+                            has_precision = 1;
+                          }
+                      }
+                    else
+                      {
+                        const FCHAR_T *digitp = dp->precision_start + 1;
+
+                        precision = 0;
+                        while (digitp != dp->precision_end)
+                          precision = xsum (xtimes (precision, 10), *digitp++ - '0');
+                        has_precision = 1;
+                      }
+                  }
+
+                {
+                  const char *arg = a.arg[dp->arg_index].a.a_string;
+                  size_t bytes;
+# if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
+                  size_t characters;
+# endif
+# if !DCHAR_IS_TCHAR
+                  /* This code assumes that TCHAR_T is 'char'.  */
+                  static_assert (sizeof (TCHAR_T) == 1);
+                  DCHAR_T *tmpdst;
+                  size_t tmpdst_len;
+# endif
+                  size_t w;
+
+                  if (has_precision)
+                    {
+                      /* Use only at most PRECISION bytes, from the left.  */
+                      bytes = local_strnlen (arg, precision);
+                    }
+                  else
+                    {
+                      /* Use the entire string, and count the number of
+                         bytes.  */
+                      bytes = strlen (arg);
+                    }
+
+# if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
+                  if (has_width)
+                    characters = mbsnlen (arg, bytes);
+                  else
+                    {
+                      /* The number of characters doesn't matter,
+                         because !has_width and therefore width==0.  */
+                      characters = 0;
+                    }
+# endif
+
+# if !DCHAR_IS_TCHAR
+                  /* Convert from TCHAR_T[] to DCHAR_T[].  */
+                  tmpdst =
+                    DCHAR_CONV_FROM_ENCODING (locale_charset (),
+                                              iconveh_question_mark,
+                                              arg, bytes,
+                                              NULL,
+                                              NULL, &tmpdst_len);
+                  if (tmpdst == NULL)
+                    goto fail_with_errno;
+# endif
+
+                  if (has_width)
+                    {
+# if ENABLE_UNISTDIO
+                      /* Outside POSIX, it's preferable to compare the width
+                         against the number of _characters_ of the converted
+                         value.  */
+#  if DCHAR_IS_TCHAR
+                      w = characters;
+#  else
+                      w = DCHAR_MBSNLEN (tmpdst, tmpdst_len);
+#  endif
+# else
+                      /* The width is compared against the number of _bytes_
+                         of the converted value, says POSIX.  */
+                      w = bytes;
+# endif
+                    }
+                  else
+                    /* w doesn't matter.  */
+                    w = 0;
+
+                  {
+# if DCHAR_IS_TCHAR
+                    size_t total = bytes + (w < width ? width - w : 0);
+                    ENSURE_ALLOCATION (xsum (length, total));
+# else
+                    size_t total = tmpdst_len + (w < width ? width - w : 0);
+                    ENSURE_ALLOCATION_ELSE (xsum (length, total),
+                      { free (tmpdst); goto out_of_memory; });
+# endif
+
+                    if (w < width && !(flags & FLAG_LEFT))
+                      {
+                        size_t n = width - w;
+                        DCHAR_SET (result + length, ' ', n);
+                        length += n;
+                      }
+
+# if DCHAR_IS_TCHAR
+                    memcpy (result + length, arg, bytes);
+                    length += bytes;
+# else
+                    DCHAR_CPY (result + length, tmpdst, tmpdst_len);
+                    free (tmpdst);
+                    length += tmpdst_len;
+# endif
+
+                    if (w < width && (flags & FLAG_LEFT))
+                      {
+                        size_t n = width - w;
+                        DCHAR_SET (result + length, ' ', n);
+                        length += n;
+                      }
+                  }
+                }
+              }
+#endif
+#if WIDE_CHAR_VERSION && ((PTRDIFF_MAX > INT_MAX) || !DCHAR_IS_TCHAR || NEED_WPRINTF_DIRECTIVE_LC)
             else if ((dp->conversion == 's'
                       && a.arg[dp->arg_index].type == TYPE_WIDE_STRING)
                      || (dp->conversion == 'c'
@@ -2810,6 +3289,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
                   }
 
                 {
@@ -2912,7 +3393,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                 }
               }
 #endif
-#if (!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T
+#if WIDE_CHAR_VERSION || !USE_SNPRINTF || (PTRDIFF_MAX > INT_MAX) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK
             else if (dp->conversion == 's'
 # if WIDE_CHAR_VERSION
                      && a.arg[dp->arg_index].type != TYPE_WIDE_STRING
@@ -2965,6 +3446,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
                     has_width = 1;
                   }
 
@@ -3145,11 +3628,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                 {
                   const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
                   const wchar_t *arg_end;
+                  size_t bytes;
+#  if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
                   size_t characters;
+#  endif
 #  if !DCHAR_IS_TCHAR
                   /* This code assumes that TCHAR_T is 'char'.  */
                   static_assert (sizeof (TCHAR_T) == 1);
-                  TCHAR_T *tmpsrc;
                   DCHAR_T *tmpdst;
                   size_t tmpdst_len;
 #  endif
@@ -3164,7 +3649,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       mbszero (&state);
 #  endif
                       arg_end = arg;
+                      bytes = 0;
+#  if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
                       characters = 0;
+#  endif
                       while (precision > 0)
                         {
                           char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
@@ -3180,7 +3668,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           if (precision < (unsigned int) count)
                             break;
                           arg_end++;
-                          characters += count;
+                          bytes += count;
+#  if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
+                          characters += mbsnlen (cbuf, count);
+#  endif
                           precision -= count;
                         }
                     }
@@ -3197,7 +3688,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       mbszero (&state);
 #  endif
                       arg_end = arg;
+                      bytes = 0;
+#  if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
                       characters = 0;
+#  endif
                       for (;;)
                         {
                           char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
@@ -3211,7 +3705,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                             /* Cannot convert.  */
                             goto fail_with_EILSEQ;
                           arg_end++;
-                          characters += count;
+                          bytes += count;
+#  if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
+                          characters += mbsnlen (cbuf, count);
+#  endif
                         }
                     }
 #  if DCHAR_IS_TCHAR
@@ -3219,56 +3716,64 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     {
                       /* Use the entire string.  */
                       arg_end = arg + local_wcslen (arg);
-                      /* The number of bytes doesn't matter.  */
+                      /* The number of bytes and characters doesn't matter,
+                         because !has_width and therefore width==0.  */
+                      bytes = 0;
+#   if ENABLE_UNISTDIO
                       characters = 0;
+#   endif
                     }
 #  endif
 
 #  if !DCHAR_IS_TCHAR
-                  /* Convert the string into a piece of temporary memory.  */
-                  tmpsrc = (TCHAR_T *) malloc (characters * sizeof (TCHAR_T));
-                  if (tmpsrc == NULL)
-                    goto out_of_memory;
                   {
-                    TCHAR_T *tmpptr = tmpsrc;
-                    size_t remaining;
+                    TCHAR_T *tmpsrc;
+
+                    /* Convert the string into a piece of temporary memory.  */
+                    tmpsrc = (TCHAR_T *) malloc (bytes * sizeof (TCHAR_T));
+                    if (tmpsrc == NULL)
+                      goto out_of_memory;
+                    {
+                      TCHAR_T *tmpptr = tmpsrc;
+                      size_t remaining;
 #   if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
-                    mbstate_t state;
-                    mbszero (&state);
+                      mbstate_t state;
+                      mbszero (&state);
 #   endif
-                    for (remaining = characters; remaining > 0; )
-                      {
-                        char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                        int count;
+                      for (remaining = bytes; remaining > 0; )
+                        {
+                          char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
+                          int count;
 
-                        if (*arg == 0)
-                          abort ();
-                        count = local_wcrtomb (cbuf, *arg, &state);
-                        if (count <= 0)
-                          /* Inconsistency.  */
-                          abort ();
-                        memcpy (tmpptr, cbuf, count);
-                        tmpptr += count;
-                        arg++;
-                        remaining -= count;
+                          if (*arg == 0)
+                            abort ();
+                          count = local_wcrtomb (cbuf, *arg, &state);
+                          if (count <= 0)
+                            /* Inconsistency.  */
+                            abort ();
+                          memcpy (tmpptr, cbuf, count);
+                          tmpptr += count;
+                          arg++;
+                          remaining -= count;
+                        }
+                      if (!(arg == arg_end))
+                        abort ();
+                    }
+
+                    /* Convert from TCHAR_T[] to DCHAR_T[].  */
+                    tmpdst =
+                      DCHAR_CONV_FROM_ENCODING (locale_charset (),
+                                                iconveh_question_mark,
+                                                tmpsrc, bytes,
+                                                NULL,
+                                                NULL, &tmpdst_len);
+                    if (tmpdst == NULL)
+                      {
+                        free (tmpsrc);
+                        goto fail_with_errno;
                       }
-                    if (!(arg == arg_end))
-                      abort ();
+                    free (tmpsrc);
                   }
-
-                  /* Convert from TCHAR_T[] to DCHAR_T[].  */
-                  tmpdst =
-                    DCHAR_CONV_FROM_ENCODING (locale_charset (),
-                                              iconveh_question_mark,
-                                              tmpsrc, characters,
-                                              NULL,
-                                              NULL, &tmpdst_len);
-                  if (tmpdst == NULL)
-                    {
-                      free (tmpsrc);
-                      goto fail_with_errno;
-                    }
-                  free (tmpsrc);
 #  endif
 
                   if (has_width)
@@ -3277,11 +3782,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       /* Outside POSIX, it's preferable to compare the width
                          against the number of _characters_ of the converted
                          value.  */
-                      w = DCHAR_MBSNLEN (result + length, characters);
+#   if DCHAR_IS_TCHAR
+                      w = characters;
+#   else
+                      w = DCHAR_MBSNLEN (tmpdst, tmpdst_len);
+#   endif
 #  else
                       /* The width is compared against the number of _bytes_
                          of the converted value, says POSIX.  */
-                      w = characters;
+                      w = bytes;
 #  endif
                     }
                   else
@@ -3291,7 +3800,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   if (w < width && !(flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
+#  if DCHAR_IS_TCHAR
                       ENSURE_ALLOCATION (xsum (length, n));
+#  else
+                      ENSURE_ALLOCATION_ELSE (xsum (length, n),
+                        { free (tmpdst); goto out_of_memory; });
+#  endif
                       DCHAR_SET (result + length, ' ', n);
                       length += n;
                     }
@@ -3305,8 +3819,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       mbstate_t state;
                       mbszero (&state);
 #   endif
-                      ENSURE_ALLOCATION (xsum (length, characters));
-                      for (remaining = characters; remaining > 0; )
+                      ENSURE_ALLOCATION (xsum (length, bytes));
+                      for (remaining = bytes; remaining > 0; )
                         {
                           char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
                           int count;
@@ -3350,7 +3864,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     }
 #  else
                   ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len),
-                                          { free (tmpdst); goto out_of_memory; });
+                    { free (tmpdst); goto out_of_memory; });
                   DCHAR_CPY (result + length, tmpdst, tmpdst_len);
                   free (tmpdst);
                   length += tmpdst_len;
@@ -3406,17 +3920,21 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
                     has_width = 1;
                   }
 
                 /* %lc in vasnprintf.  See the specification of fprintf.  */
                 {
                   wchar_t arg = (wchar_t) a.arg[dp->arg_index].a.a_wide_char;
+                  size_t bytes;
+# if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
                   size_t characters;
+# endif
 # if !DCHAR_IS_TCHAR
                   /* This code assumes that TCHAR_T is 'char'.  */
                   static_assert (sizeof (TCHAR_T) == 1);
-                  TCHAR_T tmpsrc[64]; /* Assume MB_CUR_MAX <= 64.  */
                   DCHAR_T *tmpdst;
                   size_t tmpdst_len;
 # endif
@@ -3427,7 +3945,6 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 # endif
                     {
                       /* Count the number of bytes.  */
-                      characters = 0;
                       char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
                       int count;
 # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
@@ -3439,43 +3956,54 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       if (count < 0)
                         /* Cannot convert.  */
                         goto fail_with_EILSEQ;
-                      characters = count;
+                      bytes = count;
+# if ENABLE_UNISTDIO && DCHAR_IS_TCHAR
+                      characters = mbsnlen (cbuf, count);
+# endif
                     }
 # if DCHAR_IS_TCHAR
                   else
                     {
-                      /* The number of bytes doesn't matter.  */
+                      /* The number of bytes and characters doesn't matter,
+                         because !has_width and therefore width==0.  */
+                      bytes = 0;
+#  if ENABLE_UNISTDIO
                       characters = 0;
+#  endif
                     }
 # endif
 
 # if !DCHAR_IS_TCHAR
-                  /* Convert the string into a piece of temporary memory.  */
-                  if (characters > 0)
-                    {
-                      char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                      int count;
+                  {
+                    TCHAR_T tmpsrc[64]; /* Assume MB_CUR_MAX <= 64.  */
+
+                    /* Convert the string into a piece of temporary memory.  */
+                    if (bytes > 0)
+                      {
+                        char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
+                        int count;
 #  if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
-                      mbstate_t state;
-                      mbszero (&state);
+                        mbstate_t state;
+                        mbszero (&state);
 #  endif
 
-                      count = local_wcrtomb (cbuf, arg, &state);
-                      if (count <= 0)
-                        /* Inconsistency.  */
-                        abort ();
-                      memcpy (tmpsrc, cbuf, count);
-                    }
+                        count = local_wcrtomb (cbuf, arg, &state);
+                        if (count <= 0)
+                          /* Inconsistency.  */
+                          abort ();
+                        memcpy (tmpsrc, cbuf, count);
+                      }
 
-                  /* Convert from TCHAR_T[] to DCHAR_T[].  */
-                  tmpdst =
-                    DCHAR_CONV_FROM_ENCODING (locale_charset (),
-                                              iconveh_question_mark,
-                                              tmpsrc, characters,
-                                              NULL,
-                                              NULL, &tmpdst_len);
-                  if (tmpdst == NULL)
-                    goto fail_with_errno;
+                    /* Convert from TCHAR_T[] to DCHAR_T[].  */
+                    tmpdst =
+                      DCHAR_CONV_FROM_ENCODING (locale_charset (),
+                                                iconveh_question_mark,
+                                                tmpsrc, bytes,
+                                                NULL,
+                                                NULL, &tmpdst_len);
+                    if (tmpdst == NULL)
+                      goto fail_with_errno;
+                  }
 # endif
 
                   if (has_width)
@@ -3484,11 +4012,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       /* Outside POSIX, it's preferable to compare the width
                          against the number of _characters_ of the converted
                          value.  */
-                      w = DCHAR_MBSNLEN (result + length, characters);
+#  if DCHAR_IS_TCHAR
+                      w = characters;
+#  else
+                      w = DCHAR_MBSNLEN (tmpdst, tmpdst_len);
+#  endif
 # else
                       /* The width is compared against the number of _bytes_
                          of the converted value, says POSIX.  */
-                      w = characters;
+                      w = bytes;
 # endif
                     }
                   else
@@ -3498,7 +4030,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   if (w < width && !(flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
+#  if DCHAR_IS_TCHAR
                       ENSURE_ALLOCATION (xsum (length, n));
+#  else
+                      ENSURE_ALLOCATION_ELSE (xsum (length, n),
+                        { free (tmpdst); goto out_of_memory; });
+#  endif
                       DCHAR_SET (result + length, ' ', n);
                       length += n;
                     }
@@ -3507,8 +4044,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   if (has_width)
                     {
                       /* We know the number of bytes in advance.  */
-                      ENSURE_ALLOCATION (xsum (length, characters));
-                      if (characters > 0)
+                      ENSURE_ALLOCATION (xsum (length, bytes));
+                      if (bytes > 0)
                         {
                           int count;
 #  if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
@@ -3542,7 +4079,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     }
 # else
                   ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len),
-                                          { free (tmpdst); goto out_of_memory; });
+                    { free (tmpdst); goto out_of_memory; });
                   DCHAR_CPY (result + length, tmpdst, tmpdst_len);
                   free (tmpdst);
                   length += tmpdst_len;
@@ -3594,6 +4131,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
                   }
 
                 /* %c in vasnwprintf.  See the specification of fwprintf.  */
@@ -3608,24 +4147,26 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     /* Invalid or incomplete multibyte character.  */
                     goto fail_with_EILSEQ;
 
-                  if (1 < width && !(flags & FLAG_LEFT))
-                    {
-                      size_t n = width - 1;
-                      ENSURE_ALLOCATION (xsum (length, n));
-                      DCHAR_SET (result + length, ' ', n);
-                      length += n;
-                    }
+                  {
+                    size_t total = (1 < width ? width : 1);
+                    ENSURE_ALLOCATION (xsum (length, total));
+
+                    if (1 < width && !(flags & FLAG_LEFT))
+                      {
+                        size_t n = width - 1;
+                        DCHAR_SET (result + length, ' ', n);
+                        length += n;
+                      }
 
-                  ENSURE_ALLOCATION (xsum (length, 1));
-                  result[length++] = wc;
+                    result[length++] = wc;
 
-                  if (1 < width && (flags & FLAG_LEFT))
-                    {
-                      size_t n = width - 1;
-                      ENSURE_ALLOCATION (xsum (length, n));
-                      DCHAR_SET (result + length, ' ', n);
-                      length += n;
-                    }
+                    if (1 < width && (flags & FLAG_LEFT))
+                      {
+                        size_t n = width - 1;
+                        DCHAR_SET (result + length, ' ', n);
+                        length += n;
+                      }
+                  }
                 }
               }
 #endif
@@ -3682,6 +4223,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
                     has_width = 1;
                   }
 
@@ -3933,7 +4476,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   {
                     size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
+                    ENSURE_ALLOCATION_ELSE (n,
+                      { if (tmp != tmpbuf) free (tmp); goto out_of_memory; });
                   }
 
                 /* Append the result.  */
@@ -3996,6 +4540,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
                   }
 
                 has_precision = 0;
@@ -4423,7 +4969,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   {
                     size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
+                    ENSURE_ALLOCATION_ELSE (n,
+                      { if (tmp != tmpbuf) free (tmp); goto out_of_memory; });
                   }
 
                 /* Append the result.  */
@@ -4501,6 +5048,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
                   }
 
                 has_precision = 0;
@@ -4587,6 +5136,17 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                         }
                     }
 # endif
+                /* Account for thousands separators.  */
+                if (flags & FLAG_GROUP)
+                  {
+                    /* A thousands separator needs to be inserted at most every 2 digits.
+                       This is the case in the ta_IN locale.  */
+# if WIDE_CHAR_VERSION
+                    tmp_length = xsum (tmp_length, tmp_length / 2 * THOUSEP_WCHAR_MAXLEN);
+# else
+                    tmp_length = xsum (tmp_length, tmp_length / 2 * THOUSEP_CHAR_MAXLEN);
+# endif
+                  }
                 /* Account for sign, decimal point etc. */
                 tmp_length = xsum (tmp_length, 12);
 
@@ -4682,12 +5242,84 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                 ndigits = strlen (digits);
 
                                 if (ndigits > precision)
-                                  do
-                                    {
-                                      --ndigits;
-                                      *p++ = digits[ndigits];
-                                    }
-                                  while (ndigits > precision);
+                                  {
+                                    /* Number of digits before the decimal point.  */
+                                    size_t intpart_digits = ndigits - precision;
+
+                                    const DCHAR_T *thousep = NULL;
+                                    DCHAR_T thousep_buf[10];
+#   if !WIDE_CHAR_VERSION
+                                    size_t thousep_len = 0;
+#   endif
+                                    const signed char *grouping;
+                                    size_t insert = 0;
+
+                                    if ((flags & FLAG_GROUP) && (intpart_digits > 1))
+                                      {
+                                        /* Determine the thousands separator and
+                                           the grouping rule of the current locale.  */
+#   if WIDE_CHAR_VERSION
+                                        /* DCHAR_T is wchar_t.  */
+                                        thousep = thousands_separator_wchar (thousep_buf);
+#                                       define thousep_len 1
+#   elif defined DCHAR_CONV_FROM_ENCODING
+                                        /* DCHAR_T is uintN_t.  */
+                                        thousep = thousands_separator_DCHAR (thousep_buf);
+                                        thousep_len = DCHAR_STRLEN (thousep);
+#   else
+                                        /* DCHAR_T is char.  */
+                                        thousep = thousands_separator_char (thousep_buf);
+                                        thousep_len = strlen (thousep);
+#   endif
+                                        if (*thousep == 0)
+                                          thousep = NULL;
+                                        if (thousep != NULL)
+                                          {
+                                            grouping = grouping_rule ();
+                                            insert =
+                                              num_thousands_separators (grouping, intpart_digits);
+                                          }
+                                      }
+
+                                    const char *digitp = digits + precision;
+                                    DCHAR_T *p_before_intpart = p;
+                                    p += intpart_digits + insert * thousep_len;
+                                    DCHAR_T *p_after_intpart = p;
+                                    if (insert > 0) /* implies (flag & FLAG_GROUP) && (thousep != NULL) */
+                                      {
+                                        const signed char *g = grouping;
+                                        for (;;)
+                                          {
+                                            int h = *g;
+                                            if (h <= 0)
+                                              abort ();
+                                            int i = h;
+                                            do
+                                              *--p = *digitp++;
+                                            while (--i > 0);
+#   if WIDE_CHAR_VERSION
+                                            *--p = thousep[0];
+#   else
+                                            p -= thousep_len;
+                                            DCHAR_CPY (p, thousep, thousep_len);
+#   endif
+                                            insert--;
+                                            if (insert == 0)
+                                              break;
+                                            if (g[1] != 0)
+                                              g++;
+                                          }
+                                      }
+                                    for (;;)
+                                      {
+                                        *--p = *digitp++;
+                                        if (p == p_before_intpart)
+                                          break;
+                                      }
+                                    p = p_after_intpart;
+                                    ndigits = precision;
+#   undef thousep_len
+                                  }
                                 else
                                   *p++ = '0';
                                 /* Here ndigits <= precision.  */
@@ -4940,10 +5572,84 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
-                                            /* Note: count <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
-                                              *p++ = digits[--ndigits];
+                                            /* Number of digits before the decimal point.  */
+                                            size_t intpart_digits = exponent + 1;
+                                            /* Note: intpart_digits <= precision = ndigits.  */
+
+                                            const DCHAR_T *thousep = NULL;
+                                            DCHAR_T thousep_buf[10];
+#   if !WIDE_CHAR_VERSION
+                                            size_t thousep_len = 0;
+#   endif
+                                            const signed char *grouping;
+                                            size_t insert = 0;
+
+                                            if ((flags & FLAG_GROUP) && (intpart_digits > 1))
+                                              {
+                                                /* Determine the thousands separator and
+                                                   the grouping rule of the current locale.  */
+#   if WIDE_CHAR_VERSION
+                                                /* DCHAR_T is wchar_t.  */
+                                                thousep = thousands_separator_wchar (thousep_buf);
+#                                               define thousep_len 1
+#   elif defined DCHAR_CONV_FROM_ENCODING
+                                                /* DCHAR_T is uintN_t.  */
+                                                thousep = thousands_separator_DCHAR (thousep_buf);
+                                                thousep_len = DCHAR_STRLEN (thousep);
+#   else
+                                                /* DCHAR_T is char.  */
+                                                thousep = thousands_separator_char (thousep_buf);
+                                                thousep_len = strlen (thousep);
+#   endif
+                                                if (*thousep == 0)
+                                                  thousep = NULL;
+                                                if (thousep != NULL)
+                                                  {
+                                                    grouping = grouping_rule ();
+                                                    insert =
+                                                      num_thousands_separators (grouping, intpart_digits);
+                                                  }
+                                              }
+
+                                            const char *digitp = digits + ndigits - intpart_digits;
+                                            DCHAR_T *p_before_intpart = p;
+                                            p += intpart_digits + insert * thousep_len;
+                                            DCHAR_T *p_after_intpart = p;
+                                            if (insert > 0) /* implies (flag & FLAG_GROUP) && (thousep != NULL) */
+                                              {
+                                                const signed char *g = grouping;
+                                                for (;;)
+                                                  {
+                                                    int h = *g;
+                                                    if (h <= 0)
+                                                      abort ();
+                                                    int i = h;
+                                                    do
+                                                      *--p = *digitp++;
+                                                    while (--i > 0);
+#   if WIDE_CHAR_VERSION
+                                                    *--p = thousep[0];
+#   else
+                                                    p -= thousep_len;
+                                                    DCHAR_CPY (p, thousep, thousep_len);
+#   endif
+                                                    insert--;
+                                                    if (insert == 0)
+                                                      break;
+                                                    if (g[1] != 0)
+                                                      g++;
+                                                  }
+                                              }
+                                            for (;;)
+                                              {
+                                                *--p = *digitp++;
+                                                if (p == p_before_intpart)
+                                                  break;
+                                              }
+                                            p = p_after_intpart;
+                                            ndigits -= intpart_digits;
+#   undef thousep_len
+
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
                                                 *p++ = decimal_point_char ();
@@ -5144,12 +5850,84 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                 ndigits = strlen (digits);
 
                                 if (ndigits > precision)
-                                  do
-                                    {
-                                      --ndigits;
-                                      *p++ = digits[ndigits];
-                                    }
-                                  while (ndigits > precision);
+                                  {
+                                    /* Number of digits before the decimal point.  */
+                                    size_t intpart_digits = ndigits - precision;
+
+                                    const DCHAR_T *thousep = NULL;
+                                    DCHAR_T thousep_buf[10];
+#   if !WIDE_CHAR_VERSION
+                                    size_t thousep_len = 0;
+#   endif
+                                    const signed char *grouping;
+                                    size_t insert = 0;
+
+                                    if ((flags & FLAG_GROUP) && (intpart_digits > 1))
+                                      {
+                                        /* Determine the thousands separator and
+                                           the grouping rule of the current locale.  */
+#   if WIDE_CHAR_VERSION
+                                        /* DCHAR_T is wchar_t.  */
+                                        thousep = thousands_separator_wchar (thousep_buf);
+#                                       define thousep_len 1
+#   elif defined DCHAR_CONV_FROM_ENCODING
+                                        /* DCHAR_T is uintN_t.  */
+                                        thousep = thousands_separator_DCHAR (thousep_buf);
+                                        thousep_len = DCHAR_STRLEN (thousep);
+#   else
+                                        /* DCHAR_T is char.  */
+                                        thousep = thousands_separator_char (thousep_buf);
+                                        thousep_len = strlen (thousep);
+#   endif
+                                        if (*thousep == 0)
+                                          thousep = NULL;
+                                        if (thousep != NULL)
+                                          {
+                                            grouping = grouping_rule ();
+                                            insert =
+                                              num_thousands_separators (grouping, intpart_digits);
+                                          }
+                                      }
+
+                                    const char *digitp = digits + precision;
+                                    DCHAR_T *p_before_intpart = p;
+                                    p += intpart_digits + insert * thousep_len;
+                                    DCHAR_T *p_after_intpart = p;
+                                    if (insert > 0) /* implies (flag & FLAG_GROUP) && (thousep != NULL) */
+                                      {
+                                        const signed char *g = grouping;
+                                        for (;;)
+                                          {
+                                            int h = *g;
+                                            if (h <= 0)
+                                              abort ();
+                                            int i = h;
+                                            do
+                                              *--p = *digitp++;
+                                            while (--i > 0);
+#   if WIDE_CHAR_VERSION
+                                            *--p = thousep[0];
+#   else
+                                            p -= thousep_len;
+                                            DCHAR_CPY (p, thousep, thousep_len);
+#   endif
+                                            insert--;
+                                            if (insert == 0)
+                                              break;
+                                            if (g[1] != 0)
+                                              g++;
+                                          }
+                                      }
+                                    for (;;)
+                                      {
+                                        *--p = *digitp++;
+                                        if (p == p_before_intpart)
+                                          break;
+                                      }
+                                    p = p_after_intpart;
+                                    ndigits = precision;
+#   undef thousep_len
+                                  }
                                 else
                                   *p++ = '0';
                                 /* Here ndigits <= precision.  */
@@ -5410,10 +6188,84 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                            digits without trailing zeroes.  */
                                         if (exponent >= 0)
                                           {
-                                            size_t ecount = exponent + 1;
-                                            /* Note: ecount <= precision = ndigits.  */
-                                            for (; ecount > 0; ecount--)
-                                              *p++ = digits[--ndigits];
+                                            /* Number of digits before the decimal point.  */
+                                            size_t intpart_digits = exponent + 1;
+                                            /* Note: intpart_digits <= precision = ndigits.  */
+
+                                            const DCHAR_T *thousep = NULL;
+                                            DCHAR_T thousep_buf[10];
+#   if !WIDE_CHAR_VERSION
+                                            size_t thousep_len = 0;
+#   endif
+                                            const signed char *grouping;
+                                            size_t insert = 0;
+
+                                            if ((flags & FLAG_GROUP) && (intpart_digits > 1))
+                                              {
+                                                /* Determine the thousands separator and
+                                                   the grouping rule of the current locale.  */
+#   if WIDE_CHAR_VERSION
+                                                /* DCHAR_T is wchar_t.  */
+                                                thousep = thousands_separator_wchar (thousep_buf);
+#                                               define thousep_len 1
+#   elif defined DCHAR_CONV_FROM_ENCODING
+                                                /* DCHAR_T is uintN_t.  */
+                                                thousep = thousands_separator_DCHAR (thousep_buf);
+                                                thousep_len = DCHAR_STRLEN (thousep);
+#   else
+                                                /* DCHAR_T is char.  */
+                                                thousep = thousands_separator_char (thousep_buf);
+                                                thousep_len = strlen (thousep);
+#   endif
+                                                if (*thousep == 0)
+                                                  thousep = NULL;
+                                                if (thousep != NULL)
+                                                  {
+                                                    grouping = grouping_rule ();
+                                                    insert =
+                                                      num_thousands_separators (grouping, intpart_digits);
+                                                  }
+                                              }
+
+                                            const char *digitp = digits + ndigits - intpart_digits;
+                                            DCHAR_T *p_before_intpart = p;
+                                            p += intpart_digits + insert * thousep_len;
+                                            DCHAR_T *p_after_intpart = p;
+                                            if (insert > 0) /* implies (flag & FLAG_GROUP) && (thousep != NULL) */
+                                              {
+                                                const signed char *g = grouping;
+                                                for (;;)
+                                                  {
+                                                    int h = *g;
+                                                    if (h <= 0)
+                                                      abort ();
+                                                    int i = h;
+                                                    do
+                                                      *--p = *digitp++;
+                                                    while (--i > 0);
+#   if WIDE_CHAR_VERSION
+                                                    *--p = thousep[0];
+#   else
+                                                    p -= thousep_len;
+                                                    DCHAR_CPY (p, thousep, thousep_len);
+#   endif
+                                                    insert--;
+                                                    if (insert == 0)
+                                                      break;
+                                                    if (g[1] != 0)
+                                                      g++;
+                                                  }
+                                              }
+                                            for (;;)
+                                              {
+                                                *--p = *digitp++;
+                                                if (p == p_before_intpart)
+                                                  break;
+                                              }
+                                            p = p_after_intpart;
+                                            ndigits -= intpart_digits;
+#   undef thousep_len
+
                                             if ((flags & FLAG_ALT) || ndigits > nzeroes)
                                               {
                                                 *p++ = decimal_point_char ();
@@ -5606,7 +6458,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   {
                     size_t n = xsum (length, count);
 
-                    ENSURE_ALLOCATION (n);
+                    ENSURE_ALLOCATION_ELSE (n,
+                      { if (tmp != tmpbuf) free (tmp); goto out_of_memory; });
                   }
 
                 /* Append the result.  */
@@ -5620,13 +6473,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
-#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#if (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                 int has_width;
 #endif
-#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_FLAG_LEFTADJUST || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                 size_t width;
 #endif
-#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                 int has_precision;
                 size_t precision;
 #endif
@@ -5635,9 +6488,14 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #else
 #               define prec_ourselves 0
 #endif
+#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
+                int group_ourselves;
+#else
+#               define group_ourselves 0
+#endif
 #if (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST
 #               define pad_ourselves 1
-#elif !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#elif !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                 int pad_ourselves;
 #else
 #               define pad_ourselves 0
@@ -5652,10 +6510,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                 TCHAR_T *tmp;
 #endif
 
-#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#if (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                 has_width = 0;
 #endif
-#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#if !USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_FLAG_LEFTADJUST || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -5683,13 +6541,16 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
-# if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+                    if (width > (size_t) INT_MAX)
+                      goto overflow;
+# define WIDTH_IS_CHECKED 1
+# if (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                     has_width = 1;
 # endif
                   }
 #endif
 
-#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                 has_precision = 0;
                 precision = 6;
                 if (dp->precision_start != dp->precision_end)
@@ -5754,8 +6615,37 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   }
 #endif
 
+                /* Decide whether to add the thousands separators ourselves.  */
+#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
+                if (flags & FLAG_GROUP)
+                  {
+                    switch (dp->conversion)
+                      {
+                      case 'd': case 'i': case 'u':
+# if NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
+                        group_ourselves = 1;
+# else
+                        group_ourselves = prec_ourselves;
+# endif
+                        break;
+                      case 'f': case 'F': case 'g': case 'G':
+# if NEED_PRINTF_FLAG_GROUPING
+                        group_ourselves = 1;
+# else
+                        group_ourselves = prec_ourselves;
+# endif
+                        break;
+                      default:
+                        group_ourselves = 0;
+                        break;
+                      }
+                  }
+                else
+                  group_ourselves = 0;
+#endif
+
                 /* Decide whether to perform the padding ourselves.  */
-#if !((WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST) && (!DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION)
+#if !((WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST) && (!DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT)
                 switch (dp->conversion)
                   {
 # if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO
@@ -5772,7 +6662,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     pad_ourselves = 1;
                     break;
                   default:
-                    pad_ourselves = prec_ourselves;
+                    pad_ourselves = prec_ourselves | group_ourselves;
                     break;
                   }
 #endif
@@ -5805,14 +6695,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                    sprintf.  */
                 fbp = buf;
                 *fbp++ = '%';
-#if NEED_PRINTF_FLAG_GROUPING
-                /* The underlying implementation doesn't support the ' flag.
-                   Produce no grouping characters in this case; this is
-                   acceptable because the grouping is locale dependent.  */
-#else
-                if (flags & FLAG_GROUP)
+                if ((flags & FLAG_GROUP) && !group_ourselves)
                   *fbp++ = '\'';
-#endif
                 if (flags & FLAG_LEFT)
                   *fbp++ = '-';
                 if (flags & FLAG_SHOWSIGN)
@@ -5832,6 +6716,43 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     if (dp->width_start != dp->width_end)
                       {
                         size_t n = dp->width_end - dp->width_start;
+#if !WIDTH_IS_CHECKED
+                        size_t width;
+                        /* Reject an out-of-range width.
+                           The underlying SNPRINTF already does this on some
+                           platforms (glibc, musl, macOS, FreeBSD, NetBSD,
+                           OpenBSD, Cygwin, Solaris, MSVC).  However, on others
+                           (AIX, mingw), it doesn't; thus this vasnprintf
+                           invocation would succeed and produce a wrong result.
+                           So, this is redundant on some platforms, but it's a
+                           quick check anyway.  */
+                        if (dp->width_arg_index != ARG_NONE)
+                          {
+                            int arg;
+
+                            if (!(a.arg[dp->width_arg_index].type == TYPE_INT))
+                              abort ();
+                            arg = a.arg[dp->width_arg_index].a.a_int;
+                            width = arg;
+                            if (arg < 0)
+                              {
+                                /* "A negative field width is taken as a '-' flag
+                                    followed by a positive field width."  */
+                                width = -width;
+                              }
+                          }
+                        else
+                          {
+                            const FCHAR_T *digitp = dp->width_start;
+
+                            width = 0;
+                            do
+                              width = xsum (xtimes (width, 10), *digitp++ - '0');
+                            while (digitp != dp->width_end);
+                          }
+                        if (width > (size_t) INT_MAX)
+                          goto overflow;
+#endif
                         /* The width specification is known to consist only
                            of standard ASCII characters.  */
                         if (sizeof (FCHAR_T) == sizeof (TCHAR_T))
@@ -5870,7 +6791,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       }
                   }
 
-                switch (type)
+                switch (+type)
                   {
                   case TYPE_LONGLONGINT:
                   case TYPE_ULONGLONGINT:
@@ -5984,9 +6905,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   #if HAVE_WINT_T
                   case TYPE_WIDE_CHAR:
                   #endif
-                  #if HAVE_WCHAR_T
                   case TYPE_WIDE_STRING:
-                  #endif
                     *fbp++ = 'l';
                     break;
                   case TYPE_LONGDOUBLE:
@@ -6168,7 +7087,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #endif
 
                     errno = 0;
-                    switch (type)
+                    switch (+type)
                       {
                       case TYPE_SCHAR:
                         {
@@ -6358,14 +7277,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           SNPRINTF_BUF (arg);
                         }
                         break;
-#if HAVE_WCHAR_T
                       case TYPE_WIDE_STRING:
                         {
                           const wchar_t *arg = a.arg[dp->arg_index].a.a_wide_string;
                           SNPRINTF_BUF (arg);
                         }
                         break;
-#endif
                       case TYPE_POINTER:
                         {
                           void *arg = a.arg[dp->arg_index].a.a_pointer;
@@ -6539,10 +7456,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                 || *prec_ptr == ' '))
                           prefix_count = 1;
                         /* Put the additional zeroes after the 0x prefix if
-                           (flags & FLAG_ALT) || (dp->conversion == 'p').  */
+                           (flags & FLAG_ALT) || (dp->conversion == 'p'), or
+                           after the 0b prefix if (flags & FLAG_ALT).  */
                         else if (count >= 2
                                  && prec_ptr[0] == '0'
-                                 && (prec_ptr[1] == 'x' || prec_ptr[1] == 'X'))
+                                 && (prec_ptr[1] == 'x' || prec_ptr[1] == 'X'
+                                     || prec_ptr[1] == 'b'
+                                     || prec_ptr[1] == 'B'))
                           prefix_count = 2;
 
                         move = count - prefix_count;
@@ -6591,6 +7511,135 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       }
 #endif
 
+#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
+                    if (group_ourselves) /* implies (flags & FLAG_GROUP) */
+                      /* Handle the grouping.  */
+                      switch (dp->conversion)
+                        {
+                        /* These are the only conversion to which grouping
+                           applies.  */
+                        case 'd': case 'i': case 'u':
+                        case 'f': case 'F': case 'g': case 'G':
+                          {
+                            /* Determine the thousands separator of the current
+                               locale.  */
+                            const TCHAR_T *thousep;
+                            TCHAR_T thousep_buf[10];
+
+# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
+                            /* TCHAR_T is wchar_t.  */
+                            thousep = thousands_separator_wchar (thousep_buf);
+# else
+                            /* TCHAR_T is char.  */
+                            thousep = thousands_separator_char (thousep_buf);
+# endif
+
+                            /* Nothing to do in locales where thousep is the empty
+                               string.  */
+                            if (*thousep != 0)
+                              {
+                                /* Since FLAG_LOCALIZED is only supported on glibc
+                                   systems, here we can assume that all digits are
+                                   the ASCII digits '0'..'9'.  */
+                                TCHAR_T *number_ptr =
+# if USE_SNPRINTF
+                                  (TCHAR_T *) (result + length);
+# else
+                                  tmp;
+# endif
+                                TCHAR_T *end_ptr = number_ptr + count;
+
+                                /* Find where the leading digits start.  */
+                                TCHAR_T *digits_ptr = number_ptr;
+                                if (count >= 1
+                                    && (*digits_ptr == '-' || *digits_ptr == '+'
+                                        || *digits_ptr == ' '))
+                                  digits_ptr++;
+
+                                /* Find where the leading digits end.  */
+                                TCHAR_T *digits_end_ptr;
+                                switch (dp->conversion)
+                                  {
+                                  case 'd': case 'i': case 'u':
+                                    digits_end_ptr = end_ptr;
+                                    break;
+                                  case 'f': case 'F': case 'g': case 'G':
+                                    {
+                                      TCHAR_T decimal_point = decimal_point_char ();
+                                      for (digits_end_ptr = digits_ptr;
+                                           digits_end_ptr < end_ptr;
+                                           digits_end_ptr++)
+                                        if (*digits_end_ptr == decimal_point
+                                            || *digits_end_ptr == 'e')
+                                          break;
+                                    }
+                                    break;
+                                  }
+
+                                /* Determine the number of thousands separators
+                                   to insert.  */
+                                const signed char *grouping = grouping_rule ();
+                                size_t insert =
+                                  num_thousands_separators (grouping, digits_end_ptr - digits_ptr);
+                                if (insert > 0)
+                                  {
+# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
+#                                   define thousep_len 1
+# else
+                                    size_t thousep_len = strlen (thousep);
+# endif
+# if USE_SNPRINTF
+                                    size_t digits_offset = digits_ptr - number_ptr;
+                                    size_t digits_end_offset = digits_end_ptr - number_ptr;
+                                    size_t n =
+                                      xsum (length,
+                                            (count + insert * thousep_len + TCHARS_PER_DCHAR - 1)
+                                            / TCHARS_PER_DCHAR);
+                                    length += (count + TCHARS_PER_DCHAR - 1) / TCHARS_PER_DCHAR;
+                                    ENSURE_ALLOCATION (n);
+                                    length -= (count + TCHARS_PER_DCHAR - 1) / TCHARS_PER_DCHAR;
+                                    number_ptr = (TCHAR_T *) (result + length);
+                                    end_ptr = number_ptr + count;
+                                    digits_ptr = number_ptr + digits_offset;
+                                    digits_end_ptr = number_ptr + digits_end_offset;
+# endif
+
+                                    count += insert * thousep_len;
+
+                                    const TCHAR_T *p = end_ptr;
+                                    TCHAR_T *q = end_ptr + insert * thousep_len;
+                                    while (p > digits_end_ptr)
+                                      *--q = *--p;
+                                    const signed char *g = grouping;
+                                    for (;;)
+                                      {
+                                        int h = *g;
+                                        if (h <= 0)
+                                          abort ();
+                                        int i = h;
+                                        do
+                                          *--q = *--p;
+                                        while (--i > 0);
+# if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
+                                        *--q = *thousep;
+# else
+                                        q -= thousep_len;
+                                        memcpy (q, thousep, thousep_len);
+# endif
+                                        insert--;
+                                        if (insert == 0)
+                                          break;
+                                        if (g[1] != 0)
+                                          g++;
+                                      }
+                                    /* Here q == p.  Done with the insertions.  */
+                                  }
+                              }
+                          }
+                          break;
+                        }
+#endif
+
 #if !USE_SNPRINTF
                     if (count >= tmp_length)
                       /* tmp_length was incorrectly calculated - fix the
@@ -6601,6 +7650,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #if !DCHAR_IS_TCHAR
                     /* Convert from TCHAR_T[] to DCHAR_T[].  */
                     if (dp->conversion == 'c' || dp->conversion == 's'
+                        || (flags & FLAG_GROUP)
 # if __GLIBC__ >= 2 && !defined __UCLIBC__
                         || (flags & FLAG_LOCALIZED)
 # endif
@@ -6677,7 +7727,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           goto fail_with_errno;
 # endif
                         ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len),
-                                                { free (tmpdst); goto out_of_memory; });
+                          { free (tmpdst); goto out_of_memory; });
                         DCHAR_CPY (result + length, tmpdst, tmpdst_len);
                         free (tmpdst);
                         count = tmpdst_len;
@@ -6742,7 +7792,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     /* Here count <= allocated - length.  */
 
                     /* Perform padding.  */
-#if (WIDE_CHAR_VERSION && MUSL_LIBC) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#if (WIDE_CHAR_VERSION && MUSL_LIBC) || NEED_PRINTF_FLAG_LEFTADJUST || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION || NEED_PRINTF_FLAG_GROUPING || NEED_PRINTF_FLAG_GROUPING_INT
                     if (pad_ourselves && has_width)
                       {
                         size_t w;
@@ -6751,6 +7801,23 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                            against the number of _characters_ of the converted
                            value.  */
                         w = DCHAR_MBSNLEN (result + length, count);
+# elif __GLIBC__ >= 2
+                        /* glibc prefers to compare the width against the number
+                           of characters as well, but only for numeric conversion
+                           specifiers.  See
+                           <https://sourceware.org/bugzilla/show_bug.cgi?id=28943>
+                           <https://sourceware.org/bugzilla/show_bug.cgi?id=30883>
+                           <https://sourceware.org/bugzilla/show_bug.cgi?id=31542>  */
+                        switch (dp->conversion)
+                          {
+                          case 'd': case 'i': case 'u':
+                          case 'f': case 'F': case 'g': case 'G':
+                            w = DCHAR_MBSNLEN (result + length, count);
+                            break;
+                          default:
+                            w = count;
+                            break;
+                          }
 # else
                         /* The width is compared against the number of _bytes_
                            of the converted value, says POSIX.  */
@@ -6929,17 +7996,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
        not have this limitation.  */
     return result;
 
-#if USE_SNPRINTF
   overflow:
     errno = EOVERFLOW;
     goto fail_with_errno;
-#endif
 
   out_of_memory:
     errno = ENOMEM;
     goto fail_with_errno;
 
-#if ENABLE_UNISTDIO || ((!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T) || ((NEED_PRINTF_DIRECTIVE_LC || ENABLE_WCHAR_FALLBACK) && HAVE_WINT_T && !WIDE_CHAR_VERSION) || (NEED_WPRINTF_DIRECTIVE_C && WIDE_CHAR_VERSION)
+#if ENABLE_UNISTDIO || (WIDE_CHAR_VERSION || !USE_SNPRINTF || (PTRDIFF_MAX > INT_MAX) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) || ((NEED_PRINTF_DIRECTIVE_LC || ENABLE_WCHAR_FALLBACK) && HAVE_WINT_T && !WIDE_CHAR_VERSION) || (NEED_WPRINTF_DIRECTIVE_C && WIDE_CHAR_VERSION)
   fail_with_EILSEQ:
     errno = EILSEQ;
     goto fail_with_errno;
diff --git a/gl/vasnprintf.h b/gl/vasnprintf.h
index 7ed9145c..ccd60e5e 100644
--- a/gl/vasnprintf.h
+++ b/gl/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/vasprintf.c b/gl/vasprintf.c
index e52aaca5..30aa4469 100644
--- a/gl/vasprintf.c
+++ b/gl/vasprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2024 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -25,6 +25,7 @@
 
 #include <errno.h>
 #include <limits.h>
+#include <stdint.h>
 #include <stdlib.h>
 
 #include "vasnprintf.h"
@@ -37,12 +38,21 @@ vasprintf (char **resultp, const char *format, va_list args)
   if (result == NULL)
     return -1;
 
+#if PTRDIFF_MAX > INT_MAX
   if (length > INT_MAX)
     {
       free (result);
-      errno = EOVERFLOW;
+      errno = (length > PTRDIFF_MAX ? ENOMEM : EOVERFLOW);
       return -1;
     }
+#else
+  if (length > PTRDIFF_MAX)
+    {
+      free (result);
+      errno = ENOMEM;
+      return -1;
+    }
+#endif
 
   *resultp = result;
   /* Return the number of resulting bytes, excluding the trailing NUL.  */
diff --git a/gl/verify.h b/gl/verify.h
index 08268c24..3b01d7c2 100644
--- a/gl/verify.h
+++ b/gl/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -34,11 +34,12 @@
 #ifndef __cplusplus
 # if (201112 <= __STDC_VERSION__ \
       || (!defined __STRICT_ANSI__ \
-          && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 5 <= __clang_major__)))
+          && ((4 < __GNUC__ + (6 <= __GNUC_MINOR__) && !defined __clang__) \
+              || 5 <= __clang_major__)))
 #  define _GL_HAVE__STATIC_ASSERT 1
 # endif
 # if (202311 <= __STDC_VERSION__ \
-      || (!defined __STRICT_ANSI__ && 9 <= __GNUC__))
+      || (!defined __STRICT_ANSI__ && 9 <= __GNUC__ && !defined __clang__))
 #  define _GL_HAVE__STATIC_ASSERT1 1
 # endif
 #endif
@@ -156,9 +157,10 @@
 #define _GL_CONCAT0(x, y) x##y
 
 /* _GL_COUNTER is an integer, preferably one that changes each time we
-   use it.  Use __COUNTER__ if it works, falling back on __LINE__
-   otherwise.  __LINE__ isn't perfect, but it's better than a
-   constant.  */
+   use it.  Use __COUNTER__ if it works (it does so with most compilers,
+   see <https://www.open-std.org/jtc1/sc22/wg14/www/docs/n3457.htm>),
+   falling back on __LINE__ otherwise.  __LINE__ isn't perfect, but it's
+   better than a constant.  */
 #if defined __COUNTER__ && __COUNTER__ != __COUNTER__
 # define _GL_COUNTER __COUNTER__
 #else
@@ -215,7 +217,7 @@ template <int w>
 # define _GL_VERIFY(R, DIAGNOSTIC, ...) \
     extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
       [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
-# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) && !defined __clang__
 #  pragma GCC diagnostic ignored "-Wnested-externs"
 # endif
 #endif
@@ -254,16 +256,32 @@ template <int w>
 #  endif
 # endif
 /* Define static_assert if needed.  */
+# if defined __cplusplus && defined __clang__ && __clang_major__ < 9
+/* clang++ before commit 5c739665a8721228cf6143fd4ef95870a59f55ae had a
+   two-arguments static_assert but not the one-argument static_assert.  */
+#  undef static_assert
+# endif
 # if (!defined static_assert \
       && __STDC_VERSION__ < 202311 \
       && (!defined __cplusplus \
           || (__cpp_static_assert < 201411 \
               && __GNUG__ < 6 && __clang_major__ < 6 && _MSC_VER < 1910)))
-#  if defined __cplusplus && _MSC_VER >= 1900 && !defined __clang__
+#  if (defined __cplusplus && defined __GNUG__ && __GNUG__ < 6 \
+       && __cplusplus == 201103L && !defined __clang__)
+/* g++ >= 4.7, < 6 with option -std=c++11 or -std=gnu++11 supports the
+   two-arguments static_assert but not the one-argument static_assert, and
+   it does not support _Static_assert.
+   We have to play preprocessor tricks to distinguish the two cases.  */
+#   define _GL_SA1(a1) static_assert ((a1), "static assertion failed")
+#   define _GL_SA2 static_assert
+#   define _GL_SA3 static_assert
+#   define _GL_SA_PICK(x1,x2,x3,x4,...) x4
+#   define static_assert(...) _GL_SA_PICK(__VA_ARGS__,_GL_SA3,_GL_SA2,_GL_SA1) (__VA_ARGS__)
+#  elif defined __cplusplus && _MSC_VER >= 1900 && !defined __clang__
 /* MSVC 14 in C++ mode supports the two-arguments static_assert but not
    the one-argument static_assert, and it does not support _Static_assert.
    We have to play preprocessor tricks to distinguish the two cases.
-   Since the MSVC preprocessor is not ISO C compliant (see above),.
+   Since the MSVC preprocessor is not ISO C compliant (see above),
    the solution is specific to MSVC.  */
 #   define _GL_EXPAND(x) x
 #   define _GL_SA1(a1) static_assert ((a1), "static assertion failed")
@@ -294,7 +312,7 @@ template <int w>
 #ifndef _GL_HAS_BUILTIN_UNREACHABLE
 # if defined __clang_major__ && __clang_major__ < 5
 #  define _GL_HAS_BUILTIN_UNREACHABLE 0
-# elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__)
+# elif 4 < __GNUC__ + (5 <= __GNUC_MINOR__) && !defined __clang__
 #  define _GL_HAS_BUILTIN_UNREACHABLE 1
 # elif defined __has_builtin
 #  define _GL_HAS_BUILTIN_UNREACHABLE __has_builtin (__builtin_unreachable)
diff --git a/gl/vsnprintf.c b/gl/vsnprintf.c
index e6676a1f..d3d7ef7a 100644
--- a/gl/vsnprintf.c
+++ b/gl/vsnprintf.c
@@ -1,6 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2024 Free Software Foundation, Inc.
-   Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
+   Copyright (C) 2004, 2006-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -25,46 +24,20 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdint.h>
 
-#include "vasnprintf.h"
-
-/* Print formatted output to string STR.  Similar to vsprintf, but
-   additional length SIZE limit how much is written into STR.  Returns
-   string length of formatted string (which may be larger than SIZE).
-   STR may be NULL, in which case nothing will be written.  On error,
-   return a negative value.  */
 int
 vsnprintf (char *str, size_t size, const char *format, va_list args)
 {
-  char *output;
-  size_t len;
-  size_t lenbuf = size;
-
-  output = vasnprintf (str, &lenbuf, format, args);
-  len = lenbuf;
-
-  if (!output)
-    return -1;
-
-  if (output != str)
-    {
-      if (size)
-        {
-          size_t pruned_len = (len < size ? len : size - 1);
-          memcpy (str, output, pruned_len);
-          str[pruned_len] = '\0';
-        }
-
-      free (output);
-    }
+  ptrdiff_t ret = vsnzprintf (str, size, format, args);
 
-  if (len > INT_MAX)
+#if PTRDIFF_MAX > INT_MAX
+  if (ret > INT_MAX)
     {
       errno = EOVERFLOW;
       return -1;
     }
+#endif
 
-  return len;
+  return ret;
 }
diff --git a/gl/vsnzprintf.c b/gl/vsnzprintf.c
new file mode 100644
index 00000000..f6e6b1d4
--- /dev/null
+++ b/gl/vsnzprintf.c
@@ -0,0 +1,65 @@
+/* Formatted output to strings.
+   Copyright (C) 2004, 2006-2025 Free Software Foundation, Inc.
+   Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+/* Specification.  */
+#include <stdio.h>
+
+#include <errno.h>
+#include <stdarg.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "vasnprintf.h"
+
+ptrdiff_t
+vsnzprintf (char *str, size_t size, const char *format, va_list args)
+{
+  char *output;
+  size_t len;
+  size_t lenbuf = size;
+
+  output = vasnprintf (str, &lenbuf, format, args);
+  len = lenbuf;
+
+  if (!output)
+    return -1;
+
+  if (output != str)
+    {
+      if (size)
+        {
+          size_t pruned_len = (len < size ? len : size - 1);
+          memcpy (str, output, pruned_len);
+          str[pruned_len] = '\0';
+        }
+
+      free (output);
+    }
+
+  if (len > PTRDIFF_MAX)
+    {
+      errno = ENOMEM;
+      return -1;
+    }
+
+  return len;
+}
diff --git a/gl/w32sock.h b/gl/w32sock.h
index 166a5f77..d7087a28 100644
--- a/gl/w32sock.h
+++ b/gl/w32sock.h
@@ -1,6 +1,6 @@
 /* w32sock.h --- internal auxiliary functions for Windows socket functions
 
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/warn-on-use.h b/gl/warn-on-use.h
index 701013a0..c0072412 100644
--- a/gl/warn-on-use.h
+++ b/gl/warn-on-use.h
@@ -1,5 +1,5 @@
 /* A C macro for emitting warnings if a function is used.
-   Copyright (C) 2010-2024 Free Software Foundation, Inc.
+   Copyright (C) 2010-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify it
    under the terms of the GNU Lesser General Public License as published
@@ -85,7 +85,7 @@
    */
 #ifndef _GL_WARN_ON_USE
 
-# if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+# if (4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)) && !defined __clang__
 /* A compiler attribute is available in gcc versions 4.3.0 and later.  */
 #  define _GL_WARN_ON_USE(function, message) \
 _GL_WARN_EXTERN_C __typeof__ (function) function __attribute__ ((__warning__ (message)))
@@ -98,7 +98,7 @@ _GL_WARN_EXTERN_C __typeof__ (function) function \
   __attribute__ ((__diagnose_if__ (1, message, "warning")))
 #  define _GL_WARN_ON_USE_ATTRIBUTE(message) \
   __attribute__ ((__diagnose_if__ (1, message, "warning")))
-# elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+# elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
 /* Verify the existence of the function.  */
 #  define _GL_WARN_ON_USE(function, message) \
 _GL_WARN_EXTERN_C __typeof__ (function) function
@@ -121,7 +121,7 @@ _GL_WARN_EXTERN_C int _gl_warn_on_use
 #  define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
      _GL_WARN_ON_USE (function, msg)
 # else
-#  if 4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)
+#  if (4 < __GNUC__ || (__GNUC__ == 4 && 3 <= __GNUC_MINOR__)) && !defined __clang__
 /* A compiler attribute is available in gcc versions 4.3.0 and later.  */
 #   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
 extern rettype_gcc function parameters_and_attributes \
@@ -131,7 +131,7 @@ extern rettype_gcc function parameters_and_attributes \
 #   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
 extern rettype_clang function parameters_and_attributes \
   __attribute__ ((__diagnose_if__ (1, msg, "warning")))
-#  elif __GNUC__ >= 3 && GNULIB_STRICT_CHECKING
+#  elif (__GNUC__ >= 3 || defined __clang__) && GNULIB_STRICT_CHECKING
 /* Verify the existence of the function.  */
 #   define _GL_WARN_ON_USE_CXX(function,rettype_gcc,rettype_clang,parameters_and_attributes,msg) \
 extern rettype_gcc function parameters_and_attributes
diff --git a/gl/wchar.in.h b/gl/wchar.in.h
index a33a10f7..a6c52eb9 100644
--- a/gl/wchar.in.h
+++ b/gl/wchar.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wchar.h>, for platforms that have issues.
 
-   Copyright (C) 2007-2024 Free Software Foundation, Inc.
+   Copyright (C) 2007-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -37,7 +37,7 @@
               && !defined _GL_FINISHED_INCLUDING_SYSTEM_INTTYPES_H)     \
              || defined _GL_JUST_INCLUDE_SYSTEM_WCHAR_H))               \
      || (defined __MINGW32__ && defined __STRING_H_SOURCED__)           \
-     || defined _GL_ALREADY_INCLUDING_WCHAR_H)
+     || defined _@GUARD_PREFIX@_ALREADY_INCLUDING_WCHAR_H)
 /* Special invocation convention:
    - Inside glibc and uClibc header files, but not MinGW.
    - On HP-UX 11.00 we have a sequence of nested includes
@@ -53,13 +53,16 @@
      <wctype.h> is completely included or is still being included.  */
 
 #@INCLUDE_NEXT@ @NEXT_WCHAR_H@
+/* The glibc 2.5 /usr/include/wchar.h defines __need_wint_t but never undefines
+   it.  We need to do that here.  */
+#undef __need_wint_t
 
 #else
 /* Normal invocation convention.  */
 
 #ifndef _@GUARD_PREFIX@_WCHAR_H
 
-#define _GL_ALREADY_INCLUDING_WCHAR_H
+#define _@GUARD_PREFIX@_ALREADY_INCLUDING_WCHAR_H
 
 #if @HAVE_FEATURES_H@
 # include <features.h> /* for __GLIBC__ */
@@ -79,7 +82,7 @@
 # @INCLUDE_NEXT@ @NEXT_WCHAR_H@
 #endif
 
-#undef _GL_ALREADY_INCLUDING_WCHAR_H
+#undef _@GUARD_PREFIX@_ALREADY_INCLUDING_WCHAR_H
 
 #ifndef _@GUARD_PREFIX@_WCHAR_H
 #define _@GUARD_PREFIX@_WCHAR_H
@@ -95,7 +98,7 @@
    that can be freed by passing them as the Ith argument to the
    function F.  */
 #ifndef _GL_ATTRIBUTE_DEALLOC
-# if __GNUC__ >= 11
+# if __GNUC__ >= 11 && !defined __clang__
 #  define _GL_ATTRIBUTE_DEALLOC(f, i) __attribute__ ((__malloc__ (f, i)))
 # else
 #  define _GL_ATTRIBUTE_DEALLOC(f, i)
@@ -137,11 +140,23 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_NONNULL_IF_NONZERO (NP, NI) declares that the argument NP
+   (a pointer) must not be NULL if the argument NI (an integer) is != 0.  */
+/* Applies to: functions.  */
+#ifndef _GL_ATTRIBUTE_NONNULL_IF_NONZERO
+# if __GNUC__ >= 15 && !defined __clang__
+#  define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni) \
+     __attribute__ ((__nonnull_if_nonzero__ (np, ni)))
+# else
+#  define _GL_ATTRIBUTE_NONNULL_IF_NONZERO(np, ni)
+# endif
+#endif
+
 /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
  */
 #ifndef _GL_ATTRIBUTE_NOTHROW
 # if defined __cplusplus
-#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major >= 4
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 8) > 2) || __clang_major__ >= 4
 #   if __cplusplus >= 201103L
 #    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
 #   else
@@ -198,11 +213,12 @@ typedef unsigned int rpl_wint_t;
 /* Override mbstate_t if it is too small.
    On IRIX 6.5, sizeof (mbstate_t) == 1, which is not sufficient for
    implementing mbrtowc for encodings like UTF-8.
-   On AIX and MSVC, mbrtowc needs to be overridden, but mbstate_t exists and is
-   large enough and overriding it would cause problems in C++ mode.  */
+   On AIX, MSVC, and OpenBSD 6.0, mbrtowc needs to be overridden, but
+   mbstate_t exists and is large enough and overriding it would cause problems
+   in C++ mode.  */
 #if !(((defined _WIN32 && !defined __CYGWIN__) || @HAVE_MBSINIT@) && @HAVE_MBRTOWC@) || @REPLACE_MBSTATE_T@
 # if !GNULIB_defined_mbstate_t
-#  if !(defined _AIX || defined _MSC_VER)
+#  if !(defined _AIX || defined _MSC_VER || defined __OpenBSD__)
 typedef int rpl_mbstate_t;
 #   undef mbstate_t
 #   define mbstate_t rpl_mbstate_t
@@ -262,6 +278,55 @@ _GL_EXTERN_C void free (void *);
 #endif
 
 
+/* Declarations for ISO C N3322.  */
+#if defined __GNUC__ && __GNUC__ >= 15 && !defined __clang__
+_GL_EXTERN_C wchar_t *wmemcpy (wchar_t *__dest, const wchar_t *__src, size_t __n)
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+# endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+_GL_EXTERN_C wchar_t *wmemmove (wchar_t *__dest, const wchar_t *__src, size_t __n)
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+# endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+_GL_EXTERN_C wchar_t *wcsncpy (wchar_t *__dest, const wchar_t *__src, size_t __n)
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+# endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+_GL_EXTERN_C wchar_t *wcsncat (wchar_t *__dest, const wchar_t *__src, size_t __n)
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+# endif
+  _GL_ARG_NONNULL ((1)) _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+_GL_EXTERN_C int wmemcmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+# endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+_GL_EXTERN_C int wcsncmp (const wchar_t *__s1, const wchar_t *__s2, size_t __n)
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+# endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3);
+# ifndef __cplusplus
+_GL_EXTERN_C wchar_t *wmemchr (const wchar_t *__s, wchar_t __wc, size_t __n)
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+# endif
+_GL_EXTERN_C wchar_t *wmemset (wchar_t *__s, wchar_t __wc, size_t __n)
+# if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+  _GL_ATTRIBUTE_NOTHROW
+# endif
+  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3);
+#endif
+
+
 /* Convert a single-byte character to a wide character.  */
 #if @GNULIB_BTOWC@
 # if @REPLACE_BTOWC@
@@ -269,11 +334,11 @@ _GL_EXTERN_C void free (void *);
 #   undef btowc
 #   define btowc rpl_btowc
 #  endif
-_GL_FUNCDECL_RPL (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (btowc, wint_t, (int c), _GL_ATTRIBUTE_PURE);
 _GL_CXXALIAS_RPL (btowc, wint_t, (int c));
 # else
 #  if !@HAVE_BTOWC@
-_GL_FUNCDECL_SYS (btowc, wint_t, (int c) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (btowc, wint_t, (int c), _GL_ATTRIBUTE_PURE);
 #  endif
 /* Need to cast, because on mingw, the return type is 'unsigned short'.  */
 _GL_CXXALIAS_SYS_CAST (btowc, wint_t, (int c));
@@ -297,12 +362,12 @@ _GL_WARN_ON_USE (btowc, "btowc is unportable - "
 #   undef wctob
 #   define wctob rpl_wctob
 #  endif
-_GL_FUNCDECL_RPL (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE);
 _GL_CXXALIAS_RPL (wctob, int, (wint_t wc));
 # else
 #  if !defined wctob && !@HAVE_DECL_WCTOB@
 /* wctob is provided by gnulib, or wctob exists but is not declared.  */
-_GL_FUNCDECL_SYS (wctob, int, (wint_t wc) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wctob, int, (wint_t wc), _GL_ATTRIBUTE_PURE);
 #  endif
 _GL_CXXALIAS_SYS (wctob, int, (wint_t wc));
 # endif
@@ -325,11 +390,11 @@ _GL_WARN_ON_USE (wctob, "wctob is unportable - "
 #   undef mbsinit
 #   define mbsinit rpl_mbsinit
 #  endif
-_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps));
+_GL_FUNCDECL_RPL (mbsinit, int, (const mbstate_t *ps), );
 _GL_CXXALIAS_RPL (mbsinit, int, (const mbstate_t *ps));
 # else
 #  if !@HAVE_MBSINIT@
-_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps));
+_GL_FUNCDECL_SYS (mbsinit, int, (const mbstate_t *ps), );
 #  endif
 _GL_CXXALIAS_SYS (mbsinit, int, (const mbstate_t *ps));
 # endif
@@ -531,16 +596,19 @@ _GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - "
 #  define _GL_MBSTATE_ZERO_SIZE sizeof (mbstate_t)
 # endif
 _GL_BEGIN_C_LINKAGE
-# if defined IN_MBSZERO
+# if !GNULIB_defined_mbszero
+#  if defined IN_MBSZERO
 _GL_EXTERN_INLINE
-# else
+#  else
 _GL_INLINE
-# endif
+#  endif
 _GL_ARG_NONNULL ((1)) void
 mbszero (mbstate_t *ps)
 {
   memset (ps, 0, _GL_MBSTATE_ZERO_SIZE);
 }
+#  define GNULIB_defined_mbszero 1
+# endif
 _GL_END_C_LINKAGE
 _GL_CXXALIAS_SYS (mbszero, void, (mbstate_t *ps));
 _GL_CXXALIASWARN (mbszero);
@@ -556,7 +624,7 @@ _GL_CXXALIASWARN (mbszero);
 #  endif
 _GL_FUNCDECL_RPL (mbrtowc, size_t,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n,
-                   mbstate_t *restrict ps));
+                   mbstate_t *restrict ps), );
 _GL_CXXALIAS_RPL (mbrtowc, size_t,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n,
                    mbstate_t *restrict ps));
@@ -564,7 +632,7 @@ _GL_CXXALIAS_RPL (mbrtowc, size_t,
 #  if !@HAVE_MBRTOWC@
 _GL_FUNCDECL_SYS (mbrtowc, size_t,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n,
-                   mbstate_t *restrict ps));
+                   mbstate_t *restrict ps), );
 #  endif
 _GL_CXXALIAS_SYS (mbrtowc, size_t,
                   (wchar_t *restrict pwc, const char *restrict s, size_t n,
@@ -590,13 +658,13 @@ _GL_WARN_ON_USE (mbrtowc, "mbrtowc is unportable - "
 #   define mbrlen rpl_mbrlen
 #  endif
 _GL_FUNCDECL_RPL (mbrlen, size_t,
-                  (const char *restrict s, size_t n, mbstate_t *restrict ps));
+                  (const char *restrict s, size_t n, mbstate_t *restrict ps), );
 _GL_CXXALIAS_RPL (mbrlen, size_t,
                   (const char *restrict s, size_t n, mbstate_t *restrict ps));
 # else
 #  if !@HAVE_MBRLEN@
 _GL_FUNCDECL_SYS (mbrlen, size_t,
-                  (const char *restrict s, size_t n, mbstate_t *restrict ps));
+                  (const char *restrict s, size_t n, mbstate_t *restrict ps), );
 #  endif
 _GL_CXXALIAS_SYS (mbrlen, size_t,
                   (const char *restrict s, size_t n, mbstate_t *restrict ps));
@@ -623,7 +691,7 @@ _GL_WARN_ON_USE (mbrlen, "mbrlen is unportable - "
 _GL_FUNCDECL_RPL (mbsrtowcs, size_t,
                   (wchar_t *restrict dest,
                    const char **restrict srcp, size_t len,
-                   mbstate_t *restrict ps)
+                   mbstate_t *restrict ps),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (mbsrtowcs, size_t,
                   (wchar_t *restrict dest,
@@ -634,7 +702,7 @@ _GL_CXXALIAS_RPL (mbsrtowcs, size_t,
 _GL_FUNCDECL_SYS (mbsrtowcs, size_t,
                   (wchar_t *restrict dest,
                    const char **restrict srcp, size_t len,
-                   mbstate_t *restrict ps)
+                   mbstate_t *restrict ps),
                   _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (mbsrtowcs, size_t,
@@ -664,7 +732,7 @@ _GL_WARN_ON_USE (mbsrtowcs, "mbsrtowcs is unportable - "
 _GL_FUNCDECL_RPL (mbsnrtowcs, size_t,
                   (wchar_t *restrict dest,
                    const char **restrict srcp, size_t srclen, size_t len,
-                   mbstate_t *restrict ps)
+                   mbstate_t *restrict ps),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (mbsnrtowcs, size_t,
                   (wchar_t *restrict dest,
@@ -675,7 +743,7 @@ _GL_CXXALIAS_RPL (mbsnrtowcs, size_t,
 _GL_FUNCDECL_SYS (mbsnrtowcs, size_t,
                   (wchar_t *restrict dest,
                    const char **restrict srcp, size_t srclen, size_t len,
-                   mbstate_t *restrict ps)
+                   mbstate_t *restrict ps),
                   _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (mbsnrtowcs, size_t,
@@ -703,13 +771,13 @@ _GL_WARN_ON_USE (mbsnrtowcs, "mbsnrtowcs is unportable - "
 #   define wcrtomb rpl_wcrtomb
 #  endif
 _GL_FUNCDECL_RPL (wcrtomb, size_t,
-                  (char *restrict s, wchar_t wc, mbstate_t *restrict ps));
+                  (char *restrict s, wchar_t wc, mbstate_t *restrict ps), );
 _GL_CXXALIAS_RPL (wcrtomb, size_t,
                   (char *restrict s, wchar_t wc, mbstate_t *restrict ps));
 # else
 #  if !@HAVE_WCRTOMB@
 _GL_FUNCDECL_SYS (wcrtomb, size_t,
-                  (char *restrict s, wchar_t wc, mbstate_t *restrict ps));
+                  (char *restrict s, wchar_t wc, mbstate_t *restrict ps), );
 #  endif
 _GL_CXXALIAS_SYS (wcrtomb, size_t,
                   (char *restrict s, wchar_t wc, mbstate_t *restrict ps));
@@ -736,7 +804,7 @@ _GL_WARN_ON_USE (wcrtomb, "wcrtomb is unportable - "
 _GL_FUNCDECL_RPL (wcsrtombs, size_t,
                   (char *restrict dest, const wchar_t **restrict srcp,
                    size_t len,
-                   mbstate_t *restrict ps)
+                   mbstate_t *restrict ps),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (wcsrtombs, size_t,
                   (char *restrict dest, const wchar_t **restrict srcp,
@@ -747,7 +815,7 @@ _GL_CXXALIAS_RPL (wcsrtombs, size_t,
 _GL_FUNCDECL_SYS (wcsrtombs, size_t,
                   (char *restrict dest, const wchar_t **restrict srcp,
                    size_t len,
-                   mbstate_t *restrict ps)
+                   mbstate_t *restrict ps),
                   _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (wcsrtombs, size_t,
@@ -778,7 +846,7 @@ _GL_FUNCDECL_RPL (wcsnrtombs, size_t,
                   (char *restrict dest,
                    const wchar_t **restrict srcp, size_t srclen,
                    size_t len,
-                   mbstate_t *restrict ps)
+                   mbstate_t *restrict ps),
                   _GL_ARG_NONNULL ((2)));
 _GL_CXXALIAS_RPL (wcsnrtombs, size_t,
                   (char *restrict dest,
@@ -791,7 +859,7 @@ _GL_FUNCDECL_SYS (wcsnrtombs, size_t,
                   (char *restrict dest,
                    const wchar_t **restrict srcp, size_t srclen,
                    size_t len,
-                   mbstate_t *restrict ps)
+                   mbstate_t *restrict ps),
                   _GL_ARG_NONNULL ((2)));
 #  endif
 _GL_CXXALIAS_SYS (wcsnrtombs, size_t,
@@ -819,12 +887,12 @@ _GL_WARN_ON_USE (wcsnrtombs, "wcsnrtombs is unportable - "
 #   undef wcwidth
 #   define wcwidth rpl_wcwidth
 #  endif
-_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_RPL (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE);
 _GL_CXXALIAS_RPL (wcwidth, int, (wchar_t));
 # else
 #  if !@HAVE_DECL_WCWIDTH@
 /* wcwidth exists but is not declared.  */
-_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wcwidth, int, (wchar_t), _GL_ATTRIBUTE_PURE);
 #  endif
 _GL_CXXALIAS_SYS (wcwidth, int, (wchar_t));
 # endif
@@ -843,8 +911,9 @@ _GL_WARN_ON_USE (wcwidth, "wcwidth is unportable - "
 /* Search N wide characters of S for C.  */
 #if @GNULIB_WMEMCHR@
 # if !@HAVE_WMEMCHR@
-_GL_FUNCDECL_SYS (wmemchr, wchar_t *, (const wchar_t *s, wchar_t c, size_t n)
-                                      _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wmemchr, wchar_t *,
+                  (const wchar_t *s, wchar_t c, size_t n),
+                  _GL_ATTRIBUTE_PURE _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3));
 # endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" {
@@ -855,11 +924,12 @@ _GL_CXXALIAS_SYS_CAST2 (wmemchr,
                         wchar_t *, (const wchar_t *, wchar_t, size_t),
                         const wchar_t *, (const wchar_t *, wchar_t, size_t));
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) \
+     && !defined __clang__
 _GL_CXXALIASWARN1 (wmemchr, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
 _GL_CXXALIASWARN1 (wmemchr, const wchar_t *,
                    (const wchar_t *s, wchar_t c, size_t n));
-# elif __GLIBC__ >= 2
+# elif __GLIBC__ >= 2 && !defined __CORRECT_ISO_CPP_WCHAR_H_PROTO
 _GL_CXXALIASWARN (wmemchr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -879,15 +949,19 @@ _GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - "
 #   define wmemcmp rpl_wmemcmp
 #  endif
 _GL_FUNCDECL_RPL (wmemcmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
+                  (const wchar_t *s1, const wchar_t *s2, size_t n),
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 _GL_CXXALIAS_RPL (wmemcmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
 # else
 #  if !@HAVE_WMEMCMP@
 _GL_FUNCDECL_SYS (wmemcmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
+                  (const wchar_t *s1, const wchar_t *s2, size_t n),
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 #  endif
 _GL_CXXALIAS_SYS (wmemcmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
@@ -909,7 +983,9 @@ _GL_WARN_ON_USE (wmemcmp, "wmemcmp is unportable - "
 # if !@HAVE_WMEMCPY@
 _GL_FUNCDECL_SYS (wmemcpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 # endif
 _GL_CXXALIAS_SYS (wmemcpy, wchar_t *,
                   (wchar_t *restrict dest,
@@ -931,7 +1007,9 @@ _GL_WARN_ON_USE (wmemcpy, "wmemcpy is unportable - "
 #if @GNULIB_WMEMMOVE@
 # if !@HAVE_WMEMMOVE@
 _GL_FUNCDECL_SYS (wmemmove, wchar_t *,
-                  (wchar_t *dest, const wchar_t *src, size_t n));
+                  (wchar_t *dest, const wchar_t *src, size_t n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 # endif
 _GL_CXXALIAS_SYS (wmemmove, wchar_t *,
                   (wchar_t *dest, const wchar_t *src, size_t n));
@@ -957,7 +1035,7 @@ _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n), );
 _GL_CXXALIAS_RPL (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
                    const wchar_t *restrict src, size_t n));
@@ -965,7 +1043,7 @@ _GL_CXXALIAS_RPL (wmempcpy, wchar_t *,
 #  if !@HAVE_WMEMPCPY@
 _GL_FUNCDECL_SYS (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n), );
 #  endif
 _GL_CXXALIAS_SYS (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
@@ -986,7 +1064,8 @@ _GL_WARN_ON_USE (wmempcpy, "wmempcpy is unportable - "
 /* Set N wide characters of S to C.  */
 #if @GNULIB_WMEMSET@
 # if !@HAVE_WMEMSET@
-_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
+_GL_FUNCDECL_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n),
+                                      _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3));
 # endif
 _GL_CXXALIAS_SYS (wmemset, wchar_t *, (wchar_t *s, wchar_t c, size_t n));
 # if __GLIBC__ >= 2
@@ -1004,7 +1083,7 @@ _GL_WARN_ON_USE (wmemset, "wmemset is unportable - "
 /* Return the number of wide characters in S.  */
 #if @GNULIB_WCSLEN@
 # if !@HAVE_WCSLEN@
-_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s) _GL_ATTRIBUTE_PURE);
+_GL_FUNCDECL_SYS (wcslen, size_t, (const wchar_t *s), _GL_ATTRIBUTE_PURE);
 # endif
 _GL_CXXALIAS_SYS (wcslen, size_t, (const wchar_t *s));
 # if __GLIBC__ >= 2
@@ -1025,7 +1104,7 @@ _GL_WARN_ON_USE (wcslen, "wcslen is unportable - "
    namespace, not in the global namespace.  So, force a declaration in
    the global namespace.  */
 # if !@HAVE_WCSNLEN@ || (defined __sun && defined __cplusplus)
-_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen)
+_GL_FUNCDECL_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen),
                                    _GL_ATTRIBUTE_PURE);
 # endif
 _GL_CXXALIAS_SYS (wcsnlen, size_t, (const wchar_t *s, size_t maxlen));
@@ -1043,7 +1122,7 @@ _GL_WARN_ON_USE (wcsnlen, "wcsnlen is unportable - "
 #if @GNULIB_WCSCPY@
 # if !@HAVE_WCSCPY@
 _GL_FUNCDECL_SYS (wcscpy, wchar_t *,
-                  (wchar_t *restrict dest, const wchar_t *restrict src));
+                  (wchar_t *restrict dest, const wchar_t *restrict src), );
 # endif
 _GL_CXXALIAS_SYS (wcscpy, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src));
@@ -1066,7 +1145,7 @@ _GL_WARN_ON_USE (wcscpy, "wcscpy is unportable - "
    the global namespace.  */
 # if !@HAVE_WCPCPY@ || (defined __sun && defined __cplusplus)
 _GL_FUNCDECL_SYS (wcpcpy, wchar_t *,
-                  (wchar_t *restrict dest, const wchar_t *restrict src));
+                  (wchar_t *restrict dest, const wchar_t *restrict src), );
 # endif
 _GL_CXXALIAS_SYS (wcpcpy, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src));
@@ -1085,7 +1164,9 @@ _GL_WARN_ON_USE (wcpcpy, "wcpcpy is unportable - "
 # if !@HAVE_WCSNCPY@
 _GL_FUNCDECL_SYS (wcsncpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n),
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 # endif
 _GL_CXXALIAS_SYS (wcsncpy, wchar_t *,
                   (wchar_t *restrict dest,
@@ -1111,7 +1192,7 @@ _GL_WARN_ON_USE (wcsncpy, "wcsncpy is unportable - "
 # if !@HAVE_WCPNCPY@ || (defined __sun && defined __cplusplus)
 _GL_FUNCDECL_SYS (wcpncpy, wchar_t *,
                   (wchar_t *restrict dest,
-                   const wchar_t *restrict src, size_t n));
+                   const wchar_t *restrict src, size_t n), );
 # endif
 _GL_CXXALIAS_SYS (wcpncpy, wchar_t *,
                   (wchar_t *restrict dest,
@@ -1130,7 +1211,7 @@ _GL_WARN_ON_USE (wcpncpy, "wcpncpy is unportable - "
 #if @GNULIB_WCSCAT@
 # if !@HAVE_WCSCAT@
 _GL_FUNCDECL_SYS (wcscat, wchar_t *,
-                  (wchar_t *restrict dest, const wchar_t *restrict src));
+                  (wchar_t *restrict dest, const wchar_t *restrict src), );
 # endif
 _GL_CXXALIAS_SYS (wcscat, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src));
@@ -1148,14 +1229,31 @@ _GL_WARN_ON_USE (wcscat, "wcscat is unportable - "
 
 /* Append no more than N wide characters of SRC onto DEST.  */
 #if @GNULIB_WCSNCAT@
-# if !@HAVE_WCSNCAT@
-_GL_FUNCDECL_SYS (wcsncat, wchar_t *,
+# if @REPLACE_WCSNCAT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsncat
+#   define wcsncat rpl_wcsncat
+#  endif
+_GL_FUNCDECL_RPL (wcsncat, wchar_t *,
+                  (wchar_t *restrict dest, const wchar_t *restrict src,
+                   size_t n),
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
+_GL_CXXALIAS_RPL (wcsncat, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src,
                    size_t n));
-# endif
+# else
+#  if !@HAVE_WCSNCAT@
+_GL_FUNCDECL_SYS (wcsncat, wchar_t *,
+                  (wchar_t *restrict dest, const wchar_t *restrict src,
+                   size_t n),
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
+#  endif
 _GL_CXXALIAS_SYS (wcsncat, wchar_t *,
                   (wchar_t *restrict dest, const wchar_t *restrict src,
                    size_t n));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wcsncat);
 # endif
@@ -1175,12 +1273,12 @@ _GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - "
 #   undef wcscmp
 #   define wcscmp rpl_wcscmp
 #  endif
-_GL_FUNCDECL_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)
+_GL_FUNCDECL_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2),
                                _GL_ATTRIBUTE_PURE);
 _GL_CXXALIAS_RPL (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
 # else
 #  if !@HAVE_WCSCMP@
-_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2)
+_GL_FUNCDECL_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2),
                                _GL_ATTRIBUTE_PURE);
 #  endif
 _GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
@@ -1205,15 +1303,19 @@ _GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - "
 #   define wcsncmp rpl_wcsncmp
 #  endif
 _GL_FUNCDECL_RPL (wcsncmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
+                  (const wchar_t *s1, const wchar_t *s2, size_t n),
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 _GL_CXXALIAS_RPL (wcsncmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
 # else
 #  if !@HAVE_WCSNCMP@
 _GL_FUNCDECL_SYS (wcsncmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
-                  _GL_ATTRIBUTE_PURE);
+                  (const wchar_t *s1, const wchar_t *s2, size_t n),
+                  _GL_ATTRIBUTE_PURE
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (1, 3)
+                  _GL_ATTRIBUTE_NONNULL_IF_NONZERO (2, 3));
 #  endif
 _GL_CXXALIAS_SYS (wcsncmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
@@ -1236,7 +1338,7 @@ _GL_WARN_ON_USE (wcsncmp, "wcsncmp is unportable - "
    namespace, not in the global namespace.  So, force a declaration in
    the global namespace.  */
 # if !@HAVE_WCSCASECMP@ || (defined __sun && defined __cplusplus)
-_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2)
+_GL_FUNCDECL_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2),
                                    _GL_ATTRIBUTE_PURE);
 # endif
 _GL_CXXALIAS_SYS (wcscasecmp, int, (const wchar_t *s1, const wchar_t *s2));
@@ -1257,7 +1359,7 @@ _GL_WARN_ON_USE (wcscasecmp, "wcscasecmp is unportable - "
    the global namespace.  */
 # if !@HAVE_WCSNCASECMP@ || (defined __sun && defined __cplusplus)
 _GL_FUNCDECL_SYS (wcsncasecmp, int,
-                  (const wchar_t *s1, const wchar_t *s2, size_t n)
+                  (const wchar_t *s1, const wchar_t *s2, size_t n),
                   _GL_ATTRIBUTE_PURE);
 # endif
 _GL_CXXALIAS_SYS (wcsncasecmp, int,
@@ -1276,7 +1378,7 @@ _GL_WARN_ON_USE (wcsncasecmp, "wcsncasecmp is unportable - "
    category of the current locale.  */
 #if @GNULIB_WCSCOLL@
 # if !@HAVE_WCSCOLL@
-_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
+_GL_FUNCDECL_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2), );
 # endif
 _GL_CXXALIAS_SYS (wcscoll, int, (const wchar_t *s1, const wchar_t *s2));
 # if __GLIBC__ >= 2
@@ -1297,7 +1399,7 @@ _GL_WARN_ON_USE (wcscoll, "wcscoll is unportable - "
 #if @GNULIB_WCSXFRM@
 # if !@HAVE_WCSXFRM@
 _GL_FUNCDECL_SYS (wcsxfrm, size_t,
-                  (wchar_t *restrict s1, const wchar_t *restrict s2, size_t n));
+                  (wchar_t *restrict s1, const wchar_t *restrict s2, size_t n), );
 # endif
 _GL_CXXALIAS_SYS (wcsxfrm, size_t,
                   (wchar_t *restrict s1, const wchar_t *restrict s2, size_t n));
@@ -1325,15 +1427,16 @@ _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s));
 /* On Solaris 11.3, the header files declare the function in the std::
    namespace, not in the global namespace.  So, force a declaration in
    the global namespace.  */
-#  if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) || __GNUC__ >= 11
+#  if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) \
+      || (__GNUC__ >= 11 && !defined __clang__)
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
-                  (const wchar_t *s)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (const wchar_t *s),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
-                  (const wchar_t *s)
+                  (const wchar_t *s),
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #   endif
 #  endif
@@ -1341,16 +1444,16 @@ _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
 # endif
 _GL_CXXALIASWARN (wcsdup);
 #else
-# if __GNUC__ >= 11 && !defined wcsdup
+# if (__GNUC__ >= 11 && !defined __clang__) && !defined wcsdup
 /* For -Wmismatched-dealloc: Associate wcsdup with free or rpl_free.  */
 #  if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
-                  (const wchar_t *s)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (const wchar_t *s),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
-                  (const wchar_t *s)
+                  (const wchar_t *s),
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #  endif
 # endif
@@ -1373,12 +1476,12 @@ _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s));
 #  else
 #   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
-                  (const wchar_t *s)
-                  _GL_ATTRIBUTE_NOTHROW
-                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+                  (const wchar_t *s),
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE)
+                  _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
-                  (const wchar_t *s)
+                  (const wchar_t *s),
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
 #   endif
 #   if @HAVE_DECL_WCSDUP@
@@ -1395,7 +1498,7 @@ _GL_CXXALIASWARN (wcsdup);
 /* Find the first occurrence of WC in WCS.  */
 #if @GNULIB_WCSCHR@
 # if !@HAVE_WCSCHR@
-_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
+_GL_FUNCDECL_SYS (wcschr, wchar_t *, (const wchar_t *wcs, wchar_t wc),
                                      _GL_ATTRIBUTE_PURE);
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -1407,10 +1510,11 @@ _GL_CXXALIAS_SYS_CAST2 (wcschr,
                         wchar_t *, (const wchar_t *, wchar_t),
                         const wchar_t *, (const wchar_t *, wchar_t));
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) \
+     && !defined __clang__
 _GL_CXXALIASWARN1 (wcschr, wchar_t *, (wchar_t *wcs, wchar_t wc));
 _GL_CXXALIASWARN1 (wcschr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
-# elif __GLIBC__ >= 2
+# elif __GLIBC__ >= 2 && !defined __CORRECT_ISO_CPP_WCHAR_H_PROTO
 _GL_CXXALIASWARN (wcschr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1425,7 +1529,7 @@ _GL_WARN_ON_USE (wcschr, "wcschr is unportable - "
 /* Find the last occurrence of WC in WCS.  */
 #if @GNULIB_WCSRCHR@
 # if !@HAVE_WCSRCHR@
-_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc)
+_GL_FUNCDECL_SYS (wcsrchr, wchar_t *, (const wchar_t *wcs, wchar_t wc),
                                       _GL_ATTRIBUTE_PURE);
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -1437,10 +1541,11 @@ _GL_CXXALIAS_SYS_CAST2 (wcsrchr,
                         wchar_t *, (const wchar_t *, wchar_t),
                         const wchar_t *, (const wchar_t *, wchar_t));
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) \
+     && !defined __clang__
 _GL_CXXALIASWARN1 (wcsrchr, wchar_t *, (wchar_t *wcs, wchar_t wc));
 _GL_CXXALIASWARN1 (wcsrchr, const wchar_t *, (const wchar_t *wcs, wchar_t wc));
-# elif __GLIBC__ >= 2
+# elif __GLIBC__ >= 2 && !defined __CORRECT_ISO_CPP_WCHAR_H_PROTO
 _GL_CXXALIASWARN (wcsrchr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1456,7 +1561,7 @@ _GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - "
    of wide characters not in REJECT.  */
 #if @GNULIB_WCSCSPN@
 # if !@HAVE_WCSCSPN@
-_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject)
+_GL_FUNCDECL_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject),
                                    _GL_ATTRIBUTE_PURE);
 # endif
 _GL_CXXALIAS_SYS (wcscspn, size_t, (const wchar_t *wcs, const wchar_t *reject));
@@ -1476,7 +1581,7 @@ _GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - "
    of wide characters in ACCEPT.  */
 #if @GNULIB_WCSSPN@
 # if !@HAVE_WCSSPN@
-_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept)
+_GL_FUNCDECL_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept),
                                   _GL_ATTRIBUTE_PURE);
 # endif
 _GL_CXXALIAS_SYS (wcsspn, size_t, (const wchar_t *wcs, const wchar_t *accept));
@@ -1496,7 +1601,7 @@ _GL_WARN_ON_USE (wcsspn, "wcsspn is unportable - "
 #if @GNULIB_WCSPBRK@
 # if !@HAVE_WCSPBRK@
 _GL_FUNCDECL_SYS (wcspbrk, wchar_t *,
-                  (const wchar_t *wcs, const wchar_t *accept)
+                  (const wchar_t *wcs, const wchar_t *accept),
                   _GL_ATTRIBUTE_PURE);
 # endif
   /* On some systems, this function is defined as an overloaded function:
@@ -1508,12 +1613,13 @@ _GL_CXXALIAS_SYS_CAST2 (wcspbrk,
                         wchar_t *, (const wchar_t *, const wchar_t *),
                         const wchar_t *, (const wchar_t *, const wchar_t *));
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) \
+     && !defined __clang__
 _GL_CXXALIASWARN1 (wcspbrk, wchar_t *,
                    (wchar_t *wcs, const wchar_t *accept));
 _GL_CXXALIASWARN1 (wcspbrk, const wchar_t *,
                    (const wchar_t *wcs, const wchar_t *accept));
-# elif __GLIBC__ >= 2
+# elif __GLIBC__ >= 2 && !defined __CORRECT_ISO_CPP_WCHAR_H_PROTO
 _GL_CXXALIASWARN (wcspbrk);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1534,7 +1640,7 @@ _GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (wcsstr, wchar_t *,
                   (const wchar_t *restrict haystack,
-                   const wchar_t *restrict needle)
+                   const wchar_t *restrict needle),
                   _GL_ATTRIBUTE_PURE);
 _GL_CXXALIAS_RPL (wcsstr, wchar_t *,
                   (const wchar_t *restrict haystack,
@@ -1543,7 +1649,7 @@ _GL_CXXALIAS_RPL (wcsstr, wchar_t *,
 #  if !@HAVE_WCSSTR@
 _GL_FUNCDECL_SYS (wcsstr, wchar_t *,
                   (const wchar_t *restrict haystack,
-                   const wchar_t *restrict needle)
+                   const wchar_t *restrict needle),
                   _GL_ATTRIBUTE_PURE);
 #  endif
   /* On some systems, this function is defined as an overloaded function:
@@ -1558,14 +1664,15 @@ _GL_CXXALIAS_SYS_CAST2 (wcsstr,
                         (const wchar_t *restrict, const wchar_t *restrict));
 # endif
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
-     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
+     && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) \
+     && !defined __clang__
 _GL_CXXALIASWARN1 (wcsstr, wchar_t *,
                    (wchar_t *restrict haystack,
                     const wchar_t *restrict needle));
 _GL_CXXALIASWARN1 (wcsstr, const wchar_t *,
                    (const wchar_t *restrict haystack,
                     const wchar_t *restrict needle));
-# elif __GLIBC__ >= 2
+# elif __GLIBC__ >= 2 && !defined __CORRECT_ISO_CPP_WCHAR_H_PROTO
 _GL_CXXALIASWARN (wcsstr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1586,7 +1693,7 @@ _GL_WARN_ON_USE (wcsstr, "wcsstr is unportable - "
 #  endif
 _GL_FUNCDECL_RPL (wcstok, wchar_t *,
                   (wchar_t *restrict wcs, const wchar_t *restrict delim,
-                   wchar_t **restrict ptr));
+                   wchar_t **restrict ptr), );
 _GL_CXXALIAS_RPL (wcstok, wchar_t *,
                   (wchar_t *restrict wcs, const wchar_t *restrict delim,
                    wchar_t **restrict ptr));
@@ -1594,7 +1701,7 @@ _GL_CXXALIAS_RPL (wcstok, wchar_t *,
 #  if !@HAVE_WCSTOK@
 _GL_FUNCDECL_SYS (wcstok, wchar_t *,
                   (wchar_t *restrict wcs, const wchar_t *restrict delim,
-                   wchar_t **restrict ptr));
+                   wchar_t **restrict ptr), );
 #  endif
 _GL_CXXALIAS_SYS (wcstok, wchar_t *,
                   (wchar_t *restrict wcs, const wchar_t *restrict delim,
@@ -1620,12 +1727,12 @@ _GL_WARN_ON_USE (wcstok, "wcstok is unportable - "
 #   undef wcswidth
 #   define wcswidth rpl_wcswidth
 #  endif
-_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n)
+_GL_FUNCDECL_RPL (wcswidth, int, (const wchar_t *s, size_t n),
                                  _GL_ATTRIBUTE_PURE);
 _GL_CXXALIAS_RPL (wcswidth, int, (const wchar_t *s, size_t n));
 # else
 #  if !@HAVE_WCSWIDTH@
-_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n)
+_GL_FUNCDECL_SYS (wcswidth, int, (const wchar_t *s, size_t n),
                                  _GL_ATTRIBUTE_PURE);
 #  endif
 _GL_CXXALIAS_SYS (wcswidth, int, (const wchar_t *s, size_t n));
@@ -1653,7 +1760,7 @@ _GL_WARN_ON_USE (wcswidth, "wcswidth is unportable - "
 _GL_FUNCDECL_RPL (wcsftime, size_t,
                   (wchar_t *restrict __buf, size_t __bufsize,
                    const wchar_t *restrict __fmt,
-                   const struct tm *restrict __tp)
+                   const struct tm *restrict __tp),
                   _GL_ARG_NONNULL ((1, 3, 4)));
 _GL_CXXALIAS_RPL (wcsftime, size_t,
                   (wchar_t *restrict __buf, size_t __bufsize,
@@ -1664,7 +1771,7 @@ _GL_CXXALIAS_RPL (wcsftime, size_t,
 _GL_FUNCDECL_SYS (wcsftime, size_t,
                   (wchar_t *restrict __buf, size_t __bufsize,
                    const wchar_t *restrict __fmt,
-                   const struct tm *restrict __tp)
+                   const struct tm *restrict __tp),
                   _GL_ARG_NONNULL ((1, 3, 4)));
 #  endif
 _GL_CXXALIAS_SYS (wcsftime, size_t,
@@ -1698,7 +1805,7 @@ _GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - "
    Possible errno values include:
      - ERANGE if SIZE is too small.
      - ENOMEM if the memory could no be allocated.  */
-_GL_FUNCDECL_SYS (wgetcwd, wchar_t *, (wchar_t *buf, size_t size));
+_GL_FUNCDECL_SYS (wgetcwd, wchar_t *, (wchar_t *buf, size_t size), );
 #endif
 
 
diff --git a/gl/wcrtomb.c b/gl/wcrtomb.c
index 197b020e..c9ebcf0c 100644
--- a/gl/wcrtomb.c
+++ b/gl/wcrtomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2008-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/wctype-h.c b/gl/wctype-h.c
index 7e4ff13a..098014a9 100644
--- a/gl/wctype-h.c
+++ b/gl/wctype-h.c
@@ -1,6 +1,6 @@
 /* Inline functions for <wctype.h>.
 
-   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+   Copyright (C) 2012-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
 
 /* Normally this would be wctype.c, but that name's already taken.  */
 
+#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE
 #include <config.h>
 
-#define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE
 #include <wctype.h>
diff --git a/gl/wctype-impl.h b/gl/wctype-impl.h
index 26d68b41..8bb83be7 100644
--- a/gl/wctype-impl.h
+++ b/gl/wctype-impl.h
@@ -1,5 +1,5 @@
 /* Get descriptor for a wide character property.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/wctype.c b/gl/wctype.c
index 914f6847..b421ad38 100644
--- a/gl/wctype.c
+++ b/gl/wctype.c
@@ -1,5 +1,5 @@
 /* Get descriptor for a wide character property.
-   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Copyright (C) 2011-2025 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/wctype.in.h b/gl/wctype.in.h
index 851c4f4e..aa4a8e7d 100644
--- a/gl/wctype.in.h
+++ b/gl/wctype.in.h
@@ -1,6 +1,6 @@
 /* A substitute for ISO C99 <wctype.h>, for platforms that lack it.
 
-   Copyright (C) 2006-2024 Free Software Foundation, Inc.
+   Copyright (C) 2006-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -478,9 +478,9 @@ towupper
 #    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #     define iswblank rpl_iswblank
 #    endif
-_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc));
+_GL_FUNCDECL_RPL (iswblank, int, (wint_t wc), );
 #   else
-_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
+_GL_FUNCDECL_SYS (iswblank, int, (wint_t wc), );
 #   endif
 #  endif
 
@@ -490,7 +490,7 @@ _GL_FUNCDECL_SYS (iswblank, int, (wint_t wc));
 #     undef iswdigit
 #     define iswdigit rpl_iswdigit
 #    endif
-_GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc));
+_GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc), );
 #   endif
 #  endif
 
@@ -500,7 +500,7 @@ _GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc));
 #     undef iswpunct
 #     define iswpunct rpl_iswpunct
 #    endif
-_GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc));
+_GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc), );
 #   endif
 #  endif
 
@@ -510,7 +510,7 @@ _GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc));
 #     undef iswxdigit
 #     define iswxdigit rpl_iswxdigit
 #    endif
-_GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc));
+_GL_FUNCDECL_RPL (iswxdigit, int, (wint_t wc), );
 #   endif
 #  endif
 
@@ -659,12 +659,12 @@ typedef void *rpl_wctype_t;
 #   undef wctype
 #   define wctype rpl_wctype
 #  endif
-_GL_FUNCDECL_RPL (wctype, wctype_t, (const char *name)
+_GL_FUNCDECL_RPL (wctype, wctype_t, (const char *name),
                                     _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (wctype, wctype_t, (const char *name));
 # else
 #  if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name)
+_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name),
                                     _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name));
@@ -689,11 +689,11 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - "
 #   undef iswctype
 #   define iswctype rpl_iswctype
 #  endif
-_GL_FUNCDECL_RPL (iswctype, int, (wint_t wc, wctype_t desc));
+_GL_FUNCDECL_RPL (iswctype, int, (wint_t wc, wctype_t desc), );
 _GL_CXXALIAS_RPL (iswctype, int, (wint_t wc, wctype_t desc));
 # else
 #  if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc));
+_GL_FUNCDECL_SYS (iswctype, int, (wint_t wc, wctype_t desc), );
 #  endif
 _GL_CXXALIAS_SYS (iswctype, int, (wint_t wc, wctype_t desc));
 # endif
@@ -741,12 +741,12 @@ typedef void *rpl_wctrans_t;
 #   undef wctrans
 #   define wctrans rpl_wctrans
 #  endif
-_GL_FUNCDECL_RPL (wctrans, wctrans_t, (const char *name)
+_GL_FUNCDECL_RPL (wctrans, wctrans_t, (const char *name),
                                       _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (wctrans, wctrans_t, (const char *name));
 # else
 #  if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name)
+_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name),
                                       _GL_ARG_NONNULL ((1)));
 #  endif
 _GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name));
@@ -771,11 +771,11 @@ _GL_WARN_ON_USE (wctrans, "wctrans is unportable - "
 #   undef towctrans
 #   define towctrans rpl_towctrans
 #  endif
-_GL_FUNCDECL_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc));
+_GL_FUNCDECL_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc), );
 _GL_CXXALIAS_RPL (towctrans, wint_t, (wint_t wc, wctrans_t desc));
 # else
 #  if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
+_GL_FUNCDECL_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc), );
 #  endif
 _GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
 # endif
diff --git a/gl/wcwidth.c b/gl/wcwidth.c
new file mode 100644
index 00000000..6e7141d0
--- /dev/null
+++ b/gl/wcwidth.c
@@ -0,0 +1,73 @@
+/* Determine the number of screen columns needed for a character.
+   Copyright (C) 2006-2007, 2010-2025 Free Software Foundation, Inc.
+
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of the
+   License, or (at your option) any later version.
+
+   This file is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wchar.h>
+
+/* Get iswprint.  */
+#include <wctype.h>
+
+#include "localcharset.h"
+#include "streq.h"
+#include "uniwidth.h"
+
+/* Returns 1 if the current locale is an UTF-8 locale, 0 otherwise.  */
+static inline int
+is_locale_utf8 (void)
+{
+  const char *encoding = locale_charset ();
+  return STREQ_OPT (encoding, "UTF-8", 'U', 'T', 'F', '-', '8', 0, 0, 0, 0);
+}
+
+#if GNULIB_WCHAR_SINGLE_LOCALE
+/* When we know that the locale does not change, provide a speedup by
+   caching the value of is_locale_utf8.  */
+static int cached_is_locale_utf8 = -1;
+static inline int
+is_locale_utf8_cached (void)
+{
+  if (cached_is_locale_utf8 < 0)
+    cached_is_locale_utf8 = is_locale_utf8 ();
+  return cached_is_locale_utf8;
+}
+#else
+/* By default, don't make assumptions, hence no caching.  */
+# define is_locale_utf8_cached is_locale_utf8
+#endif
+
+int
+wcwidth (wchar_t wc)
+#undef wcwidth
+{
+  /* In UTF-8 locales, use a Unicode aware width function.  */
+  if (is_locale_utf8_cached ())
+    {
+      /* We assume that in a UTF-8 locale, a wide character is the same as a
+         Unicode character.  */
+      return uc_width (wc, "UTF-8");
+    }
+  else
+    {
+      /* Otherwise, fall back to the system's wcwidth function.  */
+#if HAVE_WCWIDTH
+      return wcwidth (wc);
+#else
+      return wc == 0 ? 0 : iswprint (wc) ? 1 : -1;
+#endif
+    }
+}
diff --git a/gl/windows-initguard.h b/gl/windows-initguard.h
index 6bace3f0..4f45e5bb 100644
--- a/gl/windows-initguard.h
+++ b/gl/windows-initguard.h
@@ -1,5 +1,5 @@
 /* Init guards, somewhat like spinlocks (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/windows-mutex.c b/gl/windows-mutex.c
index b112e13b..87b75735 100644
--- a/gl/windows-mutex.c
+++ b/gl/windows-mutex.c
@@ -1,5 +1,5 @@
 /* Plain mutexes (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -23,10 +23,12 @@
 #include "windows-mutex.h"
 
 #include <errno.h>
+#include <stdlib.h>
 
 void
 glwthread_mutex_init (glwthread_mutex_t *mutex)
 {
+  mutex->owner = 0;
   InitializeCriticalSection (&mutex->lock);
   mutex->guard.done = 1;
 }
@@ -49,7 +51,13 @@ glwthread_mutex_lock (glwthread_mutex_t *mutex)
             Sleep (0);
         }
     }
+  /* If this thread already owns the mutex, POSIX pthread_mutex_lock() is
+     required to deadlock here.  But let's not do that on purpose.  */
   EnterCriticalSection (&mutex->lock);
+  {
+    DWORD self = GetCurrentThreadId ();
+    mutex->owner = self;
+  }
   return 0;
 }
 
@@ -72,6 +80,21 @@ glwthread_mutex_trylock (glwthread_mutex_t *mutex)
     }
   if (!TryEnterCriticalSection (&mutex->lock))
     return EBUSY;
+  {
+    DWORD self = GetCurrentThreadId ();
+    /* TryEnterCriticalSection succeeded.  This means that the mutex was either
+       previously unlocked (and thus mutex->owner == 0) or previously locked by
+       this thread (and thus mutex->owner == self).  Since the mutex is meant to
+       be plain, we need to fail in the latter case.  */
+    if (mutex->owner == self)
+      {
+        LeaveCriticalSection (&mutex->lock);
+        return EBUSY;
+      }
+    if (mutex->owner != 0)
+      abort ();
+    mutex->owner = self;
+  }
   return 0;
 }
 
@@ -80,6 +103,7 @@ glwthread_mutex_unlock (glwthread_mutex_t *mutex)
 {
   if (!mutex->guard.done)
     return EINVAL;
+  mutex->owner = 0;
   LeaveCriticalSection (&mutex->lock);
   return 0;
 }
diff --git a/gl/windows-mutex.h b/gl/windows-mutex.h
index 88de4bdc..dc6b41e0 100644
--- a/gl/windows-mutex.h
+++ b/gl/windows-mutex.h
@@ -1,5 +1,5 @@
 /* Plain mutexes (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -28,6 +28,7 @@
 typedef struct
         {
           glwthread_initguard_t guard; /* protects the initialization */
+          DWORD owner;
           CRITICAL_SECTION lock;
         }
         glwthread_mutex_t;
diff --git a/gl/windows-once.c b/gl/windows-once.c
index 17854f5c..bd9e672a 100644
--- a/gl/windows-once.c
+++ b/gl/windows-once.c
@@ -1,5 +1,5 @@
 /* Once-only control (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -29,7 +29,9 @@ glwthread_once (glwthread_once_t *once_control, void (*initfunction) (void))
 {
   if (once_control->inited <= 0)
     {
-      if (InterlockedIncrement (&once_control->started) == 0)
+      InterlockedIncrement (&once_control->num_threads);
+      /* If once_control->started is == -1, set it to 0.  */
+      if (InterlockedCompareExchange (&once_control->started, 0, -1) < 0)
         {
           /* This thread is the first one to come to this once_control.  */
           InitializeCriticalSection (&once_control->lock);
@@ -41,8 +43,6 @@ glwthread_once (glwthread_once_t *once_control, void (*initfunction) (void))
         }
       else
         {
-          /* Don't let once_control->started grow and wrap around.  */
-          InterlockedDecrement (&once_control->started);
           /* Some other thread has already started the initialization.
              Yield the CPU while waiting for the other thread to finish
              initializing and taking the lock.  */
@@ -58,5 +58,48 @@ glwthread_once (glwthread_once_t *once_control, void (*initfunction) (void))
                 abort ();
             }
         }
+      /* Here once_control->started == 0 and once_control->inited > 0.  */
+      if (InterlockedDecrement (&once_control->num_threads) == 0)
+        /* once_control->num_threads is now zero, and
+           once_control->started == 0 and once_control->inited > 0.
+           No other thread will need to use the lock.
+           We can therefore destroy the lock, to free resources.  */
+        /* If once_control->inited is == 1, set it to 2.  */
+        if (InterlockedCompareExchange (&once_control->inited, 2, 1) == 1)
+          DeleteCriticalSection (&once_control->lock);
     }
+  /* Proof of correctness:
+     * num_threads is incremented and then decremented by some threads.
+       Therefore, num_threads always stays >= 0, and is == 0 at the end.
+     * The first thread to go through the once_control->started fence
+       initializes the lock and moves inited from <= 0 to > 0.  The other
+       threads don't move inited from <= 0 to > 0.
+     * started, once == 0, stays == 0.
+     * inited, once > 0, stays > 0 (since at the place where it is assigned 0,
+       it cannot be > 0).
+     * inited does not change any more once it is 2.
+       Therefore, it can be changed from 1 to 2 only once.
+     * DeleteCriticalSection gets invoked right after inited has been changed
+       from 1 to 2.  Therefore, DeleteCriticalSection gets invoked only once.
+     * After a moment where num_threads was 0 and started was 0 and
+       inited was > 0, no thread can reach an InitializeCriticalSection or
+       EnterCriticalSection invocation.  Proof:
+       - At such a moment, no thread is in the code range between
+           InterlockedIncrement (&once_control->num_threads)
+         and
+           InterlockedDecrement (&once_control->num_threads)
+       - After such a moment, some thread can increment num_threads, but from
+         there they cannot reach the InitializeCriticalSection invocation,
+         because the once_control->started test prevents that, and they cannot
+         reach the EnterCriticalSection invocation in the other branch because
+         the
+           if (once_control->inited <= 0)
+         test prevents that.
+     * From this it follows that:
+       - DeleteCriticalSection cannot be executed while the lock is taken
+         (because DeleteCriticalSection is only executed after a moment where
+         num_threads was 0 and started was 0 and inited was > 0).
+       - Once DeleteCriticalSection has been executed, the lock is not used any
+         more.
+   */
 }
diff --git a/gl/windows-once.h b/gl/windows-once.h
index c5bbcd57..b27ae538 100644
--- a/gl/windows-once.h
+++ b/gl/windows-once.h
@@ -1,5 +1,5 @@
 /* Once-only control (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -25,13 +25,14 @@
 
 typedef struct
         {
-          volatile int inited;
+          volatile LONG inited;
+          volatile LONG num_threads;
           volatile LONG started;
           CRITICAL_SECTION lock;
         }
         glwthread_once_t;
 
-#define GLWTHREAD_ONCE_INIT { -1, -1 }
+#define GLWTHREAD_ONCE_INIT { -1, 0, -1 }
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/gl/windows-recmutex.c b/gl/windows-recmutex.c
index e5672baf..09341d56 100644
--- a/gl/windows-recmutex.c
+++ b/gl/windows-recmutex.c
@@ -1,5 +1,5 @@
 /* Plain recursive mutexes (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/windows-recmutex.h b/gl/windows-recmutex.h
index 9fa445b3..25a883d4 100644
--- a/gl/windows-recmutex.h
+++ b/gl/windows-recmutex.h
@@ -1,5 +1,5 @@
 /* Plain recursive mutexes (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/windows-rwlock.c b/gl/windows-rwlock.c
index e60c4efc..313f14ca 100644
--- a/gl/windows-rwlock.c
+++ b/gl/windows-rwlock.c
@@ -1,5 +1,5 @@
 /* Read-write locks (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/windows-rwlock.h b/gl/windows-rwlock.h
index 08d67750..b1b4063a 100644
--- a/gl/windows-rwlock.h
+++ b/gl/windows-rwlock.h
@@ -1,5 +1,5 @@
 /* Read-write locks (native Windows implementation).
-   Copyright (C) 2005-2024 Free Software Foundation, Inc.
+   Copyright (C) 2005-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/xalloc-die.c b/gl/xalloc-die.c
index c053c7a8..db1ee8ff 100644
--- a/gl/xalloc-die.c
+++ b/gl/xalloc-die.c
@@ -1,6 +1,6 @@
 /* Report a memory allocation failure and exit.
 
-   Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2024 Free Software
+   Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2025 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@
 #include "exitfail.h"
 
 #include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
 
 void
 xalloc_die (void)
diff --git a/gl/xalloc-oversized.h b/gl/xalloc-oversized.h
index 7f30f83e..0f66bd06 100644
--- a/gl/xalloc-oversized.h
+++ b/gl/xalloc-oversized.h
@@ -1,6 +1,6 @@
 /* xalloc-oversized.h -- memory allocation size checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2024 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -47,7 +47,8 @@
 #if 7 <= __GNUC__ && !defined __clang__ && PTRDIFF_MAX < SIZE_MAX
 # define xalloc_oversized(n, s) \
    __builtin_mul_overflow_p (n, s, (ptrdiff_t) 1)
-#elif 5 <= __GNUC__ && !defined __ICC && PTRDIFF_MAX < SIZE_MAX
+#elif 5 <= __GNUC__ && !defined __clang__ && !defined __ICC \
+      && PTRDIFF_MAX < SIZE_MAX
 # define xalloc_oversized(n, s) \
    (__builtin_constant_p (n) && __builtin_constant_p (s) \
     ? __xalloc_oversized (n, s) \
diff --git a/gl/xalloc.h b/gl/xalloc.h
index 75a5db30..438e5caa 100644
--- a/gl/xalloc.h
+++ b/gl/xalloc.h
@@ -1,6 +1,6 @@
 /* xalloc.h -- malloc with out-of-memory checking
 
-   Copyright (C) 1990-2000, 2003-2004, 2006-2024 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/gl/xmalloc.c b/gl/xmalloc.c
index 5befdab7..8a715807 100644
--- a/gl/xmalloc.c
+++ b/gl/xmalloc.c
@@ -1,6 +1,6 @@
 /* xmalloc.c -- malloc with out of memory checking
 
-   Copyright (C) 1990-2000, 2002-2006, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2002-2006, 2008-2025 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ void *
 xrealloc (void *p, size_t s)
 {
   void *r = realloc (p, s);
-  if (!r && (!p || s))
+  if (!r)
     xalloc_die ();
   return r;
 }
@@ -82,7 +82,7 @@ void *
 xreallocarray (void *p, size_t n, size_t s)
 {
   void *r = reallocarray (p, n, s);
-  if (!r && (!p || (n && s)))
+  if (!r)
     xalloc_die ();
   return r;
 }
diff --git a/gl/xsize.c b/gl/xsize.c
index 87744675..cd75b606 100644
--- a/gl/xsize.c
+++ b/gl/xsize.c
@@ -1,6 +1,6 @@
 /* Checked size_t computations.
 
-   Copyright (C) 2012-2024 Free Software Foundation, Inc.
+   Copyright (C) 2012-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
diff --git a/gl/xsize.h b/gl/xsize.h
index 619c0edc..ee9c5680 100644
--- a/gl/xsize.h
+++ b/gl/xsize.h
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2024 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008-2025 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -26,7 +26,7 @@
 /* Get size_t.  */
 #include <stddef.h>
 
-/* Get SIZE_MAX.  */
+/* Get INT_MAX, SIZE_MAX.  */
 #include <limits.h>
 #if HAVE_STDINT_H
 # include <stdint.h>
@@ -61,7 +61,8 @@ extern "C" {
       void *p = (size_in_bounds_p (size) ? malloc (size) : NULL);
 */
 
-/* Convert an arbitrary value >= 0 to type size_t.  */
+/* Convert an arbitrary N >= 0 to type size_t.
+   N should not have side effects.  */
 #define xcast_size_t(N) \
   ((N) <= SIZE_MAX ? (size_t) (N) : SIZE_MAX)
 
@@ -69,8 +70,15 @@ extern "C" {
 XSIZE_INLINE size_t ATTRIBUTE_PURE
 xsum (size_t size1, size_t size2)
 {
-  size_t sum = size1 + size2;
-  return (sum >= size1 ? sum : SIZE_MAX);
+  if (INT_MAX < SIZE_MAX)
+    {
+      /* Optimize for the common case where size_t arithmetic wraps
+         around without undefined behavior.  */
+      size_t sum = size1 + size2;
+      return size1 <= sum ? sum : SIZE_MAX;
+    }
+
+  return size1 <= SIZE_MAX - size2 ? size1 + size2 : SIZE_MAX;
 }
 
 /* Sum of three sizes, with overflow check.  */
@@ -98,6 +106,8 @@ xmax (size_t size1, size_t size2)
 
 /* Multiplication of a count with an element size, with overflow check.
    The count must be >= 0 and the element size must be > 0.
+   Arguments should not have side effects.
+   The element size's type should be no wider than size_t.
    This is a macro, not a function, so that it works correctly even
    when N is of a wider type and N > SIZE_MAX.  */
 #define xtimes(N, ELSIZE) \
diff --git a/lib/Makefile.am b/lib/Makefile.am
index e41201c4..27a08278 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -4,13 +4,12 @@ SUBDIRS = . tests
 
 noinst_LIBRARIES = libmonitoringplug.a
 
-AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
+AM_CPPFLAGS =  \
         -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-libmonitoringplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c maxfd.c output.c perfdata.c output.c thresholds.c vendor/cJSON/cJSON.c
+libmonitoringplug_a_SOURCES = utils_base.c utils_tcp.c utils_cmd.c maxfd.c output.c perfdata.c output.c thresholds.c vendor/cJSON/cJSON.c
 
 EXTRA_DIST = utils_base.h \
-        utils_disk.h \
         utils_tcp.h \
         utils_cmd.h \
         parse_ini.h \
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 88787336..3fe69014 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -27,27 +27,32 @@
 
 /* FIXME: copied from utils.h; we should move a bunch of libs! */
 bool is_option2(char *str) {
-        if (!str)
+        if (!str) {
                 return false;
-        else if (strspn(str, "-") == 1 || strspn(str, "-") == 2)
+        }
+
+        if (strspn(str, "-") == 1 || strspn(str, "-") == 2) {
                 return true;
-        else
-                return false;
+        }
+
+        return false;
 }
 
 /* this is the externally visible function used by plugins */
 char **np_extra_opts(int *argc, char **argv, const char *plugin_name) {
-        np_arg_list *extra_args = NULL, *ea1 = NULL, *ea_tmp = NULL;
-        char **argv_new = NULL;
-        char *argptr = NULL;
-        int i, j, optfound, argc_new, ea_num = *argc;
-
         if (*argc < 2) {
                 /* No arguments provided */
                 return argv;
         }
 
-        for (i = 1; i < *argc; i++) {
+        np_arg_list *extra_args = NULL;
+        np_arg_list *ea1 = NULL;
+        np_arg_list *ea_tmp = NULL;
+        char *argptr = NULL;
+        int optfound;
+        size_t ea_num = (size_t)*argc;
+
+        for (int i = 1; i < *argc; i++) {
                 argptr = NULL;
                 optfound = 0;
 
@@ -56,8 +61,10 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name) {
                         /* It is a single argument with value */
                         argptr = argv[i] + 13;
                         /* Delete the extra opts argument */
-                        for (j = i; j < *argc; j++)
+                        for (int j = i; j < *argc; j++) {
                                 argv[j] = argv[j + 1];
+                        }
+
                         i--;
                         *argc -= 1;
                 } else if (strcmp(argv[i], "--extra-opts") == 0) {
@@ -65,8 +72,10 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name) {
                                 /* It is a argument with separate value */
                                 argptr = argv[i + 1];
                                 /* Delete the extra-opts argument/value */
-                                for (j = i; j < *argc - 1; j++)
+                                for (int j = i; j < *argc - 1; j++) {
                                         argv[j] = argv[j + 2];
+                                }
+
                                 i -= 2;
                                 *argc -= 2;
                                 ea_num--;
@@ -74,8 +83,10 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name) {
                                 /* It has no value */
                                 optfound = 1;
                                 /* Delete the extra opts argument */
-                                for (j = i; j < *argc; j++)
+                                for (int j = i; j < *argc; j++) {
                                         argv[j] = argv[j + 1];
+                                }
+
                                 i--;
                                 *argc -= 1;
                         }
@@ -94,34 +105,37 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name) {
                         /* append the list to extra_args */
                         if (extra_args == NULL) {
                                 extra_args = ea1;
-                                while ((ea1 = ea1->next))
+                                while ((ea1 = ea1->next)) {
                                         ea_num++;
+                                }
                         } else {
                                 ea_tmp = extra_args;
                                 while (ea_tmp->next) {
                                         ea_tmp = ea_tmp->next;
                                 }
                                 ea_tmp->next = ea1;
-                                while ((ea1 = ea1->next))
+                                while ((ea1 = ea1->next)) {
                                         ea_num++;
+                                }
                         }
                         ea1 = ea_tmp = NULL;
                 }
         } /* lather, rince, repeat */
 
-        if (ea_num == *argc && extra_args == NULL) {
+        if (ea_num == (size_t)*argc && extra_args == NULL) {
                 /* No extra-opts */
                 return argv;
         }
 
         /* done processing arguments. now create a new argv array... */
-        argv_new = (char **)malloc((ea_num + 1) * sizeof(char **));
-        if (argv_new == NULL)
+        char **argv_new = (char **)malloc((ea_num + 1) * sizeof(char **));
+        if (argv_new == NULL) {
                 die(STATE_UNKNOWN, _("malloc() failed!\n"));
+        }
 
         /* starting with program name */
         argv_new[0] = argv[0];
-        argc_new = 1;
+        int argc_new = 1;
         /* then parsed ini opts (frying them up in the same run) */
         while (extra_args) {
                 argv_new[argc_new++] = extra_args->arg;
@@ -130,8 +144,9 @@ char **np_extra_opts(int *argc, char **argv, const char *plugin_name) {
                 free(ea1);
         }
         /* finally the rest of the argv array */
-        for (i = 1; i < *argc; i++)
+        for (int i = 1; i < *argc; i++) {
                 argv_new[argc_new++] = argv[i];
+        }
         *argc = argc_new;
         /* and terminate. */
         argv_new[argc_new] = NULL;
diff --git a/lib/maxfd.c b/lib/maxfd.c
index ca5b6e54..a0f79949 100644
--- a/lib/maxfd.c
+++ b/lib/maxfd.c
@@ -19,7 +19,6 @@
  *****************************************************************************/
 
 #include "./maxfd.h"
-#include <errno.h>
 
 long mp_open_max(void) {
         long maxfd = 0L;
@@ -31,10 +30,11 @@ long mp_open_max(void) {
 #ifdef _SC_OPEN_MAX
         errno = 0;
         if ((maxfd = sysconf(_SC_OPEN_MAX)) < 0) {
-                if (errno == 0)
+                if (errno == 0) {
                         maxfd = DEFAULT_MAXFD; /* it's indeterminate */
-                else
+                } else {
                         die(STATE_UNKNOWN, _("sysconf error for _SC_OPEN_MAX\n"));
+                }
         }
 #elif defined(OPEN_MAX)
         return OPEN_MAX
diff --git a/lib/output.c b/lib/output.c
index 61fbf832..62e1366d 100644
--- a/lib/output.c
+++ b/lib/output.c
@@ -13,9 +13,11 @@
 
 // == Global variables
 static mp_output_format output_format = MP_FORMAT_DEFAULT;
+static mp_output_detail_level level_of_detail = MP_DETAIL_ALL;
 
 // == Prototypes ==
-static char *fmt_subcheck_output(mp_output_format output_format, mp_subcheck check, unsigned int indentation);
+static char *fmt_subcheck_output(mp_output_format output_format, mp_subcheck check,
+                                                                 unsigned int indentation);
 static inline cJSON *json_serialize_subcheck(mp_subcheck subcheck);
 
 // == Implementation ==
@@ -40,7 +42,7 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
 
         while (subchecks != NULL) {
                 if (added > 0) {
-                        added = asprintf(&result, "%s%s", result, fmt_subcheck_perfdata(subchecks->subcheck));
+                        added = asprintf(&result, "%s %s", result, fmt_subcheck_perfdata(subchecks->subcheck));
                 } else {
                         // TODO free previous result here?
                         added = asprintf(&result, "%s", fmt_subcheck_perfdata(subchecks->subcheck));
@@ -57,7 +59,9 @@ static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
  * It sets useful defaults
  */
 mp_check mp_check_init(void) {
-        mp_check check = {0};
+        mp_check check = {
+                .evaluation_function = &mp_eval_check_default,
+        };
         return check;
 }
 
@@ -120,7 +124,8 @@ void mp_add_perfdata_to_subcheck(mp_subcheck check[static 1], const mp_perfdata
  */
 int mp_add_subcheck_to_subcheck(mp_subcheck check[static 1], mp_subcheck subcheck) {
         if (subcheck.output == NULL) {
-                die(STATE_UNKNOWN, "%s - %s #%d: %s", __FILE__, __func__, __LINE__, "Sub check output is NULL");
+                die(STATE_UNKNOWN, "%s - %s #%d: %s", __FILE__, __func__, __LINE__,
+                        "Sub check output is NULL");
         }
 
         mp_subcheck_list *tmp = NULL;
@@ -193,16 +198,33 @@ char *get_subcheck_summary(mp_check check) {
         return result;
 }
 
+mp_state_enum mp_compute_subcheck_state(const mp_subcheck subcheck) {
+        if (subcheck.evaluation_function == NULL) {
+                return mp_eval_subcheck_default(subcheck);
+        }
+        return subcheck.evaluation_function(subcheck);
+}
+
 /*
- * Generate the result state of a mp_subcheck object based on it's own state and it's subchecks states
+ * Generate the result state of a mp_subcheck object based on its own state and its subchecks
+ * states
  */
-mp_state_enum mp_compute_subcheck_state(const mp_subcheck check) {
-        if (check.state_set_explicitly) {
-                return check.state;
+mp_state_enum mp_eval_subcheck_default(mp_subcheck subcheck) {
+        if (subcheck.evaluation_function != NULL) {
+                return subcheck.evaluation_function(subcheck);
         }
 
-        mp_subcheck_list *scl = check.subchecks;
-        mp_state_enum result = check.default_state;
+        if (subcheck.state_set_explicitly) {
+                return subcheck.state;
+        }
+
+        mp_subcheck_list *scl = subcheck.subchecks;
+
+        if (scl == NULL) {
+                return subcheck.default_state;
+        }
+
+        mp_state_enum result = STATE_OK;
 
         while (scl != NULL) {
                 result = max_state_alt(result, mp_compute_subcheck_state(scl->subcheck));
@@ -212,10 +234,18 @@ mp_state_enum mp_compute_subcheck_state(const mp_subcheck check) {
         return result;
 }
 
+mp_state_enum mp_compute_check_state(const mp_check check) {
+        // just a safety check
+        if (check.evaluation_function == NULL) {
+                return mp_eval_check_default(check);
+        }
+        return check.evaluation_function(check);
+}
+
 /*
  * Generate the result state of a mp_check object based on it's own state and it's subchecks states
  */
-mp_state_enum mp_compute_check_state(const mp_check check) {
+mp_state_enum mp_eval_check_default(const mp_check check) {
         assert(check.subchecks != NULL); // a mp_check without subchecks is invalid, die here
 
         mp_subcheck_list *scl = check.subchecks;
@@ -247,7 +277,11 @@ char *mp_fmt_output(mp_check check) {
                 mp_subcheck_list *subchecks = check.subchecks;
 
                 while (subchecks != NULL) {
-                        asprintf(&result, "%s\n%s", result, fmt_subcheck_output(MP_FORMAT_MULTI_LINE, subchecks->subcheck, 1));
+                        if (level_of_detail == MP_DETAIL_ALL ||
+                                mp_compute_subcheck_state(subchecks->subcheck) != STATE_OK) {
+                                asprintf(&result, "%s\n%s", result,
+                                                 fmt_subcheck_output(MP_FORMAT_MULTI_LINE, subchecks->subcheck, 1));
+                        }
                         subchecks = subchecks->next;
                 }
 
@@ -258,7 +292,8 @@ char *mp_fmt_output(mp_check check) {
                         if (pd_string == NULL) {
                                 asprintf(&pd_string, "%s", fmt_subcheck_perfdata(subchecks->subcheck));
                         } else {
-                                asprintf(&pd_string, "%s %s", pd_string, fmt_subcheck_perfdata(subchecks->subcheck));
+                                asprintf(&pd_string, "%s %s", pd_string,
+                                                 fmt_subcheck_perfdata(subchecks->subcheck));
                         }
 
                         subchecks = subchecks->next;
@@ -327,22 +362,58 @@ static char *generate_indentation_string(unsigned int indentation) {
 /*
  * Helper function to generate the output string of mp_subcheck
  */
-static inline char *fmt_subcheck_output(mp_output_format output_format, mp_subcheck check, unsigned int indentation) {
+static inline char *fmt_subcheck_output(mp_output_format output_format, mp_subcheck check,
+                                                                                unsigned int indentation) {
         char *result = NULL;
         mp_subcheck_list *subchecks = NULL;
 
         switch (output_format) {
-        case MP_FORMAT_MULTI_LINE:
-                asprintf(&result, "%s\\_[%s] - %s", generate_indentation_string(indentation), state_text(mp_compute_subcheck_state(check)),
-                                 check.output);
+        case MP_FORMAT_MULTI_LINE: {
+                char *tmp_string = NULL;
+                if ((tmp_string = strchr(check.output, '\n')) != NULL) {
+                        // This is a multiline string, put the correct indentation in before proceeding
+                        char *intermediate_string = "";
+                        bool have_residual_chars = false;
+
+                        while (tmp_string != NULL) {
+                                *tmp_string = '\0';
+                                asprintf(&intermediate_string, "%s%s\n%s", intermediate_string, check.output,
+                                                 generate_indentation_string(
+                                                         indentation + 1)); // one more indentation to make it look better
+
+                                if (*(tmp_string + 1) != '\0') {
+                                        check.output = tmp_string + 1;
+                                        have_residual_chars = true;
+                                } else {
+                                        // Null after the \n, so this is the end
+                                        have_residual_chars = false;
+                                        break;
+                                }
+
+                                tmp_string = strchr(check.output, '\n');
+                        }
+
+                        // add the rest (if any)
+                        if (have_residual_chars) {
+                                char *tmp = check.output;
+                                xasprintf(&check.output, "%s\n%s%s", intermediate_string,
+                                                  generate_indentation_string(indentation + 1), tmp);
+                        } else {
+                                check.output = intermediate_string;
+                        }
+                }
+                asprintf(&result, "%s\\_[%s] - %s", generate_indentation_string(indentation),
+                                 state_text(mp_compute_subcheck_state(check)), check.output);
 
                 subchecks = check.subchecks;
 
                 while (subchecks != NULL) {
-                        asprintf(&result, "%s\n%s", result, fmt_subcheck_output(output_format, subchecks->subcheck, indentation + 1));
+                        asprintf(&result, "%s\n%s", result,
+                                         fmt_subcheck_output(output_format, subchecks->subcheck, indentation + 1));
                         subchecks = subchecks->next;
                 }
                 return result;
+        }
         default:
                 die(STATE_UNKNOWN, "Invalid format");
         }
@@ -539,3 +610,27 @@ parsed_output_format mp_parse_output_format(char *format_string) {
 void mp_set_format(mp_output_format format) { output_format = format; }
 
 mp_output_format mp_get_format(void) { return output_format; }
+
+void mp_set_level_of_detail(mp_output_detail_level level) { level_of_detail = level; }
+
+mp_output_detail_level mp_get_level_of_detail(void) { return level_of_detail; }
+
+mp_state_enum mp_eval_ok(mp_check overall) {
+        (void)overall;
+        return STATE_OK;
+}
+
+mp_state_enum mp_eval_warning(mp_check overall) {
+        (void)overall;
+        return STATE_WARNING;
+}
+
+mp_state_enum mp_eval_critical(mp_check overall) {
+        (void)overall;
+        return STATE_CRITICAL;
+}
+
+mp_state_enum mp_eval_unknown(mp_check overall) {
+        (void)overall;
+        return STATE_UNKNOWN;
+}
diff --git a/lib/output.h b/lib/output.h
index 2bdfa074..c63c8e3f 100644
--- a/lib/output.h
+++ b/lib/output.h
@@ -7,15 +7,21 @@
 /*
  * A partial check result
  */
-typedef struct {
+typedef struct mp_subcheck mp_subcheck;
+struct mp_subcheck {
         mp_state_enum state;         // OK, Warning, Critical ... set explicitly
         mp_state_enum default_state; // OK, Warning, Critical .. if not set explicitly
-        bool state_set_explicitly;   // was the state set explicitly (or should it be derived from subchecks)
+        bool state_set_explicitly;   // was the state set explicitly (or should it be derived from
+                                                                 // subchecks)
 
-        char *output;                    // Text output for humans ("Filesystem xyz is fine", "Could not create TCP connection to..")
-        pd_list *perfdata;               // Performance data for this check
+        char *output;      // Text output for humans ("Filesystem xyz is fine", "Could not create TCP
+                                           // connection to..")
+        pd_list *perfdata; // Performance data for this check
         struct subcheck_list *subchecks; // subchecks deeper in the hierarchy
-} mp_subcheck;
+
+        // the evaluation_functions computes the state of subcheck
+        mp_state_enum (*evaluation_function)(mp_subcheck);
+};
 
 /*
  * A list of subchecks, used in subchecks and the main check
@@ -38,8 +44,18 @@ typedef enum output_format {
 /*
  * Format related functions
  */
- void mp_set_format(mp_output_format format);
- mp_output_format mp_get_format(void);
+void mp_set_format(mp_output_format format);
+mp_output_format mp_get_format(void);
+
+// Output detail level
+
+typedef enum output_detail_level {
+        MP_DETAIL_ALL,
+        MP_DETAIL_NON_OK_ONLY,
+} mp_output_detail_level;
+
+void mp_set_level_of_detail(mp_output_detail_level level);
+mp_output_detail_level mp_get_level_of_detail(void);
 
 /*
  * The main state object of a plugin. Exists only ONCE per plugin.
@@ -47,10 +63,14 @@ typedef enum output_format {
  * The final result is always derived from the children and the "worst" state
  * in the first layer of subchecks
  */
-typedef struct {
-        char *summary;           // Overall summary, if not set a summary will be automatically generated
+typedef struct mp_check mp_check;
+struct mp_check {
+        char *summary; // Overall summary, if not set a summary will be automatically generated
         mp_subcheck_list *subchecks;
-} mp_check;
+
+        // the evaluation_functions computes the state of check
+        mp_state_enum (*evaluation_function)(mp_check);
+};
 
 mp_check mp_check_init(void);
 mp_subcheck mp_subcheck_init(void);
@@ -68,6 +88,13 @@ void mp_add_summary(mp_check check[static 1], char *summary);
 mp_state_enum mp_compute_check_state(mp_check);
 mp_state_enum mp_compute_subcheck_state(mp_subcheck);
 
+mp_state_enum mp_eval_ok(mp_check overall);
+mp_state_enum mp_eval_warning(mp_check overall);
+mp_state_enum mp_eval_critical(mp_check overall);
+mp_state_enum mp_eval_unknown(mp_check overall);
+mp_state_enum mp_eval_check_default(mp_check check);
+mp_state_enum mp_eval_subcheck_default(mp_subcheck subcheck);
+
 typedef struct {
         bool parsing_success;
         mp_output_format output_format;
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 1289aae2..db337622 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -40,26 +40,29 @@ typedef struct {
         char *stanza;
 } np_ini_info;
 
-static char *default_ini_file_names[] = {"monitoring-plugins.ini", "plugins.ini", "nagios-plugins.ini", NULL};
+static char *default_ini_file_names[] = {"monitoring-plugins.ini", "plugins.ini",
+                                                                                 "nagios-plugins.ini", NULL};
 
 static char *default_ini_path_names[] = {
-        "/usr/local/etc/monitoring-plugins/monitoring-plugins.ini", "/usr/local/etc/monitoring-plugins.ini",
-        "/etc/monitoring-plugins/monitoring-plugins.ini", "/etc/monitoring-plugins.ini",
+        "/usr/local/etc/monitoring-plugins/monitoring-plugins.ini",
+        "/usr/local/etc/monitoring-plugins.ini", "/etc/monitoring-plugins/monitoring-plugins.ini",
+        "/etc/monitoring-plugins.ini",
         /* deprecated path names (for backward compatibility): */
-        "/etc/nagios/plugins.ini", "/usr/local/nagios/etc/plugins.ini", "/usr/local/etc/nagios/plugins.ini", "/etc/opt/nagios/plugins.ini",
-        "/etc/nagios-plugins.ini", "/usr/local/etc/nagios-plugins.ini", "/etc/opt/nagios-plugins.ini", NULL};
+        "/etc/nagios/plugins.ini", "/usr/local/nagios/etc/plugins.ini",
+        "/usr/local/etc/nagios/plugins.ini", "/etc/opt/nagios/plugins.ini", "/etc/nagios-plugins.ini",
+        "/usr/local/etc/nagios-plugins.ini", "/etc/opt/nagios-plugins.ini", NULL};
 
 /* eat all characters from a FILE pointer until n is encountered */
-#define GOBBLE_TO(f, c, n)                                                                                                                 \
-        do {                                                                                                                                   \
-                (c) = fgetc((f));                                                                                                                  \
+#define GOBBLE_TO(f, c, n)                                                                         \
+        do {                                                                                           \
+                (c) = fgetc((f));                                                                          \
         } while ((c) != EOF && (c) != (n))
 
 /* internal function that returns the constructed defaults options */
-static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts);
+static bool read_defaults(FILE *defaults_file, const char *stanza, np_arg_list **opts);
 
 /* internal function that converts a single line into options format */
-static int add_option(FILE *f, np_arg_list **optlst);
+static int add_option(FILE *filePointer, np_arg_list **optlst);
 
 /* internal functions to find default file */
 static char *default_file(void);
@@ -71,7 +74,8 @@ static char *default_file_in_path(void);
  * into its separate parts.
  */
 static void parse_locator(const char *locator, const char *def_stanza, np_ini_info *i) {
-        size_t locator_len = 0, stanza_len = 0;
+        size_t locator_len = 0;
+        size_t stanza_len = 0;
 
         /* if locator is NULL we'll use default values */
         if (locator != NULL) {
@@ -87,8 +91,9 @@ static void parse_locator(const char *locator, const char *def_stanza, np_ini_in
                 i->stanza = strdup(def_stanza);
         }
 
-        if (i->stanza == NULL)
+        if (i->stanza == NULL) {
                 die(STATE_UNKNOWN, _("malloc() failed!\n"));
+        }
 
         /* check whether there's an @file part */
         if (stanza_len == locator_len) {
@@ -99,39 +104,46 @@ static void parse_locator(const char *locator, const char *def_stanza, np_ini_in
                 i->file_string_on_heap = true;
         }
 
-        if (i->file == NULL || i->file[0] == '\0')
+        if (i->file == NULL || i->file[0] == '\0') {
                 die(STATE_UNKNOWN, _("Cannot find config file in any standard location.\n"));
+        }
 }
 
 /*
  * This is the externally visible function used by extra_opts.
  */
 np_arg_list *np_get_defaults(const char *locator, const char *default_section) {
-        FILE *inifile = NULL;
-        np_arg_list *defaults = NULL;
-        np_ini_info i;
         int is_suid_plugin = mp_suid();
 
-        if (is_suid_plugin && idpriv_temp_drop() == -1)
+        if (is_suid_plugin && idpriv_temp_drop() == -1) {
                 die(STATE_UNKNOWN, _("Cannot drop privileges: %s\n"), strerror(errno));
+        }
 
-        parse_locator(locator, default_section, &i);
-        inifile = strcmp(i.file, "-") == 0 ? stdin : fopen(i.file, "r");
+        FILE *inifile = NULL;
+        np_ini_info ini_info;
+        parse_locator(locator, default_section, &ini_info);
+        inifile = strcmp(ini_info.file, "-") == 0 ? stdin : fopen(ini_info.file, "r");
 
-        if (inifile == NULL)
+        if (inifile == NULL) {
                 die(STATE_UNKNOWN, _("Can't read config file: %s\n"), strerror(errno));
-        if (!read_defaults(inifile, i.stanza, &defaults))
-                die(STATE_UNKNOWN, _("Invalid section '%s' in config file '%s'\n"), i.stanza, i.file);
+        }
 
-        if (i.file_string_on_heap) {
-                free(i.file);
+        np_arg_list *defaults = NULL;
+        if (!read_defaults(inifile, ini_info.stanza, &defaults)) {
+                die(STATE_UNKNOWN, _("Invalid section '%s' in config file '%s'\n"), ini_info.stanza, ini_info.file);
+        }
+
+        if (ini_info.file_string_on_heap) {
+                free(ini_info.file);
         }
 
-        if (inifile != stdin)
+        if (inifile != stdin) {
                 fclose(inifile);
-        free(i.stanza);
-        if (is_suid_plugin && idpriv_temp_restore() == -1)
+        }
+        free(ini_info.stanza);
+        if (is_suid_plugin && idpriv_temp_restore() == -1) {
                 die(STATE_UNKNOWN, _("Cannot restore privileges: %s\n"), strerror(errno));
+        }
 
         return defaults;
 }
@@ -143,54 +155,58 @@ np_arg_list *np_get_defaults(const char *locator, const char *default_section) {
  * be extra careful about user-supplied input (i.e. avoiding possible
  * format string vulnerabilities, etc).
  */
-static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts) {
-        int c = 0;
+static bool read_defaults(FILE *defaults_file, const char *stanza, np_arg_list **opts) {
         bool status = false;
-        size_t i, stanza_len;
         enum {
                 NOSTANZA,
                 WRONGSTANZA,
                 RIGHTSTANZA
         } stanzastate = NOSTANZA;
 
-        stanza_len = strlen(stanza);
+        size_t stanza_len = strlen(stanza);
 
         /* our little stanza-parsing state machine */
-        while ((c = fgetc(f)) != EOF) {
+        int current_char = 0;
+        while ((current_char = fgetc(defaults_file)) != EOF) {
                 /* gobble up leading whitespace */
-                if (isspace(c))
+                if (isspace(current_char)) {
                         continue;
-                switch (c) {
+                }
+                switch (current_char) {
                         /* globble up comment lines */
                 case ';':
                 case '#':
-                        GOBBLE_TO(f, c, '\n');
+                        GOBBLE_TO(defaults_file, current_char, '\n');
                         break;
                         /* start of a stanza, check to see if it matches */
-                case '[':
+                case '[': {
                         stanzastate = WRONGSTANZA;
+                        size_t i;
                         for (i = 0; i < stanza_len; i++) {
-                                c = fgetc(f);
+                                current_char = fgetc(defaults_file);
                                 /* strip leading whitespace */
-                                if (i == 0)
-                                        for (; isspace(c); c = fgetc(f))
-                                                continue;
+                                if (i == 0) {
+                                        for (; isspace(current_char); current_char = fgetc(defaults_file)) {
+                                        }
+                                }
                                 /* nope, read to the end of the line */
-                                if (c != stanza[i]) {
-                                        GOBBLE_TO(f, c, '\n');
+                                if (current_char != stanza[i]) {
+                                        GOBBLE_TO(defaults_file, current_char, '\n');
                                         break;
                                 }
                         }
+
                         /* if it matched up to here and the next char is ']'... */
                         if (i == stanza_len) {
-                                c = fgetc(f);
+                                current_char = fgetc(defaults_file);
                                 /* strip trailing whitespace */
-                                for (; isspace(c); c = fgetc(f))
-                                        continue;
-                                if (c == ']')
+                                for (; isspace(current_char); current_char = fgetc(defaults_file)) {
+                                }
+                                if (current_char == ']') {
                                         stanzastate = RIGHTSTANZA;
+                                }
                         }
-                        break;
+                } break;
                         /* otherwise, we're in the body of a stanza or a parse error */
                 default:
                         switch (stanzastate) {
@@ -201,12 +217,12 @@ static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts) {
                                 die(STATE_UNKNOWN, "%s\n", _("Config file error"));
                                 /* we're in a stanza, but for a different plugin */
                         case WRONGSTANZA:
-                                GOBBLE_TO(f, c, '\n');
+                                GOBBLE_TO(defaults_file, current_char, '\n');
                                 break;
                                 /* okay, this is where we start taking the config */
                         case RIGHTSTANZA:
-                                ungetc(c, f);
-                                if (add_option(f, opts)) {
+                                ungetc(current_char, defaults_file);
+                                if (add_option(defaults_file, opts)) {
                                         die(STATE_UNKNOWN, "%s\n", _("Config file error"));
                                 }
                                 status = true;
@@ -225,13 +241,12 @@ static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts) {
  *      --option[=value]
  * appending it to the linked list optbuf.
  */
-static int add_option(FILE *f, np_arg_list **optlst) {
-        np_arg_list *opttmp = *optlst, *optnew;
-        char *linebuf = NULL, *lineend = NULL, *optptr = NULL, *optend = NULL;
-        char *eqptr = NULL, *valptr = NULL, *valend = NULL;
-        short done_reading = 0, equals = 0, value = 0;
-        size_t cfg_len = 0, read_sz = 8, linebuf_sz = 0, read_pos = 0;
-        size_t opt_len = 0, val_len = 0;
+static int add_option(FILE *filePointer, np_arg_list **optlst) {
+        char *linebuf = NULL;
+        bool done_reading = false;
+        const size_t read_sz = 8;
+        size_t linebuf_sz = 0;
+        size_t read_pos = 0;
 
         /* read one line from the file */
         while (!done_reading) {
@@ -239,74 +254,101 @@ static int add_option(FILE *f, np_arg_list **optlst) {
                 if (linebuf == NULL || read_pos + read_sz >= linebuf_sz) {
                         linebuf_sz = linebuf_sz > 0 ? linebuf_sz << 1 : read_sz;
                         linebuf = realloc(linebuf, linebuf_sz);
-                        if (linebuf == NULL)
+                        if (linebuf == NULL) {
                                 die(STATE_UNKNOWN, _("malloc() failed!\n"));
+                        }
                 }
-                if (fgets(&linebuf[read_pos], (int)read_sz, f) == NULL)
-                        done_reading = 1;
-                else {
+
+                if (fgets(&linebuf[read_pos], (int)read_sz, filePointer) == NULL) {
+                        done_reading = true;
+                } else {
                         read_pos = strlen(linebuf);
                         if (linebuf[read_pos - 1] == '\n') {
                                 linebuf[--read_pos] = '\0';
-                                done_reading = 1;
+                                done_reading = true;
                         }
                 }
         }
-        lineend = &linebuf[read_pos];
+
+        char *lineend = &linebuf[read_pos];
         /* all that to read one line, isn't C fun? :) now comes the parsing :/ */
 
         /* skip leading whitespace */
-        for (optptr = linebuf; optptr < lineend && isspace(*optptr); optptr++)
-                continue;
+        char *optptr = NULL;
+        for (optptr = linebuf; optptr < lineend && isspace(*optptr); optptr++) {
+        }
+
         /* continue to '=' or EOL, watching for spaces that might precede it */
+        char *eqptr = NULL;
+        char *optend = NULL;
         for (eqptr = optptr; eqptr < lineend && *eqptr != '='; eqptr++) {
-                if (isspace(*eqptr) && optend == NULL)
+                if (isspace(*eqptr) && optend == NULL) {
                         optend = eqptr;
-                else
+                } else {
                         optend = NULL;
+                }
         }
-        if (optend == NULL)
+
+        if (optend == NULL) {
                 optend = eqptr;
+        }
+
         --optend;
+
         /* ^[[:space:]]*=foo is a syntax error */
-        if (optptr == eqptr)
+        if (optptr == eqptr) {
                 die(STATE_UNKNOWN, "%s\n", _("Config file error"));
+        }
+
         /* continue from '=' to start of value or EOL */
-        for (valptr = eqptr + 1; valptr < lineend && isspace(*valptr); valptr++)
-                continue;
+        char *valptr = NULL;
+        for (valptr = eqptr + 1; valptr < lineend && isspace(*valptr); valptr++) {
+        }
+
         /* continue to the end of value */
-        for (valend = valptr; valend < lineend; valend++)
-                continue;
+        char *valend = NULL;
+        for (valend = valptr; valend < lineend; valend++) {
+        }
+
         --valend;
+
         /* finally trim off trailing spaces */
-        for (; isspace(*valend); valend--)
-                continue;
+        for (; isspace(*valend); valend--) {
+        }
+
         /* calculate the length of "--foo" */
-        opt_len = (size_t)(1 + optend - optptr);
+        size_t opt_len = (size_t)(1 + optend - optptr);
         /* 1-character params needs only one dash */
-        if (opt_len == 1)
+        size_t cfg_len = 0;
+        if (opt_len == 1) {
                 cfg_len = 1 + (opt_len);
-        else
+        } else {
                 cfg_len = 2 + (opt_len);
+        }
+
+        size_t val_len = 0;
+        bool equals = false;
+        bool value = false;
         /* if valptr<lineend then we have to also allocate space for "=bar" */
         if (valptr < lineend) {
-                equals = value = 1;
+                equals = value = true;
                 val_len = (size_t)(1 + valend - valptr);
                 cfg_len += 1 + val_len;
-        }
-        /* if valptr==valend then we have "=" but no "bar" */
-        else if (valptr == lineend) {
-                equals = 1;
+        } else if (valptr == lineend) {
+                /* if valptr==valend then we have "=" but no "bar" */
+                equals = true;
                 cfg_len += 1;
         }
+
         /* a line with no equal sign isn't valid */
-        if (equals == 0)
+        if (!equals) {
                 die(STATE_UNKNOWN, "%s\n", _("Config file error"));
+        }
 
         /* okay, now we have all the info we need, so we create a new np_arg_list
          * element and set the argument...
          */
-        optnew = malloc(sizeof(np_arg_list));
+        np_arg_list *optnew = malloc(sizeof(np_arg_list));
         optnew->next = NULL;
 
         read_pos = 0;
@@ -329,11 +371,13 @@ static int add_option(FILE *f, np_arg_list **optlst) {
         optnew->arg[read_pos] = '\0';
 
         /* ...and put that to the end of the list */
-        if (*optlst == NULL)
+        if (*optlst == NULL) {
                 *optlst = optnew;
-        else {
-                while (opttmp->next != NULL)
+        } else {
+                np_arg_list *opttmp = *optlst;
+                while (opttmp->next != NULL) {
                         opttmp = opttmp->next;
+                }
                 opttmp->next = optnew;
         }
 
@@ -344,7 +388,8 @@ static int add_option(FILE *f, np_arg_list **optlst) {
 static char *default_file(void) {
         char *ini_file;
 
-        if ((ini_file = getenv("MP_CONFIG_FILE")) != NULL || (ini_file = default_file_in_path()) != NULL) {
+        if ((ini_file = getenv("MP_CONFIG_FILE")) != NULL ||
+                (ini_file = default_file_in_path()) != NULL) {
                 return ini_file;
         }
 
@@ -357,19 +402,25 @@ static char *default_file(void) {
 }
 
 static char *default_file_in_path(void) {
-        char *config_path, **file;
-        char *dir, *ini_file, *tokens;
+        char *config_path;
+        char **file;
+        char *dir;
+        char *ini_file;
+        char *tokens;
 
-        if ((config_path = getenv("NAGIOS_CONFIG_PATH")) == NULL)
+        if ((config_path = getenv("NAGIOS_CONFIG_PATH")) == NULL) {
                 return NULL;
+        }
         /* shall we spit out a warning that NAGIOS_CONFIG_PATH is deprecated? */
 
-        if ((tokens = strdup(config_path)) == NULL)
+        if ((tokens = strdup(config_path)) == NULL) {
                 die(STATE_UNKNOWN, "%s\n", _("Insufficient Memory"));
+        }
         for (dir = strtok(tokens, ":"); dir != NULL; dir = strtok(NULL, ":")) {
                 for (file = default_ini_file_names; *file != NULL; file++) {
-                        if ((asprintf(&ini_file, "%s/%s", dir, *file)) < 0)
+                        if ((asprintf(&ini_file, "%s/%s", dir, *file)) < 0) {
                                 die(STATE_UNKNOWN, "%s\n", _("Insufficient Memory"));
+                        }
                         if (access(ini_file, F_OK) == 0) {
                                 free(tokens);
                                 return ini_file;
diff --git a/lib/perfdata.c b/lib/perfdata.c
index 661756c5..2930a8bc 100644
--- a/lib/perfdata.c
+++ b/lib/perfdata.c
@@ -33,7 +33,18 @@ char *pd_value_to_string(const mp_perfdata_value pd) {
 char *pd_to_string(mp_perfdata pd) {
         assert(pd.label != NULL);
         char *result = NULL;
-        asprintf(&result, "%s=", pd.label);
+
+        if (strchr(pd.label, '\'') == NULL) {
+                asprintf(&result, "'%s'=", pd.label);
+        } else {
+                // we have a illegal single quote in the string
+                // replace it silently instead of complaining
+                for (char *ptr = pd.label; *ptr == '\0'; ptr++) {
+                        if (*ptr == '\'') {
+                                *ptr = '_';
+                        }
+                }
+        }
 
         asprintf(&result, "%s%s", result, pd_value_to_string(pd.value));
 
@@ -249,7 +260,9 @@ char *mp_range_to_string(const mp_range input) {
         return result;
 }
 
-mp_perfdata mp_set_pd_value_float(mp_perfdata pd, float value) { return mp_set_pd_value_double(pd, value); }
+mp_perfdata mp_set_pd_value_float(mp_perfdata pd, float value) {
+        return mp_set_pd_value_double(pd, value);
+}
 
 mp_perfdata mp_set_pd_value_double(mp_perfdata pd, double value) {
         pd.value.pd_double = value;
@@ -257,11 +270,25 @@ mp_perfdata mp_set_pd_value_double(mp_perfdata pd, double value) {
         return pd;
 }
 
-mp_perfdata mp_set_pd_value_int(mp_perfdata pd, int value) { return mp_set_pd_value_long_long(pd, (long long)value); }
+mp_perfdata mp_set_pd_value_char(mp_perfdata pd, char value) {
+        return mp_set_pd_value_long_long(pd, (long long)value);
+}
 
-mp_perfdata mp_set_pd_value_u_int(mp_perfdata pd, unsigned int value) { return mp_set_pd_value_u_long_long(pd, (unsigned long long)value); }
+mp_perfdata mp_set_pd_value_u_char(mp_perfdata pd, unsigned char value) {
+        return mp_set_pd_value_u_long_long(pd, (unsigned long long)value);
+}
 
-mp_perfdata mp_set_pd_value_long(mp_perfdata pd, long value) { return mp_set_pd_value_long_long(pd, (long long)value); }
+mp_perfdata mp_set_pd_value_int(mp_perfdata pd, int value) {
+        return mp_set_pd_value_long_long(pd, (long long)value);
+}
+
+mp_perfdata mp_set_pd_value_u_int(mp_perfdata pd, unsigned int value) {
+        return mp_set_pd_value_u_long_long(pd, (unsigned long long)value);
+}
+
+mp_perfdata mp_set_pd_value_long(mp_perfdata pd, long value) {
+        return mp_set_pd_value_long_long(pd, (long long)value);
+}
 
 mp_perfdata mp_set_pd_value_u_long(mp_perfdata pd, unsigned long value) {
         return mp_set_pd_value_u_long_long(pd, (unsigned long long)value);
@@ -286,15 +313,33 @@ mp_perfdata_value mp_create_pd_value_double(double value) {
         return res;
 }
 
-mp_perfdata_value mp_create_pd_value_float(float value) { return mp_create_pd_value_double((double)value); }
+mp_perfdata_value mp_create_pd_value_float(float value) {
+        return mp_create_pd_value_double((double)value);
+}
 
-mp_perfdata_value mp_create_pd_value_int(int value) { return mp_create_pd_value_long_long((long long)value); }
+mp_perfdata_value mp_create_pd_value_char(char value) {
+        return mp_create_pd_value_long_long((long long)value);
+}
 
-mp_perfdata_value mp_create_pd_value_u_int(unsigned int value) { return mp_create_pd_value_u_long_long((unsigned long long)value); }
+mp_perfdata_value mp_create_pd_value_u_char(unsigned char value) {
+        return mp_create_pd_value_u_long_long((unsigned long long)value);
+}
+
+mp_perfdata_value mp_create_pd_value_int(int value) {
+        return mp_create_pd_value_long_long((long long)value);
+}
+
+mp_perfdata_value mp_create_pd_value_u_int(unsigned int value) {
+        return mp_create_pd_value_u_long_long((unsigned long long)value);
+}
 
-mp_perfdata_value mp_create_pd_value_long(long value) { return mp_create_pd_value_long_long((long long)value); }
+mp_perfdata_value mp_create_pd_value_long(long value) {
+        return mp_create_pd_value_long_long((long long)value);
+}
 
-mp_perfdata_value mp_create_pd_value_u_long(unsigned long value) { return mp_create_pd_value_u_long_long((unsigned long long)value); }
+mp_perfdata_value mp_create_pd_value_u_long(unsigned long value) {
+        return mp_create_pd_value_u_long_long((unsigned long long)value);
+}
 
 mp_perfdata_value mp_create_pd_value_long_long(long long value) {
         mp_perfdata_value res = {0};
@@ -360,6 +405,13 @@ mp_range_parsed mp_parse_range_string(const char *input) {
         }
 
         char *working_copy = strdup(input);
+        if (working_copy == NULL) {
+                // strdup error, probably
+                mp_range_parsed result = {
+                        .error = MP_RANGE_PARSING_FAILURE,
+                };
+                return result;
+        }
         input = working_copy;
 
         char *separator = index(working_copy, ':');
@@ -514,3 +566,84 @@ perfdata_value_parser_wrapper parse_pd_value(const char *input) {
         }
         return result;
 }
+
+mp_perfdata mp_set_pd_max_value(mp_perfdata perfdata, mp_perfdata_value value) {
+        perfdata.max = value;
+        perfdata.max_present = true;
+        return perfdata;
+}
+
+mp_perfdata mp_set_pd_min_value(mp_perfdata perfdata, mp_perfdata_value value) {
+        perfdata.min = value;
+        perfdata.min_present = true;
+        return perfdata;
+}
+
+double mp_get_pd_value(mp_perfdata_value value) {
+        assert(value.type != PD_TYPE_NONE);
+        switch (value.type) {
+        case PD_TYPE_DOUBLE:
+                return value.pd_double;
+        case PD_TYPE_INT:
+                return (double)value.pd_int;
+        case PD_TYPE_UINT:
+                return (double)value.pd_uint;
+        default:
+                return 0; // just to make the compiler happy
+        }
+}
+
+mp_perfdata_value mp_pd_value_multiply(mp_perfdata_value left, mp_perfdata_value right) {
+        if (left.type == right.type) {
+                switch (left.type) {
+                case PD_TYPE_DOUBLE:
+                        left.pd_double *= right.pd_double;
+                        return left;
+                case PD_TYPE_INT:
+                        left.pd_int *= right.pd_int;
+                        return left;
+                case PD_TYPE_UINT:
+                        left.pd_uint *= right.pd_uint;
+                        return left;
+                default:
+                        // what to here?
+                        return left;
+                }
+        }
+
+        // Different types, oh boy, just do the lazy thing for now and switch to double
+        switch (left.type) {
+        case PD_TYPE_INT:
+                left.pd_double = (double)left.pd_int;
+                left.type = PD_TYPE_DOUBLE;
+                break;
+        case PD_TYPE_UINT:
+                left.pd_double = (double)left.pd_uint;
+                left.type = PD_TYPE_DOUBLE;
+                break;
+        }
+
+        switch (right.type) {
+        case PD_TYPE_INT:
+                right.pd_double = (double)right.pd_int;
+                right.type = PD_TYPE_DOUBLE;
+                break;
+        case PD_TYPE_UINT:
+                right.pd_double = (double)right.pd_uint;
+                right.type = PD_TYPE_DOUBLE;
+                break;
+        }
+
+        left.pd_double *= right.pd_double;
+        return left;
+}
+
+mp_range mp_range_multiply(mp_range range, mp_perfdata_value factor) {
+        if (!range.end_infinity) {
+                range.end = mp_pd_value_multiply(range.end, factor);
+        }
+        if (!range.start_infinity) {
+                range.start = mp_pd_value_multiply(range.start, factor);
+        }
+        return range;
+}
diff --git a/lib/perfdata.h b/lib/perfdata.h
index 74583ee5..e51ef5fd 100644
--- a/lib/perfdata.h
+++ b/lib/perfdata.h
@@ -28,7 +28,7 @@ typedef struct {
 /*
  * New range type with generic numerical values
  */
-typedef struct mp_range_struct {
+typedef struct {
         mp_perfdata_value start;
         bool start_infinity; /* false (default) or true */
 
@@ -41,11 +41,11 @@ typedef struct mp_range_struct {
 /*
  * Old range type with floating point values
  */
-typedef struct range_struct {
+typedef struct {
         double start;
         bool start_infinity;
         double end;
-        int end_infinity;
+        bool end_infinity;
         int alert_on; /* OUTSIDE (default) or INSIDE */
         char *text;   /* original unparsed text input */
 } range;
@@ -53,7 +53,7 @@ typedef struct range_struct {
 /*
  * Perfdata type for storing perfdata output
  */
-typedef struct perfdata_struct {
+typedef struct {
         char *label;
         char *uom;
         mp_perfdata_value value;
@@ -131,15 +131,15 @@ mp_range_parsed mp_parse_range_string(const char * /*input*/);
  */
 void pd_list_append(pd_list[1], mp_perfdata);
 
-#define mp_set_pd_value(P, V)                                                                                                              \
-        _Generic((V),                                                                                                                          \
-                float: mp_set_pd_value_float,                                                                                                      \
-                double: mp_set_pd_value_double,                                                                                                    \
-                int: mp_set_pd_value_int,                                                                                                          \
-                unsigned int: mp_set_pd_value_u_int,                                                                                               \
-                long: mp_set_pd_value_long,                                                                                                        \
-                unsigned long: mp_set_pd_value_u_long,                                                                                             \
-                long long: mp_set_pd_value_long_long,                                                                                              \
+#define mp_set_pd_value(P, V)                                                                      \
+        _Generic((V),                                                                                  \
+                float: mp_set_pd_value_float,                                                              \
+                double: mp_set_pd_value_double,                                                            \
+                int: mp_set_pd_value_int,                                                                  \
+                unsigned int: mp_set_pd_value_u_int,                                                       \
+                long: mp_set_pd_value_long,                                                                \
+                unsigned long: mp_set_pd_value_u_long,                                                     \
+                long long: mp_set_pd_value_long_long,                                                      \
                 unsigned long long: mp_set_pd_value_u_long_long)(P, V)
 
 mp_perfdata mp_set_pd_value_float(mp_perfdata, float);
@@ -151,19 +151,23 @@ mp_perfdata mp_set_pd_value_u_long(mp_perfdata, unsigned long);
 mp_perfdata mp_set_pd_value_long_long(mp_perfdata, long long);
 mp_perfdata mp_set_pd_value_u_long_long(mp_perfdata, unsigned long long);
 
-#define mp_create_pd_value(V)                                                                                                              \
-        _Generic((V),                                                                                                                          \
-                float: mp_create_pd_value_float,                                                                                                   \
-                double: mp_create_pd_value_double,                                                                                                 \
-                int: mp_create_pd_value_int,                                                                                                       \
-                unsigned int: mp_create_pd_value_u_int,                                                                                            \
-                long: mp_create_pd_value_long,                                                                                                     \
-                unsigned long: mp_create_pd_value_u_long,                                                                                          \
-                long long: mp_create_pd_value_long_long,                                                                                           \
+#define mp_create_pd_value(V)                                                                      \
+        _Generic((V),                                                                                  \
+                float: mp_create_pd_value_float,                                                           \
+                double: mp_create_pd_value_double,                                                         \
+                char: mp_create_pd_value_char,                                                             \
+                unsigned char: mp_create_pd_value_u_char,                                                  \
+                int: mp_create_pd_value_int,                                                               \
+                unsigned int: mp_create_pd_value_u_int,                                                    \
+                long: mp_create_pd_value_long,                                                             \
+                unsigned long: mp_create_pd_value_u_long,                                                  \
+                long long: mp_create_pd_value_long_long,                                                   \
                 unsigned long long: mp_create_pd_value_u_long_long)(V)
 
 mp_perfdata_value mp_create_pd_value_float(float);
 mp_perfdata_value mp_create_pd_value_double(double);
+mp_perfdata_value mp_create_pd_value_char(char);
+mp_perfdata_value mp_create_pd_value_u_char(unsigned char);
 mp_perfdata_value mp_create_pd_value_int(int);
 mp_perfdata_value mp_create_pd_value_u_int(unsigned int);
 mp_perfdata_value mp_create_pd_value_long(long);
@@ -171,6 +175,11 @@ mp_perfdata_value mp_create_pd_value_u_long(unsigned long);
 mp_perfdata_value mp_create_pd_value_long_long(long long);
 mp_perfdata_value mp_create_pd_value_u_long_long(unsigned long long);
 
+mp_perfdata mp_set_pd_max_value(mp_perfdata perfdata, mp_perfdata_value value);
+mp_perfdata mp_set_pd_min_value(mp_perfdata perfdata, mp_perfdata_value value);
+
+double mp_get_pd_value(mp_perfdata_value value);
+
 /*
  * Free the memory used by a pd_list
  */
@@ -178,6 +187,13 @@ void pd_list_free(pd_list[1]);
 
 int cmp_perfdata_value(mp_perfdata_value, mp_perfdata_value);
 
+// ================
+// Helper functions
+// ================
+
+mp_perfdata_value mp_pd_value_multiply(mp_perfdata_value left, mp_perfdata_value right);
+mp_range mp_range_multiply(mp_range range, mp_perfdata_value factor);
+
 // =================
 // String formatters
 // =================
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 9be94f6d..7798a72e 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -8,9 +8,9 @@ check_PROGRAMS = @EXTRA_TEST@
 AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
         -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 test_generic_output
+EXTRA_PROGRAMS = test_utils test_tcp test_cmd test_base64 test_ini1 test_ini3 test_opts1 test_opts2 test_opts3 test_generic_output
 
-np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t test_generic_output.t
+np_test_scripts = test_base64.t test_cmd.t test_ini1.t test_ini3.t test_opts1.t test_opts2.t test_opts3.t test_tcp.t test_utils.t test_generic_output.t
 np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini
 EXTRA_DIST = $(np_test_scripts) $(np_test_files) var
 
@@ -29,7 +29,7 @@ AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
 AM_LDFLAGS = $(tap_ldflags) -ltap
 LDADD = $(top_srcdir)/lib/libmonitoringplug.a $(top_srcdir)/gl/libgnu.a $(LIB_CRYPTO)
 
-SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c test_generic_output.c
+SOURCES = test_utils.c test_tcp.c test_cmd.c test_base64.c test_ini1.c test_ini3.c test_opts1.c test_opts2.c test_opts3.c test_generic_output.c
 
 test: ${noinst_PROGRAMS}
         perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
diff --git a/lib/tests/test_base64.c b/lib/tests/test_base64.c
index 94cb5aa9..798244da 100644
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
@@ -180,117 +180,168 @@ int main(int argc, char **argv) {
 #endif
 
         char random[1024] = {
-                0x0b, 0x30, 0x44, 0x62, 0x7c, 0x22, 0x1f, 0x0d, 0x05, 0x67, 0x2c, 0x2a, 0x39, 0x21, 0x46, 0x08, 0x50, 0x66, 0x34, 0x37, 0x0b, 0x45,
-                0x4b, 0x38, 0x32, 0x06, 0x7a, 0x3e, 0x7f, 0x0c, 0x40, 0x18, 0x6b, 0x2d, 0x60, 0x4c, 0x60, 0x0c, 0x23, 0x43, 0x3b, 0x3e, 0x1b, 0x16,
-                0x04, 0x46, 0x58, 0x3f, 0x40, 0x6a, 0x11, 0x05, 0x63, 0x71, 0x14, 0x35, 0x47, 0x79, 0x13, 0x6f, 0x6b, 0x27, 0x18, 0x5b, 0x48, 0x27,
-                0x3e, 0x6f, 0x15, 0x33, 0x4f, 0x3e, 0x5e, 0x51, 0x73, 0x68, 0x25, 0x0f, 0x06, 0x5b, 0x7c, 0x72, 0x75, 0x3e, 0x3f, 0x1b, 0x5c, 0x6d,
-                0x6a, 0x39, 0x7c, 0x63, 0x63, 0x60, 0x6c, 0x7a, 0x33, 0x76, 0x52, 0x13, 0x25, 0x33, 0x7d, 0x65, 0x23, 0x27, 0x11, 0x06, 0x06, 0x47,
-                0x71, 0x1e, 0x14, 0x74, 0x63, 0x70, 0x2d, 0x15, 0x27, 0x18, 0x51, 0x06, 0x05, 0x33, 0x11, 0x2c, 0x6b, 0x00, 0x2d, 0x77, 0x20, 0x48,
-                0x0d, 0x73, 0x51, 0x45, 0x25, 0x7f, 0x7f, 0x35, 0x26, 0x2e, 0x26, 0x53, 0x24, 0x68, 0x1e, 0x0e, 0x58, 0x3a, 0x59, 0x50, 0x56, 0x37,
-                0x5f, 0x66, 0x01, 0x4c, 0x5a, 0x64, 0x32, 0x50, 0x7b, 0x6a, 0x20, 0x72, 0x2b, 0x1d, 0x7e, 0x43, 0x7b, 0x61, 0x42, 0x0b, 0x61, 0x73,
-                0x24, 0x79, 0x3a, 0x6b, 0x4a, 0x79, 0x6e, 0x09, 0x0f, 0x27, 0x2d, 0x0c, 0x5e, 0x32, 0x4b, 0x0d, 0x79, 0x46, 0x39, 0x21, 0x0a, 0x26,
-                0x5f, 0x3a, 0x00, 0x26, 0x3f, 0x13, 0x2e, 0x7e, 0x50, 0x2b, 0x67, 0x46, 0x72, 0x3f, 0x3b, 0x01, 0x46, 0x1b, 0x0b, 0x35, 0x49, 0x39,
-                0x19, 0x70, 0x3d, 0x02, 0x41, 0x0e, 0x38, 0x05, 0x76, 0x65, 0x4f, 0x31, 0x6c, 0x5e, 0x17, 0x04, 0x15, 0x36, 0x26, 0x64, 0x34, 0x14,
-                0x17, 0x7c, 0x0e, 0x0b, 0x5b, 0x55, 0x53, 0x6b, 0x00, 0x42, 0x41, 0x4f, 0x02, 0x5c, 0x13, 0x0a, 0x2c, 0x2c, 0x3e, 0x10, 0x14, 0x33,
-                0x45, 0x7c, 0x7a, 0x5a, 0x31, 0x61, 0x39, 0x08, 0x22, 0x6a, 0x1e, 0x0f, 0x6f, 0x1b, 0x6c, 0x13, 0x5e, 0x79, 0x20, 0x79, 0x50, 0x62,
-                0x06, 0x2c, 0x76, 0x17, 0x04, 0x2b, 0x2a, 0x75, 0x1f, 0x0c, 0x37, 0x4e, 0x0f, 0x7b, 0x2d, 0x34, 0x75, 0x60, 0x31, 0x74, 0x2e, 0x0a,
-                0x4a, 0x11, 0x6c, 0x49, 0x25, 0x01, 0x3a, 0x3d, 0x22, 0x1e, 0x6d, 0x18, 0x51, 0x78, 0x2d, 0x62, 0x31, 0x4c, 0x50, 0x40, 0x17, 0x4b,
-                0x6f, 0x22, 0x00, 0x7f, 0x61, 0x2a, 0x34, 0x3e, 0x00, 0x5f, 0x2f, 0x5f, 0x2f, 0x14, 0x2a, 0x55, 0x27, 0x1f, 0x46, 0x1f, 0x12, 0x46,
-                0x5e, 0x1e, 0x0c, 0x7c, 0x38, 0x01, 0x61, 0x64, 0x76, 0x22, 0x6e, 0x08, 0x20, 0x38, 0x4f, 0x73, 0x72, 0x55, 0x12, 0x42, 0x19, 0x50,
-                0x61, 0x43, 0x77, 0x7d, 0x41, 0x2e, 0x35, 0x4f, 0x3d, 0x31, 0x28, 0x58, 0x67, 0x1b, 0x03, 0x51, 0x20, 0x32, 0x1c, 0x08, 0x6e, 0x37,
-                0x75, 0x37, 0x44, 0x4f, 0x68, 0x19, 0x07, 0x64, 0x14, 0x28, 0x25, 0x2b, 0x69, 0x35, 0x18, 0x27, 0x26, 0x14, 0x13, 0x70, 0x42, 0x19,
-                0x12, 0x75, 0x3e, 0x02, 0x5d, 0x7c, 0x13, 0x1f, 0x16, 0x53, 0x3b, 0x74, 0x48, 0x3c, 0x5e, 0x39, 0x6c, 0x1c, 0x1c, 0x74, 0x39, 0x1f,
-                0x00, 0x1b, 0x06, 0x0a, 0x68, 0x3b, 0x52, 0x4f, 0x1e, 0x6e, 0x3c, 0x35, 0x0c, 0x38, 0x0e, 0x0b, 0x3b, 0x1a, 0x76, 0x23, 0x29, 0x53,
-                0x1e, 0x5f, 0x41, 0x0c, 0x4b, 0x0a, 0x65, 0x28, 0x78, 0x67, 0x48, 0x59, 0x26, 0x6d, 0x31, 0x76, 0x23, 0x70, 0x61, 0x64, 0x3b, 0x38,
-                0x79, 0x66, 0x74, 0x53, 0x2c, 0x64, 0x64, 0x54, 0x03, 0x54, 0x65, 0x44, 0x4c, 0x18, 0x4f, 0x48, 0x20, 0x4f, 0x72, 0x10, 0x3f, 0x0c,
-                0x52, 0x2d, 0x03, 0x14, 0x03, 0x51, 0x42, 0x10, 0x77, 0x6a, 0x34, 0x06, 0x32, 0x03, 0x72, 0x14, 0x7c, 0x08, 0x5d, 0x52, 0x1a, 0x62,
-                0x7c, 0x3e, 0x30, 0x7e, 0x5f, 0x7f, 0x54, 0x0f, 0x44, 0x49, 0x5d, 0x5e, 0x10, 0x6a, 0x06, 0x2b, 0x06, 0x53, 0x10, 0x39, 0x37, 0x32,
-                0x4a, 0x4e, 0x3d, 0x2b, 0x65, 0x38, 0x39, 0x07, 0x72, 0x54, 0x64, 0x4d, 0x56, 0x6a, 0x03, 0x22, 0x70, 0x7b, 0x5f, 0x60, 0x0b, 0x2a,
-                0x0b, 0x6b, 0x10, 0x64, 0x14, 0x05, 0x22, 0x00, 0x73, 0x40, 0x23, 0x5b, 0x51, 0x1f, 0x2b, 0x1a, 0x5d, 0x69, 0x7a, 0x46, 0x0c, 0x5f,
-                0x32, 0x4b, 0x4a, 0x28, 0x52, 0x79, 0x5b, 0x12, 0x42, 0x18, 0x00, 0x5d, 0x27, 0x31, 0x53, 0x3c, 0x4c, 0x36, 0x4e, 0x38, 0x3f, 0x72,
-                0x03, 0x71, 0x02, 0x5b, 0x36, 0x59, 0x7f, 0x75, 0x6e, 0x08, 0x54, 0x0d, 0x34, 0x1c, 0x34, 0x57, 0x5d, 0x69, 0x48, 0x00, 0x3b, 0x05,
-                0x07, 0x6e, 0x27, 0x65, 0x6e, 0x40, 0x3d, 0x3a, 0x4f, 0x72, 0x5d, 0x39, 0x16, 0x0f, 0x63, 0x12, 0x12, 0x15, 0x3a, 0x70, 0x0d, 0x57,
-                0x18, 0x0d, 0x5e, 0x3d, 0x22, 0x68, 0x68, 0x7c, 0x6d, 0x4f, 0x0c, 0x7b, 0x09, 0x2d, 0x4a, 0x73, 0x20, 0x47, 0x07, 0x57, 0x75, 0x5d,
-                0x53, 0x70, 0x34, 0x21, 0x40, 0x57, 0x51, 0x5e, 0x49, 0x44, 0x00, 0x54, 0x27, 0x04, 0x68, 0x7e, 0x59, 0x56, 0x58, 0x74, 0x14, 0x3c,
-                0x16, 0x33, 0x41, 0x16, 0x4b, 0x2f, 0x49, 0x37, 0x0a, 0x54, 0x08, 0x08, 0x1f, 0x39, 0x67, 0x76, 0x28, 0x28, 0x07, 0x1d, 0x61, 0x47,
-                0x51, 0x4d, 0x75, 0x26, 0x52, 0x47, 0x47, 0x0c, 0x57, 0x58, 0x74, 0x3e, 0x62, 0x6c, 0x58, 0x3a, 0x44, 0x1e, 0x16, 0x2e, 0x21, 0x1c,
-                0x73, 0x45, 0x67, 0x74, 0x4f, 0x33, 0x66, 0x0e, 0x74, 0x66, 0x26, 0x1f, 0x2e, 0x38, 0x44, 0x40, 0x7e, 0x2a, 0x50, 0x52, 0x5e, 0x43,
-                0x01, 0x7a, 0x38, 0x49, 0x3c, 0x55, 0x4d, 0x5a, 0x44, 0x08, 0x26, 0x59, 0x4d, 0x45, 0x0b, 0x48, 0x0a, 0x33, 0x5e, 0x4a, 0x4d, 0x75,
-                0x16, 0x17, 0x63, 0x46, 0x01, 0x2a, 0x55, 0x7b, 0x0f, 0x02, 0x73, 0x6a, 0x4b, 0x7f, 0x75, 0x65, 0x3c, 0x4c, 0x33, 0x39, 0x6c, 0x74,
-                0x05, 0x60, 0x0f, 0x7f, 0x2d, 0x41, 0x4d, 0x4d, 0x46, 0x71, 0x09, 0x6f, 0x4f, 0x60, 0x15, 0x0f, 0x46, 0x73, 0x63, 0x4c, 0x5e, 0x74,
-                0x30, 0x0d, 0x28, 0x43, 0x08, 0x72, 0x32, 0x04, 0x2e, 0x31, 0x29, 0x27, 0x44, 0x6d, 0x13, 0x17, 0x48, 0x0f, 0x49, 0x52, 0x10, 0x13,
-                0x7f, 0x17, 0x16, 0x62, 0x79, 0x35, 0x78, 0x3e, 0x01, 0x7c, 0x2e, 0x0f, 0x76, 0x3e, 0x5e, 0x53, 0x6c, 0x5b, 0x5f, 0x7c, 0x19, 0x41,
-                0x02, 0x2f, 0x17, 0x64, 0x41, 0x75, 0x10, 0x04, 0x47, 0x7c, 0x3d, 0x4b, 0x52, 0x00, 0x10, 0x5d, 0x51, 0x4e, 0x7a, 0x27, 0x25, 0x55,
-                0x40, 0x12, 0x35, 0x60, 0x05, 0x1b, 0x34, 0x2d, 0x04, 0x7a, 0x6a, 0x69, 0x02, 0x79, 0x03, 0x3a, 0x2f, 0x06, 0x0a, 0x79, 0x7b, 0x12,
-                0x5d, 0x7c, 0x52, 0x29, 0x47, 0x58, 0x12, 0x73, 0x3f, 0x27, 0x56, 0x05, 0x0c, 0x48, 0x32, 0x58, 0x6b, 0x57, 0x5c, 0x03, 0x64, 0x56,
-                0x11, 0x52, 0x7a, 0x30, 0x36, 0x29, 0x17, 0x3b, 0x68, 0x7a, 0x7c, 0x05, 0x6b, 0x6b, 0x13, 0x6a, 0x24, 0x5c, 0x68, 0x42, 0x18, 0x32,
-                0x03, 0x73, 0x6e, 0x04, 0x21, 0x2e, 0x01, 0x04, 0x63, 0x7d, 0x44, 0x41, 0x12, 0x31, 0x0b, 0x15, 0x1f, 0x70, 0x00, 0x2e, 0x66, 0x14,
-                0x3c, 0x7f, 0x2b, 0x00, 0x1f, 0x0c, 0x28, 0x59, 0x0a, 0x16, 0x49, 0x5a, 0x5c, 0x64, 0x65, 0x4b, 0x11, 0x29, 0x15, 0x36, 0x5a, 0x65,
-                0x19, 0x4f, 0x60, 0x23, 0x3a, 0x3a, 0x13, 0x25, 0x02, 0x78, 0x4c, 0x54};
+                0x0b, 0x30, 0x44, 0x62, 0x7c, 0x22, 0x1f, 0x0d, 0x05, 0x67, 0x2c, 0x2a, 0x39, 0x21, 0x46,
+                0x08, 0x50, 0x66, 0x34, 0x37, 0x0b, 0x45, 0x4b, 0x38, 0x32, 0x06, 0x7a, 0x3e, 0x7f, 0x0c,
+                0x40, 0x18, 0x6b, 0x2d, 0x60, 0x4c, 0x60, 0x0c, 0x23, 0x43, 0x3b, 0x3e, 0x1b, 0x16, 0x04,
+                0x46, 0x58, 0x3f, 0x40, 0x6a, 0x11, 0x05, 0x63, 0x71, 0x14, 0x35, 0x47, 0x79, 0x13, 0x6f,
+                0x6b, 0x27, 0x18, 0x5b, 0x48, 0x27, 0x3e, 0x6f, 0x15, 0x33, 0x4f, 0x3e, 0x5e, 0x51, 0x73,
+                0x68, 0x25, 0x0f, 0x06, 0x5b, 0x7c, 0x72, 0x75, 0x3e, 0x3f, 0x1b, 0x5c, 0x6d, 0x6a, 0x39,
+                0x7c, 0x63, 0x63, 0x60, 0x6c, 0x7a, 0x33, 0x76, 0x52, 0x13, 0x25, 0x33, 0x7d, 0x65, 0x23,
+                0x27, 0x11, 0x06, 0x06, 0x47, 0x71, 0x1e, 0x14, 0x74, 0x63, 0x70, 0x2d, 0x15, 0x27, 0x18,
+                0x51, 0x06, 0x05, 0x33, 0x11, 0x2c, 0x6b, 0x00, 0x2d, 0x77, 0x20, 0x48, 0x0d, 0x73, 0x51,
+                0x45, 0x25, 0x7f, 0x7f, 0x35, 0x26, 0x2e, 0x26, 0x53, 0x24, 0x68, 0x1e, 0x0e, 0x58, 0x3a,
+                0x59, 0x50, 0x56, 0x37, 0x5f, 0x66, 0x01, 0x4c, 0x5a, 0x64, 0x32, 0x50, 0x7b, 0x6a, 0x20,
+                0x72, 0x2b, 0x1d, 0x7e, 0x43, 0x7b, 0x61, 0x42, 0x0b, 0x61, 0x73, 0x24, 0x79, 0x3a, 0x6b,
+                0x4a, 0x79, 0x6e, 0x09, 0x0f, 0x27, 0x2d, 0x0c, 0x5e, 0x32, 0x4b, 0x0d, 0x79, 0x46, 0x39,
+                0x21, 0x0a, 0x26, 0x5f, 0x3a, 0x00, 0x26, 0x3f, 0x13, 0x2e, 0x7e, 0x50, 0x2b, 0x67, 0x46,
+                0x72, 0x3f, 0x3b, 0x01, 0x46, 0x1b, 0x0b, 0x35, 0x49, 0x39, 0x19, 0x70, 0x3d, 0x02, 0x41,
+                0x0e, 0x38, 0x05, 0x76, 0x65, 0x4f, 0x31, 0x6c, 0x5e, 0x17, 0x04, 0x15, 0x36, 0x26, 0x64,
+                0x34, 0x14, 0x17, 0x7c, 0x0e, 0x0b, 0x5b, 0x55, 0x53, 0x6b, 0x00, 0x42, 0x41, 0x4f, 0x02,
+                0x5c, 0x13, 0x0a, 0x2c, 0x2c, 0x3e, 0x10, 0x14, 0x33, 0x45, 0x7c, 0x7a, 0x5a, 0x31, 0x61,
+                0x39, 0x08, 0x22, 0x6a, 0x1e, 0x0f, 0x6f, 0x1b, 0x6c, 0x13, 0x5e, 0x79, 0x20, 0x79, 0x50,
+                0x62, 0x06, 0x2c, 0x76, 0x17, 0x04, 0x2b, 0x2a, 0x75, 0x1f, 0x0c, 0x37, 0x4e, 0x0f, 0x7b,
+                0x2d, 0x34, 0x75, 0x60, 0x31, 0x74, 0x2e, 0x0a, 0x4a, 0x11, 0x6c, 0x49, 0x25, 0x01, 0x3a,
+                0x3d, 0x22, 0x1e, 0x6d, 0x18, 0x51, 0x78, 0x2d, 0x62, 0x31, 0x4c, 0x50, 0x40, 0x17, 0x4b,
+                0x6f, 0x22, 0x00, 0x7f, 0x61, 0x2a, 0x34, 0x3e, 0x00, 0x5f, 0x2f, 0x5f, 0x2f, 0x14, 0x2a,
+                0x55, 0x27, 0x1f, 0x46, 0x1f, 0x12, 0x46, 0x5e, 0x1e, 0x0c, 0x7c, 0x38, 0x01, 0x61, 0x64,
+                0x76, 0x22, 0x6e, 0x08, 0x20, 0x38, 0x4f, 0x73, 0x72, 0x55, 0x12, 0x42, 0x19, 0x50, 0x61,
+                0x43, 0x77, 0x7d, 0x41, 0x2e, 0x35, 0x4f, 0x3d, 0x31, 0x28, 0x58, 0x67, 0x1b, 0x03, 0x51,
+                0x20, 0x32, 0x1c, 0x08, 0x6e, 0x37, 0x75, 0x37, 0x44, 0x4f, 0x68, 0x19, 0x07, 0x64, 0x14,
+                0x28, 0x25, 0x2b, 0x69, 0x35, 0x18, 0x27, 0x26, 0x14, 0x13, 0x70, 0x42, 0x19, 0x12, 0x75,
+                0x3e, 0x02, 0x5d, 0x7c, 0x13, 0x1f, 0x16, 0x53, 0x3b, 0x74, 0x48, 0x3c, 0x5e, 0x39, 0x6c,
+                0x1c, 0x1c, 0x74, 0x39, 0x1f, 0x00, 0x1b, 0x06, 0x0a, 0x68, 0x3b, 0x52, 0x4f, 0x1e, 0x6e,
+                0x3c, 0x35, 0x0c, 0x38, 0x0e, 0x0b, 0x3b, 0x1a, 0x76, 0x23, 0x29, 0x53, 0x1e, 0x5f, 0x41,
+                0x0c, 0x4b, 0x0a, 0x65, 0x28, 0x78, 0x67, 0x48, 0x59, 0x26, 0x6d, 0x31, 0x76, 0x23, 0x70,
+                0x61, 0x64, 0x3b, 0x38, 0x79, 0x66, 0x74, 0x53, 0x2c, 0x64, 0x64, 0x54, 0x03, 0x54, 0x65,
+                0x44, 0x4c, 0x18, 0x4f, 0x48, 0x20, 0x4f, 0x72, 0x10, 0x3f, 0x0c, 0x52, 0x2d, 0x03, 0x14,
+                0x03, 0x51, 0x42, 0x10, 0x77, 0x6a, 0x34, 0x06, 0x32, 0x03, 0x72, 0x14, 0x7c, 0x08, 0x5d,
+                0x52, 0x1a, 0x62, 0x7c, 0x3e, 0x30, 0x7e, 0x5f, 0x7f, 0x54, 0x0f, 0x44, 0x49, 0x5d, 0x5e,
+                0x10, 0x6a, 0x06, 0x2b, 0x06, 0x53, 0x10, 0x39, 0x37, 0x32, 0x4a, 0x4e, 0x3d, 0x2b, 0x65,
+                0x38, 0x39, 0x07, 0x72, 0x54, 0x64, 0x4d, 0x56, 0x6a, 0x03, 0x22, 0x70, 0x7b, 0x5f, 0x60,
+                0x0b, 0x2a, 0x0b, 0x6b, 0x10, 0x64, 0x14, 0x05, 0x22, 0x00, 0x73, 0x40, 0x23, 0x5b, 0x51,
+                0x1f, 0x2b, 0x1a, 0x5d, 0x69, 0x7a, 0x46, 0x0c, 0x5f, 0x32, 0x4b, 0x4a, 0x28, 0x52, 0x79,
+                0x5b, 0x12, 0x42, 0x18, 0x00, 0x5d, 0x27, 0x31, 0x53, 0x3c, 0x4c, 0x36, 0x4e, 0x38, 0x3f,
+                0x72, 0x03, 0x71, 0x02, 0x5b, 0x36, 0x59, 0x7f, 0x75, 0x6e, 0x08, 0x54, 0x0d, 0x34, 0x1c,
+                0x34, 0x57, 0x5d, 0x69, 0x48, 0x00, 0x3b, 0x05, 0x07, 0x6e, 0x27, 0x65, 0x6e, 0x40, 0x3d,
+                0x3a, 0x4f, 0x72, 0x5d, 0x39, 0x16, 0x0f, 0x63, 0x12, 0x12, 0x15, 0x3a, 0x70, 0x0d, 0x57,
+                0x18, 0x0d, 0x5e, 0x3d, 0x22, 0x68, 0x68, 0x7c, 0x6d, 0x4f, 0x0c, 0x7b, 0x09, 0x2d, 0x4a,
+                0x73, 0x20, 0x47, 0x07, 0x57, 0x75, 0x5d, 0x53, 0x70, 0x34, 0x21, 0x40, 0x57, 0x51, 0x5e,
+                0x49, 0x44, 0x00, 0x54, 0x27, 0x04, 0x68, 0x7e, 0x59, 0x56, 0x58, 0x74, 0x14, 0x3c, 0x16,
+                0x33, 0x41, 0x16, 0x4b, 0x2f, 0x49, 0x37, 0x0a, 0x54, 0x08, 0x08, 0x1f, 0x39, 0x67, 0x76,
+                0x28, 0x28, 0x07, 0x1d, 0x61, 0x47, 0x51, 0x4d, 0x75, 0x26, 0x52, 0x47, 0x47, 0x0c, 0x57,
+                0x58, 0x74, 0x3e, 0x62, 0x6c, 0x58, 0x3a, 0x44, 0x1e, 0x16, 0x2e, 0x21, 0x1c, 0x73, 0x45,
+                0x67, 0x74, 0x4f, 0x33, 0x66, 0x0e, 0x74, 0x66, 0x26, 0x1f, 0x2e, 0x38, 0x44, 0x40, 0x7e,
+                0x2a, 0x50, 0x52, 0x5e, 0x43, 0x01, 0x7a, 0x38, 0x49, 0x3c, 0x55, 0x4d, 0x5a, 0x44, 0x08,
+                0x26, 0x59, 0x4d, 0x45, 0x0b, 0x48, 0x0a, 0x33, 0x5e, 0x4a, 0x4d, 0x75, 0x16, 0x17, 0x63,
+                0x46, 0x01, 0x2a, 0x55, 0x7b, 0x0f, 0x02, 0x73, 0x6a, 0x4b, 0x7f, 0x75, 0x65, 0x3c, 0x4c,
+                0x33, 0x39, 0x6c, 0x74, 0x05, 0x60, 0x0f, 0x7f, 0x2d, 0x41, 0x4d, 0x4d, 0x46, 0x71, 0x09,
+                0x6f, 0x4f, 0x60, 0x15, 0x0f, 0x46, 0x73, 0x63, 0x4c, 0x5e, 0x74, 0x30, 0x0d, 0x28, 0x43,
+                0x08, 0x72, 0x32, 0x04, 0x2e, 0x31, 0x29, 0x27, 0x44, 0x6d, 0x13, 0x17, 0x48, 0x0f, 0x49,
+                0x52, 0x10, 0x13, 0x7f, 0x17, 0x16, 0x62, 0x79, 0x35, 0x78, 0x3e, 0x01, 0x7c, 0x2e, 0x0f,
+                0x76, 0x3e, 0x5e, 0x53, 0x6c, 0x5b, 0x5f, 0x7c, 0x19, 0x41, 0x02, 0x2f, 0x17, 0x64, 0x41,
+                0x75, 0x10, 0x04, 0x47, 0x7c, 0x3d, 0x4b, 0x52, 0x00, 0x10, 0x5d, 0x51, 0x4e, 0x7a, 0x27,
+                0x25, 0x55, 0x40, 0x12, 0x35, 0x60, 0x05, 0x1b, 0x34, 0x2d, 0x04, 0x7a, 0x6a, 0x69, 0x02,
+                0x79, 0x03, 0x3a, 0x2f, 0x06, 0x0a, 0x79, 0x7b, 0x12, 0x5d, 0x7c, 0x52, 0x29, 0x47, 0x58,
+                0x12, 0x73, 0x3f, 0x27, 0x56, 0x05, 0x0c, 0x48, 0x32, 0x58, 0x6b, 0x57, 0x5c, 0x03, 0x64,
+                0x56, 0x11, 0x52, 0x7a, 0x30, 0x36, 0x29, 0x17, 0x3b, 0x68, 0x7a, 0x7c, 0x05, 0x6b, 0x6b,
+                0x13, 0x6a, 0x24, 0x5c, 0x68, 0x42, 0x18, 0x32, 0x03, 0x73, 0x6e, 0x04, 0x21, 0x2e, 0x01,
+                0x04, 0x63, 0x7d, 0x44, 0x41, 0x12, 0x31, 0x0b, 0x15, 0x1f, 0x70, 0x00, 0x2e, 0x66, 0x14,
+                0x3c, 0x7f, 0x2b, 0x00, 0x1f, 0x0c, 0x28, 0x59, 0x0a, 0x16, 0x49, 0x5a, 0x5c, 0x64, 0x65,
+                0x4b, 0x11, 0x29, 0x15, 0x36, 0x5a, 0x65, 0x19, 0x4f, 0x60, 0x23, 0x3a, 0x3a, 0x13, 0x25,
+                0x02, 0x78, 0x4c, 0x54};
         char b64_known[1369] = {
-                0x43, 0x7a, 0x42, 0x45, 0x59, 0x6e, 0x77, 0x69, 0x48, 0x77, 0x30, 0x46, 0x5a, 0x79, 0x77, 0x71, 0x4f, 0x53, 0x46, 0x47, 0x43, 0x46,
-                0x42, 0x6d, 0x4e, 0x44, 0x63, 0x4c, 0x52, 0x55, 0x73, 0x34, 0x4d, 0x67, 0x5a, 0x36, 0x50, 0x6e, 0x38, 0x4d, 0x51, 0x42, 0x68, 0x72,
-                0x4c, 0x57, 0x42, 0x4d, 0x59, 0x41, 0x77, 0x6a, 0x51, 0x7a, 0x73, 0x2b, 0x47, 0x78, 0x59, 0x45, 0x52, 0x6c, 0x67, 0x2f, 0x51, 0x47,
-                0x6f, 0x52, 0x42, 0x57, 0x4e, 0x78, 0x46, 0x44, 0x56, 0x48, 0x65, 0x52, 0x4e, 0x76, 0x61, 0x79, 0x63, 0x59, 0x57, 0x30, 0x67, 0x6e,
-                0x50, 0x6d, 0x38, 0x56, 0x4d, 0x30, 0x38, 0x2b, 0x58, 0x6c, 0x46, 0x7a, 0x61, 0x43, 0x55, 0x50, 0x42, 0x6c, 0x74, 0x38, 0x63, 0x6e,
-                0x55, 0x2b, 0x50, 0x78, 0x74, 0x63, 0x62, 0x57, 0x6f, 0x35, 0x66, 0x47, 0x4e, 0x6a, 0x59, 0x47, 0x78, 0x36, 0x4d, 0x33, 0x5a, 0x53,
-                0x45, 0x79, 0x55, 0x7a, 0x66, 0x57, 0x55, 0x6a, 0x4a, 0x78, 0x45, 0x47, 0x42, 0x6b, 0x64, 0x78, 0x48, 0x68, 0x52, 0x30, 0x59, 0x33,
-                0x41, 0x74, 0x46, 0x53, 0x63, 0x59, 0x55, 0x51, 0x59, 0x46, 0x4d, 0x78, 0x45, 0x73, 0x61, 0x77, 0x41, 0x74, 0x64, 0x79, 0x42, 0x49,
-                0x44, 0x58, 0x4e, 0x52, 0x52, 0x53, 0x56, 0x2f, 0x66, 0x7a, 0x55, 0x6d, 0x4c, 0x69, 0x5a, 0x54, 0x4a, 0x47, 0x67, 0x65, 0x44, 0x6c,
-                0x67, 0x36, 0x57, 0x56, 0x42, 0x57, 0x4e, 0x31, 0x39, 0x6d, 0x41, 0x55, 0x78, 0x61, 0x5a, 0x44, 0x4a, 0x51, 0x65, 0x32, 0x6f, 0x67,
-                0x63, 0x69, 0x73, 0x64, 0x66, 0x6b, 0x4e, 0x37, 0x59, 0x55, 0x49, 0x4c, 0x59, 0x58, 0x4d, 0x6b, 0x65, 0x54, 0x70, 0x72, 0x53, 0x6e,
-                0x6c, 0x75, 0x43, 0x51, 0x38, 0x6e, 0x4c, 0x51, 0x78, 0x65, 0x4d, 0x6b, 0x73, 0x4e, 0x65, 0x55, 0x59, 0x35, 0x49, 0x51, 0x6f, 0x6d,
-                0x58, 0x7a, 0x6f, 0x41, 0x4a, 0x6a, 0x38, 0x54, 0x4c, 0x6e, 0x35, 0x51, 0x4b, 0x32, 0x64, 0x47, 0x63, 0x6a, 0x38, 0x37, 0x41, 0x55,
-                0x59, 0x62, 0x43, 0x7a, 0x56, 0x4a, 0x4f, 0x52, 0x6c, 0x77, 0x50, 0x51, 0x4a, 0x42, 0x44, 0x6a, 0x67, 0x46, 0x64, 0x6d, 0x56, 0x50,
-                0x4d, 0x57, 0x78, 0x65, 0x46, 0x77, 0x51, 0x56, 0x4e, 0x69, 0x5a, 0x6b, 0x4e, 0x42, 0x51, 0x58, 0x66, 0x41, 0x34, 0x4c, 0x57, 0x31,
-                0x56, 0x54, 0x61, 0x77, 0x42, 0x43, 0x51, 0x55, 0x38, 0x43, 0x58, 0x42, 0x4d, 0x4b, 0x4c, 0x43, 0x77, 0x2b, 0x45, 0x42, 0x51, 0x7a,
-                0x52, 0x58, 0x78, 0x36, 0x57, 0x6a, 0x46, 0x68, 0x4f, 0x51, 0x67, 0x69, 0x61, 0x68, 0x34, 0x50, 0x62, 0x78, 0x74, 0x73, 0x45, 0x31,
-                0x35, 0x35, 0x49, 0x48, 0x6c, 0x51, 0x59, 0x67, 0x59, 0x73, 0x64, 0x68, 0x63, 0x45, 0x4b, 0x79, 0x70, 0x31, 0x48, 0x77, 0x77, 0x33,
-                0x54, 0x67, 0x39, 0x37, 0x4c, 0x54, 0x52, 0x31, 0x59, 0x44, 0x46, 0x30, 0x4c, 0x67, 0x70, 0x4b, 0x45, 0x57, 0x78, 0x4a, 0x4a, 0x51,
-                0x45, 0x36, 0x50, 0x53, 0x49, 0x65, 0x62, 0x52, 0x68, 0x52, 0x65, 0x43, 0x31, 0x69, 0x4d, 0x55, 0x78, 0x51, 0x51, 0x42, 0x64, 0x4c,
-                0x62, 0x79, 0x49, 0x41, 0x66, 0x32, 0x45, 0x71, 0x4e, 0x44, 0x34, 0x41, 0x58, 0x79, 0x39, 0x66, 0x4c, 0x78, 0x51, 0x71, 0x56, 0x53,
-                0x63, 0x66, 0x52, 0x68, 0x38, 0x53, 0x52, 0x6c, 0x34, 0x65, 0x44, 0x48, 0x77, 0x34, 0x41, 0x57, 0x46, 0x6b, 0x64, 0x69, 0x4a, 0x75,
-                0x43, 0x43, 0x41, 0x34, 0x54, 0x33, 0x4e, 0x79, 0x56, 0x52, 0x4a, 0x43, 0x47, 0x56, 0x42, 0x68, 0x51, 0x33, 0x64, 0x39, 0x51, 0x53,
-                0x34, 0x31, 0x54, 0x7a, 0x30, 0x78, 0x4b, 0x46, 0x68, 0x6e, 0x47, 0x77, 0x4e, 0x52, 0x49, 0x44, 0x49, 0x63, 0x43, 0x47, 0x34, 0x33,
-                0x64, 0x54, 0x64, 0x45, 0x54, 0x32, 0x67, 0x5a, 0x42, 0x32, 0x51, 0x55, 0x4b, 0x43, 0x55, 0x72, 0x61, 0x54, 0x55, 0x59, 0x4a, 0x79,
-                0x59, 0x55, 0x45, 0x33, 0x42, 0x43, 0x47, 0x52, 0x4a, 0x31, 0x50, 0x67, 0x4a, 0x64, 0x66, 0x42, 0x4d, 0x66, 0x46, 0x6c, 0x4d, 0x37,
-                0x64, 0x45, 0x67, 0x38, 0x58, 0x6a, 0x6c, 0x73, 0x48, 0x42, 0x78, 0x30, 0x4f, 0x52, 0x38, 0x41, 0x47, 0x77, 0x59, 0x4b, 0x61, 0x44,
-                0x74, 0x53, 0x54, 0x78, 0x35, 0x75, 0x50, 0x44, 0x55, 0x4d, 0x4f, 0x41, 0x34, 0x4c, 0x4f, 0x78, 0x70, 0x32, 0x49, 0x79, 0x6c, 0x54,
-                0x48, 0x6c, 0x39, 0x42, 0x44, 0x45, 0x73, 0x4b, 0x5a, 0x53, 0x68, 0x34, 0x5a, 0x30, 0x68, 0x5a, 0x4a, 0x6d, 0x30, 0x78, 0x64, 0x69,
-                0x4e, 0x77, 0x59, 0x57, 0x51, 0x37, 0x4f, 0x48, 0x6c, 0x6d, 0x64, 0x46, 0x4d, 0x73, 0x5a, 0x47, 0x52, 0x55, 0x41, 0x31, 0x52, 0x6c,
-                0x52, 0x45, 0x77, 0x59, 0x54, 0x30, 0x67, 0x67, 0x54, 0x33, 0x49, 0x51, 0x50, 0x77, 0x78, 0x53, 0x4c, 0x51, 0x4d, 0x55, 0x41, 0x31,
-                0x46, 0x43, 0x45, 0x48, 0x64, 0x71, 0x4e, 0x41, 0x59, 0x79, 0x41, 0x33, 0x49, 0x55, 0x66, 0x41, 0x68, 0x64, 0x55, 0x68, 0x70, 0x69,
-                0x66, 0x44, 0x34, 0x77, 0x66, 0x6c, 0x39, 0x2f, 0x56, 0x41, 0x39, 0x45, 0x53, 0x56, 0x31, 0x65, 0x45, 0x47, 0x6f, 0x47, 0x4b, 0x77,
-                0x5a, 0x54, 0x45, 0x44, 0x6b, 0x33, 0x4d, 0x6b, 0x70, 0x4f, 0x50, 0x53, 0x74, 0x6c, 0x4f, 0x44, 0x6b, 0x48, 0x63, 0x6c, 0x52, 0x6b,
-                0x54, 0x56, 0x5a, 0x71, 0x41, 0x79, 0x4a, 0x77, 0x65, 0x31, 0x39, 0x67, 0x43, 0x79, 0x6f, 0x4c, 0x61, 0x78, 0x42, 0x6b, 0x46, 0x41,
-                0x55, 0x69, 0x41, 0x48, 0x4e, 0x41, 0x49, 0x31, 0x74, 0x52, 0x48, 0x79, 0x73, 0x61, 0x58, 0x57, 0x6c, 0x36, 0x52, 0x67, 0x78, 0x66,
-                0x4d, 0x6b, 0x74, 0x4b, 0x4b, 0x46, 0x4a, 0x35, 0x57, 0x78, 0x4a, 0x43, 0x47, 0x41, 0x42, 0x64, 0x4a, 0x7a, 0x46, 0x54, 0x50, 0x45,
-                0x77, 0x32, 0x54, 0x6a, 0x67, 0x2f, 0x63, 0x67, 0x4e, 0x78, 0x41, 0x6c, 0x73, 0x32, 0x57, 0x58, 0x39, 0x31, 0x62, 0x67, 0x68, 0x55,
-                0x44, 0x54, 0x51, 0x63, 0x4e, 0x46, 0x64, 0x64, 0x61, 0x55, 0x67, 0x41, 0x4f, 0x77, 0x55, 0x48, 0x62, 0x69, 0x64, 0x6c, 0x62, 0x6b,
-                0x41, 0x39, 0x4f, 0x6b, 0x39, 0x79, 0x58, 0x54, 0x6b, 0x57, 0x44, 0x32, 0x4d, 0x53, 0x45, 0x68, 0x55, 0x36, 0x63, 0x41, 0x31, 0x58,
-                0x47, 0x41, 0x31, 0x65, 0x50, 0x53, 0x4a, 0x6f, 0x61, 0x48, 0x78, 0x74, 0x54, 0x77, 0x78, 0x37, 0x43, 0x53, 0x31, 0x4b, 0x63, 0x79,
-                0x42, 0x48, 0x42, 0x31, 0x64, 0x31, 0x58, 0x56, 0x4e, 0x77, 0x4e, 0x43, 0x46, 0x41, 0x56, 0x31, 0x46, 0x65, 0x53, 0x55, 0x51, 0x41,
-                0x56, 0x43, 0x63, 0x45, 0x61, 0x48, 0x35, 0x5a, 0x56, 0x6c, 0x68, 0x30, 0x46, 0x44, 0x77, 0x57, 0x4d, 0x30, 0x45, 0x57, 0x53, 0x79,
-                0x39, 0x4a, 0x4e, 0x77, 0x70, 0x55, 0x43, 0x41, 0x67, 0x66, 0x4f, 0x57, 0x64, 0x32, 0x4b, 0x43, 0x67, 0x48, 0x48, 0x57, 0x46, 0x48,
-                0x55, 0x55, 0x31, 0x31, 0x4a, 0x6c, 0x4a, 0x48, 0x52, 0x77, 0x78, 0x58, 0x57, 0x48, 0x51, 0x2b, 0x59, 0x6d, 0x78, 0x59, 0x4f, 0x6b,
-                0x51, 0x65, 0x46, 0x69, 0x34, 0x68, 0x48, 0x48, 0x4e, 0x46, 0x5a, 0x33, 0x52, 0x50, 0x4d, 0x32, 0x59, 0x4f, 0x64, 0x47, 0x59, 0x6d,
-                0x48, 0x79, 0x34, 0x34, 0x52, 0x45, 0x42, 0x2b, 0x4b, 0x6c, 0x42, 0x53, 0x58, 0x6b, 0x4d, 0x42, 0x65, 0x6a, 0x68, 0x4a, 0x50, 0x46,
-                0x56, 0x4e, 0x57, 0x6b, 0x51, 0x49, 0x4a, 0x6c, 0x6c, 0x4e, 0x52, 0x51, 0x74, 0x49, 0x43, 0x6a, 0x4e, 0x65, 0x53, 0x6b, 0x31, 0x31,
-                0x46, 0x68, 0x64, 0x6a, 0x52, 0x67, 0x45, 0x71, 0x56, 0x58, 0x73, 0x50, 0x41, 0x6e, 0x4e, 0x71, 0x53, 0x33, 0x39, 0x31, 0x5a, 0x54,
-                0x78, 0x4d, 0x4d, 0x7a, 0x6c, 0x73, 0x64, 0x41, 0x56, 0x67, 0x44, 0x33, 0x38, 0x74, 0x51, 0x55, 0x31, 0x4e, 0x52, 0x6e, 0x45, 0x4a,
-                0x62, 0x30, 0x39, 0x67, 0x46, 0x51, 0x39, 0x47, 0x63, 0x32, 0x4e, 0x4d, 0x58, 0x6e, 0x51, 0x77, 0x44, 0x53, 0x68, 0x44, 0x43, 0x48,
-                0x49, 0x79, 0x42, 0x43, 0x34, 0x78, 0x4b, 0x53, 0x64, 0x45, 0x62, 0x52, 0x4d, 0x58, 0x53, 0x41, 0x39, 0x4a, 0x55, 0x68, 0x41, 0x54,
-                0x66, 0x78, 0x63, 0x57, 0x59, 0x6e, 0x6b, 0x31, 0x65, 0x44, 0x34, 0x42, 0x66, 0x43, 0x34, 0x50, 0x64, 0x6a, 0x35, 0x65, 0x55, 0x32,
-                0x78, 0x62, 0x58, 0x33, 0x77, 0x5a, 0x51, 0x51, 0x49, 0x76, 0x46, 0x32, 0x52, 0x42, 0x64, 0x52, 0x41, 0x45, 0x52, 0x33, 0x77, 0x39,
-                0x53, 0x31, 0x49, 0x41, 0x45, 0x46, 0x31, 0x52, 0x54, 0x6e, 0x6f, 0x6e, 0x4a, 0x56, 0x56, 0x41, 0x45, 0x6a, 0x56, 0x67, 0x42, 0x52,
-                0x73, 0x30, 0x4c, 0x51, 0x52, 0x36, 0x61, 0x6d, 0x6b, 0x43, 0x65, 0x51, 0x4d, 0x36, 0x4c, 0x77, 0x59, 0x4b, 0x65, 0x58, 0x73, 0x53,
-                0x58, 0x58, 0x78, 0x53, 0x4b, 0x55, 0x64, 0x59, 0x45, 0x6e, 0x4d, 0x2f, 0x4a, 0x31, 0x59, 0x46, 0x44, 0x45, 0x67, 0x79, 0x57, 0x47,
-                0x74, 0x58, 0x58, 0x41, 0x4e, 0x6b, 0x56, 0x68, 0x46, 0x53, 0x65, 0x6a, 0x41, 0x32, 0x4b, 0x52, 0x63, 0x37, 0x61, 0x48, 0x70, 0x38,
-                0x42, 0x57, 0x74, 0x72, 0x45, 0x32, 0x6f, 0x6b, 0x58, 0x47, 0x68, 0x43, 0x47, 0x44, 0x49, 0x44, 0x63, 0x32, 0x34, 0x45, 0x49, 0x53,
-                0x34, 0x42, 0x42, 0x47, 0x4e, 0x39, 0x52, 0x45, 0x45, 0x53, 0x4d, 0x51, 0x73, 0x56, 0x48, 0x33, 0x41, 0x41, 0x4c, 0x6d, 0x59, 0x55,
-                0x50, 0x48, 0x38, 0x72, 0x41, 0x42, 0x38, 0x4d, 0x4b, 0x46, 0x6b, 0x4b, 0x46, 0x6b, 0x6c, 0x61, 0x58, 0x47, 0x52, 0x6c, 0x53, 0x78,
-                0x45, 0x70, 0x46, 0x54, 0x5a, 0x61, 0x5a, 0x52, 0x6c, 0x50, 0x59, 0x43, 0x4d, 0x36, 0x4f, 0x68, 0x4d, 0x6c, 0x41, 0x6e, 0x68, 0x4d,
-                0x56, 0x41, 0x3d, 0x3d, 0x00};
+                0x43, 0x7a, 0x42, 0x45, 0x59, 0x6e, 0x77, 0x69, 0x48, 0x77, 0x30, 0x46, 0x5a, 0x79, 0x77,
+                0x71, 0x4f, 0x53, 0x46, 0x47, 0x43, 0x46, 0x42, 0x6d, 0x4e, 0x44, 0x63, 0x4c, 0x52, 0x55,
+                0x73, 0x34, 0x4d, 0x67, 0x5a, 0x36, 0x50, 0x6e, 0x38, 0x4d, 0x51, 0x42, 0x68, 0x72, 0x4c,
+                0x57, 0x42, 0x4d, 0x59, 0x41, 0x77, 0x6a, 0x51, 0x7a, 0x73, 0x2b, 0x47, 0x78, 0x59, 0x45,
+                0x52, 0x6c, 0x67, 0x2f, 0x51, 0x47, 0x6f, 0x52, 0x42, 0x57, 0x4e, 0x78, 0x46, 0x44, 0x56,
+                0x48, 0x65, 0x52, 0x4e, 0x76, 0x61, 0x79, 0x63, 0x59, 0x57, 0x30, 0x67, 0x6e, 0x50, 0x6d,
+                0x38, 0x56, 0x4d, 0x30, 0x38, 0x2b, 0x58, 0x6c, 0x46, 0x7a, 0x61, 0x43, 0x55, 0x50, 0x42,
+                0x6c, 0x74, 0x38, 0x63, 0x6e, 0x55, 0x2b, 0x50, 0x78, 0x74, 0x63, 0x62, 0x57, 0x6f, 0x35,
+                0x66, 0x47, 0x4e, 0x6a, 0x59, 0x47, 0x78, 0x36, 0x4d, 0x33, 0x5a, 0x53, 0x45, 0x79, 0x55,
+                0x7a, 0x66, 0x57, 0x55, 0x6a, 0x4a, 0x78, 0x45, 0x47, 0x42, 0x6b, 0x64, 0x78, 0x48, 0x68,
+                0x52, 0x30, 0x59, 0x33, 0x41, 0x74, 0x46, 0x53, 0x63, 0x59, 0x55, 0x51, 0x59, 0x46, 0x4d,
+                0x78, 0x45, 0x73, 0x61, 0x77, 0x41, 0x74, 0x64, 0x79, 0x42, 0x49, 0x44, 0x58, 0x4e, 0x52,
+                0x52, 0x53, 0x56, 0x2f, 0x66, 0x7a, 0x55, 0x6d, 0x4c, 0x69, 0x5a, 0x54, 0x4a, 0x47, 0x67,
+                0x65, 0x44, 0x6c, 0x67, 0x36, 0x57, 0x56, 0x42, 0x57, 0x4e, 0x31, 0x39, 0x6d, 0x41, 0x55,
+                0x78, 0x61, 0x5a, 0x44, 0x4a, 0x51, 0x65, 0x32, 0x6f, 0x67, 0x63, 0x69, 0x73, 0x64, 0x66,
+                0x6b, 0x4e, 0x37, 0x59, 0x55, 0x49, 0x4c, 0x59, 0x58, 0x4d, 0x6b, 0x65, 0x54, 0x70, 0x72,
+                0x53, 0x6e, 0x6c, 0x75, 0x43, 0x51, 0x38, 0x6e, 0x4c, 0x51, 0x78, 0x65, 0x4d, 0x6b, 0x73,
+                0x4e, 0x65, 0x55, 0x59, 0x35, 0x49, 0x51, 0x6f, 0x6d, 0x58, 0x7a, 0x6f, 0x41, 0x4a, 0x6a,
+                0x38, 0x54, 0x4c, 0x6e, 0x35, 0x51, 0x4b, 0x32, 0x64, 0x47, 0x63, 0x6a, 0x38, 0x37, 0x41,
+                0x55, 0x59, 0x62, 0x43, 0x7a, 0x56, 0x4a, 0x4f, 0x52, 0x6c, 0x77, 0x50, 0x51, 0x4a, 0x42,
+                0x44, 0x6a, 0x67, 0x46, 0x64, 0x6d, 0x56, 0x50, 0x4d, 0x57, 0x78, 0x65, 0x46, 0x77, 0x51,
+                0x56, 0x4e, 0x69, 0x5a, 0x6b, 0x4e, 0x42, 0x51, 0x58, 0x66, 0x41, 0x34, 0x4c, 0x57, 0x31,
+                0x56, 0x54, 0x61, 0x77, 0x42, 0x43, 0x51, 0x55, 0x38, 0x43, 0x58, 0x42, 0x4d, 0x4b, 0x4c,
+                0x43, 0x77, 0x2b, 0x45, 0x42, 0x51, 0x7a, 0x52, 0x58, 0x78, 0x36, 0x57, 0x6a, 0x46, 0x68,
+                0x4f, 0x51, 0x67, 0x69, 0x61, 0x68, 0x34, 0x50, 0x62, 0x78, 0x74, 0x73, 0x45, 0x31, 0x35,
+                0x35, 0x49, 0x48, 0x6c, 0x51, 0x59, 0x67, 0x59, 0x73, 0x64, 0x68, 0x63, 0x45, 0x4b, 0x79,
+                0x70, 0x31, 0x48, 0x77, 0x77, 0x33, 0x54, 0x67, 0x39, 0x37, 0x4c, 0x54, 0x52, 0x31, 0x59,
+                0x44, 0x46, 0x30, 0x4c, 0x67, 0x70, 0x4b, 0x45, 0x57, 0x78, 0x4a, 0x4a, 0x51, 0x45, 0x36,
+                0x50, 0x53, 0x49, 0x65, 0x62, 0x52, 0x68, 0x52, 0x65, 0x43, 0x31, 0x69, 0x4d, 0x55, 0x78,
+                0x51, 0x51, 0x42, 0x64, 0x4c, 0x62, 0x79, 0x49, 0x41, 0x66, 0x32, 0x45, 0x71, 0x4e, 0x44,
+                0x34, 0x41, 0x58, 0x79, 0x39, 0x66, 0x4c, 0x78, 0x51, 0x71, 0x56, 0x53, 0x63, 0x66, 0x52,
+                0x68, 0x38, 0x53, 0x52, 0x6c, 0x34, 0x65, 0x44, 0x48, 0x77, 0x34, 0x41, 0x57, 0x46, 0x6b,
+                0x64, 0x69, 0x4a, 0x75, 0x43, 0x43, 0x41, 0x34, 0x54, 0x33, 0x4e, 0x79, 0x56, 0x52, 0x4a,
+                0x43, 0x47, 0x56, 0x42, 0x68, 0x51, 0x33, 0x64, 0x39, 0x51, 0x53, 0x34, 0x31, 0x54, 0x7a,
+                0x30, 0x78, 0x4b, 0x46, 0x68, 0x6e, 0x47, 0x77, 0x4e, 0x52, 0x49, 0x44, 0x49, 0x63, 0x43,
+                0x47, 0x34, 0x33, 0x64, 0x54, 0x64, 0x45, 0x54, 0x32, 0x67, 0x5a, 0x42, 0x32, 0x51, 0x55,
+                0x4b, 0x43, 0x55, 0x72, 0x61, 0x54, 0x55, 0x59, 0x4a, 0x79, 0x59, 0x55, 0x45, 0x33, 0x42,
+                0x43, 0x47, 0x52, 0x4a, 0x31, 0x50, 0x67, 0x4a, 0x64, 0x66, 0x42, 0x4d, 0x66, 0x46, 0x6c,
+                0x4d, 0x37, 0x64, 0x45, 0x67, 0x38, 0x58, 0x6a, 0x6c, 0x73, 0x48, 0x42, 0x78, 0x30, 0x4f,
+                0x52, 0x38, 0x41, 0x47, 0x77, 0x59, 0x4b, 0x61, 0x44, 0x74, 0x53, 0x54, 0x78, 0x35, 0x75,
+                0x50, 0x44, 0x55, 0x4d, 0x4f, 0x41, 0x34, 0x4c, 0x4f, 0x78, 0x70, 0x32, 0x49, 0x79, 0x6c,
+                0x54, 0x48, 0x6c, 0x39, 0x42, 0x44, 0x45, 0x73, 0x4b, 0x5a, 0x53, 0x68, 0x34, 0x5a, 0x30,
+                0x68, 0x5a, 0x4a, 0x6d, 0x30, 0x78, 0x64, 0x69, 0x4e, 0x77, 0x59, 0x57, 0x51, 0x37, 0x4f,
+                0x48, 0x6c, 0x6d, 0x64, 0x46, 0x4d, 0x73, 0x5a, 0x47, 0x52, 0x55, 0x41, 0x31, 0x52, 0x6c,
+                0x52, 0x45, 0x77, 0x59, 0x54, 0x30, 0x67, 0x67, 0x54, 0x33, 0x49, 0x51, 0x50, 0x77, 0x78,
+                0x53, 0x4c, 0x51, 0x4d, 0x55, 0x41, 0x31, 0x46, 0x43, 0x45, 0x48, 0x64, 0x71, 0x4e, 0x41,
+                0x59, 0x79, 0x41, 0x33, 0x49, 0x55, 0x66, 0x41, 0x68, 0x64, 0x55, 0x68, 0x70, 0x69, 0x66,
+                0x44, 0x34, 0x77, 0x66, 0x6c, 0x39, 0x2f, 0x56, 0x41, 0x39, 0x45, 0x53, 0x56, 0x31, 0x65,
+                0x45, 0x47, 0x6f, 0x47, 0x4b, 0x77, 0x5a, 0x54, 0x45, 0x44, 0x6b, 0x33, 0x4d, 0x6b, 0x70,
+                0x4f, 0x50, 0x53, 0x74, 0x6c, 0x4f, 0x44, 0x6b, 0x48, 0x63, 0x6c, 0x52, 0x6b, 0x54, 0x56,
+                0x5a, 0x71, 0x41, 0x79, 0x4a, 0x77, 0x65, 0x31, 0x39, 0x67, 0x43, 0x79, 0x6f, 0x4c, 0x61,
+                0x78, 0x42, 0x6b, 0x46, 0x41, 0x55, 0x69, 0x41, 0x48, 0x4e, 0x41, 0x49, 0x31, 0x74, 0x52,
+                0x48, 0x79, 0x73, 0x61, 0x58, 0x57, 0x6c, 0x36, 0x52, 0x67, 0x78, 0x66, 0x4d, 0x6b, 0x74,
+                0x4b, 0x4b, 0x46, 0x4a, 0x35, 0x57, 0x78, 0x4a, 0x43, 0x47, 0x41, 0x42, 0x64, 0x4a, 0x7a,
+                0x46, 0x54, 0x50, 0x45, 0x77, 0x32, 0x54, 0x6a, 0x67, 0x2f, 0x63, 0x67, 0x4e, 0x78, 0x41,
+                0x6c, 0x73, 0x32, 0x57, 0x58, 0x39, 0x31, 0x62, 0x67, 0x68, 0x55, 0x44, 0x54, 0x51, 0x63,
+                0x4e, 0x46, 0x64, 0x64, 0x61, 0x55, 0x67, 0x41, 0x4f, 0x77, 0x55, 0x48, 0x62, 0x69, 0x64,
+                0x6c, 0x62, 0x6b, 0x41, 0x39, 0x4f, 0x6b, 0x39, 0x79, 0x58, 0x54, 0x6b, 0x57, 0x44, 0x32,
+                0x4d, 0x53, 0x45, 0x68, 0x55, 0x36, 0x63, 0x41, 0x31, 0x58, 0x47, 0x41, 0x31, 0x65, 0x50,
+                0x53, 0x4a, 0x6f, 0x61, 0x48, 0x78, 0x74, 0x54, 0x77, 0x78, 0x37, 0x43, 0x53, 0x31, 0x4b,
+                0x63, 0x79, 0x42, 0x48, 0x42, 0x31, 0x64, 0x31, 0x58, 0x56, 0x4e, 0x77, 0x4e, 0x43, 0x46,
+                0x41, 0x56, 0x31, 0x46, 0x65, 0x53, 0x55, 0x51, 0x41, 0x56, 0x43, 0x63, 0x45, 0x61, 0x48,
+                0x35, 0x5a, 0x56, 0x6c, 0x68, 0x30, 0x46, 0x44, 0x77, 0x57, 0x4d, 0x30, 0x45, 0x57, 0x53,
+                0x79, 0x39, 0x4a, 0x4e, 0x77, 0x70, 0x55, 0x43, 0x41, 0x67, 0x66, 0x4f, 0x57, 0x64, 0x32,
+                0x4b, 0x43, 0x67, 0x48, 0x48, 0x57, 0x46, 0x48, 0x55, 0x55, 0x31, 0x31, 0x4a, 0x6c, 0x4a,
+                0x48, 0x52, 0x77, 0x78, 0x58, 0x57, 0x48, 0x51, 0x2b, 0x59, 0x6d, 0x78, 0x59, 0x4f, 0x6b,
+                0x51, 0x65, 0x46, 0x69, 0x34, 0x68, 0x48, 0x48, 0x4e, 0x46, 0x5a, 0x33, 0x52, 0x50, 0x4d,
+                0x32, 0x59, 0x4f, 0x64, 0x47, 0x59, 0x6d, 0x48, 0x79, 0x34, 0x34, 0x52, 0x45, 0x42, 0x2b,
+                0x4b, 0x6c, 0x42, 0x53, 0x58, 0x6b, 0x4d, 0x42, 0x65, 0x6a, 0x68, 0x4a, 0x50, 0x46, 0x56,
+                0x4e, 0x57, 0x6b, 0x51, 0x49, 0x4a, 0x6c, 0x6c, 0x4e, 0x52, 0x51, 0x74, 0x49, 0x43, 0x6a,
+                0x4e, 0x65, 0x53, 0x6b, 0x31, 0x31, 0x46, 0x68, 0x64, 0x6a, 0x52, 0x67, 0x45, 0x71, 0x56,
+                0x58, 0x73, 0x50, 0x41, 0x6e, 0x4e, 0x71, 0x53, 0x33, 0x39, 0x31, 0x5a, 0x54, 0x78, 0x4d,
+                0x4d, 0x7a, 0x6c, 0x73, 0x64, 0x41, 0x56, 0x67, 0x44, 0x33, 0x38, 0x74, 0x51, 0x55, 0x31,
+                0x4e, 0x52, 0x6e, 0x45, 0x4a, 0x62, 0x30, 0x39, 0x67, 0x46, 0x51, 0x39, 0x47, 0x63, 0x32,
+                0x4e, 0x4d, 0x58, 0x6e, 0x51, 0x77, 0x44, 0x53, 0x68, 0x44, 0x43, 0x48, 0x49, 0x79, 0x42,
+                0x43, 0x34, 0x78, 0x4b, 0x53, 0x64, 0x45, 0x62, 0x52, 0x4d, 0x58, 0x53, 0x41, 0x39, 0x4a,
+                0x55, 0x68, 0x41, 0x54, 0x66, 0x78, 0x63, 0x57, 0x59, 0x6e, 0x6b, 0x31, 0x65, 0x44, 0x34,
+                0x42, 0x66, 0x43, 0x34, 0x50, 0x64, 0x6a, 0x35, 0x65, 0x55, 0x32, 0x78, 0x62, 0x58, 0x33,
+                0x77, 0x5a, 0x51, 0x51, 0x49, 0x76, 0x46, 0x32, 0x52, 0x42, 0x64, 0x52, 0x41, 0x45, 0x52,
+                0x33, 0x77, 0x39, 0x53, 0x31, 0x49, 0x41, 0x45, 0x46, 0x31, 0x52, 0x54, 0x6e, 0x6f, 0x6e,
+                0x4a, 0x56, 0x56, 0x41, 0x45, 0x6a, 0x56, 0x67, 0x42, 0x52, 0x73, 0x30, 0x4c, 0x51, 0x52,
+                0x36, 0x61, 0x6d, 0x6b, 0x43, 0x65, 0x51, 0x4d, 0x36, 0x4c, 0x77, 0x59, 0x4b, 0x65, 0x58,
+                0x73, 0x53, 0x58, 0x58, 0x78, 0x53, 0x4b, 0x55, 0x64, 0x59, 0x45, 0x6e, 0x4d, 0x2f, 0x4a,
+                0x31, 0x59, 0x46, 0x44, 0x45, 0x67, 0x79, 0x57, 0x47, 0x74, 0x58, 0x58, 0x41, 0x4e, 0x6b,
+                0x56, 0x68, 0x46, 0x53, 0x65, 0x6a, 0x41, 0x32, 0x4b, 0x52, 0x63, 0x37, 0x61, 0x48, 0x70,
+                0x38, 0x42, 0x57, 0x74, 0x72, 0x45, 0x32, 0x6f, 0x6b, 0x58, 0x47, 0x68, 0x43, 0x47, 0x44,
+                0x49, 0x44, 0x63, 0x32, 0x34, 0x45, 0x49, 0x53, 0x34, 0x42, 0x42, 0x47, 0x4e, 0x39, 0x52,
+                0x45, 0x45, 0x53, 0x4d, 0x51, 0x73, 0x56, 0x48, 0x33, 0x41, 0x41, 0x4c, 0x6d, 0x59, 0x55,
+                0x50, 0x48, 0x38, 0x72, 0x41, 0x42, 0x38, 0x4d, 0x4b, 0x46, 0x6b, 0x4b, 0x46, 0x6b, 0x6c,
+                0x61, 0x58, 0x47, 0x52, 0x6c, 0x53, 0x78, 0x45, 0x70, 0x46, 0x54, 0x5a, 0x61, 0x5a, 0x52,
+                0x6c, 0x50, 0x59, 0x43, 0x4d, 0x36, 0x4f, 0x68, 0x4d, 0x6c, 0x41, 0x6e, 0x68, 0x4d, 0x56,
+                0x41, 0x3d, 0x3d, 0x00};
         char *b64_test;
 
         plan_tests(1);
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index c8867dfb..d51016cc 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -38,36 +38,35 @@ char *get_command(char *const *line) {
 }
 
 int main(int argc, char **argv) {
-        char **command_line = malloc(sizeof(char *) * COMMAND_LINE);
-        char *command = NULL;
-        char *perl;
-        output chld_out, chld_err;
-        int c;
-        int result = UNSET;
-
         plan_tests(51);
 
         diag("Running plain echo command, set one");
 
         /* ensure everything is empty before we begin */
+
+        output chld_out;
         memset(&chld_out, 0, sizeof(output));
+        output chld_err;
         memset(&chld_err, 0, sizeof(output));
         ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
         ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        int result = UNSET;
         ok(result == UNSET, "(initialised) Checking exit code is reset");
 
+        char **command_line = malloc(sizeof(char *) * COMMAND_LINE);
         command_line[0] = strdup("/bin/echo");
         command_line[1] = strdup("this");
         command_line[2] = strdup("is");
         command_line[3] = strdup("test");
         command_line[4] = strdup("one");
 
-        command = get_command(command_line);
+        char *command = get_command(command_line);
 
         result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
         ok(chld_out.lines == 1, "(array) Check for expected number of stdout lines");
         ok(chld_err.lines == 0, "(array) Check for expected number of stderr lines");
-        ok(strcmp(chld_out.line[0], "this is test one") == 0, "(array) Check for expected stdout output");
+        ok(strcmp(chld_out.line[0], "this is test one") == 0,
+           "(array) Check for expected stdout output");
         ok(result == 0, "(array) Checking exit code");
 
         /* ensure everything is empty again */
@@ -82,7 +81,8 @@ int main(int argc, char **argv) {
 
         ok(chld_out.lines == 1, "(string) Check for expected number of stdout lines");
         ok(chld_err.lines == 0, "(string) Check for expected number of stderr lines");
-        ok(strcmp(chld_out.line[0], "this is test one") == 0, "(string) Check for expected stdout output");
+        ok(strcmp(chld_out.line[0], "this is test one") == 0,
+           "(string) Check for expected stdout output");
         ok(result == 0, "(string) Checking exit code");
 
         diag("Running plain echo command, set two");
@@ -104,7 +104,8 @@ int main(int argc, char **argv) {
         result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
         ok(chld_out.lines == 1, "(array) Check for expected number of stdout lines");
         ok(chld_err.lines == 0, "(array) Check for expected number of stderr lines");
-        ok(strcmp(chld_out.line[0], "this is test two") == 0, "(array) Check for expected stdout output");
+        ok(strcmp(chld_out.line[0], "this is test two") == 0,
+           "(array) Check for expected stdout output");
         ok(result == 0, "(array) Checking exit code");
 
         /* ensure everything is empty again */
@@ -119,7 +120,8 @@ int main(int argc, char **argv) {
 
         ok(chld_out.lines == 1, "(string) Check for expected number of stdout lines");
         ok(chld_err.lines == 0, "(string) Check for expected number of stderr lines");
-        ok(strcmp(chld_out.line[0], "this is test one") == 0, "(string) Check for expected stdout output");
+        ok(strcmp(chld_out.line[0], "this is test one") == 0,
+           "(string) Check for expected stdout output");
         ok(result == 0, "(string) Checking exit code");
 
         /* ensure everything is empty again */
@@ -130,7 +132,8 @@ int main(int argc, char **argv) {
         ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
         ok(result == UNSET, "(initialised) Checking exit code is reset");
 
-        /* Pass linefeeds via parameters through - those should be evaluated by echo to give multi line output */
+        /* Pass linefeeds via parameters through - those should be evaluated by echo to give multi line
+         * output */
         command_line[0] = strdup("/bin/echo");
         command_line[1] = strdup("this is a test via echo\nline two\nit's line 3");
         command_line[2] = strdup("and (note space between '3' and 'and') $$ will not get evaluated");
@@ -138,9 +141,12 @@ int main(int argc, char **argv) {
         result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
         ok(chld_out.lines == 3, "(array) Check for expected number of stdout lines");
         ok(chld_err.lines == 0, "(array) Check for expected number of stderr lines");
-        ok(strcmp(chld_out.line[0], "this is a test via echo") == 0, "(array) Check line 1 for expected stdout output");
-        ok(strcmp(chld_out.line[1], "line two") == 0, "(array) Check line 2 for expected stdout output");
-        ok(strcmp(chld_out.line[2], "it's line 3 and (note space between '3' and 'and') $$ will not get evaluated") == 0,
+        ok(strcmp(chld_out.line[0], "this is a test via echo") == 0,
+           "(array) Check line 1 for expected stdout output");
+        ok(strcmp(chld_out.line[1], "line two") == 0,
+           "(array) Check line 2 for expected stdout output");
+        ok(strcmp(chld_out.line[2],
+                          "it's line 3 and (note space between '3' and 'and') $$ will not get evaluated") == 0,
            "(array) Check line 3 for expected stdout output");
         ok(result == 0, "(array) Checking exit code");
 
@@ -171,7 +177,8 @@ int main(int argc, char **argv) {
 
         ok(chld_out.lines == 0, "/bin/sh returns no stdout when file is missing...");
         ok(chld_err.lines == 1, "...but does give an error line");
-        ok(strstr(chld_err.line[0], "non-existent-file") != NULL, "And missing filename is in error message");
+        ok(strstr(chld_err.line[0], "non-existent-file") != NULL,
+           "And missing filename is in error message");
         ok(result != 0, "Get non-zero return code from /bin/sh");
 
         /* ensure everything is empty again */
diff --git a/lib/tests/test_disk.t b/lib/tests/test_disk.t
deleted file mode 100755
index da84dfdf..00000000
--- a/lib/tests/test_disk.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/perl
-use Test::More;
-if (! -e "./test_disk") {
-        plan skip_all => "./test_disk not compiled - please enable libtap library to test";
-}
-exec "./test_disk";
diff --git a/lib/tests/test_generic_output.c b/lib/tests/test_generic_output.c
index e67aefc9..e4a78bcd 100644
--- a/lib/tests/test_generic_output.c
+++ b/lib/tests/test_generic_output.c
@@ -110,7 +110,8 @@ void test_two_subchecks(void) {
         sc1.output = "foobar";
         sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
 
-        ok(mp_compute_subcheck_state(sc1) == STATE_WARNING, "Test subcheck state directly after setting it");
+        ok(mp_compute_subcheck_state(sc1) == STATE_WARNING,
+           "Test subcheck state directly after setting it");
 
         mp_perfdata pd1 = perfdata_init();
 
@@ -129,7 +130,8 @@ void test_two_subchecks(void) {
 
         mp_add_subcheck_to_subcheck(&sc1, sc2);
 
-        ok(mp_compute_subcheck_state(sc1) == STATE_WARNING, "Test subcheck state after adding a subcheck");
+        ok(mp_compute_subcheck_state(sc1) == STATE_WARNING,
+           "Test subcheck state after adding a subcheck");
 
         mp_check check = mp_check_init();
         mp_add_subcheck_to_check(&check, sc1);
diff --git a/lib/tests/test_ini1.c b/lib/tests/test_ini1.c
index 246c1250..de983764 100644
--- a/lib/tests/test_ini1.c
+++ b/lib/tests/test_ini1.c
@@ -42,27 +42,30 @@ char *list2str(np_arg_list *optlst) {
                 free(optltmp);
         }
         /* Strip last whitespace */
-        if (strlen(optstr) > 1)
+        if (strlen(optstr) > 1) {
                 optstr[strlen(optstr) - 1] = '\0';
+        }
 
         return optstr;
 }
 
 int main(int argc, char **argv) {
-        char *optstr = NULL;
 
         plan_tests(12);
 
-        optstr = list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
-        ok(!strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "config-tiny.ini's section as expected");
+        char *optstr = list2str(np_get_defaults("section@./config-tiny.ini", "check_disk"));
+        ok(!strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"),
+           "config-tiny.ini's section as expected");
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("@./config-tiny.ini", "section"));
-        ok(!strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"), "Used default section name, without specific");
+        ok(!strcmp(optstr, "--one=two --Foo=Bar --this=Your Mother! --blank"),
+           "Used default section name, without specific");
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("Section Two@./config-tiny.ini", "check_disk"));
-        ok(!strcmp(optstr, "--something else=blah --remove=whitespace"), "config-tiny.ini's Section Two as expected");
+        ok(!strcmp(optstr, "--something else=blah --remove=whitespace"),
+           "config-tiny.ini's Section Two as expected");
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk"));
@@ -70,15 +73,18 @@ int main(int argc, char **argv) {
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("section2@./config-tiny.ini", "check_disk"));
-        ok(!strcmp(optstr, "--this=that"), "config-tiny.ini's section2 with whitespace before section name");
+        ok(!strcmp(optstr, "--this=that"),
+           "config-tiny.ini's section2 with whitespace before section name");
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("section3@./config-tiny.ini", "check_disk"));
-        ok(!strcmp(optstr, "--this=that"), "config-tiny.ini's section3 with whitespace after section name");
+        ok(!strcmp(optstr, "--this=that"),
+           "config-tiny.ini's section3 with whitespace after section name");
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("check_mysql@./plugin.ini", "check_disk"));
-        ok(!strcmp(optstr, "--username=operator --password=secret"), "plugin.ini's check_mysql as expected");
+        ok(!strcmp(optstr, "--username=operator --password=secret"),
+           "plugin.ini's check_mysql as expected");
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("check_mysql2@./plugin.ini", "check_disk"));
@@ -90,29 +96,39 @@ int main(int argc, char **argv) {
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("Section Two@./config-dos.ini", "check_disk"));
-        ok(!strcmp(optstr, "--something else=blah --remove=whitespace"), "config-dos.ini's Section Two as expected");
+        ok(!strcmp(optstr, "--something else=blah --remove=whitespace"),
+           "config-dos.ini's Section Two as expected");
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("section_twice@./plugin.ini", "check_disk"));
-        ok(!strcmp(optstr, "--foo=bar --bar=foo"), "plugin.ini's section_twice defined twice in the file");
+        ok(!strcmp(optstr, "--foo=bar --bar=foo"),
+           "plugin.ini's section_twice defined twice in the file");
         my_free(optstr);
 
         optstr = list2str(np_get_defaults("tcp_long_lines@plugins.ini", "check_tcp"));
-        ok(!strcmp(optstr, "--escape --send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar "
+        ok(!strcmp(optstr, "--escape --send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar "
                                            "BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
-                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar "
+                                           "BAZ yadda yadda yadda Foo bar BAZ yadda "
                                            "yadda yadda Foo bar BAZ yadda yadda yadda Foo "
-                                           "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                           "yadda yadda Foo bar BAZ yadda yadda "
                                            "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
-                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda --expect=Foo bar BAZ yadda yadda "
+                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda --expect=Foo bar BAZ yadda yadda "
                                            "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
-                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo "
+                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo "
                                            "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
-                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar "
+                                           "BAZ yadda yadda yadda Foo bar BAZ yadda "
                                            "yadda yadda Foo bar BAZ yadda yadda yadda Foo "
-                                           "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                           "yadda yadda Foo bar BAZ yadda yadda "
                                            "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
-                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo "
+                                           "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                           "yadda Foo bar BAZ yadda yadda yadda Foo "
                                            "bar BAZ yadda yadda yadda --jail"),
            "Long options");
         my_free(optstr);
diff --git a/lib/tests/test_opts1.c b/lib/tests/test_opts1.c
index 984183d3..fa95c4d4 100644
--- a/lib/tests/test_opts1.c
+++ b/lib/tests/test_opts1.c
@@ -40,37 +40,40 @@ void my_free(int *argc, char **newargv, char **argv) {
 #else
 void my_free(int *argc, char **newargv, char **argv) {
         /* Free stuff (and print while we're at it) */
-        int i, freeflag = 1;
+        bool freeflag = true;
         printf("    Arg(%i): ", *argc + 1);
         printf("'%s' ", newargv[0]);
-        for (i = 1; i < *argc; i++) {
+
+        for (int i = 1; i < *argc; i++) {
                 printf("'%s' ", newargv[i]);
                 /* Stop freeing when we get to the start of the original array */
                 if (freeflag) {
-                        if (newargv[i] == argv[1])
-                                freeflag = 0;
-                        else
+                        if (newargv[i] == argv[1]) {
+                                freeflag = false;
+                        } else {
                                 free(newargv[i]);
+                        }
                 }
         }
         printf("\n");
         /* Free only if it's a different array */
-        if (newargv != argv)
+        if (newargv != argv) {
                 free(newargv);
+        }
         *argc = 0;
 }
 #endif
 
 int array_diff(int i1, char **a1, int i2, char **a2) {
-        int i;
-
         if (i1 != i2) {
                 printf("    Argument count doesn't match!\n");
                 return 0;
         }
-        for (i = 0; i <= i1; i++) {
-                if (a1[i] == NULL && a2[i] == NULL)
+
+        for (int i = 0; i <= i1; i++) {
+                if (a1[i] == NULL && a2[i] == NULL) {
                         continue;
+                }
                 if (a1[i] == NULL || a2[i] == NULL) {
                         printf("    Argument # %i null in one array!\n", i);
                         return 0;
@@ -84,11 +87,10 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
 }
 
 int main(int argc, char **argv) {
-        char **argv_new = NULL;
-        int i, argc_test;
-
         plan_tests(5);
 
+        char **argv_new = NULL;
+        int argc_test;
         {
                 char *argv_test[] = {"prog_name", (char *)NULL};
                 argc_test = 1;
@@ -110,27 +112,36 @@ int main(int argc, char **argv) {
         {
                 char *argv_test[] = {"prog_name", "--extra-opts=@./config-opts.ini", (char *)NULL};
                 argc_test = 2;
-                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank", (char *)NULL};
+                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!", "--blank",
+                                                          (char *)NULL};
                 argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts using default section");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts", "sect2@./config-opts.ini", (char *)NULL};
+                char *argv_test[] = {"prog_name", "--extra-opts=sect1@./config-opts.ini", "--extra-opts",
+                                                         "sect2@./config-opts.ini", (char *)NULL};
                 argc_test = 4;
-                char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that", (char *)NULL};
+                char *argv_known[] = {"prog_name", "--one=two", "--something else=oops", "--this=that",
+                                                          (char *)NULL};
                 argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 4, argv_known), "Only extra opts specified twice");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--arg1=val1", "--extra-opts=@./config-opts.ini", "--extra-opts", "sect1@./config-opts.ini",
-                                                         "--arg2",    (char *)NULL};
+                char *argv_test[] = {"prog_name",
+                                                         "--arg1=val1",
+                                                         "--extra-opts=@./config-opts.ini",
+                                                         "--extra-opts",
+                                                         "sect1@./config-opts.ini",
+                                                         "--arg2",
+                                                         (char *)NULL};
                 argc_test = 6;
-                char *argv_known[] = {"prog_name",   "--foo=Bar", "--this=Your Mother!", "--blank", "--one=two",
-                                                          "--arg1=val1", "--arg2",    (char *)NULL};
+                char *argv_known[] = {"prog_name", "--foo=Bar", "--this=Your Mother!",
+                                                          "--blank",   "--one=two", "--arg1=val1",
+                                                          "--arg2",    (char *)NULL};
                 argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 7, argv_known), "twice extra opts using two sections");
                 my_free(&argc_test, argv_new, argv_test);
diff --git a/lib/tests/test_opts2.c b/lib/tests/test_opts2.c
index 23496617..3dd1b039 100644
--- a/lib/tests/test_opts2.c
+++ b/lib/tests/test_opts2.c
@@ -23,36 +23,39 @@
 
 void my_free(int *argc, char **newargv, char **argv) {
         /* Free stuff (and print while we're at it) */
-        int i, freeflag = 1;
+        bool freeflag = true;
+
         printf("    Arg(%i): ", *argc + 1);
         printf("'%s' ", newargv[0]);
-        for (i = 1; i < *argc; i++) {
+        for (int i = 1; i < *argc; i++) {
                 printf("'%s' ", newargv[i]);
                 /* Stop freeing when we get to the start of the original array */
                 if (freeflag) {
-                        if (newargv[i] == argv[1])
-                                freeflag = 0;
-                        else
+                        if (newargv[i] == argv[1]) {
+                                freeflag = false;
+                        } else {
                                 free(newargv[i]);
+                        }
                 }
         }
         printf("\n");
         /* Free only if it's a different array */
-        if (newargv != argv)
+        if (newargv != argv) {
                 free(newargv);
+        }
         *argc = 0;
 }
 
 int array_diff(int i1, char **a1, int i2, char **a2) {
-        int i;
-
         if (i1 != i2) {
                 printf("    Argument count doesn't match!\n");
                 return 0;
         }
-        for (i = 0; i <= i1; i++) {
-                if (a1[i] == NULL && a2[i] == NULL)
+
+        for (int i = 0; i <= i1; i++) {
+                if (a1[i] == NULL && a2[i] == NULL) {
                         continue;
+                }
                 if (a1[i] == NULL || a2[i] == NULL) {
                         printf("    Argument # %i null in one array!\n", i);
                         return 0;
@@ -66,11 +69,10 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
 }
 
 int main(int argc, char **argv) {
-        char **argv_new = NULL;
-        int i, argc_test;
-
         plan_tests(5);
 
+        char **argv_new = NULL;
+        int argc_test;
         {
                 char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "--arg3", "val2", (char *)NULL};
                 argc_test = 5;
@@ -90,7 +92,8 @@ int main(int argc, char **argv) {
         }
 
         {
-                char *argv_test[] = {"prog_name", "arg1", "--extra-opts=section1", "--arg3", "val2", (char *)NULL};
+                char *argv_test[] = {"prog_name", "arg1", "--extra-opts=section1",
+                                                         "--arg3",    "val2", (char *)NULL};
                 argc_test = 5;
                 char *argv_known[] = {"prog_name", "--foobar=baz", "arg1", "--arg3", "val2", (char *)NULL};
                 argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
@@ -108,30 +111,39 @@ int main(int argc, char **argv) {
         }
 
         {
-                char *argv_test[] = {"check_tcp", "--extra-opts", "--extra-opts=tcp_long_lines", (char *)NULL};
+                char *argv_test[] = {"check_tcp", "--extra-opts", "--extra-opts=tcp_long_lines",
+                                                         (char *)NULL};
                 argc_test = 3;
-                char *argv_known[] = {
-                        "check_tcp",
-                        "--timeout=10",
-                        "--escape",
-                        "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
-                        "yadda Foo bar BAZ yadda "
-                        "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
-                        "yadda Foo bar BAZ "
-                        "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
-                        "yadda yadda Foo bar "
-                        "BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda",
-                        "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
-                        "yadda Foo bar BAZ yadda "
-                        "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
-                        "yadda Foo bar BAZ "
-                        "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
-                        "yadda yadda Foo bar "
-                        "BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
-                        "yadda yadda yadda Foo "
-                        "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda",
-                        "--jail",
-                        (char *)NULL};
+                char *argv_known[] = {"check_tcp",
+                                                          "--timeout=10",
+                                                          "--escape",
+                                                          "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda "
+                                                          "Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar "
+                                                          "BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda",
+                                                          "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda "
+                                                          "yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda "
+                                                          "yadda yadda Foo bar "
+                                                          "BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo "
+                                                          "bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ "
+                                                          "yadda yadda yadda Foo bar BAZ yadda yadda yadda",
+                                                          "--jail",
+                                                          (char *)NULL};
                 argv_new = np_extra_opts(&argc_test, argv_test, "check_tcp");
                 ok(array_diff(argc_test, argv_new, 6, argv_known), "Long lines test");
                 my_free(&argc_test, argv_new, argv_test);
diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c
index 1b3003e9..37c818c9 100644
--- a/lib/tests/test_tcp.c
+++ b/lib/tests/test_tcp.c
@@ -21,30 +21,38 @@
 #include "tap.h"
 
 int main(void) {
-        char **server_expect;
-        int server_expect_count = 3;
-
         plan_tests(9);
 
+        char **server_expect;
+        const int server_expect_count = 3;
         server_expect = malloc(sizeof(char *) * server_expect_count);
 
         server_expect[0] = strdup("AA");
         server_expect[1] = strdup("bb");
         server_expect[2] = strdup("CC");
 
-        ok(np_expect_match("AA bb CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_SUCCESS,
+        ok(np_expect_match("AA bb CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) ==
+                   NP_MATCH_SUCCESS,
            "Test matching any string at the beginning (first expect string)");
-        ok(np_expect_match("bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_SUCCESS,
+        ok(np_expect_match("bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) ==
+                   NP_MATCH_SUCCESS,
            "Test matching any string at the beginning (second expect string)");
         ok(np_expect_match("b", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_RETRY,
            "Test matching any string at the beginning (substring match)");
-        ok(np_expect_match("XX bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_FAILURE,
+        ok(np_expect_match("XX bb AA CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) ==
+                   NP_MATCH_FAILURE,
            "Test with strings not matching at the beginning");
-        ok(np_expect_match("XX CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) == NP_MATCH_FAILURE, "Test matching any string");
-        ok(np_expect_match("XX", server_expect, server_expect_count, 0) == NP_MATCH_RETRY, "Test not matching any string");
-        ok(np_expect_match("XX AA bb CC XX", server_expect, server_expect_count, NP_MATCH_ALL) == NP_MATCH_SUCCESS,
+        ok(np_expect_match("XX CC XX", server_expect, server_expect_count, NP_MATCH_EXACT) ==
+                   NP_MATCH_FAILURE,
+           "Test matching any string");
+        ok(np_expect_match("XX", server_expect, server_expect_count, 0) == NP_MATCH_RETRY,
+           "Test not matching any string");
+        ok(np_expect_match("XX AA bb CC XX", server_expect, server_expect_count, NP_MATCH_ALL) ==
+                   NP_MATCH_SUCCESS,
            "Test matching all strings");
-        ok(np_expect_match("XX bb CC XX", server_expect, server_expect_count, NP_MATCH_ALL) == NP_MATCH_RETRY, "Test not matching all strings");
+        ok(np_expect_match("XX bb CC XX", server_expect, server_expect_count, NP_MATCH_ALL) ==
+                   NP_MATCH_RETRY,
+           "Test not matching all strings");
         ok(np_expect_match("XX XX", server_expect, server_expect_count, NP_MATCH_ALL) == NP_MATCH_RETRY,
            "Test not matching any string (testing all)");
 
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index c3150f00..8040dec8 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -28,17 +28,7 @@
 #include "utils_base.c"
 
 int main(int argc, char **argv) {
-        char state_path[1024];
-        range *range;
-        double temp;
-        thresholds *thresholds = NULL;
-        int i, rc;
-        char *temp_string;
-        state_key *temp_state_key = NULL;
-        state_data *temp_state_data;
-        time_t current_time;
-
-        plan_tests(185);
+        plan_tests(155);
 
         ok(this_monitoring_plugin == NULL, "monitoring_plugin not initialised");
 
@@ -57,7 +47,7 @@ int main(int argc, char **argv) {
 
         np_set_args(argc, argv);
 
-        range = parse_range_string("6");
+        range *range = parse_range_string("6");
         ok(range != NULL, "'6' is valid range");
         ok(range->start == 0, "Start correct");
         ok(range->start_infinity == false, "Not using negative infinity");
@@ -97,7 +87,7 @@ int main(int argc, char **argv) {
         free(range);
 
         range = parse_range_string("12345678901234567890:");
-        temp = atof("12345678901234567890"); /* Can't just use this because number too large */
+        double temp = atof("12345678901234567890"); /* Can't just use this because number too large */
         ok(range != NULL, "'12345678901234567890:' is valid range");
         ok(range->start == temp, "Start correct");
         ok(range->start_infinity == false, "Not using negative infinity");
@@ -158,32 +148,34 @@ int main(int argc, char **argv) {
         range = parse_range_string("2:1");
         ok(range == NULL, "'2:1' rejected");
 
-        rc = _set_thresholds(&thresholds, NULL, NULL);
-        ok(rc == 0, "Thresholds (NULL, NULL) set");
+        thresholds *thresholds = NULL;
+        int returnCode;
+        returnCode = _set_thresholds(&thresholds, NULL, NULL);
+        ok(returnCode == 0, "Thresholds (NULL, NULL) set");
         ok(thresholds->warning == NULL, "Warning not set");
         ok(thresholds->critical == NULL, "Critical not set");
 
-        rc = _set_thresholds(&thresholds, NULL, "80");
-        ok(rc == 0, "Thresholds (NULL, '80') set");
+        returnCode = _set_thresholds(&thresholds, NULL, "80");
+        ok(returnCode == 0, "Thresholds (NULL, '80') set");
         ok(thresholds->warning == NULL, "Warning not set");
         ok(thresholds->critical->end == 80, "Critical set correctly");
 
-        rc = _set_thresholds(&thresholds, "5:33", NULL);
-        ok(rc == 0, "Thresholds ('5:33', NULL) set");
+        returnCode = _set_thresholds(&thresholds, "5:33", NULL);
+        ok(returnCode == 0, "Thresholds ('5:33', NULL) set");
         ok(thresholds->warning->start == 5, "Warning start set");
         ok(thresholds->warning->end == 33, "Warning end set");
         ok(thresholds->critical == NULL, "Critical not set");
 
-        rc = _set_thresholds(&thresholds, "30", "60");
-        ok(rc == 0, "Thresholds ('30', '60') set");
+        returnCode = _set_thresholds(&thresholds, "30", "60");
+        ok(returnCode == 0, "Thresholds ('30', '60') set");
         ok(thresholds->warning->end == 30, "Warning set correctly");
         ok(thresholds->critical->end == 60, "Critical set correctly");
         ok(get_status(15.3, thresholds) == STATE_OK, "15.3 - ok");
         ok(get_status(30.0001, thresholds) == STATE_WARNING, "30.0001 - warning");
         ok(get_status(69, thresholds) == STATE_CRITICAL, "69 - critical");
 
-        rc = _set_thresholds(&thresholds, "-10:-2", "-30:20");
-        ok(rc == 0, "Thresholds ('-30:20', '-10:-2') set");
+        returnCode = _set_thresholds(&thresholds, "-10:-2", "-30:20");
+        ok(returnCode == 0, "Thresholds ('-30:20', '-10:-2') set");
         ok(thresholds->warning->start == -10, "Warning start set correctly");
         ok(thresholds->warning->end == -2, "Warning end set correctly");
         ok(thresholds->critical->start == -30, "Critical start set correctly");
@@ -304,164 +296,28 @@ int main(int argc, char **argv) {
         test = np_extract_ntpvar("", "foo");
         ok(!test, "Empty string return NULL");
 
-        /* This is the result of running ./test_utils */
-        temp_string = (char *)_np_state_generate_key();
-        ok(!strcmp(temp_string, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"), "Got hash with exe and no parameters") ||
-                diag("You are probably running in wrong directory. Must run as ./test_utils");
-
-        this_monitoring_plugin->argc = 4;
-        this_monitoring_plugin->argv[0] = "./test_utils";
-        this_monitoring_plugin->argv[1] = "here";
-        this_monitoring_plugin->argv[2] = "--and";
-        this_monitoring_plugin->argv[3] = "now";
-        temp_string = (char *)_np_state_generate_key();
-        ok(!strcmp(temp_string, "bd72da9f78ff1419fad921ea5e43ce56508aef6c"), "Got based on expected argv");
-
-        unsetenv("MP_STATE_PATH");
-        temp_string = (char *)_np_state_calculate_location_prefix();
-        ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory");
-
-        setenv("MP_STATE_PATH", "", 1);
-        temp_string = (char *)_np_state_calculate_location_prefix();
-        ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string");
-
-        setenv("MP_STATE_PATH", "/usr/local/nagios/var", 1);
-        temp_string = (char *)_np_state_calculate_location_prefix();
-        ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory");
-
-        ok(temp_state_key == NULL, "temp_state_key initially empty");
-
-        this_monitoring_plugin->argc = 1;
-        this_monitoring_plugin->argv[0] = "./test_utils";
-        np_enable_state(NULL, 51);
-        temp_state_key = this_monitoring_plugin->state;
-        ok(!strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name");
-        ok(!strcmp(temp_state_key->name, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"), "Got generated filename");
-
-        np_enable_state("allowedchars_in_keyname", 77);
-        temp_state_key = this_monitoring_plugin->state;
-        sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/allowedchars_in_keyname", (unsigned long)geteuid());
-        ok(!strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name");
-        ok(!strcmp(temp_state_key->name, "allowedchars_in_keyname"), "Got key name with valid chars");
-        ok(!strcmp(temp_state_key->_filename, state_path), "Got internal filename");
-
-        /* Don't do this test just yet. Will die */
-        /*
-        np_enable_state("bad^chars$in@here", 77);
-        temp_state_key = this_monitoring_plugin->state;
-        ok( !strcmp(temp_state_key->name, "bad_chars_in_here"), "Got key name with bad chars replaced" );
-        */
-
-        np_enable_state("funnykeyname", 54);
-        temp_state_key = this_monitoring_plugin->state;
-        sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/funnykeyname", (unsigned long)geteuid());
-        ok(!strcmp(temp_state_key->plugin_name, "check_test"), "Got plugin name");
-        ok(!strcmp(temp_state_key->name, "funnykeyname"), "Got key name");
-
-        ok(!strcmp(temp_state_key->_filename, state_path), "Got internal filename");
-        ok(temp_state_key->data_version == 54, "Version set");
-
-        temp_state_data = np_state_read();
-        ok(temp_state_data == NULL, "Got no state data as file does not exist");
-
-        /*
-                temp_fp = fopen("var/statefile", "r");
-                if (temp_fp==NULL)
-                        printf("Error opening. errno=%d\n", errno);
-                printf("temp_fp=%s\n", temp_fp);
-                ok( _np_state_read_file(temp_fp) == true, "Can read state file" );
-                fclose(temp_fp);
-        */
-
-        temp_state_key->_filename = "var/statefile";
-        temp_state_data = np_state_read();
-        ok(this_monitoring_plugin->state->state_data != NULL, "Got state data now") ||
-                diag("Are you running in right directory? Will get coredump next if not");
-        ok(this_monitoring_plugin->state->state_data->time == 1234567890, "Got time");
-        ok(!strcmp((char *)this_monitoring_plugin->state->state_data->data, "String to read"), "Data as expected");
-
-        temp_state_key->data_version = 53;
-        temp_state_data = np_state_read();
-        ok(temp_state_data == NULL, "Older data version gives NULL");
-        temp_state_key->data_version = 54;
-
-        temp_state_key->_filename = "var/nonexistent";
-        temp_state_data = np_state_read();
-        ok(temp_state_data == NULL, "Missing file gives NULL");
-        ok(this_monitoring_plugin->state->state_data == NULL, "No state information");
-
-        temp_state_key->_filename = "var/oldformat";
-        temp_state_data = np_state_read();
-        ok(temp_state_data == NULL, "Old file format gives NULL");
-
-        temp_state_key->_filename = "var/baddate";
-        temp_state_data = np_state_read();
-        ok(temp_state_data == NULL, "Bad date gives NULL");
-
-        temp_state_key->_filename = "var/missingdataline";
-        temp_state_data = np_state_read();
-        ok(temp_state_data == NULL, "Missing data line gives NULL");
-
-        unlink("var/generated");
-        temp_state_key->_filename = "var/generated";
-        current_time = 1234567890;
-        np_state_write_string(current_time, "String to read");
-        ok(system("cmp var/generated var/statefile") == 0, "Generated file same as expected");
-
-        unlink("var/generated_directory/statefile");
-        unlink("var/generated_directory");
-        temp_state_key->_filename = "var/generated_directory/statefile";
-        current_time = 1234567890;
-        np_state_write_string(current_time, "String to read");
-        ok(system("cmp var/generated_directory/statefile var/statefile") == 0, "Have created directory");
-
-        /* This test to check cannot write to dir - can't automate yet */
-        /*
-        unlink("var/generated_bad_dir");
-        mkdir("var/generated_bad_dir", S_IRUSR);
-        np_state_write_string(current_time, "String to read");
-        */
-
-        temp_state_key->_filename = "var/generated";
-        time(&current_time);
-        np_state_write_string(0, "String to read");
-        temp_state_data = np_state_read();
-        /* Check time is set to current_time */
-        ok(system("cmp var/generated var/statefile > /dev/null") != 0, "Generated file should be different this time");
-        ok(this_monitoring_plugin->state->state_data->time - current_time <= 1, "Has time generated from current time");
-
-        /* Don't know how to automatically test this. Need to be able to redefine die and catch the error */
-        /*
-        temp_state_key->_filename="/dev/do/not/expect/to/be/able/to/write";
-        np_state_write_string(0, "Bad file");
-        */
-
-        np_cleanup();
-
-        ok(this_monitoring_plugin == NULL, "Free'd this_monitoring_plugin");
-
         ok(mp_suid() == false, "Test aren't suid");
 
         /* base states with random case */
         char *states[] = {"Ok", "wArnINg", "cRiTIcaL", "UnKNoWN", NULL};
 
-        for (i = 0; states[i] != NULL; i++) {
-                /* out of the random case states, create the lower and upper versions + numeric string one */
+        for (int i = 0; states[i] != NULL; i++) {
+                /* out of the random case states, create the lower and upper versions + numeric string one
+                 */
                 char *statelower = strdup(states[i]);
                 char *stateupper = strdup(states[i]);
                 char statenum[2];
-                char *temp_ptr;
-                for (temp_ptr = statelower; *temp_ptr; temp_ptr++) {
-                        *temp_ptr = tolower(*temp_ptr);
+                for (char *temp_ptr = statelower; *temp_ptr; temp_ptr++) {
+                        *temp_ptr = (char)tolower(*temp_ptr);
                 }
-                for (temp_ptr = stateupper; *temp_ptr; temp_ptr++) {
-                        *temp_ptr = toupper(*temp_ptr);
+                for (char *temp_ptr = stateupper; *temp_ptr; temp_ptr++) {
+                        *temp_ptr = (char)toupper(*temp_ptr);
                 }
                 snprintf(statenum, 2, "%i", i);
 
                 /* Base test names, we'll append the state string */
                 char testname[64] = "Translate state string: ";
-                int tlen = strlen(testname);
+                size_t tlen = strlen(testname);
 
                 strcpy(testname + tlen, states[i]);
                 ok(i == mp_translate_state(states[i]), testname);
diff --git a/lib/thresholds.c b/lib/thresholds.c
index ddefae37..de2b9315 100644
--- a/lib/thresholds.c
+++ b/lib/thresholds.c
@@ -51,9 +51,21 @@ mp_state_enum mp_get_pd_status(mp_perfdata perfdata) {
         }
         if (perfdata.warn_present) {
                 if (mp_check_range(perfdata.value, perfdata.warn)) {
-                        return STATE_CRITICAL;
+                        return STATE_WARNING;
                 }
         }
 
         return STATE_OK;
 }
+
+mp_thresholds mp_thresholds_set_warn(mp_thresholds thlds, mp_range warn) {
+        thlds.warning = warn;
+        thlds.warning_is_set = true;
+        return thlds;
+}
+
+mp_thresholds mp_thresholds_set_crit(mp_thresholds thlds, mp_range crit) {
+        thlds.critical = crit;
+        thlds.critical_is_set = true;
+        return thlds;
+}
diff --git a/lib/thresholds.h b/lib/thresholds.h
index 4e7defee..f8647681 100644
--- a/lib/thresholds.h
+++ b/lib/thresholds.h
@@ -6,12 +6,12 @@
 /*
  * Old threshold type using the old range type
  */
-typedef struct thresholds_struct {
+typedef struct {
         range *warning;
         range *critical;
 } thresholds;
 
-typedef struct mp_thresholds_struct {
+typedef struct {
         bool warning_is_set;
         mp_range warning;
         bool critical_is_set;
@@ -24,5 +24,8 @@ mp_perfdata mp_pd_set_thresholds(mp_perfdata /* pd */, mp_thresholds /* th */);
 
 mp_state_enum mp_get_pd_status(mp_perfdata /* pd */);
 
+mp_thresholds mp_thresholds_set_warn(mp_thresholds thlds, mp_range warn);
+mp_thresholds mp_thresholds_set_crit(mp_thresholds thlds, mp_range crit);
+
 char *fmt_threshold_warning(thresholds th);
 char *fmt_threshold_critical(thresholds th);
diff --git a/lib/utils_base.c b/lib/utils_base.c
index ff9540c7..28e6dc47 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -25,6 +25,7 @@
  *****************************************************************************/
 
 #include "../plugins/common.h"
+#include "states.h"
 #include <stdarg.h>
 #include "utils_base.h"
 #include <ctype.h>
@@ -33,20 +34,20 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#define np_free(ptr)                                                                                                                       \
-        {                                                                                                                                      \
-                if (ptr) {                                                                                                                         \
-                        free(ptr);                                                                                                                     \
-                        ptr = NULL;                                                                                                                    \
-                }                                                                                                                                  \
+#define np_free(ptr)                                                                               \
+        {                                                                                              \
+                if (ptr) {                                                                                 \
+                        free(ptr);                                                                             \
+                        ptr = NULL;                                                                            \
+                }                                                                                          \
         }
 
 monitoring_plugin *this_monitoring_plugin = NULL;
 
-int timeout_state = STATE_CRITICAL;
+mp_state_enum timeout_state = STATE_CRITICAL;
 unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
 
-bool _np_state_read_file(FILE *);
+bool _np_state_read_file(FILE *state_file);
 
 void np_init(char *plugin_name, int argc, char **argv) {
         if (this_monitoring_plugin == NULL) {
@@ -74,14 +75,6 @@ void np_set_args(int argc, char **argv) {
 
 void np_cleanup(void) {
         if (this_monitoring_plugin != NULL) {
-                if (this_monitoring_plugin->state != NULL) {
-                        if (this_monitoring_plugin->state->state_data) {
-                                np_free(this_monitoring_plugin->state->state_data->data);
-                                np_free(this_monitoring_plugin->state->state_data);
-                        }
-                        np_free(this_monitoring_plugin->state->name);
-                        np_free(this_monitoring_plugin->state);
-                }
                 np_free(this_monitoring_plugin->plugin_name);
                 np_free(this_monitoring_plugin);
         }
@@ -153,7 +146,8 @@ range *parse_range_string(char *str) {
                 set_range_end(temp_range, end);
         }
 
-        if (temp_range->start_infinity == true || temp_range->end_infinity == true || temp_range->start <= temp_range->end) {
+        if (temp_range->start_infinity || temp_range->end_infinity ||
+                temp_range->start <= temp_range->end) {
                 return temp_range;
         }
         free(temp_range);
@@ -205,12 +199,14 @@ void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
                 printf("Threshold not set");
         } else {
                 if (my_threshold->warning) {
-                        printf("Warning: start=%g end=%g; ", my_threshold->warning->start, my_threshold->warning->end);
+                        printf("Warning: start=%g end=%g; ", my_threshold->warning->start,
+                                   my_threshold->warning->end);
                 } else {
                         printf("Warning not set; ");
                 }
                 if (my_threshold->critical) {
-                        printf("Critical: start=%g end=%g", my_threshold->critical->start, my_threshold->critical->end);
+                        printf("Critical: start=%g end=%g", my_threshold->critical->start,
+                                   my_threshold->critical->end);
                 } else {
                         printf("Critical not set");
                 }
@@ -222,36 +218,26 @@ void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
 bool mp_check_range(const mp_perfdata_value value, const mp_range my_range) {
         bool is_inside = false;
 
-        if (my_range.end_infinity == false && my_range.start_infinity == false) {
+        if (!my_range.end_infinity && !my_range.start_infinity) {
                 // range:  .........|---inside---|...........
                 // value
-                if ((cmp_perfdata_value(my_range.start, value) < 1) && (cmp_perfdata_value(value, my_range.end) <= 0)) {
-                        is_inside = true;
-                } else {
-                        is_inside = false;
-                }
-        } else if (my_range.start_infinity == false && my_range.end_infinity == true) {
+                is_inside = ((cmp_perfdata_value(value, my_range.start) >= 0) &&
+                                         (cmp_perfdata_value(value, my_range.end) <= 0));
+        } else if (!my_range.start_infinity && my_range.end_infinity) {
                 // range:  .........|---inside---------
                 // value
-                if (cmp_perfdata_value(my_range.start, value) < 0) {
-                        is_inside = true;
-                } else {
-                        is_inside = false;
-                }
-        } else if (my_range.start_infinity == true && my_range.end_infinity == false) {
+                is_inside = (cmp_perfdata_value(value, my_range.start) >= 0);
+        } else if (my_range.start_infinity && !my_range.end_infinity) {
                 // range:  -inside--------|....................
                 // value
-                if (cmp_perfdata_value(value, my_range.end) == -1) {
-                        is_inside = true;
-                } else {
-                        is_inside = false;
-                }
+                is_inside = (cmp_perfdata_value(value, my_range.end) == -1);
         } else {
                 // range from -inf to inf, so always inside
                 is_inside = true;
         }
 
-        if ((is_inside && my_range.alert_on_inside_range == INSIDE) || (!is_inside && my_range.alert_on_inside_range == OUTSIDE)) {
+        if ((is_inside && my_range.alert_on_inside_range == INSIDE) ||
+                (!is_inside && my_range.alert_on_inside_range == OUTSIDE)) {
                 return true;
         }
 
@@ -268,21 +254,21 @@ bool check_range(double value, range *my_range) {
                 yes = false;
         }
 
-        if (my_range->end_infinity == false && my_range->start_infinity == false) {
+        if (!my_range->end_infinity && !my_range->start_infinity) {
                 if ((my_range->start <= value) && (value <= my_range->end)) {
                         return no;
                 }
                 return yes;
         }
 
-        if (my_range->start_infinity == false && my_range->end_infinity == true) {
+        if (!my_range->start_infinity && my_range->end_infinity) {
                 if (my_range->start <= value) {
                         return no;
                 }
                 return yes;
         }
 
-        if (my_range->start_infinity == true && my_range->end_infinity == false) {
+        if (my_range->start_infinity && !my_range->end_infinity) {
                 if (value <= my_range->end) {
                         return no;
                 }
@@ -292,14 +278,14 @@ bool check_range(double value, range *my_range) {
 }
 
 /* Returns status */
-int get_status(double value, thresholds *my_thresholds) {
+mp_state_enum get_status(double value, thresholds *my_thresholds) {
         if (my_thresholds->critical != NULL) {
-                if (check_range(value, my_thresholds->critical) == true) {
+                if (check_range(value, my_thresholds->critical)) {
                         return STATE_CRITICAL;
                 }
         }
         if (my_thresholds->warning != NULL) {
-                if (check_range(value, my_thresholds->warning) == true) {
+                if (check_range(value, my_thresholds->warning)) {
                         return STATE_WARNING;
                 }
         }
@@ -308,32 +294,31 @@ int get_status(double value, thresholds *my_thresholds) {
 
 char *np_escaped_string(const char *string) {
         char *data;
-        int i;
-        int j = 0;
+        int write_index = 0;
         data = strdup(string);
-        for (i = 0; data[i]; i++) {
+        for (int i = 0; data[i]; i++) {
                 if (data[i] == '\\') {
                         switch (data[++i]) {
                         case 'n':
-                                data[j++] = '\n';
+                                data[write_index++] = '\n';
                                 break;
                         case 'r':
-                                data[j++] = '\r';
+                                data[write_index++] = '\r';
                                 break;
                         case 't':
-                                data[j++] = '\t';
+                                data[write_index++] = '\t';
                                 break;
                         case '\\':
-                                data[j++] = '\\';
+                                data[write_index++] = '\\';
                                 break;
                         default:
-                                data[j++] = data[i];
+                                data[write_index++] = data[i];
                         }
                 } else {
-                        data[j++] = data[i];
+                        data[write_index++] = data[i];
                 }
         }
-        data[j] = '\0';
+        data[write_index] = '\0';
         return data;
 }
 
@@ -348,33 +333,35 @@ int np_check_if_root(void) { return (geteuid() == 0); }
 char *np_extract_value(const char *varlist, const char *name, char sep) {
         char *tmp = NULL;
         char *value = NULL;
-        int i;
 
-        while (1) {
+        while (true) {
                 /* Strip any leading space */
-                for (; isspace(varlist[0]); varlist++)
+                for (; isspace(varlist[0]); varlist++) {
                         ;
+                }
 
                 if (strncmp(name, varlist, strlen(name)) == 0) {
                         varlist += strlen(name);
                         /* strip trailing spaces */
-                        for (; isspace(varlist[0]); varlist++)
+                        for (; isspace(varlist[0]); varlist++) {
                                 ;
+                        }
 
                         if (varlist[0] == '=') {
                                 /* We matched the key, go past the = sign */
                                 varlist++;
                                 /* strip leading spaces */
-                                for (; isspace(varlist[0]); varlist++)
+                                for (; isspace(varlist[0]); varlist++) {
                                         ;
+                                }
 
                                 if ((tmp = index(varlist, sep))) {
                                         /* Value is delimited by a comma */
                                         if (tmp - varlist == 0) {
                                                 continue;
                                         }
-                                        value = (char *)calloc(1, tmp - varlist + 1);
-                                        strncpy(value, varlist, tmp - varlist);
+                                        value = (char *)calloc(1, (unsigned long)(tmp - varlist + 1));
+                                        strncpy(value, varlist, (unsigned long)(tmp - varlist));
                                         value[tmp - varlist] = '\0';
                                 } else {
                                         /* Value is delimited by a \0 */
@@ -399,7 +386,7 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
 
         /* Clean-up trailing spaces/newlines */
         if (value) {
-                for (i = strlen(value) - 1; isspace(value[i]); i--) {
+                for (unsigned long i = strlen(value) - 1; isspace(value[i]); i--) {
                         value[i] = '\0';
                 }
         }
@@ -407,7 +394,7 @@ char *np_extract_value(const char *varlist, const char *name, char sep) {
         return value;
 }
 
-const char *state_text(int result) {
+const char *state_text(mp_state_enum result) {
         switch (result) {
         case STATE_OK:
                 return "OK";
@@ -441,349 +428,3 @@ int mp_translate_state(char *state_text) {
         }
         return ERROR;
 }
-
-/*
- * Returns a string to use as a keyname, based on an md5 hash of argv, thus
- * hopefully a unique key per service/plugin invocation. Use the extra-opts
- * parse of argv, so that uniqueness in parameters are reflected there.
- */
-char *_np_state_generate_key(void) {
-        int i;
-        char **argv = this_monitoring_plugin->argv;
-        char keyname[41];
-        char *p = NULL;
-
-        unsigned char result[256];
-
-#ifdef USE_OPENSSL
-        /*
-         * This code path is chosen if openssl is available (which should be the most common
-         * scenario). Alternatively, the gnulib implementation/
-         *
-         */
-        EVP_MD_CTX *ctx = EVP_MD_CTX_new();
-
-        EVP_DigestInit(ctx, EVP_sha256());
-
-        for (i = 0; i < this_monitoring_plugin->argc; i++) {
-                EVP_DigestUpdate(ctx, argv[i], strlen(argv[i]));
-        }
-
-        EVP_DigestFinal(ctx, result, NULL);
-#else
-
-        struct sha256_ctx ctx;
-
-        for (i = 0; i < this_monitoring_plugin->argc; i++) {
-                sha256_process_bytes(argv[i], strlen(argv[i]), &ctx);
-        }
-
-        sha256_finish_ctx(&ctx, result);
-#endif // FOUNDOPENSSL
-
-        for (i = 0; i < 20; ++i) {
-                sprintf(&keyname[2 * i], "%02x", result[i]);
-        }
-
-        keyname[40] = '\0';
-
-        p = strdup(keyname);
-        if (p == NULL) {
-                die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-        }
-        return p;
-}
-
-void _cleanup_state_data(void) {
-        if (this_monitoring_plugin->state->state_data != NULL) {
-                np_free(this_monitoring_plugin->state->state_data->data);
-                np_free(this_monitoring_plugin->state->state_data);
-        }
-}
-
-/*
- * Internal function. Returns either:
- *   envvar NAGIOS_PLUGIN_STATE_DIRECTORY
- *   statically compiled shared state directory
- */
-char *_np_state_calculate_location_prefix(void) {
-        char *env_dir;
-
-        /* Do not allow passing MP_STATE_PATH in setuid plugins
-         * for security reasons */
-        if (!mp_suid()) {
-                env_dir = getenv("MP_STATE_PATH");
-                if (env_dir && env_dir[0] != '\0') {
-                        return env_dir;
-                }
-                /* This is the former ENV, for backward-compatibility */
-                env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
-                if (env_dir && env_dir[0] != '\0') {
-                        return env_dir;
-                }
-        }
-
-        return NP_STATE_DIR_PREFIX;
-}
-
-/*
- * Initiatializer for state routines.
- * Sets variables. Generates filename. Returns np_state_key. die with
- * UNKNOWN if exception
- */
-void np_enable_state(char *keyname, int expected_data_version) {
-        state_key *this_state = NULL;
-        char *temp_filename = NULL;
-        char *temp_keyname = NULL;
-        char *p = NULL;
-        int ret;
-
-        if (this_monitoring_plugin == NULL) {
-                die(STATE_UNKNOWN, _("This requires np_init to be called"));
-        }
-
-        this_state = (state_key *)calloc(1, sizeof(state_key));
-        if (this_state == NULL) {
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
-        }
-
-        if (keyname == NULL) {
-                temp_keyname = _np_state_generate_key();
-        } else {
-                temp_keyname = strdup(keyname);
-                if (temp_keyname == NULL) {
-                        die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-                }
-        }
-        /* Die if invalid characters used for keyname */
-        p = temp_keyname;
-        while (*p != '\0') {
-                if (!(isalnum(*p) || *p == '_')) {
-                        die(STATE_UNKNOWN, _("Invalid character for keyname - only alphanumerics or '_'"));
-                }
-                p++;
-        }
-        this_state->name = temp_keyname;
-        this_state->plugin_name = this_monitoring_plugin->plugin_name;
-        this_state->data_version = expected_data_version;
-        this_state->state_data = NULL;
-
-        /* Calculate filename */
-        ret = asprintf(&temp_filename, "%s/%lu/%s/%s", _np_state_calculate_location_prefix(), (unsigned long)geteuid(),
-                                   this_monitoring_plugin->plugin_name, this_state->name);
-        if (ret < 0) {
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
-        }
-
-        this_state->_filename = temp_filename;
-
-        this_monitoring_plugin->state = this_state;
-}
-
-/*
- * Will return NULL if no data is available (first run). If key currently
- * exists, read data. If state file format version is not expected, return
- * as if no data. Get state data version number and compares to expected.
- * If numerically lower, then return as no previous state. die with UNKNOWN
- * if exceptional error.
- */
-state_data *np_state_read(void) {
-        state_data *this_state_data = NULL;
-        FILE *statefile;
-        bool rc = false;
-
-        if (this_monitoring_plugin == NULL) {
-                die(STATE_UNKNOWN, _("This requires np_init to be called"));
-        }
-
-        /* Open file. If this fails, no previous state found */
-        statefile = fopen(this_monitoring_plugin->state->_filename, "r");
-        if (statefile != NULL) {
-
-                this_state_data = (state_data *)calloc(1, sizeof(state_data));
-                if (this_state_data == NULL) {
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
-                }
-
-                this_state_data->data = NULL;
-                this_monitoring_plugin->state->state_data = this_state_data;
-
-                rc = _np_state_read_file(statefile);
-
-                fclose(statefile);
-        }
-
-        if (!rc) {
-                _cleanup_state_data();
-        }
-
-        return this_monitoring_plugin->state->state_data;
-}
-
-/*
- * Read the state file
- */
-bool _np_state_read_file(FILE *f) {
-        bool status = false;
-        size_t pos;
-        char *line;
-        int i;
-        int failure = 0;
-        time_t current_time, data_time;
-        enum {
-                STATE_FILE_VERSION,
-                STATE_DATA_VERSION,
-                STATE_DATA_TIME,
-                STATE_DATA_TEXT,
-                STATE_DATA_END
-        } expected = STATE_FILE_VERSION;
-
-        time(&current_time);
-
-        /* Note: This introduces a limit of 1024 bytes in the string data */
-        line = (char *)calloc(1, 1024);
-        if (line == NULL) {
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
-        }
-
-        while (!failure && (fgets(line, 1024, f)) != NULL) {
-                pos = strlen(line);
-                if (line[pos - 1] == '\n') {
-                        line[pos - 1] = '\0';
-                }
-
-                if (line[0] == '#') {
-                        continue;
-                }
-
-                switch (expected) {
-                case STATE_FILE_VERSION:
-                        i = atoi(line);
-                        if (i != NP_STATE_FORMAT_VERSION) {
-                                failure++;
-                        } else {
-                                expected = STATE_DATA_VERSION;
-                        }
-                        break;
-                case STATE_DATA_VERSION:
-                        i = atoi(line);
-                        if (i != this_monitoring_plugin->state->data_version) {
-                                failure++;
-                        } else {
-                                expected = STATE_DATA_TIME;
-                        }
-                        break;
-                case STATE_DATA_TIME:
-                        /* If time > now, error */
-                        data_time = strtoul(line, NULL, 10);
-                        if (data_time > current_time) {
-                                failure++;
-                        } else {
-                                this_monitoring_plugin->state->state_data->time = data_time;
-                                expected = STATE_DATA_TEXT;
-                        }
-                        break;
-                case STATE_DATA_TEXT:
-                        this_monitoring_plugin->state->state_data->data = strdup(line);
-                        if (this_monitoring_plugin->state->state_data->data == NULL) {
-                                die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
-                        }
-                        expected = STATE_DATA_END;
-                        status = true;
-                        break;
-                case STATE_DATA_END:;
-                }
-        }
-
-        np_free(line);
-        return status;
-}
-
-/*
- * If time=NULL, use current time. Create state file, with state format
- * version, default text. Writes version, time, and data. Avoid locking
- * problems - use mv to write and then swap. Possible loss of state data if
- * two things writing to same key at same time.
- * Will die with UNKNOWN if errors
- */
-void np_state_write_string(time_t data_time, char *data_string) {
-        FILE *fp;
-        char *temp_file = NULL;
-        int fd = 0, result = 0;
-        time_t current_time;
-        char *directories = NULL;
-        char *p = NULL;
-
-        if (data_time == 0) {
-                time(&current_time);
-        } else {
-                current_time = data_time;
-        }
-
-        /* If file doesn't currently exist, create directories */
-        if (access(this_monitoring_plugin->state->_filename, F_OK) != 0) {
-                result = asprintf(&directories, "%s", this_monitoring_plugin->state->_filename);
-                if (result < 0) {
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
-                }
-
-                for (p = directories + 1; *p; p++) {
-                        if (*p == '/') {
-                                *p = '\0';
-                                if ((access(directories, F_OK) != 0) && (mkdir(directories, S_IRWXU) != 0)) {
-                                        /* Can't free this! Otherwise error message is wrong! */
-                                        /* np_free(directories); */
-                                        die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories);
-                                }
-                                *p = '/';
-                        }
-                }
-                np_free(directories);
-        }
-
-        result = asprintf(&temp_file, "%s.XXXXXX", this_monitoring_plugin->state->_filename);
-        if (result < 0) {
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
-        }
-
-        if ((fd = mkstemp(temp_file)) == -1) {
-                np_free(temp_file);
-                die(STATE_UNKNOWN, _("Cannot create temporary filename"));
-        }
-
-        fp = (FILE *)fdopen(fd, "w");
-        if (fp == NULL) {
-                close(fd);
-                unlink(temp_file);
-                np_free(temp_file);
-                die(STATE_UNKNOWN, _("Unable to open temporary state file"));
-        }
-
-        fprintf(fp, "# NP State file\n");
-        fprintf(fp, "%d\n", NP_STATE_FORMAT_VERSION);
-        fprintf(fp, "%d\n", this_monitoring_plugin->state->data_version);
-        fprintf(fp, "%lu\n", current_time);
-        fprintf(fp, "%s\n", data_string);
-
-        fchmod(fd, S_IRUSR | S_IWUSR | S_IRGRP);
-
-        fflush(fp);
-
-        result = fclose(fp);
-
-        fsync(fd);
-
-        if (result != 0) {
-                unlink(temp_file);
-                np_free(temp_file);
-                die(STATE_UNKNOWN, _("Error writing temp file"));
-        }
-
-        if (rename(temp_file, this_monitoring_plugin->state->_filename) != 0) {
-                unlink(temp_file);
-                np_free(temp_file);
-                die(STATE_UNKNOWN, _("Cannot rename state temp file"));
-        }
-
-        np_free(temp_file);
-}
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 123066f8..27884bf0 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -7,7 +7,7 @@
 
 #include "./perfdata.h"
 #include "./thresholds.h"
-
+#include "states.h"
 
 #ifndef USE_OPENSSL
 #       include "sha256.h"
@@ -26,25 +26,8 @@
 #define OUTSIDE 0
 #define INSIDE  1
 
-#define NP_STATE_FORMAT_VERSION 1
-
-typedef struct state_data_struct {
-        time_t time;
-        void *data;
-        int length; /* Of binary data */
-} state_data;
-
-typedef struct state_key_struct {
-        char *name;
-        char *plugin_name;
-        int data_version;
-        char *_filename;
-        state_data *state_data;
-} state_key;
-
 typedef struct np_struct {
         char *plugin_name;
-        state_key *state;
         int argc;
         char **argv;
 } monitoring_plugin;
@@ -55,10 +38,10 @@ void set_thresholds(thresholds **, char *, char *);
 void print_thresholds(const char *, thresholds *);
 bool check_range(double, range *);
 bool mp_check_range(mp_perfdata_value, mp_range);
-int get_status(double, thresholds *);
+mp_state_enum get_status(double, thresholds *);
 
 /* Handle timeouts */
-extern int timeout_state;
+extern mp_state_enum timeout_state;
 extern unsigned int timeout_interval;
 
 /* All possible characters in a threshold range */
@@ -100,13 +83,9 @@ char *np_extract_value(const char *, const char *, char);
  */
 int mp_translate_state(char *);
 
-void np_enable_state(char *, int);
-state_data *np_state_read(void);
-void np_state_write_string(time_t, char *);
-
 void np_init(char *, int argc, char **argv);
 void np_set_args(int argc, char **argv);
 void np_cleanup(void);
-const char *state_text(int);
+const char *state_text(mp_state_enum);
 
 #endif /* _UTILS_BASE_ */
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 18350ac0..23d42168 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -40,7 +40,6 @@
 
 /** includes **/
 #include "common.h"
-#include "utils.h"
 #include "utils_cmd.h"
 /* This variable must be global, since there's no way the caller
  * can forcibly slay a dead or ungainly running program otherwise.
@@ -57,21 +56,19 @@ static pid_t *_cmd_pids = NULL;
 #include "./maxfd.h"
 
 #include <fcntl.h>
+#include <stddef.h>
 
 #ifdef HAVE_SYS_WAIT_H
 #       include <sys/wait.h>
 #endif
 
-/* used in _cmd_open to pass the environment to commands */
-extern char **environ;
-
 /** macros **/
 #ifndef WEXITSTATUS
 #       define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
 #endif
 
 #ifndef WIFEXITED
-#       define WIFEXITED(stat_val) (((stat_val)&255) == 0)
+#       define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
 #endif
 
 /* 4.3BSD Reno <signal.h> doesn't define SIG_ERR */
@@ -80,14 +77,13 @@ extern char **environ;
 #endif
 
 /** prototypes **/
-static int _cmd_open(char *const *, int *, int *) __attribute__((__nonnull__(1, 2, 3)));
-
-static int _cmd_fetch_output(int, output *, int) __attribute__((__nonnull__(2)));
+static int _cmd_open(char *const *argv, int *pfd, int *pfderr)
+        __attribute__((__nonnull__(1, 2, 3)));
 
-static int _cmd_close(int);
+static int _cmd_fetch_output(int fileDescriptor, output *cmd_output, int flags)
+        __attribute__((__nonnull__(2)));
 
-/* prototype imported from utils.h */
-extern void die(int, const char *, ...) __attribute__((__noreturn__, __format__(__printf__, 2, 3)));
+static int _cmd_close(int fileDescriptor);
 
 /* this function is NOT async-safe. It is exported so multithreaded
  * plugins (or other apps) can call it prior to running any commands
@@ -103,26 +99,100 @@ void cmd_init(void) {
                 maxfd = MAXFD_LIMIT;
         }
 
-        if (!_cmd_pids)
+        if (!_cmd_pids) {
                 _cmd_pids = calloc(maxfd, sizeof(pid_t));
+        }
+}
+
+typedef struct {
+        int stdout_pipe_fd[2];
+        int stderr_pipe_fd[2];
+        int file_descriptor;
+        int error_code;
+} int_cmd_open_result;
+static int_cmd_open_result _cmd_open2(char *const *argv) {
+#ifdef RLIMIT_CORE
+        struct rlimit limit;
+#endif
+
+        if (!_cmd_pids) {
+                CMD_INIT;
+        }
+
+        setenv("LC_ALL", "C", 1);
+
+        int_cmd_open_result result = {
+                .error_code = 0,
+                .stdout_pipe_fd = {0, 0},
+                .stderr_pipe_fd = {0, 0},
+        };
+        pid_t pid;
+        if (pipe(result.stdout_pipe_fd) < 0 || pipe(result.stderr_pipe_fd) < 0 || (pid = fork()) < 0) {
+                result.error_code = -1;
+                return result; /* errno set by the failing function */
+        }
+
+        /* child runs exceve() and _exit. */
+        if (pid == 0) {
+#ifdef RLIMIT_CORE
+                /* the program we execve shouldn't leave core files */
+                getrlimit(RLIMIT_CORE, &limit);
+                limit.rlim_cur = 0;
+                setrlimit(RLIMIT_CORE, &limit);
+#endif
+                close(result.stdout_pipe_fd[0]);
+                if (result.stdout_pipe_fd[1] != STDOUT_FILENO) {
+                        dup2(result.stdout_pipe_fd[1], STDOUT_FILENO);
+                        close(result.stdout_pipe_fd[1]);
+                }
+                close(result.stderr_pipe_fd[0]);
+                if (result.stderr_pipe_fd[1] != STDERR_FILENO) {
+                        dup2(result.stderr_pipe_fd[1], STDERR_FILENO);
+                        close(result.stderr_pipe_fd[1]);
+                }
+
+                /* close all descriptors in _cmd_pids[]
+                 * This is executed in a separate address space (pure child),
+                 * so we don't have to worry about async safety */
+                long maxfd = mp_open_max();
+                for (int i = 0; i < maxfd; i++) {
+                        if (_cmd_pids[i] > 0) {
+                                close(i);
+                        }
+                }
+
+                execve(argv[0], argv, environ);
+                _exit(STATE_UNKNOWN);
+        }
+
+        /* parent picks up execution here */
+        /* close children descriptors in our address space */
+        close(result.stdout_pipe_fd[1]);
+        close(result.stderr_pipe_fd[1]);
+
+        /* tag our file's entry in the pid-list and return it */
+        _cmd_pids[result.stdout_pipe_fd[0]] = pid;
+
+        result.file_descriptor = result.stdout_pipe_fd[0];
+        return result;
 }
 
 /* Start running a command, array style */
 static int _cmd_open(char *const *argv, int *pfd, int *pfderr) {
-        pid_t pid;
 #ifdef RLIMIT_CORE
         struct rlimit limit;
 #endif
 
-        int i = 0;
-
-        if (!_cmd_pids)
+        if (!_cmd_pids) {
                 CMD_INIT;
+        }
 
         setenv("LC_ALL", "C", 1);
 
-        if (pipe(pfd) < 0 || pipe(pfderr) < 0 || (pid = fork()) < 0)
+        pid_t pid;
+        if (pipe(pfd) < 0 || pipe(pfderr) < 0 || (pid = fork()) < 0) {
                 return -1; /* errno set by the failing function */
+        }
 
         /* child runs exceve() and _exit. */
         if (pid == 0) {
@@ -147,9 +217,11 @@ static int _cmd_open(char *const *argv, int *pfd, int *pfderr) {
                  * This is executed in a separate address space (pure child),
                  * so we don't have to worry about async safety */
                 long maxfd = mp_open_max();
-                for (i = 0; i < maxfd; i++)
-                        if (_cmd_pids[i] > 0)
+                for (int i = 0; i < maxfd; i++) {
+                        if (_cmd_pids[i] > 0) {
                                 close(i);
+                        }
+                }
 
                 execve(argv[0], argv, environ);
                 _exit(STATE_UNKNOWN);
@@ -166,88 +238,171 @@ static int _cmd_open(char *const *argv, int *pfd, int *pfderr) {
         return pfd[0];
 }
 
-static int _cmd_close(int fd) {
-        int status;
+static int _cmd_close(int fileDescriptor) {
         pid_t pid;
 
         /* make sure the provided fd was opened */
         long maxfd = mp_open_max();
-        if (fd < 0 || fd > maxfd || !_cmd_pids || (pid = _cmd_pids[fd]) == 0)
+        if (fileDescriptor < 0 || fileDescriptor > maxfd || !_cmd_pids ||
+                (pid = _cmd_pids[fileDescriptor]) == 0) {
                 return -1;
+        }
 
-        _cmd_pids[fd] = 0;
-        if (close(fd) == -1)
+        _cmd_pids[fileDescriptor] = 0;
+        if (close(fileDescriptor) == -1) {
                 return -1;
+        }
 
         /* EINTR is ok (sort of), everything else is bad */
-        while (waitpid(pid, &status, 0) < 0)
-                if (errno != EINTR)
+        int status;
+        while (waitpid(pid, &status, 0) < 0) {
+                if (errno != EINTR) {
                         return -1;
+                }
+        }
 
         /* return child's termination status */
         return (WIFEXITED(status)) ? WEXITSTATUS(status) : -1;
 }
 
-static int _cmd_fetch_output(int fd, output *op, int flags) {
-        size_t len = 0, i = 0, lineno = 0;
-        size_t rsf = 6, ary_size = 0; /* rsf = right shift factor, dec'ed uncond once */
-        char *buf = NULL;
-        int ret;
+typedef struct {
+        int error_code;
+        output output_container;
+} int_cmd_fetch_output2;
+static int_cmd_fetch_output2 _cmd_fetch_output2(int fileDescriptor, int flags) {
         char tmpbuf[4096];
 
-        op->buf = NULL;
-        op->buflen = 0;
-        while ((ret = read(fd, tmpbuf, sizeof(tmpbuf))) > 0) {
-                len = (size_t)ret;
-                op->buf = realloc(op->buf, op->buflen + len + 1);
-                memcpy(op->buf + op->buflen, tmpbuf, len);
-                op->buflen += len;
+        int_cmd_fetch_output2 result = {
+                .error_code = 0,
+                .output_container =
+                        {
+                                .buf = NULL,
+                                .buflen = 0,
+                                .line = NULL,
+                                .lines = 0,
+                        },
+        };
+        ssize_t ret;
+        while ((ret = read(fileDescriptor, tmpbuf, sizeof(tmpbuf))) > 0) {
+                size_t len = (size_t)ret;
+                result.output_container.buf =
+                        realloc(result.output_container.buf, result.output_container.buflen + len + 1);
+                memcpy(result.output_container.buf + result.output_container.buflen, tmpbuf, len);
+                result.output_container.buflen += len;
+        }
+
+        if (ret < 0) {
+                printf("read() returned %zd: %s\n", ret, strerror(errno));
+                result.error_code = -1;
+                return result;
+        }
+
+        /* some plugins may want to keep output unbroken, and some commands
+         * will yield no output, so return here for those */
+        if (flags & CMD_NO_ARRAYS || !result.output_container.buf || !result.output_container.buflen) {
+                return result;
+        }
+
+        /* and some may want both */
+        char *buf = NULL;
+        if (flags & CMD_NO_ASSOC) {
+                buf = malloc(result.output_container.buflen);
+                memcpy(buf, result.output_container.buf, result.output_container.buflen);
+        } else {
+                buf = result.output_container.buf;
+        }
+
+        result.output_container.line = NULL;
+        size_t ary_size = 0; /* rsf = right shift factor, dec'ed uncond once */
+        size_t rsf = 6;
+        size_t lineno = 0;
+        for (size_t i = 0; i < result.output_container.buflen;) {
+                /* make sure we have enough memory */
+                if (lineno >= ary_size) {
+                        /* ary_size must never be zero */
+                        do {
+                                ary_size = result.output_container.buflen >> --rsf;
+                        } while (!ary_size);
+
+                        result.output_container.line =
+                                realloc(result.output_container.line, ary_size * sizeof(char *));
+                }
+
+                /* set the pointer to the string */
+                result.output_container.line[lineno] = &buf[i];
+
+                /* hop to next newline or end of buffer */
+                while (buf[i] != '\n' && i < result.output_container.buflen) {
+                        i++;
+                }
+                buf[i] = '\0';
+
+                lineno++;
                 i++;
         }
 
+        result.output_container.lines = lineno;
+
+        return result;
+}
+
+static int _cmd_fetch_output(int fileDescriptor, output *cmd_output, int flags) {
+        char tmpbuf[4096];
+        cmd_output->buf = NULL;
+        cmd_output->buflen = 0;
+        ssize_t ret;
+        while ((ret = read(fileDescriptor, tmpbuf, sizeof(tmpbuf))) > 0) {
+                size_t len = (size_t)ret;
+                cmd_output->buf = realloc(cmd_output->buf, cmd_output->buflen + len + 1);
+                memcpy(cmd_output->buf + cmd_output->buflen, tmpbuf, len);
+                cmd_output->buflen += len;
+        }
+
         if (ret < 0) {
-                printf("read() returned %d: %s\n", ret, strerror(errno));
+                printf("read() returned %zd: %s\n", ret, strerror(errno));
                 return ret;
         }
 
         /* some plugins may want to keep output unbroken, and some commands
          * will yield no output, so return here for those */
-        if (flags & CMD_NO_ARRAYS || !op->buf || !op->buflen)
-                return op->buflen;
+        if (flags & CMD_NO_ARRAYS || !cmd_output->buf || !cmd_output->buflen) {
+                return cmd_output->buflen;
+        }
 
         /* and some may want both */
+        char *buf = NULL;
         if (flags & CMD_NO_ASSOC) {
-                buf = malloc(op->buflen);
-                memcpy(buf, op->buf, op->buflen);
-        } else
-                buf = op->buf;
-
-        op->line = NULL;
-        op->lens = NULL;
-        i = 0;
-        while (i < op->buflen) {
+                buf = malloc(cmd_output->buflen);
+                memcpy(buf, cmd_output->buf, cmd_output->buflen);
+        } else {
+                buf = cmd_output->buf;
+        }
+
+        cmd_output->line = NULL;
+        size_t i = 0;
+        size_t ary_size = 0; /* rsf = right shift factor, dec'ed uncond once */
+        size_t rsf = 6;
+        size_t lineno = 0;
+        while (i < cmd_output->buflen) {
                 /* make sure we have enough memory */
                 if (lineno >= ary_size) {
                         /* ary_size must never be zero */
                         do {
-                                ary_size = op->buflen >> --rsf;
+                                ary_size = cmd_output->buflen >> --rsf;
                         } while (!ary_size);
 
-                        op->line = realloc(op->line, ary_size * sizeof(char *));
-                        op->lens = realloc(op->lens, ary_size * sizeof(size_t));
+                        cmd_output->line = realloc(cmd_output->line, ary_size * sizeof(char *));
                 }
 
                 /* set the pointer to the string */
-                op->line[lineno] = &buf[i];
+                cmd_output->line[lineno] = &buf[i];
 
                 /* hop to next newline or end of buffer */
-                while (buf[i] != '\n' && i < op->buflen)
+                while (buf[i] != '\n' && i < cmd_output->buflen) {
                         i++;
+                }
                 buf[i] = '\0';
 
-                /* calculate the string length using pointer difference */
-                op->lens[lineno] = (size_t)&buf[i] - (size_t)op->line[lineno];
-
                 lineno++;
                 i++;
         }
@@ -256,41 +411,42 @@ static int _cmd_fetch_output(int fd, output *op, int flags) {
 }
 
 int cmd_run(const char *cmdstring, output *out, output *err, int flags) {
-        int i = 0, argc;
-        size_t cmdlen;
-        char **argv = NULL;
-        char *cmd = NULL;
-        char *str = NULL;
-
-        if (cmdstring == NULL)
+        if (cmdstring == NULL) {
                 return -1;
+        }
 
         /* initialize the structs */
-        if (out)
+        if (out) {
                 memset(out, 0, sizeof(output));
-        if (err)
+        }
+        if (err) {
                 memset(err, 0, sizeof(output));
+        }
 
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */
-        cmdlen = strlen(cmdstring);
-        if ((cmd = malloc(cmdlen + 1)) == NULL)
+        size_t cmdlen = strlen(cmdstring);
+        char *cmd = NULL;
+        if ((cmd = malloc(cmdlen + 1)) == NULL) {
                 return -1;
+        }
         memcpy(cmd, cmdstring, cmdlen);
         cmd[cmdlen] = '\0';
 
         /* This is not a shell, so we don't handle "???" */
-        if (strstr(cmdstring, "\""))
+        if (strstr(cmdstring, "\"")) {
                 return -1;
+        }
 
         /* allow single quotes, but only if non-whitesapce doesn't occur on both sides */
-        if (strstr(cmdstring, " ' ") || strstr(cmdstring, "'''"))
+        if (strstr(cmdstring, " ' ") || strstr(cmdstring, "'''")) {
                 return -1;
+        }
 
         /* each arg must be whitespace-separated, so args can be a maximum
          * of (len / 2) + 1. We add 1 extra to the mix for NULL termination */
-        argc = (cmdlen >> 1) + 2;
-        argv = calloc((size_t)argc, sizeof(char *));
+        int argc = (cmdlen >> 1) + 2;
+        char **argv = calloc((size_t)argc, sizeof(char *));
 
         if (argv == NULL) {
                 printf("%s\n", _("Could not malloc argv array in popen()"));
@@ -298,14 +454,16 @@ int cmd_run(const char *cmdstring, output *out, output *err, int flags) {
         }
 
         /* get command arguments (stupidly, but fairly quickly) */
+        int i = 0;
         while (cmd) {
-                str = cmd;
+                char *str = cmd;
                 str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
 
                 if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
                         str++;
-                        if (!strstr(str, "'"))
+                        if (!strstr(str, "'")) {
                                 return -1; /* balanced? */
+                        }
                         cmd = 1 + strstr(str, "'");
                         str[strcspn(str, "'")] = 0;
                 } else {
@@ -317,8 +475,9 @@ int cmd_run(const char *cmdstring, output *out, output *err, int flags) {
                         }
                 }
 
-                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n"))
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n")) {
                         cmd = NULL;
+                }
 
                 argv[i++] = str;
         }
@@ -326,54 +485,199 @@ int cmd_run(const char *cmdstring, output *out, output *err, int flags) {
         return cmd_run_array(argv, out, err, flags);
 }
 
-int cmd_run_array(char *const *argv, output *out, output *err, int flags) {
-        int fd, pfd_out[2], pfd_err[2];
+cmd_run_result cmd_run2(const char *cmd_string, int flags) {
+        cmd_run_result result = {
+                .cmd_error_code = 0,
+                .error_code = 0,
+                .err =
+                        {
+                                .buf = NULL,
+                                .buflen = 0,
+                                .line = NULL,
+                                .lines = 0,
+                        },
+                .out =
+                        {
+                                .buf = NULL,
+                                .buflen = 0,
+                                .line = NULL,
+                                .lines = 0,
+                        },
+        };
+
+        if (cmd_string == NULL) {
+                result.error_code = -1;
+                return result;
+        }
+
+        /* make copy of command string so strtok() doesn't silently modify it */
+        /* (the calling program may want to access it later) */
+        char *cmd = strdup(cmd_string);
+        if (cmd == NULL) {
+                result.error_code = -1;
+                return result;
+        }
+
+        /* This is not a shell, so we don't handle "???" */
+        if (strstr(cmd, "\"")) {
+                result.error_code = -1;
+                return result;
+        }
+
+        /* allow single quotes, but only if non-whitesapce doesn't occur on both sides */
+        if (strstr(cmd, " ' ") || strstr(cmd, "'''")) {
+                result.error_code = -1;
+                return result;
+        }
+
+        /* each arg must be whitespace-separated, so args can be a maximum
+         * of (len / 2) + 1. We add 1 extra to the mix for NULL termination */
+        size_t cmdlen = strlen(cmd_string);
+        size_t argc = (cmdlen >> 1) + 2;
+        char **argv = calloc(argc, sizeof(char *));
+
+        if (argv == NULL) {
+                printf("%s\n", _("Could not malloc argv array in popen()"));
+                result.error_code = -1;
+                return result;
+        }
 
+        /* get command arguments (stupidly, but fairly quickly) */
+        for (int i = 0; cmd; i++) {
+                char *str = cmd;
+                str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
+
+                if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
+                        str++;
+                        if (!strstr(str, "'")) {
+                                result.error_code = -1;
+                                return result; /* balanced? */
+                        }
+
+                        cmd = 1 + strstr(str, "'");
+                        str[strcspn(str, "'")] = 0;
+                } else {
+                        if (strpbrk(str, " \t\r\n")) {
+                                cmd = 1 + strpbrk(str, " \t\r\n");
+                                str[strcspn(str, " \t\r\n")] = 0;
+                        } else {
+                                cmd = NULL;
+                        }
+                }
+
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n")) {
+                        cmd = NULL;
+                }
+
+                argv[i++] = str;
+        }
+
+        result = cmd_run_array2(argv, flags);
+
+        return result;
+}
+
+cmd_run_result cmd_run_array2(char *const *cmd, int flags) {
+        cmd_run_result result = {
+                .cmd_error_code = 0,
+                .error_code = 0,
+                .err =
+                        {
+                                .buf = NULL,
+                                .buflen = 0,
+                                .line = NULL,
+                                .lines = 0,
+                        },
+                .out =
+                        {
+                                .buf = NULL,
+                                .buflen = 0,
+                                .line = NULL,
+                                .lines = 0,
+                        },
+        };
+
+        int_cmd_open_result cmd_open_result = _cmd_open2(cmd);
+        if (cmd_open_result.error_code != 0) {
+                // result.error_code = -1;
+                // return result;
+                // TODO properly handle this without dying
+                die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd[0]);
+        }
+
+        int file_descriptor = cmd_open_result.file_descriptor;
+        int pfd_out[2] = {cmd_open_result.stdout_pipe_fd[0], cmd_open_result.stdout_pipe_fd[1]};
+        int pfd_err[2] = {cmd_open_result.stderr_pipe_fd[0], cmd_open_result.stderr_pipe_fd[1]};
+
+        int_cmd_fetch_output2 tmp_stdout = _cmd_fetch_output2(pfd_out[0], flags);
+        result.out = tmp_stdout.output_container;
+        int_cmd_fetch_output2 tmp_stderr = _cmd_fetch_output2(pfd_err[0], flags);
+        result.err = tmp_stderr.output_container;
+
+        result.cmd_error_code = _cmd_close(file_descriptor);
+        return result;
+}
+
+int cmd_run_array(char *const *argv, output *out, output *err, int flags) {
         /* initialize the structs */
-        if (out)
+        if (out) {
                 memset(out, 0, sizeof(output));
-        if (err)
+        }
+        if (err) {
                 memset(err, 0, sizeof(output));
+        }
 
-        if ((fd = _cmd_open(argv, pfd_out, pfd_err)) == -1)
+        int fd;
+        int pfd_out[2];
+        int pfd_err[2];
+        if ((fd = _cmd_open(argv, pfd_out, pfd_err)) == -1) {
                 die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), argv[0]);
+        }
 
-        if (out)
+        if (out) {
                 out->lines = _cmd_fetch_output(pfd_out[0], out, flags);
-        if (err)
+        }
+        if (err) {
                 err->lines = _cmd_fetch_output(pfd_err[0], err, flags);
+        }
 
         return _cmd_close(fd);
 }
 
-int cmd_file_read(char *filename, output *out, int flags) {
+int cmd_file_read(const char *filename, output *out, int flags) {
         int fd;
-        if (out)
+        if (out) {
                 memset(out, 0, sizeof(output));
+        }
 
         if ((fd = open(filename, O_RDONLY)) == -1) {
                 die(STATE_UNKNOWN, _("Error opening %s: %s"), filename, strerror(errno));
         }
 
-        if (out)
+        if (out) {
                 out->lines = _cmd_fetch_output(fd, out, flags);
+        }
 
-        if (close(fd) == -1)
+        if (close(fd) == -1) {
                 die(STATE_UNKNOWN, _("Error closing %s: %s"), filename, strerror(errno));
+        }
 
         return 0;
 }
 
 void timeout_alarm_handler(int signo) {
         if (signo == SIGALRM) {
-                printf(_("%s - Plugin timed out after %d seconds\n"), state_text(timeout_state), timeout_interval);
+                printf(_("%s - Plugin timed out after %d seconds\n"), state_text(timeout_state),
+                           timeout_interval);
 
                 long maxfd = mp_open_max();
-                if (_cmd_pids)
+                if (_cmd_pids) {
                         for (long int i = 0; i < maxfd; i++) {
-                                if (_cmd_pids[i] != 0)
+                                if (_cmd_pids[i] != 0) {
                                         kill(_cmd_pids[i], SIGKILL);
+                                }
                         }
+                }
 
                 exit(timeout_state);
         }
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index d00069c9..04a624b8 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -5,22 +5,30 @@
  * Header file for Monitoring Plugins utils_cmd.c
  *
  */
+#include "../config.h"
+#include <stddef.h>
 
 /** types **/
-struct output {
+typedef struct {
         char *buf;     /* output buffer */
         size_t buflen; /* output buffer content length */
         char **line;   /* array of lines (points to buf) */
-        size_t *lens;  /* string lengths */
         size_t lines;  /* lines of output */
-};
-
-typedef struct output output;
+} output;
 
 /** prototypes **/
 int cmd_run(const char *, output *, output *, int);
 int cmd_run_array(char *const *, output *, output *, int);
-int cmd_file_read(char *, output *, int);
+int cmd_file_read(const char *, output *, int);
+
+typedef struct {
+ int error_code;
+ int cmd_error_code;
+ output out;
+ output err;
+} cmd_run_result;
+cmd_run_result cmd_run2(const char *cmd, int flags);
+cmd_run_result cmd_run_array2(char * const *cmd, int flags);
 
 /* only multi-threaded plugins need to bother with this */
 void cmd_init(void);
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
deleted file mode 100644
index 2b761f5e..00000000
--- a/lib/utils_disk.c
+++ /dev/null
@@ -1,255 +0,0 @@
-/*****************************************************************************
- *
- * Library for check_disk
- *
- * License: GPL
- * Copyright (c) 1999-2024 Monitoring Plugins Development Team
- *
- * Description:
- *
- * This file contains utilities for check_disk. These are tested by libtap
- *
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- *****************************************************************************/
-
-#include "common.h"
-#include "utils_disk.h"
-#include "gl/fsusage.h"
-#include <string.h>
-
-void np_add_name(struct name_list **list, const char *name) {
-        struct name_list *new_entry;
-        new_entry = (struct name_list *)malloc(sizeof *new_entry);
-        new_entry->name = (char *)name;
-        new_entry->next = *list;
-        *list = new_entry;
-}
-
-/* @brief Initialises a new regex at the begin of list via regcomp(3)
- *
- * @details if the regex fails to compile the error code of regcomp(3) is returned
- *                                      and list is not modified, otherwise list is modified to point to the new
- *                                      element
- * @param list Pointer to a linked list of regex_list elements
- * @param regex the string containing the regex which should be inserted into the list
- * @param clags the cflags parameter for regcomp(3)
- */
-int np_add_regex(struct regex_list **list, const char *regex, int cflags) {
-        struct regex_list *new_entry = (struct regex_list *)malloc(sizeof *new_entry);
-
-        if (new_entry == NULL) {
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
-        }
-
-        int regcomp_result = regcomp(&new_entry->regex, regex, cflags);
-
-        if (!regcomp_result) {
-                // regcomp succeeded
-                new_entry->next = *list;
-                *list = new_entry;
-
-                return 0;
-        } else {
-                // regcomp failed
-                free(new_entry);
-
-                return regcomp_result;
-        }
-}
-
-/* Initialises a new parameter at the end of list */
-struct parameter_list *np_add_parameter(struct parameter_list **list, const char *name) {
-        struct parameter_list *current = *list;
-        struct parameter_list *new_path;
-        new_path = (struct parameter_list *)malloc(sizeof *new_path);
-        new_path->name = (char *)malloc(strlen(name) + 1);
-        new_path->best_match = NULL;
-        new_path->name_next = NULL;
-        new_path->name_prev = NULL;
-        new_path->freespace_bytes = NULL;
-        new_path->freespace_units = NULL;
-        new_path->freespace_percent = NULL;
-        new_path->usedspace_bytes = NULL;
-        new_path->usedspace_units = NULL;
-        new_path->usedspace_percent = NULL;
-        new_path->usedinodes_percent = NULL;
-        new_path->freeinodes_percent = NULL;
-        new_path->group = NULL;
-        new_path->dfree_pct = -1;
-        new_path->dused_pct = -1;
-        new_path->total = 0;
-        new_path->available = 0;
-        new_path->available_to_root = 0;
-        new_path->used = 0;
-        new_path->dused_units = 0;
-        new_path->dfree_units = 0;
-        new_path->dtotal_units = 0;
-        new_path->inodes_total = 0;
-        new_path->inodes_free = 0;
-        new_path->inodes_free_to_root = 0;
-        new_path->inodes_used = 0;
-        new_path->dused_inodes_percent = 0;
-        new_path->dfree_inodes_percent = 0;
-
-        strcpy(new_path->name, name);
-
-        if (current == NULL) {
-                *list = new_path;
-                new_path->name_prev = NULL;
-        } else {
-                while (current->name_next) {
-                        current = current->name_next;
-                }
-                current->name_next = new_path;
-                new_path->name_prev = current;
-        }
-        return new_path;
-}
-
-/* Delete a given parameter from list and return pointer to next element*/
-struct parameter_list *np_del_parameter(struct parameter_list *item, struct parameter_list *prev) {
-        if (item == NULL) {
-                return NULL;
-        }
-        struct parameter_list *next;
-
-        if (item->name_next)
-                next = item->name_next;
-        else
-                next = NULL;
-
-        if (next)
-                next->name_prev = prev;
-
-        if (prev)
-                prev->name_next = next;
-
-        if (item->name) {
-                free(item->name);
-        }
-        free(item);
-
-        return next;
-}
-
-/* returns a pointer to the struct found in the list */
-struct parameter_list *np_find_parameter(struct parameter_list *list, const char *name) {
-        struct parameter_list *temp_list;
-        for (temp_list = list; temp_list; temp_list = temp_list->name_next) {
-                if (!strcmp(temp_list->name, name))
-                        return temp_list;
-        }
-
-        return NULL;
-}
-
-void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, bool exact) {
-        struct parameter_list *d;
-        for (d = desired; d; d = d->name_next) {
-                if (!d->best_match) {
-                        struct mount_entry *me;
-                        size_t name_len = strlen(d->name);
-                        size_t best_match_len = 0;
-                        struct mount_entry *best_match = NULL;
-                        struct fs_usage fsp;
-
-                        /* set best match if path name exactly matches a mounted device name */
-                        for (me = mount_list; me; me = me->me_next) {
-                                if (strcmp(me->me_devname, d->name) == 0) {
-                                        if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) >= 0) {
-                                                best_match = me;
-                                        }
-                                }
-                        }
-
-                        /* set best match by directory name if no match was found by devname */
-                        if (!best_match) {
-                                for (me = mount_list; me; me = me->me_next) {
-                                        size_t len = strlen(me->me_mountdir);
-                                        if ((!exact &&
-                                                 (best_match_len <= len && len <= name_len && (len == 1 || strncmp(me->me_mountdir, d->name, len) == 0))) ||
-                                                (exact && strcmp(me->me_mountdir, d->name) == 0)) {
-                                                if (get_fs_usage(me->me_mountdir, me->me_devname, &fsp) >= 0) {
-                                                        best_match = me;
-                                                        best_match_len = len;
-                                                }
-                                        }
-                                }
-                        }
-
-                        if (best_match) {
-                                d->best_match = best_match;
-                        } else {
-                                d->best_match = NULL; /* Not sure why this is needed as it should be null on initialisation */
-                        }
-                }
-        }
-}
-
-/* Returns true if name is in list */
-bool np_find_name(struct name_list *list, const char *name) {
-        const struct name_list *n;
-
-        if (list == NULL || name == NULL) {
-                return false;
-        }
-        for (n = list; n; n = n->next) {
-                if (!strcmp(name, n->name)) {
-                        return true;
-                }
-        }
-        return false;
-}
-
-/* Returns true if name is in list */
-bool np_find_regmatch(struct regex_list *list, const char *name) {
-        int len;
-        regmatch_t m;
-
-        if (name == NULL) {
-                return false;
-        }
-
-        len = strlen(name);
-
-        for (; list; list = list->next) {
-                /* Emulate a full match as if surrounded with ^( )$
-                   by checking whether the match spans the whole name */
-                if (!regexec(&list->regex, name, 1, &m, 0) && m.rm_so == 0 && m.rm_eo == len) {
-                        return true;
-                }
-        }
-
-        return false;
-}
-
-bool np_seen_name(struct name_list *list, const char *name) {
-        const struct name_list *s;
-        for (s = list; s; s = s->next) {
-                if (!strcmp(s->name, name)) {
-                        return true;
-                }
-        }
-        return false;
-}
-
-bool np_regex_match_mount_entry(struct mount_entry *me, regex_t *re) {
-        if (regexec(re, me->me_devname, (size_t)0, NULL, 0) == 0 || regexec(re, me->me_mountdir, (size_t)0, NULL, 0) == 0) {
-                return true;
-        }
-        return false;
-}
diff --git a/lib/utils_disk.h b/lib/utils_disk.h
deleted file mode 100644
index c5e81dc1..00000000
--- a/lib/utils_disk.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Header file for utils_disk */
-
-#include "mountlist.h"
-#include "utils_base.h"
-#include "regex.h"
-
-struct name_list {
-        char *name;
-        struct name_list *next;
-};
-
-struct regex_list {
-        regex_t regex;
-        struct regex_list *next;
-};
-
-struct parameter_list {
-        char *name;
-        thresholds *freespace_bytes;
-        thresholds *freespace_units;
-        thresholds *freespace_percent;
-        thresholds *usedspace_bytes;
-        thresholds *usedspace_units;
-        thresholds *usedspace_percent;
-        thresholds *usedinodes_percent;
-        thresholds *freeinodes_percent;
-        char *group;
-        struct mount_entry *best_match;
-        struct parameter_list *name_next;
-        struct parameter_list *name_prev;
-        uintmax_t total, available, available_to_root, used, inodes_free, inodes_free_to_root, inodes_used, inodes_total;
-        double dfree_pct, dused_pct;
-        uint64_t dused_units, dfree_units, dtotal_units;
-        double dused_inodes_percent, dfree_inodes_percent;
-};
-
-void np_add_name(struct name_list **list, const char *name);
-bool np_find_name(struct name_list *list, const char *name);
-bool np_seen_name(struct name_list *list, const char *name);
-int np_add_regex(struct regex_list **list, const char *regex, int cflags);
-bool np_find_regmatch(struct regex_list *list, const char *name);
-struct parameter_list *np_add_parameter(struct parameter_list **list, const char *name);
-struct parameter_list *np_find_parameter(struct parameter_list *list, const char *name);
-struct parameter_list *np_del_parameter(struct parameter_list *item, struct parameter_list *prev);
-
-int search_parameter_list(struct parameter_list *list, const char *name);
-void np_set_best_match(struct parameter_list *desired, struct mount_entry *mount_list, bool exact);
-bool np_regex_match_mount_entry(struct mount_entry *me, regex_t *re);
diff --git a/lib/utils_tcp.c b/lib/utils_tcp.c
index daae1d54..a82d5a3f 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -26,28 +26,35 @@
  *
  *****************************************************************************/
 
-#include "common.h"
+#include "../config.h"
 #include "utils_tcp.h"
+#include <stdio.h>
+#include <string.h>
 
-#define VERBOSE(message)                                                                                                                   \
-        do {                                                                                                                                   \
-                if (flags & NP_MATCH_VERBOSE)                                                                                                      \
-                        puts(message);                                                                                                                 \
+#define VERBOSE(message)                                                                           \
+        do {                                                                                           \
+                if (flags & NP_MATCH_VERBOSE)                                                              \
+                        puts(message);                                                                         \
         } while (0)
 
-enum np_match_result np_expect_match(char *status, char **server_expect, int expect_count, int flags) {
-        int i, match = 0, partial = 0;
-
-        for (i = 0; i < expect_count; i++) {
-                if (flags & NP_MATCH_VERBOSE)
-                        printf("looking for [%s] %s [%s]\n", server_expect[i], (flags & NP_MATCH_EXACT) ? "in beginning of" : "anywhere in", status);
+enum np_match_result np_expect_match(char *status, char **server_expect, int expect_count,
+                                                                         int flags) {
+        int match = 0;
+        int partial = 0;
+        for (int i = 0; i < expect_count; i++) {
+                if (flags & NP_MATCH_VERBOSE) {
+                        printf("looking for [%s] %s [%s]\n", server_expect[i],
+                                   (flags & NP_MATCH_EXACT) ? "in beginning of" : "anywhere in", status);
+                }
 
                 if (flags & NP_MATCH_EXACT) {
                         if (strncmp(status, server_expect[i], strlen(server_expect[i])) == 0) {
                                 VERBOSE("found it");
                                 match++;
                                 continue;
-                        } else if (strncmp(status, server_expect[i], strlen(status)) == 0) {
+                        }
+
+                        if (strncmp(status, server_expect[i], strlen(status)) == 0) {
                                 VERBOSE("found a substring");
                                 partial++;
                                 continue;
@@ -60,10 +67,12 @@ enum np_match_result np_expect_match(char *status, char **server_expect, int exp
                 VERBOSE("couldn't find it");
         }
 
-        if ((flags & NP_MATCH_ALL && match == expect_count) || (!(flags & NP_MATCH_ALL) && match >= 1))
+        if ((flags & NP_MATCH_ALL && match == expect_count) ||
+                (!(flags & NP_MATCH_ALL) && match >= 1)) {
                 return NP_MATCH_SUCCESS;
-        else if (partial > 0 || !(flags & NP_MATCH_EXACT))
+        }
+        if (partial > 0 || !(flags & NP_MATCH_EXACT)) {
                 return NP_MATCH_RETRY;
-        else
-                return NP_MATCH_FAILURE;
+        }
+        return NP_MATCH_FAILURE;
 }
diff --git a/lib/utils_tcp.h b/lib/utils_tcp.h
index d5999e9b..e5cdbb82 100644
--- a/lib/utils_tcp.h
+++ b/lib/utils_tcp.h
@@ -11,9 +11,11 @@
  * server.
  */
 enum np_match_result {
+        NP_MATCH_NONE,
         NP_MATCH_FAILURE,
         NP_MATCH_SUCCESS,
         NP_MATCH_RETRY
 };
 
-enum np_match_result np_expect_match(char *status, char **server_expect, int server_expect_count, int flags);
+enum np_match_result np_expect_match(char *status, char **server_expect, int server_expect_count,
+                                                                         int flags);
diff --git a/plugins-root/Makefile.am b/plugins-root/Makefile.am
index a80229e2..b6342909 100644
--- a/plugins-root/Makefile.am
+++ b/plugins-root/Makefile.am
@@ -24,7 +24,9 @@ noinst_PROGRAMS = check_dhcp check_icmp @EXTRAS_ROOT@
 
 EXTRA_PROGRAMS = pst3
 
-EXTRA_DIST = t pst3.c
+EXTRA_DIST = t pst3.c \
+                         check_icmp.d \
+                         check_dhcp.d
 
 BASEOBJS = ../plugins/utils.o ../lib/libmonitoringplug.a ../gl/libgnu.a
 NETOBJS = ../plugins/netutils.o $(BASEOBJS) $(EXTRA_NETOBJS)
@@ -82,6 +84,7 @@ install-exec-local: $(noinst_PROGRAMS)
 # the actual targets
 check_dhcp_LDADD = @LTLIBINTL@ $(NETLIBS) $(LIB_CRYPTO)
 check_icmp_LDADD = @LTLIBINTL@ $(NETLIBS) $(SOCKETLIBS) $(LIB_CRYPTO)
+check_icmp_SOURCES = check_icmp.c check_icmp.d/check_icmp_helpers.c
 
 # -m64 needed at compiler and linker phase
 pst3_CFLAGS = @PST3CFLAGS@
@@ -89,7 +92,7 @@ pst3_LDFLAGS = @PST3CFLAGS@
 # pst3 must not use monitoringplug/gnulib includes!
 pst3_CPPFLAGS =
 
-check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS) 
+check_dhcp_DEPENDENCIES = check_dhcp.c $(NETOBJS) $(DEPLIBS)
 check_icmp_DEPENDENCIES = check_icmp.c $(NETOBJS)
 
 clean-local:
diff --git a/plugins-root/check_dhcp.c b/plugins-root/check_dhcp.c
index 6802232e..9a96547f 100644
--- a/plugins-root/check_dhcp.c
+++ b/plugins-root/check_dhcp.c
@@ -4,7 +4,7 @@
  *
  * License: GPL
  * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
- * Copyright (c) 2001-2023 Monitoring Plugins Development Team
+ * Copyright (c) 2001-2025 Monitoring Plugins Development Team
  *
  * Description:
  *
@@ -34,13 +34,17 @@
  *****************************************************************************/
 
 const char *progname = "check_dhcp";
-const char *copyright = "2001-2024";
+const char *copyright = "2001-2025";
 const char *email = "devel@monitoring-plugins.org";
 
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
+#include "../plugins/common.h"
+#include "../plugins/utils.h"
+#include "./check_dhcp.d/config.h"
+#include "../lib/output.h"
+#include "../lib/utils_base.h"
 
+#include "states.h"
+#include <stdint.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -111,8 +115,9 @@ static long mac_addr_dlpi(const char *, int, u_char *);
 
 /**** Common definitions ****/
 
-#define OK    0
-#define ERROR -1
+#define OK           0
+#define ERROR        -1
+#define MAC_ADDR_LEN 6
 
 /**** DHCP definitions ****/
 
@@ -122,17 +127,17 @@ static long mac_addr_dlpi(const char *, int, u_char *);
 #define MAX_DHCP_OPTIONS_LENGTH 312
 
 typedef struct dhcp_packet_struct {
-        uint8_t op;                                   /* packet type */
-        uint8_t htype;                                /* type of hardware address for this machine (Ethernet, etc) */
-        uint8_t hlen;                                 /* length of hardware address (of this machine) */
-        uint8_t hops;                                 /* hops */
-        uint32_t xid;                                 /* random transaction id number - chosen by this machine */
-        uint16_t secs;                                /* seconds used in timing */
-        uint16_t flags;                               /* flags */
-        struct in_addr ciaddr;                        /* IP address of this machine (if we already have one) */
-        struct in_addr yiaddr;                        /* IP address of this machine (offered by the DHCP server) */
-        struct in_addr siaddr;                        /* IP address of next server */
-        struct in_addr giaddr;                        /* IP address of DHCP relay */
+        uint8_t op;            /* packet type */
+        uint8_t htype;         /* type of hardware address for this machine (Ethernet, etc) */
+        uint8_t hlen;          /* length of hardware address (of this machine) */
+        uint8_t hops;          /* hops */
+        uint32_t xid;          /* random transaction id number - chosen by this machine */
+        uint16_t secs;         /* seconds used in timing */
+        uint16_t flags;        /* flags */
+        struct in_addr ciaddr; /* IP address of this machine (if we already have one) */
+        struct in_addr yiaddr; /* IP address of this machine (offered by the DHCP server) */
+        struct in_addr siaddr; /* IP address of next server */
+        struct in_addr giaddr; /* IP address of DHCP relay */
         unsigned char chaddr[MAX_DHCP_CHADDR_LENGTH]; /* hardware address of this machine */
         char sname[MAX_DHCP_SNAME_LENGTH];            /* name of DHCP server */
         char file[MAX_DHCP_FILE_LENGTH];              /* boot file name (used for diskless booting?) */
@@ -149,12 +154,6 @@ typedef struct dhcp_offer_struct {
         struct dhcp_offer_struct *next;
 } dhcp_offer;
 
-typedef struct requested_server_struct {
-        struct in_addr server_address;
-        bool answered;
-        struct requested_server_struct *next;
-} requested_server;
-
 #define BOOTREQUEST 1
 #define BOOTREPLY   2
 
@@ -186,65 +185,69 @@ typedef struct requested_server_struct {
 #define ETHERNET_HARDWARE_ADDRESS        1 /* used in htype field of dhcp packet */
 #define ETHERNET_HARDWARE_ADDRESS_LENGTH 6 /* length of Ethernet hardware addresses */
 
-static bool unicast = false;   /* unicast mode: mimic a DHCP relay */
-static bool exclusive = false; /* exclusive mode aka "rogue DHCP server detection" */
-static struct in_addr my_ip;   /* our address (required for relay) */
-static struct in_addr dhcp_ip; /* server to query (if in unicast mode) */
-static unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH] = "";
-static unsigned char *user_specified_mac = NULL;
-
-static char network_interface_name[IFNAMSIZ] = "eth0";
-
-static uint32_t packet_xid = 0;
-
-static uint32_t dhcp_lease_time = 0;
-static uint32_t dhcp_renewal_time = 0;
-static uint32_t dhcp_rebinding_time = 0;
-
-static int dhcpoffer_timeout = 2;
-
-static dhcp_offer *dhcp_offer_list = NULL;
-static requested_server *requested_server_list = NULL;
-
-static int valid_responses = 0; /* number of valid DHCPOFFERs we received */
-static int requested_servers = 0;
-static int requested_responses = 0;
-
-static bool request_specific_address = false;
-static bool received_requested_address = false;
 static int verbose = 0;
-static struct in_addr requested_address;
 
-static int process_arguments(int, char **);
-static int call_getopt(int, char **);
-static int validate_arguments(int);
+typedef struct process_arguments_wrapper {
+        int error;
+        check_dhcp_config config;
+} process_arguments_wrapper;
+
+static process_arguments_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 void print_usage(void);
 static void print_help(void);
 
-static void resolve_host(const char *in, struct in_addr *out);
-static unsigned char *mac_aton(const char *);
-static void print_hardware_address(const unsigned char *);
-static int get_hardware_address(int, char *);
-static int get_ip_address(int, char *);
-
-static int send_dhcp_discover(int);
-static int get_dhcp_offer(int);
-
-static int get_results(void);
-
-static int add_dhcp_offer(struct in_addr, dhcp_packet *);
-static int free_dhcp_offer_list(void);
-static int free_requested_server_list(void);
-
-static int create_dhcp_socket(void);
-static int close_dhcp_socket(int);
-static int send_dhcp_packet(void *, int, int, struct sockaddr_in *);
-static int receive_dhcp_packet(void *, int, int, int, struct sockaddr_in *);
+static void resolve_host(const char * /*in*/, struct in_addr * /*out*/);
+static unsigned char *mac_aton(const char * /*string*/);
+static void print_hardware_address(const unsigned char * /*address*/);
+static int get_hardware_address(int /*sock*/, char * /*interface_name*/,
+                                                                unsigned char *client_hardware_address);
+
+typedef struct get_ip_address_wrapper {
+        int error;
+        struct in_addr my_ip;
+} get_ip_address_wrapper;
+static get_ip_address_wrapper get_ip_address(int /*sock*/, char * /*interface_name*/);
+
+typedef struct send_dhcp_discover_wrapper {
+        int error;
+        uint32_t packet_xid;
+} send_dhcp_discover_wrapper;
+static send_dhcp_discover_wrapper
+send_dhcp_discover(int socket, bool unicast, struct in_addr dhcp_ip,
+                                   struct in_addr requested_address, bool request_specific_address,
+                                   struct in_addr my_ip, unsigned char *client_hardware_address);
+typedef struct get_dhcp_offer_wrapper {
+        int error;
+        int valid_responses;
+        dhcp_offer *dhcp_offer_list;
+} get_dhcp_offer_wrapper;
+static get_dhcp_offer_wrapper get_dhcp_offer(int /*sock*/, int dhcpoffer_timeout,
+                                                                                         uint32_t packet_xid, dhcp_offer *dhcp_offer_list,
+                                                                                         const unsigned char *client_hardware_address);
+
+static mp_subcheck get_results(bool exclusive, int requested_servers,
+                                                           struct in_addr requested_address, bool request_specific_address,
+                                                           requested_server *requested_server_list, int valid_responses,
+                                                           dhcp_offer *dhcp_offer_list);
+
+typedef struct add_dhcp_offer_wrapper {
+        int error;
+        dhcp_offer *dhcp_offer_list;
+} add_dhcp_offer_wrapper;
+static add_dhcp_offer_wrapper add_dhcp_offer(struct in_addr /*source*/,
+                                                                                         dhcp_packet * /*offer_packet*/,
+                                                                                         dhcp_offer *dhcp_offer_list);
+static int free_dhcp_offer_list(dhcp_offer *dhcp_offer_list);
+static int free_requested_server_list(requested_server *requested_server_list);
+
+static int create_dhcp_socket(bool /*unicast*/, char *network_interface_name);
+static int close_dhcp_socket(int /*sock*/);
+static int send_dhcp_packet(void * /*buffer*/, int /*buffer_size*/, int /*sock*/,
+                                                        struct sockaddr_in * /*dest*/);
+static int receive_dhcp_packet(void * /*buffer*/, int /*buffer_size*/, int /*sock*/,
+                                                           int /*timeout*/, struct sockaddr_in * /*address*/);
 
 int main(int argc, char **argv) {
-        int dhcp_socket;
-        int result = STATE_UNKNOWN;
-
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
@@ -252,43 +255,84 @@ int main(int argc, char **argv) {
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) != OK) {
+        process_arguments_wrapper tmp = process_arguments(argc, argv);
+
+        if (tmp.error != OK) {
                 usage4(_("Could not parse arguments"));
         }
 
+        check_dhcp_config config = tmp.config;
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* create socket for DHCP communications */
-        dhcp_socket = create_dhcp_socket();
+        int dhcp_socket = create_dhcp_socket(config.unicast_mode, config.network_interface_name);
 
         /* get hardware address of client machine */
-        if (user_specified_mac != NULL)
-                memcpy(client_hardware_address, user_specified_mac, 6);
-        else
-                get_hardware_address(dhcp_socket, network_interface_name);
+        unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH] = "";
+        if (config.user_specified_mac != NULL) {
+                memcpy(client_hardware_address, config.user_specified_mac, MAC_ADDR_LEN);
+        } else {
+                get_hardware_address(dhcp_socket, config.network_interface_name, client_hardware_address);
+        }
 
-        if (unicast) /* get IP address of client machine */
-                get_ip_address(dhcp_socket, network_interface_name);
+        struct in_addr my_ip = {0};
+
+        if (config.unicast_mode) { /* get IP address of client machine */
+                get_ip_address_wrapper tmp_get_ip =
+                        get_ip_address(dhcp_socket, config.network_interface_name);
+                if (tmp_get_ip.error == OK) {
+                        my_ip = tmp_get_ip.my_ip;
+                } else {
+                        // TODO failed to get own IP
+                        die(STATE_UNKNOWN, "Failed to retrieve my own IP address in unicast mode");
+                }
+        }
 
         /* send DHCPDISCOVER packet */
-        send_dhcp_discover(dhcp_socket);
+        send_dhcp_discover_wrapper disco_res = send_dhcp_discover(
+                dhcp_socket, config.unicast_mode, config.dhcp_ip, config.requested_address,
+                config.request_specific_address, my_ip, client_hardware_address);
+
+        if (disco_res.error != OK) {
+                // DO something?
+                die(STATE_UNKNOWN, "Failed to send DHCP discover");
+        }
 
         /* wait for a DHCPOFFER packet */
-        get_dhcp_offer(dhcp_socket);
+        get_dhcp_offer_wrapper offer_res = get_dhcp_offer(
+                dhcp_socket, config.dhcpoffer_timeout, disco_res.packet_xid, NULL, client_hardware_address);
+
+        int valid_responses = 0;
+        dhcp_offer *dhcp_offer_list = NULL;
+        if (offer_res.error == OK) {
+                valid_responses = offer_res.valid_responses;
+                dhcp_offer_list = offer_res.dhcp_offer_list;
+        } else {
+                die(STATE_UNKNOWN, "Failed to get DHCP offers");
+        }
 
         /* close socket we created */
         close_dhcp_socket(dhcp_socket);
 
-        /* determine state/plugin output to return */
-        result = get_results();
+        mp_check overall = mp_check_init();
 
+        /* determine state/plugin output to return */
+        mp_subcheck sc_res =
+                get_results(config.exclusive_mode, config.num_of_requested_servers,
+                                        config.requested_address, config.request_specific_address,
+                                        config.requested_server_list, valid_responses, dhcp_offer_list);
+        mp_add_subcheck_to_check(&overall, sc_res);
         /* free allocated memory */
-        free_dhcp_offer_list();
-        free_requested_server_list();
+        free_dhcp_offer_list(dhcp_offer_list);
+        free_requested_server_list(config.requested_server_list);
 
-        return result;
+        mp_exit(overall);
 }
 
 /* determines hardware address on client machine */
-static int get_hardware_address(int sock, char *interface_name) {
+int get_hardware_address(int sock, char *interface_name, unsigned char *client_hardware_address) {
 
 #if defined(__linux__)
         struct ifreq ifr;
@@ -302,7 +346,7 @@ static int get_hardware_address(int sock, char *interface_name) {
                 exit(STATE_UNKNOWN);
         }
 
-        memcpy(&client_hardware_address[0], &ifr.ifr_hwaddr.sa_data, 6);
+        memcpy(&client_hardware_address[0], &ifr.ifr_hwaddr.sa_data, MAC_ADDR_LEN);
 
 #elif defined(__bsd__)
         /* King 2004    see ACKNOWLEDGEMENTS */
@@ -326,17 +370,20 @@ static int get_hardware_address(int sock, char *interface_name) {
         }
 
         if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
-                printf(_("Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"), interface_name, strerror(errno));
+                printf(_("Error: Couldn't get hardware address from %s. sysctl 1 error - %s.\n"),
+                           interface_name, strerror(errno));
                 exit(STATE_UNKNOWN);
         }
 
         if ((buf = malloc(len)) == NULL) {
-                printf(_("Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"), interface_name, strerror(errno));
+                printf(_("Error: Couldn't get hardware address from interface %s. malloc error - %s.\n"),
+                           interface_name, strerror(errno));
                 exit(4);
         }
 
         if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) {
-                printf(_("Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"), interface_name, strerror(errno));
+                printf(_("Error: Couldn't get hardware address from %s. sysctl 2 error - %s.\n"),
+                           interface_name, strerror(errno));
                 exit(STATE_UNKNOWN);
         }
 
@@ -358,20 +405,25 @@ static int get_hardware_address(int sock, char *interface_name) {
         int i;
         p = interface_name + strlen(interface_name) - 1;
         for (i = strlen(interface_name) - 1; i > 0; p--) {
-                if (isalpha(*p))
+                if (isalpha(*p)) {
                         break;
+                }
         }
         p++;
         if (p != interface_name) {
                 unit = atoi(p);
                 strncat(dev, interface_name, 6);
         } else {
-                printf(_("Error: can't find unit number in interface_name (%s) - expecting TypeNumber eg lnc0.\n"), interface_name);
+                printf(_("Error: can't find unit number in interface_name (%s) - expecting TypeNumber eg "
+                                 "lnc0.\n"),
+                           interface_name);
                 exit(STATE_UNKNOWN);
         }
         stat = mac_addr_dlpi(dev, unit, client_hardware_address);
         if (stat != 0) {
-                printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"), dev, unit);
+                printf(
+                        _("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"),
+                        dev, unit);
                 exit(STATE_UNKNOWN);
         }
 
@@ -383,7 +435,9 @@ static int get_hardware_address(int sock, char *interface_name) {
 
         stat = mac_addr_dlpi(dev, unit, client_hardware_address);
         if (stat != 0) {
-                printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"), dev, unit);
+                printf(
+                        _("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"),
+                        dev, unit);
                 exit(STATE_UNKNOWN);
         }
         /* Kompf 2000-2003 */
@@ -393,14 +447,15 @@ static int get_hardware_address(int sock, char *interface_name) {
         exit(STATE_UNKNOWN);
 #endif
 
-        if (verbose)
+        if (verbose) {
                 print_hardware_address(client_hardware_address);
+        }
 
         return OK;
 }
 
 /* determines IP address of the client interface */
-static int get_ip_address(int sock, char *interface_name) {
+get_ip_address_wrapper get_ip_address(int sock, char *interface_name) {
 #if defined(SIOCGIFADDR)
         struct ifreq ifr;
 
@@ -412,28 +467,30 @@ static int get_ip_address(int sock, char *interface_name) {
                 exit(STATE_UNKNOWN);
         }
 
-        my_ip = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr;
-
 #else
         printf(_("Error: Cannot get interface IP address on this platform.\n"));
         exit(STATE_UNKNOWN);
 #endif
 
-        if (verbose)
-                printf(_("Pretending to be relay client %s\n"), inet_ntoa(my_ip));
+        get_ip_address_wrapper result = {
+                .error = OK,
+                .my_ip = ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr,
+        };
 
-        return OK;
+        if (verbose) {
+                printf(_("Pretending to be relay client %s\n"), inet_ntoa(result.my_ip));
+        }
+
+        return result;
 }
 
 /* sends a DHCPDISCOVER broadcast message in an attempt to find DHCP servers */
-static int send_dhcp_discover(int sock) {
-        dhcp_packet discover_packet;
-        struct sockaddr_in sockaddr_broadcast;
-        unsigned short opts;
-
-        /* clear the packet data structure */
-        bzero(&discover_packet, sizeof(discover_packet));
-
+static send_dhcp_discover_wrapper send_dhcp_discover(int sock, bool unicast, struct in_addr dhcp_ip,
+                                                                                                         struct in_addr requested_address,
+                                                                                                         bool request_specific_address,
+                                                                                                         struct in_addr my_ip,
+                                                                                                         unsigned char *client_hardware_address) {
+        dhcp_packet discover_packet = {0};
         /* boot request flag (backward compatible with BOOTP servers) */
         discover_packet.op = BOOTREQUEST;
 
@@ -443,12 +500,15 @@ static int send_dhcp_discover(int sock) {
         /* length of our hardware address */
         discover_packet.hlen = ETHERNET_HARDWARE_ADDRESS_LENGTH;
 
+        send_dhcp_discover_wrapper result = {
+                .error = OK,
+        };
         /*
          * transaction ID is supposed to be random.
          */
         srand(time(NULL) ^ getpid());
-        packet_xid = random();
-        discover_packet.xid = htonl(packet_xid);
+        result.packet_xid = random();
+        discover_packet.xid = htonl(result.packet_xid);
 
         /*discover_packet.secs=htons(65535);*/
         discover_packet.secs = 0xFF;
@@ -468,10 +528,11 @@ static int send_dhcp_discover(int sock) {
         discover_packet.options[2] = '\x53';
         discover_packet.options[3] = '\x63';
 
-        opts = 4;
+        unsigned short opts = 4;
         /* DHCP message type is embedded in options field */
-        discover_packet.options[opts++] = DHCP_OPTION_MESSAGE_TYPE; /* DHCP message type option identifier */
-        discover_packet.options[opts++] = '\x01';                   /* DHCP message option length in bytes */
+        discover_packet.options[opts++] =
+                DHCP_OPTION_MESSAGE_TYPE;             /* DHCP message type option identifier */
+        discover_packet.options[opts++] = '\x01'; /* DHCP message option length in bytes */
         discover_packet.options[opts++] = DHCPDISCOVER;
 
         /* the IP address we're requesting */
@@ -484,21 +545,25 @@ static int send_dhcp_discover(int sock) {
         discover_packet.options[opts++] = (char)DHCP_OPTION_END;
 
         /* unicast fields */
-        if (unicast)
+        if (unicast) {
                 discover_packet.giaddr.s_addr = my_ip.s_addr;
+        }
 
         /* see RFC 1542, 4.1.1 */
         discover_packet.hops = unicast ? 1 : 0;
 
         /* send the DHCPDISCOVER packet to broadcast address */
-        sockaddr_broadcast.sin_family = AF_INET;
-        sockaddr_broadcast.sin_port = htons(DHCP_SERVER_PORT);
-        sockaddr_broadcast.sin_addr.s_addr = unicast ? dhcp_ip.s_addr : INADDR_BROADCAST;
-        bzero(&sockaddr_broadcast.sin_zero, sizeof(sockaddr_broadcast.sin_zero));
+        struct sockaddr_in sockaddr_broadcast = {
+                .sin_family = AF_INET,
+                .sin_port = htons(DHCP_SERVER_PORT),
+                .sin_addr.s_addr = unicast ? dhcp_ip.s_addr : INADDR_BROADCAST,
+        };
 
         if (verbose) {
-                printf(_("DHCPDISCOVER to %s port %d\n"), inet_ntoa(sockaddr_broadcast.sin_addr), ntohs(sockaddr_broadcast.sin_port));
-                printf("DHCPDISCOVER XID: %u (0x%X)\n", ntohl(discover_packet.xid), ntohl(discover_packet.xid));
+                printf(_("DHCPDISCOVER to %s port %d\n"), inet_ntoa(sockaddr_broadcast.sin_addr),
+                           ntohs(sockaddr_broadcast.sin_port));
+                printf("DHCPDISCOVER XID: %u (0x%X)\n", ntohl(discover_packet.xid),
+                           ntohl(discover_packet.xid));
                 printf("DHCDISCOVER ciaddr:  %s\n", inet_ntoa(discover_packet.ciaddr));
                 printf("DHCDISCOVER yiaddr:  %s\n", inet_ntoa(discover_packet.yiaddr));
                 printf("DHCDISCOVER siaddr:  %s\n", inet_ntoa(discover_packet.siaddr));
@@ -508,56 +573,58 @@ static int send_dhcp_discover(int sock) {
         /* send the DHCPDISCOVER packet out */
         send_dhcp_packet(&discover_packet, sizeof(discover_packet), sock, &sockaddr_broadcast);
 
-        if (verbose)
+        if (verbose) {
                 printf("\n\n");
+        }
 
-        return OK;
+        return result;
 }
 
 /* waits for a DHCPOFFER message from one or more DHCP servers */
-static int get_dhcp_offer(int sock) {
-        dhcp_packet offer_packet;
-        struct sockaddr_in source;
-        struct sockaddr_in via;
-        int result = OK;
-        int responses = 0;
-        int x;
+get_dhcp_offer_wrapper get_dhcp_offer(int sock, int dhcpoffer_timeout, uint32_t packet_xid,
+                                                                          dhcp_offer *dhcp_offer_list,
+                                                                          const unsigned char *client_hardware_address) {
         time_t start_time;
-        time_t current_time;
-
         time(&start_time);
 
+        int result = OK;
+        int responses = 0;
+        int valid_responses = 0;
         /* receive as many responses as we can */
-        for (responses = 0, valid_responses = 0;;) {
-
+        for (;;) {
+                time_t current_time;
                 time(&current_time);
-                if ((current_time - start_time) >= dhcpoffer_timeout)
+                if ((current_time - start_time) >= dhcpoffer_timeout) {
                         break;
+                }
 
-                if (verbose)
+                if (verbose) {
                         printf("\n\n");
+                }
 
-                bzero(&source, sizeof(source));
-                bzero(&via, sizeof(via));
-                bzero(&offer_packet, sizeof(offer_packet));
+                struct sockaddr_in source = {0};
+                dhcp_packet offer_packet = {0};
 
                 result = OK;
-                result = receive_dhcp_packet(&offer_packet, sizeof(offer_packet), sock, dhcpoffer_timeout, &source);
+                result = receive_dhcp_packet(&offer_packet, sizeof(offer_packet), sock, dhcpoffer_timeout,
+                                                                         &source);
 
                 if (result != OK) {
-                        if (verbose)
+                        if (verbose) {
                                 printf(_("Result=ERROR\n"));
+                        }
 
                         continue;
-                } else {
-                        if (verbose)
-                                printf(_("Result=OK\n"));
-
-                        responses++;
+                }
+                if (verbose) {
+                        printf(_("Result=OK\n"));
                 }
 
+                responses++;
+
                 /* The "source" is either a server or a relay. */
                 /* Save a copy of "source" into "via" even if it's via itself */
+                struct sockaddr_in via = {0};
                 memcpy(&via, &source, sizeof(source));
 
                 if (verbose) {
@@ -568,30 +635,38 @@ static int get_dhcp_offer(int sock) {
 
                 /* check packet xid to see if its the same as the one we used in the discover packet */
                 if (ntohl(offer_packet.xid) != packet_xid) {
-                        if (verbose)
-                                printf(_("DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"), ntohl(offer_packet.xid), packet_xid);
+                        if (verbose) {
+                                printf(
+                                        _("DHCPOFFER XID (%u) did not match DHCPDISCOVER XID (%u) - ignoring packet\n"),
+                                        ntohl(offer_packet.xid), packet_xid);
+                        }
 
                         continue;
                 }
 
                 /* check hardware address */
                 result = OK;
-                if (verbose)
+                if (verbose) {
                         printf("DHCPOFFER chaddr: ");
+                }
 
-                for (x = 0; x < ETHERNET_HARDWARE_ADDRESS_LENGTH; x++) {
-                        if (verbose)
-                                printf("%02X", (unsigned char)offer_packet.chaddr[x]);
+                for (int i = 0; i < ETHERNET_HARDWARE_ADDRESS_LENGTH; i++) {
+                        if (verbose) {
+                                printf("%02X", offer_packet.chaddr[i]);
+                        }
 
-                        if (offer_packet.chaddr[x] != client_hardware_address[x])
+                        if (offer_packet.chaddr[i] != client_hardware_address[i]) {
                                 result = ERROR;
+                        }
                 }
-                if (verbose)
+                if (verbose) {
                         printf("\n");
+                }
 
                 if (result == ERROR) {
-                        if (verbose)
+                        if (verbose) {
                                 printf(_("DHCPOFFER hardware address did not match our own - ignoring packet\n"));
+                        }
 
                         continue;
                 }
@@ -603,7 +678,13 @@ static int get_dhcp_offer(int sock) {
                         printf("DHCPOFFER giaddr: %s\n", inet_ntoa(offer_packet.giaddr));
                 }
 
-                add_dhcp_offer(source.sin_addr, &offer_packet);
+                add_dhcp_offer_wrapper add_res =
+                        add_dhcp_offer(source.sin_addr, &offer_packet, dhcp_offer_list);
+                if (add_res.error != OK) {
+                        // TODO
+                } else {
+                        dhcp_offer_list = add_res.dhcp_offer_list;
+                }
 
                 valid_responses++;
         }
@@ -613,104 +694,104 @@ static int get_dhcp_offer(int sock) {
                 printf(_("Valid responses for this machine: %d\n"), valid_responses);
         }
 
-        return OK;
+        get_dhcp_offer_wrapper ret_val = {
+                .error = OK,
+                .valid_responses = valid_responses,
+                .dhcp_offer_list = dhcp_offer_list,
+        };
+        return ret_val;
 }
 
 /* sends a DHCP packet */
-static int send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in *dest) {
-        int result;
-
-        result = sendto(sock, (char *)buffer, buffer_size, 0, (struct sockaddr *)dest, sizeof(*dest));
+int send_dhcp_packet(void *buffer, int buffer_size, int sock, struct sockaddr_in *dest) {
+        int result =
+                sendto(sock, (char *)buffer, buffer_size, 0, (struct sockaddr *)dest, sizeof(*dest));
 
-        if (verbose)
+        if (verbose) {
                 printf(_("send_dhcp_packet result: %d\n"), result);
+        }
 
-        if (result < 0)
+        if (result < 0) {
                 return ERROR;
+        }
 
         return OK;
 }
 
 /* receives a DHCP packet */
-static int receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout, struct sockaddr_in *address) {
-        struct timeval tv;
-        fd_set readfds;
-        fd_set oobfds;
-        int recv_result;
-        socklen_t address_size;
-        struct sockaddr_in source_address;
-        int nfound;
-
+int receive_dhcp_packet(void *buffer, int buffer_size, int sock, int timeout,
+                                                struct sockaddr_in *address) {
         /* wait for data to arrive (up time timeout) */
-        tv.tv_sec = timeout;
-        tv.tv_usec = 0;
+        struct timeval timeout_val = {
+                .tv_sec = timeout,
+                .tv_usec = 0,
+        };
+        fd_set readfds;
         FD_ZERO(&readfds);
+        fd_set oobfds;
         FD_ZERO(&oobfds);
         FD_SET(sock, &readfds);
         FD_SET(sock, &oobfds);
-        nfound = select(sock + 1, &readfds, NULL, &oobfds, &tv);
+        int nfound = select(sock + 1, &readfds, NULL, &oobfds, &timeout_val);
 
         /* make sure some data has arrived */
         if (!FD_ISSET(sock, &readfds)) {
-                if (verbose)
+                if (verbose) {
                         printf(_("No (more) data received (nfound: %d)\n"), nfound);
+                }
                 return ERROR;
         }
 
-        else {
-                bzero(&source_address, sizeof(source_address));
-                address_size = sizeof(source_address);
-                recv_result = recvfrom(sock, (char *)buffer, buffer_size, 0, (struct sockaddr *)&source_address, &address_size);
-                if (verbose)
-                        printf("recv_result: %d\n", recv_result);
-
-                if (recv_result == -1) {
-                        if (verbose) {
-                                printf(_("recvfrom() failed, "));
-                                printf("errno: (%d) -> %s\n", errno, strerror(errno));
-                        }
-                        return ERROR;
-                } else {
-                        if (verbose) {
-                                printf(_("receive_dhcp_packet() result: %d\n"), recv_result);
-                                printf(_("receive_dhcp_packet() source: %s\n"), inet_ntoa(source_address.sin_addr));
-                        }
+        struct sockaddr_in source_address = {0};
+        socklen_t address_size = sizeof(source_address);
+        int recv_result = recvfrom(sock, (char *)buffer, buffer_size, 0,
+                                                           (struct sockaddr *)&source_address, &address_size);
+        if (verbose) {
+                printf("recv_result: %d\n", recv_result);
+        }
 
-                        memcpy(address, &source_address, sizeof(source_address));
-                        return OK;
+        if (recv_result == -1) {
+                if (verbose) {
+                        printf(_("recvfrom() failed, "));
+                        printf("errno: (%d) -> %s\n", errno, strerror(errno));
                 }
+                return ERROR;
+        }
+        if (verbose) {
+                printf(_("receive_dhcp_packet() result: %d\n"), recv_result);
+                printf(_("receive_dhcp_packet() source: %s\n"), inet_ntoa(source_address.sin_addr));
         }
 
+        memcpy(address, &source_address, sizeof(source_address));
         return OK;
 }
 
 /* creates a socket for DHCP communication */
-static int create_dhcp_socket(void) {
-        struct sockaddr_in myname;
-        struct ifreq interface;
-        int sock;
-        int flag = 1;
-
+int create_dhcp_socket(bool unicast, char *network_interface_name) {
         /* Set up the address we're going to bind to. */
-        bzero(&myname, sizeof(myname));
-        myname.sin_family = AF_INET;
         /* listen to DHCP server port if we're in unicast mode */
-        myname.sin_port = htons(unicast ? DHCP_SERVER_PORT : DHCP_CLIENT_PORT);
-        myname.sin_addr.s_addr = unicast ? my_ip.s_addr : INADDR_ANY;
-        bzero(&myname.sin_zero, sizeof(myname.sin_zero));
+        struct sockaddr_in myname = {
+                .sin_family = AF_INET,
+                .sin_port = htons(unicast ? DHCP_SERVER_PORT : DHCP_CLIENT_PORT),
+                // TODO previously the next line was trying to use our own IP, we was not set
+                // until some point later, so it was removed. Recheck whether it is actually
+                // necessary/useful
+                .sin_addr.s_addr = INADDR_ANY,
+        };
 
         /* create a socket for DHCP communications */
-        sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+        int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
         if (sock < 0) {
                 printf(_("Error: Could not create socket!\n"));
                 exit(STATE_UNKNOWN);
         }
 
-        if (verbose)
+        if (verbose) {
                 printf("DHCP socket: %d\n", sock);
+        }
 
         /* set the reuse address flag so we don't get errors when restarting */
-        flag = 1;
+        int flag = 1;
         if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&flag, sizeof(flag)) < 0) {
                 printf(_("Error: Could not set reuse address option on DHCP socket!\n"));
                 exit(STATE_UNKNOWN);
@@ -722,12 +803,14 @@ static int create_dhcp_socket(void) {
                 exit(STATE_UNKNOWN);
         }
 
+        struct ifreq interface;
         /* bind socket to interface */
 #if defined(__linux__)
         strncpy(interface.ifr_ifrn.ifrn_name, network_interface_name, IFNAMSIZ - 1);
         interface.ifr_ifrn.ifrn_name[IFNAMSIZ - 1] = '\0';
         if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, (char *)&interface, sizeof(interface)) < 0) {
-                printf(_("Error: Could not bind socket to interface %s.  Check your privileges...\n"), network_interface_name);
+                printf(_("Error: Could not bind socket to interface %s.  Check your privileges...\n"),
+                           network_interface_name);
                 exit(STATE_UNKNOWN);
         }
 
@@ -738,7 +821,8 @@ static int create_dhcp_socket(void) {
 
         /* bind the socket */
         if (bind(sock, (struct sockaddr *)&myname, sizeof(myname)) < 0) {
-                printf(_("Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"), DHCP_CLIENT_PORT);
+                printf(_("Error: Could not bind to DHCP socket (port %d)!  Check your privileges...\n"),
+                           DHCP_CLIENT_PORT);
                 exit(STATE_UNKNOWN);
         }
 
@@ -746,105 +830,121 @@ static int create_dhcp_socket(void) {
 }
 
 /* closes DHCP socket */
-static int close_dhcp_socket(int sock) {
-
+int close_dhcp_socket(int sock) {
         close(sock);
-
         return OK;
 }
 
 /* adds a requested server address to list in memory */
-static int add_requested_server(struct in_addr server_address) {
-        requested_server *new_server;
-
-        new_server = (requested_server *)malloc(sizeof(requested_server));
-        if (new_server == NULL)
+int add_requested_server(struct in_addr server_address, int *requested_servers,
+                                                 requested_server **requested_server_list) {
+        requested_server *new_server = (requested_server *)malloc(sizeof(requested_server));
+        if (new_server == NULL) {
                 return ERROR;
+        }
 
         new_server->server_address = server_address;
         new_server->answered = false;
 
-        new_server->next = requested_server_list;
-        requested_server_list = new_server;
+        new_server->next = *requested_server_list;
+        *requested_server_list = new_server;
 
-        requested_servers++;
+        *requested_servers += 1;
 
-        if (verbose)
+        if (verbose) {
                 printf(_("Requested server address: %s\n"), inet_ntoa(new_server->server_address));
+        }
 
         return OK;
 }
 
 /* adds a DHCP OFFER to list in memory */
-static int add_dhcp_offer(struct in_addr source, dhcp_packet *offer_packet) {
+add_dhcp_offer_wrapper add_dhcp_offer(struct in_addr source, dhcp_packet *offer_packet,
+                                                                          dhcp_offer *dhcp_offer_list) {
+        if (offer_packet == NULL) {
+                add_dhcp_offer_wrapper tmp = {
+                        .error = ERROR,
+                };
+                return tmp;
+        }
+
+        uint32_t dhcp_lease_time = 0;
+        uint32_t dhcp_renewal_time = 0;
+        uint32_t dhcp_rebinding_time = 0;
         dhcp_offer *new_offer;
-        int x;
-        unsigned option_type;
-        unsigned option_length;
         struct in_addr serv_ident = {0};
-
-        if (offer_packet == NULL)
-                return ERROR;
-
         /* process all DHCP options present in the packet */
-        for (x = 4; x < MAX_DHCP_OPTIONS_LENGTH - 1;) {
+        for (int dchp_opt_idx = 4; dchp_opt_idx < MAX_DHCP_OPTIONS_LENGTH - 1;) {
 
-                if ((int)offer_packet->options[x] == -1)
+                if ((int)offer_packet->options[dchp_opt_idx] == -1) {
                         break;
+                }
 
                 /* get option type */
-                option_type = offer_packet->options[x++];
+                unsigned option_type = offer_packet->options[dchp_opt_idx++];
 
                 /* get option length */
-                option_length = offer_packet->options[x++];
+                unsigned option_length = offer_packet->options[dchp_opt_idx++];
 
-                if (verbose)
+                if (verbose) {
                         printf("Option: %d (0x%02X)\n", option_type, option_length);
+                }
 
                 /* get option data */
                 switch (option_type) {
                 case DHCP_OPTION_LEASE_TIME:
-                        memcpy(&dhcp_lease_time, &offer_packet->options[x], sizeof(dhcp_lease_time));
+                        memcpy(&dhcp_lease_time, &offer_packet->options[dchp_opt_idx], sizeof(dhcp_lease_time));
                         dhcp_lease_time = ntohl(dhcp_lease_time);
                         break;
                 case DHCP_OPTION_RENEWAL_TIME:
-                        memcpy(&dhcp_renewal_time, &offer_packet->options[x], sizeof(dhcp_renewal_time));
+                        memcpy(&dhcp_renewal_time, &offer_packet->options[dchp_opt_idx],
+                                   sizeof(dhcp_renewal_time));
                         dhcp_renewal_time = ntohl(dhcp_renewal_time);
                         break;
                 case DHCP_OPTION_REBINDING_TIME:
-                        memcpy(&dhcp_rebinding_time, &offer_packet->options[x], sizeof(dhcp_rebinding_time));
+                        memcpy(&dhcp_rebinding_time, &offer_packet->options[dchp_opt_idx],
+                                   sizeof(dhcp_rebinding_time));
                         dhcp_rebinding_time = ntohl(dhcp_rebinding_time);
                         break;
                 case DHCP_OPTION_SERVER_IDENTIFIER:
-                        memcpy(&serv_ident.s_addr, &offer_packet->options[x], sizeof(serv_ident.s_addr));
+                        memcpy(&serv_ident.s_addr, &offer_packet->options[dchp_opt_idx],
+                                   sizeof(serv_ident.s_addr));
                         break;
                 }
 
                 /* skip option data we're ignoring */
-                if (option_type == 0) /* "pad" option, see RFC 2132 (3.1) */
-                        x += 1;
-                else
-                        x += option_length;
+                if (option_type == 0) { /* "pad" option, see RFC 2132 (3.1) */
+                        dchp_opt_idx += 1;
+                } else {
+                        dchp_opt_idx += option_length;
+                }
         }
 
         if (verbose) {
-                if (dhcp_lease_time == DHCP_INFINITE_TIME)
+                if (dhcp_lease_time == DHCP_INFINITE_TIME) {
                         printf(_("Lease Time: Infinite\n"));
-                else
+                } else {
                         printf(_("Lease Time: %lu seconds\n"), (unsigned long)dhcp_lease_time);
-                if (dhcp_renewal_time == DHCP_INFINITE_TIME)
+                }
+                if (dhcp_renewal_time == DHCP_INFINITE_TIME) {
                         printf(_("Renewal Time: Infinite\n"));
-                else
+                } else {
                         printf(_("Renewal Time: %lu seconds\n"), (unsigned long)dhcp_renewal_time);
-                if (dhcp_rebinding_time == DHCP_INFINITE_TIME)
+                }
+                if (dhcp_rebinding_time == DHCP_INFINITE_TIME) {
                         printf(_("Rebinding Time: Infinite\n"));
+                }
                 printf(_("Rebinding Time: %lu seconds\n"), (unsigned long)dhcp_rebinding_time);
         }
 
         new_offer = (dhcp_offer *)malloc(sizeof(dhcp_offer));
 
-        if (new_offer == NULL)
-                return ERROR;
+        if (new_offer == NULL) {
+                add_dhcp_offer_wrapper tmp = {
+                        .error = ERROR,
+                };
+                return tmp;
+        }
 
         /*
          * RFC 2131 (2.) says: "DHCP clarifies the interpretation of the
@@ -874,15 +974,18 @@ static int add_dhcp_offer(struct in_addr source, dhcp_packet *offer_packet) {
         new_offer->next = dhcp_offer_list;
         dhcp_offer_list = new_offer;
 
-        return OK;
+        add_dhcp_offer_wrapper result = {
+                .error = OK,
+                .dhcp_offer_list = dhcp_offer_list,
+        };
+
+        return result;
 }
 
 /* frees memory allocated to DHCP OFFER list */
-static int free_dhcp_offer_list(void) {
-        dhcp_offer *this_offer;
+int free_dhcp_offer_list(dhcp_offer *dhcp_offer_list) {
         dhcp_offer *next_offer;
-
-        for (this_offer = dhcp_offer_list; this_offer != NULL; this_offer = next_offer) {
+        for (dhcp_offer *this_offer = dhcp_offer_list; this_offer != NULL; this_offer = next_offer) {
                 next_offer = this_offer->next;
                 free(this_offer);
         }
@@ -891,11 +994,10 @@ static int free_dhcp_offer_list(void) {
 }
 
 /* frees memory allocated to requested server list */
-static int free_requested_server_list(void) {
-        requested_server *this_server;
+int free_requested_server_list(requested_server *requested_server_list) {
         requested_server *next_server;
-
-        for (this_server = requested_server_list; this_server != NULL; this_server = next_server) {
+        for (requested_server *this_server = requested_server_list; this_server != NULL;
+                 this_server = next_server) {
                 next_server = this_server->next;
                 free(this_server);
         }
@@ -904,39 +1006,68 @@ static int free_requested_server_list(void) {
 }
 
 /* gets state and plugin output to return */
-static int get_results(void) {
-        dhcp_offer *temp_offer, *undesired_offer = NULL;
-        requested_server *temp_server;
-        int result;
-        uint32_t max_lease_time = 0;
+mp_subcheck get_results(bool exclusive, const int requested_servers,
+                                                const struct in_addr requested_address, bool request_specific_address,
+                                                requested_server *requested_server_list, int valid_responses,
+                                                dhcp_offer *dhcp_offer_list) {
+        mp_subcheck sc_dhcp_results = mp_subcheck_init();
+        sc_dhcp_results = mp_set_subcheck_default_state(sc_dhcp_results, STATE_OK);
 
-        received_requested_address = false;
-
-        /* checks responses from requested servers */
-        requested_responses = 0;
-        if (requested_servers > 0) {
+        /* we didn't receive any DHCPOFFERs */
+        if (dhcp_offer_list == NULL) {
+                sc_dhcp_results = mp_set_subcheck_state(sc_dhcp_results, STATE_CRITICAL);
+                xasprintf(&sc_dhcp_results.output, "%s", "No DHCPOFFERs were received");
+                return sc_dhcp_results;
+        }
 
-                for (temp_server = requested_server_list; temp_server != NULL; temp_server = temp_server->next) {
+        if (valid_responses == 0) {
+                // No valid responses at all, so early exit here
+                sc_dhcp_results = mp_set_subcheck_state(sc_dhcp_results, STATE_CRITICAL);
+                xasprintf(&sc_dhcp_results.output, "No valid responses received");
+                return sc_dhcp_results;
+        }
 
-                        for (temp_offer = dhcp_offer_list; temp_offer != NULL; temp_offer = temp_offer->next) {
+        if (valid_responses == 1) {
+                xasprintf(&sc_dhcp_results.output, "Received %d DHCPOFFER", valid_responses);
+        } else {
+                xasprintf(&sc_dhcp_results.output, "Received %d DHCPOFFERs", valid_responses);
+        }
 
+        bool received_requested_address = false;
+        dhcp_offer *undesired_offer = NULL;
+        uint32_t max_lease_time = 0;
+        /* checks responses from requested servers */
+        int requested_responses = 0;
+        if (requested_servers > 0) {
+                for (requested_server *temp_server = requested_server_list; temp_server != NULL;
+                         temp_server = temp_server->next) {
+                        for (dhcp_offer *temp_offer = dhcp_offer_list; temp_offer != NULL;
+                                 temp_offer = temp_offer->next) {
                                 /* get max lease time we were offered */
-                                if (temp_offer->lease_time > max_lease_time || temp_offer->lease_time == DHCP_INFINITE_TIME)
+                                if (temp_offer->lease_time > max_lease_time ||
+                                        temp_offer->lease_time == DHCP_INFINITE_TIME) {
                                         max_lease_time = temp_offer->lease_time;
+                                }
 
                                 /* see if we got the address we requested */
-                                if (!memcmp(&requested_address, &temp_offer->offered_address, sizeof(requested_address)))
+                                if (!memcmp(&requested_address, &temp_offer->offered_address,
+                                                        sizeof(requested_address))) {
                                         received_requested_address = true;
+                                }
 
-                                /* see if the servers we wanted a response from talked to us or not */
-                                if (!memcmp(&temp_offer->server_address, &temp_server->server_address, sizeof(temp_server->server_address))) {
+                                /* see if the servers we wanted a response from, talked to us or not */
+                                if (!memcmp(&temp_offer->server_address, &temp_server->server_address,
+                                                        sizeof(temp_server->server_address))) {
                                         if (verbose) {
-                                                printf(_("DHCP Server Match: Offerer=%s"), inet_ntoa(temp_offer->server_address));
+                                                printf(_("DHCP Server Match: Offerer=%s"),
+                                                           inet_ntoa(temp_offer->server_address));
                                                 printf(_(" Requested=%s"), inet_ntoa(temp_server->server_address));
-                                                if (temp_server->answered)
+                                                if (temp_server->answered) {
                                                         printf(_(" (duplicate)"));
+                                                }
                                                 printf(_("\n"));
                                         }
+
                                         if (!temp_server->answered) {
                                                 requested_responses++;
                                                 temp_server->answered = true;
@@ -947,160 +1078,188 @@ static int get_results(void) {
                 }
 
                 /* exclusive mode: check for undesired offers */
-                for (temp_offer = dhcp_offer_list; temp_offer != NULL; temp_offer = temp_offer->next) {
+                for (dhcp_offer *temp_offer = dhcp_offer_list; temp_offer != NULL;
+                         temp_offer = temp_offer->next) {
                         if (!temp_offer->desired) {
                                 undesired_offer = temp_offer; /* Checks only for the first undesired offer */
                                 break;                        /* no further checks needed */
                         }
                 }
-        }
 
-        /* else check and see if we got our requested address from any server */
-        else {
+                mp_subcheck sc_rqust_srvs = mp_subcheck_init();
+                xasprintf(&sc_rqust_srvs.output, "%d of %d requested servers responded",
+                                  requested_responses, requested_servers);
 
-                for (temp_offer = dhcp_offer_list; temp_offer != NULL; temp_offer = temp_offer->next) {
+                if (requested_responses == requested_servers) {
+                        sc_rqust_srvs = mp_set_subcheck_state(sc_rqust_srvs, STATE_OK);
+                } else if (requested_responses == 0) {
+                        sc_rqust_srvs = mp_set_subcheck_state(sc_rqust_srvs, STATE_CRITICAL);
+                } else if (requested_responses < requested_servers) {
+                        sc_rqust_srvs = mp_set_subcheck_state(sc_rqust_srvs, STATE_WARNING);
+                } else {
+                        // We received more(!) responses than we asked for?
+                        // This case shouldn't happen, but is here for completion
+                        sc_rqust_srvs = mp_set_subcheck_state(sc_rqust_srvs, STATE_WARNING);
+                }
+                mp_add_subcheck_to_subcheck(&sc_dhcp_results, sc_rqust_srvs);
 
+        } else {
+                /* else check and see if we got our requested address from any server */
+                for (dhcp_offer *temp_offer = dhcp_offer_list; temp_offer != NULL;
+                         temp_offer = temp_offer->next) {
                         /* get max lease time we were offered */
-                        if (temp_offer->lease_time > max_lease_time || temp_offer->lease_time == DHCP_INFINITE_TIME)
+                        if (temp_offer->lease_time > max_lease_time ||
+                                temp_offer->lease_time == DHCP_INFINITE_TIME) {
                                 max_lease_time = temp_offer->lease_time;
+                        }
 
                         /* see if we got the address we requested */
-                        if (!memcmp(&requested_address, &temp_offer->offered_address, sizeof(requested_address)))
+                        if (!memcmp(&requested_address, &temp_offer->offered_address,
+                                                sizeof(requested_address))) {
                                 received_requested_address = true;
+                        }
                 }
         }
 
-        result = STATE_OK;
-        if (valid_responses == 0)
-                result = STATE_CRITICAL;
-        else if (requested_servers > 0 && requested_responses == 0)
-                result = STATE_CRITICAL;
-        else if (requested_responses < requested_servers)
-                result = STATE_WARNING;
-        else if (request_specific_address && !received_requested_address)
-                result = STATE_WARNING;
-
-        if (exclusive && undesired_offer)
-                result = STATE_CRITICAL;
-
-        if (result == 0) /* garrett honeycutt 2005 */
-                printf("OK: ");
-        else if (result == 1)
-                printf("WARNING: ");
-        else if (result == 2)
-                printf("CRITICAL: ");
-        else if (result == 3)
-                printf("UNKNOWN: ");
-
-        /* we didn't receive any DHCPOFFERs */
-        if (dhcp_offer_list == NULL) {
-                printf(_("No DHCPOFFERs were received.\n"));
-                return result;
+        if (max_lease_time == DHCP_INFINITE_TIME) {
+                xasprintf(&sc_dhcp_results.output, "%s, max lease time = Infinity", sc_dhcp_results.output);
+        } else {
+                xasprintf(&sc_dhcp_results.output, "%s, max lease time = %" PRIu32 " seconds",
+                                  sc_dhcp_results.output, max_lease_time);
         }
 
-        printf(_("Received %d DHCPOFFER(s)"), valid_responses);
+        if (exclusive) {
+                mp_subcheck sc_rogue_server = mp_subcheck_init();
 
-        if (exclusive && undesired_offer) {
-                printf(_(", Rogue DHCP Server detected! Server %s"), inet_ntoa(undesired_offer->server_address));
-                printf(_(" offered %s \n"), inet_ntoa(undesired_offer->offered_address));
-                return result;
-        }
+                if (undesired_offer != NULL) {
+                        // We wanted to get a DHCPOFFER exclusively from one machine, but another one
+                        // sent one (too)
+                        sc_rogue_server = mp_set_subcheck_state(sc_rogue_server, STATE_CRITICAL);
 
-        if (requested_servers > 0)
-                printf(_(", %s%d of %d requested servers responded"), ((requested_responses < requested_servers) && requested_responses > 0) ? "only " : "", requested_responses,
-                           requested_servers);
+                        // Get the addresses for printout
+                        // 1.address of the sending server
+                        char server_address[INET_ADDRSTRLEN];
+                        const char *server_address_transformed = inet_ntop(
+                                AF_INET, &undesired_offer->server_address, server_address, sizeof(server_address));
 
-        if (request_specific_address)
-                printf(_(", requested address (%s) was %soffered"), inet_ntoa(requested_address), (received_requested_address) ? "" : _("not "));
+                        if (server_address != server_address_transformed) {
+                                die(STATE_UNKNOWN, "inet_ntop failed");
+                        }
 
-        printf(_(", max lease time = "));
-        if (max_lease_time == DHCP_INFINITE_TIME)
-                printf(_("Infinity"));
-        else
-                printf("%lu sec", (unsigned long)max_lease_time);
+                        // 2.address offered
+                        char offered_address[INET_ADDRSTRLEN];
+                        const char *offered_address_transformed =
+                                inet_ntop(AF_INET, &undesired_offer->offered_address, offered_address,
+                                                  sizeof(offered_address));
 
-        printf(".\n");
+                        if (offered_address != offered_address_transformed) {
+                                die(STATE_UNKNOWN, "inet_ntop failed");
+                        }
 
-        return result;
+                        xasprintf(&sc_rogue_server.output, "Rogue DHCP Server detected! Server %s offered %s",
+                                          server_address, offered_address);
+                } else {
+                        sc_rogue_server = mp_set_subcheck_state(sc_rogue_server, STATE_OK);
+                        xasprintf(&sc_rogue_server.output, "No Rogue DHCP Server detected");
+                }
+                mp_add_subcheck_to_subcheck(&sc_dhcp_results, sc_rogue_server);
+        }
+
+        if (request_specific_address) {
+                mp_subcheck sc_rqustd_addr = mp_subcheck_init();
+
+                if (received_requested_address) {
+                        sc_rqustd_addr = mp_set_subcheck_state(sc_rqustd_addr, STATE_OK);
+                        xasprintf(&sc_rqustd_addr.output, "Requested address (%s) was offered",
+                                          inet_ntoa(requested_address));
+                } else {
+                        sc_rqustd_addr = mp_set_subcheck_state(sc_rqustd_addr, STATE_WARNING);
+                        xasprintf(&sc_rqustd_addr.output, "Requested address (%s) was NOT offered",
+                                          inet_ntoa(requested_address));
+                }
+
+                mp_add_subcheck_to_subcheck(&sc_dhcp_results, sc_rqustd_addr);
+        }
+
+        return sc_dhcp_results;
 }
 
 /* process command-line arguments */
-static int process_arguments(int argc, char **argv) {
-        if (argc < 1)
-                return ERROR;
+process_arguments_wrapper process_arguments(int argc, char **argv) {
+        if (argc < 1) {
+                process_arguments_wrapper tmp = {
+                        .error = ERROR,
+                };
+                return tmp;
+        }
 
-        call_getopt(argc, argv);
-        return validate_arguments(argc);
-}
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
 
-static int call_getopt(int argc, char **argv) {
-        extern int optind;
         int option_index = 0;
-        static struct option long_options[] = {{"serverip", required_argument, 0, 's'},
-                                                                                   {"requestedip", required_argument, 0, 'r'},
-                                                                                   {"timeout", required_argument, 0, 't'},
-                                                                                   {"interface", required_argument, 0, 'i'},
-                                                                                   {"mac", required_argument, 0, 'm'},
-                                                                                   {"unicast", no_argument, 0, 'u'},
-                                                                                   {"exclusive", no_argument, 0, 'x'},
-                                                                                   {"verbose", no_argument, 0, 'v'},
-                                                                                   {"version", no_argument, 0, 'V'},
-                                                                                   {"help", no_argument, 0, 'h'},
-                                                                                   {0, 0, 0, 0}};
-
-        int c = 0;
+        static struct option long_options[] = {
+                {"serverip", required_argument, 0, 's'},
+                {"requestedip", required_argument, 0, 'r'},
+                {"timeout", required_argument, 0, 't'},
+                {"interface", required_argument, 0, 'i'},
+                {"mac", required_argument, 0, 'm'},
+                {"unicast", no_argument, 0, 'u'},
+                {"exclusive", no_argument, 0, 'x'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+                {"output-format", required_argument, 0, output_format_index},
+                {0, 0, 0, 0}};
+
+        check_dhcp_config config = check_dhcp_config_init();
+        int option_char = 0;
         while (true) {
-                c = getopt_long(argc, argv, "+hVvxt:s:r:t:i:m:u", long_options, &option_index);
+                option_char = getopt_long(argc, argv, "+hVvxt:s:r:t:i:m:u", long_options, &option_index);
 
-                if (c == -1 || c == EOF || c == 1)
+                if (option_char == -1 || option_char == EOF || option_char == 1) {
                         break;
+                }
 
-                switch (c) {
-
+                switch (option_char) {
                 case 's': /* DHCP server address */
-                        resolve_host(optarg, &dhcp_ip);
-                        add_requested_server(dhcp_ip);
+                        resolve_host(optarg, &config.dhcp_ip);
+                        add_requested_server(config.dhcp_ip, &config.num_of_requested_servers,
+                                                                 &config.requested_server_list);
                         break;
 
                 case 'r': /* address we are requested from DHCP servers */
-                        resolve_host(optarg, &requested_address);
-                        request_specific_address = true;
+                        resolve_host(optarg, &config.requested_address);
+                        config.request_specific_address = true;
                         break;
 
                 case 't': /* timeout */
-
-                        /*
-                                 if(is_intnonneg(optarg))
-                                 */
-                        if (atoi(optarg) > 0)
-                                dhcpoffer_timeout = atoi(optarg);
-                        /*
-                                 else
-                                 usage("Time interval must be a nonnegative integer\n");
-                                 */
+                        if (atoi(optarg) > 0) {
+                                config.dhcpoffer_timeout = atoi(optarg);
+                        }
                         break;
 
                 case 'm': /* MAC address */
-
-                        if ((user_specified_mac = mac_aton(optarg)) == NULL)
+                        if ((config.user_specified_mac = mac_aton(optarg)) == NULL) {
                                 usage("Cannot parse MAC address.\n");
-                        if (verbose)
-                                print_hardware_address(user_specified_mac);
-
+                        }
+                        if (verbose) {
+                                print_hardware_address(config.user_specified_mac);
+                        }
                         break;
 
                 case 'i': /* interface name */
-
-                        strncpy(network_interface_name, optarg, sizeof(network_interface_name) - 1);
-                        network_interface_name[sizeof(network_interface_name) - 1] = '\x0';
-
+                        strncpy(config.network_interface_name, optarg,
+                                        sizeof(config.network_interface_name) - 1);
+                        config.network_interface_name[sizeof(config.network_interface_name) - 1] = '\x0';
                         break;
 
                 case 'u': /* unicast testing */
-                        unicast = true;
+                        config.unicast_mode = true;
                         break;
+
                 case 'x': /* exclusive testing aka "rogue DHCP server detection" */
-                        exclusive = true;
+                        config.exclusive_mode = true;
                         break;
 
                 case 'V': /* version */
@@ -1114,6 +1273,18 @@ static int call_getopt(int argc, char **argv) {
                 case 'v': /* verbose */
                         verbose = 1;
                         break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        config.output_format_is_set = true;
+                        config.output_format = parser.output_format;
+                        break;
+                }
                 case '?': /* help */
                         usage5();
                         break;
@@ -1122,15 +1293,16 @@ static int call_getopt(int argc, char **argv) {
                         break;
                 }
         }
-        return optind;
-}
 
-static int validate_arguments(int argc) {
-
-        if (argc - optind > 0)
+        if (argc - optind > 0) {
                 usage(_("Got unexpected non-option argument"));
+        }
 
-        return OK;
+        process_arguments_wrapper result = {
+                .config = config,
+                .error = OK,
+        };
+        return result;
 }
 
 #if defined(__sun__) || defined(__solaris__) || defined(__hpux__)
@@ -1180,7 +1352,8 @@ static int put_ctrl(int fd, int len, int pri) {
 
         ctl.len = len;
         if (putmsg(fd, &ctl, 0, pri) < 0) {
-                printf(_("Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"), strerror(errno));
+                printf(_("Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"),
+                           strerror(errno));
                 exit(STATE_UNKNOWN);
         }
 
@@ -1193,7 +1366,8 @@ static int put_both(int fd, int clen, int dlen, int pri) {
         ctl.len = clen;
         dat.len = dlen;
         if (putmsg(fd, &ctl, &dat, pri) < 0) {
-                printf(_("Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"), strerror(errno));
+                printf(_("Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"),
+                           strerror(errno));
                 exit(STATE_UNKNOWN);
         }
 
@@ -1205,7 +1379,8 @@ static int dl_open(const char *dev, int unit, int *fd) {
         dl_attach_req_t *attach_req = (dl_attach_req_t *)ctl_area;
 
         if ((*fd = open(dev, O_RDWR)) == -1) {
-                printf(_("Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"), dev, strerror(errno));
+                printf(_("Error: DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n"),
+                           dev, strerror(errno));
                 exit(STATE_UNKNOWN);
         }
         attach_req->dl_primitive = DL_ATTACH_REQ;
@@ -1229,7 +1404,8 @@ static int dl_bind(int fd, int sap, u_char *addr) {
         put_ctrl(fd, sizeof(dl_bind_req_t), 0);
         get_msg(fd);
         if (GOT_ERR == check_ctrl(DL_BIND_ACK)) {
-                printf(_("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"), strerror(errno));
+                printf(_("Error: DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n"),
+                           strerror(errno));
                 exit(STATE_UNKNOWN);
         }
         bcopy((u_char *)bind_ack + bind_ack->dl_addr_offset, addr, bind_ack->dl_addr_length);
@@ -1249,7 +1425,7 @@ static int dl_bind(int fd, int sap, u_char *addr) {
  *
  ***********************************************************************/
 
-static long mac_addr_dlpi(const char *dev, int unit, u_char *addr) {
+long mac_addr_dlpi(const char *dev, int unit, u_char *addr) {
         int fd;
         u_char mac_addr[25];
 
@@ -1268,51 +1444,53 @@ static long mac_addr_dlpi(const char *dev, int unit, u_char *addr) {
 #endif
 
 /* resolve host name or die (TODO: move this to netutils.c!) */
-static void resolve_host(const char *in, struct in_addr *out) {
-        struct addrinfo hints, *ai;
+void resolve_host(const char *name, struct in_addr *out) {
+        struct addrinfo hints = {
+                .ai_family = PF_INET,
+        };
+        struct addrinfo *addr_info;
 
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = PF_INET;
-        if (getaddrinfo(in, NULL, &hints, &ai) != 0)
+        if (getaddrinfo(name, NULL, &hints, &addr_info) != 0) {
                 usage_va(_("Invalid hostname/address - %s"), optarg);
+        }
 
-        memcpy(out, &((struct sockaddr_in *)ai->ai_addr)->sin_addr, sizeof(*out));
-        freeaddrinfo(ai);
+        memcpy(out, &((struct sockaddr_in *)addr_info->ai_addr)->sin_addr, sizeof(*out));
+        freeaddrinfo(addr_info);
 }
 
 /* parse MAC address string, return 6 bytes (unterminated) or NULL */
-static unsigned char *mac_aton(const char *string) {
-        static unsigned char result[6];
+unsigned char *mac_aton(const char *string) {
+        static unsigned char result[MAC_ADDR_LEN];
         char tmp[3];
-        unsigned i, j;
+        unsigned byte_counter = 0;
 
-        for (i = 0, j = 0; string[i] != '\0' && j < sizeof(result); i++) {
+        for (int i = 0; string[i] != '\0' && byte_counter < sizeof(result); i++) {
                 /* ignore ':' and any other non-hex character */
-                if (!isxdigit(string[i]) || !isxdigit(string[i + 1]))
+                if (!isxdigit(string[i]) || !isxdigit(string[i + 1])) {
                         continue;
+                }
                 tmp[0] = string[i];
                 tmp[1] = string[i + 1];
                 tmp[2] = '\0';
-                result[j] = strtol(tmp, (char **)NULL, 16);
+                result[byte_counter] = strtol(tmp, (char **)NULL, 16);
                 i++;
-                j++;
+                byte_counter++;
         }
 
-        return (j == 6) ? result : NULL;
+        return (byte_counter == MAC_ADDR_LEN) ? result : NULL;
 }
 
-static void print_hardware_address(const unsigned char *address) {
-        int i;
+void print_hardware_address(const unsigned char *address) {
 
         printf(_("Hardware address: "));
-        for (i = 0; i < 5; i++)
-                printf("%2.2x:", address[i]);
-        printf("%2.2x", address[i]);
+        for (int addr_idx = 0; addr_idx < MAC_ADDR_LEN; addr_idx++) {
+                printf("%2.2x:", address[addr_idx]);
+        }
         putchar('\n');
 }
 
 /* print usage help */
-static void print_help(void) {
+void print_help(void) {
 
         print_revision(progname, NP_VERSION);
 
@@ -1328,6 +1506,7 @@ static void print_help(void) {
         printf(UT_HELP_VRSN);
         printf(UT_EXTRA_OPTS);
 
+        printf(UT_OUTPUT_FORMAT);
         printf(UT_VERBOSE);
 
         printf(" %s\n", "-s, --serverip=IPADDRESS");
@@ -1343,10 +1522,10 @@ static void print_help(void) {
         printf(" %s\n", "-u, --unicast");
         printf("    %s\n", _("Unicast testing: mimic a DHCP relay, requires -s"));
         printf(" %s\n", "-x, --exclusive");
-        printf("    %s\n", _("Only requested DHCP server may response (rogue DHCP server detection), requires -s"));
+        printf("    %s\n",
+                   _("Only requested DHCP server may response (rogue DHCP server detection), requires -s"));
 
         printf(UT_SUPPORT);
-        return;
 }
 
 void print_usage(void) {
@@ -1354,6 +1533,4 @@ void print_usage(void) {
         printf("%s\n", _("Usage:"));
         printf(" %s [-v] [-u] [-x] [-s serverip] [-r requestedip] [-t timeout]\n", progname);
         printf("                  [-i interface] [-m mac]\n");
-
-        return;
 }
diff --git a/plugins-root/check_dhcp.d/config.h b/plugins-root/check_dhcp.d/config.h
new file mode 100644
index 00000000..f189068b
--- /dev/null
+++ b/plugins-root/check_dhcp.d/config.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "../../config.h"
+#include "../lib/states.h"
+#include <stdbool.h>
+#include <netinet/in.h>
+#include "net/if.h"
+#include "output.h"
+
+typedef struct requested_server_struct {
+        struct in_addr server_address;
+        bool answered;
+        struct requested_server_struct *next;
+} requested_server;
+
+typedef struct check_dhcp_config {
+        bool unicast_mode;   /* unicast mode: mimic a DHCP relay */
+        bool exclusive_mode; /* exclusive mode aka "rogue DHCP server detection" */
+        int num_of_requested_servers;
+        struct in_addr dhcp_ip; /* server to query (if in unicast mode) */
+        struct in_addr requested_address;
+        bool request_specific_address;
+
+        int dhcpoffer_timeout;
+        unsigned char *user_specified_mac;
+        char network_interface_name[IFNAMSIZ];
+        requested_server *requested_server_list;
+
+        mp_output_format output_format;
+        bool output_format_is_set;
+} check_dhcp_config;
+
+check_dhcp_config check_dhcp_config_init(void) {
+        check_dhcp_config tmp = {
+                .unicast_mode = false,
+                .exclusive_mode = false,
+                .num_of_requested_servers = 0,
+                .dhcp_ip = {0},
+                .requested_address = {0},
+                .request_specific_address = false,
+
+                .dhcpoffer_timeout = 2,
+                .user_specified_mac = NULL,
+                .network_interface_name = "eth0",
+                .requested_server_list = NULL,
+
+                .output_format_is_set = false,
+        };
+        return tmp;
+}
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c
index dcaceddb..35cae3ed 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -46,12 +46,17 @@ const char *email = "devel@monitoring-plugins.org";
 #include "../plugins/common.h"
 #include "netutils.h"
 #include "utils.h"
+#include "output.h"
+#include "perfdata.h"
 
 #if HAVE_SYS_SOCKIO_H
 #       include <sys/sockio.h>
 #endif
 
 #include <sys/time.h>
+#if defined(SIOCGIFADDR)
+#include <sys/ioctl.h>
+#endif /* SIOCGIFADDR */
 #include <errno.h>
 #include <signal.h>
 #include <ctype.h>
@@ -65,6 +70,17 @@ const char *email = "devel@monitoring-plugins.org";
 #include <netinet/icmp6.h>
 #include <arpa/inet.h>
 #include <math.h>
+#include <netdb.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <sys/socket.h>
+#include <assert.h>
+#include <sys/select.h>
+
+#include "../lib/states.h"
+#include "./check_icmp.d/config.h"
+#include "./check_icmp.d/check_icmp_helpers.h"
 
 /** sometimes undefined system macros (quite a few, actually) **/
 #ifndef MAXTTL
@@ -96,56 +112,8 @@ const char *email = "devel@monitoring-plugins.org";
 #       define ICMP_UNREACH_PRECEDENCE_CUTOFF 15
 #endif
 
-typedef unsigned short range_t; /* type for get_range() -- unimplemented */
-
-typedef struct rta_host {
-        unsigned short id;                            /* id in **table, and icmp pkts */
-        char *name;                                   /* arg used for adding this host */
-        char *msg;                                    /* icmp error message, if any */
-        struct sockaddr_storage saddr_in;             /* the address of this host */
-        struct sockaddr_storage error_addr;           /* stores address of error replies */
-        unsigned long long time_waited;               /* total time waited, in usecs */
-        unsigned int icmp_sent, icmp_recv, icmp_lost; /* counters */
-        unsigned char icmp_type, icmp_code;           /* type and code from errors */
-        unsigned short flags;                         /* control/status flags */
-        double rta;                                   /* measured RTA */
-        int rta_status;                               // check result for RTA checks
-        double rtmax;                                 /* max rtt */
-        double rtmin;                                 /* min rtt */
-        double jitter;                                /* measured jitter */
-        int jitter_status;                            // check result for Jitter checks
-        double jitter_max;                            /* jitter rtt maximum */
-        double jitter_min;                            /* jitter rtt minimum */
-        double EffectiveLatency;
-        double mos;       /* Mean opnion score */
-        int mos_status;   // check result for MOS checks
-        double score;     /* score */
-        int score_status; // check result for score checks
-        u_int last_tdiff;
-        u_int last_icmp_seq;   /* Last ICMP_SEQ to check out of order pkts */
-        unsigned char pl;      /* measured packet loss */
-        int pl_status;         // check result for packet loss checks
-        struct rta_host *next; /* linked list */
-        int order_status;      // check result for packet order checks
-} rta_host;
-
 #define FLAG_LOST_CAUSE 0x01 /* decidedly dead target. */
 
-/* threshold structure. all values are maximum allowed, exclusive */
-typedef struct threshold {
-        unsigned char pl; /* max allowed packet loss in percent */
-        unsigned int rta; /* roundtrip time average, microseconds */
-        double jitter;    /* jitter time average, microseconds */
-        double mos;       /* MOS */
-        double score;     /* Score */
-} threshold;
-
-/* the data structure */
-typedef struct icmp_ping_data {
-        struct timeval stime; /* timestamp (saved in protocol struct as well) */
-        unsigned short ping_id;
-} icmp_ping_data;
-
 typedef union ip_hdr {
         struct ip ip;
         struct ip6_hdr ip6;
@@ -158,24 +126,6 @@ typedef union icmp_packet {
         u_short *cksum_in;
 } icmp_packet;
 
-/* the different modes of this program are as follows:
- * MODE_RTA: send all packets no matter what (mimic check_icmp and check_ping)
- * MODE_HOSTCHECK: Return immediately upon any sign of life
- *                 In addition, sends packets to ALL addresses assigned
- *                 to this host (as returned by gethostbyname() or
- *                 gethostbyaddr() and expects one host only to be checked at
- *                 a time.  Therefore, any packet response what so ever will
- *                 count as a sign of life, even when received outside
- *                 crit.rta limit. Do not misspell any additional IP's.
- * MODE_ALL:  Requires packets from ALL requested IP to return OK (default).
- * MODE_ICMP: implement something similar to check_icmp (MODE_RTA without
- *            tcp and udp args does this)
- */
-#define MODE_RTA       0
-#define MODE_HOSTCHECK 1
-#define MODE_ALL       2
-#define MODE_ICMP      3
-
 enum enum_threshold_mode {
         const_rta_mode,
         const_packet_loss_mode,
@@ -186,89 +136,487 @@ enum enum_threshold_mode {
 
 typedef enum enum_threshold_mode threshold_mode;
 
-/* the different ping types we can do
- * TODO: investigate ARP ping as well */
-#define HAVE_ICMP 1
-#define HAVE_UDP  2
-#define HAVE_TCP  4
-#define HAVE_ARP  8
-
-#define MIN_PING_DATA_SIZE     sizeof(struct icmp_ping_data)
-#define MAX_IP_PKT_SIZE        65536 /* (theoretical) max IP packet size */
-#define IP_HDR_SIZE            20
-#define MAX_PING_DATA          (MAX_IP_PKT_SIZE - IP_HDR_SIZE - ICMP_MINLEN)
-#define DEFAULT_PING_DATA_SIZE (MIN_PING_DATA_SIZE + 44)
-
-/* various target states */
-#define TSTATE_INACTIVE 0x01 /* don't ping this host anymore */
-#define TSTATE_WAITING  0x02 /* unanswered packets on the wire */
-#define TSTATE_ALIVE    0x04 /* target is alive (has answered something) */
-#define TSTATE_UNREACH  0x08
-
 /** prototypes **/
-void print_help(void);
+void print_help();
 void print_usage(void);
-static u_int get_timevar(const char *);
-static u_int get_timevaldiff(struct timeval *, struct timeval *);
-static in_addr_t get_ip_address(const char *);
-static int wait_for_reply(int, u_int);
-static int recvfrom_wto(int, void *, unsigned int, struct sockaddr *, u_int *, struct timeval *);
-static int send_icmp_ping(int, struct rta_host *);
-static int get_threshold(char *str, threshold *th);
-static bool get_threshold2(char *str, size_t length, threshold *, threshold *, threshold_mode mode);
-static bool parse_threshold2_helper(char *s, size_t length, threshold *thr, threshold_mode mode);
-static void run_checks(void);
-static void set_source_ip(char *);
-static int add_target(char *);
-static int add_target_ip(char *, struct sockaddr_storage *);
-static int handle_random_icmp(unsigned char *, struct sockaddr_storage *);
-static void parse_address(struct sockaddr_storage *, char *, int);
-static unsigned short icmp_checksum(uint16_t *, size_t);
-static void finish(int);
-static void crash(const char *, ...);
-
-/** external **/
-extern int optind;
-extern char *optarg;
-extern char **environ;
+
+/* Time related */
+typedef struct {
+        int error_code;
+        time_t time_range;
+} get_timevar_wrapper;
+static get_timevar_wrapper get_timevar(const char *str);
+static time_t get_timevaldiff(struct timeval earlier, struct timeval later);
+static time_t get_timevaldiff_to_now(struct timeval earlier);
+
+static in_addr_t get_ip_address(const char *ifname, const int icmp_sock);
+static void set_source_ip(char *arg, int icmp_sock, sa_family_t addr_family);
+
+/* Receiving data */
+static int wait_for_reply(check_icmp_socket_set sockset, time_t time_interval,
+                                                  unsigned short icmp_pkt_size, time_t *target_interval, uint16_t sender_id,
+                                                  ping_target **table, unsigned short packets,
+                                                  unsigned short number_of_targets, check_icmp_state *program_state);
+
+typedef struct {
+        sa_family_t recv_proto;
+        ssize_t received;
+} recvfrom_wto_wrapper;
+static recvfrom_wto_wrapper recvfrom_wto(check_icmp_socket_set sockset, void *buf, unsigned int len,
+                                                                                 struct sockaddr *saddr, time_t *timeout,
+                                                                                 struct timeval *received_timestamp);
+static int handle_random_icmp(unsigned char *packet, struct sockaddr_storage *addr,
+                                                          time_t *target_interval, uint16_t sender_id, ping_target **table,
+                                                          unsigned short packets, unsigned short number_of_targets,
+                                                          check_icmp_state *program_state);
+
+/* Sending data */
+static int send_icmp_ping(check_icmp_socket_set sockset, ping_target *host,
+                                                  unsigned short icmp_pkt_size, uint16_t sender_id,
+                                                  check_icmp_state *program_state);
+
+/* Threshold related */
+typedef struct {
+        int errorcode;
+        check_icmp_threshold threshold;
+} get_threshold_wrapper;
+static get_threshold_wrapper get_threshold(char *str, check_icmp_threshold threshold);
+
+typedef struct {
+        int errorcode;
+        check_icmp_threshold warn;
+        check_icmp_threshold crit;
+} get_threshold2_wrapper;
+static get_threshold2_wrapper get_threshold2(char *str, size_t length, check_icmp_threshold warn,
+                                                                                         check_icmp_threshold crit, threshold_mode mode);
+
+typedef struct {
+        int errorcode;
+        check_icmp_threshold result;
+} parse_threshold2_helper_wrapper;
+static parse_threshold2_helper_wrapper parse_threshold2_helper(char *threshold_string,
+                                                                                                                           size_t length,
+                                                                                                                           check_icmp_threshold thr,
+                                                                                                                           threshold_mode mode);
+
+/* main test function */
+static void run_checks(unsigned short icmp_pkt_size, time_t *target_interval, uint16_t sender_id,
+                                           check_icmp_execution_mode mode, time_t max_completion_time,
+                                           struct timeval prog_start, ping_target **table, unsigned short packets,
+                                           check_icmp_socket_set sockset, unsigned short number_of_targets,
+                                           check_icmp_state *program_state);
+mp_subcheck evaluate_target(ping_target target, check_icmp_mode_switches modes,
+                                                        check_icmp_threshold warn, check_icmp_threshold crit);
+
+typedef struct {
+        int targets_ok;
+        int targets_warn;
+        mp_subcheck sc_host;
+} evaluate_host_wrapper;
+evaluate_host_wrapper evaluate_host(check_icmp_target_container host,
+                                                                        check_icmp_mode_switches modes, check_icmp_threshold warn,
+                                                                        check_icmp_threshold crit);
+
+/* Target acquisition */
+typedef struct {
+        int error_code;
+        check_icmp_target_container host;
+        bool has_v4;
+        bool has_v6;
+} add_host_wrapper;
+static add_host_wrapper add_host(char *arg, check_icmp_execution_mode mode,
+                                                                 sa_family_t enforced_proto);
+
+typedef struct {
+        int error_code;
+        ping_target *targets;
+        unsigned int number_of_targets;
+        bool has_v4;
+        bool has_v6;
+} add_target_wrapper;
+static add_target_wrapper add_target(char *arg, check_icmp_execution_mode mode,
+                                                                         sa_family_t enforced_proto);
+
+typedef struct {
+        int error_code;
+        ping_target *target;
+} add_target_ip_wrapper;
+static add_target_ip_wrapper add_target_ip(struct sockaddr_storage address);
+
+static void parse_address(const struct sockaddr_storage *addr, char *dst, socklen_t size);
+
+static unsigned short icmp_checksum(uint16_t *packet, size_t packet_size);
+
+/* End of run function */
+static void finish(int sign, check_icmp_mode_switches modes, int min_hosts_alive,
+                                   check_icmp_threshold warn, check_icmp_threshold crit,
+                                   unsigned short number_of_targets, check_icmp_state *program_state,
+                                   check_icmp_target_container host_list[], unsigned short number_of_hosts,
+                                   mp_check overall[static 1]);
+
+/* Error exit */
+static void crash(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
 
 /** global variables **/
-static struct rta_host **table, *cursor, *list;
-
-static threshold crit = {.pl = 80, .rta = 500000, .jitter = 0.0, .mos = 0.0, .score = 0.0};
-static threshold warn = {.pl = 40, .rta = 200000, .jitter = 0.0, .mos = 0.0, .score = 0.0};
-
-static int mode, protocols, sockets, debug = 0, timeout = 10;
-static unsigned short icmp_data_size = DEFAULT_PING_DATA_SIZE;
-static unsigned short icmp_pkt_size = DEFAULT_PING_DATA_SIZE + ICMP_MINLEN;
-
-static unsigned int icmp_sent = 0, icmp_recv = 0, icmp_lost = 0, ttl = 0;
-#define icmp_pkts_en_route (icmp_sent - (icmp_recv + icmp_lost))
-static unsigned short targets_down = 0, targets = 0, packets = 0;
-#define targets_alive (targets - targets_down)
-static unsigned int retry_interval, pkt_interval, target_interval;
-static int icmp_sock, tcp_sock, udp_sock, status = STATE_OK;
-static pid_t pid;
-static struct timezone tz;
-static struct timeval prog_start;
-static unsigned long long max_completion_time = 0;
-static unsigned int warn_down = 1, crit_down = 1; /* host down threshold values */
-static int min_hosts_alive = -1;
-static float pkt_backoff_factor = 1.5;
-static float target_backoff_factor = 1.5;
-static bool rta_mode = false;
-static bool pl_mode = false;
-static bool jitter_mode = false;
-static bool score_mode = false;
-static bool mos_mode = false;
-static bool order_mode = false;
+static int debug = 0;
+
+extern unsigned int timeout;
+
+/** the working code **/
+static inline unsigned short targets_alive(unsigned short targets, unsigned short targets_down) {
+        return targets - targets_down;
+}
+static inline unsigned int icmp_pkts_en_route(unsigned int icmp_sent, unsigned int icmp_recv,
+                                                                                          unsigned int icmp_lost) {
+        return icmp_sent - (icmp_recv + icmp_lost);
+}
+
+// Create configuration from cli parameters
+typedef struct {
+        int errorcode;
+        check_icmp_config config;
+} check_icmp_config_wrapper;
+check_icmp_config_wrapper process_arguments(int argc, char **argv) {
+        /* get calling name the old-fashioned way for portability instead
+         * of relying on the glibc-ism __progname */
+        char *ptr = strrchr(argv[0], '/');
+        if (ptr) {
+                progname = &ptr[1];
+        } else {
+                progname = argv[0];
+        }
+
+        check_icmp_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_icmp_config_init(),
+        };
+
+        /* use the pid to mark packets as ours */
+        /* Some systems have 32-bit pid_t so mask off only 16 bits */
+        result.config.sender_id = getpid() & 0xffff;
+
+        if (!strcmp(progname, "check_icmp") || !strcmp(progname, "check_ping")) {
+                result.config.mode = MODE_ICMP;
+        } else if (!strcmp(progname, "check_host")) {
+                result.config.mode = MODE_HOSTCHECK;
+                result.config.number_of_packets = 5;
+                result.config.crit.rta = result.config.warn.rta = 1000000;
+                result.config.crit.pl = result.config.warn.pl = 100;
+        } else if (!strcmp(progname, "check_rta_multi")) {
+                result.config.mode = MODE_ALL;
+                result.config.target_interval = 0;
+                result.config.number_of_packets = 5;
+        }
+        /* support "--help" and "--version" */
+        if (argc == 2) {
+                if (!strcmp(argv[1], "--help")) {
+                        strcpy(argv[1], "-h");
+                }
+                if (!strcmp(argv[1], "--version")) {
+                        strcpy(argv[1], "-V");
+                }
+        }
+
+        sa_family_t enforced_ai_family = AF_UNSPEC;
+
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
+
+        struct option longopts[] = {
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+                {"verbose", no_argument, 0, 'v'},
+                {"Host", required_argument, 0, 'H'},
+                {"ipv4-only", no_argument, 0, '4'},
+                {"ipv6-only", no_argument, 0, '6'},
+                {"warning", required_argument, 0, 'w'},
+                {"critical", required_argument, 0, 'c'},
+                {"rta-mode-thresholds", required_argument, 0, 'R'},
+                {"packet-loss-mode-thresholds", required_argument, 0, 'P'},
+                {"jitter-mode-thresholds", required_argument, 0, 'J'},
+                {"mos-mode-thresholds", required_argument, 0, 'M'},
+                {"score-mode-thresholds", required_argument, 0, 'S'},
+                {"out-of-order-packets", no_argument, 0, 'O'},
+                {"number-of-packets", required_argument, 0, 'n'},
+                {"number-of-packets", required_argument, 0, 'p'},
+                {"packet-interval", required_argument, 0, 'i'},
+                {"target-interval", required_argument, 0, 'I'},
+                {"minimal-host-alive", required_argument, 0, 'm'},
+                {"outgoing-ttl", required_argument, 0, 'l'},
+                {"size", required_argument, 0, 'b'},
+                {"output-format", required_argument, 0, output_format_index},
+                {},
+        };
+
+        // Parse protocol arguments first
+        // and count hosts here
+        char *opts_str = "vhVw:c:n:p:t:H:s:i:b:I:l:m:P:R:J:S:M:O64";
+        for (int i = 1; i < argc; i++) {
+                long int arg;
+                while ((arg = getopt_long(argc, argv, opts_str, longopts, NULL)) != EOF) {
+                        switch (arg) {
+
+                        case '4':
+                                if (enforced_ai_family != AF_UNSPEC) {
+                                        crash("Multiple protocol versions not supported");
+                                }
+                                enforced_ai_family = AF_INET;
+                                break;
+                        case '6':
+                                if (enforced_ai_family != AF_UNSPEC) {
+                                        crash("Multiple protocol versions not supported");
+                                }
+                                enforced_ai_family = AF_INET6;
+                                break;
+                        case 'H': {
+                                result.config.number_of_hosts++;
+                                break;
+                        }
+                        case 'h': /* help */
+                                // Trigger help here to avoid adding hosts before that (and doing DNS queries)
+                                print_help();
+                                exit(STATE_UNKNOWN);
+                                break;
+                        case 'v':
+                                debug++;
+                                break;
+                        }
+                }
+        }
+
+        char **tmp = &argv[optind];
+        while (*tmp) {
+                result.config.number_of_hosts++;
+                tmp++;
+        }
+
+        // Sanity check: if hostmode is selected,only a single host is allowed
+        if (result.config.mode == MODE_HOSTCHECK && result.config.number_of_hosts > 1) {
+                usage("check_host only allows a single host");
+        }
+
+        // Allocate hosts
+        result.config.hosts =
+                calloc(result.config.number_of_hosts, sizeof(check_icmp_target_container));
+        if (result.config.hosts == NULL) {
+                crash("failed to allocate memory");
+        }
+
+        /* Reset argument scanning */
+        optind = 1;
+
+        int host_counter = 0;
+        /* parse the arguments */
+        for (int i = 1; i < argc; i++) {
+                long int arg;
+                while ((arg = getopt_long(argc, argv, opts_str, longopts, NULL)) != EOF) {
+                        switch (arg) {
+                        case 'b': {
+                                long size = strtol(optarg, NULL, 0);
+                                if ((unsigned long)size >= (sizeof(struct icmp) + sizeof(struct icmp_ping_data)) &&
+                                        size < MAX_PING_DATA) {
+                                        result.config.icmp_data_size = (unsigned short)size;
+                                } else {
+                                        usage_va("ICMP data length must be between: %lu and %lu",
+                                                         sizeof(struct icmp) + sizeof(struct icmp_ping_data),
+                                                         MAX_PING_DATA - 1);
+                                }
+                        } break;
+                        case 'i': {
+                                // packet_interval was unused and is now removed
+                        } break;
+                        case 'I': {
+                                get_timevar_wrapper parsed_time = get_timevar(optarg);
+
+                                if (parsed_time.error_code == OK) {
+                                        result.config.target_interval = parsed_time.time_range;
+                                } else {
+                                        crash("failed to parse target interval");
+                                }
+                        } break;
+                        case 'w': {
+                                get_threshold_wrapper warn = get_threshold(optarg, result.config.warn);
+                                if (warn.errorcode == OK) {
+                                        result.config.warn = warn.threshold;
+                                } else {
+                                        crash("failed to parse warning threshold");
+                                }
+                        } break;
+                        case 'c': {
+                                get_threshold_wrapper crit = get_threshold(optarg, result.config.crit);
+                                if (crit.errorcode == OK) {
+                                        result.config.crit = crit.threshold;
+                                } else {
+                                        crash("failed to parse critical threshold");
+                                }
+                        } break;
+                        case 'n':
+                        case 'p':
+                                result.config.number_of_packets = (unsigned short)strtoul(optarg, NULL, 0);
+                                if (result.config.number_of_packets > 20) {
+                                        errno = 0;
+                                        crash("packets is > 20 (%d)", result.config.number_of_packets);
+                                }
+                                break;
+                        case 't':
+                                // WARNING Deprecated since execution time is determined by the other factors
+                                break;
+                        case 'H': {
+                                add_host_wrapper host_add_result =
+                                        add_host(optarg, result.config.mode, enforced_ai_family);
+                                if (host_add_result.error_code == OK) {
+                                        result.config.hosts[host_counter] = host_add_result.host;
+                                        host_counter++;
+
+                                        if (result.config.targets != NULL) {
+                                                result.config.number_of_targets += ping_target_list_append(
+                                                        result.config.targets, host_add_result.host.target_list);
+                                        } else {
+                                                result.config.targets = host_add_result.host.target_list;
+                                                result.config.number_of_targets += host_add_result.host.number_of_targets;
+                                        }
+
+                                        if (host_add_result.has_v4) {
+                                                result.config.need_v4 = true;
+                                        }
+                                        if (host_add_result.has_v6) {
+                                                result.config.need_v6 = true;
+                                        }
+                                } else {
+                                        crash("Failed to add host, unable to parse it correctly");
+                                }
+                        } break;
+                        case 'l':
+                                result.config.ttl = strtoul(optarg, NULL, 0);
+                                break;
+                        case 'm':
+                                result.config.min_hosts_alive = (int)strtoul(optarg, NULL, 0);
+                                break;
+                        case 's': /* specify source IP address */
+                                result.config.source_ip = optarg;
+                                break;
+                        case 'V': /* version */
+                                print_revision(progname, NP_VERSION);
+                                exit(STATE_UNKNOWN);
+                        case 'R': /* RTA mode */ {
+                                get_threshold2_wrapper rta_th = get_threshold2(
+                                        optarg, strlen(optarg), result.config.warn, result.config.crit, const_rta_mode);
+
+                                if (rta_th.errorcode != OK) {
+                                        crash("Failed to parse RTA threshold");
+                                }
+
+                                result.config.warn = rta_th.warn;
+                                result.config.crit = rta_th.crit;
+                                result.config.modes.rta_mode = true;
+                        } break;
+                        case 'P': /* packet loss mode */ {
+                                get_threshold2_wrapper pl_th =
+                                        get_threshold2(optarg, strlen(optarg), result.config.warn, result.config.crit,
+                                                                   const_packet_loss_mode);
+                                if (pl_th.errorcode != OK) {
+                                        crash("Failed to parse packet loss threshold");
+                                }
+
+                                result.config.warn = pl_th.warn;
+                                result.config.crit = pl_th.crit;
+                                result.config.modes.pl_mode = true;
+                        } break;
+                        case 'J': /* jitter mode */ {
+                                get_threshold2_wrapper jitter_th =
+                                        get_threshold2(optarg, strlen(optarg), result.config.warn, result.config.crit,
+                                                                   const_jitter_mode);
+                                if (jitter_th.errorcode != OK) {
+                                        crash("Failed to parse jitter threshold");
+                                }
+
+                                result.config.warn = jitter_th.warn;
+                                result.config.crit = jitter_th.crit;
+                                result.config.modes.jitter_mode = true;
+                        } break;
+                        case 'M': /* MOS mode */ {
+                                get_threshold2_wrapper mos_th = get_threshold2(
+                                        optarg, strlen(optarg), result.config.warn, result.config.crit, const_mos_mode);
+                                if (mos_th.errorcode != OK) {
+                                        crash("Failed to parse MOS threshold");
+                                }
+
+                                result.config.warn = mos_th.warn;
+                                result.config.crit = mos_th.crit;
+                                result.config.modes.mos_mode = true;
+                        } break;
+                        case 'S': /* score mode */ {
+                                get_threshold2_wrapper score_th =
+                                        get_threshold2(optarg, strlen(optarg), result.config.warn, result.config.crit,
+                                                                   const_score_mode);
+                                if (score_th.errorcode != OK) {
+                                        crash("Failed to parse score threshold");
+                                }
+
+                                result.config.warn = score_th.warn;
+                                result.config.crit = score_th.crit;
+                                result.config.modes.score_mode = true;
+                        } break;
+                        case 'O': /* out of order mode */
+                                result.config.modes.order_mode = true;
+                                break;
+                        case output_format_index: {
+                                parsed_output_format parser = mp_parse_output_format(optarg);
+                                if (!parser.parsing_success) {
+                                        // TODO List all available formats here, maybe add anothoer usage function
+                                        printf("Invalid output format: %s\n", optarg);
+                                        exit(STATE_UNKNOWN);
+                                }
+
+                                result.config.output_format_is_set = true;
+                                result.config.output_format = parser.output_format;
+                                break;
+                        }
+                        }
+                }
+        }
+
+        argv = &argv[optind];
+        while (*argv) {
+                add_target(*argv, result.config.mode, enforced_ai_family);
+                argv++;
+        }
+
+        if (!result.config.number_of_targets) {
+                errno = 0;
+                crash("No hosts to check");
+        }
+
+        /* stupid users should be able to give whatever thresholds they want
+         * (nothing will break if they do), but some anal plugin maintainer
+         * will probably add some printf() thing here later, so it might be
+         * best to at least show them where to do it. ;) */
+        if (result.config.warn.pl > result.config.crit.pl) {
+                result.config.warn.pl = result.config.crit.pl;
+        }
+        if (result.config.warn.rta > result.config.crit.rta) {
+                result.config.warn.rta = result.config.crit.rta;
+        }
+        if (result.config.warn.jitter > result.config.crit.jitter) {
+                result.config.crit.jitter = result.config.warn.jitter;
+        }
+        if (result.config.warn.mos < result.config.crit.mos) {
+                result.config.warn.mos = result.config.crit.mos;
+        }
+        if (result.config.warn.score < result.config.crit.score) {
+                result.config.warn.score = result.config.crit.score;
+        }
+
+        return result;
+}
 
 /** code start **/
 static void crash(const char *fmt, ...) {
-        va_list ap;
 
         printf("%s: ", progname);
 
+        va_list ap;
         va_start(ap, fmt);
         vprintf(fmt, ap);
         va_end(ap);
@@ -385,18 +733,20 @@ static const char *get_icmp_error_msg(unsigned char icmp_type, unsigned char icm
         return msg;
 }
 
-static int handle_random_icmp(unsigned char *packet, struct sockaddr_storage *addr) {
-        struct icmp p, sent_icmp;
-        struct rta_host *host = NULL;
-
-        memcpy(&p, packet, sizeof(p));
-        if (p.icmp_type == ICMP_ECHO && ntohs(p.icmp_id) == pid) {
+static int handle_random_icmp(unsigned char *packet, struct sockaddr_storage *addr,
+                                                          time_t *target_interval, const uint16_t sender_id,
+                                                          ping_target **table, unsigned short packets,
+                                                          const unsigned short number_of_targets,
+                                                          check_icmp_state *program_state) {
+        struct icmp icmp_packet;
+        memcpy(&icmp_packet, packet, sizeof(icmp_packet));
+        if (icmp_packet.icmp_type == ICMP_ECHO && ntohs(icmp_packet.icmp_id) == sender_id) {
                 /* echo request from us to us (pinging localhost) */
                 return 0;
         }
 
         if (debug) {
-                printf("handle_random_icmp(%p, %p)\n", (void *)&p, (void *)addr);
+                printf("handle_random_icmp(%p, %p)\n", (void *)&icmp_packet, (void *)addr);
         }
 
         /* only handle a few types, since others can't possibly be replies to
@@ -409,14 +759,17 @@ static int handle_random_icmp(unsigned char *packet, struct sockaddr_storage *ad
          * TIMXCEED actually sends a proper icmp response we will have passed
          * too many hops to have a hope of reaching it later, in which case it
          * indicates overconfidence in the network, poor routing or both. */
-        if (p.icmp_type != ICMP_UNREACH && p.icmp_type != ICMP_TIMXCEED && p.icmp_type != ICMP_SOURCEQUENCH && p.icmp_type != ICMP_PARAMPROB) {
+        if (icmp_packet.icmp_type != ICMP_UNREACH && icmp_packet.icmp_type != ICMP_TIMXCEED &&
+                icmp_packet.icmp_type != ICMP_SOURCEQUENCH && icmp_packet.icmp_type != ICMP_PARAMPROB) {
                 return 0;
         }
 
         /* might be for us. At least it holds the original package (according
          * to RFC 792). If it isn't, just ignore it */
+        struct icmp sent_icmp;
         memcpy(&sent_icmp, packet + 28, sizeof(sent_icmp));
-        if (sent_icmp.icmp_type != ICMP_ECHO || ntohs(sent_icmp.icmp_id) != pid || ntohs(sent_icmp.icmp_seq) >= targets * packets) {
+        if (sent_icmp.icmp_type != ICMP_ECHO || ntohs(sent_icmp.icmp_id) != sender_id ||
+                ntohs(sent_icmp.icmp_seq) >= number_of_targets * packets) {
                 if (debug) {
                         printf("Packet is no response to a packet we sent\n");
                 }
@@ -424,14 +777,15 @@ static int handle_random_icmp(unsigned char *packet, struct sockaddr_storage *ad
         }
 
         /* it is indeed a response for us */
-        host = table[ntohs(sent_icmp.icmp_seq) / packets];
+        ping_target *host = table[ntohs(sent_icmp.icmp_seq) / packets];
         if (debug) {
                 char address[INET6_ADDRSTRLEN];
                 parse_address(addr, address, sizeof(address));
-                printf("Received \"%s\" from %s for ICMP ECHO sent to %s.\n", get_icmp_error_msg(p.icmp_type, p.icmp_code), address, host->name);
+                printf("Received \"%s\" from %s for ICMP ECHO sent.\n",
+                           get_icmp_error_msg(icmp_packet.icmp_type, icmp_packet.icmp_code), address);
         }
 
-        icmp_lost++;
+        program_state->icmp_lost++;
         host->icmp_lost++;
         /* don't spend time on lost hosts any more */
         if (host->flags & FLAG_LOST_CAUSE) {
@@ -440,305 +794,104 @@ static int handle_random_icmp(unsigned char *packet, struct sockaddr_storage *ad
 
         /* source quench means we're sending too fast, so increase the
          * interval and mark this packet lost */
-        if (p.icmp_type == ICMP_SOURCEQUENCH) {
-                pkt_interval *= pkt_backoff_factor;
-                target_interval *= target_backoff_factor;
+        if (icmp_packet.icmp_type == ICMP_SOURCEQUENCH) {
+                *target_interval = (unsigned int)((double)*target_interval * TARGET_BACKOFF_FACTOR);
         } else {
-                targets_down++;
+                program_state->targets_down++;
                 host->flags |= FLAG_LOST_CAUSE;
         }
-        host->icmp_type = p.icmp_type;
-        host->icmp_code = p.icmp_code;
+        host->icmp_type = icmp_packet.icmp_type;
+        host->icmp_code = icmp_packet.icmp_code;
         host->error_addr = *addr;
 
         return 0;
 }
 
-void parse_address(struct sockaddr_storage *addr, char *address, int size) {
-        switch (address_family) {
+void parse_address(const struct sockaddr_storage *addr, char *dst, socklen_t size) {
+        switch (addr->ss_family) {
         case AF_INET:
-                inet_ntop(address_family, &((struct sockaddr_in *)addr)->sin_addr, address, size);
+                inet_ntop(AF_INET, &((struct sockaddr_in *)addr)->sin_addr, dst, size);
                 break;
         case AF_INET6:
-                inet_ntop(address_family, &((struct sockaddr_in6 *)addr)->sin6_addr, address, size);
+                inet_ntop(AF_INET6, &((struct sockaddr_in6 *)addr)->sin6_addr, dst, size);
                 break;
+        default:
+                assert(false);
         }
 }
 
 int main(int argc, char **argv) {
-        int i;
-        char *ptr;
-        long int arg;
-        int icmp_sockerrno, udp_sockerrno, tcp_sockerrno;
-        int result;
-        struct rta_host *host;
-#ifdef HAVE_SIGACTION
-        struct sigaction sig_action;
-#endif
-#ifdef SO_TIMESTAMP
-        int on = 1;
-#endif
-        char *source_ip = NULL;
-        char *opts_str = "vhVw:c:n:p:t:H:s:i:b:I:l:m:P:R:J:S:M:O64";
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
-        /* we only need to be setsuid when we get the sockets, so do
-         * that before pointer magic (esp. on network data) */
-        icmp_sockerrno = udp_sockerrno = tcp_sockerrno = sockets = 0;
-
-        address_family = -1;
-        int icmp_proto = IPPROTO_ICMP;
+        /* POSIXLY_CORRECT might break things, so unset it (the portable way) */
+        environ = NULL;
 
-        /* get calling name the old-fashioned way for portability instead
-         * of relying on the glibc-ism __progname */
-        ptr = strrchr(argv[0], '/');
-        if (ptr) {
-                progname = &ptr[1];
-        } else {
-                progname = argv[0];
-        }
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
 
-        /* now set defaults. Use progname to set them initially (allows for
-         * superfast check_host program when target host is up */
-        cursor = list = NULL;
-        table = NULL;
-
-        mode = MODE_RTA;
-        /* Default critical thresholds */
-        crit.rta = 500000;
-        crit.pl = 80;
-        crit.jitter = 50;
-        crit.mos = 3;
-        crit.score = 70;
-        /* Default warning thresholds */
-        warn.rta = 200000;
-        warn.pl = 40;
-        warn.jitter = 40;
-        warn.mos = 3.5;
-        warn.score = 80;
-
-        protocols = HAVE_ICMP | HAVE_UDP | HAVE_TCP;
-        pkt_interval = 80000; /* 80 msec packet interval by default */
-        packets = 5;
+        check_icmp_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        if (!strcmp(progname, "check_icmp") || !strcmp(progname, "check_ping")) {
-                mode = MODE_ICMP;
-                protocols = HAVE_ICMP;
-        } else if (!strcmp(progname, "check_host")) {
-                mode = MODE_HOSTCHECK;
-                pkt_interval = 1000000;
-                packets = 5;
-                crit.rta = warn.rta = 1000000;
-                crit.pl = warn.pl = 100;
-        } else if (!strcmp(progname, "check_rta_multi")) {
-                mode = MODE_ALL;
-                target_interval = 0;
-                pkt_interval = 50000;
-                packets = 5;
+        if (tmp_config.errorcode != OK) {
+                crash("failed to parse config");
         }
 
-        /* support "--help" and "--version" */
-        if (argc == 2) {
-                if (!strcmp(argv[1], "--help")) {
-                        strcpy(argv[1], "-h");
-                }
-                if (!strcmp(argv[1], "--version")) {
-                        strcpy(argv[1], "-V");
-                }
-        }
+        const check_icmp_config config = tmp_config.config;
 
-        /* Parse protocol arguments first */
-        for (i = 1; i < argc; i++) {
-                while ((arg = getopt(argc, argv, opts_str)) != EOF) {
-                        switch (arg) {
-                        case '4':
-                                if (address_family != -1) {
-                                        crash("Multiple protocol versions not supported");
-                                }
-                                address_family = AF_INET;
-                                break;
-                        case '6':
-#ifdef USE_IPV6
-                                if (address_family != -1) {
-                                        crash("Multiple protocol versions not supported");
-                                }
-                                address_family = AF_INET6;
-#else
-                                usage(_("IPv6 support not available\n"));
-#endif
-                                break;
-                        }
-                }
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
         }
 
-        /* Reset argument scanning */
-        optind = 1;
+        check_icmp_socket_set sockset = {
+                .socket4 = -1,
+                .socket6 = -1,
+        };
 
-        unsigned long size;
-        bool err;
-        /* parse the arguments */
-        for (i = 1; i < argc; i++) {
-                while ((arg = getopt(argc, argv, opts_str)) != EOF) {
-                        switch (arg) {
-                        case 'v':
-                                debug++;
-                                break;
-                        case 'b':
-                                size = strtol(optarg, NULL, 0);
-                                if (size >= (sizeof(struct icmp) + sizeof(struct icmp_ping_data)) && size < MAX_PING_DATA) {
-                                        icmp_data_size = size;
-                                        icmp_pkt_size = size + ICMP_MINLEN;
-                                } else {
-                                        usage_va("ICMP data length must be between: %lu and %lu", sizeof(struct icmp) + sizeof(struct icmp_ping_data),
-                                                         MAX_PING_DATA - 1);
-                                }
-                                break;
-                        case 'i':
-                                pkt_interval = get_timevar(optarg);
-                                break;
-                        case 'I':
-                                target_interval = get_timevar(optarg);
-                                break;
-                        case 'w':
-                                get_threshold(optarg, &warn);
-                                break;
-                        case 'c':
-                                get_threshold(optarg, &crit);
-                                break;
-                        case 'n':
-                        case 'p':
-                                packets = strtoul(optarg, NULL, 0);
-                                break;
-                        case 't':
-                                timeout = strtoul(optarg, NULL, 0);
-                                if (!timeout) {
-                                        timeout = 10;
-                                }
-                                break;
-                        case 'H':
-                                add_target(optarg);
-                                break;
-                        case 'l':
-                                ttl = (int)strtoul(optarg, NULL, 0);
-                                break;
-                        case 'm':
-                                min_hosts_alive = (int)strtoul(optarg, NULL, 0);
-                                break;
-                        case 'd': /* implement later, for cluster checks */
-                                warn_down = (unsigned char)strtoul(optarg, &ptr, 0);
-                                if (ptr) {
-                                        crit_down = (unsigned char)strtoul(ptr + 1, NULL, 0);
-                                }
-                                break;
-                        case 's': /* specify source IP address */
-                                source_ip = optarg;
-                                break;
-                        case 'V': /* version */
-                                print_revision(progname, NP_VERSION);
-                                exit(STATE_UNKNOWN);
-                        case 'h': /* help */
-                                print_help();
-                                exit(STATE_UNKNOWN);
-                                break;
-                        case 'R': /* RTA mode */
-                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_rta_mode);
-                                if (!err) {
-                                        crash("Failed to parse RTA threshold");
-                                }
+        if (config.need_v4) {
+                sockset.socket4 = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+                if (sockset.socket4 == -1) {
+                        crash("Failed to obtain ICMP v4 socket");
+                }
 
-                                rta_mode = true;
-                                break;
-                        case 'P': /* packet loss mode */
-                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_packet_loss_mode);
-                                if (!err) {
-                                        crash("Failed to parse packet loss threshold");
-                                }
+                if (config.source_ip) {
 
-                                pl_mode = true;
-                                break;
-                        case 'J': /* jitter mode */
-                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_jitter_mode);
-                                if (!err) {
-                                        crash("Failed to parse jitter threshold");
-                                }
+                        struct in_addr tmp = {};
+                        int error_code = inet_pton(AF_INET, config.source_ip, &tmp);
+                        if (error_code == 1) {
+                                set_source_ip(config.source_ip, sockset.socket4, AF_INET);
+                        } else {
+                                // just try this mindlessly if it's not a v4 address
+                                set_source_ip(config.source_ip, sockset.socket6, AF_INET6);
+                        }
+                }
 
-                                jitter_mode = true;
-                                break;
-                        case 'M': /* MOS mode */
-                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_mos_mode);
-                                if (!err) {
-                                        crash("Failed to parse MOS threshold");
+#ifdef SO_TIMESTAMP
+                if (sockset.socket4 != -1) {
+                        int on = 1;
+                        if (setsockopt(sockset.socket4, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on))) {
+                                if (debug) {
+                                        printf("Warning: no SO_TIMESTAMP support\n");
                                 }
-
-                                mos_mode = true;
-                                break;
-                        case 'S': /* score mode */
-                                err = get_threshold2(optarg, strlen(optarg), &warn, &crit, const_score_mode);
-                                if (!err) {
-                                        crash("Failed to parse score threshold");
+                        }
+                }
+                if (sockset.socket6 != -1) {
+                        int on = 1;
+                        if (setsockopt(sockset.socket6, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on))) {
+                                if (debug) {
+                                        printf("Warning: no SO_TIMESTAMP support\n");
                                 }
-
-                                score_mode = true;
-                                break;
-                        case 'O': /* out of order mode */
-                                order_mode = true;
-                                break;
                         }
                 }
+#endif // SO_TIMESTAMP
         }
 
-        /* POSIXLY_CORRECT might break things, so unset it (the portable way) */
-        environ = NULL;
-
-        /* use the pid to mark packets as ours */
-        /* Some systems have 32-bit pid_t so mask off only 16 bits */
-        pid = getpid() & 0xffff;
-        /* printf("pid = %u\n", pid); */
-
-        /* Parse extra opts if any */
-        argv = np_extra_opts(&argc, argv, progname);
-
-        argv = &argv[optind];
-        while (*argv) {
-                add_target(*argv);
-                argv++;
-        }
-
-        if (!targets) {
-                errno = 0;
-                crash("No hosts to check");
-        }
-
-        // add_target might change address_family
-        switch (address_family) {
-        case AF_INET:
-                icmp_proto = IPPROTO_ICMP;
-                break;
-        case AF_INET6:
-                icmp_proto = IPPROTO_ICMPV6;
-                break;
-        default:
-                crash("Address family not supported");
-        }
-        if ((icmp_sock = socket(address_family, SOCK_RAW, icmp_proto)) != -1) {
-                sockets |= HAVE_ICMP;
-        } else {
-                icmp_sockerrno = errno;
-        }
-
-        if (source_ip) {
-                set_source_ip(source_ip);
-        }
-
-#ifdef SO_TIMESTAMP
-        if (setsockopt(icmp_sock, SOL_SOCKET, SO_TIMESTAMP, &on, sizeof(on))) {
-                if (debug) {
-                        printf("Warning: no SO_TIMESTAMP support\n");
+        if (config.need_v6) {
+                sockset.socket6 = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+                if (sockset.socket6 == -1) {
+                        crash("Failed to obtain ICMP v6 socket");
                 }
         }
-#endif // SO_TIMESTAMP
 
         /* now drop privileges (no effect if not setsuid or geteuid() == 0) */
         if (setuid(getuid()) == -1) {
@@ -746,186 +899,179 @@ int main(int argc, char **argv) {
                 return 1;
         }
 
-        if (!sockets) {
-                if (icmp_sock == -1) {
-                        errno = icmp_sockerrno;
-                        crash("Failed to obtain ICMP socket");
-                        return -1;
-                }
-                /* if(udp_sock == -1) { */
-                /*      errno = icmp_sockerrno; */
-                /*      crash("Failed to obtain UDP socket"); */
-                /*      return -1; */
-                /* } */
-                /* if(tcp_sock == -1) { */
-                /*      errno = icmp_sockerrno; */
-                /*      crash("Failed to obtain TCP socker"); */
-                /*      return -1; */
-                /* } */
-        }
-        if (!ttl) {
-                ttl = 64;
-        }
-
-        if (icmp_sock) {
-                result = setsockopt(icmp_sock, SOL_IP, IP_TTL, &ttl, sizeof(ttl));
+        if (sockset.socket4) {
+                int result = setsockopt(sockset.socket4, SOL_IP, IP_TTL, &config.ttl, sizeof(config.ttl));
                 if (debug) {
                         if (result == -1) {
                                 printf("setsockopt failed\n");
                         } else {
-                                printf("ttl set to %u\n", ttl);
+                                printf("ttl set to %lu\n", config.ttl);
                         }
                 }
         }
 
-        /* stupid users should be able to give whatever thresholds they want
-         * (nothing will break if they do), but some anal plugin maintainer
-         * will probably add some printf() thing here later, so it might be
-         * best to at least show them where to do it. ;) */
-        if (warn.pl > crit.pl) {
-                warn.pl = crit.pl;
-        }
-        if (warn.rta > crit.rta) {
-                warn.rta = crit.rta;
-        }
-        if (warn_down > crit_down) {
-                crit_down = warn_down;
-        }
-        if (warn.jitter > crit.jitter) {
-                crit.jitter = warn.jitter;
-        }
-        if (warn.mos < crit.mos) {
-                warn.mos = crit.mos;
-        }
-        if (warn.score < crit.score) {
-                warn.score = crit.score;
-        }
-
-#ifdef HAVE_SIGACTION
-        sig_action.sa_sigaction = NULL;
-        sig_action.sa_handler = finish;
-        sigfillset(&sig_action.sa_mask);
-        sig_action.sa_flags = SA_NODEFER | SA_RESTART;
-        sigaction(SIGINT, &sig_action, NULL);
-        sigaction(SIGHUP, &sig_action, NULL);
-        sigaction(SIGTERM, &sig_action, NULL);
-        sigaction(SIGALRM, &sig_action, NULL);
-#else  /* HAVE_SIGACTION */
-        signal(SIGINT, finish);
-        signal(SIGHUP, finish);
-        signal(SIGTERM, finish);
-        signal(SIGALRM, finish);
-#endif /* HAVE_SIGACTION */
-        if (debug) {
-                printf("Setting alarm timeout to %u seconds\n", timeout);
+        if (sockset.socket6) {
+                int result = setsockopt(sockset.socket6, SOL_IP, IP_TTL, &config.ttl, sizeof(config.ttl));
+                if (debug) {
+                        if (result == -1) {
+                                printf("setsockopt failed\n");
+                        } else {
+                                printf("ttl set to %lu\n", config.ttl);
+                        }
+                }
         }
-        alarm(timeout);
 
         /* make sure we don't wait any longer than necessary */
-        gettimeofday(&prog_start, &tz);
-        max_completion_time = ((targets * packets * pkt_interval) + (targets * target_interval)) + (targets * packets * crit.rta) + crit.rta;
+        struct timeval prog_start;
+        gettimeofday(&prog_start, NULL);
+
+        time_t max_completion_time =
+                (config.target_interval * config.number_of_targets) +
+                (config.crit.rta * config.number_of_targets * config.number_of_packets) + config.crit.rta;
 
         if (debug) {
                 printf("packets: %u, targets: %u\n"
-                           "target_interval: %0.3f, pkt_interval %0.3f\n"
+                           "target_interval: %0.3f\n"
                            "crit.rta: %0.3f\n"
                            "max_completion_time: %0.3f\n",
-                           packets, targets, (float)target_interval / 1000, (float)pkt_interval / 1000, (float)crit.rta / 1000,
+                           config.number_of_packets, config.number_of_targets,
+                           (float)config.target_interval / 1000, (float)config.crit.rta / 1000,
                            (float)max_completion_time / 1000);
         }
 
         if (debug) {
-                if (max_completion_time > (u_int)timeout * 1000000) {
-                        printf("max_completion_time: %llu  timeout: %u\n", max_completion_time, timeout);
-                        printf("Timeout must be at least %llu\n", max_completion_time / 1000000 + 1);
+                if (max_completion_time > (timeout * 1000000)) {
+                        printf("max_completion_time: %ld  timeout: %u\n", max_completion_time, timeout);
+                        printf("Timeout must be at least %ld\n", (max_completion_time / 1000000) + 1);
                 }
         }
 
         if (debug) {
-                printf("crit = {%u, %u%%}, warn = {%u, %u%%}\n", crit.rta, crit.pl, warn.rta, warn.pl);
-                printf("pkt_interval: %u  target_interval: %u  retry_interval: %u\n", pkt_interval, target_interval, retry_interval);
-                printf("icmp_pkt_size: %u  timeout: %u\n", icmp_pkt_size, timeout);
+                printf("crit = {%ld, %u%%}, warn = {%ld, %u%%}\n", config.crit.rta, config.crit.pl,
+                           config.warn.rta, config.warn.pl);
+                printf("target_interval: %ld\n", config.target_interval);
+                printf("icmp_pkt_size: %u  timeout: %u\n", config.icmp_data_size + ICMP_MINLEN, timeout);
         }
 
-        if (packets > 20) {
+        if (config.min_hosts_alive < -1) {
                 errno = 0;
-                crash("packets is > 20 (%d)", packets);
+                crash("minimum alive hosts is negative (%i)", config.min_hosts_alive);
         }
 
-        if (min_hosts_alive < -1) {
-                errno = 0;
-                crash("minimum alive hosts is negative (%i)", min_hosts_alive);
-        }
-
-        host = list;
-        table = malloc(sizeof(struct rta_host *) * targets);
+        // Build an index table of all targets
+        ping_target *host = config.targets;
+        ping_target **table = malloc(sizeof(ping_target *) * config.number_of_targets);
         if (!table) {
                 crash("main(): malloc failed for host table");
         }
 
-        i = 0;
+        unsigned short target_index = 0;
         while (host) {
-                host->id = i * packets;
-                table[i] = host;
+                host->id = target_index * config.number_of_packets;
+                table[target_index] = host;
                 host = host->next;
-                i++;
+                target_index++;
         }
 
-        run_checks();
+        time_t target_interval = config.target_interval;
+
+        check_icmp_state program_state = check_icmp_state_init();
+
+        run_checks(config.icmp_data_size, &target_interval, config.sender_id, config.mode,
+                           max_completion_time, prog_start, table, config.number_of_packets, sockset,
+                           config.number_of_targets, &program_state);
 
         errno = 0;
-        finish(0);
 
-        return (0);
-}
+        mp_check overall = mp_check_init();
+        finish(0, config.modes, config.min_hosts_alive, config.warn, config.crit,
+                   config.number_of_targets, &program_state, config.hosts, config.number_of_hosts,
+                   &overall);
+
+        if (sockset.socket4) {
+                close(sockset.socket4);
+        }
+        if (sockset.socket6) {
+                close(sockset.socket6);
+        }
 
-static void run_checks(void) {
-        u_int i, t;
-        u_int final_wait, time_passed;
+        mp_exit(overall);
+}
 
+static void run_checks(unsigned short icmp_pkt_size, time_t *target_interval,
+                                           const uint16_t sender_id, const check_icmp_execution_mode mode,
+                                           const time_t max_completion_time, const struct timeval prog_start,
+                                           ping_target **table, const unsigned short packets,
+                                           const check_icmp_socket_set sockset, const unsigned short number_of_targets,
+                                           check_icmp_state *program_state) {
         /* this loop might actually violate the pkt_interval or target_interval
          * settings, but only if there aren't any packets on the wire which
          * indicates that the target can handle an increased packet rate */
-        for (i = 0; i < packets; i++) {
-                for (t = 0; t < targets; t++) {
+        for (unsigned int packet_index = 0; packet_index < packets; packet_index++) {
+                for (unsigned int target_index = 0; target_index < number_of_targets; target_index++) {
                         /* don't send useless packets */
-                        if (!targets_alive) {
-                                finish(0);
+                        if (!targets_alive(number_of_targets, program_state->targets_down)) {
+                                return;
                         }
-                        if (table[t]->flags & FLAG_LOST_CAUSE) {
+                        if (table[target_index]->flags & FLAG_LOST_CAUSE) {
                                 if (debug) {
-                                        printf("%s is a lost cause. not sending any more\n", table[t]->name);
+
+                                        char address[INET6_ADDRSTRLEN];
+                                        parse_address(&table[target_index]->address, address, sizeof(address));
+                                        printf("%s is a lost cause. not sending any more\n", address);
                                 }
                                 continue;
                         }
 
                         /* we're still in the game, so send next packet */
-                        (void)send_icmp_ping(icmp_sock, table[t]);
-                        wait_for_reply(icmp_sock, target_interval);
+                        (void)send_icmp_ping(sockset, table[target_index], icmp_pkt_size, sender_id,
+                                                                 program_state);
+
+                        /* wrap up if all targets are declared dead */
+                        if (targets_alive(number_of_targets, program_state->targets_down) ||
+                                get_timevaldiff(prog_start, prog_start) < max_completion_time ||
+                                !(mode == MODE_HOSTCHECK && program_state->targets_down)) {
+                                wait_for_reply(sockset, *target_interval, icmp_pkt_size, target_interval, sender_id,
+                                                           table, packets, number_of_targets, program_state);
+                        }
+                }
+                if (targets_alive(number_of_targets, program_state->targets_down) ||
+                        get_timevaldiff_to_now(prog_start) < max_completion_time ||
+                        !(mode == MODE_HOSTCHECK && program_state->targets_down)) {
+                        wait_for_reply(sockset, number_of_targets, icmp_pkt_size, target_interval, sender_id,
+                                                   table, packets, number_of_targets, program_state);
                 }
-                wait_for_reply(icmp_sock, pkt_interval * targets);
         }
 
-        if (icmp_pkts_en_route && targets_alive) {
-                time_passed = get_timevaldiff(NULL, NULL);
-                final_wait = max_completion_time - time_passed;
+        if (icmp_pkts_en_route(program_state->icmp_sent, program_state->icmp_recv,
+                                                   program_state->icmp_lost) &&
+                targets_alive(number_of_targets, program_state->targets_down)) {
+                time_t time_passed = get_timevaldiff_to_now(prog_start);
+                time_t final_wait = max_completion_time - time_passed;
 
                 if (debug) {
-                        printf("time_passed: %u  final_wait: %u  max_completion_time: %llu\n", time_passed, final_wait, max_completion_time);
+                        printf("time_passed: %ld  final_wait: %ld  max_completion_time: %ld\n", time_passed,
+                                   final_wait, max_completion_time);
                 }
                 if (time_passed > max_completion_time) {
                         if (debug) {
                                 printf("Time passed. Finishing up\n");
                         }
-                        finish(0);
+                        return;
                 }
 
                 /* catch the packets that might come in within the timeframe, but
                  * haven't yet */
                 if (debug) {
-                        printf("Waiting for %u micro-seconds (%0.3f msecs)\n", final_wait, (float)final_wait / 1000);
+                        printf("Waiting for %ld micro-seconds (%0.3f msecs)\n", final_wait,
+                                   (float)final_wait / 1000);
+                }
+                if (targets_alive(number_of_targets, program_state->targets_down) ||
+                        get_timevaldiff_to_now(prog_start) < max_completion_time ||
+                        !(mode == MODE_HOSTCHECK && program_state->targets_down)) {
+                        wait_for_reply(sockset, final_wait, icmp_pkt_size, target_interval, sender_id, table,
+                                                   packets, number_of_targets, program_state);
                 }
-                wait_for_reply(icmp_sock, final_wait);
         }
 }
 
@@ -939,18 +1085,11 @@ static void run_checks(void) {
  * both:
  * icmp echo reply : the rest
  */
-static int wait_for_reply(int sock, u_int t) {
-        int n, hlen;
-        static unsigned char buf[65536];
-        struct sockaddr_storage resp_addr;
-        union ip_hdr *ip;
+static int wait_for_reply(check_icmp_socket_set sockset, const time_t time_interval,
+                                                  unsigned short icmp_pkt_size, time_t *target_interval, uint16_t sender_id,
+                                                  ping_target **table, const unsigned short packets,
+                                                  const unsigned short number_of_targets, check_icmp_state *program_state) {
         union icmp_packet packet;
-        struct rta_host *host;
-        struct icmp_ping_data data;
-        struct timeval wait_start, now;
-        u_int tdiff, i, per_pkt_wait;
-        double jitter_tmp;
-
         if (!(packet.buf = malloc(icmp_pkt_size))) {
                 crash("send_icmp_ping(): failed to malloc %d bytes for send buffer", icmp_pkt_size);
                 return -1; /* might be reached if we're in debug mode */
@@ -959,177 +1098,174 @@ static int wait_for_reply(int sock, u_int t) {
         memset(packet.buf, 0, icmp_pkt_size);
 
         /* if we can't listen or don't have anything to listen to, just return */
-        if (!t || !icmp_pkts_en_route) {
+        if (!time_interval || !icmp_pkts_en_route(program_state->icmp_sent, program_state->icmp_recv,
+                                                                                          program_state->icmp_lost)) {
                 free(packet.buf);
                 return 0;
         }
 
-        gettimeofday(&wait_start, &tz);
-
-        i = t;
-        per_pkt_wait = t / icmp_pkts_en_route;
-        while (icmp_pkts_en_route && get_timevaldiff(&wait_start, NULL) < i) {
-                t = per_pkt_wait;
+        // Get current time stamp
+        struct timeval wait_start;
+        gettimeofday(&wait_start, NULL);
 
-                /* wrap up if all targets are declared dead */
-                if (!targets_alive || get_timevaldiff(&prog_start, NULL) >= max_completion_time || (mode == MODE_HOSTCHECK && targets_down)) {
-                        finish(0);
-                }
+        struct sockaddr_storage resp_addr;
+        time_t per_pkt_wait =
+                time_interval / icmp_pkts_en_route(program_state->icmp_sent, program_state->icmp_recv,
+                                                                                   program_state->icmp_lost);
+        static unsigned char buf[65536];
+        union ip_hdr *ip_header;
+        struct timeval packet_received_timestamp;
+        while (icmp_pkts_en_route(program_state->icmp_sent, program_state->icmp_recv,
+                                                          program_state->icmp_lost) &&
+                   get_timevaldiff_to_now(wait_start) < time_interval) {
+                time_t loop_time_interval = per_pkt_wait;
 
                 /* reap responses until we hit a timeout */
-                n = recvfrom_wto(sock, buf, sizeof(buf), (struct sockaddr *)&resp_addr, &t, &now);
-                if (!n) {
+                recvfrom_wto_wrapper recv_foo =
+                        recvfrom_wto(sockset, buf, sizeof(buf), (struct sockaddr *)&resp_addr,
+                                                 &loop_time_interval, &packet_received_timestamp);
+                if (!recv_foo.received) {
                         if (debug > 1) {
-                                printf("recvfrom_wto() timed out during a %u usecs wait\n", per_pkt_wait);
+                                printf("recvfrom_wto() timed out during a %ld usecs wait\n", per_pkt_wait);
                         }
                         continue; /* timeout for this one, so keep trying */
                 }
-                if (n < 0) {
+
+                if (recv_foo.received < 0) {
                         if (debug) {
                                 printf("recvfrom_wto() returned errors\n");
                         }
                         free(packet.buf);
-                        return n;
+                        return (int)recv_foo.received;
                 }
 
-                // FIXME: with ipv6 we don't have an ip header here
-                if (address_family != AF_INET6) {
-                        ip = (union ip_hdr *)buf;
+                if (recv_foo.recv_proto != AF_INET6) {
+                        ip_header = (union ip_hdr *)buf;
 
                         if (debug > 1) {
                                 char address[INET6_ADDRSTRLEN];
                                 parse_address(&resp_addr, address, sizeof(address));
-                                printf("received %u bytes from %s\n", address_family == AF_INET6 ? ntohs(ip->ip6.ip6_plen) : ntohs(ip->ip.ip_len), address);
+                                printf("received %u bytes from %s\n",
+                                           address_family == AF_INET6 ? ntohs(ip_header->ip6.ip6_plen)
+                                                                                                  : ntohs(ip_header->ip.ip_len),
+                                           address);
                         }
                 }
 
-                /* obsolete. alpha on tru64 provides the necessary defines, but isn't broken */
-                /* #if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) */
-                /* alpha headers are decidedly broken. Using an ansi compiler,
-                 * they provide ip_vhl instead of ip_hl and ip_v, so we mask
-                 * off the bottom 4 bits */
-                /*              hlen = (ip->ip_vhl & 0x0f) << 2; */
-                /* #else */
-                hlen = (address_family == AF_INET6) ? 0 : ip->ip.ip_hl << 2;
-                /* #endif */
-
-                if (n < (hlen + ICMP_MINLEN)) {
+                int hlen = (recv_foo.recv_proto == AF_INET6) ? 0 : ip_header->ip.ip_hl << 2;
+
+                if (recv_foo.received < (hlen + ICMP_MINLEN)) {
                         char address[INET6_ADDRSTRLEN];
                         parse_address(&resp_addr, address, sizeof(address));
-                        crash("received packet too short for ICMP (%d bytes, expected %d) from %s\n", n, hlen + icmp_pkt_size, address);
+                        crash("received packet too short for ICMP (%ld bytes, expected %d) from %s\n",
+                                  recv_foo.received, hlen + icmp_pkt_size, address);
                 }
-                /* else if(debug) { */
-                /*      printf("ip header size: %u, packet size: %u (expected %u, %u)\n", */
-                /*                 hlen, ntohs(ip->ip_len) - hlen, */
-                /*                 sizeof(struct ip), icmp_pkt_size); */
-                /* } */
-
                 /* check the response */
-
                 memcpy(packet.buf, buf + hlen, icmp_pkt_size);
-                /*                      address_family == AF_INET6 ? sizeof(struct icmp6_hdr)
-                                                                   : sizeof(struct icmp));*/
 
-                if ((address_family == PF_INET && (ntohs(packet.icp->icmp_id) != pid || packet.icp->icmp_type != ICMP_ECHOREPLY ||
-                                                                                   ntohs(packet.icp->icmp_seq) >= targets * packets)) ||
-                        (address_family == PF_INET6 && (ntohs(packet.icp6->icmp6_id) != pid || packet.icp6->icmp6_type != ICMP6_ECHO_REPLY ||
-                                                                                        ntohs(packet.icp6->icmp6_seq) >= targets * packets))) {
+                if ((recv_foo.recv_proto == AF_INET &&
+                         (ntohs(packet.icp->icmp_id) != sender_id || packet.icp->icmp_type != ICMP_ECHOREPLY ||
+                          ntohs(packet.icp->icmp_seq) >= number_of_targets * packets)) ||
+                        (recv_foo.recv_proto == AF_INET6 &&
+                         (ntohs(packet.icp6->icmp6_id) != sender_id ||
+                          packet.icp6->icmp6_type != ICMP6_ECHO_REPLY ||
+                          ntohs(packet.icp6->icmp6_seq) >= number_of_targets * packets))) {
                         if (debug > 2) {
                                 printf("not a proper ICMP_ECHOREPLY\n");
                         }
-                        handle_random_icmp(buf + hlen, &resp_addr);
+
+                        handle_random_icmp(buf + hlen, &resp_addr, target_interval, sender_id, table, packets,
+                                                           number_of_targets, program_state);
+
                         continue;
                 }
 
                 /* this is indeed a valid response */
-                if (address_family == PF_INET) {
+                ping_target *target;
+                struct icmp_ping_data data;
+                if (address_family == AF_INET) {
                         memcpy(&data, packet.icp->icmp_data, sizeof(data));
                         if (debug > 2) {
-                                printf("ICMP echo-reply of len %lu, id %u, seq %u, cksum 0x%X\n", (unsigned long)sizeof(data), ntohs(packet.icp->icmp_id),
-                                           ntohs(packet.icp->icmp_seq), packet.icp->icmp_cksum);
+                                printf("ICMP echo-reply of len %lu, id %u, seq %u, cksum 0x%X\n", sizeof(data),
+                                           ntohs(packet.icp->icmp_id), ntohs(packet.icp->icmp_seq),
+                                           packet.icp->icmp_cksum);
                         }
-                        host = table[ntohs(packet.icp->icmp_seq) / packets];
+                        target = table[ntohs(packet.icp->icmp_seq) / packets];
                 } else {
                         memcpy(&data, &packet.icp6->icmp6_dataun.icmp6_un_data8[4], sizeof(data));
                         if (debug > 2) {
-                                printf("ICMP echo-reply of len %lu, id %u, seq %u, cksum 0x%X\n", (unsigned long)sizeof(data), ntohs(packet.icp6->icmp6_id),
-                                           ntohs(packet.icp6->icmp6_seq), packet.icp6->icmp6_cksum);
+                                printf("ICMP echo-reply of len %lu, id %u, seq %u, cksum 0x%X\n", sizeof(data),
+                                           ntohs(packet.icp6->icmp6_id), ntohs(packet.icp6->icmp6_seq),
+                                           packet.icp6->icmp6_cksum);
                         }
-                        host = table[ntohs(packet.icp6->icmp6_seq) / packets];
+                        target = table[ntohs(packet.icp6->icmp6_seq) / packets];
                 }
 
-                tdiff = get_timevaldiff(&data.stime, &now);
+                time_t tdiff = get_timevaldiff(data.stime, packet_received_timestamp);
 
-                if (host->last_tdiff > 0) {
+                if (target->last_tdiff > 0) {
                         /* Calculate jitter */
-                        if (host->last_tdiff > tdiff) {
-                                jitter_tmp = host->last_tdiff - tdiff;
+                        double jitter_tmp;
+                        if (target->last_tdiff > tdiff) {
+                                jitter_tmp = (double)(target->last_tdiff - tdiff);
                         } else {
-                                jitter_tmp = tdiff - host->last_tdiff;
+                                jitter_tmp = (double)(tdiff - target->last_tdiff);
                         }
 
-                        if (host->jitter == 0) {
-                                host->jitter = jitter_tmp;
-                                host->jitter_max = jitter_tmp;
-                                host->jitter_min = jitter_tmp;
+                        if (target->jitter == 0) {
+                                target->jitter = jitter_tmp;
+                                target->jitter_max = jitter_tmp;
+                                target->jitter_min = jitter_tmp;
                         } else {
-                                host->jitter += jitter_tmp;
+                                target->jitter += jitter_tmp;
 
-                                if (jitter_tmp < host->jitter_min) {
-                                        host->jitter_min = jitter_tmp;
+                                if (jitter_tmp < target->jitter_min) {
+                                        target->jitter_min = jitter_tmp;
                                 }
 
-                                if (jitter_tmp > host->jitter_max) {
-                                        host->jitter_max = jitter_tmp;
+                                if (jitter_tmp > target->jitter_max) {
+                                        target->jitter_max = jitter_tmp;
                                 }
                         }
 
                         /* Check if packets in order */
-                        if (host->last_icmp_seq >= packet.icp->icmp_seq) {
-                                host->order_status = STATE_CRITICAL;
+                        if (target->last_icmp_seq >= packet.icp->icmp_seq) {
+                                target->found_out_of_order_packets = true;
                         }
                 }
-                host->last_tdiff = tdiff;
+                target->last_tdiff = tdiff;
 
-                host->last_icmp_seq = packet.icp->icmp_seq;
+                target->last_icmp_seq = packet.icp->icmp_seq;
 
-                host->time_waited += tdiff;
-                host->icmp_recv++;
-                icmp_recv++;
+                target->time_waited += tdiff;
+                target->icmp_recv++;
+                program_state->icmp_recv++;
 
-                if (tdiff > (unsigned int)host->rtmax) {
-                        host->rtmax = tdiff;
+                if (tdiff > (unsigned int)target->rtmax) {
+                        target->rtmax = (double)tdiff;
                 }
 
-                if ((host->rtmin == INFINITY) || (tdiff < (unsigned int)host->rtmin)) {
-                        host->rtmin = tdiff;
+                if ((target->rtmin == INFINITY) || (tdiff < (unsigned int)target->rtmin)) {
+                        target->rtmin = (double)tdiff;
                 }
 
                 if (debug) {
                         char address[INET6_ADDRSTRLEN];
                         parse_address(&resp_addr, address, sizeof(address));
 
-                        switch (address_family) {
+                        switch (recv_foo.recv_proto) {
                         case AF_INET: {
-                                printf("%0.3f ms rtt from %s, outgoing ttl: %u, incoming ttl: %u, max: %0.3f, min: %0.3f\n", (float)tdiff / 1000, address,
-                                           ttl, ip->ip.ip_ttl, (float)host->rtmax / 1000, (float)host->rtmin / 1000);
+                                printf("%0.3f ms rtt from %s, incoming ttl: %u, max: %0.3f, min: %0.3f\n",
+                                           (float)tdiff / 1000, address, ip_header->ip.ip_ttl,
+                                           (float)target->rtmax / 1000, (float)target->rtmin / 1000);
                                 break;
                         };
                         case AF_INET6: {
-                                printf("%0.3f ms rtt from %s, outgoing ttl: %u, max: %0.3f, min: %0.3f\n", (float)tdiff / 1000, address, ttl,
-                                           (float)host->rtmax / 1000, (float)host->rtmin / 1000);
+                                printf("%0.3f ms rtt from %s, max: %0.3f, min: %0.3f\n", (float)tdiff / 1000,
+                                           address, (float)target->rtmax / 1000, (float)target->rtmin / 1000);
                         };
                         }
                 }
-
-                /* if we're in hostcheck mode, exit with limited printouts */
-                if (mode == MODE_HOSTCHECK) {
-                        printf("OK - %s responds to ICMP. Packet %u, rta %0.3fms|"
-                                   "pkt=%u;;;0;%u rta=%0.3f;%0.3f;%0.3f;;\n",
-                                   host->name, icmp_recv, (float)tdiff / 1000, icmp_recv, packets, (float)tdiff / 1000, (float)warn.rta / 1000,
-                                   (float)crit.rta / 1000);
-                        exit(STATE_OK);
-                }
         }
 
         free(packet.buf);
@@ -1137,38 +1273,28 @@ static int wait_for_reply(int sock, u_int t) {
 }
 
 /* the ping functions */
-static int send_icmp_ping(int sock, struct rta_host *host) {
-        long int len;
-        size_t addrlen;
-        struct icmp_ping_data data;
-        struct msghdr hdr;
-        struct iovec iov;
-        struct timeval tv;
-        void *buf = NULL;
-
-        if (sock == -1) {
-                errno = 0;
-                crash("Attempt to send on bogus socket");
-                return -1;
-        }
-
+static int send_icmp_ping(const check_icmp_socket_set sockset, ping_target *host,
+                                                  const unsigned short icmp_pkt_size, const uint16_t sender_id,
+                                                  check_icmp_state *program_state) {
+        void *buf = calloc(1, icmp_pkt_size);
         if (!buf) {
-                if (!(buf = malloc(icmp_pkt_size))) {
-                        crash("send_icmp_ping(): failed to malloc %d bytes for send buffer", icmp_pkt_size);
-                        return -1; /* might be reached if we're in debug mode */
-                }
+                crash("send_icmp_ping(): failed to malloc %d bytes for send buffer", icmp_pkt_size);
+                return -1; /* might be reached if we're in debug mode */
         }
-        memset(buf, 0, icmp_pkt_size);
 
-        if ((gettimeofday(&tv, &tz)) == -1) {
+        struct timeval current_time;
+        if ((gettimeofday(&current_time, NULL)) == -1) {
                 free(buf);
                 return -1;
         }
 
+        struct icmp_ping_data data;
         data.ping_id = 10; /* host->icmp.icmp_sent; */
-        memcpy(&data.stime, &tv, sizeof(tv));
+        memcpy(&data.stime, &current_time, sizeof(current_time));
 
-        if (address_family == AF_INET) {
+        socklen_t addrlen = 0;
+
+        if (host->address.ss_family == AF_INET) {
                 struct icmp *icp = (struct icmp *)buf;
                 addrlen = sizeof(struct sockaddr_in);
 
@@ -1177,15 +1303,19 @@ static int send_icmp_ping(int sock, struct rta_host *host) {
                 icp->icmp_type = ICMP_ECHO;
                 icp->icmp_code = 0;
                 icp->icmp_cksum = 0;
-                icp->icmp_id = htons(pid);
+                icp->icmp_id = htons((uint16_t)sender_id);
                 icp->icmp_seq = htons(host->id++);
                 icp->icmp_cksum = icmp_checksum((uint16_t *)buf, (size_t)icmp_pkt_size);
 
                 if (debug > 2) {
-                        printf("Sending ICMP echo-request of len %lu, id %u, seq %u, cksum 0x%X to host %s\n", (unsigned long)sizeof(data),
-                                   ntohs(icp->icmp_id), ntohs(icp->icmp_seq), icp->icmp_cksum, host->name);
+                        char address[INET6_ADDRSTRLEN];
+                        parse_address((&host->address), address, sizeof(address));
+
+                        printf("Sending ICMP echo-request of len %lu, id %u, seq %u, cksum 0x%X to host %s\n",
+                                   sizeof(data), ntohs(icp->icmp_id), ntohs(icp->icmp_seq), icp->icmp_cksum,
+                                   address);
                 }
-        } else {
+        } else if (host->address.ss_family == AF_INET6) {
                 struct icmp6_hdr *icp6 = (struct icmp6_hdr *)buf;
                 addrlen = sizeof(struct sockaddr_in6);
 
@@ -1194,659 +1324,431 @@ static int send_icmp_ping(int sock, struct rta_host *host) {
                 icp6->icmp6_type = ICMP6_ECHO_REQUEST;
                 icp6->icmp6_code = 0;
                 icp6->icmp6_cksum = 0;
-                icp6->icmp6_id = htons(pid);
+                icp6->icmp6_id = htons((uint16_t)sender_id);
                 icp6->icmp6_seq = htons(host->id++);
                 // let checksum be calculated automatically
 
                 if (debug > 2) {
-                        printf("Sending ICMP echo-request of len %lu, id %u, seq %u, cksum 0x%X to host %s\n", (unsigned long)sizeof(data),
-                                   ntohs(icp6->icmp6_id), ntohs(icp6->icmp6_seq), icp6->icmp6_cksum, host->name);
+                        char address[INET6_ADDRSTRLEN];
+                        parse_address((&host->address), address, sizeof(address));
+
+                        printf("Sending ICMP echo-request of len %lu, id %u, seq %u, cksum 0x%X to target %s\n",
+                                   sizeof(data), ntohs(icp6->icmp6_id), ntohs(icp6->icmp6_seq), icp6->icmp6_cksum,
+                                   address);
                 }
+        } else {
+                // unknown address family
+                crash("unknown address family in %s", __func__);
         }
 
+        struct iovec iov;
         memset(&iov, 0, sizeof(iov));
         iov.iov_base = buf;
         iov.iov_len = icmp_pkt_size;
 
+        struct msghdr hdr;
         memset(&hdr, 0, sizeof(hdr));
-        hdr.msg_name = (struct sockaddr *)&host->saddr_in;
+        hdr.msg_name = (struct sockaddr *)&host->address;
         hdr.msg_namelen = addrlen;
         hdr.msg_iov = &iov;
         hdr.msg_iovlen = 1;
 
         errno = 0;
 
-/* MSG_CONFIRM is a linux thing and only available on linux kernels >= 2.3.15, see send(2) */
+        long int len;
+        /* MSG_CONFIRM is a linux thing and only available on linux kernels >= 2.3.15, see send(2) */
+        if (host->address.ss_family == AF_INET) {
+#ifdef MSG_CONFIRM
+                len = sendmsg(sockset.socket4, &hdr, MSG_CONFIRM);
+#else
+                len = sendmsg(sockset.socket4, &hdr, 0);
+#endif
+        } else if (host->address.ss_family == AF_INET6) {
 #ifdef MSG_CONFIRM
-        len = sendmsg(sock, &hdr, MSG_CONFIRM);
+                len = sendmsg(sockset.socket6, &hdr, MSG_CONFIRM);
 #else
-        len = sendmsg(sock, &hdr, 0);
+                len = sendmsg(sockset.socket6, &hdr, 0);
 #endif
+        } else {
+                assert(false);
+        }
 
         free(buf);
 
         if (len < 0 || (unsigned int)len != icmp_pkt_size) {
                 if (debug) {
                         char address[INET6_ADDRSTRLEN];
-                        parse_address((struct sockaddr_storage *)&host->saddr_in, address, sizeof(address));
+                        parse_address((&host->address), address, sizeof(address));
                         printf("Failed to send ping to %s: %s\n", address, strerror(errno));
                 }
                 errno = 0;
                 return -1;
         }
 
-        icmp_sent++;
+        program_state->icmp_sent++;
         host->icmp_sent++;
 
         return 0;
 }
 
-static int recvfrom_wto(int sock, void *buf, unsigned int len, struct sockaddr *saddr, u_int *timo, struct timeval *tv) {
-        u_int slen;
-        int n, ret;
-        struct timeval to, then, now;
-        fd_set rd, wr;
+static recvfrom_wto_wrapper recvfrom_wto(const check_icmp_socket_set sockset, void *buf,
+                                                                                 const unsigned int len, struct sockaddr *saddr,
+                                                                                 time_t *timeout, struct timeval *received_timestamp) {
 #ifdef HAVE_MSGHDR_MSG_CONTROL
         char ans_data[4096];
 #endif // HAVE_MSGHDR_MSG_CONTROL
-        struct msghdr hdr;
-        struct iovec iov;
 #ifdef SO_TIMESTAMP
         struct cmsghdr *chdr;
 #endif
 
-        if (!*timo) {
+        recvfrom_wto_wrapper result = {
+                .received = 0,
+                .recv_proto = AF_UNSPEC,
+        };
+
+        if (!*timeout) {
                 if (debug) {
-                        printf("*timo is not\n");
+                        printf("*timeout is not\n");
                 }
-                return 0;
+                return result;
+        }
+
+        struct timeval real_timeout;
+        real_timeout.tv_sec = *timeout / 1000000;
+        real_timeout.tv_usec = (*timeout - (real_timeout.tv_sec * 1000000));
+
+        // Dummy fds for select
+        fd_set dummy_write_fds;
+        FD_ZERO(&dummy_write_fds);
+
+        // Read fds for select with the socket
+        fd_set read_fds;
+        FD_ZERO(&read_fds);
+
+        if (sockset.socket4 != -1) {
+                FD_SET(sockset.socket4, &read_fds);
+        }
+        if (sockset.socket6 != -1) {
+                FD_SET(sockset.socket6, &read_fds);
         }
 
-        to.tv_sec = *timo / 1000000;
-        to.tv_usec = (*timo - (to.tv_sec * 1000000));
+        int nfds = (sockset.socket4 > sockset.socket6 ? sockset.socket4 : sockset.socket6) + 1;
+
+        struct timeval then;
+        gettimeofday(&then, NULL);
 
-        FD_ZERO(&rd);
-        FD_ZERO(&wr);
-        FD_SET(sock, &rd);
         errno = 0;
-        gettimeofday(&then, &tz);
-        n = select(sock + 1, &rd, &wr, NULL, &to);
-        if (n < 0) {
+        int select_return = select(nfds, &read_fds, &dummy_write_fds, NULL, &real_timeout);
+        if (select_return < 0) {
                 crash("select() in recvfrom_wto");
         }
-        gettimeofday(&now, &tz);
-        *timo = get_timevaldiff(&then, &now);
 
-        if (!n) {
-                return 0; /* timeout */
+        struct timeval now;
+        gettimeofday(&now, NULL);
+        *timeout = get_timevaldiff(then, now);
+
+        if (!select_return) {
+                return result; /* timeout */
         }
 
-        slen = sizeof(struct sockaddr_storage);
+        unsigned int slen = sizeof(struct sockaddr_storage);
 
-        memset(&iov, 0, sizeof(iov));
-        iov.iov_base = buf;
-        iov.iov_len = len;
+        struct iovec iov = {
+                .iov_base = buf,
+                .iov_len = len,
+        };
 
-        memset(&hdr, 0, sizeof(hdr));
-        hdr.msg_name = saddr;
-        hdr.msg_namelen = slen;
-        hdr.msg_iov = &iov;
-        hdr.msg_iovlen = 1;
+        struct msghdr hdr = {
+                .msg_name = saddr,
+                .msg_namelen = slen,
+                .msg_iov = &iov,
+                .msg_iovlen = 1,
 #ifdef HAVE_MSGHDR_MSG_CONTROL
-        hdr.msg_control = ans_data;
-        hdr.msg_controllen = sizeof(ans_data);
+                .msg_control = ans_data,
+                .msg_controllen = sizeof(ans_data),
 #endif
+        };
+
+        ssize_t ret;
+        if (FD_ISSET(sockset.socket4, &read_fds)) {
+                ret = recvmsg(sockset.socket4, &hdr, 0);
+                result.recv_proto = AF_INET;
+        } else if (FD_ISSET(sockset.socket6, &read_fds)) {
+                ret = recvmsg(sockset.socket6, &hdr, 0);
+                result.recv_proto = AF_INET6;
+        } else {
+                assert(false);
+        }
+
+        result.received = ret;
 
-        ret = recvmsg(sock, &hdr, 0);
 #ifdef SO_TIMESTAMP
         for (chdr = CMSG_FIRSTHDR(&hdr); chdr; chdr = CMSG_NXTHDR(&hdr, chdr)) {
-                if (chdr->cmsg_level == SOL_SOCKET && chdr->cmsg_type == SO_TIMESTAMP && chdr->cmsg_len >= CMSG_LEN(sizeof(struct timeval))) {
-                        memcpy(tv, CMSG_DATA(chdr), sizeof(*tv));
+                if (chdr->cmsg_level == SOL_SOCKET && chdr->cmsg_type == SO_TIMESTAMP &&
+                        chdr->cmsg_len >= CMSG_LEN(sizeof(struct timeval))) {
+                        memcpy(received_timestamp, CMSG_DATA(chdr), sizeof(*received_timestamp));
                         break;
                 }
         }
 
-        if (!chdr)
+        if (!chdr) {
+                gettimeofday(received_timestamp, NULL);
+        }
+#else
+        gettimeofday(tv, NULL);
 #endif // SO_TIMESTAMP
-                gettimeofday(tv, &tz);
-        return (ret);
-}
 
-static void finish(int sig) {
-        u_int i = 0;
-        unsigned char pl;
-        double rta;
-        struct rta_host *host;
-        const char *status_string[] = {"OK", "WARNING", "CRITICAL", "UNKNOWN", "DEPENDENT"};
-        int hosts_ok = 0;
-        int hosts_warn = 0;
-        int this_status;
-        double R;
+        return (result);
+}
 
+static void finish(int sig, check_icmp_mode_switches modes, int min_hosts_alive,
+                                   check_icmp_threshold warn, check_icmp_threshold crit,
+                                   const unsigned short number_of_targets, check_icmp_state *program_state,
+                                   check_icmp_target_container host_list[], unsigned short number_of_hosts,
+                                   mp_check overall[static 1]) {
+        // Deactivate alarm
         alarm(0);
+
         if (debug > 1) {
                 printf("finish(%d) called\n", sig);
         }
 
-        if (icmp_sock != -1) {
-                close(icmp_sock);
-        }
-        if (udp_sock != -1) {
-                close(udp_sock);
-        }
-        if (tcp_sock != -1) {
-                close(tcp_sock);
-        }
-
         if (debug) {
-                printf("icmp_sent: %u  icmp_recv: %u  icmp_lost: %u\n", icmp_sent, icmp_recv, icmp_lost);
-                printf("targets: %u  targets_alive: %u\n", targets, targets_alive);
+                printf("icmp_sent: %u  icmp_recv: %u  icmp_lost: %u\n", program_state->icmp_sent,
+                           program_state->icmp_recv, program_state->icmp_lost);
+                printf("targets: %u  targets_alive: %u\n", number_of_targets,
+                           targets_alive(number_of_targets, program_state->targets_down));
         }
 
-        /* iterate thrice to calculate values, give output, and print perfparse */
-        status = STATE_OK;
-        host = list;
-
-        while (host) {
-                this_status = STATE_OK;
-
-                if (!host->icmp_recv) {
-                        /* rta 0 is ofcourse not entirely correct, but will still show up
-                         * conspicuously as missing entries in perfparse and cacti */
-                        pl = 100;
-                        rta = 0;
-                        status = STATE_CRITICAL;
-                        /* up the down counter if not already counted */
-                        if (!(host->flags & FLAG_LOST_CAUSE) && targets_alive) {
-                                targets_down++;
-                        }
-                } else {
-                        pl = ((host->icmp_sent - host->icmp_recv) * 100) / host->icmp_sent;
-                        rta = (double)host->time_waited / host->icmp_recv;
-                }
-
-                if (host->icmp_recv > 1) {
-                        /*
-                         * This algorithm is probably pretty much blindly copied from
-                         * locations like this one: https://www.slac.stanford.edu/comp/net/wan-mon/tutorial.html#mos
-                         * It calculates a MOS value (range of 1 to 5, where 1 is bad and 5 really good).
-                         * According to some quick research MOS originates from the Audio/Video transport network area.
-                         * Whether it can and should be computed from ICMP data, I can not say.
-                         *
-                         * Anyway the basic idea is to map a value "R" with a range of 0-100 to the MOS value
-                         *
-                         * MOS stands likely for Mean Opinion Score ( https://en.wikipedia.org/wiki/Mean_Opinion_Score )
-                         *
-                         * More links:
-                         * - https://confluence.slac.stanford.edu/display/IEPM/MOS
-                         */
-                        host->jitter = (host->jitter / (host->icmp_recv - 1) / 1000);
-
-                        /*
-                         * Take the average round trip latency (in milliseconds), add
-                         * round trip jitter, but double the impact to latency
-                         * then add 10 for protocol latencies (in milliseconds).
-                         */
-                        host->EffectiveLatency = (rta / 1000) + host->jitter * 2 + 10;
-
-                        if (host->EffectiveLatency < 160) {
-                                R = 93.2 - (host->EffectiveLatency / 40);
-                        } else {
-                                R = 93.2 - ((host->EffectiveLatency - 120) / 10);
-                        }
-
-                        // Now, let us deduct 2.5 R values per percentage of packet loss (i.e. a
-                        // loss of 5% will be entered as 5).
-                        R = R - (pl * 2.5);
+        // loop over targets to evaluate each one
+        int targets_ok = 0;
+        int targets_warn = 0;
+        for (unsigned short i = 0; i < number_of_hosts; i++) {
+                evaluate_host_wrapper host_check = evaluate_host(host_list[i], modes, warn, crit);
 
-                        if (R < 0) {
-                                R = 0;
-                        }
+                targets_ok += host_check.targets_ok;
+                targets_warn += host_check.targets_warn;
 
-                        host->score = R;
-                        host->mos = 1 + ((0.035) * R) + ((.000007) * R * (R - 60) * (100 - R));
-                } else {
-                        host->jitter = 0;
-                        host->jitter_min = 0;
-                        host->jitter_max = 0;
-                        host->mos = 0;
-                }
-
-                host->pl = pl;
-                host->rta = rta;
-
-                /* if no new mode selected, use old schema */
-                if (!rta_mode && !pl_mode && !jitter_mode && !score_mode && !mos_mode && !order_mode) {
-                        rta_mode = true;
-                        pl_mode = true;
-                }
-
-                /* Check which mode is on and do the warn / Crit stuff */
-                if (rta_mode) {
-                        if (rta >= crit.rta) {
-                                this_status = STATE_CRITICAL;
-                                status = STATE_CRITICAL;
-                                host->rta_status = STATE_CRITICAL;
-                        } else if (status != STATE_CRITICAL && (rta >= warn.rta)) {
-                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
-                                status = STATE_WARNING;
-                                host->rta_status = STATE_WARNING;
-                        }
-                }
-
-                if (pl_mode) {
-                        if (pl >= crit.pl) {
-                                this_status = STATE_CRITICAL;
-                                status = STATE_CRITICAL;
-                                host->pl_status = STATE_CRITICAL;
-                        } else if (status != STATE_CRITICAL && (pl >= warn.pl)) {
-                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
-                                status = STATE_WARNING;
-                                host->pl_status = STATE_WARNING;
-                        }
-                }
-
-                if (jitter_mode) {
-                        if (host->jitter >= crit.jitter) {
-                                this_status = STATE_CRITICAL;
-                                status = STATE_CRITICAL;
-                                host->jitter_status = STATE_CRITICAL;
-                        } else if (status != STATE_CRITICAL && (host->jitter >= warn.jitter)) {
-                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
-                                status = STATE_WARNING;
-                                host->jitter_status = STATE_WARNING;
-                        }
-                }
-
-                if (mos_mode) {
-                        if (host->mos <= crit.mos) {
-                                this_status = STATE_CRITICAL;
-                                status = STATE_CRITICAL;
-                                host->mos_status = STATE_CRITICAL;
-                        } else if (status != STATE_CRITICAL && (host->mos <= warn.mos)) {
-                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
-                                status = STATE_WARNING;
-                                host->mos_status = STATE_WARNING;
-                        }
-                }
-
-                if (score_mode) {
-                        if (host->score <= crit.score) {
-                                this_status = STATE_CRITICAL;
-                                status = STATE_CRITICAL;
-                                host->score_status = STATE_CRITICAL;
-                        } else if (status != STATE_CRITICAL && (host->score <= warn.score)) {
-                                this_status = (this_status <= STATE_WARNING ? STATE_WARNING : this_status);
-                                status = STATE_WARNING;
-                                host->score_status = STATE_WARNING;
-                        }
-                }
-
-                if (this_status == STATE_WARNING) {
-                        hosts_warn++;
-                } else if (this_status == STATE_OK) {
-                        hosts_ok++;
-                }
-
-                host = host->next;
+                mp_add_subcheck_to_check(overall, host_check.sc_host);
         }
 
-        /* this is inevitable */
-        if (!targets_alive) {
-                status = STATE_CRITICAL;
-        }
         if (min_hosts_alive > -1) {
-                if (hosts_ok >= min_hosts_alive) {
-                        status = STATE_OK;
-                } else if ((hosts_ok + hosts_warn) >= min_hosts_alive) {
-                        status = STATE_WARNING;
-                }
-        }
-        printf("%s - ", status_string[status]);
-
-        host = list;
-        while (host) {
-                if (debug) {
-                        puts("");
-                }
-
-                if (i) {
-                        if (i < targets) {
-                                printf(" :: ");
-                        } else {
-                                printf("\n");
-                        }
-                }
-
-                i++;
-
-                if (!host->icmp_recv) {
-                        status = STATE_CRITICAL;
-                        host->rtmin = 0;
-                        host->jitter_min = 0;
-
-                        if (host->flags & FLAG_LOST_CAUSE) {
-                                char address[INET6_ADDRSTRLEN];
-                                parse_address(&host->error_addr, address, sizeof(address));
-                                printf("%s: %s @ %s. rta nan, lost %d%%", host->name, get_icmp_error_msg(host->icmp_type, host->icmp_code), address, 100);
-                        } else { /* not marked as lost cause, so we have no flags for it */
-                                printf("%s: rta nan, lost 100%%", host->name);
-                        }
-                } else { /* !icmp_recv */
-                        printf("%s", host->name);
-                        /* rta text output */
-                        if (rta_mode) {
-                                if (status == STATE_OK) {
-                                        printf(" rta %0.3fms", host->rta / 1000);
-                                } else if (status == STATE_WARNING && host->rta_status == status) {
-                                        printf(" rta %0.3fms > %0.3fms", (float)host->rta / 1000, (float)warn.rta / 1000);
-                                } else if (status == STATE_CRITICAL && host->rta_status == status) {
-                                        printf(" rta %0.3fms > %0.3fms", (float)host->rta / 1000, (float)crit.rta / 1000);
-                                }
-                        }
-
-                        /* pl text output */
-                        if (pl_mode) {
-                                if (status == STATE_OK) {
-                                        printf(" lost %u%%", host->pl);
-                                } else if (status == STATE_WARNING && host->pl_status == status) {
-                                        printf(" lost %u%% > %u%%", host->pl, warn.pl);
-                                } else if (status == STATE_CRITICAL && host->pl_status == status) {
-                                        printf(" lost %u%% > %u%%", host->pl, crit.pl);
-                                }
-                        }
-
-                        /* jitter text output */
-                        if (jitter_mode) {
-                                if (status == STATE_OK) {
-                                        printf(" jitter %0.3fms", (float)host->jitter);
-                                } else if (status == STATE_WARNING && host->jitter_status == status) {
-                                        printf(" jitter %0.3fms > %0.3fms", (float)host->jitter, warn.jitter);
-                                } else if (status == STATE_CRITICAL && host->jitter_status == status) {
-                                        printf(" jitter %0.3fms > %0.3fms", (float)host->jitter, crit.jitter);
-                                }
-                        }
-
-                        /* mos text output */
-                        if (mos_mode) {
-                                if (status == STATE_OK) {
-                                        printf(" MOS %0.1f", (float)host->mos);
-                                } else if (status == STATE_WARNING && host->mos_status == status) {
-                                        printf(" MOS %0.1f < %0.1f", (float)host->mos, (float)warn.mos);
-                                } else if (status == STATE_CRITICAL && host->mos_status == status) {
-                                        printf(" MOS %0.1f < %0.1f", (float)host->mos, (float)crit.mos);
-                                }
-                        }
-
-                        /* score text output */
-                        if (score_mode) {
-                                if (status == STATE_OK) {
-                                        printf(" Score %u", (int)host->score);
-                                } else if (status == STATE_WARNING && host->score_status == status) {
-                                        printf(" Score %u < %u", (int)host->score, (int)warn.score);
-                                } else if (status == STATE_CRITICAL && host->score_status == status) {
-                                        printf(" Score %u < %u", (int)host->score, (int)crit.score);
-                                }
-                        }
-
-                        /* order statis text output */
-                        if (order_mode) {
-                                if (status == STATE_OK) {
-                                        printf(" Packets in order");
-                                } else if (status == STATE_CRITICAL && host->order_status == status) {
-                                        printf(" Packets out of order");
-                                }
-                        }
-                }
-                host = host->next;
-        }
-
-        /* iterate once more for pretty perfparse output */
-        if (!(!rta_mode && !pl_mode && !jitter_mode && !score_mode && !mos_mode && order_mode)) {
-                printf("|");
-        }
-        i = 0;
-        host = list;
-        while (host) {
-                if (debug) {
-                        puts("");
-                }
-
-                if (rta_mode) {
-                        if (host->pl < 100) {
-                                printf("%srta=%0.3fms;%0.3f;%0.3f;0; %srtmax=%0.3fms;;;; %srtmin=%0.3fms;;;; ", (targets > 1) ? host->name : "",
-                                           host->rta / 1000, (float)warn.rta / 1000, (float)crit.rta / 1000, (targets > 1) ? host->name : "",
-                                           (float)host->rtmax / 1000, (targets > 1) ? host->name : "",
-                                           (host->rtmin < INFINITY) ? (float)host->rtmin / 1000 : (float)0);
-                        } else {
-                                printf("%srta=U;;;; %srtmax=U;;;; %srtmin=U;;;; ", (targets > 1) ? host->name : "", (targets > 1) ? host->name : "",
-                                           (targets > 1) ? host->name : "");
-                        }
-                }
-
-                if (pl_mode) {
-                        printf("%spl=%u%%;%u;%u;0;100 ", (targets > 1) ? host->name : "", host->pl, warn.pl, crit.pl);
-                }
-
-                if (jitter_mode) {
-                        if (host->pl < 100) {
-                                printf("%sjitter_avg=%0.3fms;%0.3f;%0.3f;0; %sjitter_max=%0.3fms;;;; %sjitter_min=%0.3fms;;;; ",
-                                           (targets > 1) ? host->name : "", (float)host->jitter, (float)warn.jitter, (float)crit.jitter,
-                                           (targets > 1) ? host->name : "", (float)host->jitter_max / 1000, (targets > 1) ? host->name : "",
-                                           (float)host->jitter_min / 1000);
-                        } else {
-                                printf("%sjitter_avg=U;;;; %sjitter_max=U;;;; %sjitter_min=U;;;; ", (targets > 1) ? host->name : "",
-                                           (targets > 1) ? host->name : "", (targets > 1) ? host->name : "");
-                        }
-                }
-
-                if (mos_mode) {
-                        if (host->pl < 100) {
-                                printf("%smos=%0.1f;%0.1f;%0.1f;0;5 ", (targets > 1) ? host->name : "", (float)host->mos, (float)warn.mos, (float)crit.mos);
-                        } else {
-                                printf("%smos=U;;;; ", (targets > 1) ? host->name : "");
-                        }
-                }
-
-                if (score_mode) {
-                        if (host->pl < 100) {
-                                printf("%sscore=%u;%u;%u;0;100 ", (targets > 1) ? host->name : "", (int)host->score, (int)warn.score, (int)crit.score);
-                        } else {
-                                printf("%sscore=U;;;; ", (targets > 1) ? host->name : "");
-                        }
+                mp_subcheck sc_min_targets_alive = mp_subcheck_init();
+                sc_min_targets_alive = mp_set_subcheck_default_state(sc_min_targets_alive, STATE_OK);
+
+                if (targets_ok >= min_hosts_alive) {
+                        sc_min_targets_alive = mp_set_subcheck_state(sc_min_targets_alive, STATE_OK);
+                        xasprintf(&sc_min_targets_alive.output, "%u targets OK of a minimum of %u", targets_ok,
+                                          min_hosts_alive);
+
+                        // Overwrite main state here
+                        overall->evaluation_function = &mp_eval_ok;
+                } else if ((targets_ok + targets_warn) >= min_hosts_alive) {
+                        sc_min_targets_alive = mp_set_subcheck_state(sc_min_targets_alive, STATE_WARNING);
+                        xasprintf(&sc_min_targets_alive.output, "%u targets OK or Warning of a minimum of %u",
+                                          targets_ok + targets_warn, min_hosts_alive);
+                        overall->evaluation_function = &mp_eval_warning;
+                } else {
+                        sc_min_targets_alive = mp_set_subcheck_state(sc_min_targets_alive, STATE_CRITICAL);
+                        xasprintf(&sc_min_targets_alive.output, "%u targets OK or Warning of a minimum of %u",
+                                          targets_ok + targets_warn, min_hosts_alive);
+                        overall->evaluation_function = &mp_eval_critical;
                 }
 
-                host = host->next;
-        }
-
-        if (min_hosts_alive > -1) {
-                if (hosts_ok >= min_hosts_alive) {
-                        status = STATE_OK;
-                } else if ((hosts_ok + hosts_warn) >= min_hosts_alive) {
-                        status = STATE_WARNING;
-                }
+                mp_add_subcheck_to_check(overall, sc_min_targets_alive);
         }
 
         /* finish with an empty line */
-        puts("");
         if (debug) {
-                printf("targets: %u, targets_alive: %u, hosts_ok: %u, hosts_warn: %u, min_hosts_alive: %i\n", targets, targets_alive, hosts_ok,
-                           hosts_warn, min_hosts_alive);
+                printf(
+                        "targets: %u, targets_alive: %u, hosts_ok: %u, hosts_warn: %u, min_hosts_alive: %i\n",
+                        number_of_targets, targets_alive(number_of_targets, program_state->targets_down),
+                        targets_ok, targets_warn, min_hosts_alive);
         }
-
-        exit(status);
 }
 
-static u_int get_timevaldiff(struct timeval *early, struct timeval *later) {
-        u_int ret;
-        struct timeval now;
-
-        if (!later) {
-                gettimeofday(&now, &tz);
-                later = &now;
-        }
-        if (!early) {
-                early = &prog_start;
-        }
-
+static time_t get_timevaldiff(const struct timeval earlier, const struct timeval later) {
         /* if early > later we return 0 so as to indicate a timeout */
-        if (early->tv_sec > later->tv_sec || (early->tv_sec == later->tv_sec && early->tv_usec > later->tv_usec)) {
+        if (earlier.tv_sec > later.tv_sec ||
+                (earlier.tv_sec == later.tv_sec && earlier.tv_usec > later.tv_usec)) {
                 return 0;
         }
-        ret = (later->tv_sec - early->tv_sec) * 1000000;
-        ret += later->tv_usec - early->tv_usec;
+
+        time_t ret = (later.tv_sec - earlier.tv_sec) * 1000000;
+        ret += later.tv_usec - earlier.tv_usec;
 
         return ret;
 }
 
-static int add_target_ip(char *arg, struct sockaddr_storage *in) {
-        struct rta_host *host;
-        struct sockaddr_in *sin, *host_sin;
-        struct sockaddr_in6 *sin6, *host_sin6;
+static time_t get_timevaldiff_to_now(struct timeval earlier) {
+        struct timeval now;
+        gettimeofday(&now, NULL);
+
+        return get_timevaldiff(earlier, now);
+}
+
+static add_target_ip_wrapper add_target_ip(struct sockaddr_storage address) {
+        assert((address.ss_family == AF_INET) || (address.ss_family == AF_INET6));
 
-        if (address_family == AF_INET) {
-                sin = (struct sockaddr_in *)in;
+        if (debug) {
+                char straddr[INET6_ADDRSTRLEN];
+                parse_address((&address), straddr, sizeof(straddr));
+                printf("add_target_ip called with: %s\n", straddr);
+        }
+        struct sockaddr_in *sin;
+        struct sockaddr_in6 *sin6;
+        if (address.ss_family == AF_INET) {
+                sin = (struct sockaddr_in *)&address;
+        } else if (address.ss_family == AF_INET6) {
+                sin6 = (struct sockaddr_in6 *)&address;
         } else {
-                sin6 = (struct sockaddr_in6 *)in;
+                assert(false);
         }
 
+        add_target_ip_wrapper result = {
+                .error_code = OK,
+                .target = NULL,
+        };
+
         /* disregard obviously stupid addresses
          * (I didn't find an ipv6 equivalent to INADDR_NONE) */
-        if (((address_family == AF_INET && (sin->sin_addr.s_addr == INADDR_NONE || sin->sin_addr.s_addr == INADDR_ANY))) ||
-                (address_family == AF_INET6 && (sin6->sin6_addr.s6_addr == in6addr_any.s6_addr))) {
-                return -1;
+        if (((address.ss_family == AF_INET &&
+                  (sin->sin_addr.s_addr == INADDR_NONE || sin->sin_addr.s_addr == INADDR_ANY))) ||
+                (address.ss_family == AF_INET6 && (sin6->sin6_addr.s6_addr == in6addr_any.s6_addr))) {
+                result.error_code = ERROR;
+                return result;
         }
 
-        /* no point in adding two identical IP's, so don't. ;) */
-        host = list;
-        while (host) {
-                host_sin = (struct sockaddr_in *)&host->saddr_in;
-                host_sin6 = (struct sockaddr_in6 *)&host->saddr_in;
-
-                if ((address_family == AF_INET && host_sin->sin_addr.s_addr == sin->sin_addr.s_addr) ||
-                        (address_family == AF_INET6 && host_sin6->sin6_addr.s6_addr == sin6->sin6_addr.s6_addr)) {
-                        if (debug) {
-                                printf("Identical IP already exists. Not adding %s\n", arg);
-                        }
-                        return -1;
-                }
-                host = host->next;
-        }
+        // get string representation of address
+        char straddr[INET6_ADDRSTRLEN];
+        parse_address((&address), straddr, sizeof(straddr));
 
         /* add the fresh ip */
-        host = (struct rta_host *)malloc(sizeof(struct rta_host));
-        if (!host) {
-                char straddr[INET6_ADDRSTRLEN];
-                parse_address((struct sockaddr_storage *)&in, straddr, sizeof(straddr));
-                crash("add_target_ip(%s, %s): malloc(%lu) failed", arg, straddr, sizeof(struct rta_host));
+        ping_target *target = (ping_target *)calloc(1, sizeof(ping_target));
+        if (!target) {
+                crash("add_target_ip(%s): malloc(%lu) failed", straddr, sizeof(ping_target));
         }
-        memset(host, 0, sizeof(struct rta_host));
 
-        /* set the values. use calling name for output */
-        host->name = strdup(arg);
+        ping_target_create_wrapper target_wrapper = ping_target_create(address);
 
-        /* fill out the sockaddr_storage struct */
-        if (address_family == AF_INET) {
-                host_sin = (struct sockaddr_in *)&host->saddr_in;
-                host_sin->sin_family = AF_INET;
-                host_sin->sin_addr.s_addr = sin->sin_addr.s_addr;
+        if (target_wrapper.errorcode == OK) {
+                *target = target_wrapper.host;
+                result.target = target;
         } else {
-                host_sin6 = (struct sockaddr_in6 *)&host->saddr_in;
-                host_sin6->sin6_family = AF_INET6;
-                memcpy(host_sin6->sin6_addr.s6_addr, sin6->sin6_addr.s6_addr, sizeof host_sin6->sin6_addr.s6_addr);
-        }
-
-        /* fill out the sockaddr_in struct */
-        host->rtmin = INFINITY;
-        host->rtmax = 0;
-        host->jitter = 0;
-        host->jitter_max = 0;
-        host->jitter_min = INFINITY;
-        host->last_tdiff = 0;
-        host->order_status = STATE_OK;
-        host->last_icmp_seq = 0;
-        host->rta_status = 0;
-        host->pl_status = 0;
-        host->jitter_status = 0;
-        host->mos_status = 0;
-        host->score_status = 0;
-        host->pl_status = 0;
-
-        if (!list) {
-                list = cursor = host;
-        } else {
-                cursor->next = host;
+                result.error_code = target_wrapper.errorcode;
         }
 
-        cursor = host;
-        targets++;
-
-        return 0;
+        return result;
 }
 
 /* wrapper for add_target_ip */
-static int add_target(char *arg) {
-        int error, result = -1;
-        struct sockaddr_storage ip;
-        struct addrinfo hints, *res, *p;
-        struct sockaddr_in *sin;
-        struct sockaddr_in6 *sin6;
-
-        switch (address_family) {
-        case -1:
-                /* -4 and -6 are not specified on cmdline */
-                address_family = AF_INET;
-                sin = (struct sockaddr_in *)&ip;
-                result = inet_pton(address_family, arg, &sin->sin_addr);
-#ifdef USE_IPV6
-                if (result != 1) {
-                        address_family = AF_INET6;
-                        sin6 = (struct sockaddr_in6 *)&ip;
-                        result = inet_pton(address_family, arg, &sin6->sin6_addr);
-                }
-#endif
-                /* If we don't find any valid addresses, we still don't know the address_family */
-                if (result != 1) {
-                        address_family = -1;
+static add_target_wrapper add_target(char *arg, const check_icmp_execution_mode mode,
+                                                                         sa_family_t enforced_proto) {
+        if (debug > 0) {
+                printf("add_target called with argument %s\n", arg);
+        }
+
+        struct sockaddr_storage address_storage = {};
+        struct sockaddr_in *sin = NULL;
+        struct sockaddr_in6 *sin6 = NULL;
+        int error_code = -1;
+
+        switch (enforced_proto) {
+        case AF_UNSPEC:
+                /*
+                 * no enforced protocol family
+                 * try to parse the address with each one
+                 */
+                sin = (struct sockaddr_in *)&address_storage;
+                error_code = inet_pton(AF_INET, arg, &sin->sin_addr);
+                address_storage.ss_family = AF_INET;
+
+                if (error_code != 1) {
+                        sin6 = (struct sockaddr_in6 *)&address_storage;
+                        error_code = inet_pton(AF_INET6, arg, &sin6->sin6_addr);
+                        address_storage.ss_family = AF_INET6;
                 }
                 break;
         case AF_INET:
-                sin = (struct sockaddr_in *)&ip;
-                result = inet_pton(address_family, arg, &sin->sin_addr);
+                sin = (struct sockaddr_in *)&address_storage;
+                error_code = inet_pton(AF_INET, arg, &sin->sin_addr);
+                address_storage.ss_family = AF_INET;
                 break;
         case AF_INET6:
-                sin6 = (struct sockaddr_in6 *)&ip;
-                result = inet_pton(address_family, arg, &sin6->sin6_addr);
+                sin6 = (struct sockaddr_in6 *)&address_storage;
+                error_code = inet_pton(AF_INET, arg, &sin6->sin6_addr);
+                address_storage.ss_family = AF_INET6;
                 break;
         default:
                 crash("Address family not supported");
         }
 
-        /* don't resolve if we don't have to */
-        if (result == 1) {
+        add_target_wrapper result = {
+                .error_code = OK,
+                .targets = NULL,
+                .has_v4 = false,
+                .has_v6 = false,
+        };
+
+        // if error_code == 1 the address was a valid address parsed above
+        if (error_code == 1) {
                 /* don't add all ip's if we were given a specific one */
-                return add_target_ip(arg, &ip);
-        } else {
-                errno = 0;
-                memset(&hints, 0, sizeof(hints));
-                if (address_family == -1) {
-                        hints.ai_family = AF_UNSPEC;
-                } else {
-                        hints.ai_family = address_family == AF_INET ? PF_INET : PF_INET6;
+                add_target_ip_wrapper targeted = add_target_ip(address_storage);
+
+                if (targeted.error_code != OK) {
+                        result.error_code = ERROR;
+                        return result;
                 }
-                hints.ai_socktype = SOCK_RAW;
-                if ((error = getaddrinfo(arg, NULL, &hints, &res)) != 0) {
-                        errno = 0;
-                        crash("Failed to resolve %s: %s", arg, gai_strerror(error));
-                        return -1;
+
+                if (targeted.target->address.ss_family == AF_INET) {
+                        result.has_v4 = true;
+                } else if (targeted.target->address.ss_family == AF_INET6) {
+                        result.has_v6 = true;
+                } else {
+                        assert(false);
                 }
-                address_family = res->ai_family;
+                result.targets = targeted.target;
+                result.number_of_targets = 1;
+                return result;
+        }
+
+        struct addrinfo hints = {};
+        errno = 0;
+        hints.ai_family = enforced_proto;
+        hints.ai_socktype = SOCK_RAW;
+
+        int error;
+        struct addrinfo *res;
+        if ((error = getaddrinfo(arg, NULL, &hints, &res)) != 0) {
+                errno = 0;
+                crash("Failed to resolve %s: %s", arg, gai_strerror(error));
+                result.error_code = ERROR;
+                return result;
         }
 
         /* possibly add all the IP's as targets */
-        for (p = res; p != NULL; p = p->ai_next) {
-                memcpy(&ip, p->ai_addr, p->ai_addrlen);
-                add_target_ip(arg, &ip);
+        for (struct addrinfo *address = res; address != NULL; address = address->ai_next) {
+                struct sockaddr_storage temporary_ip_address;
+                memcpy(&temporary_ip_address, address->ai_addr, address->ai_addrlen);
+
+                add_target_ip_wrapper tmp = add_target_ip(temporary_ip_address);
+
+                if (tmp.error_code != OK) {
+                        // No proper error handling
+                        // What to do?
+                } else {
+                        if (result.targets == NULL) {
+                                result.targets = tmp.target;
+                                result.number_of_targets = 1;
+                        } else {
+                                result.number_of_targets += ping_target_list_append(result.targets, tmp.target);
+                        }
+                        if (address->ai_family == AF_INET) {
+                                result.has_v4 = true;
+                        } else if (address->ai_family == AF_INET6) {
+                                result.has_v6 = true;
+                        }
+                }
 
                 /* this is silly, but it works */
                 if (mode == MODE_HOSTCHECK || mode == MODE_ALL) {
@@ -1855,20 +1757,22 @@ static int add_target(char *arg) {
                         }
                         continue;
                 }
+
+                // Abort after first hit if not in of the modes above
                 break;
         }
         freeaddrinfo(res);
 
-        return 0;
+        return result;
 }
 
-static void set_source_ip(char *arg) {
+static void set_source_ip(char *arg, const int icmp_sock, sa_family_t addr_family) {
         struct sockaddr_in src;
 
         memset(&src, 0, sizeof(src));
-        src.sin_family = address_family;
+        src.sin_family = addr_family;
         if ((src.sin_addr.s_addr = inet_addr(arg)) == INADDR_NONE) {
-                src.sin_addr.s_addr = get_ip_address(arg);
+                src.sin_addr.s_addr = get_ip_address(arg, icmp_sock);
         }
         if (bind(icmp_sock, (struct sockaddr *)&src, sizeof(src)) == -1) {
                 crash("Cannot bind to IP address %s", arg);
@@ -1876,10 +1780,10 @@ static void set_source_ip(char *arg) {
 }
 
 /* TODO: Move this to netutils.c and also change check_dhcp to use that. */
-static in_addr_t get_ip_address(const char *ifname) {
+static in_addr_t get_ip_address(const char *ifname, const int icmp_sock) {
         // TODO: Rewrite this so the function return an error and we exit somewhere else
-        struct sockaddr_in ip;
-        ip.sin_addr.s_addr = 0; // Fake initialization to make compiler happy
+        struct sockaddr_in ip_address;
+        ip_address.sin_addr.s_addr = 0; // Fake initialization to make compiler happy
 #if defined(SIOCGIFADDR)
         struct ifreq ifr;
 
@@ -1891,13 +1795,13 @@ static in_addr_t get_ip_address(const char *ifname) {
                 crash("Cannot determine IP address of interface %s", ifname);
         }
 
-        memcpy(&ip, &ifr.ifr_addr, sizeof(ip));
+        memcpy(&ip_address, &ifr.ifr_addr, sizeof(ip_address));
 #else
         (void)ifname;
         errno = 0;
         crash("Cannot get interface IP address on this platform.");
 #endif
-        return ip.sin_addr.s_addr;
+        return ip_address.sin_addr.s_addr;
 }
 
 /*
@@ -1906,103 +1810,127 @@ static in_addr_t get_ip_address(const char *ifname) {
  * s = seconds
  * return value is in microseconds
  */
-static u_int get_timevar(const char *str) {
-        char p, u, *ptr;
-        size_t len;
-        u_int i, d;          /* integer and decimal, respectively */
-        u_int factor = 1000; /* default to milliseconds */
+static get_timevar_wrapper get_timevar(const char *str) {
+        get_timevar_wrapper result = {
+                .error_code = OK,
+                .time_range = 0,
+        };
 
         if (!str) {
-                return 0;
+                result.error_code = ERROR;
+                return result;
         }
-        len = strlen(str);
+
+        size_t len = strlen(str);
         if (!len) {
-                return 0;
+                result.error_code = ERROR;
+                return result;
         }
 
         /* unit might be given as ms|m (millisec),
          * us|u (microsec) or just plain s, for seconds */
-        p = '\0';
-        u = str[len - 1];
+        char tmp = '\0';
+        char unit = str[len - 1];
         if (len >= 2 && !isdigit((int)str[len - 2])) {
-                p = str[len - 2];
+                tmp = str[len - 2];
         }
-        if (p && u == 's') {
-                u = p;
-        } else if (!p) {
-                p = u;
+
+        if (tmp && unit == 's') {
+                unit = tmp;
+        } else if (!tmp) {
+                tmp = unit;
         }
+
         if (debug > 2) {
-                printf("evaluating %s, u: %c, p: %c\n", str, u, p);
+                printf("evaluating %s, u: %c, p: %c\n", str, unit, tmp);
         }
 
-        if (u == 'u') {
+        unsigned int factor = 1000; /* default to milliseconds */
+        if (unit == 'u') {
                 factor = 1; /* microseconds */
-        } else if (u == 'm') {
+        } else if (unit == 'm') {
                 factor = 1000; /* milliseconds */
-        } else if (u == 's') {
+        } else if (unit == 's') {
                 factor = 1000000; /* seconds */
         }
+
         if (debug > 2) {
                 printf("factor is %u\n", factor);
         }
 
-        i = strtoul(str, &ptr, 0);
+        char *ptr;
+        unsigned long pre_radix;
+        pre_radix = strtoul(str, &ptr, 0);
         if (!ptr || *ptr != '.' || strlen(ptr) < 2 || factor == 1) {
-                return i * factor;
+                result.time_range = (unsigned int)(pre_radix * factor);
+                return result;
         }
 
         /* time specified in usecs can't have decimal points, so ignore them */
         if (factor == 1) {
-                return i;
+                result.time_range = (unsigned int)pre_radix;
+                return result;
         }
 
-        d = strtoul(ptr + 1, NULL, 0);
+        /* integer and decimal, respectively */
+        unsigned int post_radix = (unsigned int)strtoul(ptr + 1, NULL, 0);
 
         /* d is decimal, so get rid of excess digits */
-        while (d >= factor) {
-                d /= 10;
+        while (post_radix >= factor) {
+                post_radix /= 10;
         }
 
         /* the last parenthesis avoids floating point exceptions. */
-        return ((i * factor) + (d * (factor / 10)));
+        result.time_range = (unsigned int)((pre_radix * factor) + (post_radix * (factor / 10)));
+        return result;
 }
 
-/* not too good at checking errors, but it'll do (main() should barfe on -1) */
-static int get_threshold(char *str, threshold *th) {
-        char *p = NULL, i = 0;
+static get_threshold_wrapper get_threshold(char *str, check_icmp_threshold threshold) {
+        get_threshold_wrapper result = {
+                .errorcode = OK,
+                .threshold = threshold,
+        };
 
-        if (!str || !strlen(str) || !th) {
-                return -1;
+        if (!str || !strlen(str)) {
+                result.errorcode = ERROR;
+                return result;
         }
 
         /* pointer magic slims code by 10 lines. i is bof-stop on stupid libc's */
-        p = &str[strlen(str) - 1];
-        while (p != &str[1]) {
-                if (*p == '%') {
-                        *p = '\0';
-                } else if (*p == ',' && i) {
-                        *p = '\0'; /* reset it so get_timevar(str) works nicely later */
-                        th->pl = (unsigned char)strtoul(p + 1, NULL, 0);
+        bool is_at_last_char = false;
+        char *tmp = &str[strlen(str) - 1];
+        while (tmp != &str[1]) {
+                if (*tmp == '%') {
+                        *tmp = '\0';
+                } else if (*tmp == ',' && is_at_last_char) {
+                        *tmp = '\0'; /* reset it so get_timevar(str) works nicely later */
+                        result.threshold.pl = (unsigned char)strtoul(tmp + 1, NULL, 0);
                         break;
                 }
-                i = 1;
-                p--;
+                is_at_last_char = true;
+                tmp--;
         }
-        th->rta = get_timevar(str);
 
-        if (!th->rta) {
-                return -1;
+        get_timevar_wrapper parsed_time = get_timevar(str);
+
+        if (parsed_time.error_code == OK) {
+                result.threshold.rta = parsed_time.time_range;
+        } else {
+                if (debug > 1) {
+                        printf("%s: failed to parse rta threshold\n", __FUNCTION__);
+                }
+                result.errorcode = ERROR;
+                return result;
         }
 
-        if (th->rta > MAXTTL * 1000000) {
-                th->rta = MAXTTL * 1000000;
+        if (result.threshold.rta > MAXTTL * 1000000) {
+                result.threshold.rta = MAXTTL * 1000000;
         }
-        if (th->pl > 100) {
-                th->pl = 100;
+        if (result.threshold.pl > 100) {
+                result.threshold.pl = 100;
         }
 
-        return 0;
+        return result;
 }
 
 /*
@@ -2013,184 +1941,537 @@ static int get_threshold(char *str, threshold *th) {
  * @param[in] length strlen(str)
  * @param[out] warn Pointer to the warn threshold struct to which the values should be assigned
  * @param[out] crit Pointer to the crit threshold struct to which the values should be assigned
- * @param[in] mode Determines whether this a threshold for rta, packet_loss, jitter, mos or score (exclusively)
+ * @param[in] mode Determines whether this a threshold for rta, packet_loss, jitter, mos or score
+ * (exclusively)
  */
-static bool get_threshold2(char *str, size_t length, threshold *warn, threshold *crit, threshold_mode mode) {
-        if (!str || !length || !warn || !crit) {
-                return false;
+static get_threshold2_wrapper get_threshold2(char *str, size_t length, check_icmp_threshold warn,
+                                                                                         check_icmp_threshold crit, threshold_mode mode) {
+        get_threshold2_wrapper result = {
+                .errorcode = OK,
+                .warn = warn,
+                .crit = crit,
+        };
+
+        if (!str || !length) {
+                result.errorcode = ERROR;
+                return result;
         }
 
         // p points to the last char in str
-        char *p = &str[length - 1];
+        char *work_pointer = &str[length - 1];
 
         // first_iteration is bof-stop on stupid libc's
         bool first_iteration = true;
 
-        while (p != &str[0]) {
-                if ((*p == 'm') || (*p == '%')) {
-                        *p = '\0';
-                } else if (*p == ',' && !first_iteration) {
-                        *p = '\0'; /* reset it so get_timevar(str) works nicely later */
+        while (work_pointer != &str[0]) {
+                if ((*work_pointer == 'm') || (*work_pointer == '%')) {
+                        *work_pointer = '\0';
+                } else if (*work_pointer == ',' && !first_iteration) {
+                        *work_pointer = '\0'; /* reset it so get_timevar(str) works nicely later */
 
-                        char *start_of_value = p + 1;
+                        char *start_of_value = work_pointer + 1;
 
-                        if (!parse_threshold2_helper(start_of_value, strlen(start_of_value), crit, mode)) {
-                                return false;
+                        parse_threshold2_helper_wrapper tmp =
+                                parse_threshold2_helper(start_of_value, strlen(start_of_value), result.crit, mode);
+                        if (tmp.errorcode != OK) {
+                                result.errorcode = ERROR;
+                                return result;
                         }
+                        result.crit = tmp.result;
                 }
                 first_iteration = false;
-                p--;
+                work_pointer--;
         }
 
-        return parse_threshold2_helper(p, strlen(p), warn, mode);
+        parse_threshold2_helper_wrapper tmp =
+                parse_threshold2_helper(work_pointer, strlen(work_pointer), result.warn, mode);
+        if (tmp.errorcode != OK) {
+                result.errorcode = ERROR;
+        } else {
+                result.warn = tmp.result;
+        }
+        return result;
 }
 
-static bool parse_threshold2_helper(char *s, size_t length, threshold *thr, threshold_mode mode) {
+static parse_threshold2_helper_wrapper parse_threshold2_helper(char *threshold_string,
+                                                                                                                           size_t length,
+                                                                                                                           check_icmp_threshold thr,
+                                                                                                                           threshold_mode mode) {
         char *resultChecker = {0};
+        parse_threshold2_helper_wrapper result = {
+                .result = thr,
+                .errorcode = OK,
+        };
 
         switch (mode) {
         case const_rta_mode:
-                thr->rta = strtod(s, &resultChecker) * 1000;
+                result.result.rta = (unsigned int)(strtod(threshold_string, &resultChecker) * 1000);
                 break;
         case const_packet_loss_mode:
-                thr->pl = (unsigned char)strtoul(s, &resultChecker, 0);
+                result.result.pl = (unsigned char)strtoul(threshold_string, &resultChecker, 0);
                 break;
         case const_jitter_mode:
-                thr->jitter = strtod(s, &resultChecker);
-
+                result.result.jitter = strtod(threshold_string, &resultChecker);
                 break;
         case const_mos_mode:
-                thr->mos = strtod(s, &resultChecker);
+                result.result.mos = strtod(threshold_string, &resultChecker);
                 break;
         case const_score_mode:
-                thr->score = strtod(s, &resultChecker);
+                result.result.score = strtod(threshold_string, &resultChecker);
                 break;
         }
 
-        if (resultChecker == s) {
+        if (resultChecker == threshold_string) {
                 // Failed to parse
-                return false;
+                result.errorcode = ERROR;
+                return result;
         }
 
-        if (resultChecker != (s + length)) {
+        if (resultChecker != (threshold_string + length)) {
                 // Trailing symbols
-                return false;
+                result.errorcode = ERROR;
         }
 
-        return true;
+        return result;
 }
 
-unsigned short icmp_checksum(uint16_t *p, size_t n) {
-        unsigned short cksum;
+unsigned short icmp_checksum(uint16_t *packet, size_t packet_size) {
         long sum = 0;
 
         /* sizeof(uint16_t) == 2 */
-        while (n >= 2) {
-                sum += *(p++);
-                n -= 2;
+        while (packet_size >= 2) {
+                sum += *(packet++);
+                packet_size -= 2;
         }
 
         /* mop up the occasional odd byte */
-        if (n == 1) {
-                sum += *((uint8_t *)p - 1);
+        if (packet_size == 1) {
+                sum += *((uint8_t *)packet - 1);
         }
 
         sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */
         sum += (sum >> 16);                 /* add carry */
-        cksum = ~sum;                       /* ones-complement, trunc to 16 bits */
+        unsigned short cksum;
+        cksum = (unsigned short)~sum; /* ones-complement, trunc to 16 bits */
 
         return cksum;
 }
 
 void print_help(void) {
-        /*print_revision (progname);*/ /* FIXME: Why? */
+        // print_revision (progname); /* FIXME: Why? */
         printf("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
 
         printf(COPYRIGHT, copyright, email);
 
-        printf("\n\n");
-
         print_usage();
 
         printf(UT_HELP_VRSN);
         printf(UT_EXTRA_OPTS);
 
-        printf(" %s\n", "-H");
-        printf("    %s\n", _("specify a target"));
-        printf(" %s\n", "[-4|-6]");
-        printf("    %s\n", _("Use IPv4 (default) or IPv6 to communicate with the targets"));
-        printf(" %s\n", "-w");
-        printf("    %s", _("warning threshold (currently "));
-        printf("%0.3fms,%u%%)\n", (float)warn.rta / 1000, warn.pl);
-        printf(" %s\n", "-c");
-        printf("    %s", _("critical threshold (currently "));
-        printf("%0.3fms,%u%%)\n", (float)crit.rta / 1000, crit.pl);
-
-        printf(" %s\n", "-R");
-        printf("    %s\n", _("RTA, round trip average,  mode  warning,critical, ex. 100ms,200ms unit in ms"));
-        printf(" %s\n", "-P");
+        printf(" -H, --Host=HOST\n");
+        printf("    %s\n",
+                   _("specify a target, might be one of: resolveable name | IPv6 address | IPv4 address\n"
+                         "    (required, can be given multiple times)"));
+        printf(" %s\n", "[-4|-6], [--ipv4-only|--ipv6-only]");
+        printf("    %s\n", _("Use IPv4 or IPv6 only to communicate with the targets"));
+        printf(" %s\n", "-w, --warning=WARN_VALUE");
+        printf("    %s", _("warning threshold (default "));
+        printf("%0.3fms,%u%%)\n", (float)DEFAULT_WARN_RTA / 1000, DEFAULT_WARN_PL);
+        printf(" %s\n", "-c, --critical=CRIT_VALUE");
+        printf("    %s", _("critical threshold (default "));
+        printf("%0.3fms,%u%%)\n", (float)DEFAULT_CRIT_RTA / 1000, DEFAULT_CRIT_PL);
+
+        printf(" %s\n", "-R, --rta-mode-thresholds=RTA_THRESHOLDS");
+        printf("    %s\n",
+                   _("RTA (round trip average) mode  warning,critical, ex. 100ms,200ms unit in ms"));
+        printf(" %s\n", "-P, --packet-loss-mode-thresholds=PACKET_LOSS_THRESHOLD");
         printf("    %s\n", _("packet loss mode, ex. 40%,50% , unit in %"));
-        printf(" %s\n", "-J");
+        printf(" %s\n", "-J, --jitter-mode-thresholds=JITTER_MODE_THRESHOLD");
         printf("    %s\n", _("jitter mode  warning,critical, ex. 40.000ms,50.000ms , unit in ms "));
-        printf(" %s\n", "-M");
+        printf(" %s\n", "-M, --mos-mode-thresholds=MOS_MODE_THRESHOLD");
         printf("    %s\n", _("MOS mode, between 0 and 4.4  warning,critical, ex. 3.5,3.0"));
-        printf(" %s\n", "-S");
+        printf(" %s\n", "-S, --score-mode-thresholds=SCORE_MODE_THRESHOLD");
         printf("    %s\n", _("score  mode, max value 100  warning,critical, ex. 80,70 "));
-        printf(" %s\n", "-O");
-        printf("    %s\n", _("detect out of order ICMP packts "));
-        printf(" %s\n", "-H");
-        printf("    %s\n", _("specify a target"));
-        printf(" %s\n", "-s");
-        printf("    %s\n", _("specify a source IP address or device name"));
-        printf(" %s\n", "-n");
-        printf("    %s", _("number of packets to send (currently "));
-        printf("%u)\n", packets);
-        printf(" %s\n", "-p");
-        printf("    %s", _("number of packets to send (currently "));
-        printf("%u)\n", packets);
+        printf(" %s\n", "-O, --out-of-order-packets");
+        printf(
+                "    %s\n",
+                _("detect out of order ICMP packets, if such packets are found, the result is CRITICAL"));
+        printf(" %s\n", "[-n|-p], --number-of-packets=NUMBER_OF_PACKETS");
+        printf("    %s", _("number of packets to send (default "));
+        printf("%u)\n", DEFAULT_NUMBER_OF_PACKETS);
+
         printf(" %s\n", "-i");
-        printf("    %s", _("max packet interval (currently "));
-        printf("%0.3fms)\n", (float)pkt_interval / 1000);
-        printf(" %s\n", "-I");
-        printf("    %s", _("max target interval (currently "));
-        printf("%0.3fms)\n", (float)target_interval / 1000);
-        printf(" %s\n", "-m");
-        printf("    %s", _("number of alive hosts required for success"));
+        printf("    %s", _("[DEPRECATED] packet interval (default "));
+        printf("%0.3fms)\n", (float)DEFAULT_PKT_INTERVAL / 1000);
+        printf("    %s", _("This option was never actually used and is just mentioned here for "
+                                           "historical purposes\n"));
+
+        printf(" %s\n", "-I, --target-interval=TARGET_INTERVAL");
+        printf("    %s%0.3fms)\n    The time interval to wait in between one target and the next\n",
+                   _("max target interval (default "), (float)DEFAULT_TARGET_INTERVAL / 1000);
+        printf(" %s\n", "-m, --minimal-host-alive=MIN_ALIVE");
+        printf("    %s", _("number of alive hosts required for success. If less than MIN_ALIVE hosts "
+                                           "are OK, but MIN_ALIVE hosts are WARNING or OK, WARNING, else CRITICAL"));
         printf("\n");
-        printf(" %s\n", "-l");
-        printf("    %s", _("TTL on outgoing packets (currently "));
-        printf("%u)\n", ttl);
-        printf(" %s\n", "-t");
-        printf("    %s", _("timeout value (seconds, currently  "));
-        printf("%u)\n", timeout);
-        printf(" %s\n", "-b");
-        printf("    %s\n", _("Number of icmp data bytes to send"));
-        printf("    %s %u + %d)\n", _("Packet size will be data bytes + icmp header (currently"), icmp_data_size, ICMP_MINLEN);
-        printf(" %s\n", "-v");
-        printf("    %s\n", _("verbose"));
+        printf(" %s\n", "-l, --outgoing-ttl=OUTGOING_TTL");
+        printf("    %s", _("TTL on outgoing packets (default "));
+        printf("%u)\n", DEFAULT_TTL);
+        printf(" %s\n", "-b, --size=SIZE");
+        printf("    %s\n", _("Number of icmp ping data bytes to send"));
+        printf("    %s %lu + %d)\n", _("Packet size will be SIZE + icmp header (default"),
+                   DEFAULT_PING_DATA_SIZE, ICMP_MINLEN);
+        printf(" %s\n", "-v, --verbose");
+        printf("    %s\n", _("Verbosity, can be given multiple times (for debugging)"));
+
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
         printf("%s\n", _("Notes:"));
         printf(" %s\n", _("If none of R,P,J,M,S or O is specified, default behavior is -R -P"));
-        printf(" %s\n", _("The -H switch is optional. Naming a host (or several) to check is not."));
+        printf(" %s\n", _("Naming a host (or several) to check is not."));
         printf("\n");
         printf(" %s\n", _("Threshold format for -w and -c is 200.25,60% for 200.25 msec RTA and 60%"));
         printf(" %s\n", _("packet loss.  The default values should work well for most users."));
-        printf(" %s\n", _("You can specify different RTA factors using the standardized abbreviations"));
-        printf(" %s\n", _("us (microseconds), ms (milliseconds, default) or just plain s for seconds."));
-        /* -d not yet implemented */
-        /*  printf ("%s\n", _("Threshold format for -d is warn,crit.  12,14 means WARNING if >= 12 hops"));
-                        printf ("%s\n", _("are spent and CRITICAL if >= 14 hops are spent."));
-                        printf ("%s\n\n", _("NOTE: Some systems decrease TTL when forming ICMP_ECHOREPLY, others do not."));*/
-        printf("\n");
-        printf(" %s\n", _("The -v switch can be specified several times for increased verbosity."));
-        /*  printf ("%s\n", _("Long options are currently unsupported."));
-                        printf ("%s\n", _("Options marked with * require an argument"));
-                        */
+        printf(" %s\n",
+                   _("You can specify different RTA factors using the standardized abbreviations"));
+        printf(" %s\n",
+                   _("us (microseconds), ms (milliseconds, default) or just plain s for seconds."));
 
         printf(UT_SUPPORT);
 }
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf(" %s [options] [-H] host1 host2 hostN\n", progname);
+        printf(" %s [options] [-H host1 [-H host2 [-H hostN]]]\n", progname);
+}
+
+static add_host_wrapper add_host(char *arg, check_icmp_execution_mode mode,
+                                                                 sa_family_t enforced_proto) {
+        if (debug) {
+                printf("add_host called with argument %s\n", arg);
+        }
+
+        add_host_wrapper result = {
+                .error_code = OK,
+                .host = check_icmp_target_container_init(),
+                .has_v4 = false,
+                .has_v6 = false,
+        };
+
+        add_target_wrapper targets = add_target(arg, mode, enforced_proto);
+
+        if (targets.error_code != OK) {
+                result.error_code = targets.error_code;
+                return result;
+        }
+
+        result.has_v4 = targets.has_v4;
+        result.has_v6 = targets.has_v6;
+
+        result.host = check_icmp_target_container_init();
+
+        result.host.name = strdup(arg);
+        result.host.target_list = targets.targets;
+        result.host.number_of_targets = targets.number_of_targets;
+
+        return result;
+}
+
+mp_subcheck evaluate_target(ping_target target, check_icmp_mode_switches modes,
+                                                        check_icmp_threshold warn, check_icmp_threshold crit) {
+        /* if no new mode selected, use old schema */
+        if (!modes.rta_mode && !modes.pl_mode && !modes.jitter_mode && !modes.score_mode &&
+                !modes.mos_mode && !modes.order_mode) {
+                modes.rta_mode = true;
+                modes.pl_mode = true;
+        }
+
+        mp_subcheck result = mp_subcheck_init();
+        result = mp_set_subcheck_default_state(result, STATE_OK);
+
+        char address[INET6_ADDRSTRLEN];
+        memset(address, 0, INET6_ADDRSTRLEN);
+        parse_address(&target.address, address, sizeof(address));
+
+        xasprintf(&result.output, "%s", address);
+
+        double packet_loss;
+        time_t rta;
+        if (!target.icmp_recv) {
+                /* rta 0 is of course not entirely correct, but will still show up
+                 * conspicuously as missing entries in perfparse and cacti */
+                packet_loss = 100;
+                rta = 0;
+                result = mp_set_subcheck_state(result, STATE_CRITICAL);
+                /* up the down counter if not already counted */
+
+                if (target.flags & FLAG_LOST_CAUSE) {
+                        xasprintf(&result.output, "%s: %s @ %s", result.output,
+                                          get_icmp_error_msg(target.icmp_type, target.icmp_code), address);
+                } else { /* not marked as lost cause, so we have no flags for it */
+                        xasprintf(&result.output, "%s", result.output);
+                }
+        } else {
+                packet_loss =
+                        (unsigned char)((target.icmp_sent - target.icmp_recv) * 100) / target.icmp_sent;
+                rta = target.time_waited / target.icmp_recv;
+        }
+
+        double EffectiveLatency;
+        double mos;   /* Mean opinion score */
+        double score; /* score */
+
+        if (target.icmp_recv > 1) {
+                /*
+                 * This algorithm is probably pretty much blindly copied from
+                 * locations like this one:
+                 * https://www.slac.stanford.edu/comp/net/wan-mon/tutorial.html#mos It calculates a MOS
+                 * value (range of 1 to 5, where 1 is bad and 5 really good). According to some quick
+                 * research MOS originates from the Audio/Video transport network area. Whether it can
+                 * and should be computed from ICMP data, I can not say.
+                 *
+                 * Anyway the basic idea is to map a value "R" with a range of 0-100 to the MOS value
+                 *
+                 * MOS stands likely for Mean Opinion Score (
+                 * https://en.wikipedia.org/wiki/Mean_Opinion_Score )
+                 *
+                 * More links:
+                 * - https://confluence.slac.stanford.edu/display/IEPM/MOS
+                 */
+                target.jitter = (target.jitter / (target.icmp_recv - 1) / 1000);
+
+                /*
+                 * Take the average round trip latency (in milliseconds), add
+                 * round trip jitter, but double the impact to latency
+                 * then add 10 for protocol latencies (in milliseconds).
+                 */
+                EffectiveLatency = ((double)rta / 1000) + target.jitter * 2 + 10;
+
+                double R;
+                if (EffectiveLatency < 160) {
+                        R = 93.2 - (EffectiveLatency / 40);
+                } else {
+                        R = 93.2 - ((EffectiveLatency - 120) / 10);
+                }
+
+                // Now, let us deduct 2.5 R values per percentage of packet loss (i.e. a
+                // loss of 5% will be entered as 5).
+                R = R - (packet_loss * 2.5);
+
+                if (R < 0) {
+                        R = 0;
+                }
+
+                score = R;
+                mos = 1 + ((0.035) * R) + ((.000007) * R * (R - 60) * (100 - R));
+        } else {
+                target.jitter = 0;
+                target.jitter_min = 0;
+                target.jitter_max = 0;
+                mos = 0;
+        }
+
+        /* Check which mode is on and do the warn / Crit stuff */
+        if (modes.rta_mode) {
+                mp_subcheck sc_rta = mp_subcheck_init();
+                sc_rta = mp_set_subcheck_default_state(sc_rta, STATE_OK);
+                xasprintf(&sc_rta.output, "rta %0.3fms", (double)rta / 1000);
+
+                if (rta >= crit.rta) {
+                        sc_rta = mp_set_subcheck_state(sc_rta, STATE_CRITICAL);
+                        xasprintf(&sc_rta.output, "%s >= %0.3fms", sc_rta.output, (double)crit.rta / 1000);
+                } else if (rta >= warn.rta) {
+                        sc_rta = mp_set_subcheck_state(sc_rta, STATE_WARNING);
+                        xasprintf(&sc_rta.output, "%s >= %0.3fms", sc_rta.output, (double)warn.rta / 1000);
+                }
+
+                if (packet_loss < 100) {
+                        mp_perfdata pd_rta = perfdata_init();
+                        xasprintf(&pd_rta.label, "%srta", address);
+                        pd_rta.uom = strdup("ms");
+                        pd_rta.value = mp_create_pd_value(rta / 1000);
+                        pd_rta.min = mp_create_pd_value(0);
+
+                        pd_rta.warn = mp_range_set_end(pd_rta.warn, mp_create_pd_value(warn.rta));
+                        pd_rta.crit = mp_range_set_end(pd_rta.crit, mp_create_pd_value(crit.rta));
+                        mp_add_perfdata_to_subcheck(&sc_rta, pd_rta);
+
+                        mp_perfdata pd_rt_min = perfdata_init();
+                        xasprintf(&pd_rt_min.label, "%srtmin", address);
+                        pd_rt_min.value = mp_create_pd_value(target.rtmin / 1000);
+                        pd_rt_min.uom = strdup("ms");
+                        mp_add_perfdata_to_subcheck(&sc_rta, pd_rt_min);
+
+                        mp_perfdata pd_rt_max = perfdata_init();
+                        xasprintf(&pd_rt_max.label, "%srtmax", address);
+                        pd_rt_max.value = mp_create_pd_value(target.rtmax / 1000);
+                        pd_rt_max.uom = strdup("ms");
+                        mp_add_perfdata_to_subcheck(&sc_rta, pd_rt_max);
+                }
+
+                mp_add_subcheck_to_subcheck(&result, sc_rta);
+        }
+
+        if (modes.pl_mode) {
+                mp_subcheck sc_pl = mp_subcheck_init();
+                sc_pl = mp_set_subcheck_default_state(sc_pl, STATE_OK);
+                xasprintf(&sc_pl.output, "packet loss %.1f%%", packet_loss);
+
+                if (packet_loss >= crit.pl) {
+                        sc_pl = mp_set_subcheck_state(sc_pl, STATE_CRITICAL);
+                        xasprintf(&sc_pl.output, "%s >= %u%%", sc_pl.output, crit.pl);
+                } else if (packet_loss >= warn.pl) {
+                        sc_pl = mp_set_subcheck_state(sc_pl, STATE_WARNING);
+                        xasprintf(&sc_pl.output, "%s >= %u%%", sc_pl.output, warn.pl);
+                }
+
+                mp_perfdata pd_pl = perfdata_init();
+                xasprintf(&pd_pl.label, "%spl", address);
+                pd_pl.uom = strdup("%");
+
+                pd_pl.warn = mp_range_set_end(pd_pl.warn, mp_create_pd_value(warn.pl));
+                pd_pl.crit = mp_range_set_end(pd_pl.crit, mp_create_pd_value(crit.pl));
+                pd_pl.value = mp_create_pd_value(packet_loss);
+
+                mp_add_perfdata_to_subcheck(&sc_pl, pd_pl);
+
+                mp_add_subcheck_to_subcheck(&result, sc_pl);
+        }
+
+        if (modes.jitter_mode) {
+                mp_subcheck sc_jitter = mp_subcheck_init();
+                sc_jitter = mp_set_subcheck_default_state(sc_jitter, STATE_OK);
+                xasprintf(&sc_jitter.output, "jitter %0.3fms", target.jitter);
+
+                if (target.jitter >= crit.jitter) {
+                        sc_jitter = mp_set_subcheck_state(sc_jitter, STATE_CRITICAL);
+                        xasprintf(&sc_jitter.output, "%s >= %0.3fms", sc_jitter.output, crit.jitter);
+                } else if (target.jitter >= warn.jitter) {
+                        sc_jitter = mp_set_subcheck_state(sc_jitter, STATE_WARNING);
+                        xasprintf(&sc_jitter.output, "%s >= %0.3fms", sc_jitter.output, warn.jitter);
+                }
+
+                if (packet_loss < 100) {
+                        mp_perfdata pd_jitter = perfdata_init();
+                        pd_jitter.uom = strdup("ms");
+                        xasprintf(&pd_jitter.label, "%sjitter_avg", address);
+                        pd_jitter.value = mp_create_pd_value(target.jitter);
+                        pd_jitter.warn = mp_range_set_end(pd_jitter.warn, mp_create_pd_value(warn.jitter));
+                        pd_jitter.crit = mp_range_set_end(pd_jitter.crit, mp_create_pd_value(crit.jitter));
+                        mp_add_perfdata_to_subcheck(&sc_jitter, pd_jitter);
+
+                        mp_perfdata pd_jitter_min = perfdata_init();
+                        pd_jitter_min.uom = strdup("ms");
+                        xasprintf(&pd_jitter_min.label, "%sjitter_min", address);
+                        pd_jitter_min.value = mp_create_pd_value(target.jitter_min);
+                        mp_add_perfdata_to_subcheck(&sc_jitter, pd_jitter_min);
+
+                        mp_perfdata pd_jitter_max = perfdata_init();
+                        pd_jitter_max.uom = strdup("ms");
+                        xasprintf(&pd_jitter_max.label, "%sjitter_max", address);
+                        pd_jitter_max.value = mp_create_pd_value(target.jitter_max);
+                        mp_add_perfdata_to_subcheck(&sc_jitter, pd_jitter_max);
+                }
+                mp_add_subcheck_to_subcheck(&result, sc_jitter);
+        }
+
+        if (modes.mos_mode) {
+                mp_subcheck sc_mos = mp_subcheck_init();
+                sc_mos = mp_set_subcheck_default_state(sc_mos, STATE_OK);
+                xasprintf(&sc_mos.output, "MOS %0.1f", mos);
+
+                if (mos <= crit.mos) {
+                        sc_mos = mp_set_subcheck_state(sc_mos, STATE_CRITICAL);
+                        xasprintf(&sc_mos.output, "%s <= %0.1f", sc_mos.output, crit.mos);
+                } else if (mos <= warn.mos) {
+                        sc_mos = mp_set_subcheck_state(sc_mos, STATE_WARNING);
+                        xasprintf(&sc_mos.output, "%s <= %0.1f", sc_mos.output, warn.mos);
+                }
+
+                if (packet_loss < 100) {
+                        mp_perfdata pd_mos = perfdata_init();
+                        xasprintf(&pd_mos.label, "%smos", address);
+                        pd_mos.value = mp_create_pd_value(mos);
+                        pd_mos.warn = mp_range_set_end(pd_mos.warn, mp_create_pd_value(warn.mos));
+                        pd_mos.crit = mp_range_set_end(pd_mos.crit, mp_create_pd_value(crit.mos));
+                        pd_mos.min = mp_create_pd_value(0); // MOS starts at 0
+                        pd_mos.max = mp_create_pd_value(5); // MOS max is 5, by definition
+                        mp_add_perfdata_to_subcheck(&sc_mos, pd_mos);
+                }
+                mp_add_subcheck_to_subcheck(&result, sc_mos);
+        }
+
+        if (modes.score_mode) {
+                mp_subcheck sc_score = mp_subcheck_init();
+                sc_score = mp_set_subcheck_default_state(sc_score, STATE_OK);
+                xasprintf(&sc_score.output, "Score %f", score);
+
+                if (score <= crit.score) {
+                        sc_score = mp_set_subcheck_state(sc_score, STATE_CRITICAL);
+                        xasprintf(&sc_score.output, "%s <= %f", sc_score.output, crit.score);
+                } else if (score <= warn.score) {
+                        sc_score = mp_set_subcheck_state(sc_score, STATE_WARNING);
+                        xasprintf(&sc_score.output, "%s <= %f", sc_score.output, warn.score);
+                }
+
+                if (packet_loss < 100) {
+                        mp_perfdata pd_score = perfdata_init();
+                        xasprintf(&pd_score.label, "%sscore", address);
+                        pd_score.value = mp_create_pd_value(score);
+                        pd_score.warn = mp_range_set_end(pd_score.warn, mp_create_pd_value(warn.score));
+                        pd_score.crit = mp_range_set_end(pd_score.crit, mp_create_pd_value(crit.score));
+                        pd_score.min = mp_create_pd_value(0);
+                        pd_score.max = mp_create_pd_value(100);
+                        mp_add_perfdata_to_subcheck(&sc_score, pd_score);
+                }
+
+                mp_add_subcheck_to_subcheck(&result, sc_score);
+        }
+
+        if (modes.order_mode) {
+                mp_subcheck sc_order = mp_subcheck_init();
+                sc_order = mp_set_subcheck_default_state(sc_order, STATE_OK);
+
+                if (target.found_out_of_order_packets) {
+                        mp_set_subcheck_state(sc_order, STATE_CRITICAL);
+                        xasprintf(&sc_order.output, "Packets out of order");
+                } else {
+                        xasprintf(&sc_order.output, "Packets in order");
+                }
+
+                mp_add_subcheck_to_subcheck(&result, sc_order);
+        }
+
+        return result;
+}
+
+evaluate_host_wrapper evaluate_host(check_icmp_target_container host,
+                                                                        check_icmp_mode_switches modes, check_icmp_threshold warn,
+                                                                        check_icmp_threshold crit) {
+        evaluate_host_wrapper result = {
+                .targets_warn = 0,
+                .targets_ok = 0,
+                .sc_host = mp_subcheck_init(),
+        };
+        result.sc_host = mp_set_subcheck_default_state(result.sc_host, STATE_OK);
+
+        result.sc_host.output = strdup(host.name);
+
+        ping_target *target = host.target_list;
+        for (unsigned int i = 0; i < host.number_of_targets; i++) {
+                mp_subcheck sc_target = evaluate_target(*target, modes, warn, crit);
+
+                mp_state_enum target_state = mp_compute_subcheck_state(sc_target);
+
+                if (target_state == STATE_WARNING) {
+                        result.targets_warn++;
+                } else if (target_state == STATE_OK) {
+                        result.targets_ok++;
+                }
+                mp_add_subcheck_to_subcheck(&result.sc_host, sc_target);
+
+                target = target->next;
+        }
+
+        return result;
 }
diff --git a/plugins-root/check_icmp.d/check_icmp_helpers.c b/plugins-root/check_icmp.d/check_icmp_helpers.c
new file mode 100644
index 00000000..1b96a392
--- /dev/null
+++ b/plugins-root/check_icmp.d/check_icmp_helpers.c
@@ -0,0 +1,134 @@
+#include "./config.h"
+#include <math.h>
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include "./check_icmp_helpers.h"
+#include "../../plugins/netutils.h"
+
+// timeout as a global variable to make it available to the timeout handler
+unsigned int timeout = DEFAULT_TIMEOUT;
+
+check_icmp_config check_icmp_config_init() {
+        check_icmp_config tmp = {
+                .modes =
+                        {
+                                .order_mode = false,
+                                .mos_mode = false,
+                                .rta_mode = false,
+                                .pl_mode = false,
+                                .jitter_mode = false,
+                                .score_mode = false,
+                        },
+
+                .min_hosts_alive = -1,
+                .crit = {.pl = DEFAULT_CRIT_PL,
+                                 .rta = DEFAULT_CRIT_RTA,
+                                 .jitter = 50.0,
+                                 .mos = 3.0,
+                                 .score = 70.0},
+                .warn = {.pl = DEFAULT_WARN_PL,
+                                 .rta = DEFAULT_WARN_RTA,
+                                 .jitter = 40.0,
+                                 .mos = 3.5,
+                                 .score = 80.0},
+
+                .ttl = DEFAULT_TTL,
+                .icmp_data_size = DEFAULT_PING_DATA_SIZE,
+                .target_interval = 0,
+                .number_of_packets = DEFAULT_NUMBER_OF_PACKETS,
+
+                .source_ip = NULL,
+                .need_v4 = false,
+                .need_v6 = false,
+
+                .sender_id = 0,
+
+                .mode = MODE_RTA,
+
+                .number_of_targets = 0,
+                .targets = NULL,
+
+                .number_of_hosts = 0,
+                .hosts = NULL,
+
+                .output_format_is_set = false,
+        };
+        return tmp;
+}
+
+ping_target ping_target_init() {
+        ping_target tmp = {
+                .rtmin = INFINITY,
+
+                .jitter_min = INFINITY,
+
+                .found_out_of_order_packets = false,
+        };
+
+        return tmp;
+}
+
+check_icmp_state check_icmp_state_init() {
+        check_icmp_state tmp = {.icmp_sent = 0, .icmp_lost = 0, .icmp_recv = 0, .targets_down = 0};
+
+        return tmp;
+}
+
+ping_target_create_wrapper ping_target_create(struct sockaddr_storage address) {
+        ping_target_create_wrapper result = {
+                .errorcode = 0,
+        };
+
+        struct sockaddr_storage *tmp_addr = &address;
+
+        /* disregard obviously stupid addresses
+         * (I didn't find an ipv6 equivalent to INADDR_NONE) */
+        if (((tmp_addr->ss_family == AF_INET &&
+                  (((struct sockaddr_in *)tmp_addr)->sin_addr.s_addr == INADDR_NONE ||
+                   ((struct sockaddr_in *)tmp_addr)->sin_addr.s_addr == INADDR_ANY))) ||
+                (tmp_addr->ss_family == AF_INET6 &&
+                 (((struct sockaddr_in6 *)tmp_addr)->sin6_addr.s6_addr == in6addr_any.s6_addr))) {
+                result.errorcode = 1;
+                return result;
+        }
+
+        /* add the fresh ip */
+        ping_target target = ping_target_init();
+
+        /* fill out the sockaddr_storage struct */
+        target.address = address;
+
+        result.host = target;
+
+        return result;
+}
+
+check_icmp_target_container check_icmp_target_container_init() {
+        check_icmp_target_container tmp = {
+                .name = NULL,
+                .number_of_targets = 0,
+                .target_list = NULL,
+        };
+        return tmp;
+}
+
+unsigned int ping_target_list_append(ping_target *list, ping_target *elem) {
+        if (elem == NULL || list == NULL) {
+                return 0;
+        }
+
+        while (list->next != NULL) {
+                list = list->next;
+        }
+
+        list->next = elem;
+
+        unsigned int result = 1;
+
+        while (elem->next != NULL) {
+                result++;
+                elem = elem->next;
+        }
+
+        return result;
+}
diff --git a/plugins-root/check_icmp.d/check_icmp_helpers.h b/plugins-root/check_icmp.d/check_icmp_helpers.h
new file mode 100644
index 00000000..dc6ea40b
--- /dev/null
+++ b/plugins-root/check_icmp.d/check_icmp_helpers.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "../../lib/states.h"
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/icmp6.h>
+#include <arpa/inet.h>
+
+typedef struct ping_target {
+        unsigned short id; /* id in **table, and icmp pkts */
+        char *msg;         /* icmp error message, if any */
+
+        struct sockaddr_storage address;              /* the address of this host */
+        struct sockaddr_storage error_addr;           /* stores address of error replies */
+        time_t time_waited;                           /* total time waited, in usecs */
+        unsigned int icmp_sent, icmp_recv, icmp_lost; /* counters */
+        unsigned char icmp_type, icmp_code;           /* type and code from errors */
+        unsigned short flags;                         /* control/status flags */
+
+        double rtmax; /* max rtt */
+        double rtmin; /* min rtt */
+
+        double jitter;     /* measured jitter */
+        double jitter_max; /* jitter rtt maximum */
+        double jitter_min; /* jitter rtt minimum */
+
+        time_t last_tdiff;
+        unsigned int last_icmp_seq; /* Last ICMP_SEQ to check out of order pkts */
+
+        bool found_out_of_order_packets;
+
+        struct ping_target *next;
+} ping_target;
+
+ping_target ping_target_init();
+
+typedef struct {
+        char *name;
+        ping_target *target_list;
+        unsigned int number_of_targets;
+} check_icmp_target_container;
+
+check_icmp_target_container check_icmp_target_container_init();
+
+typedef struct {
+        unsigned int icmp_sent;
+        unsigned int icmp_recv;
+        unsigned int icmp_lost;
+        unsigned short targets_down;
+} check_icmp_state;
+
+check_icmp_state check_icmp_state_init();
+
+typedef struct {
+        int errorcode;
+        ping_target host;
+} ping_target_create_wrapper;
+
+typedef struct {
+        int socket4;
+        int socket6;
+} check_icmp_socket_set;
+
+ping_target_create_wrapper ping_target_create(struct sockaddr_storage address);
+unsigned int ping_target_list_append(ping_target *list, ping_target *elem);
diff --git a/plugins-root/check_icmp.d/config.h b/plugins-root/check_icmp.d/config.h
new file mode 100644
index 00000000..be388d0a
--- /dev/null
+++ b/plugins-root/check_icmp.d/config.h
@@ -0,0 +1,115 @@
+#pragma once
+
+#include "../../config.h"
+#include "../../lib/states.h"
+#include <stddef.h>
+#include <netinet/in_systm.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/ip_icmp.h>
+#include <netinet/icmp6.h>
+#include <arpa/inet.h>
+#include <stdint.h>
+#include "./check_icmp_helpers.h"
+#include "output.h"
+
+/* threshold structure. all values are maximum allowed, exclusive */
+typedef struct {
+        unsigned char pl; /* max allowed packet loss in percent */
+        time_t rta;       /* roundtrip time average, microseconds */
+        double jitter;    /* jitter time average, microseconds */
+        double mos;       /* MOS */
+        double score;     /* Score */
+} check_icmp_threshold;
+
+/* the different modes of this program are as follows:
+ * MODE_RTA: send all packets no matter what (mimic check_icmp and check_ping)
+ * MODE_HOSTCHECK: Return immediately upon any sign of life
+ *                 In addition, sends packets to ALL addresses assigned
+ *                 to this host (as returned by gethostbyname() or
+ *                 gethostbyaddr() and expects one host only to be checked at
+ *                 a time.  Therefore, any packet response what so ever will
+ *                 count as a sign of life, even when received outside
+ *                 crit.rta limit. Do not misspell any additional IP's.
+ * MODE_ALL:  Requires packets from ALL requested IP to return OK (default).
+ * MODE_ICMP: Default Mode
+ */
+typedef enum {
+        MODE_RTA,
+        MODE_HOSTCHECK,
+        MODE_ALL,
+        MODE_ICMP,
+} check_icmp_execution_mode;
+
+typedef struct {
+        bool order_mode;
+        bool mos_mode;
+        bool rta_mode;
+        bool pl_mode;
+        bool jitter_mode;
+        bool score_mode;
+} check_icmp_mode_switches;
+
+typedef struct {
+        check_icmp_mode_switches modes;
+
+        int min_hosts_alive;
+        check_icmp_threshold crit;
+        check_icmp_threshold warn;
+
+        unsigned long ttl;
+        unsigned short icmp_data_size;
+        time_t target_interval;
+        unsigned short number_of_packets;
+
+        char *source_ip;
+        bool need_v4;
+        bool need_v6;
+
+        uint16_t sender_id; // PID of the main process, which is used as an ID in packets
+
+        check_icmp_execution_mode mode;
+
+        unsigned short number_of_targets;
+        ping_target *targets;
+
+        unsigned short number_of_hosts;
+        check_icmp_target_container *hosts;
+
+        mp_output_format output_format;
+        bool output_format_is_set;
+} check_icmp_config;
+
+check_icmp_config check_icmp_config_init();
+
+/* the data structure */
+typedef struct icmp_ping_data {
+        struct timeval stime; /* timestamp (saved in protocol struct as well) */
+        unsigned short ping_id;
+} icmp_ping_data;
+
+#define MAX_IP_PKT_SIZE        65536 /* (theoretical) max IP packet size */
+#define IP_HDR_SIZE            20
+#define MAX_PING_DATA          (MAX_IP_PKT_SIZE - IP_HDR_SIZE - ICMP_MINLEN)
+#define MIN_PING_DATA_SIZE     sizeof(struct icmp_ping_data)
+#define DEFAULT_PING_DATA_SIZE (MIN_PING_DATA_SIZE + 44)
+
+/* 80 msec packet interval by default */
+// DEPRECATED, remove when removing the option
+#define DEFAULT_PKT_INTERVAL 80000
+
+#define DEFAULT_TARGET_INTERVAL 0
+
+#define DEFAULT_WARN_RTA 200000
+#define DEFAULT_CRIT_RTA 500000
+#define DEFAULT_WARN_PL  40
+#define DEFAULT_CRIT_PL  80
+
+#define DEFAULT_TIMEOUT 10
+#define DEFAULT_TTL     64
+
+#define DEFAULT_NUMBER_OF_PACKETS 5
+
+#define PACKET_BACKOFF_FACTOR 1.5
+#define TARGET_BACKOFF_FACTOR 1.5
diff --git a/plugins-root/pst3.c b/plugins-root/pst3.c
index 1f69f3a6..1bfe3d35 100644
--- a/plugins-root/pst3.c
+++ b/plugins-root/pst3.c
@@ -1,45 +1,45 @@
 /*****************************************************************************
-* 
-* pst3
-* 
-* License: GPL
-* Copyright (c) 2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the pst3 executable. This is a replacement ps command
-* for Solaris to get output which provides a long argument listing, which
-* is not possible with the standard ps command (due to truncation). /usr/ucb/ps
-* also has issues where some fields run into each other.
-* 
-* This executable works by reading process address structures, so needs
-* to be executed as root
-*
-* Originally written by R.W.Ingraham
-* Rewritten by Duncan Ferguson (Altinity Ltd, June 2008)
-*   The rewrite was necessary as /dev/kmem is not available within
-*   non-global zones on Solaris 10
-*
-*   Details for rewrite came from
-*    source of /usr/ucb/ps on Solaris:
-*     http://cvs.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/ucbcmd/ps/ps.c#argvoff
-*    usenet group posting
-*     http://groups.google.com/group/comp.unix.solaris/tree/browse_frm/month/2001-09/bfa40c08bac819a2?rnum=141&_done=%2Fgroup%2Fcomp.unix.solaris%2Fbrowse_frm%2Fmonth%2F2001-09%3F
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-*****************************************************************************/
+ *
+ * pst3
+ *
+ * License: GPL
+ * Copyright (c) 2008 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the pst3 executable. This is a replacement ps command
+ * for Solaris to get output which provides a long argument listing, which
+ * is not possible with the standard ps command (due to truncation). /usr/ucb/ps
+ * also has issues where some fields run into each other.
+ *
+ * This executable works by reading process address structures, so needs
+ * to be executed as root
+ *
+ * Originally written by R.W.Ingraham
+ * Rewritten by Duncan Ferguson (Altinity Ltd, June 2008)
+ *   The rewrite was necessary as /dev/kmem is not available within
+ *   non-global zones on Solaris 10
+ *
+ *   Details for rewrite came from
+ *    source of /usr/ucb/ps on Solaris:
+ *     http://cvs.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/ucbcmd/ps/ps.c#argvoff
+ *    usenet group posting
+ *     http://groups.google.com/group/comp.unix.solaris/tree/browse_frm/month/2001-09/bfa40c08bac819a2?rnum=141&_done=%2Fgroup%2Fcomp.unix.solaris%2Fbrowse_frm%2Fmonth%2F2001-09%3F
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *****************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -55,14 +55,14 @@
  *  Constants
  */
 
-#define PROC_DIR  "/proc"
-#define ARGS            30
+#define PROC_DIR "/proc"
+#define ARGS     30
 
 /*
  *  Globals
  */
 
-static char *        szProg;
+static char *szProg;
 
 /*
  *  Prototypes
@@ -71,192 +71,179 @@ void usage();
 
 /*----------------------------------------------------------------------------*/
 
-int main (int argc, char **argv)
-{
-  DIR *procdir;
-  struct dirent *proc;
-  char ps_name[ARGS];
-  char as_name[ARGS];
-  psinfo_t psinfo;
-
-  /* Set our program name global */
-  if ((szProg = strrchr(argv[0], '/')) != NULL)
-    szProg++;
-  else
-    szProg = argv[0];
-
-  /* if given any parameters, print out help */
-  if(argc > 1) {
-    (void)usage();
-    exit(1);
-  }
-
-  /* Make sure that our euid is root */
-  if (geteuid() != 0)
-  {
-    fprintf(stderr, "%s: This program can only be run by the root user!\n", szProg);
-    exit(1);
-  }
-
-  if ((procdir = opendir(PROC_DIR)) == NULL) {
-    fprintf(stderr, "%s: cannot open PROC directory %s\n", szProg, PROC_DIR);
-    exit(1);
-  }
-
-  /* Display column headings */
-  printf("%c %5s %5s %5s %6s %6s %4s %s %s\n",
-    'S',
-    "UID",
-    "PID",
-    "PPID",
-    "VSZ",
-    "RSS",
-    "%CPU",
-    "COMMAND",
-    "ARGS"
-  );
-
-  /* Zip through all of the process entries */
-  while((proc = readdir(procdir))) {
-    int ps_fd;
-    int as_fd;
-    off_t argoff;
-    int i;
-    char *args;
-    char *procname;
-    char *ptr;
-    int argslen;
-    uintptr_t args_addr;;
-    uintptr_t *args_vecs;;
-    int args_count;
-
-    if(proc->d_name[0] == '.')
-      continue;
-
-    sprintf(ps_name,"%s/%s/%s",PROC_DIR,proc->d_name,"psinfo");
-    sprintf(as_name,"%s/%s/%s",PROC_DIR,proc->d_name,"as");
-try_again:
-    if((ps_fd = open(ps_name, O_RDONLY)) == -1)
-      continue;
-
-    if((as_fd = open(as_name, O_RDONLY)) == -1) {
-      close(ps_fd);
-      continue;
-    }
-
-    if(read(ps_fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) {
-      int err = errno;
-      close(ps_fd);
-      close(as_fd);
-      if(err == EAGAIN) goto try_again;
-      if(err != ENOENT)
-        fprintf(stderr, "%s: read() on %s: %s\n", szProg,
-          ps_name, strerror(err));
-      continue;
-    }
-    close(ps_fd);
-
-    /* system process, ignore since the previous version did */
-    if(
-      psinfo.pr_nlwp == 0 ||
-      strcmp(psinfo.pr_lwp.pr_clname, "SYS") == 0
-    ) {
-      continue;
-    }
-
-    /* get the procname to match previous versions */
-    procname = strdup(psinfo.pr_psargs);
-    if((ptr = strchr(procname, ' ')) != NULL)
-        *ptr = '\0';
-    if((ptr = strrchr(procname, '/')) != NULL)
-        ptr++;
-    else
-        ptr = procname;
-
-    /*
-     * print out what we currently know
-     */
-    printf("%c %5d %5d %5d %6lu %6lu %4.1f %s ",
-      psinfo.pr_lwp.pr_sname,
-      psinfo.pr_euid,
-      psinfo.pr_pid,
-      psinfo.pr_ppid,
-      psinfo.pr_size,
-      psinfo.pr_rssize,
-      ((float)(psinfo.pr_pctcpu) / 0x8000 * 100.0),
-      ptr
-    );
-    free(procname);
-
-    /*
-     * and now for the command line stuff
-     */
-
-    args_addr = psinfo.pr_argv;
-    args_count = psinfo.pr_argc;
-    args_vecs = malloc(args_count * sizeof(uintptr_t));
-
-    if(psinfo.pr_dmodel == PR_MODEL_NATIVE) {
-      /* this process matches target process */
-      pread(as_fd,args_vecs, args_count * sizeof(uintptr_t),
-        args_addr);
-    } else {
-      /* this process is 64bit, target process is 32 bit*/
-      caddr32_t *args_vecs32 = (caddr32_t *)args_vecs;
-      pread(as_fd,args_vecs32,args_count * sizeof(caddr32_t),
-        args_addr);
-      for (i=args_count-1;i>=0;--i)
-        args_vecs[i]=args_vecs32[i];
-    }
-
-    /*
-     * now read in the args - if what we read in fills buffer
-     * resize buffer and reread that bit again
-     */
-    argslen=ARGS;
-    args=malloc(argslen+1);
-    for(i=0;i<args_count;i++) {
-      memset(args,'\0',argslen+1);
-      if(pread(as_fd, args, argslen, args_vecs[i]) <= 0) {
-        break;
-      }
-      args[argslen]='\0';
-      if(strlen(args) == argslen){
-        argslen += ARGS;
-        args = realloc(args, argslen + 1);
-        i--;
-        continue;
-      }
-      printf(" %s", args);
-    }
-    free(args_vecs);
-    free(args);
-    close(as_fd);
-    printf("\n");
-  }
-
-  (void) closedir(procdir);
-
-  return (0);
+int main(int argc, char **argv) {
+        DIR *procdir;
+        struct dirent *proc;
+        char ps_name[ARGS];
+        char as_name[ARGS];
+        psinfo_t psinfo;
+
+        /* Set our program name global */
+        if ((szProg = strrchr(argv[0], '/')) != NULL) {
+                szProg++;
+        } else {
+                szProg = argv[0];
+        }
+
+        /* if given any parameters, print out help */
+        if (argc > 1) {
+                (void)usage();
+                exit(1);
+        }
+
+        /* Make sure that our euid is root */
+        if (geteuid() != 0) {
+                fprintf(stderr, "%s: This program can only be run by the root user!\n", szProg);
+                exit(1);
+        }
+
+        if ((procdir = opendir(PROC_DIR)) == NULL) {
+                fprintf(stderr, "%s: cannot open PROC directory %s\n", szProg, PROC_DIR);
+                exit(1);
+        }
+
+        /* Display column headings */
+        printf("%c %5s %5s %5s %6s %6s %4s %s %s\n", 'S', "UID", "PID", "PPID", "VSZ", "RSS", "%CPU",
+                   "COMMAND", "ARGS");
+
+        /* Zip through all of the process entries */
+        while ((proc = readdir(procdir))) {
+                int ps_fd;
+                int as_fd;
+                off_t argoff;
+                int i;
+                char *args;
+                char *procname;
+                char *ptr;
+                int argslen;
+                uintptr_t args_addr;
+                ;
+                uintptr_t *args_vecs;
+                ;
+                int args_count;
+
+                if (proc->d_name[0] == '.') {
+                        continue;
+                }
+
+                sprintf(ps_name, "%s/%s/%s", PROC_DIR, proc->d_name, "psinfo");
+                sprintf(as_name, "%s/%s/%s", PROC_DIR, proc->d_name, "as");
+        try_again:
+                if ((ps_fd = open(ps_name, O_RDONLY)) == -1) {
+                        continue;
+                }
+
+                if ((as_fd = open(as_name, O_RDONLY)) == -1) {
+                        close(ps_fd);
+                        continue;
+                }
+
+                if (read(ps_fd, &psinfo, sizeof(psinfo)) != sizeof(psinfo)) {
+                        int err = errno;
+                        close(ps_fd);
+                        close(as_fd);
+                        if (err == EAGAIN) {
+                                goto try_again;
+                        }
+                        if (err != ENOENT) {
+                                fprintf(stderr, "%s: read() on %s: %s\n", szProg, ps_name, strerror(err));
+                        }
+                        continue;
+                }
+                close(ps_fd);
+
+                /* system process, ignore since the previous version did */
+                if (psinfo.pr_nlwp == 0 || strcmp(psinfo.pr_lwp.pr_clname, "SYS") == 0) {
+                        continue;
+                }
+
+                /* get the procname to match previous versions */
+                procname = strdup(psinfo.pr_psargs);
+                if ((ptr = strchr(procname, ' ')) != NULL) {
+                        *ptr = '\0';
+                }
+                if ((ptr = strrchr(procname, '/')) != NULL) {
+                        ptr++;
+                } else {
+                        ptr = procname;
+                }
+
+                /*
+                 * print out what we currently know
+                 */
+                printf("%c %5d %5d %5d %6lu %6lu %4.1f %s ", psinfo.pr_lwp.pr_sname, psinfo.pr_euid,
+                           psinfo.pr_pid, psinfo.pr_ppid, psinfo.pr_size, psinfo.pr_rssize,
+                           ((float)(psinfo.pr_pctcpu) / 0x8000 * 100.0), ptr);
+                free(procname);
+
+                /*
+                 * and now for the command line stuff
+                 */
+
+                args_addr = psinfo.pr_argv;
+                args_count = psinfo.pr_argc;
+                args_vecs = malloc(args_count * sizeof(uintptr_t));
+
+                if (psinfo.pr_dmodel == PR_MODEL_NATIVE) {
+                        /* this process matches target process */
+                        pread(as_fd, args_vecs, args_count * sizeof(uintptr_t), args_addr);
+                } else {
+                        /* this process is 64bit, target process is 32 bit*/
+                        caddr32_t *args_vecs32 = (caddr32_t *)args_vecs;
+                        pread(as_fd, args_vecs32, args_count * sizeof(caddr32_t), args_addr);
+                        for (i = args_count - 1; i >= 0; --i) {
+                                args_vecs[i] = args_vecs32[i];
+                        }
+                }
+
+                /*
+                 * now read in the args - if what we read in fills buffer
+                 * resize buffer and reread that bit again
+                 */
+                argslen = ARGS;
+                args = malloc(argslen + 1);
+                for (i = 0; i < args_count; i++) {
+                        memset(args, '\0', argslen + 1);
+                        if (pread(as_fd, args, argslen, args_vecs[i]) <= 0) {
+                                break;
+                        }
+                        args[argslen] = '\0';
+                        if (strlen(args) == argslen) {
+                                argslen += ARGS;
+                                args = realloc(args, argslen + 1);
+                                i--;
+                                continue;
+                        }
+                        printf(" %s", args);
+                }
+                free(args_vecs);
+                free(args);
+                close(as_fd);
+                printf("\n");
+        }
+
+        (void)closedir(procdir);
+
+        return (0);
 }
 
 /*----------------------------------------------------------------------------*/
 
 void usage() {
-  printf("%s: Help output\n\n", szProg);
-  printf("If this program is given any arguments, this help is displayed.\n");
-  printf("This command is used to print out the full command line for all\n");
-  printf("running processes because /usr/bin/ps is limited to 80 chars and\n");
-  printf("/usr/ucb/ps can merge columns together.\n\n");
-  printf("Columns are:\n");
-  printf("\tS        - State of process - see 'ps' man page\n");
-  printf("\tUID      - UID of the process owner\n");
-  printf("\tPID      - PID of the process\n");
-  printf("\tPPID     - PID of the parent process\n");
-  printf("\tVSZ      - Virtual memory usage (kilobytes)\n");
-  printf("\tRSS      - Real memory usage (kilobytes)\n");
-  printf("\t%%CPU     - CPU usage\n");
-  printf("\tCOMMAND  - Command being run\n");
-  printf("\tARGS     - Full command line with arguments\n");
-  return;
+        printf("%s: Help output\n\n", szProg);
+        printf("If this program is given any arguments, this help is displayed.\n");
+        printf("This command is used to print out the full command line for all\n");
+        printf("running processes because /usr/bin/ps is limited to 80 chars and\n");
+        printf("/usr/ucb/ps can merge columns together.\n\n");
+        printf("Columns are:\n");
+        printf("\tS        - State of process - see 'ps' man page\n");
+        printf("\tUID      - UID of the process owner\n");
+        printf("\tPID      - PID of the process\n");
+        printf("\tPPID     - PID of the parent process\n");
+        printf("\tVSZ      - Virtual memory usage (kilobytes)\n");
+        printf("\tRSS      - Real memory usage (kilobytes)\n");
+        printf("\t%%CPU     - CPU usage\n");
+        printf("\tCOMMAND  - Command being run\n");
+        printf("\tARGS     - Full command line with arguments\n");
+        return;
 }
diff --git a/plugins-root/t/check_dhcp.t b/plugins-root/t/check_dhcp.t
index ce627736..70392154 100644
--- a/plugins-root/t/check_dhcp.t
+++ b/plugins-root/t/check_dhcp.t
@@ -12,14 +12,14 @@ my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO",
                                    "no" );
 
 if ($allow_sudo eq "yes" or $> == 0) {
-    plan tests => 6;
+    plan tests => 7;
 } else {
     plan skip_all => "Need sudo to test check_dhcp";
 }
 my $sudo = $> == 0 ? '' : 'sudo';
 
-my $successOutput = '/OK: Received \d+ DHCPOFFER\(s\), \d+ of 1 requested servers responded, max lease time = \d+ sec\./';
-my $failureOutput = '/CRITICAL: (No DHCPOFFERs were received|Received \d+ DHCPOFFER\(s\), 0 of 1 requested servers responded, max lease time = \d+ sec\.)/';
+my $successOutput = '/Received \d+ DHCPOFFER(s)*, max lease time = \d+ seconds/';
+my $failureOutput = '/(No DHCPOFFERs were received|Received \d+ DHCPOFFER\(s\), 0 of 1 requested servers responded, max lease time = \d+ sec\.)/';
 my $invalidOutput = '/Invalid hostname/';
 
 my $host_responsive    = getTestParameter( "NP_HOST_DHCP_RESPONSIVE",
@@ -34,6 +34,8 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
                                            "An invalid (not known to DNS) hostname",
                                            "nosuchhost" );
 
+my $output_format = "--output-format mp-test-json";
+
 # try to determince interface
 my $interface = '';
 
@@ -49,19 +51,21 @@ my $res;
 SKIP: {
     skip('need responsive test host', 2) unless $host_responsive;
     $res = NPTest->testCmd(
-        "$sudo ./check_dhcp $interface -u -s $host_responsive"
+        "$sudo ./check_dhcp $interface -u -s $host_responsive $output_format"
     );
-    is( $res->return_code, 0, "Syntax ok" );
-    like( $res->output, $successOutput, "Output OK" );
+    is( $res->return_code, 0, "with JSON test format result should always be OK" );
+    like( $res->{'mp_test_result'}->{'state'}, "/OK/", "Output OK" );
+    like( $res->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $successOutput, "Output OK" );
 };
 
 SKIP: {
     skip('need nonresponsive test host', 2) unless $host_nonresponsive;
     $res = NPTest->testCmd(
-        "$sudo ./check_dhcp $interface -u -s $host_nonresponsive"
+        "$sudo ./check_dhcp $interface -u -s $host_nonresponsive $output_format"
     );
-    is( $res->return_code, 2, "Exit code - host nonresponsive" );
-    like( $res->output, $failureOutput, "Output OK" );
+    is( $res->return_code, 0, "with JSON test format result should always be OK" );
+    like( $res->{'mp_test_result'}->{'state'}, "/CRITICAL/", "Exit code - host nonresponsive" );
+    like( $res->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $failureOutput, "Output OK" );
 };
 
 SKIP: {
@@ -69,6 +73,6 @@ SKIP: {
     $res = NPTest->testCmd(
         "$sudo ./check_dhcp $interface -u -s $hostname_invalid"
     );
-    is( $res->return_code, 3, "Exit code - host invalid" );
+    is( $res->return_code, 3, "invalid hostname/address should return UNKNOWN" );
     like( $res->output, $invalidOutput, "Output OK" );
 };
diff --git a/plugins-root/t/check_icmp.t b/plugins-root/t/check_icmp.t
index de1d88d2..d414c3c7 100644
--- a/plugins-root/t/check_icmp.t
+++ b/plugins-root/t/check_icmp.t
@@ -12,15 +12,12 @@ my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO",
         "no" );
 
 if ($allow_sudo eq "yes" or $> == 0) {
-        plan tests => 40;
+        plan tests => 17;
 } else {
         plan skip_all => "Need sudo to test check_icmp";
 }
 my $sudo = $> == 0 ? '' : 'sudo';
 
-my $successOutput = '/OK - .*? rta (?:[\d\.]+ms)|(?:nan), lost \d+%/';
-my $failureOutput = '/(WARNING|CRITICAL) - .*? rta (?:[\d\.]+ms > [\d\.]+ms|nan)/';
-
 my $host_responsive    = getTestParameter( "NP_HOST_RESPONSIVE",
                                 "The hostname of system responsive to network requests",
                                 "localhost" );
@@ -36,108 +33,85 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
 my $res;
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -w 10000ms,100% -c 10000ms,100%"
+        "$sudo ./check_icmp -H $host_responsive -w 100ms,100% -c 100ms,100%"
         );
 is( $res->return_code, 0, "Syntax ok" );
-like( $res->output, $successOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -w 0ms,0% -c 10000ms,100%"
+        "$sudo ./check_icmp -H $host_responsive -w 0ms,0% -c 100ms,100%"
         );
 is( $res->return_code, 1, "Syntax ok, with forced warning" );
-like( $res->output, $failureOutput, "Output OK" );
 
 $res = NPTest->testCmd(
         "$sudo ./check_icmp -H $host_responsive -w 0,0% -c 0,0%"
         );
 is( $res->return_code, 2, "Syntax ok, with forced critical" );
-like( $res->output, $failureOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -t 2"
+        "$sudo ./check_icmp -H $host_nonresponsive -w 100ms,100% -c 100ms,100%"
         );
 is( $res->return_code, 2, "Timeout - host nonresponsive" );
-like( $res->output, '/pl=100%/', "Error contains 'pl=100%' string (for 100% packet loss)" );
-like( $res->output, '/rta=U/', "Error contains 'rta=U' string" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -w 10000ms,100% -c 10000ms,100%"
+        "$sudo ./check_icmp -w 100ms,100% -c 100ms,100%"
         );
 is( $res->return_code, 3, "No hostname" );
-like( $res->output, '/No hosts to check/', "Output with appropriate error message");
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 0 -t 2"
+        "$sudo ./check_icmp -H $host_nonresponsive -w 100ms,100% -c 100ms,100% -n 1 -m 0"
         );
 is( $res->return_code, 0, "One host nonresponsive - zero required" );
-like( $res->output, $successOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 1 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 100ms,100% -c 100ms,100% -n 1 -m 1"
         );
 is( $res->return_code, 0, "One of two host nonresponsive - one required" );
-like( $res->output, $successOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 10000ms,100% -c 10000ms,100% -n 1 -m 2"
+        "$sudo ./check_icmp -H $host_responsive -H $host_nonresponsive -w 100ms,100% -c 100ms,100% -n 1 -m 2"
         );
 is( $res->return_code, 2, "One of two host nonresponsive - two required" );
-like( $res->output, $failureOutput, "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -s 127.0.15.15 -w 10000ms,100% -c 10000ms,100% -n 1 -m 2"
+        "$sudo ./check_icmp -H $host_responsive -s 127.0.15.15 -w 100ms,100% -c 100ms,100% -n 1"
         );
 is( $res->return_code, 0, "IPv4 source_ip accepted" );
-like( $res->output, $successOutput, "Output OK" );
 
 $res = NPTest->testCmd(
         "$sudo ./check_icmp -H $host_responsive -b 65507"
         );
 is( $res->return_code, 0, "Try max packet size" );
-like( $res->output, $successOutput, "Output OK - Didn't overflow" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -R 100,100 -n 1 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -R 100,100 -n 1"
         );
 is( $res->return_code, 0, "rta works" );
-like( $res->output, $successOutput, "Output OK" );
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -P 80,90 -n 1 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -P 80,90 -n 1"
         );
 is( $res->return_code, 0, "pl works" );
-like( $res->output, '/lost 0%/', "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -J 80,90 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -J 80,90"
         );
 is( $res->return_code, 0, "jitter works" );
-like( $res->output, '/jitter \d/', "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -M 4,3 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -M 4,3"
         );
 is( $res->return_code, 0, "mos works" );
-like( $res->output, '/MOS \d/', "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -S 80,70 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -S 80,70"
         );
 is( $res->return_code, 0, "score works" );
-like( $res->output, '/Score \d/', "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -O -t 2"
+        "$sudo ./check_icmp -H $host_responsive -O"
         );
 is( $res->return_code, 0, "order works" );
-like( $res->output, '/Packets in order/', "Output OK" );
 
 $res = NPTest->testCmd(
-        "$sudo ./check_icmp -H $host_responsive -O -S 80,70 -M 4,3 -J 80,90 -P 80,90 -R 100,100 -t 2"
+        "$sudo ./check_icmp -H $host_responsive -O -S 80,70 -M 4,3 -J 80,90 -P 80,90 -R 100,100"
         );
 is( $res->return_code, 0, "order works" );
-like( $res->output, '/Packets in order/', "Output OK" );
-like( $res->output, '/Score \d/', "Output OK" );
-like( $res->output, '/MOS \d/', "Output OK" );
-like( $res->output, '/jitter \d/', "Output OK" );
-like( $res->output, '/lost 0%/', "Output OK" );
-like( $res->output, $successOutput, "Output OK" );
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 6c582a15..d098fa8a 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -13,8 +13,14 @@ AM_CFLAGS = -DNP_VERSION='"$(NP_VERSION)"'
 
 VPATH = $(top_srcdir) $(top_srcdir)/lib $(top_srcdir)/plugins $(top_srcdir)/plugins/t
 
-AM_CPPFLAGS = -I.. -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl \
-        @LDAPINCLUDE@ @PGINCLUDE@ @SSLINCLUDE@
+AM_CPPFLAGS = -I.. \
+                          -I$(top_srcdir)/lib \
+                          -I$(top_srcdir)/gl \
+                          -I$(top_srcdir)/intl \
+                          -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
+                          @LDAPINCLUDE@ \
+                          @PGINCLUDE@ \
+                          @SSLINCLUDE@
 
 localedir = $(datadir)/locale
 # gettext docs say to use AM_CPPFLAGS, but per module_CPPFLAGS override this
@@ -27,48 +33,68 @@ MATHLIBS = @MATHLIBS@
 #AM_CFLAGS = -Wall
 
 libexec_PROGRAMS = check_apt check_cluster check_disk check_dummy check_http check_load \
-        check_mrtg check_mrtgtraf check_ntp check_ntp_peer check_nwstat check_ping \
+        check_mrtg check_mrtgtraf check_ntp_peer check_ping \
         check_real check_smtp check_ssh check_tcp check_time check_ntp_time \
         check_ups check_users negate \
-        urlize @EXTRAS@
+        urlize @EXTRAS@ \
+        check_snmp
 
 check_tcp_programs = check_ftp check_imap check_nntp check_pop \
         check_udp check_clamd @check_tcp_ssl@
 
-EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
+EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_hpjd \
         check_swap check_fping check_ldap check_game check_dig \
-        check_nagios check_by_ssh check_dns check_nt check_ide_smart    \
+        check_nagios check_by_ssh check_dns check_ide_smart     \
         check_procs check_mysql_query check_apt check_dbi check_curl \
         \
-        tests/test_check_swap
+        tests/test_check_swap \
+        tests/test_check_snmp \
+        tests/test_check_disk
 
 SUBDIRS = picohttpparser
 
-np_test_scripts = tests/test_check_swap.t
+np_test_scripts = tests/test_check_swap.t \
+                                  tests/test_check_snmp.t \
+                                  tests/test_check_disk.t
 
 EXTRA_DIST = t \
                          tests \
                          $(np_test_scripts) \
+                         negate.d \
                          check_swap.d \
                          check_ldap.d \
                          check_hpjd.d \
                          check_game.d \
+                         check_radius.d \
+                         check_curl.d \
+                         check_disk.d \
+                         check_time.d \
+                         check_users.d \
+                         check_load.d \
                          check_nagios.d \
                          check_dbi.d \
+                         check_tcp.d \
+                         check_real.d \
                          check_ssh.d \
-                         check_nt.d \
                          check_dns.d \
                          check_mrtgtraf.d \
                          check_mysql_query.d \
                          check_mrtg.d \
+                         check_ntp_peer.d \
                          check_apt.d \
                          check_pgsql.d \
+                         check_procs.d \
+                         check_ping.d \
                          check_by_ssh.d \
                          check_smtp.d \
+                         check_snmp.d \
                          check_mysql.d \
                          check_ntp_time.d \
                          check_dig.d \
                          check_cluster.d \
+                         check_curl.d \
+                         check_cluster.d \
+                         check_ups.d \
                          check_fping.d
 
 PLUGINHDRS = common.h
@@ -108,9 +134,11 @@ check_cluster_LDADD = $(BASEOBJS)
 check_curl_CFLAGS = $(AM_CFLAGS) $(LIBCURLCFLAGS) $(URIPARSERCFLAGS) $(LIBCURLINCLUDE) $(URIPARSERINCLUDE) -Ipicohttpparser
 check_curl_CPPFLAGS = $(AM_CPPFLAGS) $(LIBCURLCFLAGS) $(URIPARSERCFLAGS) $(LIBCURLINCLUDE) $(URIPARSERINCLUDE) -Ipicohttpparser
 check_curl_LDADD = $(NETLIBS) $(LIBCURLLIBS) $(SSLOBJS) $(URIPARSERLIBS) picohttpparser/libpicohttpparser.a
+check_curl_SOURCES = check_curl.c check_curl.d/check_curl_helpers.c
 check_dbi_LDADD = $(NETLIBS) $(DBILIBS)
 check_dig_LDADD = $(NETLIBS)
 check_disk_LDADD = $(BASEOBJS)
+check_disk_SOURCES = check_disk.c check_disk.d/utils_disk.c
 check_dns_LDADD = $(NETLIBS)
 check_dummy_LDADD = $(BASEOBJS)
 check_fping_LDADD = $(NETLIBS)
@@ -128,16 +156,16 @@ check_mysql_query_CFLAGS = $(AM_CFLAGS) $(MYSQLCFLAGS)
 check_mysql_query_CPPFLAGS = $(AM_CPPFLAGS) $(MYSQLINCLUDE)
 check_mysql_query_LDADD = $(NETLIBS) $(MYSQLLIBS)
 check_nagios_LDADD = $(BASEOBJS)
-check_nt_LDADD = $(NETLIBS)
-check_ntp_LDADD = $(NETLIBS) $(MATHLIBS)
 check_ntp_peer_LDADD = $(NETLIBS) $(MATHLIBS)
-check_nwstat_LDADD = $(NETLIBS)
 check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
 check_ping_LDADD = $(NETLIBS)
 check_procs_LDADD = $(BASEOBJS)
 check_radius_LDADD = $(NETLIBS) $(RADIUSLIBS)
 check_real_LDADD = $(NETLIBS)
+check_snmp_SOURCES = check_snmp.c check_snmp.d/check_snmp_helpers.c
 check_snmp_LDADD = $(BASEOBJS)
+check_snmp_LDFLAGS = $(AM_LDFLAGS) `net-snmp-config --libs`
+check_snmp_CFLAGS = $(AM_CFLAGS) `net-snmp-config --cflags`
 check_smtp_LDADD = $(SSLOBJS)
 check_ssh_LDADD = $(NETLIBS)
 check_swap_SOURCES = check_swap.c check_swap.d/swap.c
@@ -146,6 +174,7 @@ check_tcp_LDADD = $(SSLOBJS)
 check_time_LDADD = $(NETLIBS)
 check_ntp_time_LDADD = $(NETLIBS) $(MATHLIBS)
 check_ups_LDADD = $(NETLIBS)
+check_users_SOURCES = check_users.c check_users.d/users.c
 check_users_LDADD = $(BASEOBJS) $(WTSAPI32LIBS) $(SYSTEMDLIBS)
 check_by_ssh_LDADD = $(NETLIBS)
 check_ide_smart_LDADD = $(BASEOBJS)
@@ -158,6 +187,10 @@ endif
 
 tests_test_check_swap_LDADD = $(BASEOBJS) $(tap_ldflags) -ltap
 tests_test_check_swap_SOURCES = tests/test_check_swap.c check_swap.d/swap.c
+tests_test_check_snmp_LDADD = $(BASEOBJS) $(tap_ldflags) -ltap
+tests_test_check_snmp_SOURCES = tests/test_check_snmp.c check_snmp.d/check_snmp_helpers.c
+tests_test_check_disk_LDADD = $(BASEOBJS) $(tap_ldflags) check_disk.d/utils_disk.c -ltap
+tests_test_check_disk_SOURCES = tests/test_check_disk.c
 
 ##############################################################################
 # secondary dependencies
diff --git a/plugins/check_apt.c b/plugins/check_apt.c
index e840184b..9ed5b6cf 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -29,31 +29,33 @@
  *
  *****************************************************************************/
 
-#include "states.h"
+#include "perfdata.h"
 const char *progname = "check_apt";
 const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
+#include "states.h"
+#include "output.h"
 #include "common.h"
 #include "runcmd.h"
 #include "utils.h"
 #include "regex.h"
 #include "check_apt.d/config.h"
 
-/* Character for hidden input file option (for testing). */
-#define INPUT_FILE_OPT CHAR_MAX + 1
 /* the default opts can be overridden via the cmdline */
-#define UPGRADE_DEFAULT_OPTS "-o 'Debug::NoLocking=true' -s -qq"
-#define UPDATE_DEFAULT_OPTS  "-q"
+const char *UPGRADE_DEFAULT_OPTS = "-o 'Debug::NoLocking=true' -s -qq";
+const char *UPDATE_DEFAULT_OPTS = "-q";
+
 /* until i commit the configure.in patch which gets this, i'll define
  * it here as well */
 #ifndef PATH_TO_APTGET
 #       define PATH_TO_APTGET "/usr/bin/apt-get"
 #endif /* PATH_TO_APTGET */
+
 /* String found at the beginning of the apt output lines we're interested in */
-#define PKGINST_PREFIX "Inst "
+const char *PKGINST_PREFIX = "Inst ";
 /* the RE that catches security updates */
-#define SECURITY_RE "^[^\\(]*\\(.* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)"
+const char *SECURITY_RE = "^[^\\(]*\\(.* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)";
 
 /* some standard functions */
 typedef struct {
@@ -66,20 +68,28 @@ void print_usage(void);
 
 /* construct the appropriate apt-get cmdline */
 static char *construct_cmdline(upgrade_type /*u*/, const char * /*opts*/);
+
 /* run an apt-get update */
-static int run_update(char * /*update_opts*/);
+typedef struct {
+        mp_subcheck sc;
+        bool stderr_warning;
+        bool exec_warning;
+} run_update_result;
+static run_update_result run_update(char *update_opts);
 
 typedef struct {
         int errorcode;
-        int package_count;
-        int security_package_count;
+        size_t package_count;
+        size_t security_package_count;
         char **packages_list;
         char **secpackages_list;
+        bool exec_warning;
 } run_upgrade_result;
 
 /* run an apt-get upgrade */
-run_upgrade_result run_upgrade(upgrade_type upgrade, const char *do_include, const char *do_exclude, const char *do_critical,
-                                                           const char *upgrade_opts, const char *input_filename);
+run_upgrade_result run_upgrade(upgrade_type upgrade, const char *do_include, const char *do_exclude,
+                                                           const char *do_critical, const char *upgrade_opts,
+                                                           const char *input_filename);
 
 /* add another clause to a regexp */
 static char *add_to_regexp(char * /*expr*/, const char * /*next*/);
@@ -107,6 +117,10 @@ int main(int argc, char **argv) {
 
         const check_apt_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* Set signal handling and alarm timeout */
         if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
@@ -115,55 +129,91 @@ int main(int argc, char **argv) {
         /* handle timeouts gracefully... */
         alarm(timeout_interval);
 
-        mp_state_enum result = STATE_UNKNOWN;
+        mp_check overall = mp_check_init();
         /* if they want to run apt-get update first... */
         if (config.do_update) {
-                result = run_update(config.update_opts);
+                run_update_result update_result = run_update(config.update_opts);
+
+                mp_add_subcheck_to_check(&overall, update_result.sc);
         }
 
         /* apt-get upgrade */
         run_upgrade_result upgrad_res =
-                run_upgrade(config.upgrade, config.do_include, config.do_exclude, config.do_critical, config.upgrade_opts, config.input_filename);
+                run_upgrade(config.upgrade, config.do_include, config.do_exclude, config.do_critical,
+                                        config.upgrade_opts, config.input_filename);
+
+        mp_subcheck sc_run_upgrade = mp_subcheck_init();
+        if (upgrad_res.errorcode == OK) {
+                sc_run_upgrade = mp_set_subcheck_state(sc_run_upgrade, STATE_OK);
+        }
+        xasprintf(&sc_run_upgrade.output, "Executed apt upgrade (dry run)");
 
-        result = max_state(result, upgrad_res.errorcode);
-        int packages_available = upgrad_res.package_count;
-        int sec_count = upgrad_res.security_package_count;
+        mp_add_subcheck_to_check(&overall, sc_run_upgrade);
+
+        size_t packages_available = upgrad_res.package_count;
+        size_t number_of_security_updates = upgrad_res.security_package_count;
         char **packages_list = upgrad_res.packages_list;
         char **secpackages_list = upgrad_res.secpackages_list;
 
-        if (sec_count > 0) {
-                result = max_state(result, STATE_CRITICAL);
-        } else if (packages_available >= config.packages_warning && !config.only_critical) {
-                result = max_state(result, STATE_WARNING);
-        } else if (result > STATE_UNKNOWN) {
-                result = STATE_UNKNOWN;
+        mp_perfdata pd_security_updates = perfdata_init();
+        pd_security_updates.value = mp_create_pd_value(number_of_security_updates);
+        pd_security_updates.label = "critical_updates";
+
+        mp_subcheck sc_security_updates = mp_subcheck_init();
+        xasprintf(&sc_security_updates.output, "Security updates available: %zu",
+                          number_of_security_updates);
+        mp_add_perfdata_to_subcheck(&sc_security_updates, pd_security_updates);
+
+        if (number_of_security_updates > 0) {
+                sc_security_updates = mp_set_subcheck_state(sc_security_updates, STATE_CRITICAL);
+        } else {
+                sc_security_updates = mp_set_subcheck_state(sc_security_updates, STATE_OK);
         }
 
-        printf(_("APT %s: %d packages available for %s (%d critical updates). %s%s%s%s|available_upgrades=%d;;;0 critical_updates=%d;;;0\n"),
-                   state_text(result), packages_available, (config.upgrade == DIST_UPGRADE) ? "dist-upgrade" : "upgrade", sec_count,
-                   (stderr_warning) ? " warnings detected" : "", (stderr_warning && exec_warning) ? "," : "",
-                   (exec_warning) ? " errors detected" : "", (stderr_warning || exec_warning) ? "." : "", packages_available, sec_count);
+        mp_perfdata pd_other_updates = perfdata_init();
+        pd_other_updates.value = mp_create_pd_value(packages_available);
+        pd_other_updates.label = "available_upgrades";
+
+        mp_subcheck sc_other_updates = mp_subcheck_init();
+
+        xasprintf(&sc_other_updates.output, "Updates available: %zu", packages_available);
+        sc_other_updates = mp_set_subcheck_default_state(sc_other_updates, STATE_OK);
+        mp_add_perfdata_to_subcheck(&sc_other_updates, pd_other_updates);
+
+        if (packages_available >= config.packages_warning && !config.only_critical) {
+                sc_other_updates = mp_set_subcheck_state(sc_other_updates, STATE_WARNING);
+        }
 
         if (config.list) {
-                qsort(secpackages_list, sec_count, sizeof(char *), cmpstringp);
-                qsort(packages_list, packages_available - sec_count, sizeof(char *), cmpstringp);
+                qsort(secpackages_list, number_of_security_updates, sizeof(char *), cmpstringp);
+                qsort(packages_list, packages_available - number_of_security_updates, sizeof(char *),
+                          cmpstringp);
 
-                for (int i = 0; i < sec_count; i++) {
-                        printf("%s (security)\n", secpackages_list[i]);
+                for (size_t i = 0; i < number_of_security_updates; i++) {
+                        xasprintf(&sc_security_updates.output, "%s\n%s (security)", sc_security_updates.output,
+                                          secpackages_list[i]);
                 }
 
                 if (!config.only_critical) {
-                        for (int i = 0; i < packages_available - sec_count; i++) {
-                                printf("%s\n", packages_list[i]);
+                        for (size_t i = 0; i < packages_available - number_of_security_updates; i++) {
+                                xasprintf(&sc_other_updates.output, "%s\n%s", sc_other_updates.output,
+                                                  packages_list[i]);
                         }
                 }
         }
+        mp_add_subcheck_to_check(&overall, sc_security_updates);
+        mp_add_subcheck_to_check(&overall, sc_other_updates);
 
-        return result;
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
 check_apt_config_wrapper process_arguments(int argc, char **argv) {
+        enum {
+                /* Character for hidden input file option (for testing). */
+                INPUT_FILE_OPT = CHAR_MAX + 1,
+                output_format_index,
+        };
         static struct option longopts[] = {{"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
                                                                            {"verbose", no_argument, 0, 'v'},
@@ -179,6 +229,7 @@ check_apt_config_wrapper process_arguments(int argc, char **argv) {
                                                                            {"only-critical", no_argument, 0, 'o'},
                                                                            {"input-file", required_argument, 0, INPUT_FILE_OPT},
                                                                            {"packages-warning", required_argument, 0, 'w'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
         check_apt_config_wrapper result = {
@@ -257,6 +308,18 @@ check_apt_config_wrapper process_arguments(int argc, char **argv) {
                 case 'w':
                         result.config.packages_warning = atoi(optarg);
                         break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 default:
                         /* print short usage statement if args not parsable */
                         usage5();
@@ -267,37 +330,38 @@ check_apt_config_wrapper process_arguments(int argc, char **argv) {
 }
 
 /* run an apt-get upgrade */
-run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_include, const char *do_exclude, const char *do_critical,
+run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_include,
+                                                           const char *do_exclude, const char *do_critical,
                                                            const char *upgrade_opts, const char *input_filename) {
-        regex_t ereg;
+        regex_t exclude_regex;
         /* initialize ereg as it is possible it is printed while uninitialized */
-        memset(&ereg, '\0', sizeof(ereg.buffer));
+        memset(&exclude_regex, '\0', sizeof(exclude_regex.buffer));
 
         run_upgrade_result result = {
-                .errorcode = STATE_UNKNOWN,
+                .errorcode = OK,
         };
 
         if (upgrade == NO_UPGRADE) {
-                result.errorcode = STATE_OK;
+                result.errorcode = OK;
                 return result;
         }
 
         int regres = 0;
-        regex_t ireg;
+        regex_t include_regex;
         char rerrbuf[64];
         /* compile the regexps */
         if (do_include != NULL) {
-                regres = regcomp(&ireg, do_include, REG_EXTENDED);
+                regres = regcomp(&include_regex, do_include, REG_EXTENDED);
                 if (regres != 0) {
-                        regerror(regres, &ireg, rerrbuf, 64);
+                        regerror(regres, &include_regex, rerrbuf, 64);
                         die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
                 }
         }
 
         if (do_exclude != NULL) {
-                regres = regcomp(&ereg, do_exclude, REG_EXTENDED);
+                regres = regcomp(&exclude_regex, do_exclude, REG_EXTENDED);
                 if (regres != 0) {
-                        regerror(regres, &ereg, rerrbuf, 64);
+                        regerror(regres, &exclude_regex, rerrbuf, 64);
                         die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
                 }
         }
@@ -306,12 +370,12 @@ run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_includ
         const char *crit_ptr = (do_critical != NULL) ? do_critical : SECURITY_RE;
         regres = regcomp(&sreg, crit_ptr, REG_EXTENDED);
         if (regres != 0) {
-                regerror(regres, &ereg, rerrbuf, 64);
+                regerror(regres, &exclude_regex, rerrbuf, 64);
                 die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
         }
 
-        struct output chld_out;
-        struct output chld_err;
+        output chld_out;
+        output chld_err;
         char *cmdline = NULL;
         cmdline = construct_cmdline(upgrade, upgrade_opts);
         if (input_filename != NULL) {
@@ -322,13 +386,12 @@ run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_includ
                 result.errorcode = np_runcmd(cmdline, &chld_out, &chld_err, 0);
         }
 
-        /* apt-get upgrade only changes exit status if there is an
-         * internal error when run in dry-run mode.  therefore we will
-         * treat such an error as UNKNOWN */
-        if (result.errorcode != STATE_OK) {
-                exec_warning = 1;
-                result.errorcode = STATE_UNKNOWN;
-                fprintf(stderr, _("'%s' exited with non-zero status.\n"), cmdline);
+        // apt-get upgrade only changes exit status if there is an
+        // internal error when run in dry-run mode.
+        if (result.errorcode != 0) {
+                result.exec_warning = true;
+                result.errorcode = ERROR;
+                // fprintf(stderr, _("'%s' exited with non-zero status.\n"), cmdline);
         }
 
         char **pkglist = malloc(sizeof(char *) * chld_out.lines);
@@ -349,27 +412,31 @@ run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_includ
          * we may need to switch to the --print-uris output format,
          * in which case the logic here will slightly change.
          */
-        int package_counter = 0;
-        int security_package_counter = 0;
+        size_t package_counter = 0;
+        size_t security_package_counter = 0;
         for (size_t i = 0; i < chld_out.lines; i++) {
                 if (verbose) {
                         printf("%s\n", chld_out.line[i]);
                 }
+
                 /* if it is a package we care about */
                 if (strncmp(PKGINST_PREFIX, chld_out.line[i], strlen(PKGINST_PREFIX)) == 0 &&
-                        (do_include == NULL || regexec(&ireg, chld_out.line[i], 0, NULL, 0) == 0)) {
+                        (do_include == NULL || regexec(&include_regex, chld_out.line[i], 0, NULL, 0) == 0)) {
                         /* if we're not excluding, or it's not in the
                          * list of stuff to exclude */
-                        if (do_exclude == NULL || regexec(&ereg, chld_out.line[i], 0, NULL, 0) != 0) {
+                        if (do_exclude == NULL || regexec(&exclude_regex, chld_out.line[i], 0, NULL, 0) != 0) {
                                 package_counter++;
                                 if (regexec(&sreg, chld_out.line[i], 0, NULL, 0) == 0) {
                                         security_package_counter++;
+
                                         if (verbose) {
                                                 printf("*");
                                         }
+
                                         (secpkglist)[security_package_counter - 1] = pkg_name(chld_out.line[i]);
                                 } else {
-                                        (pkglist)[package_counter - security_package_counter - 1] = pkg_name(chld_out.line[i]);
+                                        (pkglist)[package_counter - security_package_counter - 1] =
+                                                pkg_name(chld_out.line[i]);
                                 }
                                 if (verbose) {
                                         printf("*%s\n", chld_out.line[i]);
@@ -377,6 +444,7 @@ run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_includ
                         }
                 }
         }
+
         result.package_count = package_counter;
         result.security_package_count = security_package_counter;
         result.packages_list = pkglist;
@@ -385,41 +453,55 @@ run_upgrade_result run_upgrade(const upgrade_type upgrade, const char *do_includ
         /* If we get anything on stderr, at least set warning */
         if (input_filename == NULL && chld_err.buflen) {
                 stderr_warning = true;
-                result.errorcode = max_state(result.errorcode, STATE_WARNING);
+                result.errorcode = ERROR;
+
                 if (verbose) {
                         for (size_t i = 0; i < chld_err.lines; i++) {
                                 fprintf(stderr, "%s\n", chld_err.line[i]);
                         }
                 }
         }
+
         if (do_include != NULL) {
-                regfree(&ireg);
+                regfree(&include_regex);
         }
+
         regfree(&sreg);
+
         if (do_exclude != NULL) {
-                regfree(&ereg);
+                regfree(&exclude_regex);
         }
+
         free(cmdline);
+
         return result;
 }
 
 /* run an apt-get update (needs root) */
-int run_update(char *update_opts) {
-        int result = STATE_UNKNOWN;
+run_update_result run_update(char *update_opts) {
         char *cmdline;
         /* run the update */
         cmdline = construct_cmdline(NO_UPGRADE, update_opts);
 
-        struct output chld_out;
-        struct output chld_err;
-        result = np_runcmd(cmdline, &chld_out, &chld_err, 0);
+        run_update_result result = {
+                .exec_warning = false,
+                .stderr_warning = false,
+                .sc = mp_subcheck_init(),
+        };
+
+        result.sc = mp_set_subcheck_default_state(result.sc, STATE_OK);
+        xasprintf(&result.sc.output, "executing '%s' first", cmdline);
+
+        output chld_out;
+        output chld_err;
+        int cmd_error = np_runcmd(cmdline, &chld_out, &chld_err, 0);
         /* apt-get update changes exit status if it can't fetch packages.
          * since we were explicitly asked to do so, this is treated as
          * a critical error. */
-        if (result != 0) {
+        if (cmd_error != 0) {
                 exec_warning = true;
-                result = STATE_CRITICAL;
-                fprintf(stderr, _("'%s' exited with non-zero status.\n"), cmdline);
+                result.sc = mp_set_subcheck_state(result.sc, STATE_CRITICAL);
+                xasprintf(&result.sc.output, _("'%s' exited with non-zero status.\n"), cmdline);
         }
 
         if (verbose) {
@@ -430,15 +512,18 @@ int run_update(char *update_opts) {
 
         /* If we get anything on stderr, at least set warning */
         if (chld_err.buflen) {
-                stderr_warning = 1;
-                result = max_state(result, STATE_WARNING);
+                stderr_warning = true;
+                result.sc = mp_set_subcheck_state(
+                        result.sc, max_state(mp_compute_subcheck_state(result.sc), STATE_WARNING));
                 if (verbose) {
                         for (size_t i = 0; i < chld_err.lines; i++) {
                                 fprintf(stderr, "%s\n", chld_err.line[i]);
                         }
                 }
         }
+
         free(cmdline);
+
         return result;
 }
 
@@ -520,7 +605,7 @@ char *construct_cmdline(upgrade_type upgrade, const char *opts) {
                 break;
         }
 
-        int len = 0;
+        size_t len = 0;
         len += strlen(PATH_TO_APTGET) + 1; /* "/usr/bin/apt-get " */
         len += strlen(opts_ptr) + 1;       /* "opts " */
         len += strlen(aptcmd) + 1;         /* "upgrade\0" */
@@ -558,7 +643,8 @@ void print_help(void) {
         printf("    %s\n", _("List packages available for upgrade.  Packages are printed sorted by"));
         printf("    %s\n", _("name with security packages listed first."));
         printf(" %s\n", "-i, --include=REGEXP");
-        printf("    %s\n", _("Include only packages matching REGEXP.  Can be specified multiple times"));
+        printf("    %s\n",
+                   _("Include only packages matching REGEXP.  Can be specified multiple times"));
         printf("    %s\n", _("the values will be combined together.  Any packages matching this list"));
         printf("    %s\n", _("cause the plugin to return WARNING status.  Others will be ignored."));
         printf("    %s\n", _("Default is to include all packages."));
@@ -567,7 +653,8 @@ void print_help(void) {
         printf("    %s\n", _("otherwise be included.  Can be specified multiple times; the values"));
         printf("    %s\n", _("will be combined together.  Default is to exclude no packages."));
         printf(" %s\n", "-c, --critical=REGEXP");
-        printf("    %s\n", _("If the full package information of any of the upgradable packages match"));
+        printf("    %s\n",
+                   _("If the full package information of any of the upgradable packages match"));
         printf("    %s\n", _("this REGEXP, the plugin will return CRITICAL status.  Can be specified"));
         printf("    %s\n", _("multiple times like above.  Default is a regexp matching security"));
         printf("    %s\n", _("upgrades for Debian and Ubuntu:"));
@@ -576,15 +663,21 @@ void print_help(void) {
         printf("    %s\n", _("information is compared against the critical list."));
         printf(" %s\n", "-o, --only-critical");
         printf("    %s\n", _("Only warn about upgrades matching the critical list.  The total number"));
-        printf("    %s\n", _("of upgrades will be printed, but any non-critical upgrades will not cause"));
+        printf("    %s\n",
+                   _("of upgrades will be printed, but any non-critical upgrades will not cause"));
         printf("    %s\n", _("the plugin to return WARNING status."));
         printf(" %s\n", "-w, --packages-warning");
-        printf("    %s\n", _("Minimum number of packages available for upgrade to return WARNING status."));
+        printf("    %s\n",
+                   _("Minimum number of packages available for upgrade to return WARNING status."));
         printf("    %s\n\n", _("Default is 1 package."));
 
-        printf("%s\n\n", _("The following options require root privileges and should be used with care:"));
+        printf(UT_OUTPUT_FORMAT);
+
+        printf("%s\n\n",
+                   _("The following options require root privileges and should be used with care:"));
         printf(" %s\n", "-u, --update=OPTS");
-        printf("    %s\n", _("First perform an 'apt-get update'.  An optional OPTS parameter overrides"));
+        printf("    %s\n",
+                   _("First perform an 'apt-get update'.  An optional OPTS parameter overrides"));
         printf("    %s\n", _("the default options.  Note: you may also need to adjust the global"));
         printf("    %s\n", _("timeout (with -t) to prevent the plugin from timing out if apt-get"));
         printf("    %s\n", _("upgrade is expected to take longer than the default timeout."));
@@ -593,8 +686,10 @@ void print_help(void) {
         printf("    %s\n", _("apt-get will be run with these command line options instead of the"));
         printf("    %s", _("default "));
         printf("(%s).\n", UPGRADE_DEFAULT_OPTS);
-        printf("    %s\n", _("Note that you may be required to have root privileges if you do not use"));
-        printf("    %s\n", _("the default options, which will only run a simulation and NOT perform the upgrade"));
+        printf("    %s\n",
+                   _("Note that you may be required to have root privileges if you do not use"));
+        printf("    %s\n",
+                   _("the default options, which will only run a simulation and NOT perform the upgrade"));
         printf(" %s\n", "-d, --dist-upgrade=OPTS");
         printf("    %s\n", _("Perform a dist-upgrade instead of normal upgrade. Like with -U OPTS"));
         printf("    %s\n", _("can be provided to override the default options."));
diff --git a/plugins/check_apt.d/config.h b/plugins/check_apt.d/config.h
index 981f4f42..e4d622f1 100644
--- a/plugins/check_apt.d/config.h
+++ b/plugins/check_apt.d/config.h
@@ -2,6 +2,7 @@
 
 #include "../../config.h"
 #include <stddef.h>
+#include "../lib/output.h"
 
 /* some constants */
 typedef enum {
@@ -16,7 +17,7 @@ typedef struct {
         bool only_critical;   /* whether to warn about non-critical updates */
         bool list;            /* list packages available for upgrade */
         /* number of packages available for upgrade to return WARNING status */
-        int packages_warning;
+        size_t packages_warning;
 
         char *upgrade_opts;   /* options to override defaults for upgrade */
         char *update_opts;    /* options to override defaults for update */
@@ -24,6 +25,9 @@ typedef struct {
         char *do_exclude;     /* regexp to only exclude certain packages */
         char *do_critical;    /* regexp specifying critical packages */
         char *input_filename; /* input filename for testing */
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_apt_config;
 
 check_apt_config check_apt_config_init() {
@@ -36,6 +40,7 @@ check_apt_config check_apt_config_init() {
                                                         .do_include = NULL,
                                                         .do_exclude = NULL,
                                                         .do_critical = NULL,
-                                                        .input_filename = NULL};
+                                                        .input_filename = NULL,
+                                                        .output_format_is_set = false};
         return tmp;
 }
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 2bc38d49..7ffa0ded 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -26,16 +26,17 @@
  *
  *****************************************************************************/
 
-const char *progname = "check_by_ssh";
-const char *copyright = "2000-2024";
-const char *email = "devel@monitoring-plugins.org";
-
 #include "common.h"
+#include "output.h"
 #include "utils.h"
 #include "utils_cmd.h"
 #include "check_by_ssh.d/config.h"
 #include "states.h"
 
+const char *progname = "check_by_ssh";
+const char *copyright = "2000-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 #ifndef NP_MAXARGS
 #       define NP_MAXARGS 1024
 #endif
@@ -45,7 +46,8 @@ typedef struct {
         check_by_ssh_config config;
 } check_by_ssh_config_wrapper;
 static check_by_ssh_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
-static check_by_ssh_config_wrapper validate_arguments(check_by_ssh_config_wrapper /*config_wrapper*/);
+static check_by_ssh_config_wrapper
+        validate_arguments(check_by_ssh_config_wrapper /*config_wrapper*/);
 
 static command_construct comm_append(command_construct /*cmd*/, const char * /*str*/);
 static void print_help(void);
@@ -70,6 +72,10 @@ int main(int argc, char **argv) {
 
         const check_by_ssh_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* Set signal handling and alarm timeout */
         if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
@@ -84,59 +90,99 @@ int main(int argc, char **argv) {
                 }
         }
 
-        output chld_out;
-        output chld_err;
-        mp_state_enum result = cmd_run_array(config.cmd.commargv, &chld_out, &chld_err, 0);
+        cmd_run_result child_result = cmd_run_array2(config.cmd.commargv, 0);
+        mp_check overall = mp_check_init();
 
         /* SSH returns 255 if connection attempt fails; include the first line of error output */
-        if (result == 255 && config.unknown_timeout) {
-                printf(_("SSH connection failed: %s\n"), chld_err.lines > 0 ? chld_err.line[0] : "(no error output)");
-                return STATE_UNKNOWN;
+        // we can sadly not detect other SSH errors
+        if (child_result.cmd_error_code == 255 && config.unknown_timeout) {
+                mp_subcheck sc_ssh_execution = mp_subcheck_init();
+                xasprintf(&sc_ssh_execution.output, "SSH connection failed: %s",
+                                  child_result.err.lines > 0 ? child_result.err.line[0]
+                                                                                                : "(no error output)");
+
+                sc_ssh_execution = mp_set_subcheck_state(sc_ssh_execution, STATE_UNKNOWN);
+                mp_add_subcheck_to_check(&overall, sc_ssh_execution);
+                mp_exit(overall);
         }
 
         if (verbose) {
-                for (size_t i = 0; i < chld_out.lines; i++) {
-                        printf("stdout: %s\n", chld_out.line[i]);
+                for (size_t i = 0; i < child_result.out.lines; i++) {
+                        printf("stdout: %s\n", child_result.out.line[i]);
                 }
-                for (size_t i = 0; i < chld_err.lines; i++) {
-                        printf("stderr: %s\n", chld_err.line[i]);
+                for (size_t i = 0; i < child_result.err.lines; i++) {
+                        printf("stderr: %s\n", child_result.err.line[i]);
                 }
         }
 
         size_t skip_stdout = 0;
-        if (config.skip_stdout == -1) { /* --skip-stdout specified without argument */
-                skip_stdout = chld_out.lines;
+        if (config.skip_stdout) { /* --skip-stdout specified without argument */
+                skip_stdout = child_result.out.lines;
         } else {
-                skip_stdout = config.skip_stdout;
+                skip_stdout = config.stdout_lines_to_ignore;
         }
 
         size_t skip_stderr = 0;
-        if (config.skip_stderr == -1) { /* --skip-stderr specified without argument */
-                skip_stderr = chld_err.lines;
+        if (config.skip_stderr) { /* --skip-stderr specified without argument */
+                skip_stderr = child_result.err.lines;
         } else {
-                skip_stderr = config.skip_stderr;
+                skip_stderr = config.sterr_lines_to_ignore;
         }
 
-        /* UNKNOWN or worse if (non-skipped) output found on stderr */
-        if (chld_err.lines > (size_t)skip_stderr) {
-                printf(_("Remote command execution failed: %s\n"), chld_err.line[skip_stderr]);
+        /* Allow UNKNOWN or WARNING state for (non-skipped) output found on stderr */
+        if (child_result.err.lines > skip_stderr &&
+                (config.unknown_on_stderr || config.warn_on_stderr)) {
+                mp_subcheck sc_stderr = mp_subcheck_init();
+                xasprintf(&sc_stderr.output, "remote command execution failed: %s",
+                                  child_result.err.line[skip_stderr]);
+
+                if (config.unknown_on_stderr) {
+                        sc_stderr = mp_set_subcheck_state(sc_stderr, STATE_UNKNOWN);
+                }
+
                 if (config.warn_on_stderr) {
-                        return max_state_alt(result, STATE_WARNING);
+                        sc_stderr = mp_set_subcheck_state(sc_stderr, STATE_WARNING);
                 }
-                return max_state_alt(result, STATE_UNKNOWN);
+
+                mp_add_subcheck_to_check(&overall, sc_stderr);
+                // TODO still exit here?
         }
 
         /* this is simple if we're not supposed to be passive.
          * Wrap up quickly and keep the tricks below */
         if (!config.passive) {
-                if (chld_out.lines > (size_t)skip_stdout) {
-                        for (size_t i = skip_stdout; i < chld_out.lines; i++) {
-                                puts(chld_out.line[i]);
+                mp_subcheck sc_active_check = mp_subcheck_init();
+                xasprintf(&sc_active_check.output, "command stdout:");
+
+                if (child_result.out.lines > skip_stdout) {
+                        for (size_t i = skip_stdout; i < child_result.out.lines; i++) {
+                                xasprintf(&sc_active_check.output, "%s\n%s", sc_active_check.output,
+                                                  child_result.out.line[i]);
                         }
                 } else {
-                        printf(_("%s - check_by_ssh: Remote command '%s' returned status %d\n"), state_text(result), config.remotecmd, result);
+                        xasprintf(&sc_active_check.output, "remote command '%s' returned status %d",
+                                          config.remotecmd, child_result.cmd_error_code);
                 }
-                return result; /* return error status from remote command */
+
+                /* return error status from remote command */
+
+                switch (child_result.cmd_error_code) {
+                case 0:
+                        sc_active_check = mp_set_subcheck_state(sc_active_check, STATE_OK);
+                        break;
+                case 1:
+                        sc_active_check = mp_set_subcheck_state(sc_active_check, STATE_WARNING);
+                        break;
+                case 2:
+                        sc_active_check = mp_set_subcheck_state(sc_active_check, STATE_CRITICAL);
+                        break;
+                default:
+                        sc_active_check = mp_set_subcheck_state(sc_active_check, STATE_UNKNOWN);
+                        break;
+                }
+
+                mp_add_subcheck_to_check(&overall, sc_active_check);
+                mp_exit(overall);
         }
 
         /*
@@ -144,62 +190,88 @@ int main(int argc, char **argv) {
          */
 
         /* process output */
-        FILE *file_pointer = NULL;
-        if (!(file_pointer = fopen(config.outputfile, "a"))) {
-                printf(_("SSH WARNING: could not open %s\n"), config.outputfile);
-                exit(STATE_UNKNOWN);
+        mp_subcheck sc_passive_file = mp_subcheck_init();
+        FILE *output_file = NULL;
+        if (!(output_file = fopen(config.outputfile, "a"))) {
+                xasprintf(&sc_passive_file.output, "could not open %s", config.outputfile);
+                sc_passive_file = mp_set_subcheck_state(sc_passive_file, STATE_UNKNOWN);
+
+                mp_add_subcheck_to_check(&overall, sc_passive_file);
+                mp_exit(overall);
         }
 
+        xasprintf(&sc_passive_file.output, "opened output file %s", config.outputfile);
+        sc_passive_file = mp_set_subcheck_state(sc_passive_file, STATE_OK);
+        mp_add_subcheck_to_check(&overall, sc_passive_file);
+
         time_t local_time = time(NULL);
         unsigned int commands = 0;
         char *status_text;
         int cresult;
-        for (size_t i = skip_stdout; i < chld_out.lines; i++) {
-                status_text = chld_out.line[i++];
-                if (i == chld_out.lines || strstr(chld_out.line[i], "STATUS CODE: ") == NULL) {
-                        die(STATE_UNKNOWN, _("%s: Error parsing output\n"), progname);
+        mp_subcheck sc_parse_passive = mp_subcheck_init();
+        for (size_t i = skip_stdout; i < child_result.out.lines; i++) {
+                status_text = child_result.out.line[i++];
+                if (i == child_result.out.lines ||
+                        strstr(child_result.out.line[i], "STATUS CODE: ") == NULL) {
+
+                        sc_parse_passive = mp_set_subcheck_state(sc_parse_passive, STATE_UNKNOWN);
+                        xasprintf(&sc_parse_passive.output, "failed to parse output");
+                        mp_add_subcheck_to_check(&overall, sc_parse_passive);
+                        mp_exit(overall);
                 }
 
-                if (config.service[commands] && status_text && sscanf(chld_out.line[i], "STATUS CODE: %d", &cresult) == 1) {
-                        fprintf(file_pointer, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n", (int)local_time, config.host_shortname,
-                                        config.service[commands++], cresult, status_text);
+                if (config.service[commands] && status_text &&
+                        sscanf(child_result.out.line[i], "STATUS CODE: %d", &cresult) == 1) {
+                        fprintf(output_file, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n", (int)local_time,
+                                        config.host_shortname, config.service[commands++], cresult, status_text);
                 }
         }
 
+        sc_parse_passive = mp_set_subcheck_state(sc_parse_passive, STATE_OK);
+        xasprintf(&sc_parse_passive.output, "parsed and wrote output");
+        mp_add_subcheck_to_check(&overall, sc_parse_passive);
+
         /* Multiple commands and passive checking should always return OK */
-        exit(result);
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
 check_by_ssh_config_wrapper process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {{"version", no_argument, 0, 'V'},
-                                                                           {"help", no_argument, 0, 'h'},
-                                                                           {"verbose", no_argument, 0, 'v'},
-                                                                           {"fork", no_argument, 0, 'f'},
-                                                                           {"timeout", required_argument, 0, 't'},
-                                                                           {"unknown-timeout", no_argument, 0, 'U'},
-                                                                           {"host", required_argument, 0, 'H'}, /* backward compatibility */
-                                                                           {"hostname", required_argument, 0, 'H'},
-                                                                           {"port", required_argument, 0, 'p'},
-                                                                           {"output", required_argument, 0, 'O'},
-                                                                           {"name", required_argument, 0, 'n'},
-                                                                           {"services", required_argument, 0, 's'},
-                                                                           {"identity", required_argument, 0, 'i'},
-                                                                           {"user", required_argument, 0, 'u'},
-                                                                           {"logname", required_argument, 0, 'l'},
-                                                                           {"command", required_argument, 0, 'C'},
-                                                                           {"skip", optional_argument, 0, 'S'}, /* backwards compatibility */
-                                                                           {"skip-stdout", optional_argument, 0, 'S'},
-                                                                           {"skip-stderr", optional_argument, 0, 'E'},
-                                                                           {"warn-on-stderr", no_argument, 0, 'W'},
-                                                                           {"proto1", no_argument, 0, '1'},
-                                                                           {"proto2", no_argument, 0, '2'},
-                                                                           {"use-ipv4", no_argument, 0, '4'},
-                                                                           {"use-ipv6", no_argument, 0, '6'},
-                                                                           {"ssh-option", required_argument, 0, 'o'},
-                                                                           {"quiet", no_argument, 0, 'q'},
-                                                                           {"configfile", optional_argument, 0, 'F'},
-                                                                           {0, 0, 0, 0}};
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
+
+        static struct option longopts[] = {
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+                {"verbose", no_argument, 0, 'v'},
+                {"fork", no_argument, 0, 'f'},
+                {"timeout", required_argument, 0, 't'},
+                {"unknown-timeout", no_argument, 0, 'U'},
+                {"host", required_argument, 0, 'H'}, /* backward compatibility */
+                {"hostname", required_argument, 0, 'H'},
+                {"port", required_argument, 0, 'p'},
+                {"output", required_argument, 0, 'O'},
+                {"name", required_argument, 0, 'n'},
+                {"services", required_argument, 0, 's'},
+                {"identity", required_argument, 0, 'i'},
+                {"user", required_argument, 0, 'u'}, /* backwards compatibility */
+                {"logname", required_argument, 0, 'l'},
+                {"command", required_argument, 0, 'C'},
+                {"skip", optional_argument, 0, 'S'}, /* backwards compatibility */
+                {"skip-stdout", optional_argument, 0, 'S'},
+                {"skip-stderr", optional_argument, 0, 'E'},
+                {"unknown-on-stderr", no_argument, 0, 'e'},
+                {"warn-on-stderr", no_argument, 0, 'W'},
+                {"proto1", no_argument, 0, '1'},
+                {"proto2", no_argument, 0, '2'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"ssh-option", required_argument, 0, 'o'},
+                {"quiet", no_argument, 0, 'q'},
+                {"configfile", optional_argument, 0, 'F'},
+                {"output-format", required_argument, 0, output_format_index},
+                {0, 0, 0, 0}};
 
         check_by_ssh_config_wrapper result = {
                 .errorcode = OK,
@@ -221,7 +293,8 @@ check_by_ssh_config_wrapper process_arguments(int argc, char **argv) {
 
         int option = 0;
         while (true) {
-                int opt_index = getopt_long(argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, &option);
+                int opt_index =
+                        getopt_long(argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts, &option);
 
                 if (opt_index == -1 || opt_index == EOF) {
                         break;
@@ -266,11 +339,13 @@ check_by_ssh_config_wrapper process_arguments(int argc, char **argv) {
                         char *p2;
 
                         p1 = optarg;
-                        result.config.service = realloc(result.config.service, (++result.config.number_of_services) * sizeof(char *));
+                        result.config.service = realloc(result.config.service,
+                                                                                        (++result.config.number_of_services) * sizeof(char *));
                         while ((p2 = index(p1, ':'))) {
                                 *p2 = '\0';
                                 result.config.service[result.config.number_of_services - 1] = p1;
-                                result.config.service = realloc(result.config.service, (++result.config.number_of_services) * sizeof(char *));
+                                result.config.service = realloc(
+                                        result.config.service, (++result.config.number_of_services) * sizeof(char *));
                                 p1 = p2 + 1;
                         }
                         result.config.service[result.config.number_of_services - 1] = p1;
@@ -309,28 +384,39 @@ check_by_ssh_config_wrapper process_arguments(int argc, char **argv) {
                 case 'C': /* Command for remote machine */
                         result.config.commands++;
                         if (result.config.commands > 1) {
-                                xasprintf(&result.config.remotecmd, "%s;echo STATUS CODE: $?;", result.config.remotecmd);
+                                xasprintf(&result.config.remotecmd, "%s;echo STATUS CODE: $?;",
+                                                  result.config.remotecmd);
                         }
                         xasprintf(&result.config.remotecmd, "%s%s", result.config.remotecmd, optarg);
                         break;
                 case 'S': /* skip n (or all) lines on stdout */
                         if (optarg == NULL) {
-                                result.config.skip_stdout = -1; /* skip all output on stdout */
+                                result.config.skip_stdout = true; /* skip all output on stdout */
+
+                                if (verbose) {
+                                        printf("Setting the skip_stdout flag\n");
+                                }
                         } else if (!is_integer(optarg)) {
                                 usage_va(_("skip-stdout argument must be an integer"));
                         } else {
-                                result.config.skip_stdout = atoi(optarg);
+                                result.config.stdout_lines_to_ignore = atoi(optarg);
                         }
                         break;
                 case 'E': /* skip n (or all) lines on stderr */
                         if (optarg == NULL) {
-                                result.config.skip_stderr = -1; /* skip all output on stderr */
+                                result.config.skip_stderr = true; /* skip all output on stderr */
+                                if (verbose) {
+                                        printf("Setting the skip_stderr flag\n");
+                                }
                         } else if (!is_integer(optarg)) {
                                 usage_va(_("skip-stderr argument must be an integer"));
                         } else {
-                                result.config.skip_stderr = atoi(optarg);
+                                result.config.sterr_lines_to_ignore = atoi(optarg);
                         }
                         break;
+                case 'e': /* exit with unknown if there is an output on stderr */
+                        result.config.unknown_on_stderr = true;
+                        break;
                 case 'W': /* exit with warning if there is an output on stderr */
                         result.config.warn_on_stderr = true;
                         break;
@@ -345,6 +431,18 @@ check_by_ssh_config_wrapper process_arguments(int argc, char **argv) {
                         result.config.cmd = comm_append(result.config.cmd, "-F");
                         result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 default: /* help */
                         usage5();
                 }
@@ -396,7 +494,8 @@ command_construct comm_append(command_construct cmd, const char *str) {
                 die(STATE_UNKNOWN, _("%s: Argument limit of %d exceeded\n"), progname, NP_MAXARGS);
         }
 
-        if ((cmd.commargv = (char **)realloc(cmd.commargv, (cmd.commargc + 1) * sizeof(char *))) == NULL) {
+        if ((cmd.commargv = (char **)realloc(cmd.commargv, (cmd.commargc + 1) * sizeof(char *))) ==
+                NULL) {
                 die(STATE_UNKNOWN, _("Can not (re)allocate 'commargv' buffer\n"));
         }
 
@@ -412,12 +511,18 @@ check_by_ssh_config_wrapper validate_arguments(check_by_ssh_config_wrapper confi
                 return config_wrapper;
         }
 
-        if (config_wrapper.config.passive && config_wrapper.config.commands != config_wrapper.config.number_of_services) {
-                die(STATE_UNKNOWN, _("%s: In passive mode, you must provide a service name for each command.\n"), progname);
+        if (config_wrapper.config.passive &&
+                config_wrapper.config.commands != config_wrapper.config.number_of_services) {
+                die(STATE_UNKNOWN,
+                        _("%s: In passive mode, you must provide a service name for each command.\n"),
+                        progname);
         }
 
         if (config_wrapper.config.passive && config_wrapper.config.host_shortname == NULL) {
-                die(STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\n"), progname);
+                die(STATE_UNKNOWN,
+                        _("%s: In passive mode, you must provide the host short name from the monitoring "
+                          "configs.\n"),
+                        progname);
         }
 
         return config_wrapper;
@@ -451,10 +556,13 @@ void print_help(void) {
         printf("    %s\n", _("Ignore all or (if specified) first n lines on STDOUT [optional]"));
         printf(" %s\n", "-E, --skip-stderr[=n]");
         printf("    %s\n", _("Ignore all or (if specified) first n lines on STDERR [optional]"));
-        printf(" %s\n", "-W, --warn-on-stderr]");
-        printf("    %s\n", _("Exit with an warning, if there is an output on STDERR"));
+        printf(" %s\n", "-e, --unknown-on-stderr");
+        printf("    %s\n", _("Exit with UNKNOWN, if there is output on STDERR"));
+        printf(" %s\n", "-W, --warn-on-stderr");
+        printf("    %s\n", _("Exit with WARNING, if there is output on STDERR"));
         printf(" %s\n", "-f");
-        printf("    %s\n", _("tells ssh to fork rather than create a tty [optional]. This will always return OK if ssh is executed"));
+        printf("    %s\n", _("tells ssh to fork rather than create a tty [optional]. This will always "
+                                                 "return OK if ssh is executed"));
         printf(" %s\n", "-C, --command='COMMAND STRING'");
         printf("    %s\n", _("command to execute on the remote machine"));
         printf(" %s\n", "-l, --logname=USERNAME");
@@ -477,6 +585,7 @@ void print_help(void) {
         printf(" %s\n", "-U, --unknown-timeout");
         printf("    %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL"));
         printf(UT_VERBOSE);
+        printf(UT_OUTPUT_FORMAT);
         printf("\n");
         printf(" %s\n", _("The most common mode of use is to refer to a local identity file with"));
         printf(" %s\n", _("the '-i' option. In this mode, the identity pair should have a null"));
@@ -490,7 +599,8 @@ void print_help(void) {
         printf(" %s\n", _("all of -O, -s, and -n options (servicelist order must match '-C'options)"));
         printf("\n");
         printf("%s\n", _("Examples:"));
-        printf(" %s\n", "$ check_by_ssh -H localhost -n lh -s c1:c2:c3 -C uptime -C uptime -C uptime -O /tmp/foo");
+        printf(" %s\n", "$ check_by_ssh -H localhost -n lh -s c1:c2:c3 -C uptime -C uptime -C "
+                                        "uptime -O /tmp/foo");
         printf(" %s\n", "$ cat /tmp/foo");
         printf(" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c1;0; up 2 days");
         printf(" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c2;0; up 2 days");
@@ -502,7 +612,7 @@ void print_help(void) {
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
         printf(" %s -H <host> -C <command> [-fqvU] [-1|-2] [-4|-6]\n"
-                   "       [-S [lines]] [-E [lines]] [-W] [-t timeout] [-i identity]\n"
+                   "       [-S [lines]] [-E [lines]] [-e|-W] [-t timeout] [-i identity]\n"
                    "       [-l user] [-n name] [-s servicelist] [-O outputfile]\n"
                    "       [-p port] [-o ssh-option] [-F configfile]\n",
                    progname);
diff --git a/plugins/check_by_ssh.d/config.h b/plugins/check_by_ssh.d/config.h
index 05435def..b6a57964 100644
--- a/plugins/check_by_ssh.d/config.h
+++ b/plugins/check_by_ssh.d/config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
 #include <stddef.h>
 
 typedef struct {
@@ -21,11 +22,18 @@ typedef struct {
         command_construct cmd;
 
         bool unknown_timeout;
+        bool unknown_on_stderr;
         bool warn_on_stderr;
-        int skip_stdout;
-        int skip_stderr;
+        bool skip_stdout;
+        size_t stdout_lines_to_ignore;
+        bool skip_stderr;
+        size_t sterr_lines_to_ignore;
+
         bool passive;
         char *outputfile;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_by_ssh_config;
 
 check_by_ssh_config check_by_ssh_config_init() {
@@ -46,11 +54,18 @@ check_by_ssh_config check_by_ssh_config_init() {
                         },
 
                 .unknown_timeout = false,
+                .unknown_on_stderr = false,
                 .warn_on_stderr = false,
-                .skip_stderr = 0,
-                .skip_stdout = 0,
+
+                .skip_stderr = false,
+                .stdout_lines_to_ignore = 0,
+                .skip_stdout = false,
+                .sterr_lines_to_ignore = 0,
+
                 .passive = false,
                 .outputfile = NULL,
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index 9b695499..1cbdcd60 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -26,6 +26,8 @@ const char *progname = "check_cluster";
 const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
+#include "output.h"
+#include "states.h"
 #include "common.h"
 #include "utils.h"
 #include "utils_base.h"
@@ -57,6 +59,10 @@ int main(int argc, char **argv) {
 
         const check_cluster_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* Initialize the thresholds */
         if (verbose) {
                 print_thresholds("check_cluster", config.thresholds);
@@ -72,7 +78,6 @@ int main(int argc, char **argv) {
         int total_hosts_unreachable = 0;
         /* check the data values */
         for (char *ptr = strtok(config.data_vals, ","); ptr != NULL; ptr = strtok(NULL, ",")) {
-
                 data_val = atoi(ptr);
 
                 if (config.check_type == CHECK_SERVICES) {
@@ -109,28 +114,49 @@ int main(int argc, char **argv) {
                 }
         }
 
-        int return_code = STATE_OK;
+        mp_check overall = mp_check_init();
+        mp_subcheck sc_real_test = mp_subcheck_init();
+        sc_real_test = mp_set_subcheck_default_state(sc_real_test, STATE_OK);
+
         /* return the status of the cluster */
         if (config.check_type == CHECK_SERVICES) {
-                return_code = get_status(total_services_warning + total_services_unknown + total_services_critical, config.thresholds);
-                printf("CLUSTER %s: %s: %d ok, %d warning, %d unknown, %d critical\n", state_text(return_code),
-                           (config.label == NULL) ? "Service cluster" : config.label, total_services_ok, total_services_warning, total_services_unknown,
-                           total_services_critical);
+                sc_real_test = mp_set_subcheck_state(
+                        sc_real_test,
+                        get_status(total_services_warning + total_services_unknown + total_services_critical,
+                                           config.thresholds));
+                xasprintf(&sc_real_test.output, "%s: %d ok, %d warning, %d unknown, %d critical",
+                                  (config.label == NULL) ? "Service cluster" : config.label, total_services_ok,
+                                  total_services_warning, total_services_unknown, total_services_critical);
         } else {
-                return_code = get_status(total_hosts_down + total_hosts_unreachable, config.thresholds);
-                printf("CLUSTER %s: %s: %d up, %d down, %d unreachable\n", state_text(return_code),
-                           (config.label == NULL) ? "Host cluster" : config.label, total_hosts_up, total_hosts_down, total_hosts_unreachable);
+                sc_real_test = mp_set_subcheck_state(
+                        sc_real_test,
+                        get_status(total_hosts_down + total_hosts_unreachable, config.thresholds));
+                xasprintf(&sc_real_test.output, "%s: %d up, %d down, %d unreachable\n",
+                                  (config.label == NULL) ? "Host cluster" : config.label, total_hosts_up,
+                                  total_hosts_down, total_hosts_unreachable);
         }
 
-        exit(return_code);
+        mp_add_subcheck_to_check(&overall, sc_real_test);
+
+        mp_exit(overall);
 }
 
 check_cluster_config_wrapper process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {{"data", required_argument, 0, 'd'},     {"warning", required_argument, 0, 'w'},
-                                                                           {"critical", required_argument, 0, 'c'}, {"label", required_argument, 0, 'l'},
-                                                                           {"host", no_argument, 0, 'h'},           {"service", no_argument, 0, 's'},
-                                                                           {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
-                                                                           {"help", no_argument, 0, 'H'},           {0, 0, 0, 0}};
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
+
+        static struct option longopts[] = {{"data", required_argument, 0, 'd'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"label", required_argument, 0, 'l'},
+                                                                           {"host", no_argument, 0, 'h'},
+                                                                           {"service", no_argument, 0, 's'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'H'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
+                                                                           {0, 0, 0, 0}};
 
         check_cluster_config_wrapper result = {
                 .errorcode = OK,
@@ -197,6 +223,18 @@ check_cluster_config_wrapper process_arguments(int argc, char **argv) {
                         print_help();
                         exit(STATE_UNKNOWN);
                         break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 default:
                         result.errorcode = ERROR;
                         return result;
@@ -244,6 +282,8 @@ void print_help(void) {
 
         printf(UT_VERBOSE);
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
         printf("%s\n", _("Notes:"));
         printf(UT_THRESHOLDS_NOTES);
@@ -251,7 +291,8 @@ void print_help(void) {
         printf("\n");
         printf("%s\n", _("Examples:"));
         printf(" %s\n", "check_cluster -s -d 2,0,2,0 -c @3:");
-        printf("    %s\n", _("Will alert critical if there are 3 or more service data points in a non-OK"));
+        printf("    %s\n",
+                   _("Will alert critical if there are 3 or more service data points in a non-OK"));
         printf("    %s\n", _("state."));
 
         printf(UT_SUPPORT);
diff --git a/plugins/check_cluster.d/config.h b/plugins/check_cluster.d/config.h
index fc386415..054657b0 100644
--- a/plugins/check_cluster.d/config.h
+++ b/plugins/check_cluster.d/config.h
@@ -2,6 +2,7 @@
 
 #include "../../config.h"
 #include "../../lib/thresholds.h"
+#include "output.h"
 #include <stddef.h>
 
 enum {
@@ -14,6 +15,9 @@ typedef struct {
         thresholds *thresholds;
         int check_type;
         char *label;
+
+        mp_output_format output_format;
+        bool output_format_is_set;
 } check_cluster_config;
 
 check_cluster_config check_cluster_config_init() {
@@ -22,6 +26,8 @@ check_cluster_config check_cluster_config_init() {
                 .thresholds = NULL,
                 .check_type = CHECK_SERVICES,
                 .label = NULL,
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index 748201e8..e7737c7c 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -32,16 +32,23 @@
  *
  *
  *****************************************************************************/
-const char *progname = "check_curl";
 
+const char *progname = "check_curl";
 const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
+#include "check_curl.d/config.h"
+#include "states.h"
+#include "thresholds.h"
 #include <stdbool.h>
 #include <ctype.h>
+#include "output.h"
+#include "perfdata.h"
 
+#include <assert.h>
 #include "common.h"
 #include "utils.h"
+#include "./check_curl.d/check_curl_helpers.h"
 
 #ifndef LIBCURL_PROTOCOL_HTTP
 #       error libcurl compiled without HTTP support, compiling check_curl plugin does not makes a lot of sense
@@ -50,8 +57,6 @@ const char *email = "devel@monitoring-plugins.org";
 #include "curl/curl.h"
 #include "curl/easy.h"
 
-#include "picohttpparser.h"
-
 #include "uriparser/Uri.h"
 
 #include <arpa/inet.h>
@@ -63,207 +68,58 @@ const char *email = "devel@monitoring-plugins.org";
 
 #include <netdb.h>
 
-#define MAKE_LIBCURL_VERSION(major, minor, patch) ((major)*0x10000 + (minor)*0x100 + (patch))
-
-#define DEFAULT_BUFFER_SIZE 2048
-#define DEFAULT_SERVER_URL  "/"
-#define HTTP_EXPECT         "HTTP/"
-#define INET_ADDR_MAX_SIZE  INET6_ADDRSTRLEN
 enum {
-        MAX_IPV4_HOSTLENGTH = 255,
-        HTTP_PORT = 80,
-        HTTPS_PORT = 443,
-        MAX_PORT = 65535,
-        DEFAULT_MAX_REDIRS = 15
+        REGS = 2,
 };
 
-enum {
-        STICKY_NONE = 0,
-        STICKY_HOST = 1,
-        STICKY_PORT = 2
-};
+#include "regex.h"
 
-enum {
-        FOLLOW_HTTP_CURL = 0,
-        FOLLOW_LIBCURL = 1
-};
+// Globals
+int verbose = 0;
 
-/* for buffers for header and body */
-typedef struct {
-        char *buf;
-        size_t buflen;
-        size_t bufsize;
-} curlhelp_write_curlbuf;
+extern char errbuf[MAX_INPUT_BUFFER];
+extern bool is_openssl_callback;
+extern bool add_sslctx_verify_fun;
+
+#if defined(HAVE_SSL) && defined(USE_OPENSSL)
+static X509 *cert = NULL;
+#endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
 
-/* for buffering the data sent in PUT */
 typedef struct {
-        char *buf;
-        size_t buflen;
-        off_t pos;
-} curlhelp_read_curlbuf;
+        int errorcode;
+        check_curl_config config;
+} check_curl_config_wrapper;
+static check_curl_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+
+static mp_subcheck check_http(check_curl_config /*config*/, check_curl_working_state workingState,
+                                                          long redir_depth);
 
-/* for parsing the HTTP status line */
 typedef struct {
-        int http_major;   /* major version of the protocol, always 1 (HTTP/0.9
-                                           * never reached the big internet most likely) */
-        int http_minor;   /* minor version of the protocol, usually 0 or 1 */
-        int http_code;    /* HTTP return code as in RFC 2145 */
-        int http_subcode; /* Microsoft IIS extension, HTTP subcodes, see
-                                           * http://support.microsoft.com/kb/318380/en-us */
-        const char *msg;  /* the human readable message */
-        char *first_line; /* a copy of the first line */
-} curlhelp_statusline;
-
-/* to know the underlying SSL library used by libcurl */
-typedef enum curlhelp_ssl_library {
-        CURLHELP_SSL_LIBRARY_UNKNOWN,
-        CURLHELP_SSL_LIBRARY_OPENSSL,
-        CURLHELP_SSL_LIBRARY_LIBRESSL,
-        CURLHELP_SSL_LIBRARY_GNUTLS,
-        CURLHELP_SSL_LIBRARY_NSS
-} curlhelp_ssl_library;
+        long redir_depth;
+        check_curl_working_state working_state;
+        int error_code;
+        check_curl_global_state curl_state;
+} redir_wrapper;
+static redir_wrapper redir(curlhelp_write_curlbuf * /*header_buf*/, check_curl_config /*config*/,
+                                                   long redir_depth, check_curl_working_state working_state);
 
-enum {
-        REGS = 2,
-        MAX_RE_SIZE = 1024
-};
-#include "regex.h"
-static regex_t preg;
-static regmatch_t pmatch[REGS];
-static char regexp[MAX_RE_SIZE];
-static int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
-static int errcode;
-static bool invert_regex = false;
-static int state_regex = STATE_CRITICAL;
-
-static char *server_address = NULL;
-static char *host_name = NULL;
-static char *server_url = 0;
-static struct curl_slist *server_ips = NULL;
-static bool specify_port = false;
-static unsigned short server_port = HTTP_PORT;
-static unsigned short virtual_port = 0;
-static int host_name_length;
-static char output_header_search[30] = "";
-static char output_string_search[30] = "";
-static char *warning_thresholds = NULL;
-static char *critical_thresholds = NULL;
-static int days_till_exp_warn, days_till_exp_crit;
-static thresholds *thlds;
-static char user_agent[DEFAULT_BUFFER_SIZE];
-static int verbose = 0;
-static bool show_extended_perfdata = false;
-static bool show_body = false;
-static int min_page_len = 0;
-static int max_page_len = 0;
-static int redir_depth = 0;
-static int max_depth = DEFAULT_MAX_REDIRS;
-static char *http_method = NULL;
-static char *http_post_data = NULL;
-static char *http_content_type = NULL;
-static CURL *curl;
-static bool curl_global_initialized = false;
-static bool curl_easy_initialized = false;
-static struct curl_slist *header_list = NULL;
-static bool body_buf_initialized = false;
-static curlhelp_write_curlbuf body_buf;
-static bool header_buf_initialized = false;
-static curlhelp_write_curlbuf header_buf;
-static bool status_line_initialized = false;
-static curlhelp_statusline status_line;
-static bool put_buf_initialized = false;
-static curlhelp_read_curlbuf put_buf;
-static char http_header[DEFAULT_BUFFER_SIZE];
-static long code;
-static long socket_timeout = DEFAULT_SOCKET_TIMEOUT;
-static double total_time;
-static double time_connect;
-static double time_appconnect;
-static double time_headers;
-static double time_firstbyte;
-static char errbuf[MAX_INPUT_BUFFER];
-static CURLcode res;
-static char url[DEFAULT_BUFFER_SIZE];
-static char msg[DEFAULT_BUFFER_SIZE];
-static char perfstring[DEFAULT_BUFFER_SIZE];
-static char header_expect[MAX_INPUT_BUFFER] = "";
-static char string_expect[MAX_INPUT_BUFFER] = "";
-static char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
-static int server_expect_yn = 0;
-static char user_auth[MAX_INPUT_BUFFER] = "";
-static char proxy_auth[MAX_INPUT_BUFFER] = "";
-static char **http_opt_headers;
-static int http_opt_headers_count = 0;
-static bool display_html = false;
-static int onredirect = STATE_OK;
-static int followmethod = FOLLOW_HTTP_CURL;
-static int followsticky = STICKY_NONE;
-static bool use_ssl = false;
-static bool check_cert = false;
-static bool continue_after_check_cert = false;
-typedef union {
-        struct curl_slist *to_info;
-        struct curl_certinfo *to_certinfo;
-} cert_ptr_union;
-static cert_ptr_union cert_ptr;
-static int ssl_version = CURL_SSLVERSION_DEFAULT;
-static char *client_cert = NULL;
-static char *client_privkey = NULL;
-static char *ca_cert = NULL;
-static bool verify_peer_and_host = false;
-static bool is_openssl_callback = false;
-static bool add_sslctx_verify_fun = false;
-#if defined(HAVE_SSL) && defined(USE_OPENSSL)
-static X509 *cert = NULL;
-#endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
-static bool no_body = false;
-static int maximum_age = -1;
-static int address_family = AF_UNSPEC;
-static curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
-static int curl_http_version = CURL_HTTP_VERSION_NONE;
-static bool automatic_decompression = false;
-static char *cookie_jar_file = NULL;
-static bool haproxy_protocol = false;
-
-static bool process_arguments(int /*argc*/, char ** /*argv*/);
-static void handle_curl_option_return_code(CURLcode res, const char *option);
-static int check_http(void);
-static void redir(curlhelp_write_curlbuf * /*header_buf*/);
-static char *perfd_time(double elapsed_time);
-static char *perfd_time_connect(double elapsed_time_connect);
-static char *perfd_time_ssl(double elapsed_time_ssl);
-static char *perfd_time_firstbyte(double elapsed_time_firstbyte);
-static char *perfd_time_headers(double elapsed_time_headers);
-static char *perfd_time_transfer(double elapsed_time_transfer);
-static char *perfd_size(int page_len);
 static void print_help(void);
 void print_usage(void);
+
 static void print_curl_version(void);
-static int curlhelp_initwritebuffer(curlhelp_write_curlbuf * /*buf*/);
-static size_t curlhelp_buffer_write_callback(void * /*buffer*/, size_t /*size*/, size_t /*nmemb*/, void * /*stream*/);
-static void curlhelp_freewritebuffer(curlhelp_write_curlbuf * /*buf*/);
-static int curlhelp_initreadbuffer(curlhelp_read_curlbuf * /*buf*/, const char * /*data*/, size_t /*datalen*/);
-static size_t curlhelp_buffer_read_callback(void * /*buffer*/, size_t /*size*/, size_t /*nmemb*/, void * /*stream*/);
-static void curlhelp_freereadbuffer(curlhelp_read_curlbuf * /*buf*/);
-static curlhelp_ssl_library curlhelp_get_ssl_library(void);
-static const char *curlhelp_get_ssl_library_string(curlhelp_ssl_library /*ssl_library*/);
-int net_noopenssl_check_certificate(cert_ptr_union *, int, int);
-
-static int curlhelp_parse_statusline(const char * /*buf*/, curlhelp_statusline * /*status_line*/);
-static void curlhelp_free_statusline(curlhelp_statusline * /*status_line*/);
-static char *get_header_value(const struct phr_header *headers, size_t nof_headers, const char *header);
-static int check_document_dates(const curlhelp_write_curlbuf * /*header_buf*/, char (*msg)[DEFAULT_BUFFER_SIZE]);
-static int get_content_length(const curlhelp_write_curlbuf *header_buf, const curlhelp_write_curlbuf *body_buf);
+
+// typedef struct {
+//      int errorcode;
+// } check_curl_evaluation_wrapper;
+// check_curl_evaluation_wrapper check_curl_evaluate(check_curl_config config,
+//                                                                                                mp_check overall[static 1]) {}
 
 #if defined(HAVE_SSL) && defined(USE_OPENSSL)
-int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int days_till_exp_crit);
+mp_state_enum np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn,
+                                                                                   int days_till_exp_crit);
 #endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
 
-static void test_file(char * /*path*/);
-
 int main(int argc, char **argv) {
-        int result = STATE_UNKNOWN;
-
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
@@ -271,24 +127,30 @@ int main(int argc, char **argv) {
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        /* set defaults */
-        snprintf(user_agent, DEFAULT_BUFFER_SIZE, "%s/v%s (monitoring-plugins %s, %s)", progname, NP_VERSION, VERSION, curl_version());
-
         /* parse arguments */
-        if (process_arguments(argc, argv) == false)
+        check_curl_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
+        }
 
-        if (display_html)
-                printf("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">", use_ssl ? "https" : "http", host_name ? host_name : server_address,
-                           virtual_port ? virtual_port : server_port, server_url);
+        const check_curl_config config = tmp_config.config;
 
-        result = check_http();
-        return result;
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
+        check_curl_working_state working_state = config.initial_config;
+
+        mp_check overall = mp_check_init();
+        mp_subcheck sc_test = check_http(config, working_state, 0);
+
+        mp_add_subcheck_to_check(&overall, sc_test);
+
+        mp_exit(overall);
 }
 
 #ifdef HAVE_SSL
 #       ifdef USE_OPENSSL
-
 int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx) {
         (void)preverify_ok;
         /* TODO: we get all certificates of the chain, so which ones
@@ -301,19 +163,21 @@ int verify_callback(int preverify_ok, X509_STORE_CTX *x509_ctx) {
 #               endif
         if (verbose >= 2) {
                 puts("* SSL verify callback with certificate:");
-                X509_NAME *subject;
-                X509_NAME *issuer;
                 printf("*   issuer:\n");
-                issuer = X509_get_issuer_name(cert);
+                X509_NAME *issuer = X509_get_issuer_name(cert);
                 X509_NAME_print_ex_fp(stdout, issuer, 5, XN_FLAG_MULTILINE);
                 printf("* curl verify_callback:\n*   subject:\n");
-                subject = X509_get_subject_name(cert);
+                X509_NAME *subject = X509_get_subject_name(cert);
                 X509_NAME_print_ex_fp(stdout, subject, 5, XN_FLAG_MULTILINE);
                 puts("");
         }
         return 1;
 }
+#       endif /* USE_OPENSSL */
+#endif     /* HAVE_SSL */
 
+#ifdef HAVE_SSL
+#       ifdef USE_OPENSSL
 CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm) {
         (void)curl; // ignore unused parameter
         (void)parm; // ignore unused parameter
@@ -330,877 +194,508 @@ CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm) {
 
         return CURLE_OK;
 }
-
 #       endif /* USE_OPENSSL */
 #endif     /* HAVE_SSL */
 
-/* returns a string "HTTP/1.x" or "HTTP/2" */
-static char *string_statuscode(int major, int minor) {
-        static char buf[10];
-
-        switch (major) {
-        case 1:
-                snprintf(buf, sizeof(buf), "HTTP/%d.%d", major, minor);
-                break;
-        case 2:
-        case 3:
-                snprintf(buf, sizeof(buf), "HTTP/%d", major);
-                break;
-        default:
-                /* assuming here HTTP/N with N>=4 */
-                snprintf(buf, sizeof(buf), "HTTP/%d", major);
-                break;
-        }
-
-        return buf;
-}
-
-/* Checks if the server 'reply' is one of the expected 'statuscodes' */
-static int expected_statuscode(const char *reply, const char *statuscodes) {
-        char *expected;
-        char *code;
-        int result = 0;
-
-        if ((expected = strdup(statuscodes)) == NULL)
-                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
-
-        for (code = strtok(expected, ","); code != NULL; code = strtok(NULL, ","))
-                if (strstr(reply, code) != NULL) {
-                        result = 1;
-                        break;
-                }
-
-        free(expected);
-        return result;
-}
+mp_subcheck check_http(const check_curl_config config, check_curl_working_state workingState,
+                                           long redir_depth) {
 
-void handle_curl_option_return_code(CURLcode res, const char *option) {
-        if (res != CURLE_OK) {
-                snprintf(msg, DEFAULT_BUFFER_SIZE, _("Error while setting cURL option '%s': cURL returned %d - %s"), option, res,
-                                 curl_easy_strerror(res));
-                die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-        }
-}
+        // =======================
+        // Initialisation for curl
+        // =======================
+        check_curl_configure_curl_wrapper conf_curl_struct = check_curl_configure_curl(
+                config.curl_config, workingState, config.check_cert, config.on_redirect_dependent,
+                config.followmethod, config.max_depth);
 
-int lookup_host(const char *host, char *buf, size_t buflen) {
-        struct addrinfo hints, *res, *result;
-        char addrstr[100];
-        size_t addrstr_len;
-        int errcode;
-        void *ptr = {0};
-        size_t buflen_remaining = buflen - 1;
-
-        memset(&hints, 0, sizeof(hints));
-        hints.ai_family = address_family;
-        hints.ai_socktype = SOCK_STREAM;
-        hints.ai_flags |= AI_CANONNAME;
-
-        errcode = getaddrinfo(host, NULL, &hints, &result);
-        if (errcode != 0)
-                return errcode;
-
-        strcpy(buf, "");
-        res = result;
-
-        while (res) {
-                switch (res->ai_family) {
-                case AF_INET:
-                        ptr = &((struct sockaddr_in *)res->ai_addr)->sin_addr;
-                        break;
-                case AF_INET6:
-                        ptr = &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
-                        break;
-                }
+        check_curl_global_state curl_state = conf_curl_struct.curl_state;
+        workingState = conf_curl_struct.working_state;
 
-                inet_ntop(res->ai_family, ptr, addrstr, 100);
-                if (verbose >= 1) {
-                        printf("* getaddrinfo IPv%d address: %s\n", res->ai_family == PF_INET6 ? 6 : 4, addrstr);
-                }
+        mp_subcheck sc_result = mp_subcheck_init();
 
-                // Append all IPs to buf as a comma-separated string
-                addrstr_len = strlen(addrstr);
-                if (buflen_remaining > addrstr_len + 1) {
-                        if (buf[0] != '\0') {
-                                strncat(buf, ",", buflen_remaining);
-                                buflen_remaining -= 1;
-                        }
-                        strncat(buf, addrstr, buflen_remaining);
-                        buflen_remaining -= addrstr_len;
-                }
-
-                res = res->ai_next;
-        }
+        char *url = fmt_url(workingState);
+        xasprintf(&sc_result.output, "Testing %s", url);
+        // TODO add some output here URL or something
+        free(url);
 
-        freeaddrinfo(result);
-
-        return 0;
-}
-
-static void cleanup(void) {
-        if (status_line_initialized)
-                curlhelp_free_statusline(&status_line);
-        status_line_initialized = false;
-        if (curl_easy_initialized)
-                curl_easy_cleanup(curl);
-        curl_easy_initialized = false;
-        if (curl_global_initialized)
-                curl_global_cleanup();
-        curl_global_initialized = false;
-        if (body_buf_initialized)
-                curlhelp_freewritebuffer(&body_buf);
-        body_buf_initialized = false;
-        if (header_buf_initialized)
-                curlhelp_freewritebuffer(&header_buf);
-        header_buf_initialized = false;
-        if (put_buf_initialized)
-                curlhelp_freereadbuffer(&put_buf);
-        put_buf_initialized = false;
-}
+        // ==============
+        // do the request
+        // ==============
+        CURLcode res = curl_easy_perform(curl_state.curl);
 
-int check_http(void) {
-        int result = STATE_OK;
-        int result_ssl = STATE_OK;
-        int page_len = 0;
-        int i;
-        char *force_host_header = NULL;
-        struct curl_slist *host = NULL;
-        char addrstr[DEFAULT_BUFFER_SIZE / 2];
-        char dnscache[DEFAULT_BUFFER_SIZE];
-
-        /* initialize curl */
-        if (curl_global_init(CURL_GLOBAL_DEFAULT) != CURLE_OK)
-                die(STATE_UNKNOWN, "HTTP UNKNOWN - curl_global_init failed\n");
-        curl_global_initialized = true;
-
-        if ((curl = curl_easy_init()) == NULL) {
-                die(STATE_UNKNOWN, "HTTP UNKNOWN - curl_easy_init failed\n");
+        if (verbose >= 2 && workingState.http_post_data) {
+                printf("**** REQUEST CONTENT ****\n%s\n", workingState.http_post_data);
         }
-        curl_easy_initialized = true;
 
-        /* register cleanup function to shut down libcurl properly */
-        atexit(cleanup);
+        mp_subcheck sc_curl = mp_subcheck_init();
 
-        if (verbose >= 1)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_VERBOSE, 1), "CURLOPT_VERBOSE");
-
-        /* print everything on stdout like check_http would do */
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_STDERR, stdout), "CURLOPT_STDERR");
-
-        if (automatic_decompression)
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 6)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, ""), "CURLOPT_ACCEPT_ENCODING");
-#else
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_ENCODING, ""), "CURLOPT_ENCODING");
-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 6) */
-
-        /* initialize buffer for body of the answer */
-        if (curlhelp_initwritebuffer(&body_buf) < 0)
-                die(STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for body\n");
-        body_buf_initialized = true;
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback),
-                                                                   "CURLOPT_WRITEFUNCTION");
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)&body_buf), "CURLOPT_WRITEDATA");
-
-        /* initialize buffer for header of the answer */
-        if (curlhelp_initwritebuffer(&header_buf) < 0)
-                die(STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for header\n");
-        header_buf_initialized = true;
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback),
-                                                                   "CURLOPT_HEADERFUNCTION");
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_WRITEHEADER, (void *)&header_buf), "CURLOPT_WRITEHEADER");
-
-        /* set the error buffer */
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf), "CURLOPT_ERRORBUFFER");
-
-        /* set timeouts */
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, socket_timeout), "CURLOPT_CONNECTTIMEOUT");
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_TIMEOUT, socket_timeout), "CURLOPT_TIMEOUT");
-
-        /* enable haproxy protocol */
-        if (haproxy_protocol) {
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HAPROXYPROTOCOL, 1L), "CURLOPT_HAPROXYPROTOCOL");
-        }
-
-        // fill dns resolve cache to make curl connect to the given server_address instead of the host_name, only required for ssl, because we
-        // use the host_name later on to make SNI happy
-        if (use_ssl && host_name != NULL) {
-                if ((res = lookup_host(server_address, addrstr, DEFAULT_BUFFER_SIZE / 2)) != 0) {
-                        snprintf(msg, DEFAULT_BUFFER_SIZE, _("Unable to lookup IP address for '%s': getaddrinfo returned %d - %s"), server_address, res,
-                                         gai_strerror(res));
-                        die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-                }
-                snprintf(dnscache, DEFAULT_BUFFER_SIZE, "%s:%d:%s", host_name, server_port, addrstr);
-                host = curl_slist_append(NULL, dnscache);
-                curl_easy_setopt(curl, CURLOPT_RESOLVE, host);
-                if (verbose >= 1)
-                        printf("* curl CURLOPT_RESOLVE: %s\n", dnscache);
-        }
-
-        // If server_address is an IPv6 address it must be surround by square brackets
-        struct in6_addr tmp_in_addr;
-        if (inet_pton(AF_INET6, server_address, &tmp_in_addr) == 1) {
-                char *new_server_address = malloc(strlen(server_address) + 3);
-                if (new_server_address == NULL) {
-                        die(STATE_UNKNOWN, "HTTP UNKNOWN - Unable to allocate memory\n");
-                }
-                snprintf(new_server_address, strlen(server_address) + 3, "[%s]", server_address);
-                free(server_address);
-                server_address = new_server_address;
-        }
-
-        /* compose URL: use the address we want to connect to, set Host: header later */
-        snprintf(url, DEFAULT_BUFFER_SIZE, "%s://%s:%d%s", use_ssl ? "https" : "http",
-                         (use_ssl & (host_name != NULL)) ? host_name : server_address, server_port, server_url);
-
-        if (verbose >= 1)
-                printf("* curl CURLOPT_URL: %s\n", url);
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_URL, url), "CURLOPT_URL");
-
-        /* extract proxy information for legacy proxy https requests */
-        if (!strcmp(http_method, "CONNECT") || strstr(server_url, "http") == server_url) {
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_PROXY, server_address), "CURLOPT_PROXY");
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_PROXYPORT, (long)server_port), "CURLOPT_PROXYPORT");
-                if (verbose >= 2)
-                        printf("* curl CURLOPT_PROXY: %s:%d\n", server_address, server_port);
-                http_method = "GET";
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_URL, server_url), "CURLOPT_URL");
-        }
-
-        /* disable body for HEAD request */
-        if (http_method && !strcmp(http_method, "HEAD")) {
-                no_body = true;
+        /* Curl errors, result in critical Nagios state */
+        if (res != CURLE_OK) {
+                xasprintf(&sc_curl.output, _("Error while performing connection: cURL returned %d - %s"),
+                                  res, errbuf[0] ? errbuf : curl_easy_strerror(res));
+                sc_curl = mp_set_subcheck_state(sc_curl, STATE_CRITICAL);
+                mp_add_subcheck_to_subcheck(&sc_result, sc_curl);
+                return sc_result;
         }
 
-        /* set HTTP protocol version */
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, curl_http_version), "CURLOPT_HTTP_VERSION");
-
-        /* set HTTP method */
-        if (http_method) {
-                if (!strcmp(http_method, "POST"))
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_POST, 1), "CURLOPT_POST");
-                else if (!strcmp(http_method, "PUT"))
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_UPLOAD, 1), "CURLOPT_UPLOAD");
-                else
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, http_method), "CURLOPT_CUSTOMREQUEST");
+        /* get status line of answer, check sanity of HTTP code */
+        if (curlhelp_parse_statusline(curl_state.header_buf->buf, curl_state.status_line) < 0) {
+                sc_result = mp_set_subcheck_state(sc_result, STATE_CRITICAL);
+                /* we cannot know the major/minor version here for sure as we cannot parse the first
+                 * line */
+                xasprintf(&sc_result.output, "HTTP/x.x unknown - Unparsable status line");
+                return sc_result;
         }
 
-        /* check if Host header is explicitly set in options */
-        if (http_opt_headers_count) {
-                for (i = 0; i < http_opt_headers_count; i++) {
-                        if (strncmp(http_opt_headers[i], "Host:", 5) == 0) {
-                                force_host_header = http_opt_headers[i];
-                        }
-                }
-        }
+        curl_state.status_line_initialized = true;
 
-        /* set hostname (virtual hosts), not needed if CURLOPT_CONNECT_TO is used, but left in anyway */
-        if (host_name != NULL && force_host_header == NULL) {
-                if ((virtual_port != HTTP_PORT && !use_ssl) || (virtual_port != HTTPS_PORT && use_ssl)) {
-                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Host: %s:%d", host_name, virtual_port);
-                } else {
-                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Host: %s", host_name);
-                }
-                header_list = curl_slist_append(header_list, http_header);
-        }
+        size_t page_len = get_content_length(curl_state.header_buf, curl_state.body_buf);
 
-        /* always close connection, be nice to servers */
-        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Connection: close");
-        header_list = curl_slist_append(header_list, http_header);
+        double total_time;
+        handle_curl_option_return_code(
+                curl_easy_getinfo(curl_state.curl, CURLINFO_TOTAL_TIME, &total_time),
+                "CURLINFO_TOTAL_TIME");
 
-        /* attach additional headers supplied by the user */
-        /* optionally send any other header tag */
-        if (http_opt_headers_count) {
-                for (i = 0; i < http_opt_headers_count; i++) {
-                        header_list = curl_slist_append(header_list, http_opt_headers[i]);
-                }
-                /* This cannot be free'd here because a redirection will then try to access this and segfault */
-                /* Covered in a testcase in tests/check_http.t */
-                /* free(http_opt_headers); */
-        }
+        xasprintf(
+                &sc_curl.output, "%s %d %s - %ld bytes in %.3f second response time",
+                string_statuscode(curl_state.status_line->http_major, curl_state.status_line->http_minor),
+                curl_state.status_line->http_code, curl_state.status_line->msg, page_len, total_time);
+        sc_curl = mp_set_subcheck_state(sc_curl, STATE_OK);
+        mp_add_subcheck_to_subcheck(&sc_result, sc_curl);
 
-        /* set HTTP headers */
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header_list), "CURLOPT_HTTPHEADER");
+        // ==========
+        // Evaluation
+        // ==========
 
 #ifdef LIBCURL_FEATURE_SSL
+        if (workingState.use_ssl && config.check_cert) {
+                mp_subcheck sc_certificate = check_curl_certificate_checks(
+                        curl_state.curl, cert, config.days_till_exp_warn, config.days_till_exp_crit);
 
-        /* set SSL version, warn about insecure or unsupported versions */
-        if (use_ssl) {
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSLVERSION, ssl_version), "CURLOPT_SSLVERSION");
-        }
-
-        /* client certificate and key to present to server (SSL) */
-        if (client_cert)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSLCERT, client_cert), "CURLOPT_SSLCERT");
-        if (client_privkey)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSLKEY, client_privkey), "CURLOPT_SSLKEY");
-        if (ca_cert) {
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CAINFO, ca_cert), "CURLOPT_CAINFO");
-        }
-        if (ca_cert || verify_peer_and_host) {
-                /* per default if we have a CA verify both the peer and the
-                 * hostname in the certificate, can be switched off later */
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 1), "CURLOPT_SSL_VERIFYPEER");
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 2), "CURLOPT_SSL_VERIFYHOST");
-        } else {
-                /* backward-compatible behaviour, be tolerant in checks
-                 * TODO: depending on more options have aspects we want
-                 * to be less tolerant about ssl verfications
-                 */
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0), "CURLOPT_SSL_VERIFYPEER");
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0), "CURLOPT_SSL_VERIFYHOST");
-        }
-
-        /* detect SSL library used by libcurl */
-        ssl_library = curlhelp_get_ssl_library();
-
-        /* try hard to get a stack of certificates to verify against */
-        if (check_cert) {
-#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1)
-                /* inform curl to report back certificates */
-                switch (ssl_library) {
-                case CURLHELP_SSL_LIBRARY_OPENSSL:
-                case CURLHELP_SSL_LIBRARY_LIBRESSL:
-                        /* set callback to extract certificate with OpenSSL context function (works with
-                         * OpenSSL-style libraries only!) */
-#               ifdef USE_OPENSSL
-                        /* libcurl and monitoring plugins built with OpenSSL, good */
-                        add_sslctx_verify_fun = true;
-                        is_openssl_callback = true;
-#               endif /* USE_OPENSSL */
-                        /* libcurl is built with OpenSSL, monitoring plugins, so falling
-                         * back to manually extracting certificate information */
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
-                        break;
-
-                case CURLHELP_SSL_LIBRARY_NSS:
-#               if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
-                        /* NSS: support for CERTINFO is implemented since 7.34.0 */
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
-#               else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (libcurl linked with SSL library '%s' is too old)\n",
-                                curlhelp_get_ssl_library_string(ssl_library));
-#               endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-                        break;
-
-                case CURLHELP_SSL_LIBRARY_GNUTLS:
-#               if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0)
-                        /* GnuTLS: support for CERTINFO is implemented since 7.42.0 */
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
-#               else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0) */
-                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (libcurl linked with SSL library '%s' is too old)\n",
-                                curlhelp_get_ssl_library_string(ssl_library));
-#               endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0) */
-                        break;
-
-                case CURLHELP_SSL_LIBRARY_UNKNOWN:
-                default:
-                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (unknown SSL library '%s', must implement first)\n",
-                                curlhelp_get_ssl_library_string(ssl_library));
-                        break;
+                mp_add_subcheck_to_subcheck(&sc_result, sc_certificate);
+                if (!config.continue_after_check_cert) {
+                        return sc_result;
                 }
-#       else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
-                /* old libcurl, our only hope is OpenSSL, otherwise we are out of luck */
-                if (ssl_library == CURLHELP_SSL_LIBRARY_OPENSSL || ssl_library == CURLHELP_SSL_LIBRARY_LIBRESSL)
-                        add_sslctx_verify_fun = true;
-                else
-                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (no CURLOPT_SSL_CTX_FUNCTION, no OpenSSL library or libcurl "
-                                                                "too old and has no CURLOPT_CERTINFO)\n");
-#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
         }
-
-#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 10, 6) /* required for CURLOPT_SSL_CTX_FUNCTION */
-        // ssl ctx function is not available with all ssl backends
-        if (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, NULL) != CURLE_UNKNOWN_OPTION)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
-#       endif
-
-#endif /* LIBCURL_FEATURE_SSL */
-
-        /* set default or user-given user agent identification */
-        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_USERAGENT, user_agent), "CURLOPT_USERAGENT");
-
-        /* proxy-authentication */
-        if (strcmp(proxy_auth, ""))
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, proxy_auth), "CURLOPT_PROXYUSERPWD");
-
-        /* authentication */
-        if (strcmp(user_auth, ""))
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_USERPWD, user_auth), "CURLOPT_USERPWD");
-
-        /* TODO: parameter auth method, bitfield of following methods:
-         * CURLAUTH_BASIC (default)
-         * CURLAUTH_DIGEST
-         * CURLAUTH_DIGEST_IE
-         * CURLAUTH_NEGOTIATE
-         * CURLAUTH_NTLM
-         * CURLAUTH_NTLM_WB
-         *
-         * convenience tokens for typical sets of methods:
-         * CURLAUTH_ANYSAFE: most secure, without BASIC
-         * or CURLAUTH_ANY: most secure, even BASIC if necessary
-         *
-         * handle_curl_option_return_code (curl_easy_setopt( curl, CURLOPT_HTTPAUTH, (long)CURLAUTH_DIGEST ), "CURLOPT_HTTPAUTH");
-         */
-
-        /* handle redirections */
-        if (onredirect == STATE_DEPENDENT) {
-                if (followmethod == FOLLOW_LIBCURL) {
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1), "CURLOPT_FOLLOWLOCATION");
-
-                        /* default -1 is infinite, not good, could lead to zombie plugins!
-                           Setting it to one bigger than maximal limit to handle errors nicely below
-                         */
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_MAXREDIRS, max_depth + 1), "CURLOPT_MAXREDIRS");
-
-                        /* for now allow only http and https (we are a http(s) check plugin in the end) */
-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 0)
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS_STR, "http,https"),
-                                                                                   "CURLOPT_REDIR_PROTOCOLS_STR");
-#elif LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4)
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS),
-                                                                                   "CURLOPT_REDIRECT_PROTOCOLS");
 #endif
 
-                        /* TODO: handle the following aspects of redirection, make them
-                         * command line options too later:
-                          CURLOPT_POSTREDIR: method switch
-                          CURLINFO_REDIRECT_URL: custom redirect option
-                          CURLOPT_REDIRECT_PROTOCOLS: allow people to step outside safe protocols
-                          CURLINFO_REDIRECT_COUNT: get the number of redirects, print it, maybe a range option here is nice like for expected page size?
-                        */
-                } else {
-                        /* old style redirection is handled below */
-                }
-        }
-
-        /* no-body */
-        if (no_body)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_NOBODY, 1), "CURLOPT_NOBODY");
-
-        /* IPv4 or IPv6 forced DNS resolution */
-        if (address_family == AF_UNSPEC)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER),
-                                                                           "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_WHATEVER)");
-        else if (address_family == AF_INET)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4),
-                                                                           "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_V4)");
-#if defined(USE_IPV6) && defined(LIBCURL_FEATURE_IPV6)
-        else if (address_family == AF_INET6)
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6),
-                                                                           "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_V6)");
-#endif
+        /* we got the data and we executed the request in a given time, so we can append
+         * performance data to the answer always
+         */
 
-        /* either send http POST data (any data, not only POST)*/
-        if (!strcmp(http_method, "POST") || !strcmp(http_method, "PUT")) {
-                /* set content of payload for POST and PUT */
-                if (http_content_type) {
-                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Content-Type: %s", http_content_type);
-                        header_list = curl_slist_append(header_list, http_header);
-                }
-                /* NULL indicates "HTTP Continue" in libcurl, provide an empty string
-                 * in case of no POST/PUT data */
-                if (!http_post_data)
-                        http_post_data = "";
-                if (!strcmp(http_method, "POST")) {
-                        /* POST method, set payload with CURLOPT_POSTFIELDS */
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_POSTFIELDS, http_post_data), "CURLOPT_POSTFIELDS");
-                } else if (!strcmp(http_method, "PUT")) {
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_READFUNCTION, (curl_read_callback)curlhelp_buffer_read_callback),
-                                                                                   "CURLOPT_READFUNCTION");
-                        if (curlhelp_initreadbuffer(&put_buf, http_post_data, strlen(http_post_data)) < 0)
-                                die(STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating read buffer for PUT\n");
-                        put_buf_initialized = true;
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_READDATA, (void *)&put_buf), "CURLOPT_READDATA");
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_INFILESIZE, (curl_off_t)strlen(http_post_data)),
-                                                                                   "CURLOPT_INFILESIZE");
+        // total time the query took
+        mp_perfdata pd_total_time = perfdata_init();
+        mp_perfdata_value pd_val_total_time = mp_create_pd_value(total_time);
+        pd_total_time.value = pd_val_total_time;
+        pd_total_time = mp_pd_set_thresholds(pd_total_time, config.thlds);
+        pd_total_time.label = "time";
+        pd_total_time.uom = "s";
+
+        mp_subcheck sc_total_time = mp_subcheck_init();
+        sc_total_time = mp_set_subcheck_state(sc_total_time, mp_get_pd_status(pd_total_time));
+        xasprintf(&sc_total_time.output, "Total connection time: %fs", total_time);
+        mp_add_perfdata_to_subcheck(&sc_total_time, pd_total_time);
+
+        mp_add_subcheck_to_subcheck(&sc_result, sc_total_time);
+
+        if (config.show_extended_perfdata) {
+                // overall connection time
+                mp_perfdata pd_time_connect = perfdata_init();
+                double time_connect;
+                handle_curl_option_return_code(
+                        curl_easy_getinfo(curl_state.curl, CURLINFO_CONNECT_TIME, &time_connect),
+                        "CURLINFO_CONNECT_TIME");
+
+                mp_perfdata_value pd_val_time_connect = mp_create_pd_value(time_connect);
+                pd_time_connect.value = pd_val_time_connect;
+                pd_time_connect.label = "time_connect";
+                pd_time_connect.uom = "s";
+                pd_time_connect = mp_set_pd_max_value(
+                        pd_time_connect, mp_create_pd_value(config.curl_config.socket_timeout));
+
+                pd_time_connect = mp_pd_set_thresholds(pd_time_connect, config.thlds);
+                mp_add_perfdata_to_subcheck(&sc_result, pd_time_connect);
+
+                // application connection time, used to compute other timings
+                double time_appconnect;
+                handle_curl_option_return_code(
+                        curl_easy_getinfo(curl_state.curl, CURLINFO_APPCONNECT_TIME, &time_appconnect),
+                        "CURLINFO_APPCONNECT_TIME");
+
+                if (workingState.use_ssl) {
+                        mp_perfdata pd_time_tls = perfdata_init();
+                        {
+                                mp_perfdata_value pd_val_time_tls =
+                                        mp_create_pd_value(time_appconnect - time_connect);
+
+                                pd_time_tls.value = pd_val_time_tls;
+                        }
+                        pd_time_tls.label = "time_tls";
+                        pd_time_tls.uom = "s";
+                        mp_add_perfdata_to_subcheck(&sc_result, pd_time_tls);
                 }
-        }
 
-        /* cookie handling */
-        if (cookie_jar_file != NULL) {
-                /* enable reading cookies from a file, and if the filename is an empty string, only enable the curl cookie engine */
-                handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_COOKIEFILE, cookie_jar_file), "CURLOPT_COOKIEFILE");
-                /* now enable saving cookies to a file, but only if the filename is not an empty string, since writing it would fail */
-                if (*cookie_jar_file)
-                        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR");
-        }
-
-        /* do the request */
-        res = curl_easy_perform(curl);
-
-        if (verbose >= 2 && http_post_data)
-                printf("**** REQUEST CONTENT ****\n%s\n", http_post_data);
+                mp_perfdata pd_time_headers = perfdata_init();
+                {
+                        double time_headers;
+                        handle_curl_option_return_code(
+                                curl_easy_getinfo(curl_state.curl, CURLINFO_PRETRANSFER_TIME, &time_headers),
+                                "CURLINFO_PRETRANSFER_TIME");
 
-        /* free header and server IP resolve lists, we don't need it anymore */
-        curl_slist_free_all(header_list);
-        header_list = NULL;
-        curl_slist_free_all(server_ips);
-        server_ips = NULL;
-        if (host) {
-                curl_slist_free_all(host);
-                host = NULL;
-        }
+                        mp_perfdata_value pd_val_time_headers =
+                                mp_create_pd_value(time_headers - time_appconnect);
 
-        /* Curl errors, result in critical Nagios state */
-        if (res != CURLE_OK) {
-                snprintf(msg, DEFAULT_BUFFER_SIZE, _("Invalid HTTP response received from host on port %d: cURL returned %d - %s"), server_port,
-                                 res, errbuf[0] ? errbuf : curl_easy_strerror(res));
-                die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-        }
+                        pd_time_headers.value = pd_val_time_headers;
+                }
+                pd_time_headers.label = "time_headers";
+                pd_time_headers.uom = "s";
+                mp_add_perfdata_to_subcheck(&sc_result, pd_time_headers);
 
-        /* certificate checks */
-#ifdef LIBCURL_FEATURE_SSL
-        if (use_ssl) {
-                if (check_cert) {
-                        if (is_openssl_callback) {
-#       ifdef USE_OPENSSL
-                                /* check certificate with OpenSSL functions, curl has been built against OpenSSL
-                                 * and we actually have OpenSSL in the monitoring tools
-                                 */
-                                result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
-                                if (!continue_after_check_cert) {
-                                        return result_ssl;
-                                }
-#       else  /* USE_OPENSSL */
-                                die(STATE_CRITICAL,
-                                        "HTTP CRITICAL - Cannot retrieve certificates - OpenSSL callback used and not linked against OpenSSL\n");
-#       endif /* USE_OPENSSL */
-                        } else {
-                                int i;
-                                struct curl_slist *slist;
+                mp_perfdata pd_time_firstbyte = perfdata_init();
+                double time_firstbyte;
+                handle_curl_option_return_code(
+                        curl_easy_getinfo(curl_state.curl, CURLINFO_STARTTRANSFER_TIME, &time_firstbyte),
+                        "CURLINFO_STARTTRANSFER_TIME");
 
-                                cert_ptr.to_info = NULL;
-                                res = curl_easy_getinfo(curl, CURLINFO_CERTINFO, &cert_ptr.to_info);
-                                if (!res && cert_ptr.to_info) {
-#       ifdef USE_OPENSSL
-                                        /* We have no OpenSSL in libcurl, but we can use OpenSSL for X509 cert parsing
-                                         * We only check the first certificate and assume it's the one of the server
-                                         */
-                                        const char *raw_cert = NULL;
-                                        for (i = 0; i < cert_ptr.to_certinfo->num_of_certs; i++) {
-                                                for (slist = cert_ptr.to_certinfo->certinfo[i]; slist; slist = slist->next) {
-                                                        if (verbose >= 2)
-                                                                printf("%d ** %s\n", i, slist->data);
-                                                        if (strncmp(slist->data, "Cert:", 5) == 0) {
-                                                                raw_cert = &slist->data[5];
-                                                                goto GOT_FIRST_CERT;
-                                                        }
-                                                }
-                                        }
-                                GOT_FIRST_CERT:
-                                        if (!raw_cert) {
-                                                snprintf(msg, DEFAULT_BUFFER_SIZE,
-                                                                 _("Cannot retrieve certificates from CERTINFO information - certificate data was empty"));
-                                                die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-                                        }
-                                        BIO *cert_BIO = BIO_new(BIO_s_mem());
-                                        BIO_write(cert_BIO, raw_cert, strlen(raw_cert));
-                                        cert = PEM_read_bio_X509(cert_BIO, NULL, NULL, NULL);
-                                        if (!cert) {
-                                                snprintf(msg, DEFAULT_BUFFER_SIZE, _("Cannot read certificate from CERTINFO information - BIO error"));
-                                                die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-                                        }
-                                        BIO_free(cert_BIO);
-                                        result_ssl = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
-                                        if (!continue_after_check_cert) {
-                                                return result_ssl;
-                                        }
-#       else  /* USE_OPENSSL */
-                                        /* We assume we don't have OpenSSL and np_net_ssl_check_certificate at our disposal,
-                                         * so we use the libcurl CURLINFO data
-                                         */
-                                        result_ssl = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit);
-                                        if (!continue_after_check_cert) {
-                                                return result_ssl;
-                                        }
-#       endif /* USE_OPENSSL */
-                                } else {
-                                        snprintf(msg, DEFAULT_BUFFER_SIZE, _("Cannot retrieve certificates - cURL returned %d - %s"), res,
-                                                         curl_easy_strerror(res));
-                                        die(STATE_CRITICAL, "HTTP CRITICAL - %s\n", msg);
-                                }
-                        }
-                }
-        }
-#endif /* LIBCURL_FEATURE_SSL */
+                mp_perfdata_value pd_val_time_firstbyte = mp_create_pd_value(time_firstbyte);
+                pd_time_firstbyte.value = pd_val_time_firstbyte;
+                pd_time_firstbyte.label = "time_firstbyte";
+                pd_time_firstbyte.uom = "s";
+                mp_add_perfdata_to_subcheck(&sc_result, pd_time_firstbyte);
 
-        /* we got the data and we executed the request in a given time, so we can append
-         * performance data to the answer always
-         */
-        handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_TOTAL_TIME, &total_time), "CURLINFO_TOTAL_TIME");
-        page_len = get_content_length(&header_buf, &body_buf);
-        if (show_extended_perfdata) {
-                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_CONNECT_TIME, &time_connect), "CURLINFO_CONNECT_TIME");
-                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_APPCONNECT_TIME, &time_appconnect), "CURLINFO_APPCONNECT_TIME");
-                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_PRETRANSFER_TIME, &time_headers), "CURLINFO_PRETRANSFER_TIME");
-                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_STARTTRANSFER_TIME, &time_firstbyte),
-                                                                           "CURLINFO_STARTTRANSFER_TIME");
-                snprintf(perfstring, DEFAULT_BUFFER_SIZE, "%s %s %s %s %s %s %s", perfd_time(total_time), perfd_size(page_len),
-                                 perfd_time_connect(time_connect), use_ssl ? perfd_time_ssl(time_appconnect - time_connect) : "",
-                                 perfd_time_headers(time_headers - time_appconnect), perfd_time_firstbyte(time_firstbyte - time_headers),
-                                 perfd_time_transfer(total_time - time_firstbyte));
-        } else {
-                snprintf(perfstring, DEFAULT_BUFFER_SIZE, "%s %s", perfd_time(total_time), perfd_size(page_len));
+                mp_perfdata pd_time_transfer = perfdata_init();
+                pd_time_transfer.value = mp_create_pd_value(total_time - time_firstbyte);
+                pd_time_transfer.label = "time_transfer";
+                pd_time_transfer.uom = "s";
+                mp_add_perfdata_to_subcheck(&sc_result, pd_time_transfer);
         }
 
         /* return a CRITICAL status if we couldn't read any data */
-        if (strlen(header_buf.buf) == 0 && strlen(body_buf.buf) == 0)
-                die(STATE_CRITICAL, _("HTTP CRITICAL - No header received from host\n"));
-
-        /* get status line of answer, check sanity of HTTP code */
-        if (curlhelp_parse_statusline(header_buf.buf, &status_line) < 0) {
-                snprintf(msg, DEFAULT_BUFFER_SIZE, "Unparsable status line in %.3g seconds response time|%s\n", total_time, perfstring);
-                /* we cannot know the major/minor version here for sure as we cannot parse the first line */
-                die(STATE_CRITICAL, "HTTP CRITICAL HTTP/x.x %ld unknown - %s", code, msg);
+        if (strlen(curl_state.header_buf->buf) == 0 && strlen(curl_state.body_buf->buf) == 0) {
+                sc_result = mp_set_subcheck_state(sc_result, STATE_CRITICAL);
+                xasprintf(&sc_result.output, "No header received from host");
+                return sc_result;
         }
-        status_line_initialized = true;
 
         /* get result code from cURL */
-        handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &code), "CURLINFO_RESPONSE_CODE");
-        if (verbose >= 2)
-                printf("* curl CURLINFO_RESPONSE_CODE is %ld\n", code);
+        long httpReturnCode;
+        handle_curl_option_return_code(
+                curl_easy_getinfo(curl_state.curl, CURLINFO_RESPONSE_CODE, &httpReturnCode),
+                "CURLINFO_RESPONSE_CODE");
+        if (verbose >= 2) {
+                printf("* curl CURLINFO_RESPONSE_CODE is %ld\n", httpReturnCode);
+        }
 
         /* print status line, header, body if verbose */
         if (verbose >= 2) {
-                printf("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header_buf.buf, (no_body ? "  [[ skipped ]]" : body_buf.buf));
+                printf("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", curl_state.header_buf->buf,
+                           (workingState.no_body ? "  [[ skipped ]]" : curl_state.body_buf->buf));
         }
 
         /* make sure the status line matches the response we are looking for */
-        if (!expected_statuscode(status_line.first_line, server_expect)) {
-                if (server_port == HTTP_PORT)
-                        snprintf(msg, DEFAULT_BUFFER_SIZE, _("Invalid HTTP response received from host: %s\n"), status_line.first_line);
-                else
-                        snprintf(msg, DEFAULT_BUFFER_SIZE, _("Invalid HTTP response received from host on port %d: %s\n"), server_port,
-                                         status_line.first_line);
-                die(STATE_CRITICAL, "HTTP CRITICAL - %s%s%s", msg, show_body ? "\n" : "", show_body ? body_buf.buf : "");
+        mp_subcheck sc_expect = mp_subcheck_init();
+        sc_expect = mp_set_subcheck_default_state(sc_expect, STATE_OK);
+        if (!expected_statuscode(curl_state.status_line->first_line, config.server_expect.string)) {
+                if (workingState.serverPort == HTTP_PORT) {
+                        xasprintf(&sc_expect.output, _("Invalid HTTP response received from host: %s\n"),
+                                          curl_state.status_line->first_line);
+                } else {
+                        xasprintf(&sc_expect.output,
+                                          _("Invalid HTTP response received from host on port %d: %s\n"),
+                                          workingState.serverPort, curl_state.status_line->first_line);
+                }
+                sc_expect = mp_set_subcheck_default_state(sc_expect, STATE_CRITICAL);
+        } else {
+                xasprintf(&sc_expect.output, _("Status line output matched \"%s\""),
+                                  config.server_expect.string);
         }
+        mp_add_subcheck_to_subcheck(&sc_result, sc_expect);
 
-        if (server_expect_yn) {
-                snprintf(msg, DEFAULT_BUFFER_SIZE, _("Status line output matched \"%s\" - "), server_expect);
-                if (verbose)
-                        printf("%s\n", msg);
-                result = STATE_OK;
-        } else {
+        if (!config.server_expect.is_present) {
                 /* illegal return codes result in a critical state */
-                if (code >= 600 || code < 100) {
-                        die(STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%d, %.40s)\n"), status_line.http_code, status_line.msg);
-                        /* server errors result in a critical state */
-                } else if (code >= 500) {
-                        result = STATE_CRITICAL;
+                mp_subcheck sc_return_code = mp_subcheck_init();
+                sc_return_code = mp_set_subcheck_default_state(sc_return_code, STATE_OK);
+                xasprintf(&sc_return_code.output, "HTTP return code: %d",
+                                  curl_state.status_line->http_code);
+
+                if (httpReturnCode >= 600 || httpReturnCode < 100) {
+                        sc_return_code = mp_set_subcheck_state(sc_return_code, STATE_CRITICAL);
+                        xasprintf(&sc_return_code.output, _("Invalid Status (%d, %.40s)"),
+                                          curl_state.status_line->http_code, curl_state.status_line->msg);
+                        mp_add_subcheck_to_subcheck(&sc_result, sc_return_code);
+                        return sc_result;
+                }
+
+                // server errors result in a critical state
+                if (httpReturnCode >= 500) {
+                        sc_return_code = mp_set_subcheck_state(sc_return_code, STATE_CRITICAL);
                         /* client errors result in a warning state */
-                } else if (code >= 400) {
-                        result = STATE_WARNING;
+                } else if (httpReturnCode >= 400) {
+                        sc_return_code = mp_set_subcheck_state(sc_return_code, STATE_WARNING);
                         /* check redirected page if specified */
-                } else if (code >= 300) {
-                        if (onredirect == STATE_DEPENDENT) {
-                                if (followmethod == FOLLOW_LIBCURL) {
-                                        code = status_line.http_code;
+                } else if (httpReturnCode >= 300) {
+                        if (config.on_redirect_dependent) {
+                                if (config.followmethod == FOLLOW_LIBCURL) {
+                                        httpReturnCode = curl_state.status_line->http_code;
+                                        handle_curl_option_return_code(
+                                                curl_easy_getinfo(curl_state.curl, CURLINFO_REDIRECT_COUNT, &redir_depth),
+                                                "CURLINFO_REDIRECT_COUNT");
+
+                                        if (verbose >= 2) {
+                                                printf(_("* curl LIBINFO_REDIRECT_COUNT is %ld\n"), redir_depth);
+                                        }
+
+                                        mp_subcheck sc_redir_depth = mp_subcheck_init();
+                                        if (redir_depth > config.max_depth) {
+                                                xasprintf(&sc_redir_depth.output,
+                                                                  "maximum redirection depth %ld exceeded in libcurl",
+                                                                  config.max_depth);
+                                                sc_redir_depth = mp_set_subcheck_state(sc_redir_depth, STATE_CRITICAL);
+                                                mp_add_subcheck_to_subcheck(&sc_result, sc_redir_depth);
+                                                return sc_result;
+                                        }
+                                        xasprintf(&sc_redir_depth.output, "redirection depth %ld (of a maximum %ld)",
+                                                          redir_depth, config.max_depth);
+                                        mp_add_subcheck_to_subcheck(&sc_result, sc_redir_depth);
+
                                 } else {
                                         /* old check_http style redirection, if we come
                                          * back here, we are in the same status as with
                                          * the libcurl method
                                          */
-                                        redir(&header_buf);
+                                        redir_wrapper redir_result =
+                                                redir(curl_state.header_buf, config, redir_depth, workingState);
+                                        cleanup(curl_state);
+                                        mp_subcheck sc_redir =
+                                                check_http(config, redir_result.working_state, redir_result.redir_depth);
+                                        mp_add_subcheck_to_subcheck(&sc_result, sc_redir);
+
+                                        return sc_result;
                                 }
                         } else {
                                 /* this is a specific code in the command line to
                                  * be returned when a redirection is encountered
                                  */
+                                sc_return_code =
+                                        mp_set_subcheck_state(sc_return_code, config.on_redirect_result_state);
                         }
-                        result = max_state_alt(onredirect, result);
-                        /* all other codes are considered ok */
                 } else {
-                        result = STATE_OK;
+                        sc_return_code = mp_set_subcheck_state(sc_return_code, STATE_OK);
                 }
-        }
 
-        /* libcurl redirection internally, handle error states here */
-        if (followmethod == FOLLOW_LIBCURL) {
-                handle_curl_option_return_code(curl_easy_getinfo(curl, CURLINFO_REDIRECT_COUNT, &redir_depth), "CURLINFO_REDIRECT_COUNT");
-                if (verbose >= 2)
-                        printf(_("* curl LIBINFO_REDIRECT_COUNT is %d\n"), redir_depth);
-                if (redir_depth > max_depth) {
-                        snprintf(msg, DEFAULT_BUFFER_SIZE, "maximum redirection depth %d exceeded in libcurl", max_depth);
-                        die(STATE_WARNING, "HTTP WARNING - %s", msg);
-                }
+                mp_add_subcheck_to_subcheck(&sc_result, sc_return_code);
         }
 
         /* check status codes, set exit status accordingly */
-        if (status_line.http_code != code) {
-                die(STATE_CRITICAL, _("HTTP CRITICAL %s %d %s - different HTTP codes (cUrl has %ld)\n"),
-                        string_statuscode(status_line.http_major, status_line.http_minor), status_line.http_code, status_line.msg, code);
+        if (curl_state.status_line->http_code != httpReturnCode) {
+                mp_subcheck sc_http_return_code_sanity = mp_subcheck_init();
+                sc_http_return_code_sanity =
+                        mp_set_subcheck_state(sc_http_return_code_sanity, STATE_CRITICAL);
+                xasprintf(&sc_http_return_code_sanity.output,
+                                  _("HTTP CRITICAL %s %d %s - different HTTP codes (cUrl has %ld)\n"),
+                                  string_statuscode(curl_state.status_line->http_major,
+                                                                        curl_state.status_line->http_minor),
+                                  curl_state.status_line->http_code, curl_state.status_line->msg, httpReturnCode);
+
+                mp_add_subcheck_to_subcheck(&sc_result, sc_http_return_code_sanity);
+                return sc_result;
         }
 
-        if (maximum_age >= 0) {
-                result = max_state_alt(check_document_dates(&header_buf, &msg), result);
+        if (config.maximum_age >= 0) {
+                mp_subcheck sc_max_age = check_document_dates(curl_state.header_buf, config.maximum_age);
+                mp_add_subcheck_to_subcheck(&sc_result, sc_max_age);
         }
 
         /* Page and Header content checks go here */
+        if (strlen(config.header_expect)) {
+                mp_subcheck sc_header_expect = mp_subcheck_init();
+                sc_header_expect = mp_set_subcheck_default_state(sc_header_expect, STATE_OK);
+                xasprintf(&sc_header_expect.output, "Expect %s in header", config.header_expect);
 
-        if (strlen(header_expect)) {
-                if (!strstr(header_buf.buf, header_expect)) {
-
-                        strncpy(&output_header_search[0], header_expect, sizeof(output_header_search));
+                if (!strstr(curl_state.header_buf->buf, config.header_expect)) {
+                        char output_header_search[30] = "";
+                        strncpy(&output_header_search[0], config.header_expect, sizeof(output_header_search));
 
                         if (output_header_search[sizeof(output_header_search) - 1] != '\0') {
                                 bcopy("...", &output_header_search[sizeof(output_header_search) - 4], 4);
                         }
 
-                        char tmp[DEFAULT_BUFFER_SIZE];
-
-                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sheader '%s' not found on '%s://%s:%d%s', "), msg, output_header_search,
-                                         use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
+                        xasprintf(&sc_header_expect.output, _("header '%s' not found on '%s://%s:%d%s', "),
+                                          output_header_search, workingState.use_ssl ? "https" : "http",
+                                          workingState.host_name ? workingState.host_name : workingState.server_address,
+                                          workingState.serverPort, workingState.server_url);
 
-                        strcpy(msg, tmp);
-
-                        result = STATE_CRITICAL;
+                        sc_header_expect = mp_set_subcheck_state(sc_header_expect, STATE_CRITICAL);
                 }
+
+                mp_add_subcheck_to_subcheck(&sc_result, sc_header_expect);
         }
 
-        if (strlen(string_expect)) {
-                if (!strstr(body_buf.buf, string_expect)) {
+        if (strlen(config.string_expect)) {
+                mp_subcheck sc_string_expect = mp_subcheck_init();
+                sc_string_expect = mp_set_subcheck_default_state(sc_string_expect, STATE_OK);
+                xasprintf(&sc_string_expect.output, "Expect string \"%s\" in body", config.string_expect);
 
-                        strncpy(&output_string_search[0], string_expect, sizeof(output_string_search));
+                if (!strstr(curl_state.body_buf->buf, config.string_expect)) {
+                        char output_string_search[30] = "";
+                        strncpy(&output_string_search[0], config.string_expect, sizeof(output_string_search));
 
                         if (output_string_search[sizeof(output_string_search) - 1] != '\0') {
                                 bcopy("...", &output_string_search[sizeof(output_string_search) - 4], 4);
                         }
 
-                        char tmp[DEFAULT_BUFFER_SIZE];
+                        xasprintf(&sc_string_expect.output, _("string '%s' not found on '%s://%s:%d%s', "),
+                                          output_string_search, workingState.use_ssl ? "https" : "http",
+                                          workingState.host_name ? workingState.host_name : workingState.server_address,
+                                          workingState.serverPort, workingState.server_url);
 
-                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, output_string_search,
-                                         use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
-
-                        strcpy(msg, tmp);
-
-                        result = STATE_CRITICAL;
+                        sc_string_expect = mp_set_subcheck_state(sc_string_expect, STATE_CRITICAL);
                 }
+
+                mp_add_subcheck_to_subcheck(&sc_result, sc_string_expect);
         }
 
-        if (strlen(regexp)) {
-                errcode = regexec(&preg, body_buf.buf, REGS, pmatch, 0);
-                if ((errcode == 0 && !invert_regex) || (errcode == REG_NOMATCH && invert_regex)) {
-                        /* OK - No-op to avoid changing the logic around it */
-                        result = max_state_alt(STATE_OK, result);
-                } else if ((errcode == REG_NOMATCH && !invert_regex) || (errcode == 0 && invert_regex)) {
-                        if (!invert_regex) {
-                                char tmp[DEFAULT_BUFFER_SIZE];
+        if (strlen(config.regexp)) {
+                mp_subcheck sc_body_regex = mp_subcheck_init();
+                xasprintf(&sc_body_regex.output, "Regex \"%s\" in body matched", config.regexp);
+                regmatch_t pmatch[REGS];
 
-                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spattern not found, "), msg);
-                                strcpy(msg, tmp);
+                int errcode = regexec(&config.compiled_regex, curl_state.body_buf->buf, REGS, pmatch, 0);
 
+                if (errcode == 0) {
+                        // got a match
+                        if (config.invert_regex) {
+                                sc_body_regex = mp_set_subcheck_state(sc_body_regex, config.state_regex);
                         } else {
-                                char tmp[DEFAULT_BUFFER_SIZE];
+                                sc_body_regex = mp_set_subcheck_state(sc_body_regex, STATE_OK);
+                        }
+                } else if (errcode == REG_NOMATCH) {
+                        // got no match
+                        xasprintf(&sc_body_regex.output, "%s not", sc_body_regex.output);
 
-                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spattern found, "), msg);
-                                strcpy(msg, tmp);
+                        if (config.invert_regex) {
+                                sc_body_regex = mp_set_subcheck_state(sc_body_regex, STATE_OK);
+                        } else {
+                                sc_body_regex = mp_set_subcheck_state(sc_body_regex, config.state_regex);
                         }
-                        result = state_regex;
                 } else {
-                        regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-
-                        char tmp[DEFAULT_BUFFER_SIZE];
-
-                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sExecute Error: %s, "), msg, errbuf);
-                        strcpy(msg, tmp);
-                        result = STATE_UNKNOWN;
+                        // error in regexec
+                        char error_buffer[DEFAULT_BUFFER_SIZE];
+                        regerror(errcode, &config.compiled_regex, &error_buffer[0], DEFAULT_BUFFER_SIZE);
+                        xasprintf(&sc_body_regex.output, "regexec error: %s", error_buffer);
+                        sc_body_regex = mp_set_subcheck_state(sc_body_regex, STATE_UNKNOWN);
                 }
+
+                mp_add_subcheck_to_subcheck(&sc_result, sc_body_regex);
         }
 
-        /* make sure the page is of an appropriate size */
-        if ((max_page_len > 0) && (page_len > max_page_len)) {
-                char tmp[DEFAULT_BUFFER_SIZE];
+        // size a.k.a. page length
+        mp_perfdata pd_page_length = perfdata_init();
+        mp_perfdata_value pd_val_page_length = mp_create_pd_value(page_len);
+        pd_page_length.value = pd_val_page_length;
+        pd_page_length.label = "size";
+        pd_page_length.uom = "B";
+        pd_page_length.min = mp_create_pd_value(0);
+        pd_page_length.warn = config.page_length_limits;
+        pd_page_length.warn_present = true;
 
-                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too large, "), msg, page_len);
+        /* make sure the page is of an appropriate size */
+        if (config.page_length_limits_is_set) {
+                mp_thresholds page_length_threshold = mp_thresholds_init();
+                page_length_threshold.warning = config.page_length_limits;
+                page_length_threshold.warning_is_set = true;
 
-                strcpy(msg, tmp);
+                pd_page_length = mp_pd_set_thresholds(pd_page_length, page_length_threshold);
 
-                result = max_state_alt(STATE_WARNING, result);
+                mp_subcheck sc_page_length = mp_subcheck_init();
 
-        } else if ((min_page_len > 0) && (page_len < min_page_len)) {
-                char tmp[DEFAULT_BUFFER_SIZE];
+                mp_add_perfdata_to_subcheck(&sc_page_length, pd_page_length);
 
-                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too small, "), msg, page_len);
-                strcpy(msg, tmp);
-                result = max_state_alt(STATE_WARNING, result);
-        }
+                mp_state_enum tmp_state = mp_get_pd_status(pd_page_length);
+                sc_page_length = mp_set_subcheck_state(sc_page_length, tmp_state);
 
-        /* -w, -c: check warning and critical level */
-        result = max_state_alt(get_status(total_time, thlds), result);
+                switch (tmp_state) {
+                case STATE_CRITICAL:
+                case STATE_WARNING:
+                        xasprintf(&sc_page_length.output, _("page size %zu violates threshold"), page_len);
+                        break;
+                case STATE_OK:
+                        xasprintf(&sc_page_length.output, _("page size %zu is OK"), page_len);
+                        break;
+                default:
+                        assert(false);
+                }
 
-        /* Cut-off trailing characters */
-        if (strlen(msg) >= 2) {
-                if (msg[strlen(msg) - 2] == ',')
-                        msg[strlen(msg) - 2] = '\0';
-                else
-                        msg[strlen(msg) - 3] = '\0';
+                mp_add_subcheck_to_subcheck(&sc_result, sc_page_length);
         }
 
-        /* TODO: separate _() msg and status code: die (result, "HTTP %s: %s\n", state_text(result), msg); */
-        die(max_state_alt(result, result_ssl), "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s", state_text(result),
-                string_statuscode(status_line.http_major, status_line.http_minor), status_line.http_code, status_line.msg,
-                strlen(msg) > 0 ? " - " : "", msg, page_len, total_time, (display_html ? "</A>" : ""), perfstring, (show_body ? body_buf.buf : ""),
-                (show_body ? "\n" : ""));
-
-        return max_state_alt(result, result_ssl);
+        return sc_result;
 }
 
-int uri_strcmp(const UriTextRangeA range, const char *s) {
-        if (!range.first)
+int uri_strcmp(const UriTextRangeA range, const char *stringToCompare) {
+        if (!range.first) {
                 return -1;
-        if ((size_t)(range.afterLast - range.first) < strlen(s))
+        }
+        if ((size_t)(range.afterLast - range.first) < strlen(stringToCompare)) {
                 return -1;
-        return strncmp(s, range.first, min((size_t)(range.afterLast - range.first), strlen(s)));
+        }
+        return strncmp(stringToCompare, range.first,
+                                   min((size_t)(range.afterLast - range.first), strlen(stringToCompare)));
 }
 
 char *uri_string(const UriTextRangeA range, char *buf, size_t buflen) {
-        if (!range.first)
+        if (!range.first) {
                 return "(null)";
+        }
         strncpy(buf, range.first, max(buflen - 1, (size_t)(range.afterLast - range.first)));
         buf[max(buflen - 1, (size_t)(range.afterLast - range.first))] = '\0';
         buf[range.afterLast - range.first] = '\0';
         return buf;
 }
 
-void redir(curlhelp_write_curlbuf *header_buf) {
-        char *location = NULL;
+redir_wrapper redir(curlhelp_write_curlbuf *header_buf, const check_curl_config config,
+                                        long redir_depth, check_curl_working_state working_state) {
         curlhelp_statusline status_line;
         struct phr_header headers[255];
-        size_t nof_headers = 255;
         size_t msglen;
-        char buf[DEFAULT_BUFFER_SIZE];
-        char ipstr[INET_ADDR_MAX_SIZE];
-        int new_port;
-        char *new_host;
-        char *new_url;
-
-        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major, &status_line.http_minor,
-                                                                 &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0);
+        size_t nof_headers = 255;
+        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major,
+                                                                 &status_line.http_minor, &status_line.http_code, &status_line.msg,
+                                                                 &msglen, headers, &nof_headers, 0);
 
         if (res == -1) {
                 die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
         }
 
-        location = get_header_value(headers, nof_headers, "location");
+        char *location = get_header_value(headers, nof_headers, "location");
 
-        if (verbose >= 2)
+        if (location == NULL) {
+                // location header not found
+                die(STATE_UNKNOWN, "HTTP UNKNOWN - could not find \"location\" header\n");
+        }
+
+        if (verbose >= 2) {
                 printf(_("* Seen redirect location %s\n"), location);
+        }
 
-        if (++redir_depth > max_depth)
-                die(STATE_WARNING, _("HTTP WARNING - maximum redirection depth %d exceeded - %s%s\n"), max_depth, location,
-                        (display_html ? "</A>" : ""));
+        if (++redir_depth > config.max_depth) {
+                die(STATE_WARNING, _("HTTP WARNING - maximum redirection depth %ld exceeded - %s\n"),
+                        config.max_depth, location);
+        }
 
         UriParserStateA state;
         UriUriA uri;
         state.uri = &uri;
         if (uriParseUriA(&state, location) != URI_SUCCESS) {
                 if (state.errorCode == URI_ERROR_SYNTAX) {
-                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not parse redirect location '%s'%s\n"), location, (display_html ? "</A>" : ""));
+                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not parse redirect location '%s'\n"),
+                                location);
                 } else if (state.errorCode == URI_ERROR_MALLOC) {
                         die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
                 }
         }
 
+        char ipstr[INET_ADDR_MAX_SIZE];
+        char buf[DEFAULT_BUFFER_SIZE];
         if (verbose >= 2) {
                 printf(_("** scheme: %s\n"), uri_string(uri.scheme, buf, DEFAULT_BUFFER_SIZE));
                 printf(_("** host: %s\n"), uri_string(uri.hostText, buf, DEFAULT_BUFFER_SIZE));
@@ -1215,9 +710,9 @@ void redir(curlhelp_write_curlbuf *header_buf) {
                 }
                 if (uri.pathHead) {
                         printf(_("** path: "));
-                        const UriPathSegmentA *p = uri.pathHead;
-                        for (; p; p = p->next) {
-                                printf("/%s", uri_string(p->text, buf, DEFAULT_BUFFER_SIZE));
+                        for (UriPathSegmentA *path_segment = uri.pathHead; path_segment;
+                                 path_segment = path_segment->next) {
+                                printf("/%s", uri_string(path_segment->text, buf, DEFAULT_BUFFER_SIZE));
                         }
                         puts("");
                 }
@@ -1230,99 +725,123 @@ void redir(curlhelp_write_curlbuf *header_buf) {
         }
 
         if (uri.scheme.first) {
-                if (!uri_strcmp(uri.scheme, "https"))
-                        use_ssl = true;
-                else
-                        use_ssl = false;
+                working_state.use_ssl = (bool)(!uri_strcmp(uri.scheme, "https"));
         }
 
         /* we do a sloppy test here only, because uriparser would have failed
          * above, if the port would be invalid, we just check for MAX_PORT
          */
+        int new_port;
         if (uri.portText.first) {
                 new_port = atoi(uri_string(uri.portText, buf, DEFAULT_BUFFER_SIZE));
         } else {
                 new_port = HTTP_PORT;
-                if (use_ssl)
+                if (working_state.use_ssl) {
                         new_port = HTTPS_PORT;
+                }
+        }
+        if (new_port > MAX_PORT) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Redirection to port above %d - %s\n"), MAX_PORT,
+                        location);
         }
-        if (new_port > MAX_PORT)
-                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Redirection to port above %d - %s%s\n"), MAX_PORT, location, display_html ? "</A>" : "");
 
         /* by RFC 7231 relative URLs in Location should be taken relative to
          * the original URL, so we try to form a new absolute URL here
          */
+        char *new_host;
         if (!uri.scheme.first && !uri.hostText.first) {
-                new_host = strdup(host_name ? host_name : server_address);
-                new_port = server_port;
-                if (use_ssl)
+                new_host = strdup(working_state.host_name ? working_state.host_name
+                                                                                                  : working_state.server_address);
+                new_port = working_state.serverPort;
+                if (working_state.use_ssl) {
                         uri_string(uri.scheme, "https", DEFAULT_BUFFER_SIZE);
+                }
         } else {
                 new_host = strdup(uri_string(uri.hostText, buf, DEFAULT_BUFFER_SIZE));
         }
 
         /* compose new path */
-        /* TODO: handle fragments and query part of URL */
-        new_url = (char *)calloc(1, DEFAULT_BUFFER_SIZE);
+        /* TODO: handle fragments of URL */
+        char *new_url = (char *)calloc(1, DEFAULT_BUFFER_SIZE);
         if (uri.pathHead) {
-                const UriPathSegmentA *p = uri.pathHead;
-                for (; p; p = p->next) {
+                for (UriPathSegmentA *pathSegment = uri.pathHead; pathSegment;
+                         pathSegment = pathSegment->next) {
                         strncat(new_url, "/", DEFAULT_BUFFER_SIZE);
-                        strncat(new_url, uri_string(p->text, buf, DEFAULT_BUFFER_SIZE), DEFAULT_BUFFER_SIZE - 1);
+                        strncat(new_url, uri_string(pathSegment->text, buf, DEFAULT_BUFFER_SIZE),
+                                        DEFAULT_BUFFER_SIZE - 1);
                 }
         }
 
-        if (server_port == new_port && !strncmp(server_address, new_host, MAX_IPV4_HOSTLENGTH) &&
-                (host_name && !strncmp(host_name, new_host, MAX_IPV4_HOSTLENGTH)) && !strcmp(server_url, new_url))
-                die(STATE_CRITICAL, _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"), use_ssl ? "https" : "http",
-                        new_host, new_port, new_url, (display_html ? "</A>" : ""));
+        /* missing components have null,null in their UriTextRangeA
+         * add query parameters if they exist.
+         */
+        if (uri.query.first && uri.query.afterLast){
+                // Ensure we have space for '?' + query_str + '\0' ahead of time, instead of calling strncat twice
+                size_t current_len = strlen(new_url);
+                size_t remaining_space = DEFAULT_BUFFER_SIZE - current_len - 1;
+
+                const char* query_str = uri_string(uri.query, buf, DEFAULT_BUFFER_SIZE);
+                size_t query_str_len = strlen(query_str);
+
+                if (remaining_space >= query_str_len + 1) {
+                        strcat(new_url, "?");
+                        strcat(new_url, query_str);
+                }else{
+                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - No space to add query part of size %d to the buffer, buffer has remaining size %d"), query_str_len , current_len );
+                }
+        }
+
+        if (working_state.serverPort == new_port &&
+                !strncmp(working_state.server_address, new_host, MAX_IPV4_HOSTLENGTH) &&
+                (working_state.host_name &&
+                 !strncmp(working_state.host_name, new_host, MAX_IPV4_HOSTLENGTH)) &&
+                !strcmp(working_state.server_url, new_url)) {
+                die(STATE_CRITICAL,
+                        _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s\n"),
+                        working_state.use_ssl ? "https" : "http", new_host, new_port, new_url);
+        }
 
         /* set new values for redirected request */
 
-        if (!(followsticky & STICKY_HOST)) {
-                free(server_address);
-                server_address = strndup(new_host, MAX_IPV4_HOSTLENGTH);
+        if (!(config.followsticky & STICKY_HOST)) {
+                // free(working_state.server_address);
+                working_state.server_address = strndup(new_host, MAX_IPV4_HOSTLENGTH);
         }
-        if (!(followsticky & STICKY_PORT)) {
-                server_port = (unsigned short)new_port;
+        if (!(config.followsticky & STICKY_PORT)) {
+                working_state.serverPort = (unsigned short)new_port;
         }
 
-        free(host_name);
-        host_name = strndup(new_host, MAX_IPV4_HOSTLENGTH);
+        // free(working_state.host_name);
+        working_state.host_name = strndup(new_host, MAX_IPV4_HOSTLENGTH);
 
         /* reset virtual port */
-        virtual_port = server_port;
+        working_state.virtualPort = working_state.serverPort;
 
         free(new_host);
-        free(server_url);
-        server_url = new_url;
+        // free(working_state.server_url);
+        working_state.server_url = new_url;
 
         uriFreeUriMembersA(&uri);
 
-        if (verbose)
-                printf(_("Redirection to %s://%s:%d%s\n"), use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port,
-                           server_url);
+        if (verbose) {
+                printf(_("Redirection to %s://%s:%d%s\n"), working_state.use_ssl ? "https" : "http",
+                           working_state.host_name ? working_state.host_name : working_state.server_address,
+                           working_state.serverPort, working_state.server_url);
+        }
 
         /* TODO: the hash component MUST be taken from the original URL and
          * attached to the URL in Location
          */
 
-        cleanup();
-        check_http();
-}
-
-/* check whether a file exists */
-void test_file(char *path) {
-        if (access(path, R_OK) == 0)
-                return;
-        usage2(_("file does not exist or is not readable"), path);
+        redir_wrapper result = {
+                .redir_depth = redir_depth,
+                .working_state = working_state,
+                .error_code = OK,
+        };
+        return result;
 }
 
-bool process_arguments(int argc, char **argv) {
-        char *p;
-        int c = 1;
-        char *temp;
-
+check_curl_config_wrapper process_arguments(int argc, char **argv) {
         enum {
                 INVERT_REGEX = CHAR_MAX + 1,
                 SNI_OPTION,
@@ -1333,81 +852,101 @@ bool process_arguments(int argc, char **argv) {
                 AUTOMATIC_DECOMPRESSION,
                 COOKIE_JAR,
                 HAPROXY_PROTOCOL,
-                STATE_REGEX
+                STATE_REGEX,
+                OUTPUT_FORMAT
         };
 
-        int option = 0;
-        int got_plus = 0;
-        static struct option longopts[] = {STD_LONG_OPTS,
-                                                                           {"link", no_argument, 0, 'L'},
-                                                                           {"nohtml", no_argument, 0, 'n'},
-                                                                           {"ssl", optional_argument, 0, 'S'},
-                                                                           {"sni", no_argument, 0, SNI_OPTION},
-                                                                           {"post", required_argument, 0, 'P'},
-                                                                           {"method", required_argument, 0, 'j'},
-                                                                           {"IP-address", required_argument, 0, 'I'},
-                                                                           {"url", required_argument, 0, 'u'},
-                                                                           {"port", required_argument, 0, 'p'},
-                                                                           {"authorization", required_argument, 0, 'a'},
-                                                                           {"proxy-authorization", required_argument, 0, 'b'},
-                                                                           {"header-string", required_argument, 0, 'd'},
-                                                                           {"string", required_argument, 0, 's'},
-                                                                           {"expect", required_argument, 0, 'e'},
-                                                                           {"regex", required_argument, 0, 'r'},
-                                                                           {"ereg", required_argument, 0, 'r'},
-                                                                           {"eregi", required_argument, 0, 'R'},
-                                                                           {"linespan", no_argument, 0, 'l'},
-                                                                           {"onredirect", required_argument, 0, 'f'},
-                                                                           {"certificate", required_argument, 0, 'C'},
-                                                                           {"client-cert", required_argument, 0, 'J'},
-                                                                           {"private-key", required_argument, 0, 'K'},
-                                                                           {"ca-cert", required_argument, 0, CA_CERT_OPTION},
-                                                                           {"verify-cert", no_argument, 0, 'D'},
-                                                                           {"continue-after-certificate", no_argument, 0, CONTINUE_AFTER_CHECK_CERT},
-                                                                           {"useragent", required_argument, 0, 'A'},
-                                                                           {"header", required_argument, 0, 'k'},
-                                                                           {"no-body", no_argument, 0, 'N'},
-                                                                           {"max-age", required_argument, 0, 'M'},
-                                                                           {"content-type", required_argument, 0, 'T'},
-                                                                           {"pagesize", required_argument, 0, 'm'},
-                                                                           {"invert-regex", no_argument, NULL, INVERT_REGEX},
-                                                                           {"state-regex", required_argument, 0, STATE_REGEX},
-                                                                           {"use-ipv4", no_argument, 0, '4'},
-                                                                           {"use-ipv6", no_argument, 0, '6'},
-                                                                           {"extended-perfdata", no_argument, 0, 'E'},
-                                                                           {"show-body", no_argument, 0, 'B'},
-                                                                           {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION},
-                                                                           {"http-version", required_argument, 0, HTTP_VERSION_OPTION},
-                                                                           {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION},
-                                                                           {"cookie-jar", required_argument, 0, COOKIE_JAR},
-                                                                           {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL},
-                                                                           {0, 0, 0, 0}};
-
-        if (argc < 2)
-                return false;
+        static struct option longopts[] = {
+                STD_LONG_OPTS,
+                {"link", no_argument, 0, 'L'},
+                {"nohtml", no_argument, 0, 'n'},
+                {"ssl", optional_argument, 0, 'S'},
+                {"sni", no_argument, 0, SNI_OPTION},
+                {"post", required_argument, 0, 'P'},
+                {"method", required_argument, 0, 'j'},
+                {"IP-address", required_argument, 0, 'I'},
+                {"url", required_argument, 0, 'u'},
+                {"port", required_argument, 0, 'p'},
+                {"authorization", required_argument, 0, 'a'},
+                {"proxy-authorization", required_argument, 0, 'b'},
+                {"header-string", required_argument, 0, 'd'},
+                {"string", required_argument, 0, 's'},
+                {"expect", required_argument, 0, 'e'},
+                {"regex", required_argument, 0, 'r'},
+                {"ereg", required_argument, 0, 'r'},
+                {"eregi", required_argument, 0, 'R'},
+                {"linespan", no_argument, 0, 'l'},
+                {"onredirect", required_argument, 0, 'f'},
+                {"certificate", required_argument, 0, 'C'},
+                {"client-cert", required_argument, 0, 'J'},
+                {"private-key", required_argument, 0, 'K'},
+                {"ca-cert", required_argument, 0, CA_CERT_OPTION},
+                {"verify-cert", no_argument, 0, 'D'},
+                {"continue-after-certificate", no_argument, 0, CONTINUE_AFTER_CHECK_CERT},
+                {"useragent", required_argument, 0, 'A'},
+                {"header", required_argument, 0, 'k'},
+                {"no-body", no_argument, 0, 'N'},
+                {"max-age", required_argument, 0, 'M'},
+                {"content-type", required_argument, 0, 'T'},
+                {"pagesize", required_argument, 0, 'm'},
+                {"invert-regex", no_argument, NULL, INVERT_REGEX},
+                {"state-regex", required_argument, 0, STATE_REGEX},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"extended-perfdata", no_argument, 0, 'E'},
+                {"show-body", no_argument, 0, 'B'},
+                {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION},
+                {"http-version", required_argument, 0, HTTP_VERSION_OPTION},
+                {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION},
+                {"cookie-jar", required_argument, 0, COOKIE_JAR},
+                {"haproxy-protocol", no_argument, 0, HAPROXY_PROTOCOL},
+                {"output-format", required_argument, 0, OUTPUT_FORMAT},
+                {0, 0, 0, 0}};
+
+        check_curl_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_curl_config_init(),
+        };
 
-        /* support check_http compatible arguments */
-        for (c = 1; c < argc; c++) {
-                if (strcmp("-to", argv[c]) == 0)
-                        strcpy(argv[c], "-t");
-                if (strcmp("-hn", argv[c]) == 0)
-                        strcpy(argv[c], "-H");
-                if (strcmp("-wt", argv[c]) == 0)
-                        strcpy(argv[c], "-w");
-                if (strcmp("-ct", argv[c]) == 0)
-                        strcpy(argv[c], "-c");
-                if (strcmp("-nohtml", argv[c]) == 0)
-                        strcpy(argv[c], "-n");
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
         }
 
-        server_url = strdup(DEFAULT_SERVER_URL);
+        /* support check_http compatible arguments */
+        for (int index = 1; index < argc; index++) {
+                if (strcmp("-to", argv[index]) == 0) {
+                        strcpy(argv[index], "-t");
+                }
+                if (strcmp("-hn", argv[index]) == 0) {
+                        strcpy(argv[index], "-H");
+                }
+                if (strcmp("-wt", argv[index]) == 0) {
+                        strcpy(argv[index], "-w");
+                }
+                if (strcmp("-ct", argv[index]) == 0) {
+                        strcpy(argv[index], "-c");
+                }
+                if (strcmp("-nohtml", argv[index]) == 0) {
+                        strcpy(argv[index], "-n");
+                }
+        }
 
-        while (1) {
-                c = getopt_long(argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:DnlLS::m:M:NEB", longopts, &option);
-                if (c == -1 || c == EOF || c == 1)
+        int option = 0;
+        int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
+        bool specify_port = false;
+        bool enable_tls = false;
+        char *tls_option_optarg = NULL;
+
+        while (true) {
+                int option_index = getopt_long(
+                        argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:DnlLS::m:M:NEB",
+                        longopts, &option);
+                if (option_index == -1 || option_index == EOF || option_index == 1) {
                         break;
+                }
 
-                switch (c) {
+                switch (option_index) {
                 case 'h':
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -1421,270 +960,253 @@ bool process_arguments(int argc, char **argv) {
                         verbose++;
                         break;
                 case 't': /* timeout period */
-                        if (!is_intnonneg(optarg))
+                        if (!is_intnonneg(optarg)) {
                                 usage2(_("Timeout interval must be a positive integer"), optarg);
-                        else
-                                socket_timeout = (int)strtol(optarg, NULL, 10);
+                        } else {
+                                result.config.curl_config.socket_timeout = (int)strtol(optarg, NULL, 10);
+                        }
                         break;
                 case 'c': /* critical time threshold */
-                        critical_thresholds = optarg;
-                        break;
+                {
+                        mp_range_parsed critical_range = mp_parse_range_string(optarg);
+                        if (critical_range.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical threshold: %s", optarg);
+                        }
+                        result.config.thlds = mp_thresholds_set_crit(result.config.thlds, critical_range.range);
+                } break;
                 case 'w': /* warning time threshold */
-                        warning_thresholds = optarg;
-                        break;
+                {
+                        mp_range_parsed warning_range = mp_parse_range_string(optarg);
+
+                        if (warning_range.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning threshold: %s", optarg);
+                        }
+                        result.config.thlds = mp_thresholds_set_warn(result.config.thlds, warning_range.range);
+                } break;
                 case 'H': /* virtual host */
-                        host_name = strdup(optarg);
-                        if (host_name[0] == '[') {
-                                if ((p = strstr(host_name, "]:")) != NULL) { /* [IPv6]:port */
-                                        virtual_port = atoi(p + 2);
+                        result.config.initial_config.host_name = strdup(optarg);
+                        char *tmp_string;
+                        size_t host_name_length;
+                        if (result.config.initial_config.host_name[0] == '[') {
+                                if ((tmp_string = strstr(result.config.initial_config.host_name, "]:")) !=
+                                        NULL) { /* [IPv6]:port */
+                                        result.config.initial_config.virtualPort = atoi(tmp_string + 2);
                                         /* cut off the port */
-                                        host_name_length = strlen(host_name) - strlen(p) - 1;
-                                        free(host_name);
-                                        host_name = strndup(optarg, host_name_length);
+                                        host_name_length =
+                                                strlen(result.config.initial_config.host_name) - strlen(tmp_string) - 1;
+                                        free(result.config.initial_config.host_name);
+                                        result.config.initial_config.host_name = strndup(optarg, host_name_length);
                                 }
-                        } else if ((p = strchr(host_name, ':')) != NULL && strchr(++p, ':') == NULL) { /* IPv4:port or host:port */
-                                virtual_port = atoi(p);
+                        } else if ((tmp_string = strchr(result.config.initial_config.host_name, ':')) != NULL &&
+                                           strchr(++tmp_string, ':') == NULL) { /* IPv4:port or host:port */
+                                result.config.initial_config.virtualPort = atoi(tmp_string);
                                 /* cut off the port */
-                                host_name_length = strlen(host_name) - strlen(p) - 1;
-                                free(host_name);
-                                host_name = strndup(optarg, host_name_length);
+                                host_name_length =
+                                        strlen(result.config.initial_config.host_name) - strlen(tmp_string) - 1;
+                                free(result.config.initial_config.host_name);
+                                result.config.initial_config.host_name = strndup(optarg, host_name_length);
                         }
                         break;
                 case 'I': /* internet address */
-                        server_address = strdup(optarg);
+                        result.config.initial_config.server_address = strdup(optarg);
                         break;
                 case 'u': /* URL path */
-                        server_url = strdup(optarg);
+                        result.config.initial_config.server_url = strdup(optarg);
                         break;
                 case 'p': /* Server port */
-                        if (!is_intnonneg(optarg))
+                        if (!is_intnonneg(optarg)) {
                                 usage2(_("Invalid port number, expecting a non-negative number"), optarg);
-                        else {
-                                if (strtol(optarg, NULL, 10) > MAX_PORT)
+                        } else {
+                                if (strtol(optarg, NULL, 10) > MAX_PORT) {
                                         usage2(_("Invalid port number, supplied port number is too big"), optarg);
-                                server_port = (unsigned short)strtol(optarg, NULL, 10);
+                                }
+                                result.config.initial_config.serverPort = (unsigned short)strtol(optarg, NULL, 10);
                                 specify_port = true;
                         }
                         break;
                 case 'a': /* authorization info */
-                        strncpy(user_auth, optarg, MAX_INPUT_BUFFER - 1);
-                        user_auth[MAX_INPUT_BUFFER - 1] = 0;
+                        strncpy(result.config.curl_config.user_auth, optarg, MAX_INPUT_BUFFER - 1);
+                        result.config.curl_config.user_auth[MAX_INPUT_BUFFER - 1] = 0;
                         break;
                 case 'b': /* proxy-authorization info */
-                        strncpy(proxy_auth, optarg, MAX_INPUT_BUFFER - 1);
-                        proxy_auth[MAX_INPUT_BUFFER - 1] = 0;
+                        strncpy(result.config.curl_config.proxy_auth, optarg, MAX_INPUT_BUFFER - 1);
+                        result.config.curl_config.proxy_auth[MAX_INPUT_BUFFER - 1] = 0;
                         break;
                 case 'P': /* HTTP POST data in URL encoded format; ignored if settings already */
-                        if (!http_post_data)
-                                http_post_data = strdup(optarg);
-                        if (!http_method)
-                                http_method = strdup("POST");
+                        if (!result.config.initial_config.http_post_data) {
+                                result.config.initial_config.http_post_data = strdup(optarg);
+                        }
+                        if (!result.config.initial_config.http_method) {
+                                result.config.initial_config.http_method = strdup("POST");
+                        }
                         break;
                 case 'j': /* Set HTTP method */
-                        if (http_method)
-                                free(http_method);
-                        http_method = strdup(optarg);
+                        if (result.config.initial_config.http_method) {
+                                free(result.config.initial_config.http_method);
+                        }
+                        result.config.initial_config.http_method = strdup(optarg);
                         break;
                 case 'A': /* useragent */
-                        strncpy(user_agent, optarg, DEFAULT_BUFFER_SIZE);
-                        user_agent[DEFAULT_BUFFER_SIZE - 1] = '\0';
+                        strncpy(result.config.curl_config.user_agent, optarg, DEFAULT_BUFFER_SIZE);
+                        result.config.curl_config.user_agent[DEFAULT_BUFFER_SIZE - 1] = '\0';
                         break;
                 case 'k': /* Additional headers */
-                        if (http_opt_headers_count == 0)
-                                http_opt_headers = malloc(sizeof(char *) * (++http_opt_headers_count));
-                        else
-                                http_opt_headers = realloc(http_opt_headers, sizeof(char *) * (++http_opt_headers_count));
-                        http_opt_headers[http_opt_headers_count - 1] = optarg;
+                        if (result.config.curl_config.http_opt_headers_count == 0) {
+                                result.config.curl_config.http_opt_headers =
+                                        malloc(sizeof(char *) * (++result.config.curl_config.http_opt_headers_count));
+                        } else {
+                                result.config.curl_config.http_opt_headers =
+                                        realloc(result.config.curl_config.http_opt_headers,
+                                                        sizeof(char *) * (++result.config.curl_config.http_opt_headers_count));
+                        }
+                        result.config.curl_config
+                                .http_opt_headers[result.config.curl_config.http_opt_headers_count - 1] = optarg;
                         break;
                 case 'L': /* show html link */
-                        display_html = true;
-                        break;
                 case 'n': /* do not show html link */
-                        display_html = false;
+                        // HTML link related options are deprecated
                         break;
                 case 'C': /* Check SSL cert validity */
-#ifdef LIBCURL_FEATURE_SSL
-                        if ((temp = strchr(optarg, ',')) != NULL) {
-                                *temp = '\0';
-                                if (!is_intnonneg(optarg))
-                                        usage2(_("Invalid certificate expiration period"), optarg);
-                                days_till_exp_warn = atoi(optarg);
-                                *temp = ',';
-                                temp++;
-                                if (!is_intnonneg(temp))
-                                        usage2(_("Invalid certificate expiration period"), temp);
-                                days_till_exp_crit = atoi(temp);
-                        } else {
-                                days_till_exp_crit = 0;
-                                if (!is_intnonneg(optarg))
-                                        usage2(_("Invalid certificate expiration period"), optarg);
-                                days_till_exp_warn = atoi(optarg);
-                        }
-                        check_cert = true;
-                        goto enable_ssl;
+#ifndef LIBCURL_FEATURE_SSL
+                        usage4(_("Invalid option - SSL is not available"));
 #endif
+                        {
+                                char *temp;
+                                if ((temp = strchr(optarg, ',')) != NULL) {
+                                        *temp = '\0';
+                                        if (!is_intnonneg(optarg)) {
+                                                usage2(_("Invalid certificate expiration period"), optarg);
+                                        }
+                                        result.config.days_till_exp_warn = atoi(optarg);
+                                        *temp = ',';
+                                        temp++;
+                                        if (!is_intnonneg(temp)) {
+                                                usage2(_("Invalid certificate expiration period"), temp);
+                                        }
+                                        result.config.days_till_exp_crit = atoi(temp);
+                                } else {
+                                        result.config.days_till_exp_crit = 0;
+                                        if (!is_intnonneg(optarg)) {
+                                                usage2(_("Invalid certificate expiration period"), optarg);
+                                        }
+                                        result.config.days_till_exp_warn = atoi(optarg);
+                                }
+                                result.config.check_cert = true;
+                                enable_tls = true;
+                        }
+                        break;
                 case CONTINUE_AFTER_CHECK_CERT: /* don't stop after the certificate is checked */
 #ifdef HAVE_SSL
-                        continue_after_check_cert = true;
+                        result.config.continue_after_check_cert = true;
                         break;
 #endif
                 case 'J': /* use client certificate */
-#ifdef LIBCURL_FEATURE_SSL
-                        test_file(optarg);
-                        client_cert = optarg;
-                        goto enable_ssl;
+#ifndef LIBCURL_FEATURE_SSL
+                        usage4(_("Invalid option - SSL is not available"));
 #endif
-                case 'K': /* use client private key */
-#ifdef LIBCURL_FEATURE_SSL
                         test_file(optarg);
-                        client_privkey = optarg;
-                        goto enable_ssl;
+                        result.config.curl_config.client_cert = optarg;
+                        enable_tls = true;
+                        break;
+                case 'K': /* use client private key */
+#ifndef LIBCURL_FEATURE_SSL
+                        usage4(_("Invalid option - SSL is not available"));
 #endif
-#ifdef LIBCURL_FEATURE_SSL
-                case CA_CERT_OPTION: /* use CA chain file */
                         test_file(optarg);
-                        ca_cert = optarg;
-                        goto enable_ssl;
+                        result.config.curl_config.client_privkey = optarg;
+                        enable_tls = true;
+                        break;
+                case CA_CERT_OPTION: /* use CA chain file */
+#ifndef LIBCURL_FEATURE_SSL
+                        usage4(_("Invalid option - SSL is not available"));
 #endif
-#ifdef LIBCURL_FEATURE_SSL
-                case 'D': /* verify peer certificate & host */
-                        verify_peer_and_host = true;
+                        test_file(optarg);
+                        result.config.curl_config.ca_cert = optarg;
+                        enable_tls = true;
                         break;
+                case 'D': /* verify peer certificate & host */
+#ifndef LIBCURL_FEATURE_SSL
+                        usage4(_("Invalid option - SSL is not available"));
 #endif
-                case 'S': /* use SSL */
-#ifdef LIBCURL_FEATURE_SSL
-                enable_ssl:
-                        use_ssl = true;
-                        /* ssl_version initialized to CURL_SSLVERSION_DEFAULT as a default.
-                         * Only set if it's non-zero.  This helps when we include multiple
-                         * parameters, like -S and -C combinations */
-                        ssl_version = CURL_SSLVERSION_DEFAULT;
-                        if (c == 'S' && optarg != NULL) {
-                                char *plus_ptr = strchr(optarg, '+');
-                                if (plus_ptr) {
-                                        got_plus = 1;
-                                        *plus_ptr = '\0';
-                                }
-
-                                if (optarg[0] == '2')
-                                        ssl_version = CURL_SSLVERSION_SSLv2;
-                                else if (optarg[0] == '3')
-                                        ssl_version = CURL_SSLVERSION_SSLv3;
-                                else if (!strcmp(optarg, "1") || !strcmp(optarg, "1.0"))
-#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
-                                        ssl_version = CURL_SSLVERSION_TLSv1_0;
-#       else
-                                        ssl_version = CURL_SSLVERSION_DEFAULT;
-#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-                                else if (!strcmp(optarg, "1.1"))
-#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
-                                        ssl_version = CURL_SSLVERSION_TLSv1_1;
-#       else
-                                        ssl_version = CURL_SSLVERSION_DEFAULT;
-#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-                                else if (!strcmp(optarg, "1.2"))
-#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
-                                        ssl_version = CURL_SSLVERSION_TLSv1_2;
-#       else
-                                        ssl_version = CURL_SSLVERSION_DEFAULT;
-#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
-                                else if (!strcmp(optarg, "1.3"))
-#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 52, 0)
-                                        ssl_version = CURL_SSLVERSION_TLSv1_3;
-#       else
-                                        ssl_version = CURL_SSLVERSION_DEFAULT;
-#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 52, 0) */
-                                else
-                                        usage4(_("Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2, 1.3 (with optional '+' suffix)"));
-                        }
-#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0)
-                        if (got_plus) {
-                                switch (ssl_version) {
-                                case CURL_SSLVERSION_TLSv1_3:
-                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_3;
-                                        break;
-                                case CURL_SSLVERSION_TLSv1_2:
-                                case CURL_SSLVERSION_TLSv1_1:
-                                case CURL_SSLVERSION_TLSv1_0:
-                                        ssl_version |= CURL_SSLVERSION_MAX_DEFAULT;
-                                        break;
-                                }
-                        } else {
-                                switch (ssl_version) {
-                                case CURL_SSLVERSION_TLSv1_3:
-                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_3;
-                                        break;
-                                case CURL_SSLVERSION_TLSv1_2:
-                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_2;
-                                        break;
-                                case CURL_SSLVERSION_TLSv1_1:
-                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_1;
-                                        break;
-                                case CURL_SSLVERSION_TLSv1_0:
-                                        ssl_version |= CURL_SSLVERSION_MAX_TLSv1_0;
-                                        break;
-                                }
-                        }
-#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0) */
-                        if (verbose >= 2)
-                                printf(_("* Set SSL/TLS version to %d\n"), ssl_version);
-                        if (!specify_port)
-                                server_port = HTTPS_PORT;
+                        result.config.curl_config.verify_peer_and_host = true;
+                        enable_tls = true;
                         break;
-#else  /* LIBCURL_FEATURE_SSL */
-                        /* -C -J and -K fall through to here without SSL */
+                case 'S': /* use SSL */
+                        tls_option_optarg = optarg;
+                        enable_tls = true;
+#ifndef LIBCURL_FEATURE_SSL
                         usage4(_("Invalid option - SSL is not available"));
+#endif
                         break;
                 case SNI_OPTION: /* --sni is parsed, but ignored, the default is true with libcurl */
-                        use_sni = true;
-                        break;
+#ifndef LIBCURL_FEATURE_SSL
+                        usage4(_("Invalid option - SSL is not available"));
 #endif /* LIBCURL_FEATURE_SSL */
+                        break;
                 case MAX_REDIRS_OPTION:
-                        if (!is_intnonneg(optarg))
+                        if (!is_intnonneg(optarg)) {
                                 usage2(_("Invalid max_redirs count"), optarg);
-                        else {
-                                max_depth = atoi(optarg);
+                        } else {
+                                result.config.max_depth = atoi(optarg);
                         }
                         break;
                 case 'f': /* onredirect */
-                        if (!strcmp(optarg, "ok"))
-                                onredirect = STATE_OK;
-                        else if (!strcmp(optarg, "warning"))
-                                onredirect = STATE_WARNING;
-                        else if (!strcmp(optarg, "critical"))
-                                onredirect = STATE_CRITICAL;
-                        else if (!strcmp(optarg, "unknown"))
-                                onredirect = STATE_UNKNOWN;
-                        else if (!strcmp(optarg, "follow"))
-                                onredirect = STATE_DEPENDENT;
-                        else if (!strcmp(optarg, "stickyport"))
-                                onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_HOST | STICKY_PORT;
-                        else if (!strcmp(optarg, "sticky"))
-                                onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_HOST;
-                        else if (!strcmp(optarg, "follow"))
-                                onredirect = STATE_DEPENDENT, followmethod = FOLLOW_HTTP_CURL, followsticky = STICKY_NONE;
-                        else if (!strcmp(optarg, "curl"))
-                                onredirect = STATE_DEPENDENT, followmethod = FOLLOW_LIBCURL;
-                        else
+                        if (!strcmp(optarg, "ok")) {
+                                result.config.on_redirect_result_state = STATE_OK;
+                                result.config.on_redirect_dependent = false;
+                        } else if (!strcmp(optarg, "warning")) {
+                                result.config.on_redirect_result_state = STATE_WARNING;
+                                result.config.on_redirect_dependent = false;
+                        } else if (!strcmp(optarg, "critical")) {
+                                result.config.on_redirect_result_state = STATE_CRITICAL;
+                                result.config.on_redirect_dependent = false;
+                        } else if (!strcmp(optarg, "unknown")) {
+                                result.config.on_redirect_result_state = STATE_UNKNOWN;
+                                result.config.on_redirect_dependent = false;
+                        } else if (!strcmp(optarg, "follow")) {
+                                result.config.on_redirect_dependent = true;
+                        } else if (!strcmp(optarg, "stickyport")) {
+                                result.config.on_redirect_dependent = true;
+                                result.config.followmethod = FOLLOW_HTTP_CURL,
+                                result.config.followsticky = STICKY_HOST | STICKY_PORT;
+                        } else if (!strcmp(optarg, "sticky")) {
+                                result.config.on_redirect_dependent = true;
+                                result.config.followmethod = FOLLOW_HTTP_CURL,
+                                result.config.followsticky = STICKY_HOST;
+                        } else if (!strcmp(optarg, "follow")) {
+                                result.config.on_redirect_dependent = true;
+                                result.config.followmethod = FOLLOW_HTTP_CURL,
+                                result.config.followsticky = STICKY_NONE;
+                        } else if (!strcmp(optarg, "curl")) {
+                                result.config.on_redirect_dependent = true;
+                                result.config.followmethod = FOLLOW_LIBCURL;
+                        } else {
                                 usage2(_("Invalid onredirect option"), optarg);
-                        if (verbose >= 2)
-                                printf(_("* Following redirects set to %s\n"), state_text(onredirect));
+                        }
+                        if (verbose >= 2) {
+                                if (result.config.on_redirect_dependent) {
+                                        printf(_("* Following redirects\n"));
+                                } else {
+                                        printf(_("* Following redirects set to state %s\n"),
+                                                   state_text(result.config.on_redirect_result_state));
+                                }
+                        }
                         break;
                 case 'd': /* string or substring */
-                        strncpy(header_expect, optarg, MAX_INPUT_BUFFER - 1);
-                        header_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        strncpy(result.config.header_expect, optarg, MAX_INPUT_BUFFER - 1);
+                        result.config.header_expect[MAX_INPUT_BUFFER - 1] = 0;
                         break;
                 case 's': /* string or substring */
-                        strncpy(string_expect, optarg, MAX_INPUT_BUFFER - 1);
-                        string_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        strncpy(result.config.string_expect, optarg, MAX_INPUT_BUFFER - 1);
+                        result.config.string_expect[MAX_INPUT_BUFFER - 1] = 0;
                         break;
                 case 'e': /* string or substring */
-                        strncpy(server_expect, optarg, MAX_INPUT_BUFFER - 1);
-                        server_expect[MAX_INPUT_BUFFER - 1] = 0;
-                        server_expect_yn = 1;
+                        strncpy(result.config.server_expect.string, optarg, MAX_INPUT_BUFFER - 1);
+                        result.config.server_expect.string[MAX_INPUT_BUFFER - 1] = 0;
+                        result.config.server_expect.is_present = true;
                         break;
                 case 'T': /* Content-type */
-                        http_content_type = strdup(optarg);
+                        result.config.curl_config.http_content_type = strdup(optarg);
                         break;
                 case 'l': /* linespan */
                         cflags &= ~REG_NEWLINE;
@@ -1693,185 +1215,258 @@ bool process_arguments(int argc, char **argv) {
                         cflags |= REG_ICASE;
                         // fall through
                 case 'r': /* regex */
-                        strncpy(regexp, optarg, MAX_RE_SIZE - 1);
-                        regexp[MAX_RE_SIZE - 1] = 0;
-                        errcode = regcomp(&preg, regexp, cflags);
+                        strncpy(result.config.regexp, optarg, MAX_RE_SIZE - 1);
+                        result.config.regexp[MAX_RE_SIZE - 1] = 0;
+                        regex_t preg;
+                        int errcode = regcomp(&preg, result.config.regexp, cflags);
                         if (errcode != 0) {
                                 (void)regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
                                 printf(_("Could Not Compile Regular Expression: %s"), errbuf);
-                                return false;
+                                result.errorcode = ERROR;
+                                return result;
                         }
+
+                        result.config.compiled_regex = preg;
                         break;
                 case INVERT_REGEX:
-                        invert_regex = true;
+                        result.config.invert_regex = true;
                         break;
                 case STATE_REGEX:
-                        if (!strcasecmp(optarg, "critical"))
-                                state_regex = STATE_CRITICAL;
-                        else if (!strcasecmp(optarg, "warning"))
-                                state_regex = STATE_WARNING;
-                        else
+                        if (!strcasecmp(optarg, "critical")) {
+                                result.config.state_regex = STATE_CRITICAL;
+                        } else if (!strcasecmp(optarg, "warning")) {
+                                result.config.state_regex = STATE_WARNING;
+                        } else {
                                 usage2(_("Invalid state-regex option"), optarg);
+                        }
                         break;
                 case '4':
-                        address_family = AF_INET;
+                        result.config.curl_config.sin_family = AF_INET;
                         break;
                 case '6':
 #if defined(USE_IPV6) && defined(LIBCURL_FEATURE_IPV6)
-                        address_family = AF_INET6;
+                        result.config.curl_config.sin_family = AF_INET6;
 #else
                         usage4(_("IPv6 support not available"));
 #endif
                         break;
                 case 'm': /* min_page_length */
                 {
-                        char *tmp;
-                        if (strchr(optarg, ':') != (char *)NULL) {
-                                /* range, so get two values, min:max */
-                                tmp = strtok(optarg, ":");
-                                if (tmp == NULL) {
-                                        printf("Bad format: try \"-m min:max\"\n");
-                                        exit(STATE_WARNING);
-                                } else
-                                        min_page_len = atoi(tmp);
-
-                                tmp = strtok(NULL, ":");
-                                if (tmp == NULL) {
-                                        printf("Bad format: try \"-m min:max\"\n");
-                                        exit(STATE_WARNING);
-                                } else
-                                        max_page_len = atoi(tmp);
-                        } else
-                                min_page_len = atoi(optarg);
+                        mp_range_parsed foo = mp_parse_range_string(optarg);
+
+                        if (foo.error != MP_PARSING_SUCCES) {
+                                die(STATE_CRITICAL, "failed to parse page size limits: %s", optarg);
+                        }
+
+                        result.config.page_length_limits = foo.range;
+                        result.config.page_length_limits_is_set = true;
                         break;
                 }
                 case 'N': /* no-body */
-                        no_body = true;
+                        result.config.initial_config.no_body = true;
                         break;
                 case 'M': /* max-age */
                 {
-                        int L = strlen(optarg);
-                        if (L && optarg[L - 1] == 'm')
-                                maximum_age = atoi(optarg) * 60;
-                        else if (L && optarg[L - 1] == 'h')
-                                maximum_age = atoi(optarg) * 60 * 60;
-                        else if (L && optarg[L - 1] == 'd')
-                                maximum_age = atoi(optarg) * 60 * 60 * 24;
-                        else if (L && (optarg[L - 1] == 's' || isdigit(optarg[L - 1])))
-                                maximum_age = atoi(optarg);
-                        else {
+                        size_t option_length = strlen(optarg);
+                        if (option_length && optarg[option_length - 1] == 'm') {
+                                result.config.maximum_age = atoi(optarg) * 60;
+                        } else if (option_length && optarg[option_length - 1] == 'h') {
+                                result.config.maximum_age = atoi(optarg) * 60 * 60;
+                        } else if (option_length && optarg[option_length - 1] == 'd') {
+                                result.config.maximum_age = atoi(optarg) * 60 * 60 * 24;
+                        } else if (option_length &&
+                                           (optarg[option_length - 1] == 's' || isdigit(optarg[option_length - 1]))) {
+                                result.config.maximum_age = atoi(optarg);
+                        } else {
                                 fprintf(stderr, "unparsable max-age: %s\n", optarg);
                                 exit(STATE_WARNING);
                         }
-                        if (verbose >= 2)
-                                printf("* Maximal age of document set to %d seconds\n", maximum_age);
+                        if (verbose >= 2) {
+                                printf("* Maximal age of document set to %d seconds\n", result.config.maximum_age);
+                        }
                 } break;
                 case 'E': /* show extended perfdata */
-                        show_extended_perfdata = true;
+                        result.config.show_extended_perfdata = true;
                         break;
                 case 'B': /* print body content after status line */
-                        show_body = true;
+                        result.config.show_body = true;
                         break;
                 case HTTP_VERSION_OPTION:
-                        curl_http_version = CURL_HTTP_VERSION_NONE;
+                        result.config.curl_config.curl_http_version = CURL_HTTP_VERSION_NONE;
                         if (strcmp(optarg, "1.0") == 0) {
-                                curl_http_version = CURL_HTTP_VERSION_1_0;
+                                result.config.curl_config.curl_http_version = CURL_HTTP_VERSION_1_0;
                         } else if (strcmp(optarg, "1.1") == 0) {
-                                curl_http_version = CURL_HTTP_VERSION_1_1;
+                                result.config.curl_config.curl_http_version = CURL_HTTP_VERSION_1_1;
                         } else if ((strcmp(optarg, "2.0") == 0) || (strcmp(optarg, "2") == 0)) {
 #if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 33, 0)
-                                curl_http_version = CURL_HTTP_VERSION_2_0;
+                                result.config.curl_config.curl_http_version = CURL_HTTP_VERSION_2_0;
 #else
-                                curl_http_version = CURL_HTTP_VERSION_NONE;
+                                result.config.curl_http_version = CURL_HTTP_VERSION_NONE;
 #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 33, 0) */
+                        } else if ((strcmp(optarg, "3") == 0)) {
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 66, 0)
+                                result.config.curl_config.curl_http_version = CURL_HTTP_VERSION_3;
+#else
+                                result.config.curl_config.curl_http_version = CURL_HTTP_VERSION_NONE;
+#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 66, 0) */
                         } else {
                                 fprintf(stderr, "unknown http-version parameter: %s\n", optarg);
                                 exit(STATE_WARNING);
                         }
                         break;
                 case AUTOMATIC_DECOMPRESSION:
-                        automatic_decompression = true;
+                        result.config.curl_config.automatic_decompression = true;
                         break;
                 case COOKIE_JAR:
-                        cookie_jar_file = optarg;
+                        result.config.curl_config.cookie_jar_file = optarg;
                         break;
                 case HAPROXY_PROTOCOL:
-                        haproxy_protocol = true;
+                        result.config.curl_config.haproxy_protocol = true;
                         break;
                 case '?':
                         /* print short usage statement if args not parsable */
                         usage5();
                         break;
+                case OUTPUT_FORMAT: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 }
         }
 
-        c = optind;
+        if (enable_tls) {
+                bool got_plus = false;
+                result.config.initial_config.use_ssl = true;
+                /* ssl_version initialized to CURL_SSLVERSION_DEFAULT as a default.
+                 * Only set if it's non-zero.  This helps when we include multiple
+                 * parameters, like -S and -C combinations */
+                result.config.curl_config.ssl_version = CURL_SSLVERSION_DEFAULT;
+                if (tls_option_optarg != NULL) {
+                        char *plus_ptr = strchr(optarg, '+');
+                        if (plus_ptr) {
+                                got_plus = true;
+                                *plus_ptr = '\0';
+                        }
 
-        if (server_address == NULL && c < argc)
-                server_address = strdup(argv[c++]);
+                        if (optarg[0] == '2') {
+                                result.config.curl_config.ssl_version = CURL_SSLVERSION_SSLv2;
+                        } else if (optarg[0] == '3') {
+                                result.config.curl_config.ssl_version = CURL_SSLVERSION_SSLv3;
+                        } else if (!strcmp(optarg, "1") || !strcmp(optarg, "1.0")) {
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
+                                result.config.curl_config.ssl_version = CURL_SSLVERSION_TLSv1_0;
+#else
+                                result.config.ssl_version = CURL_SSLVERSION_DEFAULT;
+#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                        } else if (!strcmp(optarg, "1.1")) {
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
+                                result.config.curl_config.ssl_version = CURL_SSLVERSION_TLSv1_1;
+#else
+                                result.config.ssl_version = CURL_SSLVERSION_DEFAULT;
+#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                        } else if (!strcmp(optarg, "1.2")) {
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
+                                result.config.curl_config.ssl_version = CURL_SSLVERSION_TLSv1_2;
+#else
+                                result.config.ssl_version = CURL_SSLVERSION_DEFAULT;
+#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                        } else if (!strcmp(optarg, "1.3")) {
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 52, 0)
+                                result.config.curl_config.ssl_version = CURL_SSLVERSION_TLSv1_3;
+#else
+                                result.config.ssl_version = CURL_SSLVERSION_DEFAULT;
+#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 52, 0) */
+                        } else {
+                                usage4(_("Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2, 1.3 "
+                                                 "(with optional '+' suffix)"));
+                        }
+                }
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0)
+                if (got_plus) {
+                        switch (result.config.curl_config.ssl_version) {
+                        case CURL_SSLVERSION_TLSv1_3:
+                                result.config.curl_config.ssl_version |= CURL_SSLVERSION_MAX_TLSv1_3;
+                                break;
+                        case CURL_SSLVERSION_TLSv1_2:
+                        case CURL_SSLVERSION_TLSv1_1:
+                        case CURL_SSLVERSION_TLSv1_0:
+                                result.config.curl_config.ssl_version |= CURL_SSLVERSION_MAX_DEFAULT;
+                                break;
+                        }
+                } else {
+                        switch (result.config.curl_config.ssl_version) {
+                        case CURL_SSLVERSION_TLSv1_3:
+                                result.config.curl_config.ssl_version |= CURL_SSLVERSION_MAX_TLSv1_3;
+                                break;
+                        case CURL_SSLVERSION_TLSv1_2:
+                                result.config.curl_config.ssl_version |= CURL_SSLVERSION_MAX_TLSv1_2;
+                                break;
+                        case CURL_SSLVERSION_TLSv1_1:
+                                result.config.curl_config.ssl_version |= CURL_SSLVERSION_MAX_TLSv1_1;
+                                break;
+                        case CURL_SSLVERSION_TLSv1_0:
+                                result.config.curl_config.ssl_version |= CURL_SSLVERSION_MAX_TLSv1_0;
+                                break;
+                        }
+                }
+#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0) */
+                if (verbose >= 2) {
+                        printf(_("* Set SSL/TLS version to %ld\n"), result.config.curl_config.ssl_version);
+                }
+                if (!specify_port) {
+                        result.config.initial_config.serverPort = HTTPS_PORT;
+                }
+        }
 
-        if (host_name == NULL && c < argc)
-                host_name = strdup(argv[c++]);
+        int option_counter = optind;
 
-        if (server_address == NULL) {
-                if (host_name == NULL)
-                        usage4(_("You must specify a server address or host name"));
-                else
-                        server_address = strdup(host_name);
+        if (result.config.initial_config.server_address == NULL && option_counter < argc) {
+                result.config.initial_config.server_address = strdup(argv[option_counter++]);
         }
 
-        set_thresholds(&thlds, warning_thresholds, critical_thresholds);
+        if (result.config.initial_config.host_name == NULL && option_counter < argc) {
+                result.config.initial_config.host_name = strdup(argv[option_counter++]);
+        }
 
-        if (critical_thresholds && thlds->critical->end > (double)socket_timeout)
-                socket_timeout = (int)thlds->critical->end + 1;
-        if (verbose >= 2)
-                printf("* Socket timeout set to %ld seconds\n", socket_timeout);
+        if (result.config.initial_config.server_address == NULL) {
+                if (result.config.initial_config.host_name == NULL) {
+                        usage4(_("You must specify a server address or host name"));
+                } else {
+                        result.config.initial_config.server_address =
+                                strdup(result.config.initial_config.host_name);
+                }
+        }
 
-        if (http_method == NULL)
-                http_method = strdup("GET");
+        if (result.config.initial_config.http_method == NULL) {
+                result.config.initial_config.http_method = strdup("GET");
+        }
 
-        if (client_cert && !client_privkey)
+        if (result.config.curl_config.client_cert && !result.config.curl_config.client_privkey) {
                 usage4(_("If you use a client certificate you must also specify a private key file"));
-
-        if (virtual_port == 0)
-                virtual_port = server_port;
-        else {
-                if ((use_ssl && server_port == HTTPS_PORT) || (!use_ssl && server_port == HTTP_PORT))
-                        if (!specify_port)
-                                server_port = virtual_port;
         }
 
-        return true;
-}
-
-char *perfd_time(double elapsed_time) {
-        return fperfdata("time", elapsed_time, "s", thlds->warning ? true : false, thlds->warning ? thlds->warning->end : 0,
-                                         thlds->critical ? true : false, thlds->critical ? thlds->critical->end : 0, true, 0, true, socket_timeout);
-}
-
-char *perfd_time_connect(double elapsed_time_connect) {
-        return fperfdata("time_connect", elapsed_time_connect, "s", false, 0, false, 0, false, 0, true, socket_timeout);
-}
-
-char *perfd_time_ssl(double elapsed_time_ssl) {
-        return fperfdata("time_ssl", elapsed_time_ssl, "s", false, 0, false, 0, false, 0, true, socket_timeout);
-}
-
-char *perfd_time_headers(double elapsed_time_headers) {
-        return fperfdata("time_headers", elapsed_time_headers, "s", false, 0, false, 0, false, 0, true, socket_timeout);
-}
-
-char *perfd_time_firstbyte(double elapsed_time_firstbyte) {
-        return fperfdata("time_firstbyte", elapsed_time_firstbyte, "s", false, 0, false, 0, false, 0, true, socket_timeout);
-}
-
-char *perfd_time_transfer(double elapsed_time_transfer) {
-        return fperfdata("time_transfer", elapsed_time_transfer, "s", false, 0, false, 0, false, 0, true, socket_timeout);
-}
+        if (result.config.initial_config.virtualPort == 0) {
+                result.config.initial_config.virtualPort = result.config.initial_config.serverPort;
+        } else {
+                if ((result.config.initial_config.use_ssl &&
+                         result.config.initial_config.serverPort == HTTPS_PORT) ||
+                        (!result.config.initial_config.use_ssl &&
+                         result.config.initial_config.serverPort == HTTP_PORT)) {
+                        if (!specify_port) {
+                                result.config.initial_config.serverPort = result.config.initial_config.virtualPort;
+                        }
+                }
+        }
 
-char *perfd_size(int page_len) {
-        return perfdata("size", page_len, "B", (min_page_len > 0 ? true : false), min_page_len, (min_page_len > 0 ? true : false), 0, true, 0,
-                                        false, 0);
+        return result;
 }
 
 void print_help(void) {
@@ -1885,7 +1480,8 @@ void print_help(void) {
         printf("%s\n", _("strings and regular expressions, check connection times, and report on"));
         printf("%s\n", _("certificate expiration times."));
         printf("\n");
-        printf("%s\n", _("It makes use of libcurl to do so. It tries to be as compatible to check_http"));
+        printf("%s\n",
+                   _("It makes use of libcurl to do so. It tries to be as compatible to check_http"));
         printf("%s\n", _("as possible."));
 
         printf("\n\n");
@@ -1903,7 +1499,10 @@ void print_help(void) {
         printf("    %s\n", _("Host name argument for servers using host headers (virtual host)"));
         printf("    %s\n", _("Append a port to include it in the header (eg: example.com:5000)"));
         printf(" %s\n", "-I, --IP-address=ADDRESS");
-        printf("    %s\n", _("IP address or name (use numeric address if possible to bypass DNS lookup)."));
+        printf("    %s\n",
+                   "IP address or name (use numeric address if possible to bypass DNS lookup).");
+        printf("    %s\n",
+                     "This overwrites the network address of the target while leaving everything else (HTTP headers) as they are");
         printf(" %s\n", "-p, --port=INTEGER");
         printf("    %s", _("Port number (default: "));
         printf("%d)\n", HTTP_PORT);
@@ -1912,27 +1511,36 @@ void print_help(void) {
 
 #ifdef LIBCURL_FEATURE_SSL
         printf(" %s\n", "-S, --ssl=VERSION[+]");
-        printf("    %s\n", _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
+        printf("    %s\n",
+                   _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
         printf("    %s\n", _("auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,"));
-        printf("    %s\n", _("1.2 = TLSv1.2, 1.3 = TLSv1.3). With a '+' suffix, newer versions are also accepted."));
-        printf("    %s\n", _("Note: SSLv2, SSLv3, TLSv1.0 and TLSv1.1 are deprecated and are usually disabled in libcurl"));
+        printf("    %s\n", _("1.2 = TLSv1.2, 1.3 = TLSv1.3). With a '+' suffix, newer versions are "
+                                                 "also accepted."));
+        printf("    %s\n", _("Note: SSLv2, SSLv3, TLSv1.0 and TLSv1.1 are deprecated and are usually "
+                                                 "disabled in libcurl"));
         printf(" %s\n", "--sni");
         printf("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
 #       if LIBCURL_VERSION_NUM >= 0x071801
-        printf("    %s\n", _("Note: --sni is the default in libcurl as SSLv2 and SSLV3 are deprecated and"));
+        printf("    %s\n",
+                   _("Note: --sni is the default in libcurl as SSLv2 and SSLV3 are deprecated and"));
         printf("    %s\n", _("      SNI only really works since TLSv1.0"));
 #       else
         printf("    %s\n", _("Note: SNI is not supported in libcurl before 7.18.1"));
 #       endif
         printf(" %s\n", "-C, --certificate=INTEGER[,INTEGER]");
-        printf("    %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443."));
-        printf("    %s\n", _("A STATE_WARNING is returned if the certificate has a validity less than the"));
-        printf("    %s\n", _("first agument's value. If there is a second argument and the certificate's"));
+        printf("    %s\n",
+                   _("Minimum number of days a certificate has to be valid. Port defaults to 443."));
+        printf("    %s\n",
+                   _("A STATE_WARNING is returned if the certificate has a validity less than the"));
+        printf("    %s\n",
+                   _("first agument's value. If there is a second argument and the certificate's"));
         printf("    %s\n", _("validity is less than its value, a STATE_CRITICAL is returned."));
-        printf("    %s\n", _("(When this option is used the URL is not checked by default. You can use"));
+        printf("    %s\n",
+                   _("(When this option is used the URL is not checked by default. You can use"));
         printf("    %s\n", _(" --continue-after-certificate to override this behavior)"));
         printf(" %s\n", "--continue-after-certificate");
-        printf("    %s\n", _("Allows the HTTP check to continue after performing the certificate check."));
+        printf("    %s\n",
+                   _("Allows the HTTP check to continue after performing the certificate check."));
         printf("    %s\n", _("Does nothing unless -C is used."));
         printf(" %s\n", "-J, --client-cert=FILE");
         printf("   %s\n", _("Name of file that contains the client certificate (PEM format)"));
@@ -1950,16 +1558,19 @@ void print_help(void) {
         printf("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
         printf("    %s", _("the first (status) line of the server response (default: "));
         printf("%s)\n", HTTP_EXPECT);
-        printf("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
+        printf("    %s\n",
+                   _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
         printf(" %s\n", "-d, --header-string=STRING");
         printf("    %s\n", _("String to expect in the response headers"));
         printf(" %s\n", "-s, --string=STRING");
         printf("    %s\n", _("String to expect in the content"));
         printf(" %s\n", "-u, --url=PATH");
         printf("    %s\n", _("URL to GET or POST (default: /)"));
+        printf("    %s\n", _("This is the part after the address in a URL, so for \"https://example.com/index.html\" it would be '-u /index.html'"));
         printf(" %s\n", "-P, --post=STRING");
         printf("    %s\n", _("URL decoded http POST data"));
-        printf(" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT)");
+        printf(" %s\n",
+                   "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT)");
         printf("    %s\n", _("Set HTTP method."));
         printf(" %s\n", "-N, --no-body");
         printf("    %s\n", _("Don't wait for document body: stop reading after headers."));
@@ -1968,7 +1579,7 @@ void print_help(void) {
         printf("    %s\n", _("Warn if document is more than SECONDS old. the number can also be of"));
         printf("    %s\n", _("the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."));
         printf(" %s\n", "-T, --content-type=STRING");
-        printf("    %s\n", _("specify Content-Type header media type when POSTing\n"));
+        printf("    %s\n", _("specify Content-Type header media type when POSTing"));
         printf(" %s\n", "-l, --linespan");
         printf("    %s\n", _("Allow regex to span newlines (must precede -r or -R)"));
         printf(" %s\n", "-r, --regex, --ereg=STRING");
@@ -1979,7 +1590,8 @@ void print_help(void) {
         printf("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
         printf("    %s\n", _("can be changed with --state--regex)"));
         printf(" %s\n", "--state-regex=STATE");
-        printf("    %s\n", _("Return STATE if regex is found, OK if not. STATE can be one of \"critical\",\"warning\""));
+        printf("    %s\n", _("Return STATE if regex is found, OK if not. STATE can be one of "
+                                                 "\"critical\",\"warning\""));
         printf(" %s\n", "-a, --authorization=AUTH_PAIR");
         printf("    %s\n", _("Username:password on sites with basic authentication"));
         printf(" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
@@ -1987,13 +1599,14 @@ void print_help(void) {
         printf(" %s\n", "-A, --useragent=STRING");
         printf("    %s\n", _("String to be sent in http header as \"User Agent\""));
         printf(" %s\n", "-k, --header=STRING");
-        printf("    %s\n", _("Any other tags to be sent in http header. Use multiple times for additional headers"));
+        printf("    %s\n", _("Any other tags to be sent in http header. Use multiple times for "
+                                                 "additional headers"));
         printf(" %s\n", "-E, --extended-perfdata");
         printf("    %s\n", _("Print additional performance data"));
         printf(" %s\n", "-B, --show-body");
         printf("    %s\n", _("Print body content below status line"));
-        printf(" %s\n", "-L, --link");
-        printf("    %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
+        // printf(" %s\n", "-L, --link");
+        // printf("    %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
         printf(" %s\n", "-f, --onredirect=<ok|warning|critical|follow|sticky|stickyport|curl>");
         printf("    %s\n", _("How to handle redirected pages. sticky is like follow but stick to the"));
         printf("    %s\n", _("specified IP address. stickyport also ensures port stays the same."));
@@ -2003,20 +1616,25 @@ void print_help(void) {
         printf("    %s", _("Maximal number of redirects (default: "));
         printf("%d)\n", DEFAULT_MAX_REDIRS);
         printf(" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
-        printf("    %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
+        printf("    %s\n",
+                   _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
         printf("\n");
         printf(" %s\n", "--http-version=VERSION");
         printf("    %s\n", _("Connect via specific HTTP protocol."));
-        printf("    %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)"));
+        printf("    %s\n",
+                   _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)"));
         printf(" %s\n", "--enable-automatic-decompression");
         printf("    %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING)."));
         printf(" %s\n", "--haproxy-protocol");
         printf("    %s\n", _("Send HAProxy proxy protocol v1 header (CURLOPT_HAPROXYPROTOCOL)."));
         printf(" %s\n", "--cookie-jar=FILE");
         printf("    %s\n", _("Store cookies in the cookie jar and send them out when requested."));
-        printf("    %s\n", _("Specify an empty string as FILE to enable curl's cookie engine without saving"));
-        printf("    %s\n", _("the cookies to disk. Only enabling the engine without saving to disk requires"));
-        printf("    %s\n", _("handling multiple requests internally to curl, so use it with --onredirect=curl"));
+        printf("    %s\n",
+                   _("Specify an empty string as FILE to enable curl's cookie engine without saving"));
+        printf("    %s\n",
+                   _("the cookies to disk. Only enabling the engine without saving to disk requires"));
+        printf("    %s\n",
+                   _("handling multiple requests internally to curl, so use it with --onredirect=curl"));
         printf("\n");
 
         printf(UT_WARN_CRIT);
@@ -2025,13 +1643,18 @@ void print_help(void) {
 
         printf(UT_VERBOSE);
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
         printf("%s\n", _("Notes:"));
         printf(" %s\n", _("This plugin will attempt to open an HTTP connection with the host."));
-        printf(" %s\n", _("Successful connects return STATE_OK, refusals and timeouts return STATE_CRITICAL"));
-        printf(" %s\n", _("other errors return STATE_UNKNOWN.  Successful connects, but incorrect response"));
+        printf(" %s\n",
+                   _("Successful connects return STATE_OK, refusals and timeouts return STATE_CRITICAL"));
+        printf(" %s\n",
+                   _("other errors return STATE_UNKNOWN.  Successful connects, but incorrect response"));
         printf(" %s\n", _("messages from the host result in STATE_WARNING return values.  If you are"));
-        printf(" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
+        printf(" %s\n",
+                   _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
         printf(" %s\n", _("(fully qualified domain name) as the [host_name] argument."));
 
 #ifdef LIBCURL_FEATURE_SSL
@@ -2044,41 +1667,60 @@ void print_help(void) {
         printf(" %s\n", _("certificate matches the hostname of the server, or if the certificate"));
         printf(" %s\n", _("has a valid chain of trust to one of the locally installed CAs."));
         printf("\n");
+        printf(" %s\n", _("To also verify certificates, please set --verify-cert."));
+        printf("\n");
         printf("%s\n", _("Examples:"));
         printf(" %s\n\n", "CHECK CONTENT: check_curl -w 5 -c 10 --ssl -H www.verisign.com");
         printf(" %s\n", _("When the 'www.verisign.com' server returns its content within 5 seconds,"));
-        printf(" %s\n", _("a STATE_OK will be returned. When the server returns its content but exceeds"));
-        printf(" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
+        printf(" %s\n",
+                   _("a STATE_OK will be returned. When the server returns its content but exceeds"));
+        printf(" %s\n",
+                   _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
         printf(" %s\n", _("a STATE_CRITICAL will be returned."));
         printf("\n");
-        printf(" %s\n\n", "CHECK CERTIFICATE: check_curl -H www.verisign.com -C 14");
-        printf(" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 14 days,"));
-        printf(" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
-        printf(" %s\n", _("14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"));
-        printf(" %s\n\n", _("the certificate is expired."));
+        printf(" %s\n\n", "CHECK CERTIFICATE: check_curl -H www.verisign.com -C 14 -D");
+        printf(" %s\n",
+                   _("When the certificate of 'www.verisign.com' is valid for more than 14 days,"));
+        printf(" %s\n",
+                   _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
+        printf(" %s\n",
+                   _("14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"));
+        printf(" %s\n", _("the certificate is expired."));
+        printf("\n");
+        printf(" %s\n", _("The -D flag enforces a certificate validation beyond expiration time."));
         printf("\n");
-        printf(" %s\n\n", "CHECK CERTIFICATE: check_curl -H www.verisign.com -C 30,14");
-        printf(" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 30 days,"));
-        printf(" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
+        printf(" %s\n\n", "CHECK CERTIFICATE: check_curl -H www.verisign.com -C 30,14 -D");
+        printf(" %s\n",
+                   _("When the certificate of 'www.verisign.com' is valid for more than 30 days,"));
+        printf(" %s\n",
+                   _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
         printf(" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned."));
-        printf(" %s\n", _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days"));
+        printf(" %s\n",
+                   _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days"));
 #endif
 
         printf("\n %s\n", "CHECK WEBSERVER CONTENT VIA PROXY:");
         printf(" %s\n", _("It is recommended to use an environment proxy like:"));
-        printf(" %s\n", _("http_proxy=http://192.168.100.35:3128 ./check_curl -H www.monitoring-plugins.org"));
+        printf(" %s\n",
+                   _("http_proxy=http://192.168.100.35:3128 ./check_curl -H www.monitoring-plugins.org"));
         printf(" %s\n", _("legacy proxy requests in check_http style still work:"));
-        printf(" %s\n", _("check_curl -I 192.168.100.35 -p 3128 -u http://www.monitoring-plugins.org/ -H www.monitoring-plugins.org"));
+        printf(" %s\n", _("check_curl -I 192.168.100.35 -p 3128 -u http://www.monitoring-plugins.org/ "
+                                          "-H www.monitoring-plugins.org"));
 
 #ifdef LIBCURL_FEATURE_SSL
         printf("\n %s\n", "CHECK SSL WEBSERVER CONTENT VIA PROXY USING HTTP 1.1 CONNECT: ");
         printf(" %s\n", _("It is recommended to use an environment proxy like:"));
-        printf(" %s\n", _("https_proxy=http://192.168.100.35:3128 ./check_curl -H www.verisign.com -S"));
-        printf(" %s\n", _("legacy proxy requests in check_http style still work:"));
-        printf(" %s\n", _("check_curl -I 192.168.100.35 -p 3128 -u https://www.verisign.com/ -S -j CONNECT -H www.verisign.com "));
-        printf(" %s\n", _("all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -S(sl) -j CONNECT -H <webserver>"));
-        printf(" %s\n", _("a STATE_OK will be returned. When the server returns its content but exceeds"));
-        printf(" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
+        printf(" %s\n",
+                   _("https_proxy=http://192.168.100.35:3128 ./check_curl -H www.verisign.com -S"));
+        printf(" %s\n", _("legacy proxy requests in check_http style might still work, but are frowned upon, so DONT:"));
+        printf(" %s\n", _("check_curl -I 192.168.100.35 -p 3128 -u https://www.verisign.com/ -S -j "
+                                          "CONNECT -H www.verisign.com "));
+        printf(" %s\n", _("all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> "
+                                          "-S(sl) -j CONNECT -H <webserver>"));
+        printf(" %s\n",
+                   _("a STATE_OK will be returned. When the server returns its content but exceeds"));
+        printf(" %s\n",
+                   _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
         printf(" %s\n", _("a STATE_CRITICAL will be returned."));
 
 #endif
@@ -2089,10 +1731,12 @@ void print_help(void) {
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
         printf(" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n", progname);
-        printf("       [-J <client certificate file>] [-K <private key>] [--ca-cert <CA certificate file>] [-D]\n");
+        printf("       [-J <client certificate file>] [-K <private key>] [--ca-cert <CA certificate "
+                   "file>] [-D]\n");
         printf("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-E] [-a auth]\n");
         printf("       [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport|curl>]\n");
-        printf("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
+        printf("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive "
+                   "regex>]\n");
         printf("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
         printf("       [-A string] [-k string] [-S <version>] [--sni] [--haproxy-protocol]\n");
         printf("       [-T <content-type>] [-j method]\n");
@@ -2109,435 +1753,49 @@ void print_usage(void) {
 
 void print_curl_version(void) { printf("%s\n", curl_version()); }
 
-int curlhelp_initwritebuffer(curlhelp_write_curlbuf *buf) {
-        buf->bufsize = DEFAULT_BUFFER_SIZE;
-        buf->buflen = 0;
-        buf->buf = (char *)malloc((size_t)buf->bufsize);
-        if (buf->buf == NULL)
-                return -1;
-        return 0;
-}
-
-size_t curlhelp_buffer_write_callback(void *buffer, size_t size, size_t nmemb, void *stream) {
-        curlhelp_write_curlbuf *buf = (curlhelp_write_curlbuf *)stream;
-
-        while (buf->bufsize < buf->buflen + size * nmemb + 1) {
-                buf->bufsize = buf->bufsize * 2;
-                buf->buf = (char *)realloc(buf->buf, buf->bufsize);
-                if (buf->buf == NULL) {
-                        fprintf(stderr, "malloc failed (%d) %s\n", errno, strerror(errno));
-                        return -1;
-                }
-        }
-
-        memcpy(buf->buf + buf->buflen, buffer, size * nmemb);
-        buf->buflen += size * nmemb;
-        buf->buf[buf->buflen] = '\0';
-
-        return (int)(size * nmemb);
-}
-
-size_t curlhelp_buffer_read_callback(void *buffer, size_t size, size_t nmemb, void *stream) {
-        curlhelp_read_curlbuf *buf = (curlhelp_read_curlbuf *)stream;
-
-        size_t n = min(nmemb * size, buf->buflen - buf->pos);
-
-        memcpy(buffer, buf->buf + buf->pos, n);
-        buf->pos += n;
-
-        return (int)n;
-}
-
-void curlhelp_freewritebuffer(curlhelp_write_curlbuf *buf) {
-        free(buf->buf);
-        buf->buf = NULL;
-}
-
-int curlhelp_initreadbuffer(curlhelp_read_curlbuf *buf, const char *data, size_t datalen) {
-        buf->buflen = datalen;
-        buf->buf = (char *)malloc((size_t)buf->buflen);
-        if (buf->buf == NULL)
-                return -1;
-        memcpy(buf->buf, data, datalen);
-        buf->pos = 0;
-        return 0;
-}
-
-void curlhelp_freereadbuffer(curlhelp_read_curlbuf *buf) {
-        free(buf->buf);
-        buf->buf = NULL;
-}
-
-/* TODO: where to put this, it's actually part of sstrings2 (logically)?
- */
-const char *strrstr2(const char *haystack, const char *needle) {
-        int counter;
-        size_t len;
-        const char *prev_pos;
-        const char *pos;
-
-        if (haystack == NULL || needle == NULL)
-                return NULL;
-
-        if (haystack[0] == '\0' || needle[0] == '\0')
-                return NULL;
-
-        counter = 0;
-        prev_pos = NULL;
-        pos = haystack;
-        len = strlen(needle);
-        for (;;) {
-                pos = strstr(pos, needle);
-                if (pos == NULL) {
-                        if (counter == 0)
-                                return NULL;
-                        return prev_pos;
-                }
-                counter++;
-                prev_pos = pos;
-                pos += len;
-                if (*pos == '\0')
-                        return prev_pos;
-        }
-}
-
-int curlhelp_parse_statusline(const char *buf, curlhelp_statusline *status_line) {
-        char *first_line_end;
-        char *p;
-        size_t first_line_len;
-        char *pp;
-        const char *start;
-        char *first_line_buf;
-
-        /* find last start of a new header */
-        start = strrstr2(buf, "\r\nHTTP/");
-        if (start != NULL) {
-                start += 2;
-                buf = start;
-        }
-
-        first_line_end = strstr(buf, "\r\n");
-        if (first_line_end == NULL)
-                return -1;
-
-        first_line_len = (size_t)(first_line_end - buf);
-        status_line->first_line = (char *)malloc(first_line_len + 1);
-        if (status_line->first_line == NULL)
-                return -1;
-        memcpy(status_line->first_line, buf, first_line_len);
-        status_line->first_line[first_line_len] = '\0';
-        first_line_buf = strdup(status_line->first_line);
-
-        /* protocol and version: "HTTP/x.x" SP or "HTTP/2" SP */
-
-        p = strtok(first_line_buf, "/");
-        if (p == NULL) {
-                free(first_line_buf);
-                return -1;
-        }
-        if (strcmp(p, "HTTP") != 0) {
-                free(first_line_buf);
-                return -1;
-        }
-
-        p = strtok(NULL, " ");
-        if (p == NULL) {
-                free(first_line_buf);
-                return -1;
-        }
-        if (strchr(p, '.') != NULL) {
-
-                /* HTTP 1.x case */
-                strtok(p, ".");
-                status_line->http_major = (int)strtol(p, &pp, 10);
-                if (*pp != '\0') {
-                        free(first_line_buf);
-                        return -1;
-                }
-                strtok(NULL, " ");
-                status_line->http_minor = (int)strtol(p, &pp, 10);
-                if (*pp != '\0') {
-                        free(first_line_buf);
-                        return -1;
-                }
-                p += 4; /* 1.x SP */
-        } else {
-                /* HTTP 2 case */
-                status_line->http_major = (int)strtol(p, &pp, 10);
-                status_line->http_minor = 0;
-                p += 2; /* 2 SP */
-        }
-
-        /* status code: "404" or "404.1", then SP */
-
-        p = strtok(p, " ");
-        if (p == NULL) {
-                free(first_line_buf);
-                return -1;
-        }
-        if (strchr(p, '.') != NULL) {
-                char *ppp;
-                ppp = strtok(p, ".");
-                status_line->http_code = (int)strtol(ppp, &pp, 10);
-                if (*pp != '\0') {
-                        free(first_line_buf);
-                        return -1;
-                }
-                ppp = strtok(NULL, "");
-                status_line->http_subcode = (int)strtol(ppp, &pp, 10);
-                if (*pp != '\0') {
-                        free(first_line_buf);
-                        return -1;
-                }
-                p += 6; /* 400.1 SP */
-        } else {
-                status_line->http_code = (int)strtol(p, &pp, 10);
-                status_line->http_subcode = -1;
-                if (*pp != '\0') {
-                        free(first_line_buf);
-                        return -1;
-                }
-                p += 4; /* 400 SP */
-        }
-
-        /* Human readable message: "Not Found" CRLF */
-
-        p = strtok(p, "");
-        if (p == NULL) {
-                status_line->msg = "";
-                return 0;
-        }
-        status_line->msg = status_line->first_line + (p - first_line_buf);
-        free(first_line_buf);
-
-        return 0;
-}
-
-void curlhelp_free_statusline(curlhelp_statusline *status_line) { free(status_line->first_line); }
-
-char *get_header_value(const struct phr_header *headers, const size_t nof_headers, const char *header) {
-        for (size_t i = 0; i < nof_headers; i++) {
-                if (headers[i].name != NULL && strncasecmp(header, headers[i].name, max(headers[i].name_len, 4)) == 0) {
-                        return strndup(headers[i].value, headers[i].value_len);
-                }
-        }
-        return NULL;
-}
-
-int check_document_dates(const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFAULT_BUFFER_SIZE]) {
-        char *server_date = NULL;
-        char *document_date = NULL;
-        int date_result = STATE_OK;
-        curlhelp_statusline status_line;
-        struct phr_header headers[255];
-        size_t nof_headers = 255;
-        size_t msglen;
-
-        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major, &status_line.http_minor,
-                                                                 &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0);
-
-        if (res == -1) {
-                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
-        }
-
-        server_date = get_header_value(headers, nof_headers, "date");
-        document_date = get_header_value(headers, nof_headers, "last-modified");
-
-        if (!server_date || !*server_date) {
-                char tmp[DEFAULT_BUFFER_SIZE];
-
-                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sServer date unknown, "), *msg);
-                strcpy(*msg, tmp);
-
-                date_result = max_state_alt(STATE_UNKNOWN, date_result);
-
-        } else if (!document_date || !*document_date) {
-                char tmp[DEFAULT_BUFFER_SIZE];
-
-                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sDocument modification date unknown, "), *msg);
-                strcpy(*msg, tmp);
-
-                date_result = max_state_alt(STATE_CRITICAL, date_result);
-
-        } else {
-                time_t srv_data = curl_getdate(server_date, NULL);
-                time_t doc_data = curl_getdate(document_date, NULL);
-                if (verbose >= 2)
-                        printf("* server date: '%s' (%d), doc_date: '%s' (%d)\n", server_date, (int)srv_data, document_date, (int)doc_data);
-                if (srv_data <= 0) {
-                        char tmp[DEFAULT_BUFFER_SIZE];
-
-                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sServer date \"%100s\" unparsable, "), *msg, server_date);
-                        strcpy(*msg, tmp);
-
-                        date_result = max_state_alt(STATE_CRITICAL, date_result);
-                } else if (doc_data <= 0) {
-                        char tmp[DEFAULT_BUFFER_SIZE];
-
-                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sDocument date \"%100s\" unparsable, "), *msg, document_date);
-                        strcpy(*msg, tmp);
-
-                        date_result = max_state_alt(STATE_CRITICAL, date_result);
-                } else if (doc_data > srv_data + 30) {
-                        char tmp[DEFAULT_BUFFER_SIZE];
-
-                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sDocument is %d seconds in the future, "), *msg, (int)doc_data - (int)srv_data);
-                        strcpy(*msg, tmp);
-
-                        date_result = max_state_alt(STATE_CRITICAL, date_result);
-                } else if (doc_data < srv_data - maximum_age) {
-                        int n = (srv_data - doc_data);
-                        if (n > (60 * 60 * 24 * 2)) {
-                                char tmp[DEFAULT_BUFFER_SIZE];
-
-                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sLast modified %.1f days ago, "), *msg, ((float)n) / (60 * 60 * 24));
-                                strcpy(*msg, tmp);
-
-                                date_result = max_state_alt(STATE_CRITICAL, date_result);
-                        } else {
-                                char tmp[DEFAULT_BUFFER_SIZE];
-
-                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sLast modified %d:%02d:%02d ago, "), *msg, n / (60 * 60), (n / 60) % 60, n % 60);
-                                strcpy(*msg, tmp);
-
-                                date_result = max_state_alt(STATE_CRITICAL, date_result);
-                        }
-                }
-        }
-
-        if (server_date)
-                free(server_date);
-        if (document_date)
-                free(document_date);
-
-        return date_result;
-}
-
-int get_content_length(const curlhelp_write_curlbuf *header_buf, const curlhelp_write_curlbuf *body_buf) {
-        size_t content_length = 0;
-        struct phr_header headers[255];
-        size_t nof_headers = 255;
-        size_t msglen;
-        char *content_length_s = NULL;
-        curlhelp_statusline status_line;
-
-        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major, &status_line.http_minor,
-                                                                 &status_line.http_code, &status_line.msg, &msglen, headers, &nof_headers, 0);
-
-        if (res == -1) {
-                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
-        }
-
-        content_length_s = get_header_value(headers, nof_headers, "content-length");
-        if (!content_length_s) {
-                return header_buf->buflen + body_buf->buflen;
-        }
-        content_length_s += strspn(content_length_s, " \t");
-        content_length = atoi(content_length_s);
-        if (content_length != body_buf->buflen) {
-                /* TODO: should we warn if the actual and the reported body length don't match? */
-        }
-
-        if (content_length_s)
-                free(content_length_s);
-
-        return header_buf->buflen + body_buf->buflen;
-}
-
-/* TODO: is there a better way in libcurl to check for the SSL library? */
-curlhelp_ssl_library curlhelp_get_ssl_library(void) {
-        curl_version_info_data *version_data;
-        char *ssl_version;
-        char *library;
-        curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
-
-        version_data = curl_version_info(CURLVERSION_NOW);
-        if (version_data == NULL)
-                return CURLHELP_SSL_LIBRARY_UNKNOWN;
-
-        ssl_version = strdup(version_data->ssl_version);
-        if (ssl_version == NULL)
-                return CURLHELP_SSL_LIBRARY_UNKNOWN;
-
-        library = strtok(ssl_version, "/");
-        if (library == NULL)
-                return CURLHELP_SSL_LIBRARY_UNKNOWN;
-
-        if (strcmp(library, "OpenSSL") == 0)
-                ssl_library = CURLHELP_SSL_LIBRARY_OPENSSL;
-        else if (strcmp(library, "LibreSSL") == 0)
-                ssl_library = CURLHELP_SSL_LIBRARY_LIBRESSL;
-        else if (strcmp(library, "GnuTLS") == 0)
-                ssl_library = CURLHELP_SSL_LIBRARY_GNUTLS;
-        else if (strcmp(library, "NSS") == 0)
-                ssl_library = CURLHELP_SSL_LIBRARY_NSS;
-
-        if (verbose >= 2)
-                printf("* SSL library string is : %s %s (%d)\n", version_data->ssl_version, library, ssl_library);
-
-        free(ssl_version);
-
-        return ssl_library;
-}
-
-const char *curlhelp_get_ssl_library_string(curlhelp_ssl_library ssl_library) {
-        switch (ssl_library) {
-        case CURLHELP_SSL_LIBRARY_OPENSSL:
-                return "OpenSSL";
-        case CURLHELP_SSL_LIBRARY_LIBRESSL:
-                return "LibreSSL";
-        case CURLHELP_SSL_LIBRARY_GNUTLS:
-                return "GnuTLS";
-        case CURLHELP_SSL_LIBRARY_NSS:
-                return "NSS";
-        case CURLHELP_SSL_LIBRARY_UNKNOWN:
-        default:
-                return "unknown";
-        }
-}
-
 #ifdef LIBCURL_FEATURE_SSL
 #       ifndef USE_OPENSSL
 time_t parse_cert_date(const char *s) {
-        struct tm tm;
-        time_t date;
-        char *res;
-
-        if (!s)
+        if (!s) {
                 return -1;
+        }
 
         /* Jan 17 14:25:12 2020 GMT */
-        res = strptime(s, "%Y-%m-%d %H:%M:%S GMT", &tm);
+        struct tm tm;
+        char *res = strptime(s, "%Y-%m-%d %H:%M:%S GMT", &tm);
         /* Sep 11 12:00:00 2020 GMT */
-        if (res == NULL)
+        if (res == NULL) {
                 strptime(s, "%Y %m %d %H:%M:%S GMT", &tm);
-        date = mktime(&tm);
+        }
+        time_t date = mktime(&tm);
 
         return date;
 }
+#       endif /* USE_OPENSSL */
+#endif     /* LIBCURL_FEATURE_SSL */
 
+#ifdef LIBCURL_FEATURE_SSL
+#       ifndef USE_OPENSSL
 /* TODO: this needs cleanup in the sslutils.c, maybe we the #else case to
  * OpenSSL could be this function
  */
-int net_noopenssl_check_certificate(cert_ptr_union *cert_ptr, int days_till_exp_warn, int days_till_exp_crit) {
-        int i;
-        struct curl_slist *slist;
-        int cname_found = 0;
-        char *start_date_str = NULL;
-        char *end_date_str = NULL;
-        time_t start_date;
-        time_t end_date;
-        char *tz;
-        float time_left;
-        int days_left;
-        int time_remaining;
-        char timestamp[50] = "";
-        int status = STATE_UNKNOWN;
+int net_noopenssl_check_certificate(cert_ptr_union *cert_ptr, int days_till_exp_warn,
+                                                                        int days_till_exp_crit) {
 
-        if (verbose >= 2)
+        if (verbose >= 2) {
                 printf("**** REQUEST CERTIFICATES ****\n");
+        }
+
+        char *start_date_str = NULL;
+        char *end_date_str = NULL;
+        bool have_first_cert = false;
+        bool cname_found = false;
+        for (int i = 0; i < cert_ptr->to_certinfo->num_of_certs; i++) {
+                if (have_first_cert) {
+                        break;
+                }
 
-        for (i = 0; i < cert_ptr->to_certinfo->num_of_certs; i++) {
+                struct curl_slist *slist;
                 for (slist = cert_ptr->to_certinfo->certinfo[i]; slist; slist = slist->next) {
                         /* find first common name in subject,
                          * TODO: check alternative subjects for
@@ -2553,7 +1811,7 @@ int net_noopenssl_check_certificate(cert_ptr_union *cert_ptr, int days_till_exp_
                                 }
                                 if (p != NULL) {
                                         if (strncmp(host_name, p + d, strlen(host_name)) == 0) {
-                                                cname_found = 1;
+                                                cname_found = true;
                                         }
                                 }
                         } else if (strncasecmp(slist->data, "Start Date:", 11) == 0) {
@@ -2561,78 +1819,93 @@ int net_noopenssl_check_certificate(cert_ptr_union *cert_ptr, int days_till_exp_
                         } else if (strncasecmp(slist->data, "Expire Date:", 12) == 0) {
                                 end_date_str = &slist->data[12];
                         } else if (strncasecmp(slist->data, "Cert:", 5) == 0) {
-                                goto HAVE_FIRST_CERT;
+                                have_first_cert = true;
+                                break;
                         }
-                        if (verbose >= 2)
+                        if (verbose >= 2) {
                                 printf("%d ** %s\n", i, slist->data);
+                        }
                 }
         }
-HAVE_FIRST_CERT:
 
-        if (verbose >= 2)
+        if (verbose >= 2) {
                 printf("**** REQUEST CERTIFICATES ****\n");
+        }
 
         if (!cname_found) {
                 printf("%s\n", _("CRITICAL - Cannot retrieve certificate subject."));
                 return STATE_CRITICAL;
         }
 
-        start_date = parse_cert_date(start_date_str);
+        time_t start_date = parse_cert_date(start_date_str);
         if (start_date <= 0) {
-                snprintf(msg, DEFAULT_BUFFER_SIZE, _("WARNING - Unparsable 'Start Date' in certificate: '%s'"), start_date_str);
+                snprintf(msg, DEFAULT_BUFFER_SIZE,
+                                 _("WARNING - Unparsable 'Start Date' in certificate: '%s'"), start_date_str);
                 puts(msg);
                 return STATE_WARNING;
         }
 
-        end_date = parse_cert_date(end_date_str);
+        time_t end_date = parse_cert_date(end_date_str);
         if (end_date <= 0) {
-                snprintf(msg, DEFAULT_BUFFER_SIZE, _("WARNING - Unparsable 'Expire Date' in certificate: '%s'"), start_date_str);
+                snprintf(msg, DEFAULT_BUFFER_SIZE,
+                                 _("WARNING - Unparsable 'Expire Date' in certificate: '%s'"), start_date_str);
                 puts(msg);
                 return STATE_WARNING;
         }
 
-        time_left = difftime(end_date, time(NULL));
-        days_left = time_left / 86400;
-        tz = getenv("TZ");
+        float time_left = difftime(end_date, time(NULL));
+        int days_left = time_left / 86400;
+        char *tz = getenv("TZ");
         setenv("TZ", "GMT", 1);
         tzset();
+
+        char timestamp[50] = "";
         strftime(timestamp, 50, "%c %z", localtime(&end_date));
-        if (tz)
+        if (tz) {
                 setenv("TZ", tz, 1);
-        else
+        } else {
                 unsetenv("TZ");
+        }
         tzset();
 
+        mp_state_enum status = STATE_UNKNOWN;
+        int time_remaining;
         if (days_left > 0 && days_left <= days_till_exp_warn) {
-                printf(_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL",
-                           host_name, days_left, timestamp);
-                if (days_left > days_till_exp_crit)
+                printf(_("%s - Certificate '%s' expires in %d day(s) (%s).\n"),
+                           (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", host_name, days_left,
+                           timestamp);
+                if (days_left > days_till_exp_crit) {
                         status = STATE_WARNING;
-                else
+                } else {
                         status = STATE_CRITICAL;
+                }
         } else if (days_left == 0 && time_left > 0) {
-                if (time_left >= 3600)
+                if (time_left >= 3600) {
                         time_remaining = (int)time_left / 3600;
-                else
+                } else {
                         time_remaining = (int)time_left / 60;
+                }
 
-                printf(_("%s - Certificate '%s' expires in %u %s (%s)\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", host_name,
-                           time_remaining, time_left >= 3600 ? "hours" : "minutes", timestamp);
+                printf(_("%s - Certificate '%s' expires in %u %s (%s)\n"),
+                           (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", host_name, time_remaining,
+                           time_left >= 3600 ? "hours" : "minutes", timestamp);
 
-                if (days_left > days_till_exp_crit)
+                if (days_left > days_till_exp_crit) {
                         status = STATE_WARNING;
-                else
+                } else {
                         status = STATE_CRITICAL;
+                }
         } else if (time_left < 0) {
                 printf(_("CRITICAL - Certificate '%s' expired on %s.\n"), host_name, timestamp);
                 status = STATE_CRITICAL;
         } else if (days_left == 0) {
-                printf(_("%s - Certificate '%s' just expired (%s).\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", host_name,
-                           timestamp);
-                if (days_left > days_till_exp_crit)
+                printf(_("%s - Certificate '%s' just expired (%s).\n"),
+                           (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", host_name, timestamp);
+                if (days_left > days_till_exp_crit) {
                         status = STATE_WARNING;
-                else
+                } else {
                         status = STATE_CRITICAL;
+                }
         } else {
                 printf(_("OK - Certificate '%s' will expire on %s.\n"), host_name, timestamp);
                 status = STATE_OK;
diff --git a/plugins/check_curl.d/check_curl_helpers.c b/plugins/check_curl.d/check_curl_helpers.c
new file mode 100644
index 00000000..7be781fc
--- /dev/null
+++ b/plugins/check_curl.d/check_curl_helpers.c
@@ -0,0 +1,1297 @@
+#include "./check_curl_helpers.h"
+#include <stdbool.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <string.h>
+#include "../utils.h"
+#include "check_curl.d/config.h"
+#include "output.h"
+#include "perfdata.h"
+#include "states.h"
+
+extern int verbose;
+char errbuf[MAX_INPUT_BUFFER];
+bool is_openssl_callback = false;
+bool add_sslctx_verify_fun = false;
+
+check_curl_configure_curl_wrapper
+check_curl_configure_curl(const check_curl_static_curl_config config,
+                                                  check_curl_working_state working_state, bool check_cert,
+                                                  bool on_redirect_dependent, int follow_method, long max_depth) {
+        check_curl_configure_curl_wrapper result = {
+                .errorcode = OK,
+                .curl_state =
+                        {
+                                .curl_global_initialized = false,
+                                .curl_easy_initialized = false,
+                                .curl = NULL,
+
+                                .body_buf_initialized = false,
+                                .body_buf = NULL,
+                                .header_buf_initialized = false,
+                                .header_buf = NULL,
+                                .status_line_initialized = false,
+                                .status_line = NULL,
+                                .put_buf_initialized = false,
+                                .put_buf = NULL,
+
+                                .header_list = NULL,
+                                .host = NULL,
+                        },
+        };
+
+        if ((result.curl_state.status_line = calloc(1, sizeof(curlhelp_statusline))) == NULL) {
+                die(STATE_UNKNOWN, "HTTP UNKNOWN - allocation of statusline failed\n");
+        }
+
+        if (curl_global_init(CURL_GLOBAL_DEFAULT) != CURLE_OK) {
+                die(STATE_UNKNOWN, "HTTP UNKNOWN - curl_global_init failed\n");
+        }
+        result.curl_state.curl_global_initialized = true;
+
+        if ((result.curl_state.curl = curl_easy_init()) == NULL) {
+                die(STATE_UNKNOWN, "HTTP UNKNOWN - curl_easy_init failed\n");
+        }
+        result.curl_state.curl_easy_initialized = true;
+
+        if (verbose >= 1) {
+                handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_VERBOSE, 1L),
+                                                                           "CURLOPT_VERBOSE");
+        }
+
+        /* print everything on stdout like check_http would do */
+        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_STDERR, stdout),
+                                                                   "CURLOPT_STDERR");
+
+        if (config.automatic_decompression) {
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 6)
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_ACCEPT_ENCODING, ""),
+                        "CURLOPT_ACCEPT_ENCODING");
+#else
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_ENCODING, ""), "CURLOPT_ENCODING");
+#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 21, 6) */
+        }
+
+        /* initialize buffer for body of the answer */
+        if (curlhelp_initwritebuffer(&result.curl_state.body_buf) < 0) {
+                die(STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for body\n");
+        }
+        result.curl_state.body_buf_initialized = true;
+
+        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_WRITEFUNCTION,
+                                                                                                        curlhelp_buffer_write_callback),
+                                                                   "CURLOPT_WRITEFUNCTION");
+        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_WRITEDATA,
+                                                                                                        (void *)result.curl_state.body_buf),
+                                                                   "CURLOPT_WRITEDATA");
+
+        /* initialize buffer for header of the answer */
+        if (curlhelp_initwritebuffer(&result.curl_state.header_buf) < 0) {
+                die(STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for header\n");
+        }
+        result.curl_state.header_buf_initialized = true;
+
+        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_HEADERFUNCTION,
+                                                                                                        curlhelp_buffer_write_callback),
+                                                                   "CURLOPT_HEADERFUNCTION");
+        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_WRITEHEADER,
+                                                                                                        (void *)result.curl_state.header_buf),
+                                                                   "CURLOPT_WRITEHEADER");
+
+        /* set the error buffer */
+        handle_curl_option_return_code(
+                curl_easy_setopt(result.curl_state.curl, CURLOPT_ERRORBUFFER, errbuf),
+                "CURLOPT_ERRORBUFFER");
+
+        /* set timeouts */
+        handle_curl_option_return_code(
+                curl_easy_setopt(result.curl_state.curl, CURLOPT_CONNECTTIMEOUT, config.socket_timeout),
+                "CURLOPT_CONNECTTIMEOUT");
+
+        handle_curl_option_return_code(
+                curl_easy_setopt(result.curl_state.curl, CURLOPT_TIMEOUT, config.socket_timeout),
+                "CURLOPT_TIMEOUT");
+
+        /* enable haproxy protocol */
+        if (config.haproxy_protocol) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_HAPROXYPROTOCOL, 1L),
+                        "CURLOPT_HAPROXYPROTOCOL");
+        }
+
+        // fill dns resolve cache to make curl connect to the given server_address instead of the
+        // host_name, only required for ssl, because we use the host_name later on to make SNI happy
+        char dnscache[DEFAULT_BUFFER_SIZE];
+        char addrstr[DEFAULT_BUFFER_SIZE / 2];
+        if (working_state.use_ssl && working_state.host_name != NULL) {
+                char *tmp_mod_address;
+
+                /* lookup_host() requires an IPv6 address without the brackets. */
+                if ((strnlen(working_state.server_address, MAX_IPV4_HOSTLENGTH) > 2) &&
+                        (working_state.server_address[0] == '[')) {
+                        // Duplicate and strip the leading '['
+                        tmp_mod_address =
+                                strndup(working_state.server_address + 1, strlen(working_state.server_address) - 2);
+                } else {
+                        tmp_mod_address = working_state.server_address;
+                }
+
+                int res;
+                if ((res = lookup_host(tmp_mod_address, addrstr, DEFAULT_BUFFER_SIZE / 2,
+                                                           config.sin_family)) != 0) {
+                        die(STATE_CRITICAL,
+                                _("Unable to lookup IP address for '%s': getaddrinfo returned %d - %s"),
+                                working_state.server_address, res, gai_strerror(res));
+                }
+
+                snprintf(dnscache, DEFAULT_BUFFER_SIZE, "%s:%d:%s", working_state.host_name,
+                                 working_state.serverPort, addrstr);
+                result.curl_state.host = curl_slist_append(NULL, dnscache);
+                curl_easy_setopt(result.curl_state.curl, CURLOPT_RESOLVE, result.curl_state.host);
+
+                if (verbose >= 1) {
+                        printf("* curl CURLOPT_RESOLVE: %s\n", dnscache);
+                }
+        }
+
+        // If server_address is an IPv6 address it must be surround by square brackets
+        struct in6_addr tmp_in_addr;
+        if (inet_pton(AF_INET6, working_state.server_address, &tmp_in_addr) == 1) {
+                char *new_server_address = calloc(strlen(working_state.server_address) + 3, sizeof(char));
+                if (new_server_address == NULL) {
+                        die(STATE_UNKNOWN, "HTTP UNKNOWN - Unable to allocate memory\n");
+                }
+                snprintf(new_server_address, strlen(working_state.server_address) + 3, "[%s]",
+                                 working_state.server_address);
+                working_state.server_address = new_server_address;
+        }
+
+        /* compose URL: use the address we want to connect to, set Host: header later */
+        char *url = fmt_url(working_state);
+
+        if (verbose >= 1) {
+                printf("* curl CURLOPT_URL: %s\n", url);
+        }
+        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_URL, url),
+                                                                   "CURLOPT_URL");
+
+        free(url);
+
+        /* extract proxy information for legacy proxy https requests */
+        if (!strcmp(working_state.http_method, "CONNECT") ||
+                strstr(working_state.server_url, "http") == working_state.server_url) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_PROXY, working_state.server_address),
+                        "CURLOPT_PROXY");
+                handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_PROXYPORT,
+                                                                                                                (long)working_state.serverPort),
+                                                                           "CURLOPT_PROXYPORT");
+                if (verbose >= 2) {
+                        printf("* curl CURLOPT_PROXY: %s:%d\n", working_state.server_address,
+                                   working_state.serverPort);
+                }
+                working_state.http_method = "GET";
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_URL, working_state.server_url),
+                        "CURLOPT_URL");
+        }
+
+        /* disable body for HEAD request */
+        if (working_state.http_method && !strcmp(working_state.http_method, "HEAD")) {
+                working_state.no_body = true;
+        }
+
+        /* set HTTP protocol version */
+        handle_curl_option_return_code(
+                curl_easy_setopt(result.curl_state.curl, CURLOPT_HTTP_VERSION, config.curl_http_version),
+                "CURLOPT_HTTP_VERSION");
+
+        /* set HTTP method */
+        if (working_state.http_method) {
+                if (!strcmp(working_state.http_method, "POST")) {
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_POST, 1L), "CURLOPT_POST");
+                } else if (!strcmp(working_state.http_method, "PUT")) {
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_UPLOAD, 1L), "CURLOPT_UPLOAD");
+                } else {
+                        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl,
+                                                                                                                        CURLOPT_CUSTOMREQUEST,
+                                                                                                                        working_state.http_method),
+                                                                                   "CURLOPT_CUSTOMREQUEST");
+                }
+        }
+
+        char *force_host_header = NULL;
+        /* check if Host header is explicitly set in options */
+        if (config.http_opt_headers_count) {
+                for (size_t i = 0; i < config.http_opt_headers_count; i++) {
+                        if (strncmp(config.http_opt_headers[i], "Host:", 5) == 0) {
+                                force_host_header = config.http_opt_headers[i];
+                        }
+                }
+        }
+
+        /* set hostname (virtual hosts), not needed if CURLOPT_CONNECT_TO is used, but left in
+         * anyway */
+        char http_header[DEFAULT_BUFFER_SIZE];
+        if (working_state.host_name != NULL && force_host_header == NULL) {
+                if ((working_state.virtualPort != HTTP_PORT && !working_state.use_ssl) ||
+                        (working_state.virtualPort != HTTPS_PORT && working_state.use_ssl)) {
+                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Host: %s:%d", working_state.host_name,
+                                         working_state.virtualPort);
+                } else {
+                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Host: %s", working_state.host_name);
+                }
+                result.curl_state.header_list =
+                        curl_slist_append(result.curl_state.header_list, http_header);
+        }
+
+        /* always close connection, be nice to servers */
+        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Connection: close");
+        result.curl_state.header_list = curl_slist_append(result.curl_state.header_list, http_header);
+
+        /* attach additional headers supplied by the user */
+        /* optionally send any other header tag */
+        if (config.http_opt_headers_count) {
+                for (size_t i = 0; i < config.http_opt_headers_count; i++) {
+                        result.curl_state.header_list =
+                                curl_slist_append(result.curl_state.header_list, config.http_opt_headers[i]);
+                }
+        }
+
+        /* set HTTP headers */
+        handle_curl_option_return_code(
+                curl_easy_setopt(result.curl_state.curl, CURLOPT_HTTPHEADER, result.curl_state.header_list),
+                "CURLOPT_HTTPHEADER");
+
+#ifdef LIBCURL_FEATURE_SSL
+        /* set SSL version, warn about insecure or unsupported versions */
+        if (working_state.use_ssl) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSLVERSION, config.ssl_version),
+                        "CURLOPT_SSLVERSION");
+        }
+
+        /* client certificate and key to present to server (SSL) */
+        if (config.client_cert) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSLCERT, config.client_cert),
+                        "CURLOPT_SSLCERT");
+        }
+
+        if (config.client_privkey) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSLKEY, config.client_privkey),
+                        "CURLOPT_SSLKEY");
+        }
+
+        if (config.ca_cert) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_CAINFO, config.ca_cert),
+                        "CURLOPT_CAINFO");
+        }
+
+        if (config.ca_cert || config.verify_peer_and_host) {
+                /* per default if we have a CA verify both the peer and the
+                 * hostname in the certificate, can be switched off later */
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYPEER, 1L),
+                        "CURLOPT_SSL_VERIFYPEER");
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYHOST, 2L),
+                        "CURLOPT_SSL_VERIFYHOST");
+        } else {
+                /* backward-compatible behaviour, be tolerant in checks
+                 * TODO: depending on more options have aspects we want
+                 * to be less tolerant about ssl verfications
+                 */
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYPEER, 0L),
+                        "CURLOPT_SSL_VERIFYPEER");
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_VERIFYHOST, 0L),
+                        "CURLOPT_SSL_VERIFYHOST");
+        }
+
+        /* detect SSL library used by libcurl */
+        curlhelp_ssl_library ssl_library = curlhelp_get_ssl_library();
+
+        /* try hard to get a stack of certificates to verify against */
+        if (check_cert) {
+#       if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1)
+                /* inform curl to report back certificates */
+                switch (ssl_library) {
+                case CURLHELP_SSL_LIBRARY_OPENSSL:
+                case CURLHELP_SSL_LIBRARY_LIBRESSL:
+                        /* set callback to extract certificate with OpenSSL context function (works with
+                         * OpenSSL-style libraries only!) */
+#               ifdef USE_OPENSSL
+                        /* libcurl and monitoring plugins built with OpenSSL, good */
+                        add_sslctx_verify_fun = true;
+                        is_openssl_callback = true;
+#               endif /* USE_OPENSSL */
+                        /* libcurl is built with OpenSSL, monitoring plugins, so falling
+                         * back to manually extracting certificate information */
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
+                        break;
+
+                case CURLHELP_SSL_LIBRARY_NSS:
+#               if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0)
+                        /* NSS: support for CERTINFO is implemented since 7.34.0 */
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
+#               else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                        die(STATE_CRITICAL,
+                                "HTTP CRITICAL - Cannot retrieve certificates (libcurl linked with SSL library "
+                                "'%s' is too old)\n",
+                                curlhelp_get_ssl_library_string(ssl_library));
+#               endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 34, 0) */
+                        break;
+
+                case CURLHELP_SSL_LIBRARY_GNUTLS:
+#               if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0)
+                        /* GnuTLS: support for CERTINFO is implemented since 7.42.0 */
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_CERTINFO, 1L), "CURLOPT_CERTINFO");
+#               else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0) */
+                        die(STATE_CRITICAL,
+                                "HTTP CRITICAL - Cannot retrieve certificates (libcurl linked with SSL library "
+                                "'%s' is too old)\n",
+                                curlhelp_get_ssl_library_string(ssl_library));
+#               endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 42, 0) */
+                        break;
+
+                case CURLHELP_SSL_LIBRARY_UNKNOWN:
+                default:
+                        die(STATE_CRITICAL,
+                                "HTTP CRITICAL - Cannot retrieve certificates (unknown SSL library '%s', must "
+                                "implement first)\n",
+                                curlhelp_get_ssl_library_string(ssl_library));
+                        break;
+                }
+#       else  /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
+                /* old libcurl, our only hope is OpenSSL, otherwise we are out of luck */
+                if (ssl_library == CURLHELP_SSL_LIBRARY_OPENSSL ||
+                        ssl_library == CURLHELP_SSL_LIBRARY_LIBRESSL) {
+                        add_sslctx_verify_fun = true;
+                } else {
+                        die(STATE_CRITICAL, "HTTP CRITICAL - Cannot retrieve certificates (no "
+                                                                "CURLOPT_SSL_CTX_FUNCTION, no OpenSSL library or libcurl "
+                                                                "too old and has no CURLOPT_CERTINFO)\n");
+                }
+#       endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 1) */
+        }
+
+#       if LIBCURL_VERSION_NUM >=                                                                     \
+                MAKE_LIBCURL_VERSION(7, 10, 6) /* required for CURLOPT_SSL_CTX_FUNCTION */
+        // ssl ctx function is not available with all ssl backends
+        if (curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_CTX_FUNCTION, NULL) !=
+                CURLE_UNKNOWN_OPTION) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun),
+                        "CURLOPT_SSL_CTX_FUNCTION");
+        }
+#       endif
+#endif /* LIBCURL_FEATURE_SSL */
+
+        /* set default or user-given user agent identification */
+        handle_curl_option_return_code(
+                curl_easy_setopt(result.curl_state.curl, CURLOPT_USERAGENT, config.user_agent),
+                "CURLOPT_USERAGENT");
+
+        /* proxy-authentication */
+        if (strcmp(config.proxy_auth, "")) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_PROXYUSERPWD, config.proxy_auth),
+                        "CURLOPT_PROXYUSERPWD");
+        }
+
+        /* authentication */
+        if (strcmp(config.user_auth, "")) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_USERPWD, config.user_auth),
+                        "CURLOPT_USERPWD");
+        }
+        /* TODO: parameter auth method, bitfield of following methods:
+         * CURLAUTH_BASIC (default)
+         * CURLAUTH_DIGEST
+         * CURLAUTH_DIGEST_IE
+         * CURLAUTH_NEGOTIATE
+         * CURLAUTH_NTLM
+         * CURLAUTH_NTLM_WB
+         *
+         * convenience tokens for typical sets of methods:
+         * CURLAUTH_ANYSAFE: most secure, without BASIC
+         * or CURLAUTH_ANY: most secure, even BASIC if necessary
+         *
+         * handle_curl_option_return_code (curl_easy_setopt( curl, CURLOPT_HTTPAUTH,
+         * (long)CURLAUTH_DIGEST ), "CURLOPT_HTTPAUTH");
+         */
+
+        /* handle redirections */
+        if (on_redirect_dependent) {
+                if (follow_method == FOLLOW_LIBCURL) {
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_FOLLOWLOCATION, 1L),
+                                "CURLOPT_FOLLOWLOCATION");
+
+                        /* default -1 is infinite, not good, could lead to zombie plugins!
+                           Setting it to one bigger than maximal limit to handle errors nicely below
+                         */
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_MAXREDIRS, max_depth + 1),
+                                "CURLOPT_MAXREDIRS");
+
+                        /* for now allow only http and https (we are a http(s) check plugin in the end) */
+#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 0)
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_REDIR_PROTOCOLS_STR, "http,https"),
+                                "CURLOPT_REDIR_PROTOCOLS_STR");
+#elif LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4)
+                        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl,
+                                                                                                                        CURLOPT_REDIR_PROTOCOLS,
+                                                                                                                        CURLPROTO_HTTP | CURLPROTO_HTTPS),
+                                                                                   "CURLOPT_REDIRECT_PROTOCOLS");
+#endif
+
+                        /* TODO: handle the following aspects of redirection, make them
+                         * command line options too later:
+                          CURLOPT_POSTREDIR: method switch
+                          CURLINFO_REDIRECT_URL: custom redirect option
+                          CURLOPT_REDIRECT_PROTOCOLS: allow people to step outside safe protocols
+                          CURLINFO_REDIRECT_COUNT: get the number of redirects, print it, maybe a range
+                         option here is nice like for expected page size?
+                        */
+                } else {
+                        /* old style redirection*/
+                }
+        }
+        /* no-body */
+        if (working_state.no_body) {
+                handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl, CURLOPT_NOBODY, 1L),
+                                                                           "CURLOPT_NOBODY");
+        }
+
+        /* IPv4 or IPv6 forced DNS resolution */
+        if (config.sin_family == AF_UNSPEC) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_WHATEVER),
+                        "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_WHATEVER)");
+        } else if (config.sin_family == AF_INET) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4),
+                        "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_V4)");
+        }
+#if defined(USE_IPV6) && defined(LIBCURL_FEATURE_IPV6)
+        else if (config.sin_family == AF_INET6) {
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V6),
+                        "CURLOPT_IPRESOLVE(CURL_IPRESOLVE_V6)");
+        }
+#endif
+
+        /* either send http POST data (any data, not only POST)*/
+        if (!strcmp(working_state.http_method, "POST") || !strcmp(working_state.http_method, "PUT")) {
+                /* set content of payload for POST and PUT */
+                if (config.http_content_type) {
+                        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Content-Type: %s",
+                                         config.http_content_type);
+                        result.curl_state.header_list =
+                                curl_slist_append(result.curl_state.header_list, http_header);
+                }
+                /* NULL indicates "HTTP Continue" in libcurl, provide an empty string
+                 * in case of no POST/PUT data */
+                if (!working_state.http_post_data) {
+                        working_state.http_post_data = "";
+                }
+
+                if (!strcmp(working_state.http_method, "POST")) {
+                        /* POST method, set payload with CURLOPT_POSTFIELDS */
+                        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl,
+                                                                                                                        CURLOPT_POSTFIELDS,
+                                                                                                                        working_state.http_post_data),
+                                                                                   "CURLOPT_POSTFIELDS");
+                } else if (!strcmp(working_state.http_method, "PUT")) {
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_READFUNCTION,
+                                                                 (curl_read_callback)curlhelp_buffer_read_callback),
+                                "CURLOPT_READFUNCTION");
+                        if (curlhelp_initreadbuffer(&result.curl_state.put_buf, working_state.http_post_data,
+                                                                                strlen(working_state.http_post_data)) < 0) {
+                                die(STATE_UNKNOWN,
+                                        "HTTP CRITICAL - out of memory allocating read buffer for PUT\n");
+                        }
+                        result.curl_state.put_buf_initialized = true;
+                        handle_curl_option_return_code(curl_easy_setopt(result.curl_state.curl,
+                                                                                                                        CURLOPT_READDATA,
+                                                                                                                        (void *)result.curl_state.put_buf),
+                                                                                   "CURLOPT_READDATA");
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_INFILESIZE,
+                                                                 (curl_off_t)strlen(working_state.http_post_data)),
+                                "CURLOPT_INFILESIZE");
+                }
+        }
+
+        /* cookie handling */
+        if (config.cookie_jar_file != NULL) {
+                /* enable reading cookies from a file, and if the filename is an empty string, only
+                 * enable the curl cookie engine */
+                handle_curl_option_return_code(
+                        curl_easy_setopt(result.curl_state.curl, CURLOPT_COOKIEFILE, config.cookie_jar_file),
+                        "CURLOPT_COOKIEFILE");
+                /* now enable saving cookies to a file, but only if the filename is not an empty string,
+                 * since writing it would fail */
+                if (*config.cookie_jar_file) {
+                        handle_curl_option_return_code(
+                                curl_easy_setopt(result.curl_state.curl, CURLOPT_COOKIEJAR, config.cookie_jar_file),
+                                "CURLOPT_COOKIEJAR");
+                }
+        }
+
+        result.working_state = working_state;
+
+        return result;
+}
+
+void handle_curl_option_return_code(CURLcode res, const char *option) {
+        if (res != CURLE_OK) {
+                die(STATE_CRITICAL, _("Error while setting cURL option '%s': cURL returned %d - %s"),
+                        option, res, curl_easy_strerror(res));
+        }
+}
+
+char *get_header_value(const struct phr_header *headers, const size_t nof_headers,
+                                           const char *header) {
+        for (size_t i = 0; i < nof_headers; i++) {
+                if (headers[i].name != NULL &&
+                        strncasecmp(header, headers[i].name, max(headers[i].name_len, 4)) == 0) {
+                        return strndup(headers[i].value, headers[i].value_len);
+                }
+        }
+        return NULL;
+}
+
+check_curl_working_state check_curl_working_state_init() {
+        check_curl_working_state result = {
+                .server_address = NULL,
+                .server_url = DEFAULT_SERVER_URL,
+                .host_name = NULL,
+                .http_method = NULL,
+                .http_post_data = NULL,
+                .virtualPort = 0,
+                .serverPort = HTTP_PORT,
+                .use_ssl = false,
+                .no_body = false,
+        };
+        return result;
+}
+
+check_curl_config check_curl_config_init() {
+        check_curl_config tmp = {
+                .initial_config = check_curl_working_state_init(),
+
+                .curl_config =
+                        {
+                                .automatic_decompression = false,
+                                .socket_timeout = DEFAULT_SOCKET_TIMEOUT,
+                                .haproxy_protocol = false,
+                                .sin_family = AF_UNSPEC,
+                                .curl_http_version = CURL_HTTP_VERSION_NONE,
+                                .http_opt_headers = NULL,
+                                .http_opt_headers_count = 0,
+                                .ssl_version = CURL_SSLVERSION_DEFAULT,
+                                .client_cert = NULL,
+                                .client_privkey = NULL,
+                                .ca_cert = NULL,
+                                .verify_peer_and_host = false,
+                                .user_agent = {'\0'},
+                                .proxy_auth = "",
+                                .user_auth = "",
+                                .http_content_type = NULL,
+                                .cookie_jar_file = NULL,
+                        },
+                .max_depth = DEFAULT_MAX_REDIRS,
+                .followmethod = FOLLOW_HTTP_CURL,
+                .followsticky = STICKY_NONE,
+
+                .maximum_age = -1,
+                .regexp = {},
+                .compiled_regex = {},
+                .state_regex = STATE_CRITICAL,
+                .invert_regex = false,
+                .check_cert = false,
+                .continue_after_check_cert = false,
+                .days_till_exp_warn = 0,
+                .days_till_exp_crit = 0,
+                .thlds = mp_thresholds_init(),
+                .page_length_limits = mp_range_init(),
+                .page_length_limits_is_set = false,
+                .server_expect =
+                        {
+                                .string = HTTP_EXPECT,
+                                .is_present = false,
+                        },
+                .string_expect = "",
+                .header_expect = "",
+                .on_redirect_result_state = STATE_OK,
+                .on_redirect_dependent = false,
+
+                .show_extended_perfdata = false,
+                .show_body = false,
+
+                .output_format_is_set = false,
+        };
+
+        snprintf(tmp.curl_config.user_agent, DEFAULT_BUFFER_SIZE, "%s/v%s (monitoring-plugins %s, %s)",
+                         "check_curl", NP_VERSION, VERSION, curl_version());
+
+        return tmp;
+}
+
+/* TODO: is there a better way in libcurl to check for the SSL library? */
+curlhelp_ssl_library curlhelp_get_ssl_library(void) {
+        curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
+
+        curl_version_info_data *version_data = curl_version_info(CURLVERSION_NOW);
+        if (version_data == NULL) {
+                return CURLHELP_SSL_LIBRARY_UNKNOWN;
+        }
+
+        char *ssl_version = strdup(version_data->ssl_version);
+        if (ssl_version == NULL) {
+                return CURLHELP_SSL_LIBRARY_UNKNOWN;
+        }
+
+        char *library = strtok(ssl_version, "/");
+        if (library == NULL) {
+                return CURLHELP_SSL_LIBRARY_UNKNOWN;
+        }
+
+        if (strcmp(library, "OpenSSL") == 0) {
+                ssl_library = CURLHELP_SSL_LIBRARY_OPENSSL;
+        } else if (strcmp(library, "LibreSSL") == 0) {
+                ssl_library = CURLHELP_SSL_LIBRARY_LIBRESSL;
+        } else if (strcmp(library, "GnuTLS") == 0) {
+                ssl_library = CURLHELP_SSL_LIBRARY_GNUTLS;
+        } else if (strcmp(library, "NSS") == 0) {
+                ssl_library = CURLHELP_SSL_LIBRARY_NSS;
+        }
+
+        if (verbose >= 2) {
+                printf("* SSL library string is : %s %s (%d)\n", version_data->ssl_version, library,
+                           ssl_library);
+        }
+
+        free(ssl_version);
+
+        return ssl_library;
+}
+
+const char *curlhelp_get_ssl_library_string(const curlhelp_ssl_library ssl_library) {
+        switch (ssl_library) {
+        case CURLHELP_SSL_LIBRARY_OPENSSL:
+                return "OpenSSL";
+        case CURLHELP_SSL_LIBRARY_LIBRESSL:
+                return "LibreSSL";
+        case CURLHELP_SSL_LIBRARY_GNUTLS:
+                return "GnuTLS";
+        case CURLHELP_SSL_LIBRARY_NSS:
+                return "NSS";
+        case CURLHELP_SSL_LIBRARY_UNKNOWN:
+        default:
+                return "unknown";
+        }
+}
+
+size_t get_content_length(const curlhelp_write_curlbuf *header_buf,
+                                                  const curlhelp_write_curlbuf *body_buf) {
+        struct phr_header headers[255];
+        size_t nof_headers = 255;
+        size_t msglen;
+        curlhelp_statusline status_line;
+        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major,
+                                                                 &status_line.http_minor, &status_line.http_code, &status_line.msg,
+                                                                 &msglen, headers, &nof_headers, 0);
+
+        if (res == -1) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+        }
+
+        char *content_length_s = get_header_value(headers, nof_headers, "content-length");
+        if (!content_length_s) {
+                return header_buf->buflen + body_buf->buflen;
+        }
+
+        content_length_s += strspn(content_length_s, " \t");
+        size_t content_length = atoi(content_length_s);
+        if (content_length != body_buf->buflen) {
+                /* TODO: should we warn if the actual and the reported body length don't match? */
+        }
+
+        if (content_length_s) {
+                free(content_length_s);
+        }
+
+        return header_buf->buflen + body_buf->buflen;
+}
+
+mp_subcheck check_document_dates(const curlhelp_write_curlbuf *header_buf, const int maximum_age) {
+        struct phr_header headers[255];
+        size_t nof_headers = 255;
+        curlhelp_statusline status_line;
+        size_t msglen;
+        int res = phr_parse_response(header_buf->buf, header_buf->buflen, &status_line.http_major,
+                                                                 &status_line.http_minor, &status_line.http_code, &status_line.msg,
+                                                                 &msglen, headers, &nof_headers, 0);
+
+        if (res == -1) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+        }
+
+        char *server_date = get_header_value(headers, nof_headers, "date");
+        char *document_date = get_header_value(headers, nof_headers, "last-modified");
+
+        mp_subcheck sc_document_dates = mp_subcheck_init();
+        if (!server_date || !*server_date) {
+                xasprintf(&sc_document_dates.output, _("Server date unknown"));
+                sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_UNKNOWN);
+        } else if (!document_date || !*document_date) {
+                xasprintf(&sc_document_dates.output, _("Document modification date unknown, "));
+                sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_CRITICAL);
+        } else {
+                time_t srv_data = curl_getdate(server_date, NULL);
+                time_t doc_data = curl_getdate(document_date, NULL);
+
+                if (verbose >= 2) {
+                        printf("* server date: '%s' (%d), doc_date: '%s' (%d)\n", server_date, (int)srv_data,
+                                   document_date, (int)doc_data);
+                }
+
+                if (srv_data <= 0) {
+                        xasprintf(&sc_document_dates.output, _("Server date \"%100s\" unparsable"),
+                                          server_date);
+                        sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_CRITICAL);
+                } else if (doc_data <= 0) {
+
+                        xasprintf(&sc_document_dates.output, _("Document date \"%100s\" unparsable"),
+                                          document_date);
+                        sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_CRITICAL);
+                } else if (doc_data > srv_data + 30) {
+
+                        xasprintf(&sc_document_dates.output, _("Document is %d seconds in the future"),
+                                          (int)doc_data - (int)srv_data);
+
+                        sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_CRITICAL);
+                } else if (doc_data < srv_data - maximum_age) {
+                        time_t last_modified = (srv_data - doc_data);
+                        if (last_modified > (60 * 60 * 24 * 2)) { // two days hardcoded?
+                                xasprintf(&sc_document_dates.output, _("Last modified %.1f days ago"),
+                                                  ((float)last_modified) / (60 * 60 * 24));
+                                sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_CRITICAL);
+                        } else {
+                                xasprintf(&sc_document_dates.output, _("Last modified %lld:%02d:%02d ago"),
+                                                  (long long)last_modified / (60 * 60), (int)(last_modified / 60) % 60,
+                                                  (int)last_modified % 60);
+                                sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_CRITICAL);
+                        }
+                } else {
+                        // TODO is this the OK case?
+                        time_t last_modified = (srv_data - doc_data);
+                        xasprintf(&sc_document_dates.output, _("Last modified %lld:%02d:%02d ago"),
+                                          (long long)last_modified / (60 * 60), (int)(last_modified / 60) % 60,
+                                          (int)last_modified % 60);
+                        sc_document_dates = mp_set_subcheck_state(sc_document_dates, STATE_OK);
+                }
+        }
+
+        if (server_date) {
+                free(server_date);
+        }
+        if (document_date) {
+                free(document_date);
+        }
+
+        return sc_document_dates;
+}
+
+void curlhelp_free_statusline(curlhelp_statusline *status_line) { free(status_line->first_line); }
+
+int curlhelp_parse_statusline(const char *buf, curlhelp_statusline *status_line) {
+        /* find last start of a new header */
+        const char *start = strrstr2(buf, "\r\nHTTP/");
+        if (start != NULL) {
+                start += 2;
+                buf = start;
+        }
+
+        // Accept either LF or CRLF as end of line for the status line
+        // CRLF is the standard (RFC9112), but it is recommended to accept both
+        size_t length_of_first_line = strcspn(buf, "\r\n");
+        const char *first_line_end = &buf[length_of_first_line];
+        if (first_line_end == NULL) {
+                return -1;
+        }
+
+        size_t first_line_len = (size_t)(first_line_end - buf);
+        status_line->first_line = (char *)calloc(first_line_len + 1, sizeof(char));
+        if (status_line->first_line == NULL) {
+                return -1;
+        }
+
+        memcpy(status_line->first_line, buf, first_line_len);
+        status_line->first_line[first_line_len] = '\0';
+        char *first_line_buf = strdup(status_line->first_line);
+
+        /* protocol and version: "HTTP/x.x" SP or "HTTP/2" SP */
+        char *temp_string = strtok(first_line_buf, "/");
+        if (temp_string == NULL) {
+                if (verbose > 1) {
+                        printf("%s: no / found\n", __func__);
+                }
+                free(first_line_buf);
+                return -1;
+        }
+
+        if (strcmp(temp_string, "HTTP") != 0) {
+                if (verbose > 1) {
+                        printf("%s: string 'HTTP' not found\n", __func__);
+                }
+                free(first_line_buf);
+                return -1;
+        }
+
+        // try to find a space in the remaining string?
+        // the space after HTTP/1.1 probably
+        temp_string = strtok(NULL, " ");
+        if (temp_string == NULL) {
+                if (verbose > 1) {
+                        printf("%s: no space after protocol definition\n", __func__);
+                }
+                free(first_line_buf);
+                return -1;
+        }
+
+        char *temp_string_2;
+        if (strchr(temp_string, '.') != NULL) {
+                /* HTTP 1.x case */
+                strtok(temp_string, ".");
+                status_line->http_major = (int)strtol(temp_string, &temp_string_2, 10);
+                if (*temp_string_2 != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                strtok(NULL, " ");
+                status_line->http_minor = (int)strtol(temp_string, &temp_string_2, 10);
+                if (*temp_string_2 != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                temp_string += 4; /* 1.x SP */
+        } else {
+                /* HTTP 2 case */
+                status_line->http_major = (int)strtol(temp_string, &temp_string_2, 10);
+                status_line->http_minor = 0;
+                temp_string += 2; /* 2 SP */
+        }
+
+        /* status code: "404" or "404.1", then SP */
+        temp_string = strtok(temp_string, " ");
+        if (temp_string == NULL) {
+                free(first_line_buf);
+                return -1;
+        }
+        if (strchr(temp_string, '.') != NULL) {
+                char *ppp;
+                ppp = strtok(temp_string, ".");
+                status_line->http_code = (int)strtol(ppp, &temp_string_2, 10);
+                if (*temp_string_2 != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                ppp = strtok(NULL, "");
+                status_line->http_subcode = (int)strtol(ppp, &temp_string_2, 10);
+                if (*temp_string_2 != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                temp_string += 6; /* 400.1 SP */
+        } else {
+                status_line->http_code = (int)strtol(temp_string, &temp_string_2, 10);
+                status_line->http_subcode = -1;
+                if (*temp_string_2 != '\0') {
+                        free(first_line_buf);
+                        return -1;
+                }
+                temp_string += 4; /* 400 SP */
+        }
+
+        /* Human readable message: "Not Found" CRLF */
+
+        temp_string = strtok(temp_string, "");
+        if (temp_string == NULL) {
+                status_line->msg = "";
+                return 0;
+        }
+        status_line->msg = status_line->first_line + (temp_string - first_line_buf);
+        free(first_line_buf);
+
+        return 0;
+}
+
+/* TODO: where to put this, it's actually part of sstrings2 (logically)?
+ */
+const char *strrstr2(const char *haystack, const char *needle) {
+        if (haystack == NULL || needle == NULL) {
+                return NULL;
+        }
+
+        if (haystack[0] == '\0' || needle[0] == '\0') {
+                return NULL;
+        }
+
+        int counter = 0;
+        const char *prev_pos = NULL;
+        const char *pos = haystack;
+        size_t len = strlen(needle);
+        for (;;) {
+                pos = strstr(pos, needle);
+                if (pos == NULL) {
+                        if (counter == 0) {
+                                return NULL;
+                        }
+                        return prev_pos;
+                }
+                counter++;
+                prev_pos = pos;
+                pos += len;
+                if (*pos == '\0') {
+                        return prev_pos;
+                }
+        }
+}
+
+void curlhelp_freereadbuffer(curlhelp_read_curlbuf *buf) {
+        free(buf->buf);
+        buf->buf = NULL;
+}
+
+void curlhelp_freewritebuffer(curlhelp_write_curlbuf *buf) {
+        free(buf->buf);
+        buf->buf = NULL;
+}
+
+int curlhelp_initreadbuffer(curlhelp_read_curlbuf **buf, const char *data, size_t datalen) {
+        if ((*buf = calloc(1, sizeof(curlhelp_read_curlbuf))) == NULL) {
+                return 1;
+        }
+
+        (*buf)->buflen = datalen;
+        (*buf)->buf = (char *)calloc((*buf)->buflen, sizeof(char));
+        if ((*buf)->buf == NULL) {
+                return -1;
+        }
+        memcpy((*buf)->buf, data, datalen);
+        (*buf)->pos = 0;
+        return 0;
+}
+
+size_t curlhelp_buffer_read_callback(void *buffer, size_t size, size_t nmemb, void *stream) {
+        curlhelp_read_curlbuf *buf = (curlhelp_read_curlbuf *)stream;
+
+        size_t minimalSize = min(nmemb * size, buf->buflen - buf->pos);
+
+        memcpy(buffer, buf->buf + buf->pos, minimalSize);
+        buf->pos += minimalSize;
+
+        return minimalSize;
+}
+
+int curlhelp_initwritebuffer(curlhelp_write_curlbuf **buf) {
+        if ((*buf = calloc(1, sizeof(curlhelp_write_curlbuf))) == NULL) {
+                return 1;
+        }
+        (*buf)->bufsize = DEFAULT_BUFFER_SIZE * sizeof(char);
+        (*buf)->buflen = 0;
+        (*buf)->buf = (char *)calloc((*buf)->bufsize, sizeof(char));
+        if ((*buf)->buf == NULL) {
+                return -1;
+        }
+        return 0;
+}
+
+size_t curlhelp_buffer_write_callback(void *buffer, size_t size, size_t nmemb, void *stream) {
+        curlhelp_write_curlbuf *buf = (curlhelp_write_curlbuf *)stream;
+
+        while (buf->bufsize < buf->buflen + size * nmemb + 1) {
+                buf->bufsize = buf->bufsize * 2;
+                buf->buf = (char *)realloc(buf->buf, buf->bufsize);
+                if (buf->buf == NULL) {
+                        fprintf(stderr, "malloc failed (%d) %s\n", errno, strerror(errno));
+                        return 0;
+                }
+        }
+
+        memcpy(buf->buf + buf->buflen, buffer, size * nmemb);
+        buf->buflen += size * nmemb;
+        buf->buf[buf->buflen] = '\0';
+
+        return size * nmemb;
+}
+
+void cleanup(check_curl_global_state global_state) {
+        if (global_state.status_line_initialized) {
+                curlhelp_free_statusline(global_state.status_line);
+        }
+        global_state.status_line_initialized = false;
+
+        if (global_state.curl_easy_initialized) {
+                curl_easy_cleanup(global_state.curl);
+        }
+        global_state.curl_easy_initialized = false;
+
+        if (global_state.curl_global_initialized) {
+                curl_global_cleanup();
+        }
+        global_state.curl_global_initialized = false;
+
+        if (global_state.body_buf_initialized) {
+                curlhelp_freewritebuffer(global_state.body_buf);
+        }
+        global_state.body_buf_initialized = false;
+
+        if (global_state.header_buf_initialized) {
+                curlhelp_freewritebuffer(global_state.header_buf);
+        }
+        global_state.header_buf_initialized = false;
+
+        if (global_state.put_buf_initialized) {
+                curlhelp_freereadbuffer(global_state.put_buf);
+        }
+        global_state.put_buf_initialized = false;
+
+        if (global_state.header_list) {
+                curl_slist_free_all(global_state.header_list);
+        }
+
+        if (global_state.host) {
+                curl_slist_free_all(global_state.host);
+        }
+}
+
+int lookup_host(const char *host, char *buf, size_t buflen, sa_family_t addr_family) {
+        struct addrinfo hints = {
+                .ai_family = addr_family,
+                .ai_socktype = SOCK_STREAM,
+                .ai_flags = AI_CANONNAME,
+        };
+
+        struct addrinfo *result;
+        int errcode = getaddrinfo(host, NULL, &hints, &result);
+        if (errcode != 0) {
+                return errcode;
+        }
+
+        strcpy(buf, "");
+        struct addrinfo *res = result;
+
+        size_t buflen_remaining = buflen - 1;
+        size_t addrstr_len;
+        char addrstr[100];
+        void *ptr = {0};
+        while (res) {
+                switch (res->ai_family) {
+                case AF_INET:
+                        ptr = &((struct sockaddr_in *)res->ai_addr)->sin_addr;
+                        break;
+                case AF_INET6:
+                        ptr = &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
+                        break;
+                }
+
+                inet_ntop(res->ai_family, ptr, addrstr, 100);
+                if (verbose >= 1) {
+                        printf("* getaddrinfo IPv%d address: %s\n", res->ai_family == PF_INET6 ? 6 : 4,
+                                   addrstr);
+                }
+
+                // Append all IPs to buf as a comma-separated string
+                addrstr_len = strlen(addrstr);
+                if (buflen_remaining > addrstr_len + 1) {
+                        if (buf[0] != '\0') {
+                                strncat(buf, ",", buflen_remaining);
+                                buflen_remaining -= 1;
+                        }
+                        strncat(buf, addrstr, buflen_remaining);
+                        buflen_remaining -= addrstr_len;
+                }
+
+                res = res->ai_next;
+        }
+
+        freeaddrinfo(result);
+
+        return 0;
+}
+
+/* Checks if the server 'reply' is one of the expected 'statuscodes' */
+bool expected_statuscode(const char *reply, const char *statuscodes) {
+        char *expected;
+
+        if ((expected = strdup(statuscodes)) == NULL) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
+        }
+
+        bool result = false;
+        for (char *code = strtok(expected, ","); code != NULL; code = strtok(NULL, ",")) {
+                if (strstr(reply, code) != NULL) {
+                        result = true;
+                        break;
+                }
+        }
+
+        free(expected);
+        return result;
+}
+
+/* returns a string "HTTP/1.x" or "HTTP/2" */
+char *string_statuscode(int major, int minor) {
+        static char buf[10];
+
+        switch (major) {
+        case 1:
+                snprintf(buf, sizeof(buf), "HTTP/%d.%d", major, minor);
+                break;
+        case 2:
+        case 3:
+                snprintf(buf, sizeof(buf), "HTTP/%d", major);
+                break;
+        default:
+                /* assuming here HTTP/N with N>=4 */
+                snprintf(buf, sizeof(buf), "HTTP/%d", major);
+                break;
+        }
+
+        return buf;
+}
+
+/* check whether a file exists */
+void test_file(char *path) {
+        if (access(path, R_OK) == 0) {
+                return;
+        }
+        usage2(_("file does not exist or is not readable"), path);
+}
+
+mp_subcheck mp_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn,
+                                                                                 int days_till_exp_crit);
+
+mp_subcheck check_curl_certificate_checks(CURL *curl, X509 *cert, int warn_days_till_exp,
+                                                                                  int crit_days_till_exp) {
+        mp_subcheck sc_cert_result = mp_subcheck_init();
+        sc_cert_result = mp_set_subcheck_default_state(sc_cert_result, STATE_OK);
+
+#ifdef LIBCURL_FEATURE_SSL
+        if (is_openssl_callback) {
+#       ifdef USE_OPENSSL
+                /* check certificate with OpenSSL functions, curl has been built against OpenSSL
+                 * and we actually have OpenSSL in the monitoring tools
+                 */
+                return mp_net_ssl_check_certificate(cert, warn_days_till_exp, crit_days_till_exp);
+#       else  /* USE_OPENSSL */
+                xasprintf(&result.output, "HTTP CRITICAL - Cannot retrieve certificates - OpenSSL "
+                                                                  "callback used and not linked against OpenSSL\n");
+                mp_set_subcheck_state(result, STATE_CRITICAL);
+#       endif /* USE_OPENSSL */
+        } else {
+                struct curl_slist *slist;
+
+                cert_ptr_union cert_ptr = {0};
+                cert_ptr.to_info = NULL;
+                CURLcode res = curl_easy_getinfo(curl, CURLINFO_CERTINFO, &cert_ptr.to_info);
+                if (!res && cert_ptr.to_info) {
+#       ifdef USE_OPENSSL
+                        /* We have no OpenSSL in libcurl, but we can use OpenSSL for X509 cert
+                         * parsing We only check the first certificate and assume it's the one of
+                         * the server
+                         */
+                        char *raw_cert = NULL;
+                        bool got_first_cert = false;
+                        for (int i = 0; i < cert_ptr.to_certinfo->num_of_certs; i++) {
+                                if (got_first_cert) {
+                                        break;
+                                }
+
+                                for (slist = cert_ptr.to_certinfo->certinfo[i]; slist; slist = slist->next) {
+                                        if (verbose >= 2) {
+                                                printf("%d ** %s\n", i, slist->data);
+                                        }
+                                        if (strncmp(slist->data, "Cert:", 5) == 0) {
+                                                raw_cert = &slist->data[5];
+                                                got_first_cert = true;
+                                                break;
+                                        }
+                                }
+                        }
+
+                        if (!raw_cert) {
+
+                                xasprintf(&sc_cert_result.output,
+                                                  _("Cannot retrieve certificates from CERTINFO information - "
+                                                        "certificate data was empty"));
+                                sc_cert_result = mp_set_subcheck_state(sc_cert_result, STATE_CRITICAL);
+                                return sc_cert_result;
+                        }
+
+                        BIO *cert_BIO = BIO_new(BIO_s_mem());
+                        BIO_write(cert_BIO, raw_cert, (int)strlen(raw_cert));
+
+                        cert = PEM_read_bio_X509(cert_BIO, NULL, NULL, NULL);
+                        if (!cert) {
+                                xasprintf(&sc_cert_result.output,
+                                                  _("Cannot read certificate from CERTINFO information - BIO error"));
+                                sc_cert_result = mp_set_subcheck_state(sc_cert_result, STATE_CRITICAL);
+                                return sc_cert_result;
+                        }
+
+                        BIO_free(cert_BIO);
+                        return mp_net_ssl_check_certificate(cert, warn_days_till_exp, crit_days_till_exp);
+#       else  /* USE_OPENSSL */
+                        /* We assume we don't have OpenSSL and np_net_ssl_check_certificate at our
+                         * disposal, so we use the libcurl CURLINFO data
+                         */
+                        return net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn,
+                                                                                                   days_till_exp_crit);
+#       endif /* USE_OPENSSL */
+                } else {
+                        xasprintf(&sc_cert_result.output,
+                                          _("Cannot retrieve certificates - cURL returned %d - %s"), res,
+                                          curl_easy_strerror(res));
+                        mp_set_subcheck_state(sc_cert_result, STATE_CRITICAL);
+                }
+        }
+#endif /* LIBCURL_FEATURE_SSL */
+
+        return sc_cert_result;
+}
+
+char *fmt_url(check_curl_working_state workingState) {
+        char *url = calloc(DEFAULT_BUFFER_SIZE, sizeof(char));
+        if (url == NULL) {
+                die(STATE_UNKNOWN, "memory allocation failed");
+        }
+
+        snprintf(url, DEFAULT_BUFFER_SIZE, "%s://%s:%d%s", workingState.use_ssl ? "https" : "http",
+                         (workingState.use_ssl & (workingState.host_name != NULL))
+                                 ? workingState.host_name
+                                 : workingState.server_address,
+                         workingState.serverPort, workingState.server_url);
+
+        return url;
+}
diff --git a/plugins/check_curl.d/check_curl_helpers.h b/plugins/check_curl.d/check_curl_helpers.h
new file mode 100644
index 00000000..e77b763b
--- /dev/null
+++ b/plugins/check_curl.d/check_curl_helpers.h
@@ -0,0 +1,128 @@
+#include "./config.h"
+#include <curl/curl.h>
+#include "../picohttpparser/picohttpparser.h"
+#include "output.h"
+
+#if defined(HAVE_SSL) && defined(USE_OPENSSL)
+#       include <openssl/opensslv.h>
+#endif
+
+enum {
+        MAX_IPV4_HOSTLENGTH = 255,
+};
+
+/* for buffers for header and body */
+typedef struct {
+        size_t buflen;
+        size_t bufsize;
+        char *buf;
+} curlhelp_write_curlbuf;
+
+/* for buffering the data sent in PUT */
+typedef struct {
+        size_t buflen;
+        off_t pos;
+        char *buf;
+} curlhelp_read_curlbuf;
+
+/* for parsing the HTTP status line */
+typedef struct {
+        int http_major;   /* major version of the protocol, always 1 (HTTP/0.9
+                                           * never reached the big internet most likely) */
+        int http_minor;   /* minor version of the protocol, usually 0 or 1 */
+        int http_code;    /* HTTP return code as in RFC 2145 */
+        int http_subcode; /* Microsoft IIS extension, HTTP subcodes, see
+                                           * http://support.microsoft.com/kb/318380/en-us */
+        const char *msg;  /* the human readable message */
+        char *first_line; /* a copy of the first line */
+} curlhelp_statusline;
+
+typedef struct {
+        bool curl_global_initialized;
+        bool curl_easy_initialized;
+
+        bool body_buf_initialized;
+        curlhelp_write_curlbuf *body_buf;
+
+        bool header_buf_initialized;
+        curlhelp_write_curlbuf *header_buf;
+
+        bool status_line_initialized;
+        curlhelp_statusline *status_line;
+
+        bool put_buf_initialized;
+        curlhelp_read_curlbuf *put_buf;
+
+        CURL *curl;
+
+        struct curl_slist *header_list;
+        struct curl_slist *host;
+} check_curl_global_state;
+
+/* to know the underlying SSL library used by libcurl */
+typedef enum curlhelp_ssl_library {
+        CURLHELP_SSL_LIBRARY_UNKNOWN,
+        CURLHELP_SSL_LIBRARY_OPENSSL,
+        CURLHELP_SSL_LIBRARY_LIBRESSL,
+        CURLHELP_SSL_LIBRARY_GNUTLS,
+        CURLHELP_SSL_LIBRARY_NSS
+} curlhelp_ssl_library;
+
+#define MAKE_LIBCURL_VERSION(major, minor, patch) ((major) * 0x10000 + (minor) * 0x100 + (patch))
+
+typedef struct {
+        int errorcode;
+        check_curl_global_state curl_state;
+        check_curl_working_state working_state;
+} check_curl_configure_curl_wrapper;
+
+check_curl_configure_curl_wrapper check_curl_configure_curl(check_curl_static_curl_config config,
+                                                                                                                        check_curl_working_state working_state,
+                                                                                                                        bool check_cert,
+                                                                                                                        bool on_redirect_dependent,
+                                                                                                                        int follow_method, long max_depth);
+
+void handle_curl_option_return_code(CURLcode res, const char *option);
+
+int curlhelp_initwritebuffer(curlhelp_write_curlbuf **buf);
+size_t curlhelp_buffer_write_callback(void * /*buffer*/, size_t /*size*/, size_t /*nmemb*/,
+                                                                          void * /*stream*/);
+void curlhelp_freewritebuffer(curlhelp_write_curlbuf * /*buf*/);
+
+int curlhelp_initreadbuffer(curlhelp_read_curlbuf **buf, const char * /*data*/, size_t /*datalen*/);
+size_t curlhelp_buffer_read_callback(void * /*buffer*/, size_t /*size*/, size_t /*nmemb*/,
+                                                                         void * /*stream*/);
+void curlhelp_freereadbuffer(curlhelp_read_curlbuf * /*buf*/);
+
+curlhelp_ssl_library curlhelp_get_ssl_library(void);
+const char *curlhelp_get_ssl_library_string(curlhelp_ssl_library /*ssl_library*/);
+
+typedef union {
+        struct curl_slist *to_info;
+        struct curl_certinfo *to_certinfo;
+} cert_ptr_union;
+int net_noopenssl_check_certificate(cert_ptr_union *, int, int);
+
+int curlhelp_parse_statusline(const char * /*buf*/, curlhelp_statusline * /*status_line*/);
+void curlhelp_free_statusline(curlhelp_statusline * /*status_line*/);
+
+char *get_header_value(const struct phr_header *headers, size_t nof_headers, const char *header);
+mp_subcheck check_document_dates(const curlhelp_write_curlbuf * /*header_buf*/,
+                                                                 int /*maximum_age*/);
+size_t get_content_length(const curlhelp_write_curlbuf *header_buf,
+                                                  const curlhelp_write_curlbuf *body_buf);
+int lookup_host(const char *host, char *buf, size_t buflen, sa_family_t addr_family);
+CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm);
+
+#define INET_ADDR_MAX_SIZE INET6_ADDRSTRLEN
+const char *strrstr2(const char *haystack, const char *needle);
+
+void cleanup(check_curl_global_state global_state);
+
+bool expected_statuscode(const char *reply, const char *statuscodes);
+char *string_statuscode(int major, int minor);
+
+void test_file(char *path);
+mp_subcheck check_curl_certificate_checks(CURL *curl, X509 *cert, int warn_days_till_exp,
+                                                                                  int crit_days_till_exp);
+char *fmt_url(check_curl_working_state workingState);
diff --git a/plugins/check_curl.d/config.h b/plugins/check_curl.d/config.h
new file mode 100644
index 00000000..61067d46
--- /dev/null
+++ b/plugins/check_curl.d/config.h
@@ -0,0 +1,116 @@
+#pragma once
+
+#include "../../config.h"
+#include "../common.h"
+#include "../../lib/states.h"
+#include "../../lib/thresholds.h"
+#include <stddef.h>
+#include <string.h>
+#include <sys/socket.h>
+#include "curl/curl.h"
+#include "perfdata.h"
+#include "regex.h"
+
+enum {
+        MAX_RE_SIZE = 1024,
+        HTTP_PORT = 80,
+        HTTPS_PORT = 443,
+        MAX_PORT = 65535,
+        DEFAULT_MAX_REDIRS = 15
+};
+
+enum {
+        FOLLOW_HTTP_CURL = 0,
+        FOLLOW_LIBCURL = 1
+};
+
+enum {
+        STICKY_NONE = 0,
+        STICKY_HOST = 1,
+        STICKY_PORT = 2
+};
+
+#define HTTP_EXPECT         "HTTP/"
+#define DEFAULT_BUFFER_SIZE 2048
+#define DEFAULT_SERVER_URL  "/"
+
+typedef struct {
+        char *server_address;
+        char *server_url;
+        char *host_name;
+
+        char *http_method;
+
+        char *http_post_data;
+
+        unsigned short virtualPort;
+        unsigned short serverPort;
+
+        bool use_ssl;
+        bool no_body;
+} check_curl_working_state;
+
+check_curl_working_state check_curl_working_state_init();
+
+typedef struct {
+        bool automatic_decompression;
+        bool haproxy_protocol;
+        long socket_timeout;
+        sa_family_t sin_family;
+        long curl_http_version;
+        char **http_opt_headers;
+        size_t http_opt_headers_count;
+        long ssl_version;
+        char *client_cert;
+        char *client_privkey;
+        char *ca_cert;
+        bool verify_peer_and_host;
+        char user_agent[DEFAULT_BUFFER_SIZE];
+        char proxy_auth[MAX_INPUT_BUFFER];
+        char user_auth[MAX_INPUT_BUFFER];
+        char *http_content_type;
+        char *cookie_jar_file;
+} check_curl_static_curl_config;
+
+typedef struct {
+        check_curl_working_state initial_config;
+
+        check_curl_static_curl_config curl_config;
+        long max_depth;
+        int followmethod;
+        int followsticky;
+
+        int maximum_age;
+
+        // the original regex string from the command line
+        char regexp[MAX_RE_SIZE];
+
+        // the compiled regex for usage later
+        regex_t compiled_regex;
+
+        mp_state_enum state_regex;
+        bool invert_regex;
+        bool check_cert;
+        bool continue_after_check_cert;
+        int days_till_exp_warn;
+        int days_till_exp_crit;
+        mp_thresholds thlds;
+        mp_range page_length_limits;
+        bool page_length_limits_is_set;
+        struct {
+                char string[MAX_INPUT_BUFFER];
+                bool is_present;
+        } server_expect;
+        char string_expect[MAX_INPUT_BUFFER];
+        char header_expect[MAX_INPUT_BUFFER];
+        mp_state_enum on_redirect_result_state;
+        bool on_redirect_dependent;
+
+        bool show_extended_perfdata;
+        bool show_body;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
+} check_curl_config;
+
+check_curl_config check_curl_config_init();
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c
index 9efcd1cb..81d92952 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -34,6 +34,10 @@ const char *copyright = "2011-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "../lib/monitoringplug.h"
+#include "thresholds.h"
+#include "perfdata.h"
+#include "output.h"
+#include "states.h"
 #include "check_dbi.d/config.h"
 #include "common.h"
 #include "utils.h"
@@ -63,7 +67,6 @@ typedef struct {
 } check_dbi_config_wrapper;
 
 static check_dbi_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
-static check_dbi_config_wrapper validate_arguments(check_dbi_config_wrapper /*config_wrapper*/);
 void print_usage(void);
 static void print_help(void);
 
@@ -71,25 +74,18 @@ static double timediff(struct timeval /*start*/, struct timeval /*end*/);
 
 static void np_dbi_print_error(dbi_conn /*conn*/, char * /*fmt*/, ...);
 
-static mp_state_enum do_query(dbi_conn /*conn*/, const char ** /*res_val_str*/, double * /*res_val*/, double * /*res_time*/, mp_dbi_metric /*metric*/,
-                                        mp_dbi_type /*type*/, char * /*np_dbi_query*/);
+typedef struct {
+        char *result_string;
+        double result_number;
+        double query_duration;
+        int error_code;
+        const char *error_string;
+        mp_state_enum query_processing_status;
+} do_query_result;
+static do_query_result do_query(dbi_conn conn, check_dbi_metric metric, check_dbi_type type,
+                                                                char *query);
 
 int main(int argc, char **argv) {
-        int status = STATE_UNKNOWN;
-
-        dbi_driver driver;
-        dbi_conn conn;
-
-        unsigned int server_version;
-
-        struct timeval start_timeval;
-        struct timeval end_timeval;
-        double conn_time = 0.0;
-        double query_time = 0.0;
-
-        const char *query_val_str = NULL;
-        double query_val = 0.0;
-
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
@@ -105,6 +101,10 @@ int main(int argc, char **argv) {
 
         const check_dbi_config config = tmp.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* Set signal handling and alarm */
         if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage4(_("Cannot catch SIGALRM"));
@@ -115,63 +115,71 @@ int main(int argc, char **argv) {
                 printf("Initializing DBI\n");
         }
 
-        dbi_inst *instance_p = {0};
-
-        if (dbi_initialize_r(NULL, instance_p) < 0) {
-                printf("UNKNOWN - failed to initialize DBI; possibly you don't have any drivers installed.\n");
-                return STATE_UNKNOWN;
+        dbi_inst instance_p = NULL;
+        if (dbi_initialize_r(NULL, &instance_p) < 0) {
+                printf("failed to initialize DBI; possibly you don't have any drivers installed.\n");
+                exit(STATE_UNKNOWN);
         }
 
+        // Try to prevent libdbi from printing stuff on stderr
+        // Who thought that would be a good idea anyway?
+        dbi_set_verbosity_r(0, instance_p);
+
         if (instance_p == NULL) {
-                printf("UNKNOWN - failed to initialize DBI.\n");
-                return STATE_UNKNOWN;
+                printf("failed to initialize DBI.\n");
+                exit(STATE_UNKNOWN);
         }
 
         if (verbose) {
                 printf("Opening DBI driver '%s'\n", config.dbi_driver);
         }
 
-        driver = dbi_driver_open_r(config.dbi_driver, instance_p);
+        dbi_driver driver = dbi_driver_open_r(config.dbi_driver, instance_p);
         if (!driver) {
-                printf("UNKNOWN - failed to open DBI driver '%s'; possibly it's not installed.\n", config.dbi_driver);
+                printf("failed to open DBI driver '%s'; possibly it's not installed.\n", config.dbi_driver);
 
                 printf("Known drivers:\n");
-                for (driver = dbi_driver_list_r(NULL, instance_p); driver; driver = dbi_driver_list_r(driver, instance_p)) {
+                for (driver = dbi_driver_list_r(NULL, instance_p); driver;
+                         driver = dbi_driver_list_r(driver, instance_p)) {
                         printf(" - %s\n", dbi_driver_get_name(driver));
                 }
-                return STATE_UNKNOWN;
+                exit(STATE_UNKNOWN);
         }
 
         /* make a connection to the database */
+        struct timeval start_timeval;
         gettimeofday(&start_timeval, NULL);
 
-        conn = dbi_conn_open(driver);
+        dbi_conn conn = dbi_conn_open(driver);
         if (!conn) {
                 printf("UNKNOWN - failed top open connection object.\n");
                 dbi_conn_close(conn);
-                return STATE_UNKNOWN;
+                exit(STATE_UNKNOWN);
         }
 
         for (size_t i = 0; i < config.dbi_options_num; ++i) {
                 const char *opt;
 
                 if (verbose > 1) {
-                        printf("Setting DBI driver option '%s' to '%s'\n", config.dbi_options[i].key, config.dbi_options[i].value);
+                        printf("Setting DBI driver option '%s' to '%s'\n", config.dbi_options[i].key,
+                                   config.dbi_options[i].value);
                 }
 
                 if (!dbi_conn_set_option(conn, config.dbi_options[i].key, config.dbi_options[i].value)) {
                         continue;
                 }
-                /* else: status != 0 */
 
-                np_dbi_print_error(conn, "UNKNOWN - failed to set option '%s' to '%s'", config.dbi_options[i].key, config.dbi_options[i].value);
+                // Failing to set option
+                np_dbi_print_error(conn, "failed to set option '%s' to '%s'", config.dbi_options[i].key,
+                                                   config.dbi_options[i].value);
                 printf("Known driver options:\n");
 
-                for (opt = dbi_conn_get_option_list(conn, NULL); opt; opt = dbi_conn_get_option_list(conn, opt)) {
+                for (opt = dbi_conn_get_option_list(conn, NULL); opt;
+                         opt = dbi_conn_get_option_list(conn, opt)) {
                         printf(" - %s\n", opt);
                 }
                 dbi_conn_close(conn);
-                return STATE_UNKNOWN;
+                exit(STATE_UNKNOWN);
         }
 
         if (config.host) {
@@ -199,78 +207,216 @@ int main(int argc, char **argv) {
         }
 
         if (dbi_conn_connect(conn) < 0) {
-                np_dbi_print_error(conn, "UNKNOWN - failed to connect to database");
-                return STATE_UNKNOWN;
+                np_dbi_print_error(conn, "failed to connect to database");
+                exit(STATE_UNKNOWN);
         }
 
+        struct timeval end_timeval;
         gettimeofday(&end_timeval, NULL);
-        conn_time = timediff(start_timeval, end_timeval);
-
-        server_version = dbi_conn_get_engine_version(conn);
+        double conn_time = timediff(start_timeval, end_timeval);
         if (verbose) {
-                printf("Connected to server version %u\n", server_version);
+                printf("Time elapsed: %f\n", conn_time);
         }
 
-        if (config.metric == METRIC_SERVER_VERSION) {
-                status = get_status(server_version, config.dbi_thresholds);
+        mp_check overall = mp_check_init();
+
+        mp_subcheck sc_connection_time = mp_subcheck_init();
+        sc_connection_time = mp_set_subcheck_default_state(sc_connection_time, STATE_OK);
+        xasprintf(&sc_connection_time.output, "Connection time: %f", conn_time);
+
+        mp_perfdata pd_conn_duration = perfdata_init();
+        pd_conn_duration.label = "conntime";
+        pd_conn_duration = mp_set_pd_value(pd_conn_duration, conn_time);
+
+        if (config.metric == METRIC_CONN_TIME) {
+                pd_conn_duration = mp_pd_set_thresholds(pd_conn_duration, config.thresholds);
+                mp_state_enum status = mp_get_pd_status(pd_conn_duration);
+                sc_connection_time = mp_set_subcheck_state(sc_connection_time, status);
+                if (status != STATE_OK) {
+                        xasprintf(&sc_connection_time.output, "%s violates thresholds",
+                                          sc_connection_time.output);
+                }
         }
 
+        mp_add_perfdata_to_subcheck(&sc_connection_time, pd_conn_duration);
+        mp_add_subcheck_to_check(&overall, sc_connection_time);
+
+        unsigned int server_version = dbi_conn_get_engine_version(conn);
         if (verbose) {
-                printf("Time elapsed: %f\n", conn_time);
+                printf("Connected to server version %u\n", server_version);
         }
 
-        if (config.metric == METRIC_CONN_TIME) {
-                status = get_status(conn_time, config.dbi_thresholds);
-        }
+        mp_subcheck sc_server_version = mp_subcheck_init();
+        sc_server_version = mp_set_subcheck_default_state(sc_server_version, STATE_OK);
+        xasprintf(&sc_server_version.output, "Connected to server version %u", server_version);
+
+        if (config.metric == METRIC_SERVER_VERSION) {
+                mp_perfdata pd_server_version = perfdata_init();
+                pd_server_version = mp_set_pd_value(pd_server_version, server_version);
+                pd_server_version = mp_pd_set_thresholds(pd_server_version, config.thresholds);
+                mp_state_enum status = mp_get_pd_status(pd_server_version);
+                mp_add_perfdata_to_subcheck(&sc_server_version, pd_server_version);
+
+                sc_server_version = mp_set_subcheck_state(sc_server_version, status);
+
+                if (status != STATE_OK) {
+                        xasprintf(&sc_server_version.output, "%s violates thresholds",
+                                          sc_server_version.output);
+                }
+        };
+        mp_add_subcheck_to_check(&overall, sc_server_version);
 
         /* select a database */
-        if (config.dbi_database) {
+        if (config.database) {
                 if (verbose > 1) {
-                        printf("Selecting database '%s'\n", config.dbi_database);
+                        printf("Selecting database '%s'\n", config.database);
                 }
 
-                if (dbi_conn_select_db(conn, config.dbi_database)) {
-                        np_dbi_print_error(conn, "UNKNOWN - failed to select database '%s'", config.dbi_database);
-                        return STATE_UNKNOWN;
+                mp_subcheck sc_select_db = mp_subcheck_init();
+                sc_select_db = mp_set_subcheck_default_state(sc_select_db, STATE_OK);
+
+                if (dbi_conn_select_db(conn, config.database)) {
+                        np_dbi_print_error(conn, "UNKNOWN - failed to select database '%s'", config.database);
+                        exit(STATE_UNKNOWN);
+                } else {
+                        mp_add_subcheck_to_check(&overall, sc_select_db);
                 }
         }
 
-        if (config.dbi_query) {
+        // Do a query (if configured)
+        if (config.query) {
+                mp_subcheck sc_query = mp_subcheck_init();
+                sc_query = mp_set_subcheck_default_state(sc_query, STATE_UNKNOWN);
+
                 /* execute query */
-                status = do_query(conn, &query_val_str, &query_val, &query_time, config.metric, config.type, config.dbi_query);
-                if (status != STATE_OK) {
-                        /* do_query prints an error message in this case */
-                        return status;
-                }
+                do_query_result query_res = do_query(conn, config.metric, config.type, config.query);
+
+                if (query_res.error_code != 0) {
+                        xasprintf(&sc_query.output, "Query failed: %s", query_res.error_string);
+                        sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+                } else if (query_res.query_processing_status != STATE_OK) {
+                        if (query_res.error_string) {
+                                xasprintf(&sc_query.output, "Failed to process query: %s", query_res.error_string);
+                        } else {
+                                xasprintf(&sc_query.output, "Failed to process query");
+                        }
+                        sc_query = mp_set_subcheck_state(sc_query, query_res.query_processing_status);
+                } else {
+                        // query succeeded in general
+                        xasprintf(&sc_query.output, "Query '%s' succeeded", config.query);
+
+                        // that's a OK by default now
+                        sc_query = mp_set_subcheck_default_state(sc_query, STATE_OK);
+
+                        // query duration first
+                        mp_perfdata pd_query_duration = perfdata_init();
+                        pd_query_duration = mp_set_pd_value(pd_query_duration, query_res.query_duration);
+                        pd_query_duration.label = "querytime";
+                        if (config.metric == METRIC_QUERY_TIME) {
+                                pd_query_duration = mp_pd_set_thresholds(pd_query_duration, config.thresholds);
+                        }
+
+                        mp_add_perfdata_to_subcheck(&sc_query, pd_query_duration);
 
-                if (config.metric == METRIC_QUERY_RESULT) {
-                        if (config.expect) {
-                                if ((!query_val_str) || strcmp(query_val_str, config.expect)) {
-                                        status = STATE_CRITICAL;
+                        if (config.metric == METRIC_QUERY_RESULT) {
+                                if (config.expect) {
+                                        if ((!query_res.result_string) ||
+                                                strcmp(query_res.result_string, config.expect)) {
+                                                xasprintf(&sc_query.output, "Found string '%s' in query result",
+                                                                  config.expect);
+                                                sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+                                        } else {
+                                                xasprintf(&sc_query.output, "Did not find string '%s' in query result",
+                                                                  config.expect);
+                                                sc_query = mp_set_subcheck_state(sc_query, STATE_OK);
+                                        }
+                                } else if (config.expect_re_str) {
+                                        int comp_err;
+                                        regex_t expect_re = {};
+                                        comp_err = regcomp(&expect_re, config.expect_re_str, config.expect_re_cflags);
+                                        if (comp_err != 0) {
+                                                // TODO error, failed to compile regex
+                                                // TODO move this to config sanitatisation
+                                                printf("Failed to compile regex from string '%s'", config.expect_re_str);
+                                                exit(STATE_UNKNOWN);
+                                        }
+
+                                        int err =
+                                                regexec(&expect_re, query_res.result_string, 0, NULL, /* flags = */ 0);
+                                        if (!err) {
+                                                sc_query = mp_set_subcheck_state(sc_query, STATE_OK);
+                                                xasprintf(&sc_query.output, "Found regular expression '%s' in query result",
+                                                                  config.expect_re_str);
+                                        } else if (err == REG_NOMATCH) {
+                                                sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+                                                xasprintf(&sc_query.output,
+                                                                  "Did not find regular expression '%s' in query result",
+                                                                  config.expect_re_str);
+                                        } else {
+                                                char errmsg[1024];
+                                                regerror(err, &expect_re, errmsg, sizeof(errmsg));
+                                                xasprintf(&sc_query.output,
+                                                                  "ERROR - failed to execute regular expression: %s\n", errmsg);
+                                                sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+                                        }
                                 } else {
-                                        status = STATE_OK;
+                                        // no string matching
+                                        if (isnan(query_res.result_number)) {
+                                                // The query result is not a number, but no string checking was configured
+                                                // so we expected a number
+                                                // this is a CRITICAL
+                                                xasprintf(&sc_query.output, "Query '%s' result is not numeric",
+                                                                  config.query);
+                                                sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+
+                                        } else {
+
+                                                mp_perfdata pd_query_val = perfdata_init();
+                                                pd_query_val = mp_set_pd_value(pd_query_val, query_res.result_number);
+                                                pd_query_val.label = "query";
+                                                pd_query_val = mp_pd_set_thresholds(pd_query_val, config.thresholds);
+
+                                                mp_add_perfdata_to_subcheck(&sc_query, pd_query_val);
+                                                mp_state_enum query_numerical_result = mp_get_pd_status(pd_query_val);
+
+                                                sc_query = mp_set_subcheck_state(sc_query, query_numerical_result);
+                                                // TODO set pd thresholds
+                                                // if (config.dbi_thresholds->warning) {
+                                                // pd_query_val.warn= config.dbi_thresholds->warning
+                                                // } else {
+                                                // }
+
+                                                if (query_numerical_result == STATE_OK) {
+                                                        xasprintf(&sc_query.output,
+                                                                          "Query result '%f' is within given thresholds",
+                                                                          query_res.result_number);
+                                                } else {
+                                                        xasprintf(&sc_query.output,
+                                                                          "Query result '%f' violates the given thresholds",
+                                                                          query_res.result_number);
+                                                }
+                                        }
                                 }
-                        } else if (config.expect_re_str) {
-                                int err;
-
-                                regex_t expect_re = {};
-                                err = regexec(&expect_re, query_val_str, 0, NULL, /* flags = */ 0);
-                                if (!err) {
-                                        status = STATE_OK;
-                                } else if (err == REG_NOMATCH) {
-                                        status = STATE_CRITICAL;
+                        } else if (config.metric == METRIC_QUERY_TIME) {
+                                mp_state_enum query_time_status = mp_get_pd_status(pd_query_duration);
+                                mp_set_subcheck_state(sc_query, query_time_status);
+
+                                if (query_time_status == STATE_OK) {
+                                        xasprintf(&sc_query.output, "Query duration '%f' is within given thresholds",
+                                                          query_res.query_duration);
                                 } else {
-                                        char errmsg[1024];
-                                        regerror(err, &expect_re, errmsg, sizeof(errmsg));
-                                        printf("ERROR - failed to execute regular expression: %s\n", errmsg);
-                                        status = STATE_CRITICAL;
+                                        xasprintf(&sc_query.output, "Query duration '%f' violates the given thresholds",
+                                                          query_res.query_duration);
                                 }
                         } else {
-                                status = get_status(query_val, config.dbi_thresholds);
+                                /* In case of METRIC_QUERY_RESULT, isnan(query_val) indicates an error
+                                 * which should have been reported and handled (abort) before
+                                 * ... unless we expected a string to be returned */
+                                assert((!isnan(query_res.result_number)) || (config.type == TYPE_STRING));
                         }
-                } else if (config.metric == METRIC_QUERY_TIME) {
-                        status = get_status(query_time, config.dbi_thresholds);
                 }
+
+                mp_add_subcheck_to_check(&overall, sc_query);
         }
 
         if (verbose) {
@@ -278,55 +424,17 @@ int main(int argc, char **argv) {
         }
         dbi_conn_close(conn);
 
-        /* In case of METRIC_QUERY_RESULT, isnan(query_val) indicates an error
-         * which should have been reported and handled (abort) before
-         * ... unless we expected a string to be returned */
-        assert((config.metric != METRIC_QUERY_RESULT) || (!isnan(query_val)) || (config.type == TYPE_STRING));
-
-        assert((config.type != TYPE_STRING) || (config.expect || config.expect_re_str));
-
-        printf("%s - connection time: %fs", state_text(status), conn_time);
-        if (config.dbi_query) {
-                if (config.type == TYPE_STRING) {
-                        assert(config.expect || config.expect_re_str);
-                        printf(", '%s' returned '%s' in %fs", config.dbi_query, query_val_str ? query_val_str : "<nothing>", query_time);
-                        if (status != STATE_OK) {
-                                if (config.expect) {
-                                        printf(" (expected '%s')", config.expect);
-                                } else if (config.expect_re_str) {
-                                        printf(" (expected regex /%s/%s)", config.expect_re_str, ((config.expect_re_cflags & REG_ICASE) ? "i" : ""));
-                                }
-                        }
-                } else if (isnan(query_val)) {
-                        printf(", '%s' query execution time: %fs", config.dbi_query, query_time);
-                } else {
-                        printf(", '%s' returned %f in %fs", config.dbi_query, query_val, query_time);
-                }
-        }
-
-        printf(" | conntime=%fs;%s;%s;0; server_version=%u;%s;%s;0;", conn_time,
-                   ((config.metric == METRIC_CONN_TIME) && config.warning_range) ? config.warning_range : "",
-                   ((config.metric == METRIC_CONN_TIME) && config.critical_range) ? config.critical_range : "", server_version,
-                   ((config.metric == METRIC_SERVER_VERSION) && config.warning_range) ? config.warning_range : "",
-                   ((config.metric == METRIC_SERVER_VERSION) && config.critical_range) ? config.critical_range : "");
-        if (config.dbi_query) {
-                if (!isnan(query_val)) { /* this is also true when -e is used */
-                        printf(" query=%f;%s;%s;;", query_val, ((config.metric == METRIC_QUERY_RESULT) && config.warning_range) ? config.warning_range : "",
-                                   ((config.metric == METRIC_QUERY_RESULT) && config.critical_range) ? config.critical_range : "");
-                }
-                printf(" querytime=%fs;%s;%s;0;", query_time, ((config.metric == METRIC_QUERY_TIME) && config.warning_range) ? config.warning_range : "",
-                           ((config.metric == METRIC_QUERY_TIME) && config.critical_range) ? config.critical_range : "");
-        }
-        printf("\n");
-        return status;
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
 check_dbi_config_wrapper process_arguments(int argc, char **argv) {
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
 
         int option = 0;
         static struct option longopts[] = {STD_LONG_OPTS,
-
                                                                            {"expect", required_argument, 0, 'e'},
                                                                            {"regex", required_argument, 0, 'r'},
                                                                            {"regexi", required_argument, 0, 'R'},
@@ -335,6 +443,7 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) {
                                                                            {"option", required_argument, 0, 'o'},
                                                                            {"query", required_argument, 0, 'q'},
                                                                            {"database", required_argument, 0, 'D'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
         check_dbi_config_wrapper result = {
@@ -359,14 +468,22 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) {
                         print_revision(progname, NP_VERSION);
                         exit(STATE_UNKNOWN);
 
-                case 'c': /* critical range */
-                        result.config.critical_range = optarg;
+                case 'c': /* critical range */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical threshold");
+                        }
+                        result.config.thresholds = mp_thresholds_set_crit(result.config.thresholds, tmp.range);
                         result.config.type = TYPE_NUMERIC;
-                        break;
-                case 'w': /* warning range */
-                        result.config.warning_range = optarg;
+                } break;
+                case 'w': /* warning range */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning threshold");
+                        }
+                        result.config.thresholds = mp_thresholds_set_warn(result.config.thresholds, tmp.range);
                         result.config.type = TYPE_NUMERIC;
-                        break;
+                } break;
                 case 'e':
                         result.config.expect = optarg;
                         result.config.type = TYPE_STRING;
@@ -393,7 +510,6 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) {
                         }
                         break;
                 }
-
                 case 'm':
                         if (!strcasecmp(optarg, "CONN_TIME")) {
                                 result.config.metric = METRIC_CONN_TIME;
@@ -413,7 +529,6 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) {
                         } else {
                                 timeout_interval = atoi(optarg);
                         }
-
                         break;
                 case 'H': /* host */
                         if (!is_host(optarg)) {
@@ -425,7 +540,6 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) {
                 case 'v':
                         verbose++;
                         break;
-
                 case 'd':
                         result.config.dbi_driver = optarg;
                         break;
@@ -442,7 +556,8 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) {
                         *value = '\0';
                         ++value;
 
-                        new = realloc(result.config.dbi_options, (result.config.dbi_options_num + 1) * sizeof(*new));
+                        new = realloc(result.config.dbi_options,
+                                                  (result.config.dbi_options_num + 1) * sizeof(*new));
                         if (!new) {
                                 printf("UNKNOWN - failed to reallocate memory\n");
                                 exit(STATE_UNKNOWN);
@@ -456,52 +571,68 @@ check_dbi_config_wrapper process_arguments(int argc, char **argv) {
                         new->value = value;
                 } break;
                 case 'q':
-                        result.config.dbi_query = optarg;
+                        result.config.query = optarg;
                         break;
                 case 'D':
-                        result.config.dbi_database = optarg;
+                        result.config.database = optarg;
+                        break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
                         break;
                 }
+                }
         }
 
-        set_thresholds(&result.config.dbi_thresholds, result.config.warning_range, result.config.critical_range);
-
-        return validate_arguments(result);
-}
-
-check_dbi_config_wrapper validate_arguments(check_dbi_config_wrapper config_wrapper) {
-        if (!config_wrapper.config.dbi_driver) {
+        if (!result.config.dbi_driver) {
                 usage("Must specify a DBI driver");
         }
 
-        if (((config_wrapper.config.metric == METRIC_QUERY_RESULT) || (config_wrapper.config.metric == METRIC_QUERY_TIME)) &&
-                (!config_wrapper.config.dbi_query)) {
+        if (((result.config.metric == METRIC_QUERY_RESULT) ||
+                 (result.config.metric == METRIC_QUERY_TIME)) &&
+                (!result.config.query)) {
                 usage("Must specify a query to execute (metric == QUERY_RESULT)");
         }
 
-        if ((config_wrapper.config.metric != METRIC_CONN_TIME) && (config_wrapper.config.metric != METRIC_SERVER_VERSION) &&
-                (config_wrapper.config.metric != METRIC_QUERY_RESULT) && (config_wrapper.config.metric != METRIC_QUERY_TIME)) {
+        if ((result.config.metric != METRIC_CONN_TIME) &&
+                (result.config.metric != METRIC_SERVER_VERSION) &&
+                (result.config.metric != METRIC_QUERY_RESULT) &&
+                (result.config.metric != METRIC_QUERY_TIME)) {
                 usage("Invalid metric specified");
         }
 
-        if (config_wrapper.config.expect && (config_wrapper.config.warning_range || config_wrapper.config.critical_range || config_wrapper.config.expect_re_str)) {
+        if (result.config.expect &&
+                (result.config.thresholds.warning_is_set || result.config.thresholds.critical_is_set ||
+                 result.config.expect_re_str)) {
                 usage("Do not mix -e and -w/-c/-r/-R");
         }
 
-        if (config_wrapper.config.expect_re_str && (config_wrapper.config.warning_range || config_wrapper.config.critical_range || config_wrapper.config.expect)) {
+        if (result.config.expect_re_str &&
+                (result.config.thresholds.warning_is_set || result.config.thresholds.critical_is_set ||
+                 result.config.expect)) {
                 usage("Do not mix -r/-R and -w/-c/-e");
         }
 
-        if (config_wrapper.config.expect && (config_wrapper.config.metric != METRIC_QUERY_RESULT)) {
+        if (result.config.expect && (result.config.metric != METRIC_QUERY_RESULT)) {
                 usage("Option -e requires metric QUERY_RESULT");
         }
 
-        if (config_wrapper.config.expect_re_str && (config_wrapper.config.metric != METRIC_QUERY_RESULT)) {
+        if (result.config.expect_re_str && (result.config.metric != METRIC_QUERY_RESULT)) {
                 usage("Options -r/-R require metric QUERY_RESULT");
         }
 
-        config_wrapper.errorcode = OK;
-        return config_wrapper;
+        if (result.config.type == TYPE_STRING) {
+                assert(result.config.expect || result.config.expect_re_str);
+        }
+
+        return result;
 }
 
 void print_help(void) {
@@ -557,6 +688,8 @@ void print_help(void) {
 
         printf(UT_VERBOSE);
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
         printf(" %s\n", _("A DBI driver (-d option) is required. If the specified metric operates"));
         printf(" %s\n\n", _("on a query, one has to be specified (-q option)."));
@@ -607,20 +740,12 @@ void print_usage(void) {
         printf(" [-e <string>] [-r|-R <regex>]\n");
 }
 
-const char *get_field_str(dbi_conn conn, dbi_result res, unsigned short field_type, mp_dbi_metric metric, mp_dbi_type type) {
-        const char *str;
-
-        if (field_type != DBI_TYPE_STRING) {
-                printf("CRITICAL - result value is not a string\n");
-                return NULL;
-        }
-
-        str = dbi_result_get_string_idx(res, 1);
+const char *get_field_str(dbi_result res, check_dbi_metric metric, check_dbi_type type) {
+        const char *str = dbi_result_get_string_idx(res, 1);
         if ((!str) || (strcmp(str, "ERROR") == 0)) {
                 if (metric != METRIC_QUERY_RESULT) {
                         return NULL;
                 }
-                np_dbi_print_error(conn, "CRITICAL - failed to fetch string value");
                 return NULL;
         }
 
@@ -630,35 +755,50 @@ const char *get_field_str(dbi_conn conn, dbi_result res, unsigned short field_ty
         return str;
 }
 
-double get_field(dbi_conn conn, dbi_result res, unsigned short *field_type, mp_dbi_metric metric, mp_dbi_type type) {
-        double val = NAN;
+typedef struct {
+        double value;
+        int error_code;
+        int dbi_error_code; // not sure if useful
+} get_field_wrapper;
+get_field_wrapper get_field(dbi_result res, check_dbi_metric metric, check_dbi_type type) {
+
+        unsigned short field_type = dbi_result_get_field_type_idx(res, 1);
+        get_field_wrapper result = {
+                .value = NAN,
+                .error_code = OK,
+        };
 
-        if (*field_type == DBI_TYPE_INTEGER) {
-                val = (double)dbi_result_get_longlong_idx(res, 1);
-        } else if (*field_type == DBI_TYPE_DECIMAL) {
-                val = dbi_result_get_double_idx(res, 1);
-        } else if (*field_type == DBI_TYPE_STRING) {
+        if (field_type == DBI_TYPE_INTEGER) {
+                result.value = (double)dbi_result_get_longlong_idx(res, 1);
+        } else if (field_type == DBI_TYPE_DECIMAL) {
+                result.value = dbi_result_get_double_idx(res, 1);
+        } else if (field_type == DBI_TYPE_STRING) {
                 const char *val_str;
                 char *endptr = NULL;
 
-                val_str = get_field_str(conn, res, *field_type, metric, type);
+                val_str = get_field_str(res, metric, type);
                 if (!val_str) {
-                        if (metric != METRIC_QUERY_RESULT) {
-                                return NAN;
-                        }
-                        *field_type = DBI_TYPE_ERROR;
-                        return NAN;
+                        result.error_code = ERROR;
+                        field_type = DBI_TYPE_ERROR;
+                        return result;
                 }
 
-                val = strtod(val_str, &endptr);
+                result.value = strtod(val_str, &endptr);
                 if (endptr == val_str) {
                         if (metric != METRIC_QUERY_RESULT) {
-                                return NAN;
+                                result.error_code = ERROR;
+                                return result;
                         }
-                        printf("CRITICAL - result value is not a numeric: %s\n", val_str);
-                        *field_type = DBI_TYPE_ERROR;
-                        return NAN;
+
+                        if (verbose) {
+                                printf("CRITICAL - result value is not a numeric: %s\n", val_str);
+                        }
+
+                        field_type = DBI_TYPE_ERROR;
+                        result.error_code = ERROR;
+                        return result;
                 }
+
                 if ((endptr != NULL) && (*endptr != '\0')) {
                         if (verbose) {
                                 printf("Garbage after value: %s\n", endptr);
@@ -666,122 +806,127 @@ double get_field(dbi_conn conn, dbi_result res, unsigned short *field_type, mp_d
                 }
         } else {
                 if (metric != METRIC_QUERY_RESULT) {
-                        return NAN;
+                        result.error_code = ERROR;
+                        return result;
                 }
-                printf("CRITICAL - cannot parse value of type %s (%i)\n",
-                           (*field_type == DBI_TYPE_BINARY)     ? "BINARY"
-                           : (*field_type == DBI_TYPE_DATETIME) ? "DATETIME"
-                                                                                                        : "<unknown>",
-                           *field_type);
-                *field_type = DBI_TYPE_ERROR;
-                return NAN;
-        }
-        return val;
+                // printf("CRITICAL - cannot parse value of type %s (%i)\n",
+                // (*field_type == DBI_TYPE_BINARY)     ? "BINARY"
+                // : (*field_type == DBI_TYPE_DATETIME) ? "DATETIME"
+                // : "<unknown>",
+                // *field_type);
+                field_type = DBI_TYPE_ERROR;
+                result.error_code = ERROR;
+        }
+        return result;
 }
 
-mp_state_enum get_query_result(dbi_conn conn, dbi_result res, const char **res_val_str, double *res_val, mp_dbi_metric metric, mp_dbi_type type) {
-        unsigned short field_type;
-        double val = NAN;
-
-        if (dbi_result_get_numrows(res) == DBI_ROW_ERROR) {
-                if (metric != METRIC_QUERY_RESULT) {
-                        return STATE_OK;
-                }
-                np_dbi_print_error(conn, "CRITICAL - failed to fetch rows");
-                return STATE_CRITICAL;
-        }
-
-        if (dbi_result_get_numrows(res) < 1) {
-                if (metric != METRIC_QUERY_RESULT) {
-                        return STATE_OK;
-                }
-                printf("WARNING - no rows returned\n");
-                return STATE_WARNING;
-        }
+static do_query_result do_query(dbi_conn conn, check_dbi_metric metric, check_dbi_type type,
+                                                                char *query) {
+        assert(query);
 
-        if (dbi_result_get_numfields(res) == DBI_FIELD_ERROR) {
-                if (metric != METRIC_QUERY_RESULT) {
-                        return STATE_OK;
-                }
-                np_dbi_print_error(conn, "CRITICAL - failed to fetch fields");
-                return STATE_CRITICAL;
-        }
-
-        if (dbi_result_get_numfields(res) < 1) {
-                if (metric != METRIC_QUERY_RESULT) {
-                        return STATE_OK;
-                }
-                printf("WARNING - no fields returned\n");
-                return STATE_WARNING;
-        }
-
-        if (dbi_result_first_row(res) != 1) {
-                if (metric != METRIC_QUERY_RESULT) {
-                        return STATE_OK;
-                }
-                np_dbi_print_error(conn, "CRITICAL - failed to fetch first row");
-                return STATE_CRITICAL;
+        if (verbose) {
+                printf("Executing query '%s'\n", query);
         }
 
-        field_type = dbi_result_get_field_type_idx(res, 1);
-        if (field_type != DBI_TYPE_ERROR) {
-                if (type == TYPE_STRING) {
-                        /* the value will be freed in dbi_result_free */
-                        *res_val_str = strdup(get_field_str(conn, res, field_type, metric, type));
-                } else {
-                        val = get_field(conn, res, &field_type, metric, type);
-                }
-        }
+        do_query_result result = {
+                .query_duration = 0,
+                .result_string = NULL,
+                .result_number = 0,
+                .error_code = 0,
+                .query_processing_status = STATE_UNKNOWN,
+        };
 
-        *res_val = val;
+        struct timeval timeval_start;
+        gettimeofday(&timeval_start, NULL);
 
-        if (field_type == DBI_TYPE_ERROR) {
-                if (metric != METRIC_QUERY_RESULT) {
-                        return STATE_OK;
-                }
-                np_dbi_print_error(conn, "CRITICAL - failed to fetch data");
-                return STATE_CRITICAL;
+        dbi_result res = dbi_conn_query(conn, query);
+        if (!res) {
+                dbi_conn_error(conn, &result.error_string);
+                result.error_code = 1;
+                return result;
         }
 
-        dbi_result_free(res);
-        return STATE_OK;
-}
-
-mp_state_enum do_query(dbi_conn conn, const char **res_val_str, double *res_val, double *res_time, mp_dbi_metric metric, mp_dbi_type type,
-                         char *np_dbi_query) {
-        dbi_result res;
-
-        struct timeval timeval_start;
         struct timeval timeval_end;
-        mp_state_enum status = STATE_OK;
-
-        assert(np_dbi_query);
+        gettimeofday(&timeval_end, NULL);
+        result.query_duration = timediff(timeval_start, timeval_end);
 
         if (verbose) {
-                printf("Executing query '%s'\n", np_dbi_query);
+                printf("Query duration: %f\n", result.query_duration);
         }
 
-        gettimeofday(&timeval_start, NULL);
+        // Default state is OK, all error will be set explicitly
+        mp_state_enum query_processing_state = STATE_OK;
+        {
 
-        res = dbi_conn_query(conn, np_dbi_query);
-        if (!res) {
-                np_dbi_print_error(conn, "CRITICAL - failed to execute query '%s'", np_dbi_query);
-                return STATE_CRITICAL;
+                if (dbi_result_get_numrows(res) == DBI_ROW_ERROR) {
+                        if (metric != METRIC_QUERY_RESULT) {
+                                query_processing_state = STATE_OK;
+                        } else {
+                                dbi_conn_error(conn, &result.error_string);
+                                query_processing_state = STATE_CRITICAL;
+                        }
+                } else if (dbi_result_get_numrows(res) < 1) {
+                        if (metric != METRIC_QUERY_RESULT) {
+                                query_processing_state = STATE_OK;
+                        } else {
+                                result.error_string = "no rows returned";
+                                // printf("WARNING - no rows returned\n");
+                                query_processing_state = STATE_WARNING;
+                        }
+                } else if (dbi_result_get_numfields(res) == DBI_FIELD_ERROR) {
+                        if (metric != METRIC_QUERY_RESULT) {
+                                query_processing_state = STATE_OK;
+                        } else {
+                                dbi_conn_error(conn, &result.error_string);
+                                // np_dbi_print_error(conn, "CRITICAL - failed to fetch fields");
+                                query_processing_state = STATE_CRITICAL;
+                        }
+                } else if (dbi_result_get_numfields(res) < 1) {
+                        if (metric != METRIC_QUERY_RESULT) {
+                                query_processing_state = STATE_OK;
+                        } else {
+                                result.error_string = "no fields returned";
+                                // printf("WARNING - no fields returned\n");
+                                query_processing_state = STATE_WARNING;
+                        }
+                } else if (dbi_result_first_row(res) != 1) {
+                        if (metric != METRIC_QUERY_RESULT) {
+                                query_processing_state = STATE_OK;
+                        } else {
+                                dbi_conn_error(conn, &result.error_string);
+                                // np_dbi_print_error(conn, "CRITICAL - failed to fetch first row");
+                                query_processing_state = STATE_CRITICAL;
+                        }
+                } else {
+                        unsigned short field_type = dbi_result_get_field_type_idx(res, 1);
+                        if (field_type != DBI_TYPE_ERROR) {
+                                if (type == TYPE_STRING) {
+                                        result.result_string = strdup(get_field_str(res, metric, type));
+                                } else {
+                                        get_field_wrapper gfw = get_field(res, metric, type);
+                                        result.result_number = gfw.value;
+                                }
+                        } else {
+                                // Error when retrieving the field, that is OK if the Query result is not of
+                                // interest
+                                if (metric != METRIC_QUERY_RESULT) {
+                                        query_processing_state = STATE_OK;
+                                } else {
+                                        dbi_conn_error(conn, &result.error_string);
+                                        // np_dbi_print_error(conn, "CRITICAL - failed to fetch data");
+                                        query_processing_state = STATE_CRITICAL;
+                                }
+                        }
+                }
         }
+        dbi_result_free(res);
 
-        status = get_query_result(conn, res, res_val_str, res_val, metric, type);
-
-        gettimeofday(&timeval_end, NULL);
-        *res_time = timediff(timeval_start, timeval_end);
-
-        if (verbose) {
-                printf("Time elapsed: %f\n", *res_time);
-        }
+        result.query_processing_status = query_processing_state;
 
-        return status;
+        return result;
 }
 
-double timediff(struct timeval start, struct timeval end) {
+static double timediff(struct timeval start, struct timeval end) {
         double diff;
 
         while (start.tv_usec > end.tv_usec) {
@@ -792,7 +937,7 @@ double timediff(struct timeval start, struct timeval end) {
         return diff;
 }
 
-void np_dbi_print_error(dbi_conn conn, char *fmt, ...) {
+static void np_dbi_print_error(dbi_conn conn, char *fmt, ...) {
         const char *errmsg = NULL;
         va_list ap;
 
diff --git a/plugins/check_dbi.d/config.h b/plugins/check_dbi.d/config.h
index f6f0d7b3..25d74a12 100644
--- a/plugins/check_dbi.d/config.h
+++ b/plugins/check_dbi.d/config.h
@@ -3,18 +3,19 @@
 #include "../../config.h"
 #include <stddef.h>
 #include "../../lib/monitoringplug.h"
+#include "thresholds.h"
 
 typedef enum {
         METRIC_CONN_TIME,
         METRIC_SERVER_VERSION,
         METRIC_QUERY_RESULT,
         METRIC_QUERY_TIME,
-} mp_dbi_metric;
+} check_dbi_metric;
 
 typedef enum {
         TYPE_NUMERIC,
         TYPE_STRING,
-} mp_dbi_type;
+} check_dbi_type;
 
 typedef struct {
         char *key;
@@ -24,20 +25,22 @@ typedef struct {
 typedef struct {
         char *dbi_driver;
         char *host;
+
         driver_option_t *dbi_options;
         size_t dbi_options_num;
-        char *dbi_database;
-        char *dbi_query;
+
+        char *database;
+        char *query;
 
         char *expect;
         char *expect_re_str;
         int expect_re_cflags;
-        mp_dbi_metric metric;
-        mp_dbi_type type;
-        char *warning_range;
-        char *critical_range;
-        thresholds *dbi_thresholds;
+        check_dbi_metric metric;
+        check_dbi_type type;
+        mp_thresholds thresholds;
 
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_dbi_config;
 
 check_dbi_config check_dbi_config_init() {
@@ -46,8 +49,8 @@ check_dbi_config check_dbi_config_init() {
                 .host = NULL,
                 .dbi_options = NULL,
                 .dbi_options_num = 0,
-                .dbi_database = NULL,
-                .dbi_query = NULL,
+                .database = NULL,
+                .query = NULL,
 
                 .expect = NULL,
                 .expect_re_str = NULL,
@@ -55,9 +58,9 @@ check_dbi_config check_dbi_config_init() {
                 .metric = METRIC_QUERY_RESULT,
                 .type = TYPE_NUMERIC,
 
-                .warning_range = NULL,
-                .critical_range = NULL,
-                .dbi_thresholds = NULL,
+                .thresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index d0903be2..9ea19e6a 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -3,7 +3,7 @@
  * Monitoring check_dig plugin
  *
  * License: GPL
- * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ * Copyright (c) 2002-2025 Monitoring Plugins Development Team
  *
  * Description:
  *
@@ -33,9 +33,10 @@
  *  because on some architectures those strings are in non-writable memory */
 
 const char *progname = "check_dig";
-const char *copyright = "2002-2024";
+const char *copyright = "2002-2025";
 const char *email = "devel@monitoring-plugins.org";
 
+#include <ctype.h>
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
@@ -56,6 +57,12 @@ void print_usage(void);
 
 static int verbose = 0;
 
+/* helpers for flag parsing */
+static flag_list parse_flags_line(const char *line);
+static flag_list split_csv_trim(const char *csv);
+static bool flag_list_contains(const flag_list *list, const char *needle);
+static void free_flag_list(flag_list *list);
+
 int main(int argc, char **argv) {
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
@@ -81,8 +88,9 @@ int main(int argc, char **argv) {
 
         char *command_line;
         /* get the command to run */
-        xasprintf(&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d", PATH_TO_DIG, config.dig_args, config.query_transport,
-                          config.server_port, config.dns_server, config.query_address, config.record_type, config.number_tries, timeout_interval_dig);
+        xasprintf(&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d", PATH_TO_DIG,
+                          config.dig_args, config.query_transport, config.server_port, config.dns_server,
+                          config.query_address, config.record_type, config.number_tries, timeout_interval_dig);
 
         alarm(timeout_interval);
         struct timeval start_time;
@@ -100,13 +108,35 @@ int main(int argc, char **argv) {
         output chld_out;
         output chld_err;
         char *msg = NULL;
+        flag_list dig_flags = {.items = NULL, .count = 0};
         mp_state_enum result = STATE_UNKNOWN;
+
         /* run the command */
         if (np_runcmd(command_line, &chld_out, &chld_err, 0) != 0) {
                 result = STATE_WARNING;
                 msg = (char *)_("dig returned an error status");
         }
 
+        /* extract ';; flags: ...' from stdout (first occurrence) */
+        for (size_t i = 0; i < chld_out.lines; i++) {
+                if (strstr(chld_out.line[i], "flags:")) {
+                        if (verbose) {
+                                printf("Raw flags line: %s\n", chld_out.line[i]);
+                        }
+
+                        dig_flags = parse_flags_line(chld_out.line[i]);
+
+                        if (verbose && dig_flags.count > 0) {
+                                printf(_("Parsed flags:"));
+                                for (size_t k = 0; k < dig_flags.count; k++) {
+                                        printf(" %s", dig_flags.items[k]);
+                                }
+                                printf("\n");
+                        }
+                        break;
+                }
+        }
+
         for (size_t i = 0; i < chld_out.lines; i++) {
                 /* the server is responding, we just got the host name... */
                 if (strstr(chld_out.line[i], ";; ANSWER SECTION:")) {
@@ -118,8 +148,9 @@ int main(int argc, char **argv) {
                                         printf("%s\n", chld_out.line[i]);
                                 }
 
-                                if (strcasestr(chld_out.line[i], (config.expected_address == NULL ? config.query_address : config.expected_address)) !=
-                                        NULL) {
+                                if (strcasestr(chld_out.line[i], (config.expected_address == NULL
+                                                                                                          ? config.query_address
+                                                                                                          : config.expected_address)) != NULL) {
                                         msg = chld_out.line[i];
                                         result = STATE_OK;
 
@@ -172,10 +203,49 @@ int main(int argc, char **argv) {
                 result = STATE_WARNING;
         }
 
+        /* Optional: evaluate dig flags only if -E/-X were provided */
+        if ((config.require_flags.count > 0) || (config.forbid_flags.count > 0)) {
+                if (dig_flags.count > 0) {
+                        for (size_t r = 0; r < config.require_flags.count; r++) {
+                                if (!flag_list_contains(&dig_flags, config.require_flags.items[r])) {
+                                        result = STATE_CRITICAL;
+                                        if (!msg) {
+                                                xasprintf(&msg, _("Missing required DNS flag: %s"),
+                                                                  config.require_flags.items[r]);
+                                        } else {
+                                                char *newmsg = NULL;
+                                                xasprintf(&newmsg, _("%s; missing required DNS flag: %s"), msg,
+                                                                  config.require_flags.items[r]);
+                                                msg = newmsg;
+                                        }
+                                }
+                        }
+
+                        for (size_t r = 0; r < config.forbid_flags.count; r++) {
+                                if (flag_list_contains(&dig_flags, config.forbid_flags.items[r])) {
+                                        result = STATE_CRITICAL;
+                                        if (!msg) {
+                                                xasprintf(&msg, _("Forbidden DNS flag present: %s"),
+                                                                  config.forbid_flags.items[r]);
+                                        } else {
+                                                char *newmsg = NULL;
+                                                xasprintf(&newmsg, _("%s; forbidden DNS flag present: %s"), msg,
+                                                                  config.forbid_flags.items[r]);
+                                                msg = newmsg;
+                                        }
+                                }
+                        }
+                }
+        }
+
+        /* cleanup flags buffer */
+        free_flag_list(&dig_flags);
+
         printf("DNS %s - %.3f seconds response time (%s)|%s\n", state_text(result), elapsed_time,
                    msg ? msg : _("Probably a non-existent host/domain"),
-                   fperfdata("time", elapsed_time, "s", (config.warning_interval > UNDEFINED), config.warning_interval,
-                                         (config.critical_interval > UNDEFINED), config.critical_interval, true, 0, false, 0));
+                   fperfdata("time", elapsed_time, "s", (config.warning_interval > UNDEFINED),
+                                         config.warning_interval, (config.critical_interval > UNDEFINED),
+                                         config.critical_interval, true, 0, false, 0));
         exit(result);
 }
 
@@ -187,6 +257,8 @@ check_dig_config_wrapper process_arguments(int argc, char **argv) {
                                                                            {"critical", required_argument, 0, 'c'},
                                                                            {"timeout", required_argument, 0, 't'},
                                                                            {"dig-arguments", required_argument, 0, 'A'},
+                                                                           {"require-flags", required_argument, 0, 'E'},
+                                                                           {"forbid-flags", required_argument, 0, 'X'},
                                                                            {"verbose", no_argument, 0, 'v'},
                                                                            {"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
@@ -209,7 +281,8 @@ check_dig_config_wrapper process_arguments(int argc, char **argv) {
 
         int option = 0;
         while (true) {
-                int option_index = getopt_long(argc, argv, "hVvt:l:H:w:c:T:p:a:A:46", longopts, &option);
+                int option_index =
+                        getopt_long(argc, argv, "hVvt:l:H:w:c:T:p:a:A:E:X:46", longopts, &option);
 
                 if (option_index == -1 || option_index == EOF) {
                         break;
@@ -260,6 +333,12 @@ check_dig_config_wrapper process_arguments(int argc, char **argv) {
                 case 'A': /* dig arguments */
                         result.config.dig_args = strdup(optarg);
                         break;
+                case 'E': /* require flags */
+                        result.config.require_flags = split_csv_trim(optarg);
+                        break;
+                case 'X': /* forbid flags */
+                        result.config.forbid_flags = split_csv_trim(optarg);
+                        break;
                 case 'v': /* verbose */
                         verbose++;
                         break;
@@ -335,10 +414,15 @@ void print_help(void) {
         printf(" %s\n", "-T, --record_type=STRING");
         printf("    %s\n", _("Record type to lookup (default: A)"));
         printf(" %s\n", "-a, --expected_address=STRING");
-        printf("    %s\n", _("An address expected to be in the answer section. If not set, uses whatever"));
+        printf("    %s\n",
+                   _("An address expected to be in the answer section. If not set, uses whatever"));
         printf("    %s\n", _("was in -l"));
         printf(" %s\n", "-A, --dig-arguments=STRING");
         printf("    %s\n", _("Pass STRING as argument(s) to dig"));
+        printf(" %s\n", "-E, --require-flags=LIST");
+        printf("    %s\n", _("Comma-separated dig flags that must be present (e.g. 'aa,qr')"));
+        printf(" %s\n", "-X, --forbid-flags=LIST");
+        printf("    %s\n", _("Comma-separated dig flags that must NOT be present"));
         printf(UT_WARN_CRIT);
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf(UT_VERBOSE);
@@ -355,5 +439,185 @@ void print_usage(void) {
         printf("%s\n", _("Usage:"));
         printf("%s -l <query_address> [-H <host>] [-p <server port>]\n", progname);
         printf(" [-T <query type>] [-w <warning interval>] [-c <critical interval>]\n");
-        printf(" [-t <timeout>] [-a <expected answer address>] [-v]\n");
+        printf(" [-t <timeout>] [-a <expected answer address>] [-E <flags>] [-X <flags>] [-v]\n");
+}
+
+/* helpers */
+
+/**
+ * parse_flags_line - Parse a dig output line and extract DNS header flags.
+ *
+ * Input:
+ *   line - NUL terminated dig output line, e.g. ";; flags: qr rd ra; ..."
+ *
+ * Returns:
+ *   flag_list where:
+ *     - items: array of NUL terminated flag strings (heap allocated)
+ *     - count: number of entries in items
+ *   On parse failure or if no flags were found, count is 0 and items is NULL.
+ */
+static flag_list parse_flags_line(const char *line) {
+        flag_list result = {.items = NULL, .count = 0};
+
+        if (!line) {
+                return result;
+        }
+
+        /* Locate start of DNS header flags in dig output */
+        const char *p = strstr(line, "flags:");
+        if (!p) {
+                return result;
+        }
+        p += 6; /* skip literal "flags:" */
+
+        /* Skip whitespace after "flags:" */
+        while (*p && isspace((unsigned char)*p)) {
+                p++;
+        }
+
+        /* Flags are terminated by the next semicolon e.g. "qr rd ra;" */
+        const char *q = strchr(p, ';');
+        if (!q) {
+                return result;
+        }
+
+        /* Extract substring containing the flag block */
+        size_t len = (size_t)(q - p);
+        if (len == 0) {
+                return result;
+        }
+
+        char *buf = (char *)malloc(len + 1);
+        if (!buf) {
+                return result;
+        }
+        memcpy(buf, p, len);
+        buf[len] = '\0';
+
+        /* Tokenize flags separated by whitespace */
+        char **arr = NULL;
+        size_t cnt = 0;
+        char *saveptr = NULL;
+        char *tok = strtok_r(buf, " \t", &saveptr);
+
+        while (tok) {
+                /* Expand array for the next flag token */
+                char **tmp = (char **)realloc(arr, (cnt + 1) * sizeof(char *));
+                if (!tmp) {
+                        /* On allocation failure keep what we have and return it */
+                        break;
+                }
+                arr = tmp;
+                arr[cnt++] = strdup(tok);
+                tok = strtok_r(NULL, " \t", &saveptr);
+        }
+
+        free(buf);
+
+        result.items = arr;
+        result.count = cnt;
+        return result;
+}
+
+/**
+ * split_csv_trim - Split a comma separated string into trimmed tokens.
+ *
+ * Input:
+ *   csv - NUL terminated string, e.g. "aa, qr , rd"
+ *
+ * Returns:
+ *   flag_list where:
+ *     - items: array of NUL terminated tokens (heap allocated, whitespace trimmed)
+ *     - count: number of tokens
+ *   On empty input, count is 0 and items is NULL
+ */
+static flag_list split_csv_trim(const char *csv) {
+        flag_list result = {.items = NULL, .count = 0};
+
+        if (!csv || !*csv) {
+                return result;
+        }
+
+        char *tmp = strdup(csv);
+        if (!tmp) {
+                return result;
+        }
+
+        char *s = tmp;
+        char *token = NULL;
+
+        /* Split CSV by commas, trimming whitespace on each token */
+        while ((token = strsep(&s, ",")) != NULL) {
+                /* trim leading whitespace */
+                while (*token && isspace((unsigned char)*token)) {
+                        token++;
+                }
+
+                /* trim trailing whitespace */
+                char *end = token + strlen(token);
+                while (end > token && isspace((unsigned char)end[-1])) {
+                        *--end = '\0';
+                }
+
+                if (*token) {
+                        /* Expand the items array and append the token */
+                        char **arr = (char **)realloc(result.items, (result.count + 1) * sizeof(char *));
+                        if (!arr) {
+                                /* Allocation failed, stop and return what we have */
+                                break;
+                        }
+                        result.items = arr;
+                        result.items[result.count++] = strdup(token);
+                }
+        }
+
+        free(tmp);
+        return result;
+}
+
+/**
+ * flag_list_contains - Case-insensitive membership test in a flag_list.
+ *
+ * Input:
+ *   list   - pointer to a flag_list
+ *   needle - NUL terminated string to search for
+ *
+ * Returns:
+ *   true  if needle is contained in list (strcasecmp)
+ *   false otherwise
+ */
+static bool flag_list_contains(const flag_list *list, const char *needle) {
+        if (!list || !needle || !*needle) {
+                return false;
+        }
+
+        for (size_t i = 0; i < list->count; i++) {
+                if (strcasecmp(list->items[i], needle) == 0) {
+                        return true;
+                }
+        }
+        return false;
+}
+
+/**
+ * free_flag_list - Release all heap allocations held by a flag_list.
+ *
+ * Input:
+ *   list - pointer to a flag_list whose items were allocated by
+ *          parse_flags_line() or split_csv_trim().
+ *
+ * After this call list->items is NULL and list->count is 0.
+ */
+static void free_flag_list(flag_list *list) {
+        if (!list || !list->items) {
+                return;
+        }
+
+        for (size_t i = 0; i < list->count; i++) {
+                free(list->items[i]);
+        }
+        free(list->items);
+
+        list->items = NULL;
+        list->count = 0;
 }
diff --git a/plugins/check_dig.d/config.h b/plugins/check_dig.d/config.h
index a570b633..dd1f58b5 100644
--- a/plugins/check_dig.d/config.h
+++ b/plugins/check_dig.d/config.h
@@ -8,6 +8,11 @@
 #define DEFAULT_TRIES 2
 
 typedef struct {
+        char **items;
+        size_t count;
+} flag_list;
+
+typedef struct {
         char *query_address;
         char *record_type;
         char *expected_address;
@@ -19,6 +24,8 @@ typedef struct {
 
         double warning_interval;
         double critical_interval;
+        flag_list require_flags;
+        flag_list forbid_flags;
 } check_dig_config;
 
 check_dig_config check_dig_config_init() {
@@ -34,7 +41,8 @@ check_dig_config check_dig_config_init() {
 
                 .warning_interval = UNDEFINED,
                 .critical_interval = UNDEFINED,
-
+                .require_flags = {.count = 0, .items = NULL},
+                .forbid_flags = {.count = 0, .items = NULL},
         };
         return tmp;
 }
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 037a6f7a..d42b5486 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -31,24 +31,35 @@ const char *program_name = "check_disk"; /* Required for coreutils libs */
 const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
+#include "states.h"
 #include "common.h"
+#include "output.h"
+#include "perfdata.h"
+#include "utils_base.h"
+#include "lib/thresholds.h"
+
 #ifdef HAVE_SYS_STAT_H
 #       include <sys/stat.h>
 #endif
+
 #if HAVE_INTTYPES_H
 #       include <inttypes.h>
 #endif
+
 #include <assert.h>
-#include "popen.h"
-#include "utils.h"
-#include "utils_disk.h"
 #include <stdarg.h>
-#include "fsusage.h"
-#include "mountlist.h"
+#include <stdint.h>
 #include <float.h>
+#include "./popen.h"
+#include "./utils.h"
+#include "../gl/fsusage.h"
+#include "../gl/mountlist.h"
+#include "./check_disk.d/utils_disk.h"
+
 #if HAVE_LIMITS_H
 #       include <limits.h>
 #endif
+
 #include "regex.h"
 
 #ifdef __CYGWIN__
@@ -57,424 +68,322 @@ const char *email = "devel@monitoring-plugins.org";
 #       define ERROR -1
 #endif
 
-/* If nonzero, show even filesystems with zero size or
-   uninteresting types. */
-static int show_all_fs = 1;
-
-/* If nonzero, show only local filesystems.  */
-static int show_local_fs = 0;
-
-/* If nonzero, show only local filesystems but call stat() on remote ones. */
-static int stat_remote_fs = 0;
-
-/* If positive, the units to use when printing sizes;
-   if negative, the human-readable base.  */
-/* static int output_block_size; */
-
-/* If nonzero, invoke the `sync' system call before getting any usage data.
-   Using this option can make df very slow, especially with many or very
-   busy disks.  Note that this may make a difference on some systems --
-   SunOs4.1.3, for one.  It is *not* necessary on Linux.  */
-/* static int require_sync = 0; */
-
-/* Linked list of filesystem types to display.
-   If `fs_select_list' is NULL, list all types.
-   This table is generated dynamically from command-line options,
-   rather than hardcoding into the program what it thinks are the
-   valid filesystem types; let the user specify any filesystem type
-   they want to, and if there are any filesystems of that type, they
-   will be shown.
-
-   Some filesystem types:
-   4.2 4.3 ufs nfs swap ignore io vm efs dbg */
-
-/* static struct parameter_list *fs_select_list; */
-
-/* Linked list of filesystem types to omit.
-   If the list is empty, don't exclude any types.  */
-static struct regex_list *fs_exclude_list = NULL;
-
-/* Linked list of filesystem types to check.
-   If the list is empty, include all types.  */
-static struct regex_list *fs_include_list;
-
-static struct name_list *dp_exclude_list;
-
-static struct parameter_list *path_select_list = NULL;
-
-/* Linked list of mounted filesystems. */
-static struct mount_entry *mount_list;
-
-/* For long options that have no equivalent short option, use a
-   non-character as a pseudo short option, starting with CHAR_MAX + 1.  */
-enum {
-        SYNC_OPTION = CHAR_MAX + 1,
-        NO_SYNC_OPTION,
-        BLOCK_SIZE_OPTION
-};
-
 #ifdef _AIX
 #       pragma alloca
 #endif
 
-static int process_arguments(int /*argc*/, char ** /*argv*/);
-static void set_all_thresholds(struct parameter_list *path);
-static void print_help(void);
+typedef struct {
+        int errorcode;
+        check_disk_config config;
+} check_disk_config_wrapper;
+static check_disk_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+
+static void set_all_thresholds(parameter_list_elem *path, char *warn_freespace_units,
+                                                           char *crit_freespace_units, char *warn_freespace_percent,
+                                                           char *crit_freespace_percent, char *warn_freeinodes_percent,
+                                                           char *crit_freeinodes_percent);
+static double calculate_percent(uintmax_t /*value*/, uintmax_t /*total*/);
+static bool stat_path(parameter_list_elem * /*parameters*/, bool /*ignore_missing*/);
+
+/*
+ * Puts the values from a struct fs_usage into a parameter_list with an additional flag to control
+ * how reserved and inodes should be judged (ignored or not)
+ */
+static parameter_list_elem get_path_stats(parameter_list_elem parameters, struct fs_usage fsp,
+                                                                                  bool freespace_ignore_reserved);
+static mp_subcheck evaluate_filesystem(measurement_unit measurement_unit,
+                                                                           bool display_inodes_perfdata, byte_unit unit);
+
 void print_usage(void);
-static double calculate_percent(uintmax_t, uintmax_t);
-static bool stat_path(struct parameter_list *p);
-static void get_stats(struct parameter_list *p, struct fs_usage *fsp);
-static void get_path_stats(struct parameter_list *p, struct fs_usage *fsp);
+static void print_help(void);
 
-static char *units;
-static uintmax_t mult = 1024 * 1024;
 static int verbose = 0;
-static bool erronly = false;
-static bool display_mntp = false;
-static bool exact_match = false;
-static bool ignore_missing = false;
-static bool freespace_ignore_reserved = false;
-static bool display_inodes_perfdata = false;
-static char *warn_freespace_units = NULL;
-static char *crit_freespace_units = NULL;
-static char *warn_freespace_percent = NULL;
-static char *crit_freespace_percent = NULL;
-static char *warn_usedspace_units = NULL;
-static char *crit_usedspace_units = NULL;
-static char *warn_usedspace_percent = NULL;
-static char *crit_usedspace_percent = NULL;
-static char *warn_usedinodes_percent = NULL;
-static char *crit_usedinodes_percent = NULL;
-static char *warn_freeinodes_percent = NULL;
-static char *crit_freeinodes_percent = NULL;
-static bool path_selected = false;
-static bool path_ignored = false;
-static char *group = NULL;
-static struct stat *stat_buf;
-static struct name_list *seen = NULL;
 
-int main(int argc, char **argv) {
-        int result = STATE_UNKNOWN;
-        int disk_result = STATE_UNKNOWN;
-        char *output = NULL;
-        char *ignored = NULL;
-        char *details = NULL;
-        char *perf = NULL;
-        char *perf_ilabel = NULL;
-        char *preamble = " - free space:";
-        char *ignored_preamble = " - ignored paths:";
-        char *flag_header = NULL;
-        int temp_result = STATE_UNKNOWN;
-
-        struct mount_entry *me = NULL;
-        struct fs_usage fsp = {0};
-        struct parameter_list *temp_list = NULL;
-        struct parameter_list *path = NULL;
-
-#ifdef __CYGWIN__
-        char mountdir[32];
-#endif
-
-        output = strdup("");
-        ignored = strdup("");
-        details = strdup("");
-        perf = strdup("");
-        perf_ilabel = strdup("");
-        stat_buf = malloc(sizeof *stat_buf);
+// This would not be necessary in C23!!
+const byte_unit Bytes_Factor = 1;
+const byte_unit KibiBytes_factor = 1024;
+const byte_unit MebiBytes_factor = 1048576;
+const byte_unit GibiBytes_factor = 1073741824;
+const byte_unit TebiBytes_factor = 1099511627776;
+const byte_unit PebiBytes_factor = 1125899906842624;
+const byte_unit ExbiBytes_factor = 1152921504606846976;
+const byte_unit KiloBytes_factor = 1000;
+const byte_unit MegaBytes_factor = 1000000;
+const byte_unit GigaBytes_factor = 1000000000;
+const byte_unit TeraBytes_factor = 1000000000000;
+const byte_unit PetaBytes_factor = 1000000000000000;
+const byte_unit ExaBytes_factor = 1000000000000000000;
 
+int main(int argc, char **argv) {
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
-        mount_list = read_file_system_list(0);
+#ifdef __CYGWIN__
+        char mountdir[32];
+#endif
 
-        /* Parse extra opts if any */
+        // Parse extra opts if any
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
+        check_disk_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
+        }
 
-        /* If a list of paths has not been selected, find entire
-           mount list and create list of paths
-         */
-        if (path_selected == false && path_ignored == false) {
-                for (me = mount_list; me; me = me->me_next) {
-                        if (!(path = np_find_parameter(path_select_list, me->me_mountdir))) {
-                                path = np_add_parameter(&path_select_list, me->me_mountdir);
-                        }
-                        path->best_match = me;
-                        path->group = group;
-                        set_all_thresholds(path);
-                }
+        check_disk_config config = tmp_config.config;
+
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
         }
 
-        if (path_ignored == false) {
-                np_set_best_match(path_select_list, mount_list, exact_match);
+        if (config.erronly) {
+                mp_set_level_of_detail(MP_DETAIL_NON_OK_ONLY);
         }
 
-        /* Error if no match found for specified paths */
-        temp_list = path_select_list;
+        if (!config.path_ignored) {
+                mp_int_fs_list_set_best_match(config.path_select_list, config.mount_list,
+                                                                          config.exact_match);
+        }
 
-        while (path_select_list) {
-                if (!path_select_list->best_match && ignore_missing == true) {
-                        /* If the first element will be deleted, the temp_list must be updated with the new start address as well */
-                        if (path_select_list == temp_list) {
-                                temp_list = path_select_list->name_next;
-                        }
-                        /* Add path argument to list of ignored paths to inform about missing paths being ignored and not alerted */
-                        xasprintf(&ignored, "%s %s;", ignored, path_select_list->name);
+        // Error if no match found for specified paths
+        for (parameter_list_elem *elem = config.path_select_list.first; elem;) {
+                if (!elem->best_match && config.ignore_missing) {
                         /* Delete the path from the list so that it is not stat-checked later in the code. */
-                        path_select_list = np_del_parameter(path_select_list, path_select_list->name_prev);
-                } else if (!path_select_list->best_match) {
+                        elem = mp_int_fs_list_del(&config.path_select_list, elem);
+                        continue;
+                }
+                if (!elem->best_match) {
                         /* Without --ignore-missing option, exit with Critical state. */
-                        die(STATE_CRITICAL, _("DISK %s: %s not found\n"), _("CRITICAL"), path_select_list->name);
-                } else {
-                        /* Continue jumping through the list */
-                        path_select_list = path_select_list->name_next;
+                        die(STATE_CRITICAL, _("DISK %s: %s not found\n"), _("CRITICAL"), elem->name);
                 }
-        }
 
-        path_select_list = temp_list;
+                elem = mp_int_fs_list_get_next(elem);
+        }
 
-        if (!path_select_list && ignore_missing == true) {
-                result = STATE_OK;
-                if (verbose >= 2) {
-                        printf("None of the provided paths were found\n");
+        mp_check overall = mp_check_init();
+        if (config.path_select_list.length == 0) {
+                mp_subcheck none_sc = mp_subcheck_init();
+                xasprintf(&none_sc.output, "No filesystems were found for the provided parameters");
+                if (config.ignore_missing) {
+                        none_sc = mp_set_subcheck_state(none_sc, STATE_OK);
+                } else {
+                        none_sc = mp_set_subcheck_state(none_sc, STATE_UNKNOWN);
+                        if (verbose >= 2) {
+                                printf("None of the provided paths were found\n");
+                        }
                 }
+                mp_add_subcheck_to_check(&overall, none_sc);
+                mp_exit(overall);
         }
 
-        /* Process for every path in list */
-        for (path = path_select_list; path; path = path->name_next) {
-                if (verbose >= 3 && path->freespace_percent->warning != NULL && path->freespace_percent->critical != NULL)
-                        printf("Thresholds(pct) for %s warn: %f crit %f\n", path->name, path->freespace_percent->warning->end,
-                                   path->freespace_percent->critical->end);
-
-                if (verbose >= 3 && path->group != NULL)
-                        printf("Group of %s: %s\n", path->name, path->group);
-
-                /* reset disk result */
-                disk_result = STATE_UNKNOWN;
-
-                me = path->best_match;
-
-                if (!me) {
+        // Filter list first
+        for (parameter_list_elem *path = config.path_select_list.first; path;) {
+                if (!path->best_match) {
+                        path = mp_int_fs_list_del(&config.path_select_list, path);
                         continue;
                 }
 
+                struct mount_entry *mount_entry = path->best_match;
+
 #ifdef __CYGWIN__
-                if (strncmp(path->name, "/cygdrive/", 10) != 0 || strlen(path->name) > 11)
+                if (strncmp(path->name, "/cygdrive/", 10) != 0 || strlen(path->name) > 11) {
+                        path = mp_int_fs_list_del(&config.path_select_list, path);
                         continue;
+                }
+
+                char *mountdir = NULL;
                 snprintf(mountdir, sizeof(mountdir), "%s:\\", me->me_mountdir + 10);
-                if (GetDriveType(mountdir) != DRIVE_FIXED)
-                        me->me_remote = 1;
+                if (GetDriveType(mountdir) != DRIVE_FIXED) {
+                        mount_entry->me_remote = 1;
+                }
 #endif
-                /* Filters */
 
                 /* Remove filesystems already seen */
-                if (np_seen_name(seen, me->me_mountdir)) {
+                if (np_seen_name(config.seen, mount_entry->me_mountdir)) {
+                        path = mp_int_fs_list_del(&config.path_select_list, path);
                         continue;
                 }
-                np_add_name(&seen, me->me_mountdir);
 
                 if (path->group == NULL) {
-                        /* Skip remote filesystems if we're not interested in them */
-                        if (me->me_remote && show_local_fs) {
-                                if (stat_remote_fs) {
-                                        if (!stat_path(path) && ignore_missing == true) {
-                                                result = STATE_OK;
-                                                xasprintf(&ignored, "%s %s;", ignored, path->name);
-                                        }
-                                }
+                        if (config.fs_exclude_list &&
+                                np_find_regmatch(config.fs_exclude_list, mount_entry->me_type)) {
+                                // Skip excluded fs's
+                                path = mp_int_fs_list_del(&config.path_select_list, path);
                                 continue;
-                                /* Skip pseudo fs's if we haven't asked for all fs's */
                         }
-                        if (me->me_dummy && !show_all_fs) {
-                                continue;
-                                /* Skip excluded fstypes */
-                        }
-                        if (fs_exclude_list && np_find_regmatch(fs_exclude_list, me->me_type)) {
+
+                        if (config.device_path_exclude_list &&
+                                (np_find_name(config.device_path_exclude_list, mount_entry->me_devname) ||
+                                 np_find_name(config.device_path_exclude_list, mount_entry->me_mountdir))) {
+                                // Skip excluded device or mount paths
+                                path = mp_int_fs_list_del(&config.path_select_list, path);
                                 continue;
-                                /* Skip excluded fs's */
                         }
-                        if (dp_exclude_list && (np_find_name(dp_exclude_list, me->me_devname) || np_find_name(dp_exclude_list, me->me_mountdir))) {
+
+                        if (config.fs_include_list &&
+                                !np_find_regmatch(config.fs_include_list, mount_entry->me_type)) {
+                                // Skip not included fstypes
+                                path = mp_int_fs_list_del(&config.path_select_list, path);
                                 continue;
-                                /* Skip not included fstypes */
                         }
-                        if (fs_include_list && !np_find_regmatch(fs_include_list, me->me_type)) {
+
+                        /* Skip remote filesystems if we're not interested in them */
+                        if (mount_entry->me_remote && config.show_local_fs) {
+                                if (config.stat_remote_fs) {
+                                        // TODO Stat here
+                                        if (!stat_path(path, config.ignore_missing) && config.ignore_missing) {
+                                        }
+                                }
                                 continue;
                         }
-                }
 
-                if (!stat_path(path)) {
-                        if (ignore_missing == true) {
-                                result = STATE_OK;
-                                xasprintf(&ignored, "%s %s;", ignored, path->name);
+                        // TODO why stat here? remove unstatable fs?
+                        if (!stat_path(path, config.ignore_missing)) {
+                                // if (config.ignore_missing) {
+                                // xasprintf(&ignored, "%s %s;", ignored, path->name);
+                                // }
+                                // not accessible, remove from list
+                                path = mp_int_fs_list_del(&config.path_select_list, path);
+                                continue;
                         }
-                        continue;
                 }
-                get_fs_usage(me->me_mountdir, me->me_devname, &fsp);
-
-                if (fsp.fsu_blocks && strcmp("none", me->me_mountdir)) {
-                        get_stats(path, &fsp);
-
-                        if (verbose >= 3) {
-                                printf("For %s, used_pct=%f free_pct=%f used_units=%lu free_units=%lu total_units=%lu used_inodes_pct=%f "
-                                           "free_inodes_pct=%f fsp.fsu_blocksize=%lu mult=%lu\n",
-                                           me->me_mountdir, path->dused_pct, path->dfree_pct, path->dused_units, path->dfree_units, path->dtotal_units,
-                                           path->dused_inodes_percent, path->dfree_inodes_percent, fsp.fsu_blocksize, mult);
-                        }
-
-                        /* Threshold comparisons */
-
-                        temp_result = get_status(path->dfree_units, path->freespace_units);
-                        if (verbose >= 3)
-                                printf("Freespace_units result=%d\n", temp_result);
-                        disk_result = max_state(disk_result, temp_result);
-
-                        temp_result = get_status(path->dfree_pct, path->freespace_percent);
-                        if (verbose >= 3)
-                                printf("Freespace%% result=%d\n", temp_result);
-                        disk_result = max_state(disk_result, temp_result);
 
-                        temp_result = get_status(path->dused_units, path->usedspace_units);
-                        if (verbose >= 3)
-                                printf("Usedspace_units result=%d\n", temp_result);
-                        disk_result = max_state(disk_result, temp_result);
-
-                        temp_result = get_status(path->dused_pct, path->usedspace_percent);
-                        if (verbose >= 3)
-                                printf("Usedspace_percent result=%d\n", temp_result);
-                        disk_result = max_state(disk_result, temp_result);
-
-                        temp_result = get_status(path->dused_inodes_percent, path->usedinodes_percent);
-                        if (verbose >= 3)
-                                printf("Usedinodes_percent result=%d\n", temp_result);
-                        disk_result = max_state(disk_result, temp_result);
-
-                        temp_result = get_status(path->dfree_inodes_percent, path->freeinodes_percent);
-                        if (verbose >= 3)
-                                printf("Freeinodes_percent result=%d\n", temp_result);
-                        disk_result = max_state(disk_result, temp_result);
-
-                        result = max_state(result, disk_result);
-
-                        /* What a mess of units. The output shows free space, the perf data shows used space. Yikes!
-                           Hack here. Trying to get warn/crit levels from freespace_(units|percent) for perf
-                           data. Assumption that start=0. Roll on new syntax...
-                        */
-
-                        /* *_high_tide must be reinitialized at each run */
-                        uint64_t warning_high_tide = UINT64_MAX;
+                path = mp_int_fs_list_get_next(path);
+        }
 
-                        if (path->freespace_units->warning != NULL) {
-                                warning_high_tide = (path->dtotal_units - path->freespace_units->warning->end) * mult;
-                        }
-                        if (path->freespace_percent->warning != NULL) {
-                                warning_high_tide =
-                                        min(warning_high_tide, (uint64_t)((1.0 - path->freespace_percent->warning->end / 100) * (path->dtotal_units * mult)));
-                        }
+        // now get the actual measurements
+        for (parameter_list_elem *filesystem = config.path_select_list.first; filesystem;) {
+                // Get actual metrics here
+                struct mount_entry *mount_entry = filesystem->best_match;
+                struct fs_usage fsp = {0};
+                get_fs_usage(mount_entry->me_mountdir, mount_entry->me_devname, &fsp);
 
-                        uint64_t critical_high_tide = UINT64_MAX;
+                if (fsp.fsu_blocks != 0 && strcmp("none", mount_entry->me_mountdir) != 0) {
+                        *filesystem = get_path_stats(*filesystem, fsp, config.freespace_ignore_reserved);
 
-                        if (path->freespace_units->critical != NULL) {
-                                critical_high_tide = (path->dtotal_units - path->freespace_units->critical->end) * mult;
-                        }
-                        if (path->freespace_percent->critical != NULL) {
-                                critical_high_tide =
-                                        min(critical_high_tide, (uint64_t)((1.0 - path->freespace_percent->critical->end / 100) * (path->dtotal_units * mult)));
+                        if (verbose >= 3) {
+                                printf("For %s, used_units=%lu free_units=%lu total_units=%lu "
+                                           "fsp.fsu_blocksize=%lu\n",
+                                           mount_entry->me_mountdir, filesystem->used_bytes, filesystem->free_bytes,
+                                           filesystem->total_bytes, fsp.fsu_blocksize);
                         }
+                } else {
+                        // failed to retrieve file system data or not mounted?
+                        filesystem = mp_int_fs_list_del(&config.path_select_list, filesystem);
+                        continue;
+                }
+                filesystem = mp_int_fs_list_get_next(filesystem);
+        }
 
-                        /* Nb: *_high_tide are unset when == UINT64_MAX */
-                        xasprintf(&perf, "%s %s", perf,
-                                          perfdata_uint64((!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
-                                                                          path->dused_units * mult, "B", (warning_high_tide == UINT64_MAX ? false : true), warning_high_tide,
-                                                                          (critical_high_tide == UINT64_MAX ? false : true), critical_high_tide, true, 0, true,
-                                                                          path->dtotal_units * mult));
-
-                        if (display_inodes_perfdata) {
-                                /* *_high_tide must be reinitialized at each run */
-                                warning_high_tide = UINT64_MAX;
-                                critical_high_tide = UINT64_MAX;
-
-                                if (path->freeinodes_percent->warning != NULL) {
-                                        warning_high_tide = (uint64_t)fabs(
-                                                min((double)warning_high_tide, (double)(1.0 - path->freeinodes_percent->warning->end / 100) * path->inodes_total));
-                                }
-                                if (path->freeinodes_percent->critical != NULL) {
-                                        critical_high_tide = (uint64_t)fabs(min(
-                                                (double)critical_high_tide, (double)(1.0 - path->freeinodes_percent->critical->end / 100) * path->inodes_total));
-                                }
-
-                                xasprintf(&perf_ilabel, "%s (inodes)",
-                                                  (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir);
-                                /* Nb: *_high_tide are unset when == UINT64_MAX */
-                                xasprintf(&perf, "%s %s", perf,
-                                                  perfdata_uint64(perf_ilabel, path->inodes_used, "", (warning_high_tide != UINT64_MAX ? true : false),
-                                                                                  warning_high_tide, (critical_high_tide != UINT64_MAX ? true : false), critical_high_tide, true, 0,
-                                                                                  true, path->inodes_total));
+        if (verbose > 2) {
+                for (parameter_list_elem *filesystem = config.path_select_list.first; filesystem;
+                         filesystem = mp_int_fs_list_get_next(filesystem)) {
+                        assert(filesystem->best_match != NULL);
+                        if (filesystem->best_match == NULL) {
+                                printf("Filesystem path %s has no mount_entry!\n", filesystem->name);
+                        } else {
+                                // printf("Filesystem path %s has a mount_entry!\n", filesystem->name);
                         }
+                }
+        }
 
-                        if (disk_result == STATE_OK && erronly && !verbose)
-                                continue;
-
-                        if (disk_result && verbose >= 1) {
-                                xasprintf(&flag_header, " %s [", state_text(disk_result));
+        measurement_unit_list *measurements = NULL;
+        measurement_unit_list *current = NULL;
+        // create measuring units, because of groups
+        for (parameter_list_elem *filesystem = config.path_select_list.first; filesystem;
+                 filesystem = mp_int_fs_list_get_next(filesystem)) {
+                assert(filesystem->best_match != NULL);
+
+                if (filesystem->group == NULL) {
+                        // create a measurement unit for the fs
+                        measurement_unit unit =
+                                create_measurement_unit_from_filesystem(*filesystem, config.display_mntp);
+                        if (measurements == NULL) {
+                                measurements = current = add_measurement_list(NULL, unit);
                         } else {
-                                xasprintf(&flag_header, "");
+                                current = add_measurement_list(measurements, unit);
                         }
-                        xasprintf(&output, "%s%s %s %llu%s (%.1f%%", output, flag_header,
-                                          (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, path->dfree_units, units,
-                                          path->dfree_pct);
-                        if (path->dused_inodes_percent < 0) {
-                                xasprintf(&output, "%s inode=-)%s;", output, (disk_result ? "]" : ""));
+                } else {
+                        // Grouped elements are consecutive
+                        if (measurements == NULL) {
+                                // first entry
+                                measurement_unit unit =
+                                        create_measurement_unit_from_filesystem(*filesystem, config.display_mntp);
+                                unit.name = strdup(filesystem->group);
+                                measurements = current = add_measurement_list(NULL, unit);
                         } else {
-                                xasprintf(&output, "%s inode=%.0f%%)%s;", output, path->dfree_inodes_percent, ((disk_result && verbose >= 1) ? "]" : ""));
+                                // if this is the first element of a group, the name of the previous entry is
+                                // different
+                                if (strcmp(filesystem->group, current->unit.name) != 0) {
+                                        // so, this must be the first element of a group
+                                        measurement_unit unit =
+                                                create_measurement_unit_from_filesystem(*filesystem, config.display_mntp);
+                                        unit.name = filesystem->group;
+                                        current = add_measurement_list(measurements, unit);
+
+                                } else {
+                                        // NOT the first entry of a group, add info to the other one
+                                        current->unit = add_filesystem_to_measurement_unit(current->unit, *filesystem);
+                                }
                         }
-                        free(flag_header);
                 }
         }
 
-        if (verbose >= 2)
-                xasprintf(&output, "%s%s", output, details);
+        /* Process for every path in list */
+        if (measurements != NULL) {
+                for (measurement_unit_list *unit = measurements; unit; unit = unit->next) {
+                        mp_subcheck unit_sc = evaluate_filesystem(unit->unit, config.display_inodes_perfdata,
+                                                                                                          config.display_unit);
+                        mp_add_subcheck_to_check(&overall, unit_sc);
+                }
+        } else {
+                // Apparently no machting fs found
+                mp_subcheck none_sc = mp_subcheck_init();
+                xasprintf(&none_sc.output, "No filesystems were found for the provided parameters");
 
-        if (strcmp(output, "") == 0 && !erronly) {
-                preamble = "";
-                xasprintf(&output, " - No disks were found for provided parameters");
+                if (config.ignore_missing) {
+                        none_sc = mp_set_subcheck_state(none_sc, STATE_OK);
+                } else {
+                        none_sc = mp_set_subcheck_state(none_sc, STATE_UNKNOWN);
+                }
+                mp_add_subcheck_to_check(&overall, none_sc);
         }
 
-        printf("DISK %s%s%s%s%s|%s\n", state_text(result), ((erronly && result == STATE_OK)) ? "" : preamble, output,
-                   (strcmp(ignored, "") == 0) ? "" : ignored_preamble, ignored, perf);
-        return result;
+        mp_exit(overall);
 }
 
 double calculate_percent(uintmax_t value, uintmax_t total) {
         double pct = -1;
         if (value <= DBL_MAX && total != 0) {
-                pct = (double)value / total * 100.0;
+                pct = (double)value / (double)total * 100.0;
         }
+
         return pct;
 }
 
 /* process command-line arguments */
-int process_arguments(int argc, char **argv) {
-        int c;
-        int err;
-        struct parameter_list *se;
-        struct parameter_list *temp_list = NULL;
-        struct parameter_list *previous = NULL;
-        struct mount_entry *me;
-        regex_t re;
-        int cflags = REG_NOSUB | REG_EXTENDED;
-        int default_cflags = cflags;
-        char errbuf[MAX_INPUT_BUFFER];
-        int fnd = 0;
+check_disk_config_wrapper process_arguments(int argc, char **argv) {
+
+        check_disk_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_disk_config_init(),
+        };
+
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
+
+        enum {
+                output_format_index = CHAR_MAX + 1,
+                display_unit_index,
+        };
 
-        int option = 0;
         static struct option longopts[] = {{"timeout", required_argument, 0, 't'},
                                                                            {"warning", required_argument, 0, 'w'},
                                                                            {"critical", required_argument, 0, 'c'},
                                                                            {"iwarning", required_argument, 0, 'W'},
-                                                                           /* Dang, -C is taken. We might want to reshuffle this. */
                                                                            {"icritical", required_argument, 0, 'K'},
                                                                            {"kilobytes", no_argument, 0, 'k'},
                                                                            {"megabytes", no_argument, 0, 'm'},
@@ -507,24 +416,43 @@ int process_arguments(int argc, char **argv) {
                                                                            {"clear", no_argument, 0, 'C'},
                                                                            {"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
+                                                                           {"display-unit", required_argument, 0, display_unit_index},
                                                                            {0, 0, 0, 0}};
 
-        if (argc < 2)
-                return ERROR;
+        for (int index = 1; index < argc; index++) {
+                if (strcmp("-to", argv[index]) == 0) {
+                        strcpy(argv[index], "-t");
+                }
+        }
+
+        int cflags = REG_NOSUB | REG_EXTENDED;
+        int default_cflags = cflags;
+        char *warn_freespace_units = NULL;
+        char *crit_freespace_units = NULL;
+        char *warn_freespace_percent = NULL;
+        char *crit_freespace_percent = NULL;
+        char *warn_freeinodes_percent = NULL;
+        char *crit_freeinodes_percent = NULL;
 
-        np_add_regex(&fs_exclude_list, "iso9660", REG_EXTENDED);
+        bool path_selected = false;
+        char *group = NULL;
+        byte_unit unit = MebiBytes_factor;
 
-        for (c = 1; c < argc; c++)
-                if (strcmp("-to", argv[c]) == 0)
-                        strcpy(argv[c], "-t");
+        result.config.mount_list = read_file_system_list(false);
 
-        while (1) {
-                c = getopt_long(argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEAn", longopts, &option);
+        np_add_regex(&result.config.fs_exclude_list, "iso9660", REG_EXTENDED);
 
-                if (c == -1 || c == EOF)
+        while (true) {
+                int option = 0;
+                int option_index = getopt_long(
+                        argc, argv, "+?VqhvefCt:c:w:K:W:u:p:x:X:N:mklLPg:R:r:i:I:MEAn", longopts, &option);
+
+                if (option_index == -1 || option_index == EOF) {
                         break;
+                }
 
-                switch (c) {
+                switch (option_index) {
                 case 't': /* timeout period */
                         if (is_integer(optarg)) {
                                 timeout_interval = atoi(optarg);
@@ -555,10 +483,10 @@ int process_arguments(int argc, char **argv) {
                         break;
 
                 /* Awful mistake where the range values do not make sense. Normally,
-                   you alert if the value is within the range, but since we are using
-                   freespace, we have to alert if outside the range. Thus we artificially
-                   force @ at the beginning of the range, so that it is backwards compatible
-                */
+                 * you alert if the value is within the range, but since we are using
+                 * freespace, we have to alert if outside the range. Thus we artificially
+                 * force @ at the beginning of the range, so that it is backwards compatible
+                 */
                 case 'c': /* critical threshold */
                         if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
                                 die(STATE_UNKNOWN, "Argument for --critical invalid or missing: %s\n", optarg);
@@ -594,181 +522,193 @@ int process_arguments(int argc, char **argv) {
                         }
                         break;
                 case 'u':
-                        if (units)
-                                free(units);
                         if (!strcasecmp(optarg, "bytes")) {
-                                mult = (uintmax_t)1;
-                                units = strdup("B");
+                                unit = Bytes_Factor;
                         } else if (!strcmp(optarg, "KiB")) {
-                                mult = (uintmax_t)1024;
-                                units = strdup("KiB");
+                                unit = KibiBytes_factor;
                         } else if (!strcmp(optarg, "kB")) {
-                                mult = (uintmax_t)1000;
-                                units = strdup("kB");
+                                unit = KiloBytes_factor;
                         } else if (!strcmp(optarg, "MiB")) {
-                                mult = (uintmax_t)1024 * 1024;
-                                units = strdup("MiB");
+                                unit = MebiBytes_factor;
                         } else if (!strcmp(optarg, "MB")) {
-                                mult = (uintmax_t)1000 * 1000;
-                                units = strdup("MB");
+                                unit = MegaBytes_factor;
                         } else if (!strcmp(optarg, "GiB")) {
-                                mult = (uintmax_t)1024 * 1024 * 1024;
-                                units = strdup("GiB");
+                                unit = GibiBytes_factor;
                         } else if (!strcmp(optarg, "GB")) {
-                                mult = (uintmax_t)1000 * 1000 * 1000;
-                                units = strdup("GB");
+                                unit = GigaBytes_factor;
                         } else if (!strcmp(optarg, "TiB")) {
-                                mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
-                                units = strdup("TiB");
+                                unit = TebiBytes_factor;
                         } else if (!strcmp(optarg, "TB")) {
-                                mult = (uintmax_t)1000 * 1000 * 1000 * 1000;
-                                units = strdup("TB");
+                                unit = TeraBytes_factor;
                         } else if (!strcmp(optarg, "PiB")) {
-                                mult = (uintmax_t)1024 * 1024 * 1024 * 1024 * 1024;
-                                units = strdup("PiB");
+                                unit = PebiBytes_factor;
                         } else if (!strcmp(optarg, "PB")) {
-                                mult = (uintmax_t)1000 * 1000 * 1000 * 1000 * 1000;
-                                units = strdup("PB");
+                                unit = PetaBytes_factor;
                         } else {
                                 die(STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
                         }
-                        if (units == NULL)
-                                die(STATE_UNKNOWN, _("failed allocating storage for '%s'\n"), "units");
                         break;
-                case 'k': /* display mountpoint */
-                        mult = 1024;
-                        if (units)
-                                free(units);
-                        units = strdup("kiB");
+                case 'k':
+                        unit = KibiBytes_factor;
                         break;
-                case 'm': /* display mountpoint */
-                        mult = 1024 * 1024;
-                        if (units)
-                                free(units);
-                        units = strdup("MiB");
+                case 'm':
+                        unit = MebiBytes_factor;
+                        break;
+                case display_unit_index:
+                        if (!strcasecmp(optarg, "bytes")) {
+                                result.config.display_unit = Bytes;
+                        } else if (!strcmp(optarg, "KiB")) {
+                                result.config.display_unit = KibiBytes;
+                        } else if (!strcmp(optarg, "kB")) {
+                                result.config.display_unit = KiloBytes;
+                        } else if (!strcmp(optarg, "MiB")) {
+                                result.config.display_unit = MebiBytes;
+                        } else if (!strcmp(optarg, "MB")) {
+                                result.config.display_unit = MegaBytes;
+                        } else if (!strcmp(optarg, "GiB")) {
+                                result.config.display_unit = GibiBytes;
+                        } else if (!strcmp(optarg, "GB")) {
+                                result.config.display_unit = GigaBytes;
+                        } else if (!strcmp(optarg, "TiB")) {
+                                result.config.display_unit = TebiBytes;
+                        } else if (!strcmp(optarg, "TB")) {
+                                result.config.display_unit = TeraBytes;
+                        } else if (!strcmp(optarg, "PiB")) {
+                                result.config.display_unit = PebiBytes;
+                        } else if (!strcmp(optarg, "PB")) {
+                                result.config.display_unit = PetaBytes;
+                        } else {
+                                die(STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
+                        }
                         break;
                 case 'L':
-                        stat_remote_fs = 1;
+                        result.config.stat_remote_fs = true;
                         /* fallthrough */
                 case 'l':
-                        show_local_fs = 1;
+                        result.config.show_local_fs = true;
                         break;
                 case 'P':
-                        display_inodes_perfdata = 1;
+                        result.config.display_inodes_perfdata = true;
                         break;
-                case 'p': /* select path */
-                        if (!(warn_freespace_units || crit_freespace_units || warn_freespace_percent || crit_freespace_percent ||
-                                  warn_usedspace_units || crit_usedspace_units || warn_usedspace_percent || crit_usedspace_percent ||
-                                  warn_usedinodes_percent || crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent)) {
-                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -p\n"));
+                case 'p': /* select path */ {
+                        if (!(warn_freespace_units || crit_freespace_units || warn_freespace_percent ||
+                                  crit_freespace_percent || warn_freeinodes_percent || crit_freeinodes_percent)) {
+                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"),
+                                        _("Must set a threshold value before using -p\n"));
                         }
 
                         /* add parameter if not found. overwrite thresholds if path has already been added  */
-                        if (!(se = np_find_parameter(path_select_list, optarg))) {
-                                se = np_add_parameter(&path_select_list, optarg);
-
-                                if (stat(optarg, &stat_buf[0]) && ignore_missing == true) {
-                                        path_ignored = true;
-                                        break;
-                                }
+                        parameter_list_elem *search_entry;
+                        if (!(search_entry = mp_int_fs_list_find(result.config.path_select_list, optarg))) {
+                                search_entry = mp_int_fs_list_append(&result.config.path_select_list, optarg);
+
+                                // struct stat stat_buf = {};
+                                // if (stat(optarg, &stat_buf) && result.config.ignore_missing) {
+                                // result.config.path_ignored = true;
+                                // break;
+                                // }
                         }
-                        se->group = group;
-                        set_all_thresholds(se);
+                        search_entry->group = group;
+                        set_all_thresholds(search_entry, warn_freespace_units, crit_freespace_units,
+                                                           warn_freespace_percent, crit_freespace_percent,
+
+                                                           warn_freeinodes_percent, crit_freeinodes_percent);
 
                         /* With autofs, it is required to stat() the path before re-populating the mount_list */
-                        if (!stat_path(se)) {
-                                break;
-                        }
-                        /* NB: We can't free the old mount_list "just like that": both list pointers and struct
-                         * pointers are copied around. One of the reason it wasn't done yet is that other parts
-                         * of check_disk need the same kind of cleanup so it'd better be done as a whole */
-                        mount_list = read_file_system_list(0);
-                        np_set_best_match(se, mount_list, exact_match);
+                        // if (!stat_path(se, result.config.ignore_missing)) {
+                        // break;
+                        // }
+                        mp_int_fs_list_set_best_match(result.config.path_select_list, result.config.mount_list,
+                                                                                  result.config.exact_match);
 
                         path_selected = true;
-                        break;
+                } break;
                 case 'x': /* exclude path or partition */
-                        np_add_name(&dp_exclude_list, optarg);
+                        np_add_name(&result.config.device_path_exclude_list, optarg);
                         break;
-                case 'X': /* exclude file system type */
-                        err = np_add_regex(&fs_exclude_list, optarg, REG_EXTENDED);
+                case 'X': /* exclude file system type */ {
+                        int err = np_add_regex(&result.config.fs_exclude_list, optarg, REG_EXTENDED);
                         if (err != 0) {
-                                regerror(err, &fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
-                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                                char errbuf[MAX_INPUT_BUFFER];
+                                regerror(err, &result.config.fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"),
+                                        _("Could not compile regular expression"), errbuf);
                         }
                         break;
                 case 'N': /* include file system type */
-                        err = np_add_regex(&fs_include_list, optarg, REG_EXTENDED);
+                        err = np_add_regex(&result.config.fs_include_list, optarg, REG_EXTENDED);
                         if (err != 0) {
-                                regerror(err, &fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
-                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                                char errbuf[MAX_INPUT_BUFFER];
+                                regerror(err, &result.config.fs_exclude_list->regex, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"),
+                                        _("Could not compile regular expression"), errbuf);
                         }
-                        break;
+                } break;
                 case 'v': /* verbose */
                         verbose++;
                         break;
                 case 'q': /* TODO: this function should eventually go away (removed 2007-09-20) */
                         /* verbose--; **replaced by line below**. -q was only a broken way of implementing -e */
-                        erronly = true;
+                        result.config.erronly = true;
                         break;
                 case 'e':
-                        erronly = true;
+                        result.config.erronly = true;
                         break;
                 case 'E':
-                        if (path_selected)
-                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set -E before selecting paths\n"));
-                        exact_match = true;
+                        if (path_selected) {
+                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"),
+                                        _("Must set -E before selecting paths\n"));
+                        }
+                        result.config.exact_match = true;
                         break;
                 case 'f':
-                        freespace_ignore_reserved = true;
+                        result.config.freespace_ignore_reserved = true;
                         break;
                 case 'g':
-                        if (path_selected)
-                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set group value before selecting paths\n"));
+                        if (path_selected) {
+                                die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"),
+                                        _("Must set group value before selecting paths\n"));
+                        }
                         group = optarg;
                         break;
                 case 'I':
                         cflags |= REG_ICASE;
                         // Intentional fallthrough
-                case 'i':
-                        if (!path_selected)
+                case 'i': {
+                        if (!path_selected) {
                                 die(STATE_UNKNOWN, "DISK %s: %s\n", _("UNKNOWN"),
-                                        _("Paths need to be selected before using -i/-I. Use -A to select all paths explicitly"));
-                        err = regcomp(&re, optarg, cflags);
+                                        _("Paths need to be selected before using -i/-I. Use -A to select all paths "
+                                          "explicitly"));
+                        }
+                        regex_t regex;
+                        int err = regcomp(&regex, optarg, cflags);
                         if (err != 0) {
-                                regerror(err, &re, errbuf, MAX_INPUT_BUFFER);
-                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                                char errbuf[MAX_INPUT_BUFFER];
+                                regerror(err, &regex, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"),
+                                        _("Could not compile regular expression"), errbuf);
                         }
 
-                        temp_list = path_select_list;
+                        for (parameter_list_elem *elem = result.config.path_select_list.first; elem;) {
+                                if (elem->best_match) {
+                                        if (np_regex_match_mount_entry(elem->best_match, &regex)) {
 
-                        previous = NULL;
-                        while (temp_list) {
-                                if (temp_list->best_match) {
-                                        if (np_regex_match_mount_entry(temp_list->best_match, &re)) {
+                                                if (verbose >= 3) {
+                                                        printf("ignoring %s matching regex\n", elem->name);
+                                                }
 
-                                                if (verbose >= 3)
-                                                        printf("ignoring %s matching regex\n", temp_list->name);
-
-                                                temp_list = np_del_parameter(temp_list, previous);
-                                                /* pointer to first element needs to be updated if first item gets deleted */
-                                                if (previous == NULL)
-                                                        path_select_list = temp_list;
-                                        } else {
-                                                previous = temp_list;
-                                                temp_list = temp_list->name_next;
+                                                elem = mp_int_fs_list_del(&result.config.path_select_list, elem);
+                                                continue;
                                         }
-                                } else {
-                                        previous = temp_list;
-                                        temp_list = temp_list->name_next;
                                 }
+
+                                elem = mp_int_fs_list_get_next(elem);
                         }
 
                         cflags = default_cflags;
-                        break;
-
+                } break;
                 case 'n':
-                        ignore_missing = true;
+                        result.config.ignore_missing = true;
                         break;
                 case 'A':
                         optarg = strdup(".*");
@@ -776,80 +716,96 @@ int process_arguments(int argc, char **argv) {
                 case 'R':
                         cflags |= REG_ICASE;
                         // Intentional fallthrough
-                case 'r':
-                        if (!(warn_freespace_units || crit_freespace_units || warn_freespace_percent || crit_freespace_percent ||
-                                  warn_usedspace_units || crit_usedspace_units || warn_usedspace_percent || crit_usedspace_percent ||
-                                  warn_usedinodes_percent || crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent)) {
+                case 'r': {
+                        if (!(warn_freespace_units || crit_freespace_units || warn_freespace_percent ||
+                                  crit_freespace_percent || warn_freeinodes_percent || crit_freeinodes_percent)) {
                                 die(STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"),
-                                        _("Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--all)\n"));
+                                        _("Must set a threshold value before using -r/-R/-A "
+                                          "(--ereg-path/--eregi-path/--all)\n"));
                         }
 
-                        err = regcomp(&re, optarg, cflags);
+                        regex_t regex;
+                        int err = regcomp(&regex, optarg, cflags);
                         if (err != 0) {
-                                regerror(err, &re, errbuf, MAX_INPUT_BUFFER);
-                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                                char errbuf[MAX_INPUT_BUFFER];
+                                regerror(err, &regex, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"),
+                                        _("Could not compile regular expression"), errbuf);
                         }
 
-                        for (me = mount_list; me; me = me->me_next) {
-                                if (np_regex_match_mount_entry(me, &re)) {
-                                        fnd = true;
-                                        if (verbose >= 3)
-                                                printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir, optarg);
+                        bool found = false;
+                        for (struct mount_entry *me = result.config.mount_list; me; me = me->me_next) {
+                                if (np_regex_match_mount_entry(me, &regex)) {
+                                        found = true;
+                                        if (verbose >= 3) {
+                                                printf("%s %s matching expression %s\n", me->me_devname, me->me_mountdir,
+                                                           optarg);
+                                        }
 
-                                        /* add parameter if not found. overwrite thresholds if path has already been added  */
-                                        if (!(se = np_find_parameter(path_select_list, me->me_mountdir))) {
-                                                se = np_add_parameter(&path_select_list, me->me_mountdir);
+                                        /* add parameter if not found. overwrite thresholds if path has already been
+                                         * added  */
+                                        parameter_list_elem *se = NULL;
+                                        if (!(se = mp_int_fs_list_find(result.config.path_select_list,
+                                                                                                   me->me_mountdir))) {
+                                                se =
+                                                        mp_int_fs_list_append(&result.config.path_select_list, me->me_mountdir);
                                         }
                                         se->group = group;
-                                        set_all_thresholds(se);
+                                        set_all_thresholds(se, warn_freespace_units, crit_freespace_units,
+                                                                           warn_freespace_percent, crit_freespace_percent,
+                                                                           warn_freeinodes_percent, crit_freeinodes_percent);
                                 }
                         }
 
-                        if (!fnd && ignore_missing == true) {
-                                path_ignored = true;
-                                path_selected = true;
-                                break;
+                        if (!found) {
+                                if (result.config.ignore_missing) {
+                                        result.config.path_ignored = true;
+                                        path_selected = true;
+                                        break;
+                                }
+
+                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"),
+                                        _("Regular expression did not match any path or disk"), optarg);
                         }
-                        if (!fnd)
-                                die(STATE_UNKNOWN, "DISK %s: %s - %s\n", _("UNKNOWN"), _("Regular expression did not match any path or disk"), optarg);
 
-                        fnd = false;
                         path_selected = true;
-                        np_set_best_match(path_select_list, mount_list, exact_match);
+                        mp_int_fs_list_set_best_match(result.config.path_select_list, result.config.mount_list,
+                                                                                  result.config.exact_match);
                         cflags = default_cflags;
 
-                        break;
+                } break;
                 case 'M': /* display mountpoint */
-                        display_mntp = true;
+                        result.config.display_mntp = true;
                         break;
-                case 'C':
-                        /* add all mount entries to path_select list if no partitions have been explicitly defined using -p */
-                        if (path_selected == false) {
-                                struct parameter_list *path;
-                                for (me = mount_list; me; me = me->me_next) {
-                                        if (!(path = np_find_parameter(path_select_list, me->me_mountdir)))
-                                                path = np_add_parameter(&path_select_list, me->me_mountdir);
+                case 'C': {
+                        /* add all mount entries to path_select list if no partitions have been explicitly
+                         * defined using -p */
+                        if (!path_selected) {
+                                parameter_list_elem *path;
+                                for (struct mount_entry *me = result.config.mount_list; me; me = me->me_next) {
+                                        if (!(path = mp_int_fs_list_find(result.config.path_select_list,
+                                                                                                         me->me_mountdir))) {
+                                                path =
+                                                        mp_int_fs_list_append(&result.config.path_select_list, me->me_mountdir);
+                                        }
                                         path->best_match = me;
                                         path->group = group;
-                                        set_all_thresholds(path);
+                                        set_all_thresholds(path, warn_freespace_units, crit_freespace_units,
+                                                                           warn_freespace_percent, crit_freespace_percent,
+                                                                           warn_freeinodes_percent, crit_freeinodes_percent);
                                 }
                         }
+
                         warn_freespace_units = NULL;
                         crit_freespace_units = NULL;
-                        warn_usedspace_units = NULL;
-                        crit_usedspace_units = NULL;
                         warn_freespace_percent = NULL;
                         crit_freespace_percent = NULL;
-                        warn_usedspace_percent = NULL;
-                        crit_usedspace_percent = NULL;
-                        warn_usedinodes_percent = NULL;
-                        crit_usedinodes_percent = NULL;
                         warn_freeinodes_percent = NULL;
                         crit_freeinodes_percent = NULL;
 
                         path_selected = false;
                         group = NULL;
-                        break;
+                } break;
                 case 'V': /* version */
                         print_revision(progname, NP_VERSION);
                         exit(STATE_UNKNOWN);
@@ -858,50 +814,152 @@ int process_arguments(int argc, char **argv) {
                         exit(STATE_UNKNOWN);
                 case '?': /* help */
                         usage(_("Unknown argument"));
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 }
         }
 
         /* Support for "check_disk warn crit [fs]" with thresholds at used% level */
-        c = optind;
-        if (warn_usedspace_percent == NULL && argc > c && is_intnonneg(argv[c]))
-                warn_usedspace_percent = argv[c++];
+        int index = optind;
+
+        if (argc > index && is_intnonneg(argv[index])) {
+                if (verbose > 0) {
+                        printf("Got an positional warn threshold: %s\n", argv[index]);
+                }
+                char *range = argv[index++];
+                mp_range_parsed tmp = mp_parse_range_string(range);
+                if (tmp.error != MP_PARSING_SUCCES) {
+                        die(STATE_UNKNOWN, "failed to parse warning threshold");
+                }
+
+                mp_range tmp_range = tmp.range;
+                // Invert range to use it for free instead of used
+                // tmp_range.alert_on_inside_range = !tmp_range.alert_on_inside_range;
 
-        if (crit_usedspace_percent == NULL && argc > c && is_intnonneg(argv[c]))
-                crit_usedspace_percent = argv[c++];
+                warn_freespace_percent = mp_range_to_string(tmp_range);
 
-        if (argc > c) {
-                se = np_add_parameter(&path_select_list, strdup(argv[c++]));
+                if (verbose > 0) {
+                        printf("Positional warning threshold transformed to: %s\n", warn_freespace_percent);
+                }
+        }
+
+        if (argc > index && is_intnonneg(argv[index])) {
+                if (verbose > 0) {
+                        printf("Got an positional crit threshold: %s\n", argv[index]);
+                }
+                char *range = argv[index++];
+                mp_range_parsed tmp = mp_parse_range_string(range);
+                if (tmp.error != MP_PARSING_SUCCES) {
+                        die(STATE_UNKNOWN, "failed to parse warning threshold");
+                }
+
+                mp_range tmp_range = tmp.range;
+                // Invert range to use it for free instead of used
+                // tmp_range.alert_on_inside_range = !tmp_range.alert_on_inside_range;
+
+                crit_freespace_percent = mp_range_to_string(tmp_range);
+
+                if (verbose > 0) {
+                        printf("Positional critical threshold transformed to: %s\n", crit_freespace_percent);
+                }
+        }
+
+        if (argc > index) {
+                if (verbose > 0) {
+                        printf("Got an positional filesystem: %s\n", argv[index]);
+                }
+                struct parameter_list *se =
+                        mp_int_fs_list_append(&result.config.path_select_list, strdup(argv[index++]));
                 path_selected = true;
-                set_all_thresholds(se);
+                set_all_thresholds(se, warn_freespace_units, crit_freespace_units, warn_freespace_percent,
+                                                   crit_freespace_percent, warn_freeinodes_percent,
+                                                   crit_freeinodes_percent);
         }
 
-        if (units == NULL) {
-                units = strdup("MiB");
-                mult = (uintmax_t)1024 * 1024;
+        // If a list of paths has not been explicitly selected, find entire
+        // mount list and create list of paths
+        if (!path_selected && !result.config.path_ignored) {
+                for (struct mount_entry *me = result.config.mount_list; me; me = me->me_next) {
+                        if (me->me_dummy != 0) {
+                                // just do not add dummy filesystems
+                                continue;
+                        }
+
+                        parameter_list_elem *path = NULL;
+                        if (!(path = mp_int_fs_list_find(result.config.path_select_list, me->me_mountdir))) {
+                                path = mp_int_fs_list_append(&result.config.path_select_list, me->me_mountdir);
+                        }
+                        path->best_match = me;
+                        path->group = group;
+                        set_all_thresholds(path, warn_freespace_units, crit_freespace_units,
+                                                           warn_freespace_percent, crit_freespace_percent,
+                                                           warn_freeinodes_percent, crit_freeinodes_percent);
+                }
         }
 
-        return true;
+        // Set thresholds to the appropriate unit
+        for (parameter_list_elem *tmp = result.config.path_select_list.first; tmp;
+                 tmp = mp_int_fs_list_get_next(tmp)) {
+
+                mp_perfdata_value factor = mp_create_pd_value(unit);
+
+                if (tmp->freespace_units.critical_is_set) {
+                        tmp->freespace_units.critical =
+                                mp_range_multiply(tmp->freespace_units.critical, factor);
+                }
+                if (tmp->freespace_units.warning_is_set) {
+                        tmp->freespace_units.warning = mp_range_multiply(tmp->freespace_units.warning, factor);
+                }
+        }
+
+        return result;
 }
 
-void set_all_thresholds(struct parameter_list *path) {
-        if (path->freespace_units != NULL)
-                free(path->freespace_units);
-        set_thresholds(&path->freespace_units, warn_freespace_units, crit_freespace_units);
-        if (path->freespace_percent != NULL)
-                free(path->freespace_percent);
-        set_thresholds(&path->freespace_percent, warn_freespace_percent, crit_freespace_percent);
-        if (path->usedspace_units != NULL)
-                free(path->usedspace_units);
-        set_thresholds(&path->usedspace_units, warn_usedspace_units, crit_usedspace_units);
-        if (path->usedspace_percent != NULL)
-                free(path->usedspace_percent);
-        set_thresholds(&path->usedspace_percent, warn_usedspace_percent, crit_usedspace_percent);
-        if (path->usedinodes_percent != NULL)
-                free(path->usedinodes_percent);
-        set_thresholds(&path->usedinodes_percent, warn_usedinodes_percent, crit_usedinodes_percent);
-        if (path->freeinodes_percent != NULL)
-                free(path->freeinodes_percent);
-        set_thresholds(&path->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent);
+void set_all_thresholds(parameter_list_elem *path, char *warn_freespace_units,
+                                                char *crit_freespace_units, char *warn_freespace_percent,
+                                                char *crit_freespace_percent, char *warn_freeinodes_percent,
+                                                char *crit_freeinodes_percent) {
+        mp_range_parsed tmp;
+
+        if (warn_freespace_units) {
+                tmp = mp_parse_range_string(warn_freespace_units);
+                path->freespace_units = mp_thresholds_set_warn(path->freespace_units, tmp.range);
+        }
+
+        if (crit_freespace_units) {
+                tmp = mp_parse_range_string(crit_freespace_units);
+                path->freespace_units = mp_thresholds_set_crit(path->freespace_units, tmp.range);
+        }
+
+        if (warn_freespace_percent) {
+                tmp = mp_parse_range_string(warn_freespace_percent);
+                path->freespace_percent = mp_thresholds_set_warn(path->freespace_percent, tmp.range);
+        }
+
+        if (crit_freespace_percent) {
+                tmp = mp_parse_range_string(crit_freespace_percent);
+                path->freespace_percent = mp_thresholds_set_crit(path->freespace_percent, tmp.range);
+        }
+
+        if (warn_freeinodes_percent) {
+                tmp = mp_parse_range_string(warn_freeinodes_percent);
+                path->freeinodes_percent = mp_thresholds_set_warn(path->freeinodes_percent, tmp.range);
+        }
+
+        if (crit_freeinodes_percent) {
+                tmp = mp_parse_range_string(crit_freeinodes_percent);
+                path->freeinodes_percent = mp_thresholds_set_crit(path->freeinodes_percent, tmp.range);
+        }
 }
 
 void print_help(void) {
@@ -911,7 +969,8 @@ void print_help(void) {
         printf(COPYRIGHT, copyright, email);
 
         printf("%s\n", _("This plugin checks the amount of used disk space on a mounted file system"));
-        printf("%s\n", _("and generates an alert if free space is less than one of the threshold values"));
+        printf("%s\n",
+                   _("and generates an alert if free space is less than one of the threshold values"));
 
         printf("\n\n");
 
@@ -933,7 +992,8 @@ void print_help(void) {
         printf(" %s\n", "-K, --icritical=PERCENT%");
         printf("    %s\n", _("Exit with CRITICAL status if less than PERCENT of inode space is free"));
         printf(" %s\n", "-p, --path=PATH, --partition=PARTITION");
-        printf("    %s\n", _("Mount point or block device as emitted by the mount(8) command (may be repeated)"));
+        printf("    %s\n",
+                   _("Mount point or block device as emitted by the mount(8) command (may be repeated)"));
         printf(" %s\n", "-x, --exclude_device=PATH <STRING>");
         printf("    %s\n", _("Ignore device (only works if -p unspecified)"));
         printf(" %s\n", "-C, --clear");
@@ -947,167 +1007,298 @@ void print_help(void) {
         printf(" %s\n", "-P, --iperfdata");
         printf("    %s\n", _("Display inode usage in perfdata"));
         printf(" %s\n", "-g, --group=NAME");
-        printf("    %s\n", _("Group paths. Thresholds apply to (free-)space of all partitions together"));
-        printf(" %s\n", "-k, --kilobytes");
-        printf("    %s\n", _("Same as '--units kB'"));
+        printf("    %s\n",
+                   _("Group paths. Thresholds apply to (free-)space of all partitions together"));
         printf(" %s\n", "-l, --local");
         printf("    %s\n", _("Only check local filesystems"));
         printf(" %s\n", "-L, --stat-remote-fs");
-        printf("    %s\n", _("Only check local filesystems against thresholds. Yet call stat on remote filesystems"));
+        printf(
+                "    %s\n",
+                _("Only check local filesystems against thresholds. Yet call stat on remote filesystems"));
         printf("    %s\n", _("to test if they are accessible (e.g. to detect Stale NFS Handles)"));
         printf(" %s\n", "-M, --mountpoint");
         printf("    %s\n", _("Display the (block) device instead of the mount point"));
-        printf(" %s\n", "-m, --megabytes");
-        printf("    %s\n", _("Same as '--units MB'"));
         printf(" %s\n", "-A, --all");
         printf("    %s\n", _("Explicitly select all paths. This is equivalent to -R '.*'"));
         printf(" %s\n", "-R, --eregi-path=PATH, --eregi-partition=PARTITION");
-        printf("    %s\n", _("Case insensitive regular expression for path/partition (may be repeated)"));
+        printf("    %s\n",
+                   _("Case insensitive regular expression for path/partition (may be repeated)"));
         printf(" %s\n", "-r, --ereg-path=PATH, --ereg-partition=PARTITION");
         printf("    %s\n", _("Regular expression for path or partition (may be repeated)"));
         printf(" %s\n", "-I, --ignore-eregi-path=PATH, --ignore-eregi-partition=PARTITION");
-        printf("    %s\n", _("Regular expression to ignore selected path/partition (case insensitive) (may be repeated)"));
+        printf("    %s\n", _("Regular expression to ignore selected path/partition (case insensitive) "
+                                                 "(may be repeated)"));
         printf(" %s\n", "-i, --ignore-ereg-path=PATH, --ignore-ereg-partition=PARTITION");
-        printf("    %s\n", _("Regular expression to ignore selected path or partition (may be repeated)"));
+        printf("    %s\n",
+                   _("Regular expression to ignore selected path or partition (may be repeated)"));
         printf(" %s\n", "-n, --ignore-missing");
-        printf("    %s\n", _("Return OK if no filesystem matches, filesystem does not exist or is inaccessible."));
+        printf("    %s\n",
+                   _("Return OK if no filesystem matches, filesystem does not exist or is inaccessible."));
         printf("    %s\n", _("(Provide this option before -p / -r / --ereg-path if used)"));
         printf(UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf(" %s\n", "-u, --units=STRING");
-        printf("    %s\n", _("Choose bytes, kB, MB, GB, TB (default: MB)"));
+        printf("    %s\n", _("Select the unit used for the absolute value thresholds"));
+        printf("    %s\n", _("Choose one of \"bytes\", \"KiB\", \"kB\", \"MiB\", \"MB\", \"GiB\", "
+                                                 "\"GB\", \"TiB\", \"TB\", \"PiB\", \"PB\" (default: MiB)"));
+        printf(" %s\n", "-k, --kilobytes");
+        printf("    %s\n", _("Same as '--units kB'"));
+        printf(" %s\n", "--display-unit");
+        printf("    %s\n", _("Select the unit used for in the output"));
+        printf("    %s\n", _("Choose one of \"bytes\", \"KiB\", \"kB\", \"MiB\", \"MB\", \"GiB\", "
+                                                 "\"GB\", \"TiB\", \"TB\", \"PiB\", \"PB\" (default: MiB)"));
+        printf(" %s\n", "-m, --megabytes");
+        printf("    %s\n", _("Same as '--units MB'"));
         printf(UT_VERBOSE);
         printf(" %s\n", "-X, --exclude-type=TYPE_REGEX");
-        printf("    %s\n", _("Ignore all filesystems of types matching given regex(7) (may be repeated)"));
+        printf("    %s\n",
+                   _("Ignore all filesystems of types matching given regex(7) (may be repeated)"));
         printf(" %s\n", "-N, --include-type=TYPE_REGEX");
-        printf("    %s\n", _("Check only filesystems where the type matches this given regex(7) (may be repeated)"));
+        printf(
+                "    %s\n",
+                _("Check only filesystems where the type matches this given regex(7) (may be repeated)"));
+        printf(UT_OUTPUT_FORMAT);
 
         printf("\n");
         printf("%s\n", _("General usage hints:"));
-        printf(" %s\n", _("- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the same as"));
+        printf(
+                " %s\n",
+                _("- Arguments are positional! \"-w 5 -c 1 -p /foo -w6 -c2 -p /bar\" is not the same as"));
         printf("   %s\n", _("\"-w 5 -c 1 -p /bar w6 -c2 -p /foo\"."));
-        printf(" %s\n", _("- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} {thresholds b} ...\""));
+        printf(" %s\n", _("- The syntax is broadly: \"{thresholds a} {paths a} -C {thresholds b} "
+                                          "{thresholds b} ...\""));
 
         printf("\n");
         printf("%s\n", _("Examples:"));
         printf(" %s\n", "check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /");
         printf("    %s\n\n", _("Checks /tmp and /var at 10% and 5%, and / at 100MB and 50MB"));
-        printf(" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -g sidDATA -r '^/oracle/SID/data.*$'");
-        printf("    %s\n", _("Checks all filesystems not matching -r at 100M and 50M. The fs matching the -r regex"));
-        printf("    %s\n\n", _("are grouped which means the freespace thresholds are applied to all disks together"));
+        printf(" %s\n",
+                   "check_disk -w 100 -c 50 -C -w 1000 -c 500 -g sidDATA -r '^/oracle/SID/data.*$'");
+        printf(
+                "    %s\n",
+                _("Checks all filesystems not matching -r at 100M and 50M. The fs matching the -r regex"));
+        printf("    %s\n\n",
+                   _("are grouped which means the freespace thresholds are applied to all disks together"));
         printf(" %s\n", "check_disk -w 100 -c 50 -C -w 1000 -c 500 -p /foo -C -w 5% -c 3% -p /bar");
-        printf("    %s\n", _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
+        printf("    %s\n",
+                   _("Checks /foo for 1000M/500M and /bar for 5/3%. All remaining volumes use 100M/50M"));
 
         printf(UT_SUPPORT);
 }
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf(" %s {-w absolute_limit |-w  percentage_limit%% | -W inode_percentage_limit } {-c absolute_limit|-c percentage_limit%% | -K "
+        printf(" %s {-w absolute_limit |-w  percentage_limit%% | -W inode_percentage_limit } {-c "
+                   "absolute_limit|-c percentage_limit%% | -K "
                    "inode_percentage_limit } {-p path | -x device}\n",
                    progname);
         printf("[-C] [-E] [-e] [-f] [-g group ] [-k] [-l] [-M] [-m] [-R path ] [-r path ]\n");
         printf("[-t timeout] [-u unit] [-v] [-X type_regex] [-N type]\n");
 }
 
-bool stat_path(struct parameter_list *p) {
+bool stat_path(parameter_list_elem *parameters, bool ignore_missing) {
         /* Stat entry to check that dir exists and is accessible */
-        if (verbose >= 3)
-                printf("calling stat on %s\n", p->name);
-        if (stat(p->name, &stat_buf[0])) {
-                if (verbose >= 3)
-                        printf("stat failed on %s\n", p->name);
-                if (ignore_missing == true) {
+        if (verbose >= 3) {
+                printf("calling stat on %s\n", parameters->name);
+        }
+
+        struct stat stat_buf = {0};
+        if (stat(parameters->name, &stat_buf)) {
+                if (verbose >= 3) {
+                        printf("stat failed on %s\n", parameters->name);
+                }
+                if (ignore_missing) {
                         return false;
                 }
                 printf("DISK %s - ", _("CRITICAL"));
-                die(STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("is not accessible"), strerror(errno));
+                die(STATE_CRITICAL, _("%s %s: %s\n"), parameters->name, _("is not accessible"),
+                        strerror(errno));
         }
+
         return true;
 }
 
-void get_stats(struct parameter_list *p, struct fs_usage *fsp) {
-        struct parameter_list *p_list;
-        struct fs_usage tmpfsp;
-        int first = 1;
+static parameter_list_elem get_path_stats(parameter_list_elem parameters, const struct fs_usage fsp,
+                                                                                  bool freespace_ignore_reserved) {
+        uintmax_t available = fsp.fsu_bavail;
+        uintmax_t available_to_root = fsp.fsu_bfree;
+        uintmax_t used = fsp.fsu_blocks - fsp.fsu_bfree;
+        uintmax_t total;
 
-        if (p->group == NULL) {
-                get_path_stats(p, fsp);
-        } else {
-                /* find all group members */
-                for (p_list = path_select_list; p_list; p_list = p_list->name_next) {
-#ifdef __CYGWIN__
-                        if (strncmp(p_list->name, "/cygdrive/", 10) != 0)
-                                continue;
-#endif
-                        if (p_list->group && !(strcmp(p_list->group, p->group))) {
-                                if (!stat_path(p_list))
-                                        continue;
-                                get_fs_usage(p_list->best_match->me_mountdir, p_list->best_match->me_devname, &tmpfsp);
-                                get_path_stats(p_list, &tmpfsp);
-                                if (verbose >= 3)
-                                        printf("Group %s: adding %lu blocks sized %lu, (%s) used_units=%lu free_units=%lu total_units=%lu mult=%lu\n",
-                                                   p_list->group, tmpfsp.fsu_blocks, tmpfsp.fsu_blocksize, p_list->best_match->me_mountdir, p_list->dused_units,
-                                                   p_list->dfree_units, p_list->dtotal_units, mult);
-
-                                /* prevent counting the first FS of a group twice since its parameter_list entry
-                                 * is used to carry the information of all file systems of the entire group */
-                                if (!first) {
-                                        p->total += p_list->total;
-                                        p->available += p_list->available;
-                                        p->available_to_root += p_list->available_to_root;
-                                        p->used += p_list->used;
-
-                                        p->dused_units += p_list->dused_units;
-                                        p->dfree_units += p_list->dfree_units;
-                                        p->dtotal_units += p_list->dtotal_units;
-                                        p->inodes_total += p_list->inodes_total;
-                                        p->inodes_free += p_list->inodes_free;
-                                        p->inodes_free_to_root += p_list->inodes_free_to_root;
-                                        p->inodes_used += p_list->inodes_used;
-                                }
-                                first = 0;
-                        }
-                        if (verbose >= 3)
-                                printf("Group %s now has: used_units=%lu free_units=%lu total_units=%lu fsu_blocksize=%lu mult=%lu\n", p->group,
-                                           p->dused_units, p->dfree_units, p->dtotal_units, tmpfsp.fsu_blocksize, mult);
-                }
-                /* modify devname and mountdir for output */
-                p->best_match->me_mountdir = p->best_match->me_devname = p->group;
-        }
-        /* finally calculate percentages for either plain FS or summed up group */
-        p->dused_pct = calculate_percent(p->used, p->used + p->available); /* used + available can never be > uintmax */
-        p->dfree_pct = 100.0 - p->dused_pct;
-        p->dused_inodes_percent = calculate_percent(p->inodes_total - p->inodes_free, p->inodes_total);
-        p->dfree_inodes_percent = 100 - p->dused_inodes_percent;
-}
-
-void get_path_stats(struct parameter_list *p, struct fs_usage *fsp) {
-        p->available = fsp->fsu_bavail;
-        p->available_to_root = fsp->fsu_bfree;
-        p->used = fsp->fsu_blocks - fsp->fsu_bfree;
         if (freespace_ignore_reserved) {
                 /* option activated : we subtract the root-reserved space from the total */
-                p->total = fsp->fsu_blocks - p->available_to_root + p->available;
+                total = fsp.fsu_blocks - available_to_root + available;
         } else {
                 /* default behaviour : take all the blocks into account */
-                p->total = fsp->fsu_blocks;
+                total = fsp.fsu_blocks;
         }
 
-        p->dused_units = p->used * fsp->fsu_blocksize / mult;
-        p->dfree_units = p->available * fsp->fsu_blocksize / mult;
-        p->dtotal_units = p->total * fsp->fsu_blocksize / mult;
+        parameters.used_bytes = used * fsp.fsu_blocksize;
+        parameters.free_bytes = available * fsp.fsu_blocksize;
+        parameters.total_bytes = total * fsp.fsu_blocksize;
+
         /* Free file nodes. Not sure the workaround is required, but in case...*/
-        p->inodes_free = fsp->fsu_ffree;
-        p->inodes_free_to_root = fsp->fsu_ffree; /* Free file nodes for root. */
-        p->inodes_used = fsp->fsu_files - fsp->fsu_ffree;
+        parameters.inodes_free = fsp.fsu_ffree;
+        parameters.inodes_free_to_root = fsp.fsu_ffree; /* Free file nodes for root. */
+        parameters.inodes_used = fsp.fsu_files - fsp.fsu_ffree;
+
         if (freespace_ignore_reserved) {
                 /* option activated : we subtract the root-reserved inodes from the total */
                 /* not all OS report fsp->fsu_favail, only the ones with statvfs syscall */
                 /* for others, fsp->fsu_ffree == fsp->fsu_favail */
-                p->inodes_total = fsp->fsu_files - p->inodes_free_to_root + p->inodes_free;
+                parameters.inodes_total =
+                        fsp.fsu_files - parameters.inodes_free_to_root + parameters.inodes_free;
         } else {
                 /* default behaviour : take all the inodes into account */
-                p->inodes_total = fsp->fsu_files;
+                parameters.inodes_total = fsp.fsu_files;
         }
-        np_add_name(&seen, p->best_match->me_mountdir);
+
+        return parameters;
+}
+
+mp_subcheck evaluate_filesystem(measurement_unit measurement_unit, bool display_inodes_perfdata,
+                                                                byte_unit unit) {
+        mp_subcheck result = mp_subcheck_init();
+        result = mp_set_subcheck_default_state(result, STATE_UNKNOWN);
+        xasprintf(&result.output, "%s", measurement_unit.name);
+
+        if (!measurement_unit.is_group && measurement_unit.filesystem_type) {
+                xasprintf(&result.output, "%s (%s)", result.output, measurement_unit.filesystem_type);
+        }
+
+        /* Threshold comparisons */
+
+        // ===============================
+        // Free space absolute values test
+        mp_subcheck freespace_bytes_sc = mp_subcheck_init();
+        freespace_bytes_sc = mp_set_subcheck_default_state(freespace_bytes_sc, STATE_OK);
+
+        if (unit != Humanized) {
+                xasprintf(&freespace_bytes_sc.output, "Free space absolute: %ju%s (of %ju%s)",
+                                  (uintmax_t)(measurement_unit.free_bytes / unit), get_unit_string(unit),
+                                  (uintmax_t)(measurement_unit.total_bytes / unit), get_unit_string(unit));
+        } else {
+                xasprintf(&freespace_bytes_sc.output, "Free space absolute: %s (of %s)",
+                                  humanize_byte_value(measurement_unit.free_bytes, false),
+                                  humanize_byte_value((unsigned long long)measurement_unit.total_bytes, false));
+        }
+
+        mp_perfdata used_space = perfdata_init();
+        used_space.label = measurement_unit.name;
+        used_space.value = mp_create_pd_value(measurement_unit.free_bytes);
+        used_space = mp_set_pd_max_value(used_space, mp_create_pd_value(measurement_unit.total_bytes));
+        used_space = mp_set_pd_min_value(used_space, mp_create_pd_value(0));
+        used_space.uom = "B";
+        used_space = mp_pd_set_thresholds(used_space, measurement_unit.freespace_bytes_thresholds);
+        freespace_bytes_sc = mp_set_subcheck_state(freespace_bytes_sc, mp_get_pd_status(used_space));
+
+        // special case for absolute space thresholds here:
+        // if absolute values are not set, compute the thresholds from percentage thresholds
+        mp_thresholds temp_thlds = measurement_unit.freespace_bytes_thresholds;
+        if (!temp_thlds.critical_is_set &&
+                measurement_unit.freespace_percent_thresholds.critical_is_set) {
+                mp_range tmp_range = measurement_unit.freespace_percent_thresholds.critical;
+
+                if (!tmp_range.end_infinity) {
+                        tmp_range.end = mp_create_pd_value(mp_get_pd_value(tmp_range.end) / 100 *
+                                                                                           measurement_unit.total_bytes);
+                }
+
+                if (!tmp_range.start_infinity) {
+                        tmp_range.start = mp_create_pd_value(mp_get_pd_value(tmp_range.start) / 100 *
+                                                                                                 measurement_unit.total_bytes);
+                }
+                measurement_unit.freespace_bytes_thresholds =
+                        mp_thresholds_set_crit(measurement_unit.freespace_bytes_thresholds, tmp_range);
+                used_space = mp_pd_set_thresholds(used_space, measurement_unit.freespace_bytes_thresholds);
+        }
+
+        if (!temp_thlds.warning_is_set &&
+                measurement_unit.freespace_percent_thresholds.warning_is_set) {
+                mp_range tmp_range = measurement_unit.freespace_percent_thresholds.warning;
+                if (!tmp_range.end_infinity) {
+                        tmp_range.end = mp_create_pd_value(mp_get_pd_value(tmp_range.end) / 100 *
+                                                                                           measurement_unit.total_bytes);
+                }
+                if (!tmp_range.start_infinity) {
+                        tmp_range.start = mp_create_pd_value(mp_get_pd_value(tmp_range.start) / 100 *
+                                                                                                 measurement_unit.total_bytes);
+                }
+                measurement_unit.freespace_bytes_thresholds =
+                        mp_thresholds_set_warn(measurement_unit.freespace_bytes_thresholds, tmp_range);
+                used_space = mp_pd_set_thresholds(used_space, measurement_unit.freespace_bytes_thresholds);
+        }
+
+        mp_add_perfdata_to_subcheck(&freespace_bytes_sc, used_space);
+        mp_add_subcheck_to_subcheck(&result, freespace_bytes_sc);
+
+        // ==========================
+        // Free space percentage test
+        mp_subcheck freespace_percent_sc = mp_subcheck_init();
+        freespace_percent_sc = mp_set_subcheck_default_state(freespace_percent_sc, STATE_OK);
+
+        double free_percentage =
+                calculate_percent(measurement_unit.free_bytes, measurement_unit.total_bytes);
+        xasprintf(&freespace_percent_sc.output, "Free space percentage: %g%%", free_percentage);
+
+        // Using perfdata here just to get to the test result
+        mp_perfdata free_space_percent_pd = perfdata_init();
+        free_space_percent_pd.value = mp_create_pd_value(free_percentage);
+        free_space_percent_pd =
+                mp_pd_set_thresholds(free_space_percent_pd, measurement_unit.freespace_percent_thresholds);
+
+        freespace_percent_sc =
+                mp_set_subcheck_state(freespace_percent_sc, mp_get_pd_status(free_space_percent_pd));
+        mp_add_subcheck_to_subcheck(&result, freespace_percent_sc);
+
+        // ================
+        // Free inodes test
+        // Only ever useful if the number of inodes is static (e.g. ext4),
+        // not when it is dynamic (e.g btrfs)
+        // Assumption: if the total number of inodes == 0, we have such a case and just skip the test
+        if (measurement_unit.inodes_total > 0) {
+                mp_subcheck freeindodes_percent_sc = mp_subcheck_init();
+                freeindodes_percent_sc = mp_set_subcheck_default_state(freeindodes_percent_sc, STATE_OK);
+
+                double free_inode_percentage =
+                        calculate_percent(measurement_unit.inodes_free, measurement_unit.inodes_total);
+
+                if (verbose > 0) {
+                        printf("free inode percentage computed: %g\n", free_inode_percentage);
+                }
+
+                xasprintf(&freeindodes_percent_sc.output, "Inodes free: %g%% (%ju of %ju)",
+                                  free_inode_percentage, measurement_unit.inodes_free,
+                                  measurement_unit.inodes_total);
+
+                mp_perfdata inodes_pd = perfdata_init();
+                xasprintf(&inodes_pd.label, "%s (inodes)", measurement_unit.name);
+                inodes_pd = mp_set_pd_value(inodes_pd, measurement_unit.inodes_used);
+                inodes_pd =
+                        mp_set_pd_max_value(inodes_pd, mp_create_pd_value(measurement_unit.inodes_total));
+                inodes_pd = mp_set_pd_min_value(inodes_pd, mp_create_pd_value(0));
+
+                mp_thresholds absolut_inode_thresholds = measurement_unit.freeinodes_percent_thresholds;
+
+                if (absolut_inode_thresholds.critical_is_set) {
+                        absolut_inode_thresholds.critical =
+                                mp_range_multiply(absolut_inode_thresholds.critical,
+                                                                  mp_create_pd_value(measurement_unit.inodes_total / 100));
+                }
+                if (absolut_inode_thresholds.warning_is_set) {
+                        absolut_inode_thresholds.warning =
+                                mp_range_multiply(absolut_inode_thresholds.warning,
+                                                                  mp_create_pd_value(measurement_unit.inodes_total / 100));
+                }
+
+                inodes_pd = mp_pd_set_thresholds(inodes_pd, absolut_inode_thresholds);
+
+                freeindodes_percent_sc =
+                        mp_set_subcheck_state(freeindodes_percent_sc, mp_get_pd_status(inodes_pd));
+                if (display_inodes_perfdata) {
+                        mp_add_perfdata_to_subcheck(&freeindodes_percent_sc, inodes_pd);
+                }
+                mp_add_subcheck_to_subcheck(&result, freeindodes_percent_sc);
+        }
+
+        return result;
 }
diff --git a/plugins/check_disk.d/utils_disk.c b/plugins/check_disk.d/utils_disk.c
new file mode 100644
index 00000000..0b89018d
--- /dev/null
+++ b/plugins/check_disk.d/utils_disk.c
@@ -0,0 +1,528 @@
+/*****************************************************************************
+ *
+ * Library for check_disk
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains utilities for check_disk. These are tested by libtap
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
+
+#include "../common.h"
+#include "utils_disk.h"
+#include "../../gl/fsusage.h"
+#include "../../lib/thresholds.h"
+#include "../../lib/states.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <assert.h>
+
+void np_add_name(struct name_list **list, const char *name) {
+        struct name_list *new_entry;
+        new_entry = (struct name_list *)malloc(sizeof *new_entry);
+        new_entry->name = (char *)name;
+        new_entry->next = *list;
+        *list = new_entry;
+}
+
+/* @brief Initialises a new regex at the begin of list via regcomp(3)
+ *
+ * @details if the regex fails to compile the error code of regcomp(3) is returned
+ *                                      and list is not modified, otherwise list is modified to point to the new
+ *                                      element
+ * @param list Pointer to a linked list of regex_list elements
+ * @param regex the string containing the regex which should be inserted into the list
+ * @param clags the cflags parameter for regcomp(3)
+ */
+int np_add_regex(struct regex_list **list, const char *regex, int cflags) {
+        struct regex_list *new_entry = (struct regex_list *)malloc(sizeof *new_entry);
+
+        if (new_entry == NULL) {
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+        }
+
+        int regcomp_result = regcomp(&new_entry->regex, regex, cflags);
+
+        if (!regcomp_result) {
+                // regcomp succeeded
+                new_entry->next = *list;
+                *list = new_entry;
+
+                return 0;
+        }
+        // regcomp failed
+        free(new_entry);
+
+        return regcomp_result;
+}
+
+parameter_list_elem parameter_list_init(const char *name) {
+        parameter_list_elem result = {
+                .name = strdup(name),
+                .best_match = NULL,
+
+                .freespace_units = mp_thresholds_init(),
+                .freespace_percent = mp_thresholds_init(),
+                .freeinodes_percent = mp_thresholds_init(),
+
+                .group = NULL,
+
+                .inodes_total = 0,
+                .inodes_free = 0,
+                .inodes_free_to_root = 0,
+                .inodes_used = 0,
+
+                .used_bytes = 0,
+                .free_bytes = 0,
+                .total_bytes = 0,
+
+                .next = NULL,
+                .prev = NULL,
+        };
+        return result;
+}
+
+/* Returns true if name is in list */
+bool np_find_name(struct name_list *list, const char *name) {
+        if (list == NULL || name == NULL) {
+                return false;
+        }
+        for (struct name_list *iterator = list; iterator; iterator = iterator->next) {
+                if (!strcmp(name, iterator->name)) {
+                        return true;
+                }
+        }
+        return false;
+}
+
+/* Returns true if name is in list */
+bool np_find_regmatch(struct regex_list *list, const char *name) {
+        if (name == NULL) {
+                return false;
+        }
+
+        size_t len = strlen(name);
+
+        for (; list; list = list->next) {
+                /* Emulate a full match as if surrounded with ^( )$
+                   by checking whether the match spans the whole name */
+                regmatch_t dummy_match;
+                if (!regexec(&list->regex, name, 1, &dummy_match, 0) && dummy_match.rm_so == 0 &&
+                        dummy_match.rm_eo == len) {
+                        return true;
+                }
+        }
+
+        return false;
+}
+
+bool np_seen_name(struct name_list *list, const char *name) {
+        for (struct name_list *iterator = list; iterator; iterator = iterator->next) {
+                if (!strcmp(iterator->name, name)) {
+                        return true;
+                }
+        }
+        return false;
+}
+
+bool np_regex_match_mount_entry(struct mount_entry *me, regex_t *re) {
+        return ((regexec(re, me->me_devname, (size_t)0, NULL, 0) == 0) ||
+                        (regexec(re, me->me_mountdir, (size_t)0, NULL, 0) == 0));
+}
+
+check_disk_config check_disk_config_init() {
+        check_disk_config tmp = {
+                .erronly = false,
+                .display_mntp = false,
+                .show_local_fs = false,
+                .stat_remote_fs = false,
+                .display_inodes_perfdata = false,
+
+                .exact_match = false,
+                .freespace_ignore_reserved = false,
+
+                .ignore_missing = false,
+                .path_ignored = false,
+
+                // FS Filters
+                .fs_exclude_list = NULL,
+                .fs_include_list = NULL,
+                .device_path_exclude_list = NULL,
+
+                // Actual filesystems paths to investigate
+                .path_select_list = filesystem_list_init(),
+
+                .mount_list = NULL,
+                .seen = NULL,
+
+                .display_unit = Humanized,
+                // .unit = MebiBytes,
+
+                .output_format_is_set = false,
+        };
+        return tmp;
+}
+
+char *get_unit_string(byte_unit_enum unit) {
+        switch (unit) {
+        case Bytes:
+                return "Bytes";
+        case KibiBytes:
+                return "KiB";
+        case MebiBytes:
+                return "MiB";
+        case GibiBytes:
+                return "GiB";
+        case TebiBytes:
+                return "TiB";
+        case PebiBytes:
+                return "PiB";
+        case ExbiBytes:
+                return "EiB";
+        case KiloBytes:
+                return "KB";
+        case MegaBytes:
+                return "MB";
+        case GigaBytes:
+                return "GB";
+        case TeraBytes:
+                return "TB";
+        case PetaBytes:
+                return "PB";
+        case ExaBytes:
+                return "EB";
+        default:
+                assert(false);
+        }
+}
+
+measurement_unit measurement_unit_init() {
+        measurement_unit tmp = {
+                .name = NULL,
+                .filesystem_type = NULL,
+                .is_group = false,
+
+                .freeinodes_percent_thresholds = mp_thresholds_init(),
+                .freespace_percent_thresholds = mp_thresholds_init(),
+                .freespace_bytes_thresholds = mp_thresholds_init(),
+
+                .free_bytes = 0,
+                .used_bytes = 0,
+                .total_bytes = 0,
+
+                .inodes_total = 0,
+                .inodes_free = 0,
+                .inodes_free_to_root = 0,
+                .inodes_used = 0,
+        };
+        return tmp;
+}
+
+// Add a given element to the list, memory for the new element is freshly allocated
+// Returns a pointer to new element
+measurement_unit_list *add_measurement_list(measurement_unit_list *list, measurement_unit elem) {
+        // find last element
+        measurement_unit_list *new = NULL;
+        if (list == NULL) {
+                new = calloc(1, sizeof(measurement_unit_list));
+                if (new == NULL) {
+                        die(STATE_UNKNOWN, _("allocation failed"));
+                }
+        } else {
+                measurement_unit_list *list_elem = list;
+                while (list_elem->next != NULL) {
+                        list_elem = list_elem->next;
+                }
+
+                new = calloc(1, sizeof(measurement_unit_list));
+                if (new == NULL) {
+                        die(STATE_UNKNOWN, _("allocation failed"));
+                }
+
+                list_elem->next = new;
+        }
+
+        new->unit = elem;
+        new->next = NULL;
+        return new;
+}
+
+measurement_unit add_filesystem_to_measurement_unit(measurement_unit unit,
+                                                                                                        parameter_list_elem filesystem) {
+
+        unit.free_bytes += filesystem.free_bytes;
+        unit.used_bytes += filesystem.used_bytes;
+        unit.total_bytes += filesystem.total_bytes;
+
+        unit.inodes_total += filesystem.inodes_total;
+        unit.inodes_free += filesystem.inodes_free;
+        unit.inodes_free_to_root += filesystem.inodes_free_to_root;
+        unit.inodes_used += filesystem.inodes_used;
+        return unit;
+}
+
+measurement_unit create_measurement_unit_from_filesystem(parameter_list_elem filesystem,
+                                                                                                                 bool display_mntp) {
+        measurement_unit result = measurement_unit_init();
+        if (!display_mntp) {
+                result.name = strdup(filesystem.best_match->me_mountdir);
+        } else {
+                result.name = strdup(filesystem.best_match->me_devname);
+        }
+
+        if (filesystem.group) {
+                result.is_group = true;
+        } else {
+                result.is_group = false;
+                if (filesystem.best_match) {
+                        result.filesystem_type = filesystem.best_match->me_type;
+                }
+        }
+
+        result.freeinodes_percent_thresholds = filesystem.freeinodes_percent;
+        result.freespace_percent_thresholds = filesystem.freespace_percent;
+        result.freespace_bytes_thresholds = filesystem.freespace_units;
+        result.free_bytes = filesystem.free_bytes;
+        result.total_bytes = filesystem.total_bytes;
+        result.used_bytes = filesystem.used_bytes;
+        result.inodes_total = filesystem.inodes_total;
+        result.inodes_used = filesystem.inodes_used;
+        result.inodes_free = filesystem.inodes_free;
+        result.inodes_free_to_root = filesystem.inodes_free_to_root;
+        return result;
+}
+
+#define RANDOM_STRING_LENGTH 64
+
+char *humanize_byte_value(unsigned long long value, bool use_si_units) {
+        // Idea: A reasonable output should have at most 3 orders of magnitude
+        // before the decimal separator
+        // 353GiB is ok, 2444 GiB should be 2.386 TiB
+        char *result = calloc(RANDOM_STRING_LENGTH, sizeof(char));
+        if (result == NULL) {
+                die(STATE_UNKNOWN, _("allocation failed"));
+        }
+        const byte_unit KibiBytes_factor = 1024;
+        const byte_unit MebiBytes_factor = 1048576;
+        const byte_unit GibiBytes_factor = 1073741824;
+        const byte_unit TebiBytes_factor = 1099511627776;
+        const byte_unit PebiBytes_factor = 1125899906842624;
+        const byte_unit ExbiBytes_factor = 1152921504606846976;
+        const byte_unit KiloBytes_factor = 1000;
+        const byte_unit MegaBytes_factor = 1000000;
+        const byte_unit GigaBytes_factor = 1000000000;
+        const byte_unit TeraBytes_factor = 1000000000000;
+        const byte_unit PetaBytes_factor = 1000000000000000;
+        const byte_unit ExaBytes_factor = 1000000000000000000;
+
+        if (use_si_units) {
+                // SI units, powers of 10
+                if (value < KiloBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu B", value);
+                } else if (value < MegaBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu KB", value / KiloBytes_factor);
+                } else if (value < GigaBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu MB", value / MegaBytes_factor);
+                } else if (value < TeraBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu GB", value / GigaBytes_factor);
+                } else if (value < PetaBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu TB", value / TeraBytes_factor);
+                } else if (value < ExaBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu PB", value / PetaBytes_factor);
+                } else {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu EB", value / ExaBytes_factor);
+                }
+        } else {
+                // IEC units, powers of 2 ^ 10
+                if (value < KibiBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu B", value);
+                } else if (value < MebiBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu KiB", value / KibiBytes_factor);
+                } else if (value < GibiBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu MiB", value / MebiBytes_factor);
+                } else if (value < TebiBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu GiB", value / GibiBytes_factor);
+                } else if (value < PebiBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu TiB", value / TebiBytes_factor);
+                } else if (value < ExbiBytes_factor) {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu PiB", value / PebiBytes_factor);
+                } else {
+                        snprintf(result, RANDOM_STRING_LENGTH, "%llu EiB", value / ExbiBytes_factor);
+                }
+        }
+
+        return result;
+}
+
+filesystem_list filesystem_list_init() {
+        filesystem_list tmp = {
+                .length = 0,
+                .first = NULL,
+        };
+        return tmp;
+}
+
+parameter_list_elem *mp_int_fs_list_append(filesystem_list *list, const char *name) {
+        parameter_list_elem *current = list->first;
+        parameter_list_elem *new_path = (struct parameter_list *)malloc(sizeof *new_path);
+        *new_path = parameter_list_init(name);
+
+        if (current == NULL) {
+                list->first = new_path;
+                new_path->prev = NULL;
+                list->length = 1;
+        } else {
+                while (current->next) {
+                        current = current->next;
+                }
+                current->next = new_path;
+                new_path->prev = current;
+                list->length++;
+        }
+        return new_path;
+}
+
+parameter_list_elem *mp_int_fs_list_find(filesystem_list list, const char *name) {
+        if (list.length == 0) {
+                return NULL;
+        }
+
+        for (parameter_list_elem *temp_list = list.first; temp_list; temp_list = temp_list->next) {
+                if (!strcmp(temp_list->name, name)) {
+                        return temp_list;
+                }
+        }
+
+        return NULL;
+}
+
+parameter_list_elem *mp_int_fs_list_del(filesystem_list *list, parameter_list_elem *item) {
+        if (list->length == 0) {
+                return NULL;
+        }
+
+        if (item == NULL) {
+                // Got NULL for item, interpret this as "delete first element"
+                // as a kind of compatibility to the old function
+                item = list->first;
+        }
+
+        if (list->first == item) {
+                list->length--;
+
+                list->first = item->next;
+                if (list->first) {
+                        list->first->prev = NULL;
+                }
+                return list->first;
+        }
+
+        // Was not the first element, continue
+        parameter_list_elem *prev = list->first;
+        parameter_list_elem *current = list->first->next;
+
+        while (current != item && current != NULL) {
+                prev = current;
+                current = current->next;
+        }
+
+        if (current == NULL) {
+                // didn't find that element ....
+                return NULL;
+        }
+
+        // remove the element
+        parameter_list_elem *next = current->next;
+        prev->next = next;
+        list->length--;
+        if (next) {
+                next->prev = prev;
+        }
+
+        if (item->name) {
+                free(item->name);
+        }
+        free(item);
+
+        return next;
+}
+
+parameter_list_elem *mp_int_fs_list_get_next(parameter_list_elem *current) {
+        if (!current) {
+                return NULL;
+        }
+        return current->next;
+}
+
+void mp_int_fs_list_set_best_match(filesystem_list list, struct mount_entry *mount_list,
+                                                                   bool exact) {
+        for (parameter_list_elem *elem = list.first; elem; elem = mp_int_fs_list_get_next(elem)) {
+                if (!elem->best_match) {
+                        size_t name_len = strlen(elem->name);
+                        struct mount_entry *best_match = NULL;
+
+                        /* set best match if path name exactly matches a mounted device name */
+                        for (struct mount_entry *mount_entry = mount_list; mount_entry;
+                                 mount_entry = mount_entry->me_next) {
+                                if (strcmp(mount_entry->me_devname, elem->name) == 0) {
+                                        struct fs_usage fsp;
+                                        if (get_fs_usage(mount_entry->me_mountdir, mount_entry->me_devname, &fsp) >=
+                                                0) {
+                                                best_match = mount_entry;
+                                        }
+                                }
+                        }
+
+                        /* set best match by directory name if no match was found by devname */
+                        if (!best_match) {
+                                size_t best_match_len = 0;
+                                for (struct mount_entry *mount_entry = mount_list; mount_entry;
+                                         mount_entry = mount_entry->me_next) {
+                                        size_t len = strlen(mount_entry->me_mountdir);
+
+                                        if ((!exact &&
+                                                 (best_match_len <= len && len <= name_len &&
+                                                  (len == 1 || strncmp(mount_entry->me_mountdir, elem->name, len) == 0))) ||
+                                                (exact && strcmp(mount_entry->me_mountdir, elem->name) == 0)) {
+                                                struct fs_usage fsp;
+
+                                                if (get_fs_usage(mount_entry->me_mountdir, mount_entry->me_devname, &fsp) >=
+                                                        0) {
+                                                        best_match = mount_entry;
+                                                        best_match_len = len;
+                                                }
+                                        }
+                                }
+                        }
+
+                        if (best_match) {
+                                elem->best_match = best_match;
+                        } else {
+                                elem->best_match =
+                                        NULL; /* Not sure why this is needed as it should be null on initialisation */
+                        }
+
+                        // No filesystem without a mount_entry!
+                        // assert(elem->best_match != NULL);
+                }
+        }
+}
diff --git a/plugins/check_disk.d/utils_disk.h b/plugins/check_disk.d/utils_disk.h
new file mode 100644
index 00000000..c96d4296
--- /dev/null
+++ b/plugins/check_disk.d/utils_disk.h
@@ -0,0 +1,160 @@
+#pragma once
+/* Header file for utils_disk */
+
+#include "../../config.h"
+#include "../../gl/mountlist.h"
+#include "../../lib/utils_base.h"
+#include "../../lib/output.h"
+#include "regex.h"
+#include <stdint.h>
+
+typedef unsigned long long byte_unit;
+
+typedef enum {
+        Humanized,
+        Bytes,
+        KibiBytes,
+        MebiBytes,
+        GibiBytes,
+        TebiBytes,
+        PebiBytes,
+        ExbiBytes,
+        KiloBytes,
+        MegaBytes,
+        GigaBytes,
+        TeraBytes,
+        PetaBytes,
+        ExaBytes,
+} byte_unit_enum;
+
+typedef struct name_list string_list;
+struct name_list {
+        char *name;
+        string_list *next;
+};
+
+struct regex_list {
+        regex_t regex;
+        struct regex_list *next;
+};
+
+typedef struct parameter_list parameter_list_elem;
+struct parameter_list {
+        char *name;
+        char *group;
+
+        mp_thresholds freespace_units;
+        mp_thresholds freespace_percent;
+        mp_thresholds freeinodes_percent;
+
+        struct mount_entry *best_match;
+
+        uintmax_t inodes_free_to_root;
+        uintmax_t inodes_free;
+        uintmax_t inodes_used;
+        uintmax_t inodes_total;
+
+        uint64_t used_bytes;
+        uint64_t free_bytes;
+        uint64_t total_bytes;
+
+        parameter_list_elem *next;
+        parameter_list_elem *prev;
+};
+
+typedef struct {
+        size_t length;
+        parameter_list_elem *first;
+} filesystem_list;
+
+filesystem_list filesystem_list_init();
+
+typedef struct {
+        char *name;
+        char *filesystem_type;
+        bool is_group;
+
+        mp_thresholds freespace_bytes_thresholds;
+        mp_thresholds freespace_percent_thresholds;
+        mp_thresholds freeinodes_percent_thresholds;
+
+        uintmax_t inodes_free_to_root;
+        uintmax_t inodes_free;
+        uintmax_t inodes_used;
+        uintmax_t inodes_total;
+
+        uintmax_t used_bytes;
+        uintmax_t free_bytes;
+        uintmax_t total_bytes;
+} measurement_unit;
+
+typedef struct measurement_unit_list measurement_unit_list;
+struct measurement_unit_list {
+        measurement_unit unit;
+        measurement_unit_list *next;
+};
+
+typedef struct {
+        // Output options
+        bool erronly;
+        bool display_mntp;
+        /* show only local filesystems.  */
+        bool show_local_fs;
+        /* show only local filesystems but call stat() on remote ones. */
+        bool stat_remote_fs;
+        bool display_inodes_perfdata;
+
+        bool exact_match;
+        bool freespace_ignore_reserved;
+
+        bool ignore_missing;
+        bool path_ignored;
+
+        /* Linked list of filesystem types to omit.
+           If the list is empty, don't exclude any types.  */
+        struct regex_list *fs_exclude_list;
+        /* Linked list of filesystem types to check.
+           If the list is empty, include all types.  */
+        struct regex_list *fs_include_list;
+        struct name_list *device_path_exclude_list;
+        filesystem_list path_select_list;
+        /* Linked list of mounted filesystems. */
+        struct mount_entry *mount_list;
+        struct name_list *seen;
+
+        byte_unit_enum display_unit;
+        // byte_unit unit;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
+} check_disk_config;
+
+void np_add_name(struct name_list **list, const char *name);
+bool np_find_name(struct name_list *list, const char *name);
+bool np_seen_name(struct name_list *list, const char *name);
+int np_add_regex(struct regex_list **list, const char *regex, int cflags);
+bool np_find_regmatch(struct regex_list *list, const char *name);
+
+parameter_list_elem parameter_list_init(const char *);
+
+parameter_list_elem *mp_int_fs_list_append(filesystem_list *list, const char *name);
+parameter_list_elem *mp_int_fs_list_find(filesystem_list list, const char *name);
+parameter_list_elem *mp_int_fs_list_del(filesystem_list *list, parameter_list_elem *item);
+parameter_list_elem *mp_int_fs_list_get_next(parameter_list_elem *current);
+void mp_int_fs_list_set_best_match(filesystem_list list, struct mount_entry *mount_list,
+                                                                   bool exact);
+
+measurement_unit measurement_unit_init();
+measurement_unit_list *add_measurement_list(measurement_unit_list *list, measurement_unit elem);
+measurement_unit add_filesystem_to_measurement_unit(measurement_unit unit,
+                                                                                                        parameter_list_elem filesystem);
+measurement_unit create_measurement_unit_from_filesystem(parameter_list_elem filesystem,
+                                                                                                                 bool display_mntp);
+
+int search_parameter_list(parameter_list_elem *list, const char *name);
+bool np_regex_match_mount_entry(struct mount_entry *, regex_t *);
+
+char *get_unit_string(byte_unit_enum);
+check_disk_config check_disk_config_init();
+
+char *humanize_byte_value(unsigned long long value, bool use_si_units);
diff --git a/plugins/check_dns.c b/plugins/check_dns.c
index 95f33083..56f91dae 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -48,7 +48,8 @@ typedef struct {
 } check_dns_config_wrapper;
 static check_dns_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 static check_dns_config_wrapper validate_arguments(check_dns_config_wrapper /*config_wrapper*/);
-static mp_state_enum error_scan(char * /*input_buffer*/, bool * /*is_nxdomain*/, const char /*dns_server*/[ADDRESS_LENGTH]);
+static mp_state_enum error_scan(char * /*input_buffer*/, bool * /*is_nxdomain*/,
+                                                                const char /*dns_server*/[ADDRESS_LENGTH]);
 static bool ip_match_cidr(const char * /*addr*/, const char * /*cidr_ro*/);
 static unsigned long ip2long(const char * /*src*/);
 static void print_help(void);
@@ -127,7 +128,8 @@ int main(int argc, char **argv) {
                         puts(chld_out.line[i]);
                 }
 
-                if (strcasestr(chld_out.line[i], ".in-addr.arpa") || strcasestr(chld_out.line[i], ".ip6.arpa")) {
+                if (strcasestr(chld_out.line[i], ".in-addr.arpa") ||
+                        strcasestr(chld_out.line[i], ".ip6.arpa")) {
                         if ((strstr(chld_out.line[i], "canonical name = ") != NULL)) {
                                 continue;
                         }
@@ -145,7 +147,8 @@ int main(int argc, char **argv) {
                 if (strstr(chld_out.line[i], "Server:") && strlen(config.dns_server) > 0) {
                         char *temp_buffer = strchr(chld_out.line[i], ':');
                         if (temp_buffer == NULL) {
-                                die(STATE_UNKNOWN, _("'%s' returned a weirdly formatted Server line\n"), NSLOOKUP_COMMAND);
+                                die(STATE_UNKNOWN, _("'%s' returned a weirdly formatted Server line\n"),
+                                        NSLOOKUP_COMMAND);
                         }
 
                         temp_buffer++;
@@ -157,21 +160,25 @@ int main(int argc, char **argv) {
 
                         strip(temp_buffer);
                         if (strlen(temp_buffer) == 0) {
-                                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' returned empty server string\n"), NSLOOKUP_COMMAND);
+                                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' returned empty server string\n"),
+                                        NSLOOKUP_COMMAND);
                         }
 
                         if (strcmp(temp_buffer, config.dns_server) != 0) {
-                                die(STATE_CRITICAL, _("DNS CRITICAL - No response from DNS %s\n"), config.dns_server);
+                                die(STATE_CRITICAL, _("DNS CRITICAL - No response from DNS %s\n"),
+                                        config.dns_server);
                         }
                 }
 
                 /* the server is responding, we just got the host name... */
                 if (strstr(chld_out.line[i], "Name:")) {
                         parse_address = true;
-                } else if (parse_address && (strstr(chld_out.line[i], "Address:") || strstr(chld_out.line[i], "Addresses:"))) {
+                } else if (parse_address && (strstr(chld_out.line[i], "Address:") ||
+                                                                         strstr(chld_out.line[i], "Addresses:"))) {
                         char *temp_buffer = strchr(chld_out.line[i], ':');
                         if (temp_buffer == NULL) {
-                                die(STATE_UNKNOWN, _("'%s' returned a weirdly formatted Address line\n"), NSLOOKUP_COMMAND);
+                                die(STATE_UNKNOWN, _("'%s' returned a weirdly formatted Address line\n"),
+                                        NSLOOKUP_COMMAND);
                         }
 
                         temp_buffer++;
@@ -183,7 +190,8 @@ int main(int argc, char **argv) {
 
                         strip(temp_buffer);
                         if (strlen(temp_buffer) == 0) {
-                                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' returned empty host name string\n"), NSLOOKUP_COMMAND);
+                                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' returned empty host name string\n"),
+                                        NSLOOKUP_COMMAND);
                         }
 
                         addresses[n_addresses++] = strdup(temp_buffer);
@@ -209,7 +217,8 @@ int main(int argc, char **argv) {
                 }
 
                 if (error_scan(chld_err.line[i], &is_nxdomain, config.dns_server) != STATE_OK) {
-                        result = max_state(result, error_scan(chld_err.line[i], &is_nxdomain, config.dns_server));
+                        result =
+                                max_state(result, error_scan(chld_err.line[i], &is_nxdomain, config.dns_server));
                         msg = strchr(input_buffer, ':');
                         if (msg) {
                                 msg++;
@@ -242,7 +251,8 @@ int main(int argc, char **argv) {
                 }
                 *adrp = 0;
         } else {
-                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' msg parsing exited with no address\n"), NSLOOKUP_COMMAND);
+                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' msg parsing exited with no address\n"),
+                        NSLOOKUP_COMMAND);
         }
 
         /* compare to expected address */
@@ -255,7 +265,8 @@ int main(int argc, char **argv) {
                 for (size_t i = 0; i < config.expected_address_cnt; i++) {
                         /* check if we get a match on 'raw' ip or cidr */
                         for (size_t j = 0; j < n_addresses; j++) {
-                                if (strcmp(addresses[j], config.expected_address[i]) == 0 || ip_match_cidr(addresses[j], config.expected_address[i])) {
+                                if (strcmp(addresses[j], config.expected_address[i]) == 0 ||
+                                        ip_match_cidr(addresses[j], config.expected_address[i])) {
                                         result = STATE_OK;
                                         addr_match &= ~(1 << j);
                                         expect_match &= ~(1 << i);
@@ -279,7 +290,8 @@ int main(int argc, char **argv) {
         if (config.expect_nxdomain) {
                 if (!is_nxdomain) {
                         result = STATE_CRITICAL;
-                        xasprintf(&msg, _("Domain '%s' was found by the server: '%s'\n"), config.query_address, address);
+                        xasprintf(&msg, _("Domain '%s' was found by the server: '%s'\n"), config.query_address,
+                                          address);
                 } else {
                         if (address != NULL) {
                                 free(address);
@@ -291,7 +303,8 @@ int main(int argc, char **argv) {
         /* check if authoritative */
         if (result == STATE_OK && config.expect_authority && non_authoritative) {
                 result = STATE_CRITICAL;
-                xasprintf(&msg, _("server %s is not authoritative for %s"), config.dns_server, config.query_address);
+                xasprintf(&msg, _("server %s is not authoritative for %s"), config.dns_server,
+                                  config.query_address);
         }
 
         long microsec = deltime(tv);
@@ -306,24 +319,36 @@ int main(int argc, char **argv) {
                 } else if (result == STATE_CRITICAL) {
                         printf("DNS %s: ", _("CRITICAL"));
                 }
-                printf(ngettext("%.3f second response time", "%.3f seconds response time", elapsed_time), elapsed_time);
+                printf(ngettext("%.3f second response time", "%.3f seconds response time", elapsed_time),
+                           elapsed_time);
                 printf(_(". %s returns %s"), config.query_address, address);
-                if ((config.time_thresholds->warning != NULL) && (config.time_thresholds->critical != NULL)) {
-                        printf("|%s\n", fperfdata("time", elapsed_time, "s", true, config.time_thresholds->warning->end, true,
+                if ((config.time_thresholds->warning != NULL) &&
+                        (config.time_thresholds->critical != NULL)) {
+                        printf("|%s\n",
+                                   fperfdata("time", elapsed_time, "s", true, config.time_thresholds->warning->end,
+                                                         true, config.time_thresholds->critical->end, true, 0, false, 0));
+                } else if ((config.time_thresholds->warning == NULL) &&
+                                   (config.time_thresholds->critical != NULL)) {
+                        printf("|%s\n", fperfdata("time", elapsed_time, "s", false, 0, true,
                                                                           config.time_thresholds->critical->end, true, 0, false, 0));
-                } else if ((config.time_thresholds->warning == NULL) && (config.time_thresholds->critical != NULL)) {
-                        printf("|%s\n", fperfdata("time", elapsed_time, "s", false, 0, true, config.time_thresholds->critical->end, true, 0, false, 0));
-                } else if ((config.time_thresholds->warning != NULL) && (config.time_thresholds->critical == NULL)) {
-                        printf("|%s\n", fperfdata("time", elapsed_time, "s", true, config.time_thresholds->warning->end, false, 0, true, 0, false, 0));
+                } else if ((config.time_thresholds->warning != NULL) &&
+                                   (config.time_thresholds->critical == NULL)) {
+                        printf("|%s\n",
+                                   fperfdata("time", elapsed_time, "s", true, config.time_thresholds->warning->end,
+                                                         false, 0, true, 0, false, 0));
                 } else {
-                        printf("|%s\n", fperfdata("time", elapsed_time, "s", false, 0, false, 0, true, 0, false, 0));
+                        printf("|%s\n",
+                                   fperfdata("time", elapsed_time, "s", false, 0, false, 0, true, 0, false, 0));
                 }
         } else if (result == STATE_WARNING) {
-                printf(_("DNS WARNING - %s\n"), !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
+                printf(_("DNS WARNING - %s\n"),
+                           !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
         } else if (result == STATE_CRITICAL) {
-                printf(_("DNS CRITICAL - %s\n"), !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
+                printf(_("DNS CRITICAL - %s\n"),
+                           !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
         } else {
-                printf(_("DNS UNKNOWN - %s\n"), !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
+                printf(_("DNS UNKNOWN - %s\n"),
+                           !strcmp(msg, "") ? _(" Probably a non-existent host/domain") : msg);
         }
 
         exit(result);
@@ -342,29 +367,34 @@ bool ip_match_cidr(const char *addr, const char *cidr_ro) {
         mask = atoi(mask_c);
 
         /* https://www.cryptobells.com/verifying-ips-in-a-subnet-in-php/ */
-        return (ip2long(addr) & ~((1 << (32 - mask)) - 1)) == (ip2long(subnet) >> (32 - mask)) << (32 - mask);
+        return (ip2long(addr) & ~((1 << (32 - mask)) - 1)) == (ip2long(subnet) >> (32 - mask))
+                                                                                                                          << (32 - mask);
 }
 
 unsigned long ip2long(const char *src) {
         unsigned long ip[4];
         /* http://computer-programming-forum.com/47-c-language/1376ffb92a12c471.htm */
-        return (sscanf(src, "%3lu.%3lu.%3lu.%3lu", &ip[0], &ip[1], &ip[2], &ip[3]) == 4 && ip[0] < 256 && ip[1] < 256 && ip[2] < 256 &&
-                        ip[3] < 256)
+        return (sscanf(src, "%3lu.%3lu.%3lu.%3lu", &ip[0], &ip[1], &ip[2], &ip[3]) == 4 &&
+                        ip[0] < 256 && ip[1] < 256 && ip[2] < 256 && ip[3] < 256)
                            ? ip[0] << 24 | ip[1] << 16 | ip[2] << 8 | ip[3]
                            : 0;
 }
 
-mp_state_enum error_scan(char *input_buffer, bool *is_nxdomain, const char dns_server[ADDRESS_LENGTH]) {
+mp_state_enum error_scan(char *input_buffer, bool *is_nxdomain,
+                                                 const char dns_server[ADDRESS_LENGTH]) {
 
-        const int nxdomain = strstr(input_buffer, "Non-existent") || strstr(input_buffer, "** server can't find") ||
+        const int nxdomain = strstr(input_buffer, "Non-existent") ||
+                                                 strstr(input_buffer, "** server can't find") ||
                                                  strstr(input_buffer, "** Can't find") || strstr(input_buffer, "NXDOMAIN");
         if (nxdomain) {
                 *is_nxdomain = true;
         }
 
         /* the DNS lookup timed out */
-        if (strstr(input_buffer, _("Note: nslookup is deprecated and may be removed from future releases.")) ||
-                strstr(input_buffer, _("Consider using the `dig' or `host' programs instead.  Run nslookup with")) ||
+        if (strstr(input_buffer,
+                           _("Note: nslookup is deprecated and may be removed from future releases.")) ||
+                strstr(input_buffer,
+                           _("Consider using the `dig' or `host' programs instead.  Run nslookup with")) ||
                 strstr(input_buffer, _("the `-sil[ent]' option to prevent this message from appearing."))) {
                 return STATE_OK;
         }
@@ -382,8 +412,9 @@ mp_state_enum error_scan(char *input_buffer, bool *is_nxdomain, const char dns_s
         }
 
         /* Connection was refused */
-        else if (strstr(input_buffer, "Connection refused") || strstr(input_buffer, "Couldn't find server") ||
-                         strstr(input_buffer, "Refused") || (strstr(input_buffer, "** server can't find") && strstr(input_buffer, ": REFUSED"))) {
+        else if (strstr(input_buffer, "Connection refused") ||
+                         strstr(input_buffer, "Couldn't find server") || strstr(input_buffer, "Refused") ||
+                         (strstr(input_buffer, "** server can't find") && strstr(input_buffer, ": REFUSED"))) {
                 die(STATE_CRITICAL, _("Connection to DNS %s was refused\n"), dns_server);
         }
 
@@ -504,20 +535,24 @@ check_dns_config_wrapper process_arguments(int argc, char **argv) {
                         if (strchr(optarg, ',') != NULL) {
                                 char *comma = strchr(optarg, ',');
                                 while (comma != NULL) {
-                                        result.config.expected_address =
-                                                (char **)realloc(result.config.expected_address, (result.config.expected_address_cnt + 1) * sizeof(char **));
-                                        result.config.expected_address[result.config.expected_address_cnt] = strndup(optarg, comma - optarg);
+                                        result.config.expected_address = (char **)realloc(
+                                                result.config.expected_address,
+                                                (result.config.expected_address_cnt + 1) * sizeof(char **));
+                                        result.config.expected_address[result.config.expected_address_cnt] =
+                                                strndup(optarg, comma - optarg);
                                         result.config.expected_address_cnt++;
                                         optarg = comma + 1;
                                         comma = strchr(optarg, ',');
                                 }
                                 result.config.expected_address =
-                                        (char **)realloc(result.config.expected_address, (result.config.expected_address_cnt + 1) * sizeof(char **));
+                                        (char **)realloc(result.config.expected_address,
+                                                                         (result.config.expected_address_cnt + 1) * sizeof(char **));
                                 result.config.expected_address[result.config.expected_address_cnt] = strdup(optarg);
                                 result.config.expected_address_cnt++;
                         } else {
                                 result.config.expected_address =
-                                        (char **)realloc(result.config.expected_address, (result.config.expected_address_cnt + 1) * sizeof(char **));
+                                        (char **)realloc(result.config.expected_address,
+                                                                         (result.config.expected_address_cnt + 1) * sizeof(char **));
                                 result.config.expected_address[result.config.expected_address_cnt] = strdup(optarg);
                                 result.config.expected_address_cnt++;
                         }
@@ -586,9 +621,11 @@ void print_help(void) {
         printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
         printf(COPYRIGHT, copyright, email);
 
-        printf("%s\n", _("This plugin uses the nslookup program to obtain the IP address for the given host/domain query."));
+        printf("%s\n", _("This plugin uses the nslookup program to obtain the IP address for the given "
+                                         "host/domain query."));
         printf("%s\n", _("An optional DNS server to use may be specified."));
-        printf("%s\n", _("If no DNS server is specified, the default server(s) specified in /etc/resolv.conf will be used."));
+        printf("%s\n", _("If no DNS server is specified, the default server(s) specified in "
+                                         "/etc/resolv.conf will be used."));
 
         printf("\n\n");
 
@@ -602,11 +639,14 @@ void print_help(void) {
         printf(" -s, --server=HOST\n");
         printf("    %s\n", _("Optional DNS server you want to use for the lookup"));
         printf(" -a, --expected-address=IP-ADDRESS|CIDR|HOST\n");
-        printf("    %s\n", _("Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end"));
-        printf("    %s\n", _("with a dot (.). This option can be repeated multiple times (Returns OK if any"));
+        printf("    %s\n",
+                   _("Optional IP-ADDRESS/CIDR you expect the DNS server to return. HOST must end"));
+        printf("    %s\n",
+                   _("with a dot (.). This option can be repeated multiple times (Returns OK if any"));
         printf("    %s\n", _("value matches)."));
         printf(" -n, --expect-nxdomain\n");
-        printf("    %s\n", _("Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)"));
+        printf("    %s\n",
+                   _("Expect the DNS server to return NXDOMAIN (i.e. the domain was not found)"));
         printf("    %s\n", _("Cannot be used together with -a"));
         printf(" -A, --expect-authority\n");
         printf("    %s\n", _("Optionally expect the DNS server to be authoritative for the lookup"));
@@ -615,7 +655,8 @@ void print_help(void) {
         printf(" -c, --critical=seconds\n");
         printf("    %s\n", _("Return critical if elapsed time exceeds value. Default off"));
         printf(" -L, --all\n");
-        printf("    %s\n", _("Return critical if the list of expected addresses does not match all addresses"));
+        printf("    %s\n",
+                   _("Return critical if the list of expected addresses does not match all addresses"));
         printf("    %s\n", _("returned. Default off"));
 
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
@@ -625,5 +666,7 @@ void print_help(void) {
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf("%s -H host [-s server] [-a expected-address] [-n] [-A] [-t timeout] [-w warn] [-c crit] [-L]\n", progname);
+        printf("%s -H host [-s server] [-a expected-address] [-n] [-A] [-t timeout] [-w warn] [-c "
+                   "crit] [-L]\n",
+                   progname);
 }
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 19f6c046..602d5868 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -45,18 +45,19 @@ int main(int argc, char **argv) {
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
-        if (argc < 2)
+        if (argc < 2) {
                 usage4(_("Could not parse arguments"));
-        else if (strcmp(argv[1], "-V") == 0 || strcmp(argv[1], "--version") == 0) {
+        } else if (strcmp(argv[1], "-V") == 0 || strcmp(argv[1], "--version") == 0) {
                 print_revision(progname, NP_VERSION);
                 exit(STATE_UNKNOWN);
         } else if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0) {
                 print_help();
                 exit(STATE_UNKNOWN);
-        } else if (!is_integer(argv[1]))
+        } else if (!is_integer(argv[1])) {
                 usage4(_("Arguments to check_dummy must be an integer"));
-        else
+        } else {
                 result = atoi(argv[1]);
+        }
 
         switch (result) {
         case STATE_OK:
@@ -78,8 +79,9 @@ int main(int argc, char **argv) {
                 return STATE_UNKNOWN;
         }
 
-        if (argc >= 3)
+        if (argc >= 3) {
                 printf(": %s", argv[2]);
+        }
 
         printf("\n");
 
@@ -92,7 +94,8 @@ void print_help(void) {
         printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
         printf(COPYRIGHT, copyright, email);
 
-        printf("%s\n", _("This plugin will simply return the state corresponding to the numeric value"));
+        printf("%s\n",
+                   _("This plugin will simply return the state corresponding to the numeric value"));
 
         printf("%s\n", _("of the <state> argument with optional text"));
 
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index ec7abb67..6160c2cb 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -46,8 +46,9 @@ enum {
         RTA = 1
 };
 
-static mp_state_enum textscan(char *buf, const char * /*server_name*/, bool /*crta_p*/, double /*crta*/, bool /*wrta_p*/, double /*wrta*/,
-                                                          bool /*cpl_p*/, int /*cpl*/, bool /*wpl_p*/, int /*wpl*/, bool /*alive_p*/);
+static mp_state_enum textscan(char *buf, const char * /*server_name*/, bool /*crta_p*/,
+                                                          double /*crta*/, bool /*wrta_p*/, double /*wrta*/, bool /*cpl_p*/,
+                                                          int /*cpl*/, bool /*wpl_p*/, int /*wpl*/, bool /*alive_p*/);
 
 typedef struct {
         int errorcode;
@@ -79,6 +80,24 @@ int main(int argc, char **argv) {
         server = strscpy(server, config.server_name);
 
         char *option_string = "";
+        char *fping_prog = NULL;
+
+        /* First determine if the target is dualstack or ipv6 only. */
+        bool server_is_inet6_addr = is_inet6_addr(server);
+
+        /*
+         * If the user requested -6 OR the user made no assertion and the address is v6 or dualstack
+         *   -> we use ipv6
+         * If the user requested -4 OR the user made no assertion and the address is v4 ONLY
+         *   -> we use ipv4
+         */
+        if (address_family == AF_INET6 || (address_family == AF_UNSPEC && server_is_inet6_addr)) {
+                xasprintf(&option_string, "%s-6 ", option_string);
+        } else {
+                xasprintf(&option_string, "%s-4 ", option_string);
+        }
+        fping_prog = strdup(PATH_TO_FPING);
+
         /* compose the command */
         if (config.target_timeout) {
                 xasprintf(&option_string, "%s-t %d ", option_string, config.target_timeout);
@@ -99,19 +118,28 @@ int main(int argc, char **argv) {
                 xasprintf(&option_string, "%s-R ", option_string);
         }
 
-        char *fping_prog = NULL;
-#ifdef PATH_TO_FPING6
-        if (address_family != AF_INET && is_inet6_addr(server)) {
-                fping_prog = strdup(PATH_TO_FPING6);
-        } else {
-                fping_prog = strdup(PATH_TO_FPING);
+        if (config.fwmark_set) {
+                xasprintf(&option_string, "%s--fwmark %u ", option_string, config.fwmark);
+        }
+
+        if (config.icmp_timestamp) {
+                xasprintf(&option_string, "%s--icmp-timestamp ", option_string);
+        }
+
+        if (config.check_source) {
+                xasprintf(&option_string, "%s--check-source ", option_string);
         }
-#else
-        fping_prog = strdup(PATH_TO_FPING);
-#endif
 
         char *command_line = NULL;
-        xasprintf(&command_line, "%s %s-b %d -c %d %s", fping_prog, option_string, config.packet_size, config.packet_count, server);
+
+        if (config.icmp_timestamp) {
+                // no packet size settable for ICMP timestamp
+                xasprintf(&command_line, "%s %s -c %d %s", fping_prog, option_string, config.packet_count,
+                                  server);
+        } else {
+                xasprintf(&command_line, "%s %s-b %d -c %d %s", fping_prog, option_string,
+                                  config.packet_size, config.packet_count, server);
+        }
 
         if (verbose) {
                 printf("%s\n", command_line);
@@ -135,8 +163,9 @@ int main(int argc, char **argv) {
                 if (verbose) {
                         printf("%s", input_buffer);
                 }
-                status = max_state(status, textscan(input_buffer, config.server_name, config.crta_p, config.crta, config.wrta_p, config.wrta,
-                                                                                        config.cpl_p, config.cpl, config.wpl_p, config.wpl, config.alive_p));
+                status = max_state(status, textscan(input_buffer, config.server_name, config.crta_p,
+                                                                                        config.crta, config.wrta_p, config.wrta, config.cpl_p,
+                                                                                        config.cpl, config.wpl_p, config.wpl, config.alive_p));
         }
 
         /* If we get anything on STDERR, at least set warning */
@@ -145,8 +174,9 @@ int main(int argc, char **argv) {
                 if (verbose) {
                         printf("%s", input_buffer);
                 }
-                status = max_state(status, textscan(input_buffer, config.server_name, config.crta_p, config.crta, config.wrta_p, config.wrta,
-                                                                                        config.cpl_p, config.cpl, config.wpl_p, config.wpl, config.alive_p));
+                status = max_state(status, textscan(input_buffer, config.server_name, config.crta_p,
+                                                                                        config.crta, config.wrta_p, config.wrta, config.cpl_p,
+                                                                                        config.cpl, config.wpl_p, config.wpl, config.alive_p));
         }
         (void)fclose(child_stderr);
 
@@ -175,8 +205,8 @@ int main(int argc, char **argv) {
         return status;
 }
 
-mp_state_enum textscan(char *buf, const char *server_name, bool crta_p, double crta, bool wrta_p, double wrta, bool cpl_p, int cpl,
-                                           bool wpl_p, int wpl, bool alive_p) {
+mp_state_enum textscan(char *buf, const char *server_name, bool crta_p, double crta, bool wrta_p,
+                                           double wrta, bool cpl_p, int cpl, bool wpl_p, int wpl, bool alive_p) {
         /* stops testing after the first successful reply. */
         double rta;
         double loss;
@@ -189,7 +219,8 @@ mp_state_enum textscan(char *buf, const char *server_name, bool crta_p, double c
                 die(STATE_OK, _("FPING %s - %s (rta=%f ms)|%s\n"), state_text(STATE_OK), server_name, rta,
                         /* No loss since we only waited for the first reply
                         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100), */
-                        fperfdata("rta", rta / 1.0e3, "s", wrta_p, wrta / 1.0e3, crta_p, crta / 1.0e3, true, 0, false, 0));
+                        fperfdata("rta", rta / 1.0e3, "s", wrta_p, wrta / 1.0e3, crta_p, crta / 1.0e3, true, 0,
+                                          false, 0));
         }
 
         mp_state_enum status = STATE_UNKNOWN;
@@ -230,9 +261,11 @@ mp_state_enum textscan(char *buf, const char *server_name, bool crta_p, double c
                 } else {
                         status = STATE_OK;
                 }
-                die(status, _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"), state_text(status), server_name, loss, rta,
+                die(status, _("FPING %s - %s (loss=%.0f%%, rta=%f ms)|%s %s\n"), state_text(status),
+                        server_name, loss, rta,
                         perfdata("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, false, 0, false, 0),
-                        fperfdata("rta", rta / 1.0e3, "s", wrta_p, wrta / 1.0e3, crta_p, crta / 1.0e3, true, 0, false, 0));
+                        fperfdata("rta", rta / 1.0e3, "s", wrta_p, wrta / 1.0e3, crta_p, crta / 1.0e3, true, 0,
+                                          false, 0));
 
         } else if (strstr(buf, "xmt/rcv/%loss")) {
                 /* no min/max/avg if host was unreachable in fping v2.2.b1 */
@@ -268,13 +301,38 @@ mp_state_enum textscan(char *buf, const char *server_name, bool crta_p, double c
 
 /* process command-line arguments */
 check_fping_config_wrapper process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'}, {"sourceip", required_argument, 0, 'S'}, {"sourceif", required_argument, 0, 'I'},
-                {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},  {"alive", no_argument, 0, 'a'},
-                {"bytes", required_argument, 0, 'b'},    {"number", required_argument, 0, 'n'},   {"target-timeout", required_argument, 0, 'T'},
-                {"interval", required_argument, 0, 'i'}, {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},           {"use-ipv4", no_argument, 0, '4'},       {"use-ipv6", no_argument, 0, '6'},
-                {"dontfrag", no_argument, 0, 'M'},       {"random", no_argument, 0, 'R'},         {0, 0, 0, 0}};
+        enum {
+                FWMARK_OPT = CHAR_MAX + 1,
+                ICMP_TIMESTAMP_OPT,
+                CHECK_SOURCE_OPT,
+        };
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"sourceip", required_argument, 0, 'S'},
+                                                                           {"sourceif", required_argument, 0, 'I'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"alive", no_argument, 0, 'a'},
+                                                                           {"bytes", required_argument, 0, 'b'},
+                                                                           {"number", required_argument, 0, 'n'},
+                                                                           {"target-timeout", required_argument, 0, 'T'},
+                                                                           {"interval", required_argument, 0, 'i'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {"dontfrag", no_argument, 0, 'M'},
+                                                                           {"random", no_argument, 0, 'R'},
+#ifdef FPING_VERSION_5_2_OR_HIGHER
+                                                                           // only available with fping version >= 5.2
+                                                                           {"fwmark", required_argument, NULL, FWMARK_OPT},
+#       ifdef FPING_VERSION_5_3_OR_HIGHER
+                                                                           // only available with fping version >= 5.3
+                                                                           {"icmp-timestamp", no_argument, NULL, ICMP_TIMESTAMP_OPT},
+                                                                           {"check-source", no_argument, NULL, CHECK_SOURCE_OPT},
+#       endif
+#endif
+                                                                           {0, 0, 0, 0}};
 
         char *rv[2];
         rv[PL] = NULL;
@@ -299,8 +357,9 @@ check_fping_config_wrapper process_arguments(int argc, char **argv) {
                 argc--;
         }
 
-        while (1) {
-                int option_index = getopt_long(argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:M:R:46", longopts, &option);
+        while (true) {
+                int option_index =
+                        getopt_long(argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:M:R:46", longopts, &option);
 
                 if (option_index == -1 || option_index == EOF || option_index == 1) {
                         break;
@@ -340,11 +399,7 @@ check_fping_config_wrapper process_arguments(int argc, char **argv) {
                         address_family = AF_INET;
                         break;
                 case '6': /* IPv6 only */
-#ifdef USE_IPV6
                         address_family = AF_INET6;
-#else
-                        usage(_("IPv6 support not available\n"));
-#endif
                         break;
                 case 'c':
                         get_threshold(optarg, rv);
@@ -406,6 +461,20 @@ check_fping_config_wrapper process_arguments(int argc, char **argv) {
                 case 'M':
                         result.config.dontfrag = true;
                         break;
+                case FWMARK_OPT:
+                        if (is_intpos(optarg)) {
+                                result.config.fwmark = (unsigned int)atol(optarg);
+                                result.config.fwmark_set = true;
+                        } else {
+                                usage(_("fwmark must be a positive integer"));
+                        }
+                        break;
+                case ICMP_TIMESTAMP_OPT:
+                        result.config.icmp_timestamp = true;
+                        break;
+                case CHECK_SOURCE_OPT:
+                        result.config.check_source = true;
+                        break;
                 }
         }
 
@@ -427,10 +496,12 @@ int get_threshold(char *arg, char *rv[2]) {
         if (arg2) {
                 arg1[strcspn(arg1, ",:")] = 0;
                 if (strstr(arg1, "%") && strstr(arg2, "%")) {
-                        die(STATE_UNKNOWN, _("%s: Only one threshold may be packet loss (%s)\n"), progname, arg);
+                        die(STATE_UNKNOWN, _("%s: Only one threshold may be packet loss (%s)\n"), progname,
+                                arg);
                 }
                 if (!strstr(arg1, "%") && !strstr(arg2, "%")) {
-                        die(STATE_UNKNOWN, _("%s: Only one threshold must be packet loss (%s)\n"), progname, arg);
+                        die(STATE_UNKNOWN, _("%s: Only one threshold must be packet loss (%s)\n"), progname,
+                                arg);
                 }
         }
 
@@ -456,7 +527,8 @@ void print_help(void) {
         printf("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
         printf(COPYRIGHT, copyright, email);
 
-        printf("%s\n", _("This plugin will use the fping command to ping the specified host for a fast check"));
+        printf("%s\n",
+                   _("This plugin will use the fping command to ping the specified host for a fast check"));
 
         printf("%s\n", _("Note that it is necessary to set the suid flag on fping."));
 
@@ -470,7 +542,8 @@ void print_help(void) {
         printf(UT_IPv46);
 
         printf(" %s\n", "-H, --hostname=HOST");
-        printf("    %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, reducing system load)"));
+        printf("    %s\n", _("name or IP Address of host to ping (IP Address bypasses name lookup, "
+                                                 "reducing system load)"));
         printf(" %s\n", "-w, --warning=THRESHOLD");
         printf("    %s\n", _("warning threshold pair"));
         printf(" %s\n", "-c, --critical=THRESHOLD");
@@ -484,7 +557,8 @@ void print_help(void) {
         printf(" %s\n", "-T, --target-timeout=INTEGER");
         printf("    %s (default: fping's default for -t)\n", _("Target timeout (ms)"));
         printf(" %s\n", "-i, --interval=INTEGER");
-        printf("    %s (default: fping's default for -p)\n", _("Interval (ms) between sending packets"));
+        printf("    %s (default: fping's default for -p)\n",
+                   _("Interval (ms) between sending packets"));
         printf(" %s\n", "-S, --sourceip=HOST");
         printf("    %s\n", _("name or IP Address of sourceip"));
         printf(" %s\n", "-I, --sourceif=IF");
@@ -493,9 +567,20 @@ void print_help(void) {
         printf("    %s\n", _("set the Don't Fragment flag"));
         printf(" %s\n", "-R, --random");
         printf("    %s\n", _("random packet data (to foil link data compression)"));
+#ifdef FPING_VERSION_5_2_OR_HIGHER
+        printf(" %s\n", "--fwmark=INTEGER");
+        printf("    %s\n", _("set the routing mark to INTEGER (fping option)"));
+#       ifdef FPING_VERSION_5_3_OR_HIGHER
+        printf(" %s\n", "--icmp-timestamp");
+        printf("    %s\n", _("use ICMP Timestamp instead of ICMP Echo (fping option)"));
+        printf(" %s\n", "--check-source");
+        printf("    %s\n", _("discard replies not from target address (fping option)"));
+#       endif
+#endif
         printf(UT_VERBOSE);
         printf("\n");
-        printf(" %s\n", _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)"));
+        printf(" %s\n",
+                   _("THRESHOLD is <rta>,<pl>%% where <rta> is the round trip average travel time (ms)"));
         printf(" %s\n", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
         printf(" %s\n", _("packet loss to trigger an alarm state."));
 
@@ -507,5 +592,6 @@ void print_help(void) {
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf(" %s <host_address> -w limit -c limit [-b size] [-n number] [-T number] [-i number]\n", progname);
+        printf(" %s <host_address> -w limit -c limit [-b size] [-n number] [-T number] [-i number]\n",
+                   progname);
 }
diff --git a/plugins/check_fping.d/config.h b/plugins/check_fping.d/config.h
index a0697bf3..d3e50565 100644
--- a/plugins/check_fping.d/config.h
+++ b/plugins/check_fping.d/config.h
@@ -29,6 +29,20 @@ typedef struct {
         bool cpl_p;
         int wpl;
         bool wpl_p;
+
+        // only available with fping version >= 5.2
+        // for a given uint _fwmark_ fping sets _fwmark_ as a firewall mark
+        // in the packets
+        unsigned int fwmark;
+        bool fwmark_set;
+
+        // only available with fping version >= 5.3
+        // Setting icmp_timestamp tells fping to use ICMP Timestamp (ICMP type 13) instead
+        // of ICMP Echo
+        bool icmp_timestamp;
+
+        // Setting check_source lets fping  discard replies which are not from the target address
+        bool check_source;
 } check_fping_config;
 
 check_fping_config check_fping_config_init() {
@@ -53,6 +67,15 @@ check_fping_config check_fping_config_init() {
                 .cpl_p = false,
                 .wpl = 0,
                 .wpl_p = false,
+
+                // only available with fping version >= 5.2
+                .fwmark = 0,
+                .fwmark_set = false, // just to be deterministic
+
+                // only available with fping version >= 5.3
+                .icmp_timestamp = false,
+                .check_source = false,
+
         };
         return tmp;
 }
diff --git a/plugins/check_game.c b/plugins/check_game.c
index c0193b03..974a7253 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -77,7 +77,8 @@ int main(int argc, char **argv) {
 
         /* create the command line to execute */
         char *command_line = NULL;
-        xasprintf(&command_line, "%s -raw %s -%s %s", PATH_TO_QSTAT, QSTAT_DATA_DELIMITER, config.game_type, config.server_ip);
+        xasprintf(&command_line, "%s -raw %s -%s %s", PATH_TO_QSTAT, QSTAT_DATA_DELIMITER,
+                          config.game_type, config.server_ip);
 
         if (config.port) {
                 xasprintf(&command_line, "%s:%-d", command_line, config.port);
@@ -130,11 +131,13 @@ int main(int argc, char **argv) {
                 printf(_("CRITICAL - Game server timeout\n"));
                 result = STATE_CRITICAL;
         } else {
-                printf("OK: %s/%s %s (%s), Ping: %s ms|%s %s\n", ret[config.qstat_game_players], ret[config.qstat_game_players_max],
-                           ret[config.qstat_game_field], ret[config.qstat_map_field], ret[config.qstat_ping_field],
-                           perfdata("players", atol(ret[config.qstat_game_players]), "", false, 0, false, 0, true, 0, true,
-                                                atol(ret[config.qstat_game_players_max])),
-                           fperfdata("ping", strtod(ret[config.qstat_ping_field], NULL), "", false, 0, false, 0, true, 0, false, 0));
+                printf("OK: %s/%s %s (%s), Ping: %s ms|%s %s\n", ret[config.qstat_game_players],
+                           ret[config.qstat_game_players_max], ret[config.qstat_game_field],
+                           ret[config.qstat_map_field], ret[config.qstat_ping_field],
+                           perfdata("players", atol(ret[config.qstat_game_players]), "", false, 0, false, 0,
+                                                true, 0, true, atol(ret[config.qstat_game_players_max])),
+                           fperfdata("ping", strtod(ret[config.qstat_ping_field], NULL), "", false, 0, false, 0,
+                                                 true, 0, false, 0));
         }
 
         exit(result);
@@ -144,19 +147,20 @@ int main(int argc, char **argv) {
 #define max_players_field_index 130
 
 check_game_config_wrapper process_arguments(int argc, char **argv) {
-        static struct option long_opts[] = {{"help", no_argument, 0, 'h'},
-                                                                                {"version", no_argument, 0, 'V'},
-                                                                                {"verbose", no_argument, 0, 'v'},
-                                                                                {"timeout", required_argument, 0, 't'},
-                                                                                {"hostname", required_argument, 0, 'H'},
-                                                                                {"port", required_argument, 0, 'P'},
-                                                                                {"game-type", required_argument, 0, 'G'},
-                                                                                {"map-field", required_argument, 0, 'm'},
-                                                                                {"ping-field", required_argument, 0, 'p'},
-                                                                                {"game-field", required_argument, 0, 'g'},
-                                                                                {"players-field", required_argument, 0, players_field_index},
-                                                                                {"max-players-field", required_argument, 0, max_players_field_index},
-                                                                                {0, 0, 0, 0}};
+        static struct option long_opts[] = {
+                {"help", no_argument, 0, 'h'},
+                {"version", no_argument, 0, 'V'},
+                {"verbose", no_argument, 0, 'v'},
+                {"timeout", required_argument, 0, 't'},
+                {"hostname", required_argument, 0, 'H'},
+                {"port", required_argument, 0, 'P'},
+                {"game-type", required_argument, 0, 'G'},
+                {"map-field", required_argument, 0, 'm'},
+                {"ping-field", required_argument, 0, 'p'},
+                {"game-field", required_argument, 0, 'g'},
+                {"players-field", required_argument, 0, players_field_index},
+                {"max-players-field", required_argument, 0, max_players_field_index},
+                {0, 0, 0, 0}};
 
         check_game_config_wrapper result = {
                 .config = check_game_config_init(),
@@ -216,21 +220,24 @@ check_game_config_wrapper process_arguments(int argc, char **argv) {
                         break;
                 case 'p': /* index of ping field */
                         result.config.qstat_ping_field = atoi(optarg);
-                        if (result.config.qstat_ping_field < 0 || result.config.qstat_ping_field > QSTAT_MAX_RETURN_ARGS) {
+                        if (result.config.qstat_ping_field < 0 ||
+                                result.config.qstat_ping_field > QSTAT_MAX_RETURN_ARGS) {
                                 result.errorcode = ERROR;
                                 return result;
                         }
                         break;
                 case 'm': /* index on map field */
                         result.config.qstat_map_field = atoi(optarg);
-                        if (result.config.qstat_map_field < 0 || result.config.qstat_map_field > QSTAT_MAX_RETURN_ARGS) {
+                        if (result.config.qstat_map_field < 0 ||
+                                result.config.qstat_map_field > QSTAT_MAX_RETURN_ARGS) {
                                 result.errorcode = ERROR;
                                 return result;
                         }
                         break;
                 case 'g': /* index of game field */
                         result.config.qstat_game_field = atoi(optarg);
-                        if (result.config.qstat_game_field < 0 || result.config.qstat_game_field > QSTAT_MAX_RETURN_ARGS) {
+                        if (result.config.qstat_game_field < 0 ||
+                                result.config.qstat_game_field > QSTAT_MAX_RETURN_ARGS) {
                                 result.errorcode = ERROR;
                                 return result;
                         }
@@ -240,14 +247,16 @@ check_game_config_wrapper process_arguments(int argc, char **argv) {
                         if (result.config.qstat_game_players_max == 0) {
                                 result.config.qstat_game_players_max = result.config.qstat_game_players - 1;
                         }
-                        if (result.config.qstat_game_players < 0 || result.config.qstat_game_players > QSTAT_MAX_RETURN_ARGS) {
+                        if (result.config.qstat_game_players < 0 ||
+                                result.config.qstat_game_players > QSTAT_MAX_RETURN_ARGS) {
                                 result.errorcode = ERROR;
                                 return result;
                         }
                         break;
                 case max_players_field_index: /* index of max players field */
                         result.config.qstat_game_players_max = atoi(optarg);
-                        if (result.config.qstat_game_players_max < 0 || result.config.qstat_game_players_max > QSTAT_MAX_RETURN_ARGS) {
+                        if (result.config.qstat_game_players_max < 0 ||
+                                result.config.qstat_game_players_max > QSTAT_MAX_RETURN_ARGS) {
                                 result.errorcode = ERROR;
                                 return result;
                         }
@@ -286,7 +295,7 @@ void print_help(void) {
         printf(UT_HELP_VRSN);
         printf(UT_EXTRA_OPTS);
         printf(" -H, --hostname=ADDRESS\n"
-                  "    Host name, IP Address, or unix socket (must be an absolute path)\n");
+                   "    Host name, IP Address, or unix socket (must be an absolute path)\n");
         printf(" %s\n", "-P");
         printf("    %s\n", _("Optional port to connect to"));
         printf(" %s\n", "-g");
@@ -300,8 +309,10 @@ void print_help(void) {
 
         printf("\n");
         printf("%s\n", _("Notes:"));
-        printf(" %s\n", _("This plugin uses the 'qstat' command, the popular game server status query tool."));
-        printf(" %s\n", _("If you don't have the package installed, you will need to download it from"));
+        printf(" %s\n",
+                   _("This plugin uses the 'qstat' command, the popular game server status query tool."));
+        printf(" %s\n",
+                   _("If you don't have the package installed, you will need to download it from"));
         printf(" %s\n", _("https://github.com/multiplay/qstat before you can use this plugin."));
 
         printf(UT_SUPPORT);
@@ -309,7 +320,8 @@ void print_help(void) {
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf(" %s [-hvV] [-P port] [-t timeout] [-g game_field] [-m map_field] [-p ping_field] [-G game-time] [-H hostname] <game> "
+        printf(" %s [-hvV] [-P port] [-t timeout] [-g game_field] [-m map_field] [-p ping_field] [-G "
+                   "game-time] [-H hostname] <game> "
                    "<ip_address>\n",
                    progname);
 }
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index 62417fd6..9907abc5 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -85,13 +85,16 @@ int main(int argc, char **argv) {
         char query_string[512];
         /* removed ' 2>1' at end of command 10/27/1999 - EG */
         /* create the query string */
-        sprintf(query_string, "%s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0", HPJD_LINE_STATUS, HPJD_PAPER_STATUS,
-                        HPJD_INTERVENTION_REQUIRED, HPJD_GD_PERIPHERAL_ERROR, HPJD_GD_PAPER_JAM, HPJD_GD_PAPER_OUT, HPJD_GD_TONER_LOW,
-                        HPJD_GD_PAGE_PUNT, HPJD_GD_MEMORY_OUT, HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT, HPJD_GD_STATUS_DISPLAY);
+        sprintf(query_string, "%s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0 %s.0",
+                        HPJD_LINE_STATUS, HPJD_PAPER_STATUS, HPJD_INTERVENTION_REQUIRED,
+                        HPJD_GD_PERIPHERAL_ERROR, HPJD_GD_PAPER_JAM, HPJD_GD_PAPER_OUT, HPJD_GD_TONER_LOW,
+                        HPJD_GD_PAGE_PUNT, HPJD_GD_MEMORY_OUT, HPJD_GD_DOOR_OPEN, HPJD_GD_PAPER_OUTPUT,
+                        HPJD_GD_STATUS_DISPLAY);
 
         /* get the command to run */
         char command_line[1024];
-        sprintf(command_line, "%s -OQa -m : -v 1 -c %s %s:%u %s", PATH_TO_SNMPGET, config.community, config.address, config.port, query_string);
+        sprintf(command_line, "%s -OQa -m : -v 1 -c %s %s:%u %s", PATH_TO_SNMPGET, config.community,
+                        config.address, config.port, query_string);
 
         /* run the command */
         child_process = spopen(command_line);
@@ -177,7 +180,8 @@ int main(int argc, char **argv) {
                                 strcpy(display_message, temp_buffer + 1);
                                 break;
                         default: /* fold multiline message */
-                                strncat(display_message, input_buffer, sizeof(display_message) - strlen(display_message) - 1);
+                                strncat(display_message, input_buffer,
+                                                sizeof(display_message) - strlen(display_message) - 1);
                         }
                 }
 
diff --git a/plugins/check_http.c b/plugins/check_http.c
index baff682a..d2f080c7 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -1,35 +1,35 @@
 /*****************************************************************************
-*
-* Monitoring check_http plugin
-*
-* License: GPL
-* Copyright (c) 1999-2024 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_http plugin
-*
-* This plugin tests the HTTP service on the specified host. It can test
-* normal (http) and secure (https) servers, follow redirects, search for
-* strings and regular expressions, check connection times, and report on
-* certificate expiration times.
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring check_http plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_http plugin
+ *
+ * This plugin tests the HTTP service on the specified host. It can test
+ * normal (http) and secure (https) servers, follow redirects, search for
+ * strings and regular expressions, check connection times, and report on
+ * certificate expiration times.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_http";
 const char *copyright = "1999-2024";
@@ -41,7 +41,6 @@ const char *email = "devel@monitoring-plugins.org";
 #include "base64.h"
 #include "netutils.h"
 #include "utils.h"
-#include "base64.h"
 #include <ctype.h>
 
 #define STICKY_NONE 0
@@ -50,1346 +49,1394 @@ const char *email = "devel@monitoring-plugins.org";
 
 #define HTTP_EXPECT "HTTP/1."
 enum {
-  MAX_IPV4_HOSTLENGTH = 255,
-  HTTP_PORT = 80,
-  HTTPS_PORT = 443,
-  MAX_PORT = 65535,
-  DEFAULT_MAX_REDIRS = 15
+        MAX_IPV4_HOSTLENGTH = 255,
+        HTTP_PORT = 80,
+        HTTPS_PORT = 443,
+        MAX_PORT = 65535,
+        DEFAULT_MAX_REDIRS = 15
 };
 
 #ifdef HAVE_SSL
-bool check_cert = false;
-bool continue_after_check_cert = false;
-int ssl_version = 0;
-int days_till_exp_warn, days_till_exp_crit;
-char *randbuff;
-X509 *server_cert;
-#  define my_recv(buf, len) ((use_ssl) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
-#  define my_send(buf, len) ((use_ssl) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
+static bool check_cert = false;
+static bool continue_after_check_cert = false;
+static int ssl_version = 0;
+static int days_till_exp_warn, days_till_exp_crit;
+#       define my_recv(buf, len) ((use_ssl) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
+#       define my_send(buf, len) ((use_ssl) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
 #else /* ifndef HAVE_SSL */
-#  define my_recv(buf, len) read(sd, buf, len)
-#  define my_send(buf, len) send(sd, buf, len, 0)
+#       define my_recv(buf, len) read(sd, buf, len)
+#       define my_send(buf, len) send(sd, buf, len, 0)
 #endif /* HAVE_SSL */
-bool no_body = false;
-int maximum_age = -1;
+static bool no_body = false;
+static int maximum_age = -1;
 
 enum {
-  REGS = 2,
-  MAX_RE_SIZE = 1024
+        REGS = 2,
+        MAX_RE_SIZE = 1024
 };
 #include "regex.h"
-regex_t preg;
-regmatch_t pmatch[REGS];
-char regexp[MAX_RE_SIZE];
-char errbuf[MAX_INPUT_BUFFER];
-int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
-int errcode;
-int invert_regex = 0;
-int state_regex = STATE_CRITICAL;
-
-struct timeval tv;
-struct timeval tv_temp;
+static regex_t preg;
+static regmatch_t pmatch[REGS];
+static char regexp[MAX_RE_SIZE];
+static char errbuf[MAX_INPUT_BUFFER];
+static int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
+static int errcode;
+static int invert_regex = 0;
+static int state_regex = STATE_CRITICAL;
+
+static struct timeval tv;
+static struct timeval tv_temp;
 
 #define HTTP_URL "/"
-#define CRLF "\r\n"
-
-bool specify_port = false;
-int server_port = HTTP_PORT;
-int virtual_port = 0;
-char server_port_text[6] = "";
-char server_type[6] = "http";
-char *server_address;
-char *host_name;
-int host_name_length;
-char *server_url;
-char *user_agent;
-int server_url_length;
-int server_expect_yn = 0;
-char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
-char header_expect[MAX_INPUT_BUFFER] = "";
-char string_expect[MAX_INPUT_BUFFER] = "";
-char *warning_thresholds = NULL;
-char *critical_thresholds = NULL;
-thresholds *thlds;
-char user_auth[MAX_INPUT_BUFFER] = "";
-char proxy_auth[MAX_INPUT_BUFFER] = "";
-bool display_html = false;
-char **http_opt_headers;
-int http_opt_headers_count = 0;
-int onredirect = STATE_OK;
-int followsticky = STICKY_NONE;
-bool use_ssl = false;
-bool use_sni = false;
-bool verbose = false;
-bool show_extended_perfdata = false;
-bool show_body = false;
-int sd;
-int min_page_len = 0;
-int max_page_len = 0;
-int redir_depth = 0;
-int max_depth = DEFAULT_MAX_REDIRS;
-char *http_method;
-char *http_method_proxy;
-char *http_post_data;
-char *http_content_type;
-char buffer[MAX_INPUT_BUFFER];
-char *client_cert = NULL;
-char *client_privkey = NULL;
+#define CRLF     "\r\n"
+
+static bool specify_port = false;
+static int server_port = HTTP_PORT;
+static int virtual_port = 0;
+static char server_type[6] = "http";
+static char *server_address;
+static char *host_name;
+static int host_name_length;
+static char *server_url;
+static char *user_agent;
+static int server_url_length;
+static int server_expect_yn = 0;
+static char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
+static char header_expect[MAX_INPUT_BUFFER] = "";
+static char string_expect[MAX_INPUT_BUFFER] = "";
+static char *warning_thresholds = NULL;
+static char *critical_thresholds = NULL;
+static thresholds *thlds;
+static char user_auth[MAX_INPUT_BUFFER] = "";
+static char proxy_auth[MAX_INPUT_BUFFER] = "";
+static bool display_html = false;
+static char **http_opt_headers;
+static int http_opt_headers_count = 0;
+static int onredirect = STATE_OK;
+static int followsticky = STICKY_NONE;
+static bool use_ssl = false;
+static bool use_sni = false;
+static bool verbose = false;
+static bool show_extended_perfdata = false;
+static bool show_body = false;
+static int sd;
+static int min_page_len = 0;
+static int max_page_len = 0;
+static int redir_depth = 0;
+static int max_depth = DEFAULT_MAX_REDIRS;
+static char *http_method;
+static char *http_method_proxy;
+static char *http_post_data;
+static char *http_content_type;
+static char buffer[MAX_INPUT_BUFFER];
+static char *client_cert = NULL;
+static char *client_privkey = NULL;
 
 // Forward function declarations
-bool process_arguments (int, char **);
-int check_http (void);
-void redir (char *pos, char *status_line);
-bool server_type_check(const char *type);
-int server_port_check(int ssl_flag);
-char *perfd_time (double microsec);
-char *perfd_time_connect (double microsec);
-char *perfd_time_ssl (double microsec);
-char *perfd_time_firstbyte (double microsec);
-char *perfd_time_headers (double microsec);
-char *perfd_time_transfer (double microsec);
-char *perfd_size (int page_len);
-void print_help (void);
-void print_usage (void);
-char *unchunk_content(const char *content);
-
-int
-main (int argc, char **argv)
-{
-  int result = STATE_UNKNOWN;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
-  server_url = strdup(HTTP_URL);
-  server_url_length = strlen(server_url);
-  xasprintf (&user_agent, "User-Agent: check_http/v%s (monitoring-plugins %s)",
-            NP_VERSION, VERSION);
-
-  /* Parse extra opts if any */
-  argv=np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == false)
-    usage4 (_("Could not parse arguments"));
-
-  if (display_html == true)
-    printf ("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">",
-      use_ssl ? "https" : "http", host_name ? host_name : server_address,
-      server_port, server_url);
-
-  /* initialize alarm signal handling, set socket timeout, start timer */
-  (void) signal (SIGALRM, socket_timeout_alarm_handler);
-  (void) alarm (socket_timeout);
-  gettimeofday (&tv, NULL);
-
-  result = check_http ();
-  return result;
+static bool process_arguments(int /*argc*/, char ** /*argv*/);
+static int check_http(void);
+static void redir(char *pos, char *status_line);
+static bool server_type_check(const char *type);
+static int server_port_check(int ssl_flag);
+static char *perfd_time(double elapsed_time);
+static char *perfd_time_connect(double elapsed_time_connect);
+static char *perfd_time_ssl(double elapsed_time_ssl);
+static char *perfd_time_firstbyte(double elapsed_time_firstbyte);
+static char *perfd_time_headers(double elapsed_time_headers);
+static char *perfd_time_transfer(double elapsed_time_transfer);
+static char *perfd_size(int page_len);
+void print_help(void);
+void print_usage(void);
+static char *unchunk_content(const char *content);
+
+int main(int argc, char **argv) {
+        int result = STATE_UNKNOWN;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        /* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
+        server_url = strdup(HTTP_URL);
+        server_url_length = strlen(server_url);
+        xasprintf(&user_agent, "User-Agent: check_http/v%s (monitoring-plugins %s)", NP_VERSION,
+                          VERSION);
+
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        if (!process_arguments(argc, argv)) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        if (display_html) {
+                printf("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">", use_ssl ? "https" : "http",
+                           host_name ? host_name : server_address, server_port, server_url);
+        }
+
+        /* initialize alarm signal handling, set socket timeout, start timer */
+        (void)signal(SIGALRM, socket_timeout_alarm_handler);
+        (void)alarm(socket_timeout);
+        gettimeofday(&tv, NULL);
+
+        result = check_http();
+        return result;
 }
 
 /* check whether a file exists */
-void
-test_file (char *path)
-{
-  if (access(path, R_OK) == 0)
-    return;
-  usage2 (_("file does not exist or is not readable"), path);
+void test_file(char *path) {
+        if (access(path, R_OK) == 0) {
+                return;
+        }
+        usage2(_("file does not exist or is not readable"), path);
 }
 
 /*
  * process command-line arguments
  * returns true on success, false otherwise
-  */
-bool process_arguments (int argc, char **argv)
-{
-  int c = 1;
-  char *p;
-  char *temp;
-
-  enum {
-    INVERT_REGEX = CHAR_MAX + 1,
-    SNI_OPTION,
-    MAX_REDIRS_OPTION,
-    CONTINUE_AFTER_CHECK_CERT,
-    STATE_REGEX
-  };
-
-  int option = 0;
-  static struct option longopts[] = {
-    STD_LONG_OPTS,
-    {"link", no_argument, 0, 'L'},
-    {"nohtml", no_argument, 0, 'n'},
-    {"ssl", optional_argument, 0, 'S'},
-    {"sni", no_argument, 0, SNI_OPTION},
-    {"post", required_argument, 0, 'P'},
-    {"method", required_argument, 0, 'j'},
-    {"IP-address", required_argument, 0, 'I'},
-    {"url", required_argument, 0, 'u'},
-    {"port", required_argument, 0, 'p'},
-    {"authorization", required_argument, 0, 'a'},
-    {"proxy-authorization", required_argument, 0, 'b'},
-    {"header-string", required_argument, 0, 'd'},
-    {"string", required_argument, 0, 's'},
-    {"expect", required_argument, 0, 'e'},
-    {"regex", required_argument, 0, 'r'},
-    {"ereg", required_argument, 0, 'r'},
-    {"eregi", required_argument, 0, 'R'},
-    {"linespan", no_argument, 0, 'l'},
-    {"onredirect", required_argument, 0, 'f'},
-    {"certificate", required_argument, 0, 'C'},
-    {"client-cert", required_argument, 0, 'J'},
-    {"private-key", required_argument, 0, 'K'},
-    {"continue-after-certificate", no_argument, 0, CONTINUE_AFTER_CHECK_CERT},
-    {"useragent", required_argument, 0, 'A'},
-    {"header", required_argument, 0, 'k'},
-    {"no-body", no_argument, 0, 'N'},
-    {"max-age", required_argument, 0, 'M'},
-    {"content-type", required_argument, 0, 'T'},
-    {"pagesize", required_argument, 0, 'm'},
-    {"invert-regex", no_argument, NULL, INVERT_REGEX},
-    {"state-regex", required_argument, 0, STATE_REGEX},
-    {"use-ipv4", no_argument, 0, '4'},
-    {"use-ipv6", no_argument, 0, '6'},
-    {"extended-perfdata", no_argument, 0, 'E'},
-    {"show-body", no_argument, 0, 'B'},
-    {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return false;
-
-  for (c = 1; c < argc; c++) {
-    if (strcmp ("-to", argv[c]) == 0)
-      strcpy (argv[c], "-t");
-    if (strcmp ("-hn", argv[c]) == 0)
-      strcpy (argv[c], "-H");
-    if (strcmp ("-wt", argv[c]) == 0)
-      strcpy (argv[c], "-w");
-    if (strcmp ("-ct", argv[c]) == 0)
-      strcpy (argv[c], "-c");
-    if (strcmp ("-nohtml", argv[c]) == 0)
-      strcpy (argv[c], "-n");
-  }
-
-  while (1) {
-    c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:NEB", longopts, &option);
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case '?': /* usage */
-      usage5 ();
-      break;
-    case 'h': /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-      break;
-    case 'V': /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-      break;
-    case 't': /* timeout period */
-      if (!is_intnonneg (optarg))
-        usage2 (_("Timeout interval must be a positive integer"), optarg);
-      else
-        socket_timeout = atoi (optarg);
-      break;
-    case 'c': /* critical time threshold */
-      critical_thresholds = optarg;
-      break;
-    case 'w': /* warning time threshold */
-      warning_thresholds = optarg;
-      break;
-    case 'A': /* User Agent String */
-      xasprintf (&user_agent, "User-Agent: %s", optarg);
-      break;
-    case 'k': /* Additional headers */
-      if (http_opt_headers_count == 0)
-        http_opt_headers = malloc (sizeof (char *) * (++http_opt_headers_count));
-      else
-        http_opt_headers = realloc (http_opt_headers, sizeof (char *) * (++http_opt_headers_count));
-      http_opt_headers[http_opt_headers_count - 1] = optarg;
-      /* xasprintf (&http_opt_headers, "%s", optarg); */
-      break;
-    case 'L': /* show html link */
-      display_html = true;
-      break;
-    case 'n': /* do not show html link */
-      display_html = false;
-      break;
-    case 'C': /* Check SSL cert validity */
+ */
+bool process_arguments(int argc, char **argv) {
+        int c = 1;
+        char *p;
+        char *temp;
+
+        enum {
+                INVERT_REGEX = CHAR_MAX + 1,
+                SNI_OPTION,
+                MAX_REDIRS_OPTION,
+                CONTINUE_AFTER_CHECK_CERT,
+                STATE_REGEX
+        };
+
+        int option = 0;
+        static struct option longopts[] = {
+                STD_LONG_OPTS,
+                {"link", no_argument, 0, 'L'},
+                {"nohtml", no_argument, 0, 'n'},
+                {"ssl", optional_argument, 0, 'S'},
+                {"sni", no_argument, 0, SNI_OPTION},
+                {"post", required_argument, 0, 'P'},
+                {"method", required_argument, 0, 'j'},
+                {"IP-address", required_argument, 0, 'I'},
+                {"url", required_argument, 0, 'u'},
+                {"port", required_argument, 0, 'p'},
+                {"authorization", required_argument, 0, 'a'},
+                {"proxy-authorization", required_argument, 0, 'b'},
+                {"header-string", required_argument, 0, 'd'},
+                {"string", required_argument, 0, 's'},
+                {"expect", required_argument, 0, 'e'},
+                {"regex", required_argument, 0, 'r'},
+                {"ereg", required_argument, 0, 'r'},
+                {"eregi", required_argument, 0, 'R'},
+                {"linespan", no_argument, 0, 'l'},
+                {"onredirect", required_argument, 0, 'f'},
+                {"certificate", required_argument, 0, 'C'},
+                {"client-cert", required_argument, 0, 'J'},
+                {"private-key", required_argument, 0, 'K'},
+                {"continue-after-certificate", no_argument, 0, CONTINUE_AFTER_CHECK_CERT},
+                {"useragent", required_argument, 0, 'A'},
+                {"header", required_argument, 0, 'k'},
+                {"no-body", no_argument, 0, 'N'},
+                {"max-age", required_argument, 0, 'M'},
+                {"content-type", required_argument, 0, 'T'},
+                {"pagesize", required_argument, 0, 'm'},
+                {"invert-regex", no_argument, NULL, INVERT_REGEX},
+                {"state-regex", required_argument, 0, STATE_REGEX},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"extended-perfdata", no_argument, 0, 'E'},
+                {"show-body", no_argument, 0, 'B'},
+                {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION},
+                {0, 0, 0, 0}};
+
+        if (argc < 2) {
+                return false;
+        }
+
+        for (c = 1; c < argc; c++) {
+                if (strcmp("-to", argv[c]) == 0) {
+                        strcpy(argv[c], "-t");
+                }
+                if (strcmp("-hn", argv[c]) == 0) {
+                        strcpy(argv[c], "-H");
+                }
+                if (strcmp("-wt", argv[c]) == 0) {
+                        strcpy(argv[c], "-w");
+                }
+                if (strcmp("-ct", argv[c]) == 0) {
+                        strcpy(argv[c], "-c");
+                }
+                if (strcmp("-nohtml", argv[c]) == 0) {
+                        strcpy(argv[c], "-n");
+                }
+        }
+
+        while (1) {
+                c = getopt_long(argc, argv,
+                                                "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:d:e:p:s:R:r:u:f:C:J:K:nlLS::m:M:NEB",
+                                                longopts, &option);
+                if (c == -1 || c == EOF) {
+                        break;
+                }
+
+                switch (c) {
+                case '?': /* usage */
+                        usage5();
+                        break;
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                        break;
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                        break;
+                case 't': /* timeout period */
+                        if (!is_intnonneg(optarg)) {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        } else {
+                                socket_timeout = atoi(optarg);
+                        }
+                        break;
+                case 'c': /* critical time threshold */
+                        critical_thresholds = optarg;
+                        break;
+                case 'w': /* warning time threshold */
+                        warning_thresholds = optarg;
+                        break;
+                case 'A': /* User Agent String */
+                        xasprintf(&user_agent, "User-Agent: %s", optarg);
+                        break;
+                case 'k': /* Additional headers */
+                        if (http_opt_headers_count == 0) {
+                                http_opt_headers = malloc(sizeof(char *) * (++http_opt_headers_count));
+                        } else {
+                                http_opt_headers =
+                                        realloc(http_opt_headers, sizeof(char *) * (++http_opt_headers_count));
+                        }
+                        http_opt_headers[http_opt_headers_count - 1] = optarg;
+                        /* xasprintf (&http_opt_headers, "%s", optarg); */
+                        break;
+                case 'L': /* show html link */
+                        display_html = true;
+                        break;
+                case 'n': /* do not show html link */
+                        display_html = false;
+                        break;
+                case 'C': /* Check SSL cert validity */
 #ifdef HAVE_SSL
-      if ((temp=strchr(optarg,','))!=NULL) {
-        *temp='\0';
-        if (!is_intnonneg (optarg))
-          usage2 (_("Invalid certificate expiration period"), optarg);
-        days_till_exp_warn = atoi(optarg);
-        *temp=',';
-        temp++;
-        if (!is_intnonneg (temp))
-          usage2 (_("Invalid certificate expiration period"), temp);
-        days_till_exp_crit = atoi (temp);
-      }
-      else {
-        days_till_exp_crit=0;
-        if (!is_intnonneg (optarg))
-          usage2 (_("Invalid certificate expiration period"), optarg);
-        days_till_exp_warn = atoi (optarg);
-      }
-      check_cert = true;
-      goto enable_ssl;
+                        if ((temp = strchr(optarg, ',')) != NULL) {
+                                *temp = '\0';
+                                if (!is_intnonneg(optarg)) {
+                                        usage2(_("Invalid certificate expiration period"), optarg);
+                                }
+                                days_till_exp_warn = atoi(optarg);
+                                *temp = ',';
+                                temp++;
+                                if (!is_intnonneg(temp)) {
+                                        usage2(_("Invalid certificate expiration period"), temp);
+                                }
+                                days_till_exp_crit = atoi(temp);
+                        } else {
+                                days_till_exp_crit = 0;
+                                if (!is_intnonneg(optarg)) {
+                                        usage2(_("Invalid certificate expiration period"), optarg);
+                                }
+                                days_till_exp_warn = atoi(optarg);
+                        }
+                        check_cert = true;
+                        goto enable_ssl;
 #endif
-    case CONTINUE_AFTER_CHECK_CERT: /* don't stop after the certificate is checked */
+                case CONTINUE_AFTER_CHECK_CERT: /* don't stop after the certificate is checked */
 #ifdef HAVE_SSL
-      continue_after_check_cert = true;
-      break;
+                        continue_after_check_cert = true;
+                        break;
 #endif
-    case 'J': /* use client certificate */
+                case 'J': /* use client certificate */
 #ifdef HAVE_SSL
-      test_file(optarg);
-      client_cert = optarg;
-      goto enable_ssl;
+                        test_file(optarg);
+                        client_cert = optarg;
+                        goto enable_ssl;
 #endif
-    case 'K': /* use client private key */
+                case 'K': /* use client private key */
 #ifdef HAVE_SSL
-      test_file(optarg);
-      client_privkey = optarg;
-      goto enable_ssl;
+                        test_file(optarg);
+                        client_privkey = optarg;
+                        goto enable_ssl;
 #endif
-    case 'S': /* use SSL */
+                case 'S': /* use SSL */
 #ifdef HAVE_SSL
-    enable_ssl:
-      /* ssl_version initialized to 0 as a default. Only set if it's non-zero.  This helps when we include multiple
-         parameters, like -S and -C combinations */
-      use_ssl = true;
-      if (c=='S' && optarg != NULL) {
-        int got_plus = strchr(optarg, '+') != NULL;
-
-        if (!strncmp (optarg, "1.2", 3))
-          ssl_version = got_plus ? MP_TLSv1_2_OR_NEWER : MP_TLSv1_2;
-        else if (!strncmp (optarg, "1.1", 3))
-          ssl_version = got_plus ? MP_TLSv1_1_OR_NEWER : MP_TLSv1_1;
-        else if (optarg[0] == '1')
-          ssl_version = got_plus ? MP_TLSv1_OR_NEWER : MP_TLSv1;
-        else if (optarg[0] == '3')
-          ssl_version = got_plus ? MP_SSLv3_OR_NEWER : MP_SSLv3;
-        else if (optarg[0] == '2')
-          ssl_version = got_plus ? MP_SSLv2_OR_NEWER : MP_SSLv2;
-        else
-          usage4 (_("Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with optional '+' suffix)"));
-      }
-      if (specify_port == false)
-        server_port = HTTPS_PORT;
+                enable_ssl:
+                        /* ssl_version initialized to 0 as a default. Only set if it's non-zero.  This helps
+                           when we include multiple parameters, like -S and -C combinations */
+                        use_ssl = true;
+                        if (c == 'S' && optarg != NULL) {
+                                int got_plus = strchr(optarg, '+') != NULL;
+
+                                if (!strncmp(optarg, "1.2", 3)) {
+                                        ssl_version = got_plus ? MP_TLSv1_2_OR_NEWER : MP_TLSv1_2;
+                                } else if (!strncmp(optarg, "1.1", 3)) {
+                                        ssl_version = got_plus ? MP_TLSv1_1_OR_NEWER : MP_TLSv1_1;
+                                } else if (optarg[0] == '1') {
+                                        ssl_version = got_plus ? MP_TLSv1_OR_NEWER : MP_TLSv1;
+                                } else if (optarg[0] == '3') {
+                                        ssl_version = got_plus ? MP_SSLv3_OR_NEWER : MP_SSLv3;
+                                } else if (optarg[0] == '2') {
+                                        ssl_version = got_plus ? MP_SSLv2_OR_NEWER : MP_SSLv2;
+                                } else {
+                                        usage4(_("Invalid option - Valid SSL/TLS versions: 2, 3, 1, 1.1, 1.2 (with "
+                                                         "optional '+' suffix)"));
+                                }
+                        }
+                        if (!specify_port) {
+                                server_port = HTTPS_PORT;
+                        }
 #else
-      /* -C -J and -K fall through to here without SSL */
-      usage4 (_("Invalid option - SSL is not available"));
+                        /* -C -J and -K fall through to here without SSL */
+                        usage4(_("Invalid option - SSL is not available"));
 #endif
-      break;
-    case SNI_OPTION:
-      use_sni = true;
-      break;
-    case MAX_REDIRS_OPTION:
-      if (!is_intnonneg (optarg))
-        usage2 (_("Invalid max_redirs count"), optarg);
-      else {
-        max_depth = atoi (optarg);
-      }
-      break;    
-    case 'f': /* onredirect */
-      if (!strcmp (optarg, "stickyport"))
-        onredirect = STATE_DEPENDENT, followsticky = STICKY_HOST|STICKY_PORT;
-      else if (!strcmp (optarg, "sticky"))
-        onredirect = STATE_DEPENDENT, followsticky = STICKY_HOST;
-      else if (!strcmp (optarg, "follow"))
-        onredirect = STATE_DEPENDENT, followsticky = STICKY_NONE;
-      else if (!strcmp (optarg, "unknown"))
-        onredirect = STATE_UNKNOWN;
-      else if (!strcmp (optarg, "ok"))
-        onredirect = STATE_OK;
-      else if (!strcmp (optarg, "warning"))
-        onredirect = STATE_WARNING;
-      else if (!strcmp (optarg, "critical"))
-        onredirect = STATE_CRITICAL;
-      else usage2 (_("Invalid onredirect option"), optarg);
-      if (verbose)
-        printf(_("option f:%d \n"), onredirect);
-      break;
-    /* Note: H, I, and u must be malloc'd or will fail on redirects */
-    case 'H': /* Host Name (virtual host) */
-      host_name = strdup (optarg);
-      if (host_name[0] == '[') {
-        if ((p = strstr (host_name, "]:")) != NULL) { /* [IPv6]:port */
-          virtual_port = atoi (p + 2);
-          /* cut off the port */
-          host_name_length = strlen (host_name) - strlen (p) - 1;
-          free (host_name);
-          host_name = strndup (optarg, host_name_length);
-          if (specify_port == false)
-            server_port = virtual_port;
-        }
-      } else if ((p = strchr (host_name, ':')) != NULL
-                 && strchr (++p, ':') == NULL) { /* IPv4:port or host:port */
-          virtual_port = atoi (p);
-          /* cut off the port */
-          host_name_length = strlen (host_name) - strlen (p) - 1;
-          free (host_name);
-          host_name = strndup (optarg, host_name_length);
-          if (specify_port == false)
-            server_port = virtual_port;
-        }
-      break;
-    case 'I': /* Server IP-address */
-      server_address = strdup (optarg);
-      break;
-    case 'u': /* URL path */
-      server_url = strdup (optarg);
-      server_url_length = strlen (server_url);
-      break;
-    case 'p': /* Server port */
-      if (!is_intnonneg (optarg))
-        usage2 (_("Invalid port number"), optarg);
-      else {
-        server_port = atoi (optarg);
-        specify_port = true;
-      }
-      break;
-    case 'a': /* authorization info */
-      strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1);
-      user_auth[MAX_INPUT_BUFFER - 1] = 0;
-      break;
-    case 'b': /* proxy-authorization info */
-      strncpy (proxy_auth, optarg, MAX_INPUT_BUFFER - 1);
-      proxy_auth[MAX_INPUT_BUFFER - 1] = 0;
-      break;
-    case 'P': /* HTTP POST data in URL encoded format; ignored if settings already */
-      if (! http_post_data)
-        http_post_data = strdup (optarg);
-      if (! http_method)
-        http_method = strdup("POST");
-      break;
-    case 'j': /* Set HTTP method */
-      if (http_method)
-        free(http_method);
-      http_method = strdup (optarg);
-      char *tmp;
-      if ((tmp = strstr(http_method, ":")) != NULL) {
-        tmp[0] = '\0'; // set the ":" in the middle to 0
-        http_method_proxy = ++tmp; // this points to the second part
-      }
-      break;
-    case 'd': /* string or substring */
-      strncpy (header_expect, optarg, MAX_INPUT_BUFFER - 1);
-      header_expect[MAX_INPUT_BUFFER - 1] = 0;
-      break;
-    case 's': /* string or substring */
-      strncpy (string_expect, optarg, MAX_INPUT_BUFFER - 1);
-      string_expect[MAX_INPUT_BUFFER - 1] = 0;
-      break;
-    case 'e': /* string or substring */
-      strncpy (server_expect, optarg, MAX_INPUT_BUFFER - 1);
-      server_expect[MAX_INPUT_BUFFER - 1] = 0;
-      server_expect_yn = 1;
-      break;
-    case 'T': /* Content-type */
-      xasprintf (&http_content_type, "%s", optarg);
-      break;
-    case 'l': /* linespan */
-      cflags &= ~REG_NEWLINE;
-      break;
-    case 'R': /* regex */
-      cflags |= REG_ICASE;
+                        break;
+                case SNI_OPTION:
+                        use_sni = true;
+                        break;
+                case MAX_REDIRS_OPTION:
+                        if (!is_intnonneg(optarg)) {
+                                usage2(_("Invalid max_redirs count"), optarg);
+                        } else {
+                                max_depth = atoi(optarg);
+                        }
+                        break;
+                case 'f': /* onredirect */
+                        if (!strcmp(optarg, "stickyport")) {
+                                onredirect = STATE_DEPENDENT, followsticky = STICKY_HOST | STICKY_PORT;
+                        } else if (!strcmp(optarg, "sticky")) {
+                                onredirect = STATE_DEPENDENT, followsticky = STICKY_HOST;
+                        } else if (!strcmp(optarg, "follow")) {
+                                onredirect = STATE_DEPENDENT, followsticky = STICKY_NONE;
+                        } else if (!strcmp(optarg, "unknown")) {
+                                onredirect = STATE_UNKNOWN;
+                        } else if (!strcmp(optarg, "ok")) {
+                                onredirect = STATE_OK;
+                        } else if (!strcmp(optarg, "warning")) {
+                                onredirect = STATE_WARNING;
+                        } else if (!strcmp(optarg, "critical")) {
+                                onredirect = STATE_CRITICAL;
+                        } else {
+                                usage2(_("Invalid onredirect option"), optarg);
+                        }
+                        if (verbose) {
+                                printf(_("option f:%d \n"), onredirect);
+                        }
+                        break;
+                /* Note: H, I, and u must be malloc'd or will fail on redirects */
+                case 'H': /* Host Name (virtual host) */
+                        host_name = strdup(optarg);
+                        if (host_name[0] == '[') {
+                                if ((p = strstr(host_name, "]:")) != NULL) { /* [IPv6]:port */
+                                        virtual_port = atoi(p + 2);
+                                        /* cut off the port */
+                                        host_name_length = strlen(host_name) - strlen(p) - 1;
+                                        free(host_name);
+                                        host_name = strndup(optarg, host_name_length);
+                                        if (!specify_port) {
+                                                server_port = virtual_port;
+                                        }
+                                }
+                        } else if ((p = strchr(host_name, ':')) != NULL &&
+                                           strchr(++p, ':') == NULL) { /* IPv4:port or host:port */
+                                virtual_port = atoi(p);
+                                /* cut off the port */
+                                host_name_length = strlen(host_name) - strlen(p) - 1;
+                                free(host_name);
+                                host_name = strndup(optarg, host_name_length);
+                                if (!specify_port) {
+                                        server_port = virtual_port;
+                                }
+                        }
+                        break;
+                case 'I': /* Server IP-address */
+                        server_address = strdup(optarg);
+                        break;
+                case 'u': /* URL path */
+                        server_url = strdup(optarg);
+                        server_url_length = strlen(server_url);
+                        break;
+                case 'p': /* Server port */
+                        if (!is_intnonneg(optarg)) {
+                                usage2(_("Invalid port number"), optarg);
+                        } else {
+                                server_port = atoi(optarg);
+                                specify_port = true;
+                        }
+                        break;
+                case 'a': /* authorization info */
+                        strncpy(user_auth, optarg, MAX_INPUT_BUFFER - 1);
+                        user_auth[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+                case 'b': /* proxy-authorization info */
+                        strncpy(proxy_auth, optarg, MAX_INPUT_BUFFER - 1);
+                        proxy_auth[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+                case 'P': /* HTTP POST data in URL encoded format; ignored if settings already */
+                        if (!http_post_data) {
+                                http_post_data = strdup(optarg);
+                        }
+                        if (!http_method) {
+                                http_method = strdup("POST");
+                        }
+                        break;
+                case 'j': /* Set HTTP method */
+                        if (http_method) {
+                                free(http_method);
+                        }
+                        http_method = strdup(optarg);
+                        char *tmp;
+                        if ((tmp = strstr(http_method, ":")) != NULL) {
+                                tmp[0] = '\0';             // set the ":" in the middle to 0
+                                http_method_proxy = ++tmp; // this points to the second part
+                        }
+                        break;
+                case 'd': /* string or substring */
+                        strncpy(header_expect, optarg, MAX_INPUT_BUFFER - 1);
+                        header_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+                case 's': /* string or substring */
+                        strncpy(string_expect, optarg, MAX_INPUT_BUFFER - 1);
+                        string_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        break;
+                case 'e': /* string or substring */
+                        strncpy(server_expect, optarg, MAX_INPUT_BUFFER - 1);
+                        server_expect[MAX_INPUT_BUFFER - 1] = 0;
+                        server_expect_yn = 1;
+                        break;
+                case 'T': /* Content-type */
+                        xasprintf(&http_content_type, "%s", optarg);
+                        break;
+                case 'l': /* linespan */
+                        cflags &= ~REG_NEWLINE;
+                        break;
+                case 'R': /* regex */
+                        cflags |= REG_ICASE;
                         // fall through
-    case 'r': /* regex */
-      strncpy (regexp, optarg, MAX_RE_SIZE - 1);
-      regexp[MAX_RE_SIZE - 1] = 0;
-      errcode = regcomp (&preg, regexp, cflags);
-      if (errcode != 0) {
-        (void) regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-        printf (_("Could Not Compile Regular Expression: %s"), errbuf);
-        return false;
-      }
-      break;
-    case INVERT_REGEX:
-      invert_regex = 1;
-      break;
-    case STATE_REGEX:
-      if (!strcmp (optarg, "critical"))
-        state_regex = STATE_CRITICAL;
-      else if (!strcmp (optarg, "warning"))
-        state_regex = STATE_WARNING;
-      else usage2 (_("Invalid state-regex option"), optarg);
-      break;
-    case '4':
-      address_family = AF_INET;
-      break;
-    case '6':
+                case 'r': /* regex */
+                        strncpy(regexp, optarg, MAX_RE_SIZE - 1);
+                        regexp[MAX_RE_SIZE - 1] = 0;
+                        errcode = regcomp(&preg, regexp, cflags);
+                        if (errcode != 0) {
+                                (void)regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                printf(_("Could Not Compile Regular Expression: %s"), errbuf);
+                                return false;
+                        }
+                        break;
+                case INVERT_REGEX:
+                        invert_regex = 1;
+                        break;
+                case STATE_REGEX:
+                        if (!strcmp(optarg, "critical")) {
+                                state_regex = STATE_CRITICAL;
+                        } else if (!strcmp(optarg, "warning")) {
+                                state_regex = STATE_WARNING;
+                        } else {
+                                usage2(_("Invalid state-regex option"), optarg);
+                        }
+                        break;
+                case '4':
+                        address_family = AF_INET;
+                        break;
+                case '6':
 #ifdef USE_IPV6
-      address_family = AF_INET6;
+                        address_family = AF_INET6;
 #else
-      usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
-      break;
-    case 'v': /* verbose */
-      verbose = true;
-      break;
-    case 'm': /* min_page_length */
-      {
-      char *tmp;
-      if (strchr(optarg, ':') != (char *)NULL) {
-        /* range, so get two values, min:max */
-        tmp = strtok(optarg, ":");
-        if (tmp == NULL) {
-          printf("Bad format: try \"-m min:max\"\n");
-          exit (STATE_WARNING);
-        } else
-          min_page_len = atoi(tmp);
-
-        tmp = strtok(NULL, ":");
-        if (tmp == NULL) {
-          printf("Bad format: try \"-m min:max\"\n");
-          exit (STATE_WARNING);
-        } else
-          max_page_len = atoi(tmp);
-      } else
-        min_page_len = atoi (optarg);
-      break;
-      }
-    case 'N': /* no-body */
-      no_body = true;
-      break;
-    case 'M': /* max-age */
-                  {
-                    int L = strlen(optarg);
-                    if (L && optarg[L-1] == 'm')
-                      maximum_age = atoi (optarg) * 60;
-                    else if (L && optarg[L-1] == 'h')
-                      maximum_age = atoi (optarg) * 60 * 60;
-                    else if (L && optarg[L-1] == 'd')
-                      maximum_age = atoi (optarg) * 60 * 60 * 24;
-                    else if (L && (optarg[L-1] == 's' ||
-                                   isdigit (optarg[L-1])))
-                      maximum_age = atoi (optarg);
-                    else {
-                      fprintf (stderr, "unparsable max-age: %s\n", optarg);
-                      exit (STATE_WARNING);
-                    }
-                  }
-                  break;
-    case 'E': /* show extended perfdata */
-      show_extended_perfdata = true;
-      break;
-    case 'B': /* print body content after status line */
-      show_body = true;
-      break;
-    }
-  }
-
-  c = optind;
-
-  if (server_address == NULL && c < argc)
-    server_address = strdup (argv[c++]);
-
-  if (host_name == NULL && c < argc)
-    host_name = strdup (argv[c++]);
-
-  if (server_address == NULL) {
-    if (host_name == NULL)
-      usage4 (_("You must specify a server address or host name"));
-    else
-      server_address = strdup (host_name);
-  }
-
-  set_thresholds(&thlds, warning_thresholds, critical_thresholds);
-
-  if (critical_thresholds && thlds->critical->end>(double)socket_timeout)
-    socket_timeout = (int)thlds->critical->end + 1;
-
-  if (http_method == NULL)
-    http_method = strdup ("GET");
-
-  if (http_method_proxy == NULL)
-    http_method_proxy = strdup ("GET");
-
-  if (client_cert && !client_privkey)
-    usage4 (_("If you use a client certificate you must also specify a private key file"));
-
-  if (virtual_port == 0)
-    virtual_port = server_port;
-
-  return true;
-}
+                        break;
+                case 'v': /* verbose */
+                        verbose = true;
+                        break;
+                case 'm': /* min_page_length */
+                {
+                        char *tmp;
+                        if (strchr(optarg, ':') != (char *)NULL) {
+                                /* range, so get two values, min:max */
+                                tmp = strtok(optarg, ":");
+                                if (tmp == NULL) {
+                                        printf("Bad format: try \"-m min:max\"\n");
+                                        exit(STATE_WARNING);
+                                } else {
+                                        min_page_len = atoi(tmp);
+                                }
+
+                                tmp = strtok(NULL, ":");
+                                if (tmp == NULL) {
+                                        printf("Bad format: try \"-m min:max\"\n");
+                                        exit(STATE_WARNING);
+                                } else {
+                                        max_page_len = atoi(tmp);
+                                }
+                        } else {
+                                min_page_len = atoi(optarg);
+                        }
+                        break;
+                }
+                case 'N': /* no-body */
+                        no_body = true;
+                        break;
+                case 'M': /* max-age */
+                {
+                        int L = strlen(optarg);
+                        if (L && optarg[L - 1] == 'm') {
+                                maximum_age = atoi(optarg) * 60;
+                        } else if (L && optarg[L - 1] == 'h') {
+                                maximum_age = atoi(optarg) * 60 * 60;
+                        } else if (L && optarg[L - 1] == 'd') {
+                                maximum_age = atoi(optarg) * 60 * 60 * 24;
+                        } else if (L && (optarg[L - 1] == 's' || isdigit(optarg[L - 1]))) {
+                                maximum_age = atoi(optarg);
+                        } else {
+                                fprintf(stderr, "unparsable max-age: %s\n", optarg);
+                                exit(STATE_WARNING);
+                        }
+                } break;
+                case 'E': /* show extended perfdata */
+                        show_extended_perfdata = true;
+                        break;
+                case 'B': /* print body content after status line */
+                        show_body = true;
+                        break;
+                }
+        }
+
+        c = optind;
+
+        if (server_address == NULL && c < argc) {
+                server_address = strdup(argv[c++]);
+        }
 
+        if (host_name == NULL && c < argc) {
+                host_name = strdup(argv[c++]);
+        }
+
+        if (server_address == NULL) {
+                if (host_name == NULL) {
+                        usage4(_("You must specify a server address or host name"));
+                } else {
+                        server_address = strdup(host_name);
+                }
+        }
 
+        set_thresholds(&thlds, warning_thresholds, critical_thresholds);
+
+        if (critical_thresholds && thlds->critical->end > (double)socket_timeout) {
+                socket_timeout = (int)thlds->critical->end + 1;
+        }
+
+        if (http_method == NULL) {
+                http_method = strdup("GET");
+        }
+
+        if (http_method_proxy == NULL) {
+                http_method_proxy = strdup("GET");
+        }
+
+        if (client_cert && !client_privkey) {
+                usage4(_("If you use a client certificate you must also specify a private key file"));
+        }
+
+        if (virtual_port == 0) {
+                virtual_port = server_port;
+        }
+
+        return true;
+}
 
 /* Returns 1 if we're done processing the document body; 0 to keep going */
-static int
-document_headers_done (char *full_page)
-{
-  const char *body;
+static int document_headers_done(char *full_page) {
+        const char *body;
 
-  for (body = full_page; *body; body++) {
-    if (!strncmp (body, "\n\n", 2) || !strncmp (body, "\n\r\n", 3))
-      break;
-  }
+        for (body = full_page; *body; body++) {
+                if (!strncmp(body, "\n\n", 2) || !strncmp(body, "\n\r\n", 3)) {
+                        break;
+                }
+        }
 
-  if (!*body)
-    return 0;  /* haven't read end of headers yet */
+        if (!*body) {
+                return 0; /* haven't read end of headers yet */
+        }
 
-  full_page[body - full_page] = 0;
-  return 1;
+        full_page[body - full_page] = 0;
+        return 1;
 }
 
-static time_t
-parse_time_string (const char *string)
-{
-  struct tm tm;
-  time_t t;
-  memset (&tm, 0, sizeof(tm));
-
-  /* Like this: Tue, 25 Dec 2001 02:59:03 GMT */
-
-  if (isupper (string[0])  &&  /* Tue */
-    islower (string[1])  &&
-    islower (string[2])  &&
-    ',' ==   string[3]   &&
-    ' ' ==   string[4]   &&
-    (isdigit(string[5]) || string[5] == ' ') &&   /* 25 */
-    isdigit (string[6])  &&
-    ' ' ==   string[7]   &&
-    isupper (string[8])  &&  /* Dec */
-    islower (string[9])  &&
-    islower (string[10]) &&
-    ' ' ==   string[11]  &&
-    isdigit (string[12]) &&  /* 2001 */
-    isdigit (string[13]) &&
-    isdigit (string[14]) &&
-    isdigit (string[15]) &&
-    ' ' ==   string[16]  &&
-    isdigit (string[17]) &&  /* 02: */
-    isdigit (string[18]) &&
-    ':' ==   string[19]  &&
-    isdigit (string[20]) &&  /* 59: */
-    isdigit (string[21]) &&
-    ':' ==   string[22]  &&
-    isdigit (string[23]) &&  /* 03 */
-    isdigit (string[24]) &&
-    ' ' ==   string[25]  &&
-    'G' ==   string[26]  &&  /* GMT */
-    'M' ==   string[27]  &&  /* GMT */
-    'T' ==   string[28]) {
-
-    tm.tm_sec  = 10 * (string[23]-'0') + (string[24]-'0');
-    tm.tm_min  = 10 * (string[20]-'0') + (string[21]-'0');
-    tm.tm_hour = 10 * (string[17]-'0') + (string[18]-'0');
-    tm.tm_mday = 10 * (string[5] == ' ' ? 0 : string[5]-'0') + (string[6]-'0');
-    tm.tm_mon = (!strncmp (string+8, "Jan", 3) ? 0 :
-      !strncmp (string+8, "Feb", 3) ? 1 :
-      !strncmp (string+8, "Mar", 3) ? 2 :
-      !strncmp (string+8, "Apr", 3) ? 3 :
-      !strncmp (string+8, "May", 3) ? 4 :
-      !strncmp (string+8, "Jun", 3) ? 5 :
-      !strncmp (string+8, "Jul", 3) ? 6 :
-      !strncmp (string+8, "Aug", 3) ? 7 :
-      !strncmp (string+8, "Sep", 3) ? 8 :
-      !strncmp (string+8, "Oct", 3) ? 9 :
-      !strncmp (string+8, "Nov", 3) ? 10 :
-      !strncmp (string+8, "Dec", 3) ? 11 :
-      -1);
-    tm.tm_year = ((1000 * (string[12]-'0') +
-      100 * (string[13]-'0') +
-      10 * (string[14]-'0') +
-      (string[15]-'0'))
-      - 1900);
-
-    tm.tm_isdst = 0;  /* GMT is never in DST, right? */
-
-    if (tm.tm_mon < 0 || tm.tm_mday < 1 || tm.tm_mday > 31)
-      return 0;
-
-    /*
-    This is actually wrong: we need to subtract the local timezone
-    offset from GMT from this value.  But, that's ok in this usage,
-    because we only comparing these two GMT dates against each other,
-    so it doesn't matter what time zone we parse them in.
-    */
-
-    t = mktime (&tm);
-    if (t == (time_t) -1) t = 0;
-
-    if (verbose) {
-      const char *s = string;
-      while (*s && *s != '\r' && *s != '\n')
-      fputc (*s++, stdout);
-      printf (" ==> %lu\n", (unsigned long) t);
-    }
-
-    return t;
-
-  } else {
-    return 0;
-  }
+static time_t parse_time_string(const char *string) {
+        struct tm tm;
+        time_t t;
+        memset(&tm, 0, sizeof(tm));
+
+        /* Like this: Tue, 25 Dec 2001 02:59:03 GMT */
+
+        if (isupper(string[0]) && /* Tue */
+                islower(string[1]) && islower(string[2]) && ',' == string[3] && ' ' == string[4] &&
+                (isdigit(string[5]) || string[5] == ' ') &&                     /* 25 */
+                isdigit(string[6]) && ' ' == string[7] && isupper(string[8]) && /* Dec */
+                islower(string[9]) && islower(string[10]) && ' ' == string[11] &&
+                isdigit(string[12]) && /* 2001 */
+                isdigit(string[13]) && isdigit(string[14]) && isdigit(string[15]) && ' ' == string[16] &&
+                isdigit(string[17]) &&                                             /* 02: */
+                isdigit(string[18]) && ':' == string[19] && isdigit(string[20]) && /* 59: */
+                isdigit(string[21]) && ':' == string[22] && isdigit(string[23]) && /* 03 */
+                isdigit(string[24]) && ' ' == string[25] && 'G' == string[26] &&   /* GMT */
+                'M' == string[27] &&                                               /* GMT */
+                'T' == string[28]) {
+
+                tm.tm_sec = 10 * (string[23] - '0') + (string[24] - '0');
+                tm.tm_min = 10 * (string[20] - '0') + (string[21] - '0');
+                tm.tm_hour = 10 * (string[17] - '0') + (string[18] - '0');
+                tm.tm_mday = 10 * (string[5] == ' ' ? 0 : string[5] - '0') + (string[6] - '0');
+                tm.tm_mon = (!strncmp(string + 8, "Jan", 3)   ? 0
+                                         : !strncmp(string + 8, "Feb", 3) ? 1
+                                         : !strncmp(string + 8, "Mar", 3) ? 2
+                                         : !strncmp(string + 8, "Apr", 3) ? 3
+                                         : !strncmp(string + 8, "May", 3) ? 4
+                                         : !strncmp(string + 8, "Jun", 3) ? 5
+                                         : !strncmp(string + 8, "Jul", 3) ? 6
+                                         : !strncmp(string + 8, "Aug", 3) ? 7
+                                         : !strncmp(string + 8, "Sep", 3) ? 8
+                                         : !strncmp(string + 8, "Oct", 3) ? 9
+                                         : !strncmp(string + 8, "Nov", 3) ? 10
+                                         : !strncmp(string + 8, "Dec", 3) ? 11
+                                                                                                          : -1);
+                tm.tm_year = ((1000 * (string[12] - '0') + 100 * (string[13] - '0') +
+                                           10 * (string[14] - '0') + (string[15] - '0')) -
+                                          1900);
+
+                tm.tm_isdst = 0; /* GMT is never in DST, right? */
+
+                if (tm.tm_mon < 0 || tm.tm_mday < 1 || tm.tm_mday > 31) {
+                        return 0;
+                }
+
+                /*
+                This is actually wrong: we need to subtract the local timezone
+                offset from GMT from this value.  But, that's ok in this usage,
+                because we only comparing these two GMT dates against each other,
+                so it doesn't matter what time zone we parse them in.
+                */
+
+                t = mktime(&tm);
+                if (t == (time_t)-1) {
+                        t = 0;
+                }
+
+                if (verbose) {
+                        const char *s = string;
+                        while (*s && *s != '\r' && *s != '\n') {
+                                fputc(*s++, stdout);
+                        }
+                        printf(" ==> %lu\n", (unsigned long)t);
+                }
+
+                return t;
+        }
+        return 0;
 }
 
 /* Checks if the server 'reply' is one of the expected 'statuscodes' */
-static int
-expected_statuscode (const char *reply, const char *statuscodes)
-{
-  char *expected, *code;
-  int result = 0;
-
-  if ((expected = strdup (statuscodes)) == NULL)
-    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
-
-  for (code = strtok (expected, ","); code != NULL; code = strtok (NULL, ","))
-    if (strstr (reply, code) != NULL) {
-      result = 1;
-      break;
-    }
-
-  free (expected);
-  return result;
+static int expected_statuscode(const char *reply, const char *statuscodes) {
+        char *expected;
+        char *code;
+        int result = 0;
+
+        if ((expected = strdup(statuscodes)) == NULL) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
+        }
+
+        for (code = strtok(expected, ","); code != NULL; code = strtok(NULL, ",")) {
+                if (strstr(reply, code) != NULL) {
+                        result = 1;
+                        break;
+                }
+        }
+
+        free(expected);
+        return result;
 }
 
-static int
-check_document_dates (const char *headers, char **msg)
-{
-  const char *s;
-  char *server_date = 0;
-  char *document_date = 0;
-  int date_result = STATE_OK;
-
-  s = headers;
-  while (*s) {
-    const char *field = s;
-    const char *value = 0;
-
-    /* Find the end of the header field */
-    while (*s && !isspace(*s) && *s != ':')
-      s++;
-
-    /* Remember the header value, if any. */
-    if (*s == ':')
-      value = ++s;
-
-    /* Skip to the end of the header, including continuation lines. */
-    while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
-      s++;
-
-    /* Avoid stepping over end-of-string marker */
-    if (*s)
-      s++;
-
-    /* Process this header. */
-    if (value && value > field+2) {
-      char *ff = (char *) malloc (value-field);
-      char *ss = ff;
-      while (field < value-1)
-        *ss++ = tolower(*field++);
-      *ss++ = 0;
-
-      if (!strcmp (ff, "date") || !strcmp (ff, "last-modified")) {
-        const char *e;
-        while (*value && isspace (*value))
-          value++;
-        for (e = value; *e && *e != '\r' && *e != '\n'; e++)
-          ;
-        ss = (char *) malloc (e - value + 1);
-        strncpy (ss, value, e - value);
-        ss[e - value] = 0;
-        if (!strcmp (ff, "date")) {
-          if (server_date) free (server_date);
-          server_date = ss;
-        } else {
-          if (document_date) free (document_date);
-          document_date = ss;
-        }
-      }
-      free (ff);
-    }
-  }
-
-  /* Done parsing the body.  Now check the dates we (hopefully) parsed.  */
-  if (!server_date || !*server_date) {
-    xasprintf (msg, _("%sServer date unknown, "), *msg);
-    date_result = max_state_alt(STATE_UNKNOWN, date_result);
-  } else if (!document_date || !*document_date) {
-    xasprintf (msg, _("%sDocument modification date unknown, "), *msg);
-    date_result = max_state_alt(STATE_CRITICAL, date_result);
-  } else {
-    time_t srv_data = parse_time_string (server_date);
-    time_t doc_data = parse_time_string (document_date);
-
-    if (srv_data <= 0) {
-      xasprintf (msg, _("%sServer date \"%100s\" unparsable, "), *msg, server_date);
-      date_result = max_state_alt(STATE_CRITICAL, date_result);
-    } else if (doc_data <= 0) {
-      xasprintf (msg, _("%sDocument date \"%100s\" unparsable, "), *msg, document_date);
-      date_result = max_state_alt(STATE_CRITICAL, date_result);
-    } else if (doc_data > srv_data + 30) {
-      xasprintf (msg, _("%sDocument is %d seconds in the future, "), *msg, (int)doc_data - (int)srv_data);
-      date_result = max_state_alt(STATE_CRITICAL, date_result);
-    } else if (doc_data < srv_data - maximum_age) {
-      int n = (srv_data - doc_data);
-      if (n > (60 * 60 * 24 * 2)) {
-        xasprintf (msg, _("%sLast modified %.1f days ago, "), *msg, ((float) n) / (60 * 60 * 24));
-        date_result = max_state_alt(STATE_CRITICAL, date_result);
-      } else {
-        xasprintf (msg, _("%sLast modified %d:%02d:%02d ago, "), *msg, n / (60 * 60), (n / 60) % 60, n % 60);
-        date_result = max_state_alt(STATE_CRITICAL, date_result);
-      }
-    }
-    free (server_date);
-    free (document_date);
-  }
-  return date_result;
+static int check_document_dates(const char *headers, char **msg) {
+        const char *s;
+        char *server_date = 0;
+        char *document_date = 0;
+        int date_result = STATE_OK;
+
+        s = headers;
+        while (*s) {
+                const char *field = s;
+                const char *value = 0;
+
+                /* Find the end of the header field */
+                while (*s && !isspace(*s) && *s != ':') {
+                        s++;
+                }
+
+                /* Remember the header value, if any. */
+                if (*s == ':') {
+                        value = ++s;
+                }
+
+                /* Skip to the end of the header, including continuation lines. */
+                while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t'))) {
+                        s++;
+                }
+
+                /* Avoid stepping over end-of-string marker */
+                if (*s) {
+                        s++;
+                }
+
+                /* Process this header. */
+                if (value && value > field + 2) {
+                        char *ff = (char *)malloc(value - field);
+                        char *ss = ff;
+                        while (field < value - 1) {
+                                *ss++ = tolower(*field++);
+                        }
+                        *ss++ = 0;
+
+                        if (!strcmp(ff, "date") || !strcmp(ff, "last-modified")) {
+                                const char *e;
+                                while (*value && isspace(*value)) {
+                                        value++;
+                                }
+                                for (e = value; *e && *e != '\r' && *e != '\n'; e++) {
+                                        ;
+                                }
+                                ss = (char *)malloc(e - value + 1);
+                                strncpy(ss, value, e - value);
+                                ss[e - value] = 0;
+                                if (!strcmp(ff, "date")) {
+                                        if (server_date) {
+                                                free(server_date);
+                                        }
+                                        server_date = ss;
+                                } else {
+                                        if (document_date) {
+                                                free(document_date);
+                                        }
+                                        document_date = ss;
+                                }
+                        }
+                        free(ff);
+                }
+        }
+
+        /* Done parsing the body.  Now check the dates we (hopefully) parsed.  */
+        if (!server_date || !*server_date) {
+                xasprintf(msg, _("%sServer date unknown, "), *msg);
+                date_result = max_state_alt(STATE_UNKNOWN, date_result);
+        } else if (!document_date || !*document_date) {
+                xasprintf(msg, _("%sDocument modification date unknown, "), *msg);
+                date_result = max_state_alt(STATE_CRITICAL, date_result);
+        } else {
+                time_t srv_data = parse_time_string(server_date);
+                time_t doc_data = parse_time_string(document_date);
+
+                if (srv_data <= 0) {
+                        xasprintf(msg, _("%sServer date \"%100s\" unparsable, "), *msg, server_date);
+                        date_result = max_state_alt(STATE_CRITICAL, date_result);
+                } else if (doc_data <= 0) {
+                        xasprintf(msg, _("%sDocument date \"%100s\" unparsable, "), *msg, document_date);
+                        date_result = max_state_alt(STATE_CRITICAL, date_result);
+                } else if (doc_data > srv_data + 30) {
+                        xasprintf(msg, _("%sDocument is %d seconds in the future, "), *msg,
+                                          (int)doc_data - (int)srv_data);
+                        date_result = max_state_alt(STATE_CRITICAL, date_result);
+                } else if (doc_data < srv_data - maximum_age) {
+                        int n = (srv_data - doc_data);
+                        if (n > (60 * 60 * 24 * 2)) {
+                                xasprintf(msg, _("%sLast modified %.1f days ago, "), *msg,
+                                                  ((float)n) / (60 * 60 * 24));
+                                date_result = max_state_alt(STATE_CRITICAL, date_result);
+                        } else {
+                                xasprintf(msg, _("%sLast modified %d:%02d:%02d ago, "), *msg, n / (60 * 60),
+                                                  (n / 60) % 60, n % 60);
+                                date_result = max_state_alt(STATE_CRITICAL, date_result);
+                        }
+                }
+                free(server_date);
+                free(document_date);
+        }
+        return date_result;
 }
 
-int
-get_content_length (const char *headers)
-{
-  const char *s;
-  int content_length = 0;
-
-  s = headers;
-  while (*s) {
-    const char *field = s;
-    const char *value = 0;
-
-    /* Find the end of the header field */
-    while (*s && !isspace(*s) && *s != ':')
-      s++;
-
-    /* Remember the header value, if any. */
-    if (*s == ':')
-      value = ++s;
-
-    /* Skip to the end of the header, including continuation lines. */
-    while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t')))
-      s++;
-
-    /* Avoid stepping over end-of-string marker */
-    if (*s)
-      s++;
-
-    /* Process this header. */
-    if (value && value > field+2) {
-      char *ff = (char *) malloc (value-field);
-      char *ss = ff;
-      while (field < value-1)
-        *ss++ = tolower(*field++);
-      *ss++ = 0;
-
-      if (!strcmp (ff, "content-length")) {
-        const char *e;
-        while (*value && isspace (*value))
-          value++;
-        for (e = value; *e && *e != '\r' && *e != '\n'; e++)
-          ;
-        ss = (char *) malloc (e - value + 1);
-        strncpy (ss, value, e - value);
-        ss[e - value] = 0;
-        content_length = atoi(ss);
-        free (ss);
-      }
-      free (ff);
-    }
-  }
-  return (content_length);
+int get_content_length(const char *headers) {
+        const char *s;
+        int content_length = 0;
+
+        s = headers;
+        while (*s) {
+                const char *field = s;
+                const char *value = 0;
+
+                /* Find the end of the header field */
+                while (*s && !isspace(*s) && *s != ':') {
+                        s++;
+                }
+
+                /* Remember the header value, if any. */
+                if (*s == ':') {
+                        value = ++s;
+                }
+
+                /* Skip to the end of the header, including continuation lines. */
+                while (*s && !(*s == '\n' && (s[1] != ' ' && s[1] != '\t'))) {
+                        s++;
+                }
+
+                /* Avoid stepping over end-of-string marker */
+                if (*s) {
+                        s++;
+                }
+
+                /* Process this header. */
+                if (value && value > field + 2) {
+                        char *ff = (char *)malloc(value - field);
+                        char *ss = ff;
+                        while (field < value - 1) {
+                                *ss++ = tolower(*field++);
+                        }
+                        *ss++ = 0;
+
+                        if (!strcmp(ff, "content-length")) {
+                                const char *e;
+                                while (*value && isspace(*value)) {
+                                        value++;
+                                }
+                                for (e = value; *e && *e != '\r' && *e != '\n'; e++) {
+                                        ;
+                                }
+                                ss = (char *)malloc(e - value + 1);
+                                strncpy(ss, value, e - value);
+                                ss[e - value] = 0;
+                                content_length = atoi(ss);
+                                free(ss);
+                        }
+                        free(ff);
+                }
+        }
+        return (content_length);
 }
 
-char *
-prepend_slash (char *path)
-{
-  char *newpath;
+char *prepend_slash(char *path) {
+        char *newpath;
 
-  if (path[0] == '/')
-    return path;
+        if (path[0] == '/') {
+                return path;
+        }
 
-  if ((newpath = malloc (strlen(path) + 2)) == NULL)
-    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
-  newpath[0] = '/';
-  strcpy (newpath + 1, path);
-  free (path);
-  return newpath;
+        if ((newpath = malloc(strlen(path) + 2)) == NULL) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Memory allocation error\n"));
+        }
+        newpath[0] = '/';
+        strcpy(newpath + 1, path);
+        free(path);
+        return newpath;
 }
 
-int
-check_http (void)
-{
-  char *msg;
-  char *status_line;
-  char *status_code;
-  char *header;
-  char *page;
-  char *auth;
-  int http_status;
-  int i = 0;
-  size_t pagesize = 0;
-  char *full_page;
-  char *full_page_new;
-  char *buf;
-  char *pos;
-  long microsec = 0L;
-  double elapsed_time = 0.0;
-  long microsec_connect = 0L;
-  double elapsed_time_connect = 0.0;
-  long microsec_ssl = 0L;
-  double elapsed_time_ssl = 0.0;
-  long microsec_firstbyte = 0L;
-  double elapsed_time_firstbyte = 0.0;
-  long microsec_headers = 0L;
-  double elapsed_time_headers = 0.0;
-  long microsec_transfer = 0L;
-  double elapsed_time_transfer = 0.0;
-  int page_len = 0;
-  int result = STATE_OK;
-  char *force_host_header = NULL;
-
-  /* try to connect to the host at the given port number */
-  gettimeofday (&tv_temp, NULL);
-  if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
-    die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
-  microsec_connect = deltime (tv_temp);
-
-    /* if we are called with the -I option, the -j method is CONNECT and */
-    /* we received -S for SSL, then we tunnel the request through a proxy*/
-    /* @20100414, public[at]frank4dd.com, http://www.frank4dd.com/howto  */
-
-    if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
-      && host_name != NULL && use_ssl == true) {
-
-    if (verbose) printf ("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n", server_address, server_port, host_name, HTTPS_PORT);
-    asprintf (&buf, "%s %s:%d HTTP/1.1\r\n%s\r\n", http_method, host_name, HTTPS_PORT, user_agent);
-    if (strlen(proxy_auth)) {
-      base64_encode_alloc (proxy_auth, strlen (proxy_auth), &auth);
-      xasprintf (&buf, "%sProxy-Authorization: Basic %s\r\n", buf, auth);
-    }
-    /* optionally send any other header tag */
-    if (http_opt_headers_count) {
-      for (i = 0; i < http_opt_headers_count ; i++) {
-        if (force_host_header != http_opt_headers[i]) {
-          xasprintf (&buf, "%s%s\r\n", buf, http_opt_headers[i]);
-        }
-      }
-      /* This cannot be free'd here because a redirection will then try to access this and segfault */
-      /* Covered in a testcase in tests/check_http.t */
-      /* free(http_opt_headers); */
-    }
-    asprintf (&buf, "%sProxy-Connection: keep-alive\r\n", buf);
-    asprintf (&buf, "%sHost: %s\r\n", buf, host_name);
-    /* we finished our request, send empty line with CRLF */
-    asprintf (&buf, "%s%s", buf, CRLF);
-    if (verbose) printf ("%s\n", buf);
-    send(sd, buf, strlen (buf), 0);
-    buf[0]='\0';
-
-    if (verbose) printf ("Receive response from proxy\n");
-    read (sd, buffer, MAX_INPUT_BUFFER-1);
-    if (verbose) printf ("%s", buffer);
-    /* Here we should check if we got HTTP/1.1 200 Connection established */
-  }
+int check_http(void) {
+        char *msg;
+        char *status_line;
+        char *status_code;
+        char *header;
+        char *page;
+        char *auth;
+        int http_status;
+        int i = 0;
+        size_t pagesize = 0;
+        char *full_page;
+        char *full_page_new;
+        char *buf;
+        char *pos;
+        long microsec = 0L;
+        double elapsed_time = 0.0;
+        long microsec_connect = 0L;
+        double elapsed_time_connect = 0.0;
+        long microsec_ssl = 0L;
+        double elapsed_time_ssl = 0.0;
+        long microsec_firstbyte = 0L;
+        double elapsed_time_firstbyte = 0.0;
+        long microsec_headers = 0L;
+        double elapsed_time_headers = 0.0;
+        long microsec_transfer = 0L;
+        double elapsed_time_transfer = 0.0;
+        int page_len = 0;
+        int result = STATE_OK;
+        char *force_host_header = NULL;
+
+        /* try to connect to the host at the given port number */
+        gettimeofday(&tv_temp, NULL);
+        if (my_tcp_connect(server_address, server_port, &sd) != STATE_OK) {
+                die(STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n"));
+        }
+        microsec_connect = deltime(tv_temp);
+
+        /* if we are called with the -I option, the -j method is CONNECT and */
+        /* we received -S for SSL, then we tunnel the request through a proxy*/
+        /* @20100414, public[at]frank4dd.com, http://www.frank4dd.com/howto  */
+
+        if (server_address != NULL && strcmp(http_method, "CONNECT") == 0 && host_name != NULL &&
+                use_ssl) {
+
+                if (verbose) {
+                        printf("Entering CONNECT tunnel mode with proxy %s:%d to dst %s:%d\n", server_address,
+                                   server_port, host_name, HTTPS_PORT);
+                }
+                asprintf(&buf, "%s %s:%d HTTP/1.1\r\n%s\r\n", http_method, host_name, HTTPS_PORT,
+                                 user_agent);
+                if (strlen(proxy_auth)) {
+                        base64_encode_alloc(proxy_auth, strlen(proxy_auth), &auth);
+                        xasprintf(&buf, "%sProxy-Authorization: Basic %s\r\n", buf, auth);
+                }
+                /* optionally send any other header tag */
+                if (http_opt_headers_count) {
+                        for (i = 0; i < http_opt_headers_count; i++) {
+                                if (force_host_header != http_opt_headers[i]) {
+                                        xasprintf(&buf, "%s%s\r\n", buf, http_opt_headers[i]);
+                                }
+                        }
+                        /* This cannot be free'd here because a redirection will then try to access this and
+                         * segfault */
+                        /* Covered in a testcase in tests/check_http.t */
+                        /* free(http_opt_headers); */
+                }
+                asprintf(&buf, "%sProxy-Connection: keep-alive\r\n", buf);
+                asprintf(&buf, "%sHost: %s\r\n", buf, host_name);
+                /* we finished our request, send empty line with CRLF */
+                asprintf(&buf, "%s%s", buf, CRLF);
+                if (verbose) {
+                        printf("%s\n", buf);
+                }
+                send(sd, buf, strlen(buf), 0);
+                buf[0] = '\0';
+
+                if (verbose) {
+                        printf("Receive response from proxy\n");
+                }
+                read(sd, buffer, MAX_INPUT_BUFFER - 1);
+                if (verbose) {
+                        printf("%s", buffer);
+                }
+                /* Here we should check if we got HTTP/1.1 200 Connection established */
+        }
 #ifdef HAVE_SSL
-  elapsed_time_connect = (double)microsec_connect / 1.0e6;
-  if (use_ssl == true) {
-    gettimeofday (&tv_temp, NULL);
-    result = np_net_ssl_init_with_hostname_version_and_cert(sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey);
-    if (verbose) printf ("SSL initialized\n");
-    if (result != STATE_OK)
-      die (STATE_CRITICAL, NULL);
-    microsec_ssl = deltime (tv_temp);
-    elapsed_time_ssl = (double)microsec_ssl / 1.0e6;
-    if (check_cert == true) {
-      result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
-      if (continue_after_check_cert == false) {
-        if (sd) close(sd);
-        np_net_ssl_cleanup();
-        return result;
-      }
-    }
-  }
+        elapsed_time_connect = (double)microsec_connect / 1.0e6;
+        if (use_ssl) {
+                gettimeofday(&tv_temp, NULL);
+                result = np_net_ssl_init_with_hostname_version_and_cert(
+                        sd, (use_sni ? host_name : NULL), ssl_version, client_cert, client_privkey);
+                if (verbose) {
+                        printf("SSL initialized\n");
+                }
+                if (result != STATE_OK) {
+                        die(STATE_CRITICAL,  _("HTTP CRITICAL - SSL error\n"));
+                }
+                microsec_ssl = deltime(tv_temp);
+                elapsed_time_ssl = (double)microsec_ssl / 1.0e6;
+                if (check_cert) {
+                        result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
+                        if (!continue_after_check_cert) {
+                                if (sd) {
+                                        close(sd);
+                                }
+                                np_net_ssl_cleanup();
+                                return result;
+                        }
+                }
+        }
 #endif /* HAVE_SSL */
 
-  if ( server_address != NULL && strcmp(http_method, "CONNECT") == 0
-       && host_name != NULL && use_ssl == true)
-    asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method_proxy, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
-  else
-    asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
-
-  /* tell HTTP/1.1 servers not to keep the connection alive */
-  xasprintf (&buf, "%sConnection: close\r\n", buf);
-
-  /* check if Host header is explicitly set in options */
-  if (http_opt_headers_count) {
-    for (i = 0; i < http_opt_headers_count ; i++) {
-      if (strncmp(http_opt_headers[i], "Host:", 5) == 0) {
-        force_host_header = http_opt_headers[i];
-      }
-    }
-  }
-
-  /* optionally send the host header info */
-  if (host_name) {
-    if (force_host_header) {
-      xasprintf (&buf, "%s%s\r\n", buf, force_host_header);
-    }
-    else {
-      /*
-       * Specify the port only if we're using a non-default port (see RFC 2616,
-       * 14.23).  Some server applications/configurations cause trouble if the
-       * (default) port is explicitly specified in the "Host:" header line.
-       */
-      if ((use_ssl == false && virtual_port == HTTP_PORT) ||
-          (use_ssl == true && virtual_port == HTTPS_PORT) ||
-          (server_address != NULL && strcmp(http_method, "CONNECT") == 0
-         && host_name != NULL && use_ssl == true))
-        xasprintf (&buf, "%sHost: %s\r\n", buf, host_name);
-      else
-        xasprintf (&buf, "%sHost: %s:%d\r\n", buf, host_name, virtual_port);
-    }
-  }
-
-  /* optionally send any other header tag */
-  if (http_opt_headers_count) {
-    for (i = 0; i < http_opt_headers_count ; i++) {
-      if (force_host_header != http_opt_headers[i]) {
-        xasprintf (&buf, "%s%s\r\n", buf, http_opt_headers[i]);
-      }
-    }
-    /* This cannot be free'd here because a redirection will then try to access this and segfault */
-    /* Covered in a testcase in tests/check_http.t */
-    /* free(http_opt_headers); */
-  }
-
-  /* optionally send the authentication info */
-  if (strlen(user_auth)) {
-    base64_encode_alloc (user_auth, strlen (user_auth), &auth);
-    xasprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth);
-  }
-
-  /* optionally send the proxy authentication info */
-  if (strlen(proxy_auth)) {
-    base64_encode_alloc (proxy_auth, strlen (proxy_auth), &auth);
-    xasprintf (&buf, "%sProxy-Authorization: Basic %s\r\n", buf, auth);
-  }
-
-  /* either send http POST data (any data, not only POST)*/
-  if (http_post_data) {
-    if (http_content_type) {
-      xasprintf (&buf, "%sContent-Type: %s\r\n", buf, http_content_type);
-    } else {
-      xasprintf (&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf);
-    }
-
-    xasprintf (&buf, "%sContent-Length: %i\r\n\r\n", buf, (int)strlen (http_post_data));
-    xasprintf (&buf, "%s%s", buf, http_post_data);
-  } else {
-    /* or just a newline so the server knows we're done with the request */
-    xasprintf (&buf, "%s%s", buf, CRLF);
-  }
-
-  if (verbose) printf ("%s\n", buf);
-  gettimeofday (&tv_temp, NULL);
-  my_send (buf, strlen (buf));
-  microsec_headers = deltime (tv_temp);
-  elapsed_time_headers = (double)microsec_headers / 1.0e6;
-
-  /* fetch the page */
-  full_page = strdup("");
-  gettimeofday (&tv_temp, NULL);
-  while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) {
-    if ((i >= 1) && (elapsed_time_firstbyte <= 0.000001)) {
-      microsec_firstbyte = deltime (tv_temp);
-      elapsed_time_firstbyte = (double)microsec_firstbyte / 1.0e6;
-    }
-    while ((pos = memchr(buffer, '\0', i))) {
-      /* replace nul character with a blank */
-      *pos = ' ';
-    }
-    buffer[i] = '\0';
-
-    if ((full_page_new = realloc(full_page, pagesize + i + 1)) == NULL)
-        die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate memory for full_page\n"));
-
-    memmove(&full_page_new[pagesize], buffer, i + 1);
-
-    full_page = full_page_new;
-
-    pagesize += i;
-
-                if (no_body && document_headers_done (full_page)) {
-                  i = 0;
-                  break;
-                }
-  }
-  microsec_transfer = deltime (tv_temp);
-  elapsed_time_transfer = (double)microsec_transfer / 1.0e6;
-
-  if (i < 0 && errno != ECONNRESET) {
-    die(STATE_CRITICAL, _("HTTP CRITICAL - Error on receive\n"));
-  }
-
-  /* return a CRITICAL status if we couldn't read any data */
-  if (pagesize == (size_t) 0)
-    die (STATE_CRITICAL, _("HTTP CRITICAL - No data received from host\n"));
-
-  /* close the connection */
-  if (sd) close(sd);
+        if (server_address != NULL && strcmp(http_method, "CONNECT") == 0 && host_name != NULL &&
+                use_ssl) {
+                asprintf(&buf, "%s %s %s\r\n%s\r\n", http_method_proxy, server_url,
+                                 host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
+        } else {
+                asprintf(&buf, "%s %s %s\r\n%s\r\n", http_method, server_url,
+                                 host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent);
+        }
+
+        /* tell HTTP/1.1 servers not to keep the connection alive */
+        xasprintf(&buf, "%sConnection: close\r\n", buf);
+
+        /* check if Host header is explicitly set in options */
+        if (http_opt_headers_count) {
+                for (i = 0; i < http_opt_headers_count; i++) {
+                        if (strncmp(http_opt_headers[i], "Host:", 5) == 0) {
+                                force_host_header = http_opt_headers[i];
+                        }
+                }
+        }
+
+        /* optionally send the host header info */
+        if (host_name) {
+                if (force_host_header) {
+                        xasprintf(&buf, "%s%s\r\n", buf, force_host_header);
+                } else {
+                        /*
+                         * Specify the port only if we're using a non-default port (see RFC 2616,
+                         * 14.23).  Some server applications/configurations cause trouble if the
+                         * (default) port is explicitly specified in the "Host:" header line.
+                         */
+                        if ((!use_ssl && virtual_port == HTTP_PORT) ||
+                                (use_ssl && virtual_port == HTTPS_PORT) ||
+                                (server_address != NULL && strcmp(http_method, "CONNECT") == 0 &&
+                                 host_name != NULL && use_ssl)) {
+                                xasprintf(&buf, "%sHost: %s\r\n", buf, host_name);
+                        } else {
+                                xasprintf(&buf, "%sHost: %s:%d\r\n", buf, host_name, virtual_port);
+                        }
+                }
+        }
+
+        /* optionally send any other header tag */
+        if (http_opt_headers_count) {
+                for (i = 0; i < http_opt_headers_count; i++) {
+                        if (force_host_header != http_opt_headers[i]) {
+                                xasprintf(&buf, "%s%s\r\n", buf, http_opt_headers[i]);
+                        }
+                }
+                /* This cannot be free'd here because a redirection will then try to access this and
+                 * segfault */
+                /* Covered in a testcase in tests/check_http.t */
+                /* free(http_opt_headers); */
+        }
+
+        /* optionally send the authentication info */
+        if (strlen(user_auth)) {
+                base64_encode_alloc(user_auth, strlen(user_auth), &auth);
+                xasprintf(&buf, "%sAuthorization: Basic %s\r\n", buf, auth);
+        }
+
+        /* optionally send the proxy authentication info */
+        if (strlen(proxy_auth)) {
+                base64_encode_alloc(proxy_auth, strlen(proxy_auth), &auth);
+                xasprintf(&buf, "%sProxy-Authorization: Basic %s\r\n", buf, auth);
+        }
+
+        /* either send http POST data (any data, not only POST)*/
+        if (http_post_data) {
+                if (http_content_type) {
+                        xasprintf(&buf, "%sContent-Type: %s\r\n", buf, http_content_type);
+                } else {
+                        xasprintf(&buf, "%sContent-Type: application/x-www-form-urlencoded\r\n", buf);
+                }
+
+                xasprintf(&buf, "%sContent-Length: %i\r\n\r\n", buf, (int)strlen(http_post_data));
+                xasprintf(&buf, "%s%s", buf, http_post_data);
+        } else {
+                /* or just a newline so the server knows we're done with the request */
+                xasprintf(&buf, "%s%s", buf, CRLF);
+        }
+
+        if (verbose) {
+                printf("%s\n", buf);
+        }
+        gettimeofday(&tv_temp, NULL);
+        my_send(buf, strlen(buf));
+        microsec_headers = deltime(tv_temp);
+        elapsed_time_headers = (double)microsec_headers / 1.0e6;
+
+        /* fetch the page */
+        full_page = strdup("");
+        gettimeofday(&tv_temp, NULL);
+        while ((i = my_recv(buffer, MAX_INPUT_BUFFER - 1)) > 0) {
+                if ((i >= 1) && (elapsed_time_firstbyte <= 0.000001)) {
+                        microsec_firstbyte = deltime(tv_temp);
+                        elapsed_time_firstbyte = (double)microsec_firstbyte / 1.0e6;
+                }
+                while ((pos = memchr(buffer, '\0', i))) {
+                        /* replace nul character with a blank */
+                        *pos = ' ';
+                }
+                buffer[i] = '\0';
+
+                if ((full_page_new = realloc(full_page, pagesize + i + 1)) == NULL) {
+                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate memory for full_page\n"));
+                }
+
+                memmove(&full_page_new[pagesize], buffer, i + 1);
+
+                full_page = full_page_new;
+
+                pagesize += i;
+
+                if (no_body && document_headers_done(full_page)) {
+                        i = 0;
+                        break;
+                }
+        }
+        microsec_transfer = deltime(tv_temp);
+        elapsed_time_transfer = (double)microsec_transfer / 1.0e6;
+
+        if (i < 0 && errno != ECONNRESET) {
+                die(STATE_CRITICAL, _("HTTP CRITICAL - Error on receive\n"));
+        }
+
+        /* return a CRITICAL status if we couldn't read any data */
+        if (pagesize == (size_t)0) {
+                die(STATE_CRITICAL, _("HTTP CRITICAL - No data received from host\n"));
+        }
+
+        /* close the connection */
+        if (sd) {
+                close(sd);
+        }
 #ifdef HAVE_SSL
-  np_net_ssl_cleanup();
+        np_net_ssl_cleanup();
 #endif
 
-  /* Save check time */
-  microsec = deltime (tv);
-  elapsed_time = (double)microsec / 1.0e6;
-
-  /* leave full_page untouched so we can free it later */
-  page = full_page;
-
-  if (verbose)
-    printf ("%s://%s:%d%s is %d characters\n",
-      use_ssl ? "https" : "http", server_address,
-      server_port, server_url, (int)pagesize);
-
-  /* find status line and null-terminate it */
-  status_line = page;
-  page += (size_t) strcspn (page, "\r\n");
-  pos = page;
-  page += (size_t) strspn (page, "\r\n");
-  status_line[strcspn(status_line, "\r\n")] = 0;
-  strip (status_line);
-  if (verbose)
-    printf ("STATUS: %s\n", status_line);
-
-  /* find header info and null-terminate it */
-  header = page;
-  while (strcspn (page, "\r\n") > 0) {
-    page += (size_t) strcspn (page, "\r\n");
-    pos = page;
-    if ((strspn (page, "\r") == 1 && strspn (page, "\r\n") >= 2) ||
-        (strspn (page, "\n") == 1 && strspn (page, "\r\n") >= 2))
-      page += (size_t) 2;
-    else
-      page += (size_t) 1;
-  }
-  page += (size_t) strspn (page, "\r\n");
-  header[pos - header] = 0;
-  if (verbose)
-    printf ("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header,
-                (no_body ? "  [[ skipped ]]" : page));
-
-  /* make sure the status line matches the response we are looking for */
-  if (!expected_statuscode (status_line, server_expect)) {
-    if (server_port == HTTP_PORT)
-      xasprintf (&msg,
-                _("Invalid HTTP response received from host: %s\n"),
-                status_line);
-    else
-      xasprintf (&msg,
-                _("Invalid HTTP response received from host on port %d: %s\n"),
-                server_port, status_line);
-    if (show_body)
-        xasprintf (&msg, _("%s\n%s"), msg, page);
-    die (STATE_CRITICAL, "HTTP CRITICAL - %s", msg);
-  }
-
-  /* Bypass normal status line check if server_expect was set by user and not default */
-  /* NOTE: After this if/else block msg *MUST* be an asprintf-allocated string */
-  if ( server_expect_yn  )  {
-    xasprintf (&msg,
-              _("Status line output matched \"%s\" - "), server_expect);
-    if (verbose)
-      printf ("%s\n",msg);
-  }
-  else {
-    /* Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF */
-    /* HTTP-Version   = "HTTP" "/" 1*DIGIT "." 1*DIGIT */
-    /* Status-Code = 3 DIGITS */
-
-    status_code = strchr (status_line, ' ') + sizeof (char);
-    if (strspn (status_code, "1234567890") != 3)
-      die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status Line (%s)\n"), status_line);
-
-    http_status = atoi (status_code);
-
-    /* check the return code */
-
-    if (http_status >= 600 || http_status < 100) {
-      die (STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%s)\n"), status_line);
-    }
-    /* server errors result in a critical state */
-    else if (http_status >= 500) {
-      xasprintf (&msg, _("%s - "), status_line);
-      result = STATE_CRITICAL;
-    }
-    /* client errors result in a warning state */
-    else if (http_status >= 400) {
-      xasprintf (&msg, _("%s - "), status_line);
-      result = max_state_alt(STATE_WARNING, result);
-    }
-    /* check redirected page if specified */
-    else if (http_status >= 300) {
-
-      if (onredirect == STATE_DEPENDENT)
-        redir (header, status_line);
-      else
-        result = max_state_alt(onredirect, result);
-      xasprintf (&msg, _("%s - "), status_line);
-    } /* end if (http_status >= 300) */
-    else {
-      /* Print OK status anyway */
-      xasprintf (&msg, _("%s - "), status_line);
-    }
-
-  } /* end else (server_expect_yn)  */
-
-  /* reset the alarm - must be called *after* redir or we'll never die on redirects! */
-  alarm (0);
-
-  if (maximum_age >= 0) {
-    result = max_state_alt(check_document_dates(header, &msg), result);
-  }
-
-  /* Page and Header content checks go here */
-  if (strlen(header_expect) > 0) {
-    if (strstr(header, header_expect) == NULL) {
-      // We did not find the header, the rest is for building the output and setting the state
-      char output_header_search[30] = "";
-
-      strncpy(&output_header_search[0], header_expect,
-              sizeof(output_header_search));
-
-      if (output_header_search[sizeof(output_header_search) - 1] != '\0') {
-        bcopy("...",
-            &output_header_search[sizeof(output_header_search) - 4],
-            4);
-      }
-
-      xasprintf (&msg,
-          _("%sheader '%s' not found on '%s://%s:%d%s', "),
-          msg,
-          output_header_search, use_ssl ? "https" : "http",
-          host_name ? host_name : server_address, server_port,
-          server_url);
-
-      result = STATE_CRITICAL;
-    }
-  }
-
-  // At this point we should test if the content is chunked and unchunk it, so
-  // it can be searched (and possibly printed)
-  const char *chunked_header_regex_string = "Transfer-Encoding: *chunked *";
-  regex_t chunked_header_regex;
-
-  if (regcomp(&chunked_header_regex, chunked_header_regex_string, REG_ICASE)) {
-    die(STATE_UNKNOWN, "HTTP %s: %s\n", state_text(STATE_UNKNOWN), "Failed to compile chunked_header_regex regex");
-  }
-
-  regmatch_t chre_pmatch[1]; // We actually do not care about this, since we only want to know IF it was found
-
-  if (!no_body && regexec(&chunked_header_regex, header, 1, chre_pmatch, 0) == 0) {
-    if (verbose) {
-      printf("Found chunked content\n");
-    }
-    // We actually found the chunked header
-    char *tmp = unchunk_content(page);
-    if (tmp == NULL) {
-      die(STATE_UNKNOWN, "HTTP %s: %s\n", state_text(STATE_UNKNOWN), "Failed to unchunk message body");
-    }
-    page = tmp;
-  }
-
-  if (strlen(string_expect) > 0) {
-    if (!strstr(page, string_expect)) {
-      // We found the string the body, the rest is for building the output
-      char output_string_search[30] = "";
-      strncpy(&output_string_search[0], string_expect,
-              sizeof(output_string_search));
-      if (output_string_search[sizeof(output_string_search) - 1] != '\0') {
-        bcopy("...", &output_string_search[sizeof(output_string_search) - 4],
-              4);
-      }
-      xasprintf (&msg, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg, output_string_search, use_ssl ? "https" : "http", host_name ? host_name : server_address, server_port, server_url);
-      result = STATE_CRITICAL;
-    }
-  }
-
-  if (strlen(regexp) > 0) {
-    errcode = regexec(&preg, page, REGS, pmatch, 0);
-    if ((errcode == 0 && invert_regex == 0) ||
-        (errcode == REG_NOMATCH && invert_regex == 1)) {
-      /* OK - No-op to avoid changing the logic around it */
-      result = max_state_alt(STATE_OK, result);
-    }
-    else if ((errcode == REG_NOMATCH && invert_regex == 0) || (errcode == 0 && invert_regex == 1)) {
-      if (invert_regex == 0)
-        xasprintf (&msg, _("%spattern not found, "), msg);
-      else
-        xasprintf (&msg, _("%spattern found, "), msg);
-      result = state_regex;
-    }
-    else {
-      /* FIXME: Shouldn't that be UNKNOWN? */
-      regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-      xasprintf (&msg, _("%sExecute Error: %s, "), msg, errbuf);
-      result = STATE_CRITICAL;
-    }
-  }
-
-  /* make sure the page is of an appropriate size */
-  /* page_len = get_content_length(header); */
-  /* FIXME: Will this work with -N ? IMHO we should use
-   * get_content_length(header) and always check if it's different than the
-   * returned pagesize
-   */
-  /* FIXME: IIRC pagesize returns headers - shouldn't we make
-   * it == get_content_length(header) ??
-   */
-  page_len = pagesize;
-  if ((max_page_len > 0) && (page_len > max_page_len)) {
-    xasprintf (&msg, _("%spage size %d too large, "), msg, page_len);
-    result = max_state_alt(STATE_WARNING, result);
-  } else if ((min_page_len > 0) && (page_len < min_page_len)) {
-    xasprintf (&msg, _("%spage size %d too small, "), msg, page_len);
-    result = max_state_alt(STATE_WARNING, result);
-  }
-
-  /* Cut-off trailing characters */
-  if(msg[strlen(msg)-2] == ',')
-    msg[strlen(msg)-2] = '\0';
-  else
-    msg[strlen(msg)-3] = '\0';
-
-  /* check elapsed time */
-  if (show_extended_perfdata)
-    xasprintf (&msg,
-           _("%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s"),
-           msg, page_len, elapsed_time,
-           (display_html ? "</A>" : ""),
-           perfd_time (elapsed_time),
-           perfd_size (page_len),
-           perfd_time_connect (elapsed_time_connect),
-           use_ssl == true ? perfd_time_ssl (elapsed_time_ssl) : "",
-           perfd_time_headers (elapsed_time_headers),
-           perfd_time_firstbyte (elapsed_time_firstbyte),
-           perfd_time_transfer (elapsed_time_transfer));
-  else
-    xasprintf (&msg,
-           _("%s - %d bytes in %.3f second response time %s|%s %s"),
-           msg, page_len, elapsed_time,
-           (display_html ? "</A>" : ""),
-           perfd_time (elapsed_time),
-           perfd_size (page_len));
-
-  if (show_body)
-    xasprintf (&msg, _("%s\n%s"), msg, page);
-
-  result = max_state_alt(get_status(elapsed_time, thlds), result);
-
-  die (result, "HTTP %s: %s\n", state_text(result), msg);
-  /* die failed? */
-  return STATE_UNKNOWN;
+        /* Save check time */
+        microsec = deltime(tv);
+        elapsed_time = (double)microsec / 1.0e6;
+
+        /* leave full_page untouched so we can free it later */
+        page = full_page;
+
+        if (verbose) {
+                printf("%s://%s:%d%s is %d characters\n", use_ssl ? "https" : "http", server_address,
+                           server_port, server_url, (int)pagesize);
+        }
+
+        /* find status line and null-terminate it */
+        status_line = page;
+        page += (size_t)strcspn(page, "\r\n");
+        pos = page;
+        page += (size_t)strspn(page, "\r\n");
+        status_line[strcspn(status_line, "\r\n")] = 0;
+        strip(status_line);
+        if (verbose) {
+                printf("STATUS: %s\n", status_line);
+        }
+
+        /* find header info and null-terminate it */
+        header = page;
+        while (strcspn(page, "\r\n") > 0) {
+                page += (size_t)strcspn(page, "\r\n");
+                pos = page;
+                if ((strspn(page, "\r") == 1 && strspn(page, "\r\n") >= 2) ||
+                        (strspn(page, "\n") == 1 && strspn(page, "\r\n") >= 2)) {
+                        page += (size_t)2;
+                } else {
+                        page += (size_t)1;
+                }
+        }
+        page += (size_t)strspn(page, "\r\n");
+        header[pos - header] = 0;
+        if (verbose) {
+                printf("**** HEADER ****\n%s\n**** CONTENT ****\n%s\n", header,
+                           (no_body ? "  [[ skipped ]]" : page));
+        }
+
+        /* make sure the status line matches the response we are looking for */
+        if (!expected_statuscode(status_line, server_expect)) {
+                if (server_port == HTTP_PORT) {
+                        xasprintf(&msg, _("Invalid HTTP response received from host: %s\n"), status_line);
+                } else {
+                        xasprintf(&msg, _("Invalid HTTP response received from host on port %d: %s\n"),
+                                          server_port, status_line);
+                }
+                if (show_body) {
+                        xasprintf(&msg, _("%s\n%s"), msg, page);
+                }
+                die(STATE_CRITICAL, "HTTP CRITICAL - %s", msg);
+        }
+
+        /* Bypass normal status line check if server_expect was set by user and not default */
+        /* NOTE: After this if/else block msg *MUST* be an asprintf-allocated string */
+        if (server_expect_yn) {
+                xasprintf(&msg, _("Status line output matched \"%s\" - "), server_expect);
+                if (verbose) {
+                        printf("%s\n", msg);
+                }
+        } else {
+                /* Status-Line = HTTP-Version SP Status-Code SP Reason-Phrase CRLF */
+                /* HTTP-Version   = "HTTP" "/" 1*DIGIT "." 1*DIGIT */
+                /* Status-Code = 3 DIGITS */
+
+                status_code = strchr(status_line, ' ') + sizeof(char);
+                if (strspn(status_code, "1234567890") != 3) {
+                        die(STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status Line (%s)\n"), status_line);
+                }
+
+                http_status = atoi(status_code);
+
+                /* check the return code */
+
+                if (http_status >= 600 || http_status < 100) {
+                        die(STATE_CRITICAL, _("HTTP CRITICAL: Invalid Status (%s)\n"), status_line);
+                }
+                /* server errors result in a critical state */
+                else if (http_status >= 500) {
+                        xasprintf(&msg, _("%s - "), status_line);
+                        result = STATE_CRITICAL;
+                }
+                /* client errors result in a warning state */
+                else if (http_status >= 400) {
+                        xasprintf(&msg, _("%s - "), status_line);
+                        result = max_state_alt(STATE_WARNING, result);
+                }
+                /* check redirected page if specified */
+                else if (http_status >= 300) {
+
+                        if (onredirect == STATE_DEPENDENT) {
+                                redir(header, status_line);
+                        } else {
+                                result = max_state_alt(onredirect, result);
+                        }
+                        xasprintf(&msg, _("%s - "), status_line);
+                } /* end if (http_status >= 300) */
+                else {
+                        /* Print OK status anyway */
+                        xasprintf(&msg, _("%s - "), status_line);
+                }
+
+        } /* end else (server_expect_yn)  */
+
+        /* reset the alarm - must be called *after* redir or we'll never die on redirects! */
+        alarm(0);
+
+        if (maximum_age >= 0) {
+                result = max_state_alt(check_document_dates(header, &msg), result);
+        }
+
+        /* Page and Header content checks go here */
+        if (strlen(header_expect) > 0) {
+                if (strstr(header, header_expect) == NULL) {
+                        // We did not find the header, the rest is for building the output and setting the state
+                        char output_header_search[30] = "";
+
+                        strncpy(&output_header_search[0], header_expect, sizeof(output_header_search));
+
+                        if (output_header_search[sizeof(output_header_search) - 1] != '\0') {
+                                bcopy("...", &output_header_search[sizeof(output_header_search) - 4], 4);
+                        }
+
+                        xasprintf(&msg, _("%sheader '%s' not found on '%s://%s:%d%s', "), msg,
+                                          output_header_search, use_ssl ? "https" : "http",
+                                          host_name ? host_name : server_address, server_port, server_url);
+
+                        result = STATE_CRITICAL;
+                }
+        }
+
+        // At this point we should test if the content is chunked and unchunk it, so
+        // it can be searched (and possibly printed)
+        const char *chunked_header_regex_string = "Transfer-Encoding: *chunked *";
+        regex_t chunked_header_regex;
+
+        if (regcomp(&chunked_header_regex, chunked_header_regex_string, REG_ICASE)) {
+                die(STATE_UNKNOWN, "HTTP %s: %s\n", state_text(STATE_UNKNOWN),
+                        "Failed to compile chunked_header_regex regex");
+        }
+
+        regmatch_t chre_pmatch[1]; // We actually do not care about this, since we only want to know IF
+                                                           // it was found
+
+        if (!no_body && regexec(&chunked_header_regex, header, 1, chre_pmatch, 0) == 0) {
+                if (verbose) {
+                        printf("Found chunked content\n");
+                }
+                // We actually found the chunked header
+                char *tmp = unchunk_content(page);
+                if (tmp == NULL) {
+                        die(STATE_UNKNOWN, "HTTP %s: %s\n", state_text(STATE_UNKNOWN),
+                                "Failed to unchunk message body");
+                }
+                page = tmp;
+        }
+
+        if (strlen(string_expect) > 0) {
+                if (!strstr(page, string_expect)) {
+                        // We found the string the body, the rest is for building the output
+                        char output_string_search[30] = "";
+                        strncpy(&output_string_search[0], string_expect, sizeof(output_string_search));
+                        if (output_string_search[sizeof(output_string_search) - 1] != '\0') {
+                                bcopy("...", &output_string_search[sizeof(output_string_search) - 4], 4);
+                        }
+                        xasprintf(&msg, _("%sstring '%s' not found on '%s://%s:%d%s', "), msg,
+                                          output_string_search, use_ssl ? "https" : "http",
+                                          host_name ? host_name : server_address, server_port, server_url);
+                        result = STATE_CRITICAL;
+                }
+        }
+
+        if (strlen(regexp) > 0) {
+                errcode = regexec(&preg, page, REGS, pmatch, 0);
+                if ((errcode == 0 && invert_regex == 0) || (errcode == REG_NOMATCH && invert_regex == 1)) {
+                        /* OK - No-op to avoid changing the logic around it */
+                        result = max_state_alt(STATE_OK, result);
+                } else if ((errcode == REG_NOMATCH && invert_regex == 0) ||
+                                   (errcode == 0 && invert_regex == 1)) {
+                        if (invert_regex == 0) {
+                                xasprintf(&msg, _("%spattern not found, "), msg);
+                        } else {
+                                xasprintf(&msg, _("%spattern found, "), msg);
+                        }
+                        result = state_regex;
+                } else {
+                        /* FIXME: Shouldn't that be UNKNOWN? */
+                        regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                        xasprintf(&msg, _("%sExecute Error: %s, "), msg, errbuf);
+                        result = STATE_CRITICAL;
+                }
+        }
+
+        /* make sure the page is of an appropriate size */
+        /* page_len = get_content_length(header); */
+        /* FIXME: Will this work with -N ? IMHO we should use
+         * get_content_length(header) and always check if it's different than the
+         * returned pagesize
+         */
+        /* FIXME: IIRC pagesize returns headers - shouldn't we make
+         * it == get_content_length(header) ??
+         */
+        page_len = pagesize;
+        if ((max_page_len > 0) && (page_len > max_page_len)) {
+                xasprintf(&msg, _("%spage size %d too large, "), msg, page_len);
+                result = max_state_alt(STATE_WARNING, result);
+        } else if ((min_page_len > 0) && (page_len < min_page_len)) {
+                xasprintf(&msg, _("%spage size %d too small, "), msg, page_len);
+                result = max_state_alt(STATE_WARNING, result);
+        }
+
+        /* Cut-off trailing characters */
+        if (msg[strlen(msg) - 2] == ',') {
+                msg[strlen(msg) - 2] = '\0';
+        } else {
+                msg[strlen(msg) - 3] = '\0';
+        }
+
+        /* check elapsed time */
+        if (show_extended_perfdata) {
+                xasprintf(
+                        &msg, _("%s - %d bytes in %.3f second response time %s|%s %s %s %s %s %s %s"), msg,
+                        page_len, elapsed_time, (display_html ? "</A>" : ""), perfd_time(elapsed_time),
+                        perfd_size(page_len), perfd_time_connect(elapsed_time_connect),
+                        use_ssl ? perfd_time_ssl(elapsed_time_ssl) : "",
+                        perfd_time_headers(elapsed_time_headers), perfd_time_firstbyte(elapsed_time_firstbyte),
+                        perfd_time_transfer(elapsed_time_transfer));
+        } else {
+                xasprintf(&msg, _("%s - %d bytes in %.3f second response time %s|%s %s"), msg, page_len,
+                                  elapsed_time, (display_html ? "</A>" : ""), perfd_time(elapsed_time),
+                                  perfd_size(page_len));
+        }
+
+        if (show_body) {
+                xasprintf(&msg, _("%s\n%s"), msg, page);
+        }
+
+        result = max_state_alt(get_status(elapsed_time, thlds), result);
+
+        die(result, "HTTP %s: %s\n", state_text(result), msg);
+        /* die failed? */
+        return STATE_UNKNOWN;
 }
 
 /* Receivces a pointer to the beginning of the body of a HTTP message
@@ -1398,94 +1445,95 @@ check_http (void)
  * The result must be freed by the caller.
  */
 char *unchunk_content(const char *content) {
-  // https://en.wikipedia.org/wiki/Chunked_transfer_encoding
-  // https://www.rfc-editor.org/rfc/rfc7230#section-4.1
-  char *result = NULL;
-  char *start_of_chunk;
-  char* end_of_chunk;
-  long size_of_chunk;
-  const char *pointer = content;
-  char *endptr;
-  long length_of_chunk = 0;
-  size_t overall_size = 0;
-
-  while (true) {
-    size_of_chunk = strtol(pointer, &endptr, 16);
-    if (size_of_chunk == LONG_MIN || size_of_chunk == LONG_MAX) {
-      // Apparently underflow or overflow, should not happen
-      if (verbose) {
-        printf("Got an underflow or overflow from strtol at: %u\n", __LINE__);
-      }
-      return NULL;
-    }
-    if (endptr == pointer) {
-      // Apparently this was not a number
-      if (verbose) {
-        printf("Chunked content did not start with a number at all (Line: %u)\n", __LINE__);
-      }
-      return NULL;
-    }
-
-    // So, we got the length of the chunk
-    if (*endptr == ';') {
-      // Chunk extension starts here
-      while (*endptr != '\r') {
-        endptr++;
-      }
-    }
-
-    start_of_chunk = endptr + 2;
-    end_of_chunk = start_of_chunk + size_of_chunk;
-    length_of_chunk = (long)(end_of_chunk - start_of_chunk);
-    pointer = end_of_chunk + 2; //Next number should be here
-
-    if (length_of_chunk == 0) {
-      // Chunk length is 0, so this is the last one
-      break;
-    }
-
-    overall_size += length_of_chunk;
-
-    if (result == NULL) {
-      // Size of the chunk plus the ending NULL byte
-      result = (char *)malloc(length_of_chunk +1);
-      if (result == NULL) {
-        if (verbose) {
-          printf("Failed to allocate memory for unchunked body\n");
-        }
-        return NULL;
-      }
-    } else {
-      // Enlarge memory to the new size plus the ending NULL byte
-      void *tmp = realloc(result, overall_size +1);
-      if (tmp == NULL) {
-        if (verbose) {
-          printf("Failed to allocate memory for unchunked body\n");
-        }
-        return NULL;
-      } else {
-        result = tmp;
-      }
-    }
-
-    memcpy(result + (overall_size - size_of_chunk), start_of_chunk, size_of_chunk);
-  }
-
-  if (overall_size == 0 && result == NULL) {
-    // We might just have received the end chunk without previous content, so result is never allocated
-    result = calloc(1, sizeof(char));
-    // No error handling here, we can only return NULL anyway
-  } else {
-    result[overall_size] = '\0';
-  }
-  return result;
+        // https://en.wikipedia.org/wiki/Chunked_transfer_encoding
+        // https://www.rfc-editor.org/rfc/rfc7230#section-4.1
+        char *result = NULL;
+        char *start_of_chunk;
+        char *end_of_chunk;
+        long size_of_chunk;
+        const char *pointer = content;
+        char *endptr;
+        long length_of_chunk = 0;
+        size_t overall_size = 0;
+
+        while (true) {
+                size_of_chunk = strtol(pointer, &endptr, 16);
+                if (size_of_chunk == LONG_MIN || size_of_chunk == LONG_MAX) {
+                        // Apparently underflow or overflow, should not happen
+                        if (verbose) {
+                                printf("Got an underflow or overflow from strtol at: %u\n", __LINE__);
+                        }
+                        return NULL;
+                }
+                if (endptr == pointer) {
+                        // Apparently this was not a number
+                        if (verbose) {
+                                printf("Chunked content did not start with a number at all (Line: %u)\n", __LINE__);
+                        }
+                        return NULL;
+                }
+
+                // So, we got the length of the chunk
+                if (*endptr == ';') {
+                        // Chunk extension starts here
+                        while (*endptr != '\r') {
+                                endptr++;
+                        }
+                }
+
+                start_of_chunk = endptr + 2;
+                end_of_chunk = start_of_chunk + size_of_chunk;
+                length_of_chunk = (long)(end_of_chunk - start_of_chunk);
+                pointer = end_of_chunk + 2; // Next number should be here
+
+                if (length_of_chunk == 0) {
+                        // Chunk length is 0, so this is the last one
+                        break;
+                }
+
+                overall_size += length_of_chunk;
+
+                if (result == NULL) {
+                        // Size of the chunk plus the ending NULL byte
+                        result = (char *)malloc(length_of_chunk + 1);
+                        if (result == NULL) {
+                                if (verbose) {
+                                        printf("Failed to allocate memory for unchunked body\n");
+                                }
+                                return NULL;
+                        }
+                } else {
+                        // Enlarge memory to the new size plus the ending NULL byte
+                        void *tmp = realloc(result, overall_size + 1);
+                        if (tmp == NULL) {
+                                if (verbose) {
+                                        printf("Failed to allocate memory for unchunked body\n");
+                                }
+                                return NULL;
+                        }
+                        result = tmp;
+                }
+
+                memcpy(result + (overall_size - size_of_chunk), start_of_chunk, size_of_chunk);
+        }
+
+        if (overall_size == 0 && result == NULL) {
+                // We might just have received the end chunk without previous content, so result is never
+                // allocated
+                result = calloc(1, sizeof(char));
+                // No error handling here, we can only return NULL anyway
+        } else {
+                result[overall_size] = '\0';
+        }
+        return result;
 }
 
 /* per RFC 2396 */
 #define URI_HTTP "%5[HTPShtps]"
 #define URI_HOST "%255[-.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"
 #define URI_PORT "%6d" /* MAX_PORT's width is 5 chars, 6 to detect overflow */
-#define URI_PATH "%[-_.!~*'();/?:@&=+$,%#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"
+#define URI_PATH                                                                                   \
+        "%[-_.!~*'();/?:@&=+$,%#abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789]"
 #define HD1 URI_HTTP "://" URI_HOST ":" URI_PORT "/" URI_PATH
 #define HD2 URI_HTTP "://" URI_HOST "/" URI_PATH
 #define HD3 URI_HTTP "://" URI_HOST ":" URI_PORT
@@ -1494,414 +1542,431 @@ char *unchunk_content(const char *content) {
 #define HD5 "//" URI_HOST "/" URI_PATH
 #define HD6 URI_PATH
 
-void
-redir (char *pos, char *status_line)
-{
-  int i = 0;
-  char *x;
-  char xx[2];
-  char type[6];
-  char *addr;
-  char *url;
-
-  addr = malloc (MAX_IPV4_HOSTLENGTH + 1);
-  if (addr == NULL)
-    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate addr\n"));
-
-  memset(addr, 0, MAX_IPV4_HOSTLENGTH);
-  url = malloc (strcspn (pos, "\r\n"));
-  if (url == NULL)
-    die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
-
-  while (pos) {
-    sscanf (pos, "%1[Ll]%*1[Oo]%*1[Cc]%*1[Aa]%*1[Tt]%*1[Ii]%*1[Oo]%*1[Nn]:%n", xx, &i);
-    if (i == 0) {
-      pos += (size_t) strcspn (pos, "\r\n");
-      pos += (size_t) strspn (pos, "\r\n");
-      if (strlen(pos) == 0)
-        die (STATE_UNKNOWN,
-             _("HTTP UNKNOWN - Could not find redirect location - %s%s\n"),
-             status_line, (display_html ? "</A>" : ""));
-      continue;
-    }
-
-    pos += i;
-    pos += strspn (pos, " \t");
-
-    /*
-     * RFC 2616 (4.2):  ``Header fields can be extended over multiple lines by
-     * preceding each extra line with at least one SP or HT.''
-     */
-    for (; (i = strspn (pos, "\r\n")); pos += i) {
-      pos += i;
-      if (!(i = strspn (pos, " \t"))) {
-        die (STATE_UNKNOWN, _("HTTP UNKNOWN - Empty redirect location%s\n"),
-             display_html ? "</A>" : "");
-      }
-    }
-
-    url = realloc (url, strcspn (pos, "\r\n") + 1);
-    if (url == NULL)
-      die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
-
-    /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
-    if (sscanf (pos, HD1, type, addr, &i, url) == 4) {
-      url = prepend_slash (url);
-      use_ssl = server_type_check (type);
-    }
-
-    /* URI_HTTP URI_HOST URI_PATH */
-    else if (sscanf (pos, HD2, type, addr, url) == 3 ) {
-      url = prepend_slash (url);
-      use_ssl = server_type_check (type);
-      i = server_port_check (use_ssl);
-    }
-
-    /* URI_HTTP URI_HOST URI_PORT */
-    else if (sscanf (pos, HD3, type, addr, &i) == 3) {
-      strcpy (url, HTTP_URL);
-      use_ssl = server_type_check (type);
-    }
-
-    /* URI_HTTP URI_HOST */
-    else if (sscanf (pos, HD4, type, addr) == 2) {
-      strcpy (url, HTTP_URL);
-      use_ssl = server_type_check (type);
-      i = server_port_check (use_ssl);
-    }
-    /* URI_HTTP, URI_HOST, URI_PATH */
-    else if (sscanf (pos, HD5, addr, url) == 2) {
-      if(use_ssl){
-        strcpy (type,"https");
-      }
-      else{
-         strcpy (type, server_type);
-      }
-      xasprintf (&url, "/%s", url);
-      use_ssl = server_type_check (type);
-      i = server_port_check (use_ssl);
-    }
-
-    /* URI_PATH */
-    else if (sscanf (pos, HD6, url) == 1) {
-      /* relative url */
-      if ((url[0] != '/')) {
-        if ((x = strrchr(server_url, '/')))
-          *x = '\0';
-        xasprintf (&url, "%s/%s", server_url, url);
-      }
-      i = server_port;
-      strcpy (type, server_type);
-      strcpy (addr, host_name ? host_name : server_address);
-    }
-
-    else {
-      die (STATE_UNKNOWN,
-           _("HTTP UNKNOWN - Could not parse redirect location - %s%s\n"),
-           pos, (display_html ? "</A>" : ""));
-    }
-
-    break;
-
-  } /* end while (pos) */
-
-  if (++redir_depth > max_depth)
-    die (STATE_WARNING,
-         _("HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"),
-         max_depth, type, addr, i, url, (display_html ? "</A>" : ""));
-
-  if (server_port==i &&
-      !strncmp(server_address, addr, MAX_IPV4_HOSTLENGTH) &&
-      (host_name && !strncmp(host_name, addr, MAX_IPV4_HOSTLENGTH)) &&
-      !strcmp(server_url, url))
-    die (STATE_CRITICAL,
-         _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"),
-         type, addr, i, url, (display_html ? "</A>" : ""));
-
-  strcpy (server_type, type);
-
-  free (host_name);
-  host_name = strndup (addr, MAX_IPV4_HOSTLENGTH);
-
-  if (!(followsticky & STICKY_HOST)) {
-    free (server_address);
-    server_address = strndup (addr, MAX_IPV4_HOSTLENGTH);
-  }
-  if (!(followsticky & STICKY_PORT)) {
-    server_port = i;
-  }
-
-  free (server_url);
-  server_url = url;
-
-  if (server_port > MAX_PORT)
-    die (STATE_UNKNOWN,
-         _("HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"),
-         MAX_PORT, server_type, server_address, server_port, server_url,
-         display_html ? "</A>" : "");
-
-  /* reset virtual port */
-  virtual_port = server_port;
-
-  if (verbose)
-    printf (_("Redirection to %s://%s:%d%s\n"), server_type,
-            host_name ? host_name : server_address, server_port, server_url);
-
-  free(addr);
-  check_http ();
-}
+void redir(char *pos, char *status_line) {
+        int i = 0;
+        char *x;
+        char xx[2];
+        char type[6];
+        char *addr;
+        char *url;
+
+        addr = malloc(MAX_IPV4_HOSTLENGTH + 1);
+        if (addr == NULL) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate addr\n"));
+        }
+
+        memset(addr, 0, MAX_IPV4_HOSTLENGTH);
+        url = malloc(strcspn(pos, "\r\n"));
+        if (url == NULL) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+        }
+
+        while (pos) {
+                sscanf(pos, "%1[Ll]%*1[Oo]%*1[Cc]%*1[Aa]%*1[Tt]%*1[Ii]%*1[Oo]%*1[Nn]:%n", xx, &i);
+                if (i == 0) {
+                        pos += (size_t)strcspn(pos, "\r\n");
+                        pos += (size_t)strspn(pos, "\r\n");
+                        if (strlen(pos) == 0) {
+                                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not find redirect location - %s%s\n"),
+                                        status_line, (display_html ? "</A>" : ""));
+                        }
+                        continue;
+                }
+
+                pos += i;
+                pos += strspn(pos, " \t");
+
+                /*
+                 * RFC 2616 (4.2):  ``Header fields can be extended over multiple lines by
+                 * preceding each extra line with at least one SP or HT.''
+                 */
+                for (; (i = strspn(pos, "\r\n")); pos += i) {
+                        pos += i;
+                        if (!(i = strspn(pos, " \t"))) {
+                                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Empty redirect location%s\n"),
+                                        display_html ? "</A>" : "");
+                        }
+                }
+
+                url = realloc(url, strcspn(pos, "\r\n") + 1);
+                if (url == NULL) {
+                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+                }
+
+                /* URI_HTTP, URI_HOST, URI_PORT, URI_PATH */
+                if (sscanf(pos, HD1, type, addr, &i, url) == 4) {
+                        url = prepend_slash(url);
+                        use_ssl = server_type_check(type);
+                }
+
+                /* URI_HTTP URI_HOST URI_PATH */
+                else if (sscanf(pos, HD2, type, addr, url) == 3) {
+                        url = prepend_slash(url);
+                        use_ssl = server_type_check(type);
+                        i = server_port_check(use_ssl);
+                }
+
+                /* URI_HTTP URI_HOST URI_PORT */
+                else if (sscanf(pos, HD3, type, addr, &i) == 3) {
+                        strcpy(url, HTTP_URL);
+                        use_ssl = server_type_check(type);
+                }
+
+                /* URI_HTTP URI_HOST */
+                else if (sscanf(pos, HD4, type, addr) == 2) {
+                        strcpy(url, HTTP_URL);
+                        use_ssl = server_type_check(type);
+                        i = server_port_check(use_ssl);
+                }
+                /* URI_HTTP, URI_HOST, URI_PATH */
+                else if (sscanf(pos, HD5, addr, url) == 2) {
+                        if (use_ssl) {
+                                strcpy(type, "https");
+                        } else {
+                                strcpy(type, server_type);
+                        }
+                        xasprintf(&url, "/%s", url);
+                        use_ssl = server_type_check(type);
+                        i = server_port_check(use_ssl);
+                }
+
+                /* URI_PATH */
+                else if (sscanf(pos, HD6, url) == 1) {
+                        /* relative url */
+                        if ((url[0] != '/')) {
+                                if ((x = strrchr(server_url, '/'))) {
+                                        *x = '\0';
+                                }
+                                xasprintf(&url, "%s/%s", server_url, url);
+                        }
+                        i = server_port;
+                        strcpy(type, server_type);
+                        strcpy(addr, host_name ? host_name : server_address);
+                }
+
+                else {
+                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not parse redirect location - %s%s\n"), pos,
+                                (display_html ? "</A>" : ""));
+                }
+
+                break;
+
+        } /* end while (pos) */
+
+        if (++redir_depth > max_depth) {
+                die(STATE_WARNING,
+                        _("HTTP WARNING - maximum redirection depth %d exceeded - %s://%s:%d%s%s\n"), max_depth,
+                        type, addr, i, url, (display_html ? "</A>" : ""));
+        }
+
+        if (server_port == i && !strncmp(server_address, addr, MAX_IPV4_HOSTLENGTH) &&
+                (host_name && !strncmp(host_name, addr, MAX_IPV4_HOSTLENGTH)) && !strcmp(server_url, url)) {
+                die(STATE_CRITICAL,
+                        _("HTTP CRITICAL - redirection creates an infinite loop - %s://%s:%d%s%s\n"), type,
+                        addr, i, url, (display_html ? "</A>" : ""));
+        }
+
+        strcpy(server_type, type);
+
+        free(host_name);
+        host_name = strndup(addr, MAX_IPV4_HOSTLENGTH);
+
+        if (!(followsticky & STICKY_HOST)) {
+                free(server_address);
+                server_address = strndup(addr, MAX_IPV4_HOSTLENGTH);
+        }
+        if (!(followsticky & STICKY_PORT)) {
+                server_port = i;
+        }
+
+        free(server_url);
+        server_url = url;
+
+        if (server_port > MAX_PORT) {
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"),
+                        MAX_PORT, server_type, server_address, server_port, server_url,
+                        display_html ? "</A>" : "");
+        }
 
+        /* reset virtual port */
+        virtual_port = server_port;
 
-bool
-server_type_check (const char *type)
-{
-  if (strcmp (type, "https"))
-    return false;
-  else
-    return true;
+        if (verbose) {
+                printf(_("Redirection to %s://%s:%d%s\n"), server_type,
+                           host_name ? host_name : server_address, server_port, server_url);
+        }
+
+        free(addr);
+        check_http();
 }
 
-int
-server_port_check (int ssl_flag)
-{
-  if (ssl_flag)
-    return HTTPS_PORT;
-  else
-    return HTTP_PORT;
+bool server_type_check(const char *type) { return (!(bool)strcmp(type, "https")); }
+
+int server_port_check(int ssl_flag) {
+        if (ssl_flag) {
+                return HTTPS_PORT;
+        }
+        return HTTP_PORT;
 }
 
-char *perfd_time (double elapsed_time)
-{
-  return fperfdata ("time", elapsed_time, "s",
-            thlds->warning?true:false, thlds->warning?thlds->warning->end:0,
-            thlds->critical?true:false, thlds->critical?thlds->critical->end:0,
-                   true, 0, true, socket_timeout);
+char *perfd_time(double elapsed_time) {
+        return fperfdata("time", elapsed_time, "s", thlds->warning,
+                                         thlds->warning ? thlds->warning->end : 0, thlds->critical,
+                                         thlds->critical ? thlds->critical->end : 0, true, 0, true, socket_timeout);
 }
 
-char *perfd_time_connect (double elapsed_time_connect)
-{
-  return fperfdata ("time_connect", elapsed_time_connect, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_connect(double elapsed_time_connect) {
+        return fperfdata("time_connect", elapsed_time_connect, "s", false, 0, false, 0, false, 0, true,
+                                         socket_timeout);
 }
 
-char *perfd_time_ssl (double elapsed_time_ssl)
-{
-  return fperfdata ("time_ssl", elapsed_time_ssl, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_ssl(double elapsed_time_ssl) {
+        return fperfdata("time_ssl", elapsed_time_ssl, "s", false, 0, false, 0, false, 0, true,
+                                         socket_timeout);
 }
 
-char *perfd_time_headers (double elapsed_time_headers)
-{
-  return fperfdata ("time_headers", elapsed_time_headers, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_headers(double elapsed_time_headers) {
+        return fperfdata("time_headers", elapsed_time_headers, "s", false, 0, false, 0, false, 0, true,
+                                         socket_timeout);
 }
 
-char *perfd_time_firstbyte (double elapsed_time_firstbyte)
-{
-  return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_firstbyte(double elapsed_time_firstbyte) {
+        return fperfdata("time_firstbyte", elapsed_time_firstbyte, "s", false, 0, false, 0, false, 0,
+                                         true, socket_timeout);
 }
 
-char *perfd_time_transfer (double elapsed_time_transfer)
-{
-  return fperfdata ("time_transfer", elapsed_time_transfer, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+char *perfd_time_transfer(double elapsed_time_transfer) {
+        return fperfdata("time_transfer", elapsed_time_transfer, "s", false, 0, false, 0, false, 0,
+                                         true, socket_timeout);
 }
 
-char *perfd_size (int page_len)
-{
-  return perfdata ("size", page_len, "B",
-            (min_page_len>0?true:false), min_page_len,
-            (min_page_len>0?true:false), 0,
-            true, 0, false, 0);
+char *perfd_size(int page_len) {
+        return perfdata("size", page_len, "B", (min_page_len > 0), min_page_len, (min_page_len > 0), 0,
+                                        true, 0, false, 0);
 }
 
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-  printf ("%s\n", _("This plugin tests the HTTP service on the specified host. It can test"));
-  printf ("%s\n", _("normal (http) and secure (https) servers, follow redirects, search for"));
-  printf ("%s\n", _("strings and regular expressions, check connection times, and report on"));
-  printf ("%s\n", _("certificate expiration times."));
+        printf("%s\n", _("This plugin tests the HTTP service on the specified host. It can test"));
+        printf("%s\n", _("normal (http) and secure (https) servers, follow redirects, search for"));
+        printf("%s\n", _("strings and regular expressions, check connection times, and report on"));
+        printf("%s\n", _("certificate expiration times."));
 
-  printf ("\n\n");
+        printf("\n");
+        printf("%s\n", _("ATTENTION!"));
+        printf("\n");
+        printf("%s\n", _("THIS PLUGIN IS DEPRECATED. The functionality was reimplemented by the"));
+        printf("%s\n", _("check_curl plugin, which can be used as a drop-in replacement. You should"));
+        printf("%s\n", _("migrate your checks over to check_curl, because check_http is going to be"));
+        printf("%s\n", _("removed sooner than later. Just replace check_http with check_curl in your"));
+        printf("%s\n", _("check command definitions."));
+        printf("%s\n",
+                   _("Report issues to: https://github.com/monitoring-plugins/monitoring-plugins/issues"));
 
-  print_usage ();
+        printf("\n\n");
+
+        print_usage();
 
 #ifdef HAVE_SSL
-  printf (_("In the first form, make an HTTP request."));
-  printf (_("In the second form, connect to the server and check the TLS certificate."));
+        printf(_("In the first form, make an HTTP request."));
+        printf(_("In the second form, connect to the server and check the TLS certificate."));
 #endif
-  printf (_("NOTE: One or both of -H and -I must be specified"));
+        printf(_("NOTE: One or both of -H and -I must be specified"));
 
-  printf ("\n");
+        printf("\n");
 
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-  printf (" %s\n", "-H, --hostname=ADDRESS");
-  printf ("    %s\n", _("Host name argument for servers using host headers (virtual host)"));
-  printf ("    %s\n", _("Append a port to include it in the header (eg: example.com:5000)"));
-  printf (" %s\n", "-I, --IP-address=ADDRESS");
-  printf ("    %s\n", _("IP address or name (use numeric address if possible to bypass DNS lookup)."));
-  printf (" %s\n", "-p, --port=INTEGER");
-  printf ("    %s", _("Port number (default: "));
-  printf ("%d)\n", HTTP_PORT);
+        printf(" %s\n", "-H, --hostname=ADDRESS");
+        printf("    %s\n", _("Host name argument for servers using host headers (virtual host)"));
+        printf("    %s\n", _("Append a port to include it in the header (eg: example.com:5000)"));
+        printf(" %s\n", "-I, --IP-address=ADDRESS");
+        printf("    %s\n",
+                   _("IP address or name (use numeric address if possible to bypass DNS lookup)."));
+        printf(" %s\n", "-p, --port=INTEGER");
+        printf("    %s", _("Port number (default: "));
+        printf("%d)\n", HTTP_PORT);
 
-  printf (UT_IPv46);
+        printf(UT_IPv46);
 
 #ifdef HAVE_SSL
-  printf (" %s\n", "-S, --ssl=VERSION[+]");
-  printf ("    %s\n", _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
-  printf ("    %s\n", _("auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,"));
-  printf ("    %s\n", _("1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted."));
-  printf (" %s\n", "--sni");
-  printf ("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
-  printf (" %s\n", "-C, --certificate=INTEGER[,INTEGER]");
-  printf ("    %s\n", _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
-  printf ("    %s\n", _("(when this option is used the URL is not checked by default. You can use"));
-  printf ("    %s\n", _(" --continue-after-certificate to override this behavior)"));
-  printf (" %s\n", "--continue-after-certificate");
-  printf ("    %s\n", _("Allows the HTTP check to continue after performing the certificate check."));
-  printf ("    %s\n", _("Does nothing unless -C is used."));
-  printf (" %s\n", "-J, --client-cert=FILE");
-  printf ("   %s\n", _("Name of file that contains the client certificate (PEM format)"));
-  printf ("   %s\n", _("to be used in establishing the SSL session"));
-  printf (" %s\n", "-K, --private-key=FILE");
-  printf ("   %s\n", _("Name of file containing the private key (PEM format)"));
-  printf ("   %s\n", _("matching the client certificate"));
+        printf(" %s\n", "-S, --ssl=VERSION[+]");
+        printf("    %s\n",
+                   _("Connect via SSL. Port defaults to 443. VERSION is optional, and prevents"));
+        printf("    %s\n", _("auto-negotiation (2 = SSLv2, 3 = SSLv3, 1 = TLSv1, 1.1 = TLSv1.1,"));
+        printf("    %s\n", _("1.2 = TLSv1.2). With a '+' suffix, newer versions are also accepted."));
+        printf(" %s\n", "--sni");
+        printf("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
+        printf(" %s\n", "-C, --certificate=INTEGER[,INTEGER]");
+        printf("    %s\n",
+                   _("Minimum number of days a certificate has to be valid. Port defaults to 443"));
+        printf("    %s\n",
+                   _("(when this option is used the URL is not checked by default. You can use"));
+        printf("    %s\n", _(" --continue-after-certificate to override this behavior)"));
+        printf(" %s\n", "--continue-after-certificate");
+        printf("    %s\n",
+                   _("Allows the HTTP check to continue after performing the certificate check."));
+        printf("    %s\n", _("Does nothing unless -C is used."));
+        printf(" %s\n", "-J, --client-cert=FILE");
+        printf("   %s\n", _("Name of file that contains the client certificate (PEM format)"));
+        printf("   %s\n", _("to be used in establishing the SSL session"));
+        printf(" %s\n", "-K, --private-key=FILE");
+        printf("   %s\n", _("Name of file containing the private key (PEM format)"));
+        printf("   %s\n", _("matching the client certificate"));
 #endif
 
-  printf (" %s\n", "-e, --expect=STRING");
-  printf ("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
-  printf ("    %s", _("the first (status) line of the server response (default: "));
-  printf ("%s)\n", HTTP_EXPECT);
-  printf ("    %s\n", _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
-  printf (" %s\n", "-d, --header-string=STRING");
-  printf ("    %s\n", _("String to expect in the response headers"));
-  printf (" %s\n", "-s, --string=STRING");
-  printf ("    %s\n", _("String to expect in the content"));
-  printf (" %s\n", "-u, --url=PATH");
-  printf ("    %s\n", _("URL to GET or POST (default: /)"));
-  printf (" %s\n", "-P, --post=STRING");
-  printf ("    %s\n", _("URL decoded http POST data"));
-  printf (" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, CONNECT, CONNECT:POST)");
-  printf ("    %s\n", _("Set HTTP method."));
-  printf (" %s\n", "-N, --no-body");
-  printf ("    %s\n", _("Don't wait for document body: stop reading after headers."));
-  printf ("    %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)"));
-  printf (" %s\n", "-M, --max-age=SECONDS");
-  printf ("    %s\n", _("Warn if document is more than SECONDS old. the number can also be of"));
-  printf ("    %s\n", _("the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."));
-  printf (" %s\n", "-T, --content-type=STRING");
-  printf ("    %s\n", _("specify Content-Type header media type when POSTing\n"));
-
-  printf (" %s\n", "-l, --linespan");
-  printf ("    %s\n", _("Allow regex to span newlines (must precede -r or -R)"));
-  printf (" %s\n", "-r, --regex, --ereg=STRING");
-  printf ("    %s\n", _("Search page for regex STRING"));
-  printf (" %s\n", "-R, --eregi=STRING");
-  printf ("    %s\n", _("Search page for case-insensitive regex STRING"));
-  printf (" %s\n", "--invert-regex");
-  printf ("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
-  printf ("    %s\n", _("can be changed with --state--regex)"));
-  printf (" %s\n", "--state-regex=STATE");
-  printf ("    %s\n", _("Return STATE if regex is found, OK if not\n"));
-
-  printf (" %s\n", "-a, --authorization=AUTH_PAIR");
-  printf ("    %s\n", _("Username:password on sites with basic authentication"));
-  printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
-  printf ("    %s\n", _("Username:password on proxy-servers with basic authentication"));
-  printf (" %s\n", "-A, --useragent=STRING");
-  printf ("    %s\n", _("String to be sent in http header as \"User Agent\""));
-  printf (" %s\n", "-k, --header=STRING");
-  printf ("    %s\n", _("Any other tags to be sent in http header. Use multiple times for additional headers"));
-  printf (" %s\n", "-E, --extended-perfdata");
-  printf ("    %s\n", _("Print additional performance data"));
-  printf (" %s\n", "-B, --show-body");
-  printf ("    %s\n", _("Print body content below status line"));
-  printf (" %s\n", "-L, --link");
-  printf ("    %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
-  printf (" %s\n", "-f, --onredirect=<ok|warning|critical|follow|sticky|stickyport>");
-  printf ("    %s\n", _("How to handle redirected pages. sticky is like follow but stick to the"));
-  printf ("    %s\n", _("specified IP address. stickyport also ensures port stays the same."));
-  printf (" %s\n", "--max-redirs=INTEGER");
-  printf ("    %s", _("Maximal number of redirects (default: "));
-  printf ("%d)\n", DEFAULT_MAX_REDIRS);
-  printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
-  printf ("    %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
-  printf (UT_WARN_CRIT);
-
-  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-  printf (UT_VERBOSE);
-
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("This plugin will attempt to open an HTTP connection with the host."));
-  printf (" %s\n", _("Successful connects return STATE_OK, refusals and timeouts return STATE_CRITICAL"));
-  printf (" %s\n", _("other errors return STATE_UNKNOWN.  Successful connects, but incorrect response"));
-  printf (" %s\n", _("messages from the host result in STATE_WARNING return values.  If you are"));
-  printf (" %s\n", _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
-  printf (" %s\n", _("(fully qualified domain name) as the [host_name] argument."));
+        printf(" %s\n", "-e, --expect=STRING");
+        printf("    %s\n", _("Comma-delimited list of strings, at least one of them is expected in"));
+        printf("    %s", _("the first (status) line of the server response (default: "));
+        printf("%s)\n", HTTP_EXPECT);
+        printf("    %s\n",
+                   _("If specified skips all other status line logic (ex: 3xx, 4xx, 5xx processing)"));
+        printf(" %s\n", "-d, --header-string=STRING");
+        printf("    %s\n", _("String to expect in the response headers"));
+        printf(" %s\n", "-s, --string=STRING");
+        printf("    %s\n", _("String to expect in the content"));
+        printf(" %s\n", "-u, --url=PATH");
+        printf("    %s\n", _("URL to GET or POST (default: /)"));
+        printf(" %s\n", "-P, --post=STRING");
+        printf("    %s\n", _("URL decoded http POST data"));
+        printf(" %s\n", "-j, --method=STRING  (for example: HEAD, OPTIONS, TRACE, PUT, DELETE, "
+                                        "CONNECT, CONNECT:POST)");
+        printf("    %s\n", _("Set HTTP method."));
+        printf(" %s\n", "-N, --no-body");
+        printf("    %s\n", _("Don't wait for document body: stop reading after headers."));
+        printf("    %s\n", _("(Note that this still does an HTTP GET or POST, not a HEAD.)"));
+        printf(" %s\n", "-M, --max-age=SECONDS");
+        printf("    %s\n", _("Warn if document is more than SECONDS old. the number can also be of"));
+        printf("    %s\n", _("the form \"10m\" for minutes, \"10h\" for hours, or \"10d\" for days."));
+        printf(" %s\n", "-T, --content-type=STRING");
+        printf("    %s\n", _("specify Content-Type header media type when POSTing\n"));
+
+        printf(" %s\n", "-l, --linespan");
+        printf("    %s\n", _("Allow regex to span newlines (must precede -r or -R)"));
+        printf(" %s\n", "-r, --regex, --ereg=STRING");
+        printf("    %s\n", _("Search page for regex STRING"));
+        printf(" %s\n", "-R, --eregi=STRING");
+        printf("    %s\n", _("Search page for case-insensitive regex STRING"));
+        printf(" %s\n", "--invert-regex");
+        printf("    %s\n", _("Return STATE if found, OK if not (STATE is CRITICAL, per default)"));
+        printf("    %s\n", _("can be changed with --state--regex)"));
+        printf(" %s\n", "--state-regex=STATE");
+        printf("    %s\n", _("Return STATE if regex is found, OK if not\n"));
+
+        printf(" %s\n", "-a, --authorization=AUTH_PAIR");
+        printf("    %s\n", _("Username:password on sites with basic authentication"));
+        printf(" %s\n", "-b, --proxy-authorization=AUTH_PAIR");
+        printf("    %s\n", _("Username:password on proxy-servers with basic authentication"));
+        printf(" %s\n", "-A, --useragent=STRING");
+        printf("    %s\n", _("String to be sent in http header as \"User Agent\""));
+        printf(" %s\n", "-k, --header=STRING");
+        printf(
+                "    %s\n",
+                _("Any other tags to be sent in http header. Use multiple times for additional headers"));
+        printf(" %s\n", "-E, --extended-perfdata");
+        printf("    %s\n", _("Print additional performance data"));
+        printf(" %s\n", "-B, --show-body");
+        printf("    %s\n", _("Print body content below status line"));
+        printf(" %s\n", "-L, --link");
+        printf("    %s\n", _("Wrap output in HTML link (obsoleted by urlize)"));
+        printf(" %s\n", "-f, --onredirect=<ok|warning|critical|follow|sticky|stickyport>");
+        printf("    %s\n", _("How to handle redirected pages. sticky is like follow but stick to the"));
+        printf("    %s\n", _("specified IP address. stickyport also ensures port stays the same."));
+        printf(" %s\n", "--max-redirs=INTEGER");
+        printf("    %s", _("Maximal number of redirects (default: "));
+        printf("%d)\n", DEFAULT_MAX_REDIRS);
+        printf(" %s\n", "-m, --pagesize=INTEGER<:INTEGER>");
+        printf("    %s\n",
+                   _("Minimum page size required (bytes) : Maximum page size required (bytes)"));
+        printf(UT_WARN_CRIT);
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf(UT_VERBOSE);
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("This plugin will attempt to open an HTTP connection with the host."));
+        printf(" %s\n",
+                   _("Successful connects return STATE_OK, refusals and timeouts return STATE_CRITICAL"));
+        printf(" %s\n",
+                   _("other errors return STATE_UNKNOWN.  Successful connects, but incorrect response"));
+        printf(" %s\n", _("messages from the host result in STATE_WARNING return values.  If you are"));
+        printf(" %s\n",
+                   _("checking a virtual server that uses 'host headers' you must supply the FQDN"));
+        printf(" %s\n", _("(fully qualified domain name) as the [host_name] argument."));
 
 #ifdef HAVE_SSL
-  printf ("\n");
-  printf (" %s\n", _("This plugin can also check whether an SSL enabled web server is able to"));
-  printf (" %s\n", _("serve content (optionally within a specified time) or whether the X509 "));
-  printf (" %s\n", _("certificate is still valid for the specified number of days."));
-  printf ("\n");
-  printf (" %s\n", _("Please note that this plugin does not check if the presented server"));
-  printf (" %s\n", _("certificate matches the hostname of the server, or if the certificate"));
-  printf (" %s\n", _("has a valid chain of trust to one of the locally installed CAs."));
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n\n", "CHECK CONTENT: check_http -w 5 -c 10 --ssl -H www.verisign.com");
-  printf (" %s\n", _("When the 'www.verisign.com' server returns its content within 5 seconds,"));
-  printf (" %s\n", _("a STATE_OK will be returned. When the server returns its content but exceeds"));
-  printf (" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
-  printf (" %s\n", _("a STATE_CRITICAL will be returned."));
-  printf ("\n");
-  printf (" %s\n\n", "CHECK CERTIFICATE: check_http -H www.verisign.com -C 14");
-  printf (" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 14 days,"));
-  printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
-  printf (" %s\n", _("14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"));
-  printf (" %s\n\n", _("the certificate is expired."));
-  printf ("\n");
-  printf (" %s\n\n", "CHECK CERTIFICATE: check_http -H www.verisign.com -C 30,14");
-  printf (" %s\n", _("When the certificate of 'www.verisign.com' is valid for more than 30 days,"));
-  printf (" %s\n", _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
-  printf (" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned."));
-  printf (" %s\n", _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days"));
-
-  printf (" %s\n\n", "CHECK SSL WEBSERVER CONTENT VIA PROXY USING HTTP 1.1 CONNECT: ");
-  printf (" %s\n", _("check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j CONNECT -H www.verisign.com "));
-  printf (" %s\n", _("all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> -S(sl) -j CONNECT -H <webserver>"));
-  printf (" %s\n", _("a STATE_OK will be returned. When the server returns its content but exceeds"));
-  printf (" %s\n", _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
-  printf (" %s\n", _("a STATE_CRITICAL will be returned. By adding a colon to the method you can set the method used"));
-  printf (" %s\n", _("inside the proxied connection: -j CONNECT:POST"));
+        printf("\n");
+        printf(" %s\n", _("This plugin can also check whether an SSL enabled web server is able to"));
+        printf(" %s\n", _("serve content (optionally within a specified time) or whether the X509 "));
+        printf(" %s\n", _("certificate is still valid for the specified number of days."));
+        printf("\n");
+        printf(" %s\n", _("Please note that this plugin does not check if the presented server"));
+        printf(" %s\n", _("certificate matches the hostname of the server, or if the certificate"));
+        printf(" %s\n", _("has a valid chain of trust to one of the locally installed CAs."));
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n\n", "CHECK CONTENT: check_http -w 5 -c 10 --ssl -H www.verisign.com");
+        printf(" %s\n", _("When the 'www.verisign.com' server returns its content within 5 seconds,"));
+        printf(" %s\n",
+                   _("a STATE_OK will be returned. When the server returns its content but exceeds"));
+        printf(" %s\n",
+                   _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
+        printf(" %s\n", _("a STATE_CRITICAL will be returned."));
+        printf("\n");
+        printf(" %s\n\n", "CHECK CERTIFICATE: check_http -H www.verisign.com -C 14");
+        printf(" %s\n",
+                   _("When the certificate of 'www.verisign.com' is valid for more than 14 days,"));
+        printf(" %s\n",
+                   _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
+        printf(" %s\n",
+                   _("14 days, a STATE_WARNING is returned. A STATE_CRITICAL will be returned when"));
+        printf(" %s\n\n", _("the certificate is expired."));
+        printf("\n");
+        printf(" %s\n\n", "CHECK CERTIFICATE: check_http -H www.verisign.com -C 30,14");
+        printf(" %s\n",
+                   _("When the certificate of 'www.verisign.com' is valid for more than 30 days,"));
+        printf(" %s\n",
+                   _("a STATE_OK is returned. When the certificate is still valid, but for less than"));
+        printf(" %s\n", _("30 days, but more than 14 days, a STATE_WARNING is returned."));
+        printf(" %s\n",
+                   _("A STATE_CRITICAL will be returned when certificate expires in less than 14 days"));
+
+        printf(" %s\n\n", "CHECK SSL WEBSERVER CONTENT VIA PROXY USING HTTP 1.1 CONNECT: ");
+        printf(" %s\n", _("check_http -I 192.168.100.35 -p 80 -u https://www.verisign.com/ -S -j "
+                                          "CONNECT -H www.verisign.com "));
+        printf(" %s\n", _("all these options are needed: -I <proxy> -p <proxy-port> -u <check-url> "
+                                          "-S(sl) -j CONNECT -H <webserver>"));
+        printf(" %s\n",
+                   _("a STATE_OK will be returned. When the server returns its content but exceeds"));
+        printf(" %s\n",
+                   _("the 5-second threshold, a STATE_WARNING will be returned. When an error occurs,"));
+        printf(" %s\n", _("a STATE_CRITICAL will be returned. By adding a colon to the method you can "
+                                          "set the method used"));
+        printf(" %s\n", _("inside the proxied connection: -j CONNECT:POST"));
 
 #endif
 
-  printf (UT_SUPPORT);
-
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n",progname);
-  printf ("       [-J <client certificate file>] [-K <private key>]\n");
-  printf ("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-E] [-a auth]\n");
-  printf ("       [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport>]\n");
-  printf ("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n");
-  printf ("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
-  printf ("       [-A string] [-k string] [-S <version>] [--sni]\n");
-  printf ("       [-T <content-type>] [-j method]\n");
-  printf (" %s -H <vhost> | -I <IP-address> -C <warn_age>[,<crit_age>]\n",progname);
-  printf ("       [-p <port>] [-t <timeout>] [-4|-6] [--sni]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s -H <vhost> | -I <IP-address> [-u <uri>] [-p <port>]\n", progname);
+        printf("       [-J <client certificate file>] [-K <private key>]\n");
+        printf("       [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L] [-E] [-a auth]\n");
+        printf("       [-b proxy_auth] [-f <ok|warning|critical|follow|sticky|stickyport>]\n");
+        printf("       [-e <expect>] [-d string] [-s string] [-l] [-r <regex> | -R <case-insensitive "
+                   "regex>]\n");
+        printf("       [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
+        printf("       [-A string] [-k string] [-S <version>] [--sni]\n");
+        printf("       [-T <content-type>] [-j method]\n");
+        printf(" %s -H <vhost> | -I <IP-address> -C <warn_age>[,<crit_age>]\n", progname);
+        printf("       [-p <port>] [-t <timeout>] [-4|-6] [--sni]\n");
 }
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 9640ef70..16fe3d01 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -56,7 +56,6 @@ void print_usage(void);
 #       include <sys/device.h>
 #       include <sys/param.h>
 #       include <sys/sysctl.h>
-#       include <sys/videoio.h> /* for __u8 and friends */
 #       include <sys/scsiio.h>
 #       include <sys/ataio.h>
 #       include <dev/ata/atareg.h>
@@ -79,48 +78,47 @@ void print_usage(void);
 #define UNKNOWN     -1
 
 typedef struct threshold_s {
-        __u8 id;
-        __u8 threshold;
-        __u8 reserved[10];
+        uint8_t id;
+        uint8_t threshold;
+        uint8_t reserved[10];
 } __attribute__((packed)) threshold_t;
 
 typedef struct thresholds_s {
-        __u16 revision;
+        uint16_t revision;
         threshold_t thresholds[NR_ATTRIBUTES];
-        __u8 reserved[18];
-        __u8 vendor[131];
-        __u8 checksum;
+        uint8_t reserved[18];
+        uint8_t vendor[131];
+        uint8_t checksum;
 } __attribute__((packed)) thresholds_t;
 
 typedef struct value_s {
-        __u8 id;
-        __u16 status;
-        __u8 value;
-        __u8 vendor[8];
+        uint8_t id;
+        uint16_t status;
+        uint8_t value;
+        uint8_t vendor[8];
 } __attribute__((packed)) value_t;
 
 typedef struct values_s {
-        __u16 revision;
+        uint16_t revision;
         value_t values[NR_ATTRIBUTES];
-        __u8 offline_status;
-        __u8 vendor1;
-        __u16 offline_timeout;
-        __u8 vendor2;
-        __u8 offline_capability;
-        __u16 smart_capability;
-        __u8 reserved[16];
-        __u8 vendor[125];
-        __u8 checksum;
+        uint8_t offline_status;
+        uint8_t vendor1;
+        uint16_t offline_timeout;
+        uint8_t vendor2;
+        uint8_t offline_capability;
+        uint16_t smart_capability;
+        uint8_t reserved[16];
+        uint8_t vendor[125];
+        uint8_t checksum;
 } __attribute__((packed)) values_t;
 
 static struct {
-        __u8 value;
+        uint8_t value;
         char *text;
-} offline_status_text[] = {{0x00, "NeverStarted"}, {0x02, "Completed"}, {0x04, "Suspended"},
-                                                                {0x05, "Aborted"},      {0x06, "Failed"},    {0, 0}};
+} offline_status_text[] = {{0x00, "NeverStarted"}, {0x02, "Completed"}, {0x04, "Suspended"}, {0x05, "Aborted"}, {0x06, "Failed"}, {0, 0}};
 
 static struct {
-        __u8 value;
+        uint8_t value;
         char *text;
 } smart_command[] = {{SMART_ENABLE, "SMART_ENABLE"},
                                          {SMART_DISABLE, "SMART_DISABLE"},
@@ -140,7 +138,7 @@ static int smart_read_values(int, values_t *);
 static int nagios(values_t *, thresholds_t *);
 static void print_value(value_t *, threshold_t *);
 static void print_values(values_t *, thresholds_t *);
-static int smart_cmd_simple(int, enum SmartCommand, __u8, bool);
+static int smart_cmd_simple(int, enum SmartCommand, uint8_t, bool);
 static int smart_read_thresholds(int, thresholds_t *);
 static bool verbose = false;
 
@@ -175,8 +173,9 @@ int main(int argc, char *argv[]) {
 
                 o = getopt_long(argc, argv, "+d:iq10nhVv", longopts, &longindex);
 
-                if (o == -1 || o == EOF || o == 1)
+                if (o == -1 || o == EOF || o == 1) {
                         break;
+                }
 
                 switch (o) {
                 case 'd':
@@ -234,8 +233,9 @@ int main(int argc, char *argv[]) {
         smart_read_values(fd, &values);
         smart_read_thresholds(fd, &thresholds);
         retval = nagios(&values, &thresholds);
-        if (verbose)
+        if (verbose) {
                 print_values(&values, &thresholds);
+        }
 
         close(fd);
         return retval;
@@ -254,7 +254,7 @@ char *get_offline_text(int status) {
 int smart_read_values(int fd, values_t *values) {
 #ifdef __linux__
         int e;
-        __u8 args[4 + 512];
+        uint8_t args[4 + 512];
         args[0] = WIN_SMART;
         args[1] = 0;
         args[2] = SMART_READ_VALUES;
@@ -282,8 +282,9 @@ int smart_read_values(int fd, values_t *values) {
         req.cylinder = WDSMART_CYL;
 
         if (ioctl(fd, ATAIOCCOMMAND, &req) == 0) {
-                if (req.retsts != ATACMD_OK)
+                if (req.retsts != ATACMD_OK) {
                         errno = ENODEV;
+                }
         }
 
         if (errno != 0) {
@@ -370,22 +371,24 @@ void print_values(values_t *p, thresholds_t *t) {
                    p->smart_capability & 1 ? "SaveOnStandBy" : "", p->smart_capability & 2 ? "AutoSave" : "");
 }
 
-int smart_cmd_simple(int fd, enum SmartCommand command, __u8 val0, bool show_error) {
+int smart_cmd_simple(int fd, enum SmartCommand command, uint8_t val0, bool show_error) {
         int e = STATE_UNKNOWN;
 #ifdef __linux__
-        __u8 args[4];
+        uint8_t args[4];
         args[0] = WIN_SMART;
         args[1] = val0;
         args[2] = smart_command[command].value;
         args[3] = 0;
         if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
                 e = STATE_CRITICAL;
-                if (show_error)
+                if (show_error) {
                         printf(_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror(errno));
+                }
         } else {
                 e = STATE_OK;
-                if (show_error)
+                if (show_error) {
                         printf(_("OK - Command sent (%s)\n"), smart_command[command].text);
+                }
         }
 
 #endif /* __linux__ */
@@ -401,20 +404,24 @@ int smart_cmd_simple(int fd, enum SmartCommand command, __u8 val0, bool show_err
         req.sec_count = val0;
 
         if (ioctl(fd, ATAIOCCOMMAND, &req) == 0) {
-                if (req.retsts != ATACMD_OK)
+                if (req.retsts != ATACMD_OK) {
                         errno = ENODEV;
-                if (req.cylinder != WDSMART_CYL)
+                }
+                if (req.cylinder != WDSMART_CYL) {
                         errno = ENODEV;
+                }
         }
 
         if (errno != 0) {
                 e = STATE_CRITICAL;
-                if (show_error)
+                if (show_error) {
                         printf(_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror(errno));
+                }
         } else {
                 e = STATE_OK;
-                if (show_error)
+                if (show_error) {
                         printf(_("OK - Command sent (%s)\n"), smart_command[command].text);
+                }
         }
 
 #endif /* __NetBSD__ */
@@ -424,7 +431,7 @@ int smart_cmd_simple(int fd, enum SmartCommand command, __u8 val0, bool show_err
 int smart_read_thresholds(int fd, thresholds_t *thresholds) {
 #ifdef __linux__
         int e;
-        __u8 args[4 + 512];
+        uint8_t args[4 + 512];
         args[0] = WIN_SMART;
         args[1] = 0;
         args[2] = SMART_READ_THRESHOLDS;
@@ -452,8 +459,9 @@ int smart_read_thresholds(int fd, thresholds_t *thresholds) {
         req.cylinder = WDSMART_CYL;
 
         if (ioctl(fd, ATAIOCCOMMAND, &req) == 0) {
-                if (req.retsts != ATACMD_OK)
+                if (req.retsts != ATACMD_OK) {
                         errno = ENODEV;
+                }
         }
 
         if (errno != 0) {
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 597644bd..1b2e2826 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -27,12 +27,11 @@
  *****************************************************************************/
 
 /* progname may be check_ldaps */
-char *progname = "check_ldap";
-const char *copyright = "2000-2024";
-const char *email = "devel@monitoring-plugins.org";
-
+#include "output.h"
 #include "common.h"
 #include "netutils.h"
+#include "perfdata.h"
+#include "thresholds.h"
 #include "utils.h"
 #include "check_ldap.d/config.h"
 
@@ -41,6 +40,10 @@ const char *email = "devel@monitoring-plugins.org";
 #define LDAP_DEPRECATED 1
 #include <ldap.h>
 
+char *progname = "check_ldap";
+const char *copyright = "2000-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 enum {
         DEFAULT_PORT = 389
 };
@@ -79,6 +82,10 @@ int main(int argc, char *argv[]) {
 
         const check_ldap_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* initialize alarm signal handling */
         signal(SIGALRM, socket_timeout_alarm_handler);
 
@@ -89,96 +96,172 @@ int main(int argc, char *argv[]) {
         struct timeval start_time;
         gettimeofday(&start_time, NULL);
 
+        mp_check overall = mp_check_init();
+
         LDAP *ldap_connection;
         /* initialize ldap */
+        {
 #ifdef HAVE_LDAP_INIT
-        if (!(ldap_connection = ldap_init(config.ld_host, config.ld_port))) {
-                printf("Could not connect to the server at port %i\n", config.ld_port);
-                return STATE_CRITICAL;
-        }
+                mp_subcheck sc_ldap_init = mp_subcheck_init();
+                if (!(ldap_connection = ldap_init(config.ld_host, config.ld_port))) {
+                        xasprintf(&sc_ldap_init.output, "could not connect to the server at port %i",
+                                          config.ld_port);
+                        sc_ldap_init = mp_set_subcheck_state(sc_ldap_init, STATE_CRITICAL);
+                        mp_add_subcheck_to_check(&overall, sc_ldap_init);
+                        mp_exit(overall);
+                } else {
+                        xasprintf(&sc_ldap_init.output, "connected to the server at port %i", config.ld_port);
+                        sc_ldap_init = mp_set_subcheck_state(sc_ldap_init, STATE_OK);
+                        mp_add_subcheck_to_check(&overall, sc_ldap_init);
+                }
 #else
-        if (!(ld = ldap_open(config.ld_host, config.ld_port))) {
-                if (verbose) {
-                        ldap_perror(ldap_connection, "ldap_open");
+                mp_subcheck sc_ldap_init = mp_subcheck_init();
+                if (!(ld = ldap_open(config.ld_host, config.ld_port))) {
+                        if (verbose) {
+                                ldap_perror(ldap_connection, "ldap_open");
+                        }
+                xasprintf(&sc_ldap_init.output, "Could not connect to the server at port %i"), config.ld_port);
+                sc_ldap_init = mp_set_subcheck_state(sc_ldap_init, STATE_CRITICAL);
+                mp_add_subcheck_to_check(&overall, sc_ldap_init);
+                mp_exit(overall);
+                } else {
+                        xasprintf(&sc_ldap_init.output, "connected to the server at port %i", config.ld_port);
+                        sc_ldap_init = mp_set_subcheck_state(sc_ldap_init, STATE_OK);
+                        mp_add_subcheck_to_check(&overall, sc_ldap_init);
                 }
-                printf(_("Could not connect to the server at port %i\n"), config.ld_port);
-                return STATE_CRITICAL;
-        }
 #endif /* HAVE_LDAP_INIT */
+        }
 
 #ifdef HAVE_LDAP_SET_OPTION
         /* set ldap options */
-        if (ldap_set_option(ldap_connection, LDAP_OPT_PROTOCOL_VERSION, &config.ld_protocol) != LDAP_OPT_SUCCESS) {
-                printf(_("Could not set protocol version %d\n"), config.ld_protocol);
-                return STATE_CRITICAL;
+        mp_subcheck sc_ldap_set_opts = mp_subcheck_init();
+        if (ldap_set_option(ldap_connection, LDAP_OPT_PROTOCOL_VERSION, &config.ld_protocol) !=
+                LDAP_OPT_SUCCESS) {
+                xasprintf(&sc_ldap_set_opts.output, "Could not set protocol version %d",
+                                  config.ld_protocol);
+                sc_ldap_set_opts = mp_set_subcheck_state(sc_ldap_set_opts, STATE_CRITICAL);
+                mp_add_subcheck_to_check(&overall, sc_ldap_set_opts);
+                mp_exit(overall);
+        } else {
+                xasprintf(&sc_ldap_set_opts.output, "set protocol version %d", config.ld_protocol);
+                sc_ldap_set_opts = mp_set_subcheck_state(sc_ldap_set_opts, STATE_OK);
+                mp_add_subcheck_to_check(&overall, sc_ldap_set_opts);
         }
 #endif
 
         int version = 3;
         int tls;
-        if (config.ld_port == LDAPS_PORT || config.ssl_on_connect) {
+        {
+                if (config.ld_port == LDAPS_PORT || config.ssl_on_connect) {
 #if defined(HAVE_LDAP_SET_OPTION) && defined(LDAP_OPT_X_TLS)
-                /* ldaps: set option tls */
-                tls = LDAP_OPT_X_TLS_HARD;
+                        /* ldaps: set option tls */
+                        tls = LDAP_OPT_X_TLS_HARD;
 
-                if (ldap_set_option(ldap_connection, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS) {
-                        if (verbose) {
-                                ldap_perror(ldap_connection, "ldaps_option");
+                        mp_subcheck sc_ldap_tls_init = mp_subcheck_init();
+                        if (ldap_set_option(ldap_connection, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS) {
+                                if (verbose) {
+                                        ldap_perror(ldap_connection, "ldaps_option");
+                                }
+                                xasprintf(&sc_ldap_tls_init.output, "could not init TLS at port %i!",
+                                                  config.ld_port);
+                                sc_ldap_tls_init = mp_set_subcheck_state(sc_ldap_tls_init, STATE_CRITICAL);
+                                mp_add_subcheck_to_check(&overall, sc_ldap_tls_init);
+                                mp_exit(overall);
+                        } else {
+                                xasprintf(&sc_ldap_tls_init.output, "initiated TLS at port %i!", config.ld_port);
+                                sc_ldap_tls_init = mp_set_subcheck_state(sc_ldap_tls_init, STATE_OK);
+                                mp_add_subcheck_to_check(&overall, sc_ldap_tls_init);
                         }
-                        printf(_("Could not init TLS at port %i!\n"), config.ld_port);
-                        return STATE_CRITICAL;
-                }
 #else
-                printf(_("TLS not supported by the libraries!\n"));
-                return STATE_CRITICAL;
+                        printf(_("TLS not supported by the libraries!\n"));
+                        exit(STATE_CRITICAL);
 #endif /* LDAP_OPT_X_TLS */
-        } else if (config.starttls) {
+                } else if (config.starttls) {
 #if defined(HAVE_LDAP_SET_OPTION) && defined(HAVE_LDAP_START_TLS_S)
-                /* ldap with startTLS: set option version */
-                if (ldap_get_option(ldap_connection, LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS) {
-                        if (version < LDAP_VERSION3) {
-                                version = LDAP_VERSION3;
-                                ldap_set_option(ldap_connection, LDAP_OPT_PROTOCOL_VERSION, &version);
+                        /* ldap with startTLS: set option version */
+                        if (ldap_get_option(ldap_connection, LDAP_OPT_PROTOCOL_VERSION, &version) ==
+                                LDAP_OPT_SUCCESS) {
+                                if (version < LDAP_VERSION3) {
+                                        version = LDAP_VERSION3;
+                                        ldap_set_option(ldap_connection, LDAP_OPT_PROTOCOL_VERSION, &version);
+                                }
                         }
-                }
-                /* call start_tls */
-                if (ldap_start_tls_s(ldap_connection, NULL, NULL) != LDAP_SUCCESS) {
-                        if (verbose) {
-                                ldap_perror(ldap_connection, "ldap_start_tls");
+                        /* call start_tls */
+                        mp_subcheck sc_ldap_starttls = mp_subcheck_init();
+                        if (ldap_start_tls_s(ldap_connection, NULL, NULL) != LDAP_SUCCESS) {
+                                if (verbose) {
+                                        ldap_perror(ldap_connection, "ldap_start_tls");
+                                }
+                                xasprintf(&sc_ldap_starttls.output, "could not init STARTTLS at port %i!",
+                                                  config.ld_port);
+                                sc_ldap_starttls = mp_set_subcheck_state(sc_ldap_starttls, STATE_CRITICAL);
+                                mp_add_subcheck_to_check(&overall, sc_ldap_starttls);
+                                mp_exit(overall);
+                        } else {
+                                xasprintf(&sc_ldap_starttls.output, "initiated STARTTLS at port %i!",
+                                                  config.ld_port);
+                                sc_ldap_starttls = mp_set_subcheck_state(sc_ldap_starttls, STATE_OK);
+                                mp_add_subcheck_to_check(&overall, sc_ldap_starttls);
                         }
-                        printf(_("Could not init startTLS at port %i!\n"), config.ld_port);
-                        return STATE_CRITICAL;
-                }
 #else
-                printf(_("startTLS not supported by the library, needs LDAPv3!\n"));
-                return STATE_CRITICAL;
+                        printf(_("startTLS not supported by the library, needs LDAPv3!\n"));
+                        exit(STATE_CRITICAL);
 #endif /* HAVE_LDAP_START_TLS_S */
+                }
         }
 
         /* bind to the ldap server */
-        if (ldap_bind_s(ldap_connection, config.ld_binddn, config.ld_passwd, LDAP_AUTH_SIMPLE) != LDAP_SUCCESS) {
-                if (verbose) {
-                        ldap_perror(ldap_connection, "ldap_bind");
+        {
+                mp_subcheck sc_ldap_bind = mp_subcheck_init();
+                int ldap_error =
+                        ldap_bind_s(ldap_connection, config.ld_binddn, config.ld_passwd, LDAP_AUTH_SIMPLE);
+                if (ldap_error != LDAP_SUCCESS) {
+                        if (verbose) {
+                                ldap_perror(ldap_connection, "ldap_bind");
+                        }
+
+                        xasprintf(&sc_ldap_bind.output, "could not bind to the LDAP server: %s",
+                                          ldap_err2string(ldap_error));
+                        sc_ldap_bind = mp_set_subcheck_state(sc_ldap_bind, STATE_CRITICAL);
+                        mp_add_subcheck_to_check(&overall, sc_ldap_bind);
+                        mp_exit(overall);
+                } else {
+                        xasprintf(&sc_ldap_bind.output, "execute bind to the LDAP server");
+                        sc_ldap_bind = mp_set_subcheck_state(sc_ldap_bind, STATE_OK);
+                        mp_add_subcheck_to_check(&overall, sc_ldap_bind);
                 }
-                printf(_("Could not bind to the LDAP server\n"));
-                return STATE_CRITICAL;
         }
 
         LDAPMessage *result;
-        int num_entries = 0;
         /* do a search of all objectclasses in the base dn */
-        if (ldap_search_s(ldap_connection, config.ld_base,
-                                          (config.crit_entries != NULL || config.warn_entries != NULL) ? LDAP_SCOPE_SUBTREE : LDAP_SCOPE_BASE, config.ld_attr,
-                                          NULL, 0, &result) != LDAP_SUCCESS) {
-                if (verbose) {
-                        ldap_perror(ldap_connection, "ldap_search");
+        {
+                mp_subcheck sc_ldap_search = mp_subcheck_init();
+                int ldap_error = ldap_search_s(
+                        ldap_connection, config.ld_base,
+                        (config.entries_thresholds.warning_is_set || config.entries_thresholds.critical_is_set)
+                                ? LDAP_SCOPE_SUBTREE
+                                : LDAP_SCOPE_BASE,
+                        config.ld_attr, NULL, 0, &result);
+
+                if (ldap_error != LDAP_SUCCESS) {
+                        if (verbose) {
+                                ldap_perror(ldap_connection, "ldap_search");
+                        }
+                        xasprintf(&sc_ldap_search.output, "could not search/find objectclasses in %s: %s",
+                                          config.ld_base, ldap_err2string(ldap_error));
+                        sc_ldap_search = mp_set_subcheck_state(sc_ldap_search, STATE_CRITICAL);
+                        mp_add_subcheck_to_check(&overall, sc_ldap_search);
+                        mp_exit(overall);
+                } else {
+                        xasprintf(&sc_ldap_search.output, "search/find objectclasses in %s", config.ld_base);
+                        sc_ldap_search = mp_set_subcheck_state(sc_ldap_search, STATE_OK);
+                        mp_add_subcheck_to_check(&overall, sc_ldap_search);
                 }
-                printf(_("Could not search/find objectclasses in %s\n"), config.ld_base);
-                return STATE_CRITICAL;
         }
 
-        if (config.crit_entries != NULL || config.warn_entries != NULL) {
-                num_entries = ldap_count_entries(ldap_connection, result);
+        int num_entries = ldap_count_entries(ldap_connection, result);
+        if (verbose) {
+                printf("entries found: %d\n", num_entries);
         }
 
         /* unbind from the ldap server */
@@ -188,48 +271,50 @@ int main(int argc, char *argv[]) {
         alarm(0);
 
         /* calculate the elapsed time and compare to thresholds */
-
         long microsec = deltime(start_time);
         double elapsed_time = (double)microsec / 1.0e6;
-        mp_state_enum status = STATE_UNKNOWN;
-        if (config.crit_time_set && elapsed_time > config.crit_time) {
-                status = STATE_CRITICAL;
-        } else if (config.warn_time_set && elapsed_time > config.warn_time) {
-                status = STATE_WARNING;
-        } else {
-                status = STATE_OK;
-        }
+        mp_perfdata pd_connection_time = perfdata_init();
+        pd_connection_time.label = "time";
+        pd_connection_time.value = mp_create_pd_value(elapsed_time);
+        pd_connection_time = mp_pd_set_thresholds(pd_connection_time, config.connection_time_threshold);
 
-        if (config.entries_thresholds != NULL) {
-                if (verbose) {
-                        printf("entries found: %d\n", num_entries);
-                        print_thresholds("entry thresholds", config.entries_thresholds);
-                }
-                mp_state_enum status_entries = get_status(num_entries, config.entries_thresholds);
-                if (status_entries == STATE_CRITICAL) {
-                        status = STATE_CRITICAL;
-                } else if (status != STATE_CRITICAL) {
-                        status = status_entries;
-                }
-        }
+        mp_subcheck sc_connection_time = mp_subcheck_init();
+        mp_add_perfdata_to_subcheck(&sc_connection_time, pd_connection_time);
+
+        mp_state_enum connection_time_state = mp_get_pd_status(pd_connection_time);
+        sc_connection_time = mp_set_subcheck_state(sc_connection_time, connection_time_state);
 
-        /* print out the result */
-        if (config.crit_entries != NULL || config.warn_entries != NULL) {
-                printf(_("LDAP %s - found %d entries in %.3f seconds|%s %s\n"), state_text(status), num_entries, elapsed_time,
-                           fperfdata("time", elapsed_time, "s", config.warn_time_set, config.warn_time, config.crit_time_set, config.crit_time, true, 0,
-                                                 false, 0),
-                           sperfdata("entries", (double)num_entries, "", config.warn_entries, config.crit_entries, true, 0.0, false, 0.0));
+        if (connection_time_state == STATE_OK) {
+                xasprintf(&sc_connection_time.output, "connection time %.3fs is within thresholds",
+                                  elapsed_time);
         } else {
-                printf(_("LDAP %s - %.3f seconds response time|%s\n"), state_text(status), elapsed_time,
-                           fperfdata("time", elapsed_time, "s", config.warn_time_set, config.warn_time, config.crit_time_set, config.crit_time, true, 0,
-                                                 false, 0));
+                xasprintf(&sc_connection_time.output, "connection time %.3fs is violating thresholds",
+                                  elapsed_time);
         }
 
-        exit(status);
+        mp_add_subcheck_to_check(&overall, sc_connection_time);
+
+        mp_perfdata pd_num_entries = perfdata_init();
+        pd_num_entries.label = "entries";
+        pd_num_entries.value = mp_create_pd_value(num_entries);
+        pd_num_entries = mp_pd_set_thresholds(pd_num_entries, config.entries_thresholds);
+
+        mp_subcheck sc_num_entries = mp_subcheck_init();
+        mp_add_perfdata_to_subcheck(&sc_num_entries, pd_num_entries);
+        xasprintf(&sc_num_entries.output, "found %d entries", num_entries);
+        sc_num_entries = mp_set_subcheck_state(sc_num_entries, mp_get_pd_status(pd_num_entries));
+
+        mp_add_subcheck_to_check(&overall, sc_num_entries);
+
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
 check_ldap_config_wrapper process_arguments(int argc, char **argv) {
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
+
         /* initialize the long option struct */
         static struct option longopts[] = {{"help", no_argument, 0, 'h'},
                                                                            {"version", no_argument, 0, 'V'},
@@ -253,6 +338,7 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) {
                                                                            {"warn-entries", required_argument, 0, 'W'},
                                                                            {"crit-entries", required_argument, 0, 'C'},
                                                                            {"verbose", no_argument, 0, 'v'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
         check_ldap_config_wrapper result = {
@@ -273,7 +359,8 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) {
 
         int option = 0;
         while (true) {
-                int option_index = getopt_long(argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:C:W:", longopts, &option);
+                int option_index =
+                        getopt_long(argc, argv, "hvV234TS6t:c:w:H:b:p:a:D:P:C:W:", longopts, &option);
 
                 if (option_index == -1 || option_index == EOF) {
                         break;
@@ -311,20 +398,38 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) {
                 case 'P':
                         result.config.ld_passwd = optarg;
                         break;
-                case 'w':
-                        result.config.warn_time_set = true;
-                        result.config.warn_time = strtod(optarg, NULL);
-                        break;
-                case 'c':
-                        result.config.crit_time_set = true;
-                        result.config.crit_time = strtod(optarg, NULL);
-                        break;
-                case 'W':
-                        result.config.warn_entries = optarg;
-                        break;
-                case 'C':
-                        result.config.crit_entries = optarg;
-                        break;
+                case 'w': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning connection time threshold");
+                        }
+                        result.config.connection_time_threshold =
+                                mp_thresholds_set_warn(result.config.connection_time_threshold, tmp.range);
+                } break;
+                case 'c': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical connection time threshold");
+                        }
+                        result.config.connection_time_threshold =
+                                mp_thresholds_set_crit(result.config.connection_time_threshold, tmp.range);
+                } break;
+                case 'W': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse number of entries warning threshold");
+                        }
+                        result.config.entries_thresholds =
+                                mp_thresholds_set_warn(result.config.entries_thresholds, tmp.range);
+                } break;
+                case 'C': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse number of entries critical threshold");
+                        }
+                        result.config.entries_thresholds =
+                                 mp_thresholds_set_crit(result.config.entries_thresholds, tmp.range);
+                } break;
 #ifdef HAVE_LDAP_SET_OPTION
                 case '2':
                         result.config.ld_protocol = 2;
@@ -363,6 +468,18 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) {
                         usage(_("IPv6 support not available\n"));
 #endif
                         break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 default:
                         usage5();
                 }
@@ -381,7 +498,8 @@ check_ldap_config_wrapper process_arguments(int argc, char **argv) {
                 result.config.ld_port = DEFAULT_PORT;
         }
 
-        if (strstr(argv[0], "check_ldaps") && !result.config.starttls && !result.config.ssl_on_connect) {
+        if (strstr(argv[0], "check_ldaps") && !result.config.starttls &&
+                !result.config.ssl_on_connect) {
                 result.config.starttls = true;
         }
 
@@ -397,10 +515,6 @@ check_ldap_config_wrapper validate_arguments(check_ldap_config_wrapper config_wr
                 usage4(_("Please specify the LDAP base\n"));
         }
 
-        if (config_wrapper.config.crit_entries != NULL || config_wrapper.config.warn_entries != NULL) {
-                set_thresholds(&config_wrapper.config.entries_thresholds, config_wrapper.config.warn_entries, config_wrapper.config.crit_entries);
-        }
-
         if (config_wrapper.config.ld_passwd == NULL) {
                 config_wrapper.config.ld_passwd = getenv("LDAP_PASSWORD");
         }
@@ -435,11 +549,13 @@ void print_help(void) {
         printf(" %s\n", "-D [--bind]");
         printf("    %s\n", _("ldap bind DN (if required)"));
         printf(" %s\n", "-P [--pass]");
-        printf("    %s\n", _("ldap password (if required, or set the password through environment variable 'LDAP_PASSWORD')"));
+        printf("    %s\n", _("ldap password (if required, or set the password through environment "
+                                                 "variable 'LDAP_PASSWORD')"));
         printf(" %s\n", "-T [--starttls]");
         printf("    %s\n", _("use starttls mechanism introduced in protocol version 3"));
         printf(" %s\n", "-S [--ssl]");
-        printf("    %s %i\n", _("use ldaps (ldap v2 ssl method). this also sets the default port to"), LDAPS_PORT);
+        printf("    %s %i\n", _("use ldaps (ldap v2 ssl method). this also sets the default port to"),
+                   LDAPS_PORT);
 
 #ifdef HAVE_LDAP_SET_OPTION
         printf(" %s\n", "-2 [--ver2]");
@@ -459,13 +575,16 @@ void print_help(void) {
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf(UT_VERBOSE);
+        printf(UT_OUTPUT_FORMAT);
 
         printf("\n");
         printf("%s\n", _("Notes:"));
         printf(" %s\n", _("If this plugin is called via 'check_ldaps', method 'STARTTLS' will be"));
-        printf(_(" implied (using default port %i) unless --port=636 is specified. In that case\n"), DEFAULT_PORT);
+        printf(_(" implied (using default port %i) unless --port=636 is specified. In that case\n"),
+                   DEFAULT_PORT);
         printf(" %s\n", _("'SSL on connect' will be used no matter how the plugin was called."));
-        printf(" %s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' or '--ssl' flags"));
+        printf(" %s\n", _("This detection is deprecated, please use 'check_ldap' with the '--starttls' "
+                                          "or '--ssl' flags"));
         printf(" %s\n", _("to define the behaviour explicitly instead."));
         printf(" %s\n", _("The parameters --warn-entries and --crit-entries are optional."));
 
diff --git a/plugins/check_ldap.d/config.h b/plugins/check_ldap.d/config.h
index c8a40610..50191725 100644
--- a/plugins/check_ldap.d/config.h
+++ b/plugins/check_ldap.d/config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
 #include "thresholds.h"
 #include <stddef.h>
 
@@ -25,13 +26,11 @@ typedef struct {
         int ld_protocol;
 #endif
 
-        char *warn_entries;
-        char *crit_entries;
-        thresholds *entries_thresholds;
-        bool warn_time_set;
-        double warn_time;
-        bool crit_time_set;
-        double crit_time;
+        mp_thresholds entries_thresholds;
+        mp_thresholds connection_time_threshold;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_ldap_config;
 
 check_ldap_config check_ldap_config_init() {
@@ -48,13 +47,10 @@ check_ldap_config check_ldap_config_init() {
                 .ld_protocol = DEFAULT_PROTOCOL,
 #endif
 
-                .warn_entries = NULL,
-                .crit_entries = NULL,
-                .entries_thresholds = NULL,
-                .warn_time_set = false,
-                .warn_time = 0,
-                .crit_time_set = false,
-                .crit_time = 0,
+                .entries_thresholds = mp_thresholds_init(),
+                .connection_time_threshold = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 1431d130..644cd604 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -1,350 +1,430 @@
 /*****************************************************************************
-*
-* Monitoring check_load plugin
-*
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_load plugin
-*
-* This plugin tests the current system load average.
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring check_load plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2007 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_load plugin
+ *
+ * This plugin tests the current system load average.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_load";
 const char *copyright = "1999-2022";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "./common.h"
+#include <string.h>
 #include "./runcmd.h"
 #include "./utils.h"
 #include "./popen.h"
+#include "../lib/states.h"
+#include "../lib/output.h"
+#include "../lib/perfdata.h"
+#include "../lib/thresholds.h"
+#include "check_load.d/config.h"
 
-#include <string.h>
-
-#ifdef HAVE_SYS_LOADAVG_H
-#include <sys/loadavg.h>
-#endif
+// getloadavg comes from gnulib
+#include "../gl/stdlib.h"
 
 /* needed for compilation under NetBSD, as suggested by Andy Doran */
 #ifndef LOADAVG_1MIN
-#define LOADAVG_1MIN    0
-#define LOADAVG_5MIN    1
-#define LOADAVG_15MIN   2
+#       define LOADAVG_1MIN  0
+#       define LOADAVG_5MIN  1
+#       define LOADAVG_15MIN 2
 #endif /* !defined LOADAVG_1MIN */
 
+typedef struct {
+        int errorcode;
+        check_load_config config;
+} check_load_config_wrapper;
+static check_load_config_wrapper process_arguments(int argc, char **argv);
+
+void print_help(void);
+void print_usage(void);
+typedef struct {
+        int errorcode;
+        char **top_processes;
+} top_processes_result;
+static top_processes_result print_top_consuming_processes(unsigned long n_procs_to_show);
+
+typedef struct {
+        mp_range load[3];
+} parsed_thresholds;
+static parsed_thresholds get_threshold(char *arg) {
+        size_t index;
+        char *str = arg;
+        char *tmp_pointer;
+        bool valid = false;
+
+        parsed_thresholds result = {
+                .load =
+                        {
+                                mp_range_init(),
+                                mp_range_init(),
+                                mp_range_init(),
+                        },
+        };
 
-static int process_arguments (int argc, char **argv);
-static int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-static int print_top_consuming_processes();
-
-static int n_procs_to_show = 0;
-
-/* strictly for pretty-print usage in loops */
-static const int nums[3] = { 1, 5, 15 };
-
-/* provide some fairly sane defaults */
-double wload[3] = { 0.0, 0.0, 0.0 };
-double cload[3] = { 0.0, 0.0, 0.0 };
-#define la1 la[0]
-#define la5 la[1]
-#define la15 la[2]
-
-char *status_line;
-bool take_into_account_cpus = false;
-
-static void
-get_threshold(char *arg, double *th)
-{
-        size_t i, n;
-        int valid = 0;
-        char *str = arg, *p;
+        size_t arg_length = strlen(arg);
+        for (index = 0; index < 3; index++) {
+                double tmp = strtod(str, &tmp_pointer);
+                if (tmp_pointer == str) {
+                        break;
+                }
 
-        n = strlen(arg);
-        for(i = 0; i < 3; i++) {
-                th[i] = strtod(str, &p);
-                if(p == str) break;
+                result.load[index] = mp_range_set_end(result.load[index], mp_create_pd_value(tmp));
 
-                valid = 1;
-                str = p + 1;
-                if(n <= (size_t)(str - arg)) break;
+                valid = true;
+                str = tmp_pointer + 1;
+                if (arg_length <= (size_t)(str - arg)) {
+                        break;
+                }
         }
 
         /* empty argument or non-floatish, so warn about it and die */
-        if(!i && !valid) usage (_("Warning threshold must be float or float triplet!\n"));
+        if (!index && !valid) {
+                usage(_("Warning threshold must be float or float triplet!\n"));
+        }
 
-        if(i != 2) {
+        if (index != 2) {
                 /* one or more numbers were given, so fill array with last
                  * we got (most likely to NOT produce the least expected result) */
-                for(n = i; n < 3; n++) th[n] = th[i];
+                for (size_t tmp_index = index; tmp_index < 3; tmp_index++) {
+                        result.load[tmp_index] = result.load[index];
+                }
         }
+        return result;
 }
 
-
-int
-main (int argc, char **argv)
-{
-        int result = -1;
-        int i;
-        long numcpus;
-
-        double la[3] = { 0.0, 0.0, 0.0 };       /* NetBSD complains about uninitialized arrays */
-#ifndef HAVE_GETLOADAVG
-        char input_buffer[MAX_INPUT_BUFFER];
-#endif
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
         setlocale(LC_NUMERIC, "POSIX");
 
         /* Parse extra opts if any */
-        argv = np_extra_opts (&argc, argv, progname);
-
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
-
-#ifdef HAVE_GETLOADAVG
-        result = getloadavg (la, 3);
-        if (result != 3)
-                return STATE_UNKNOWN;
-#else
-        child_process = spopen (PATH_TO_UPTIME);
-        if (child_process == NULL) {
-                printf (_("Error opening %s\n"), PATH_TO_UPTIME);
-                return STATE_UNKNOWN;
-        }
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
-        if (child_stderr == NULL) {
-                printf (_("Could not open stderr for %s\n"), PATH_TO_UPTIME);
-        }
-        fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
-    if(strstr(input_buffer, "load average:")) {
-            sscanf (input_buffer, "%*[^l]load average: %lf, %lf, %lf", &la1, &la5, &la15);
-    }
-    else if(strstr(input_buffer, "load averages:")) {
-            sscanf (input_buffer, "%*[^l]load averages: %lf, %lf, %lf", &la1, &la5, &la15);
-    }
-    else {
-                printf (_("could not parse load from uptime %s: %d\n"), PATH_TO_UPTIME, result);
-                return STATE_UNKNOWN;
-    }
-
-        result = spclose (child_process);
-        if (result) {
-                printf (_("Error code %d returned in %s\n"), result, PATH_TO_UPTIME);
-                return STATE_UNKNOWN;
-        }
-#endif
-
-        if ((la[0] < 0.0) || (la[1] < 0.0) || (la[2] < 0.0)) {
-#ifdef HAVE_GETLOADAVG
-                printf (_("Error in getloadavg()\n"));
-#else
-                printf (_("Error processing %s\n"), PATH_TO_UPTIME);
-#endif
-                return STATE_UNKNOWN;
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_load_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
         }
 
-        /* we got this far, so assume OK until we've measured */
-        result = STATE_OK;
+        const check_load_config config = tmp_config.config;
+
+        double load_values[3] = {0, 0, 0};
 
-        xasprintf(&status_line, _("load average: %.2f, %.2f, %.2f"), la1, la5, la15);
-        xasprintf(&status_line, ("total %s"), status_line);
+        // this should be getloadavg from gnulib, should work everywhere™
+        int error = getloadavg(load_values, 3);
+        if (error != 3) {
+                die(STATE_UNKNOWN, _("Failed to retrieve load values"));
+        }
 
+        mp_check overall = mp_check_init();
+        if (config.output_format_set) {
+                mp_set_format(config.output_format);
+        }
 
-        double scaled_la[3] = { 0.0, 0.0, 0.0 };
         bool is_using_scaled_load_values = false;
-
-        if (take_into_account_cpus == true && (numcpus = GET_NUMBER_OF_CPUS()) > 0) {
+        long numcpus;
+        if (config.take_into_account_cpus && ((numcpus = GET_NUMBER_OF_CPUS()) > 0)) {
                 is_using_scaled_load_values = true;
 
-                scaled_la[0] = la[0] / numcpus;
-                scaled_la[1] = la[1] / numcpus;
-                scaled_la[2] = la[2] / numcpus;
+                double scaled_la[3] = {
+                        load_values[0] / numcpus,
+                        load_values[1] / numcpus,
+                        load_values[2] / numcpus,
+                };
+
+                mp_subcheck scaled_load_sc = mp_subcheck_init();
+                scaled_load_sc = mp_set_subcheck_default_state(scaled_load_sc, STATE_OK);
+                scaled_load_sc.output = "Scaled Load (divided by number of CPUs";
+
+                mp_perfdata pd_scaled_load1 = perfdata_init();
+                pd_scaled_load1.label = "scaled_load1";
+                pd_scaled_load1 = mp_set_pd_value(pd_scaled_load1, scaled_la[0]);
+                pd_scaled_load1 = mp_pd_set_thresholds(pd_scaled_load1, config.th_load[0]);
+
+                mp_subcheck scaled_load_sc1 = mp_subcheck_init();
+                scaled_load_sc1 = mp_set_subcheck_state(scaled_load_sc1, mp_get_pd_status(pd_scaled_load1));
+                mp_add_perfdata_to_subcheck(&scaled_load_sc1, pd_scaled_load1);
+                xasprintf(&scaled_load_sc1.output, "1 Minute: %s",
+                                  pd_value_to_string(pd_scaled_load1.value));
+                mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc1);
+
+                mp_perfdata pd_scaled_load5 = perfdata_init();
+                pd_scaled_load5.label = "scaled_load5";
+                pd_scaled_load5 = mp_set_pd_value(pd_scaled_load5, scaled_la[1]);
+                pd_scaled_load5 = mp_pd_set_thresholds(pd_scaled_load5, config.th_load[1]);
+
+                mp_subcheck scaled_load_sc5 = mp_subcheck_init();
+                scaled_load_sc5 = mp_set_subcheck_state(scaled_load_sc5, mp_get_pd_status(pd_scaled_load5));
+                mp_add_perfdata_to_subcheck(&scaled_load_sc5, pd_scaled_load5);
+                xasprintf(&scaled_load_sc5.output, "5 Minutes: %s",
+                                  pd_value_to_string(pd_scaled_load5.value));
+                mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc5);
+
+                mp_perfdata pd_scaled_load15 = perfdata_init();
+                pd_scaled_load15.label = "scaled_load15";
+                pd_scaled_load15 = mp_set_pd_value(pd_scaled_load15, scaled_la[2]);
+                pd_scaled_load15 = mp_pd_set_thresholds(pd_scaled_load15, config.th_load[2]);
+
+                mp_subcheck scaled_load_sc15 = mp_subcheck_init();
+                scaled_load_sc15 =
+                        mp_set_subcheck_state(scaled_load_sc15, mp_get_pd_status(pd_scaled_load15));
+                mp_add_perfdata_to_subcheck(&scaled_load_sc15, pd_scaled_load15);
+                xasprintf(&scaled_load_sc15.output, "15 Minutes: %s",
+                                  pd_value_to_string(pd_scaled_load15.value));
+                mp_add_subcheck_to_subcheck(&scaled_load_sc, scaled_load_sc15);
+
+                mp_add_subcheck_to_check(&overall, scaled_load_sc);
+        }
+
+        mp_subcheck load_sc = mp_subcheck_init();
+        load_sc = mp_set_subcheck_default_state(load_sc, STATE_OK);
+        load_sc.output = "Total Load";
 
-                char *tmp = NULL;
-                xasprintf(&tmp, _("load average: %.2f, %.2f, %.2f"), scaled_la[0], scaled_la[1], scaled_la[2]);
-                xasprintf(&status_line, "scaled %s - %s", tmp, status_line);
+        mp_perfdata pd_load1 = perfdata_init();
+        pd_load1.label = "load1";
+        pd_load1 = mp_set_pd_value(pd_load1, load_values[0]);
+        if (!is_using_scaled_load_values) {
+                pd_load1 = mp_pd_set_thresholds(pd_load1, config.th_load[0]);
         }
 
-        for(i = 0; i < 3; i++) {
-                if (is_using_scaled_load_values) {
-                        if(scaled_la[i] > cload[i]) {
-                                result = STATE_CRITICAL;
-                                break;
-                        }
-                        else if(scaled_la[i] > wload[i]) result = STATE_WARNING;
-                } else {
-                        if(la[i] > cload[i]) {
-                                result = STATE_CRITICAL;
-                                break;
-                        }
-                        else if(la[i] > wload[i]) result = STATE_WARNING;
-                }
+        mp_subcheck load_sc1 = mp_subcheck_init();
+        load_sc1 = mp_set_subcheck_state(load_sc1, mp_get_pd_status(pd_load1));
+        mp_add_perfdata_to_subcheck(&load_sc1, pd_load1);
+        xasprintf(&load_sc1.output, "1 Minute: %s", pd_value_to_string(pd_load1.value));
+        mp_add_subcheck_to_subcheck(&load_sc, load_sc1);
+
+        mp_perfdata pd_load5 = perfdata_init();
+        pd_load5.label = "load5";
+        pd_load5 = mp_set_pd_value(pd_load5, load_values[1]);
+        if (!is_using_scaled_load_values) {
+                pd_load5 = mp_pd_set_thresholds(pd_load5, config.th_load[1]);
         }
 
-        printf("LOAD %s - %s|", state_text(result), status_line);
-        for(i = 0; i < 3; i++) {
-                if (is_using_scaled_load_values) {
-                        printf("load%d=%.3f;;;0; ", nums[i], la[i]);
-                        printf("scaled_load%d=%.3f;%.3f;%.3f;0; ", nums[i], scaled_la[i], wload[i], cload[i]);
-                } else {
-                        printf("load%d=%.3f;%.3f;%.3f;0; ", nums[i], la[i], wload[i], cload[i]);
-                }
+        mp_subcheck load_sc5 = mp_subcheck_init();
+        load_sc5 = mp_set_subcheck_state(load_sc5, mp_get_pd_status(pd_load5));
+        mp_add_perfdata_to_subcheck(&load_sc5, pd_load5);
+        xasprintf(&load_sc5.output, "5 Minutes: %s", pd_value_to_string(pd_load5.value));
+        mp_add_subcheck_to_subcheck(&load_sc, load_sc5);
+
+        mp_perfdata pd_load15 = perfdata_init();
+        pd_load15.label = "load15";
+        pd_load15 = mp_set_pd_value(pd_load15, load_values[2]);
+        if (!is_using_scaled_load_values) {
+                pd_load15 = mp_pd_set_thresholds(pd_load15, config.th_load[2]);
         }
 
-        putchar('\n');
-        if (n_procs_to_show > 0) {
-                print_top_consuming_processes();
+        mp_subcheck load_sc15 = mp_subcheck_init();
+        load_sc15 = mp_set_subcheck_state(load_sc15, mp_get_pd_status(pd_load15));
+        mp_add_perfdata_to_subcheck(&load_sc15, pd_load15);
+        xasprintf(&load_sc15.output, "15 Minutes: %s", pd_value_to_string(pd_load15.value));
+        mp_add_subcheck_to_subcheck(&load_sc, load_sc15);
+
+        mp_add_subcheck_to_check(&overall, load_sc);
+
+        if (config.n_procs_to_show > 0) {
+                mp_subcheck top_proc_sc = mp_subcheck_init();
+                top_proc_sc = mp_set_subcheck_state(top_proc_sc, STATE_OK);
+                top_processes_result top_proc = print_top_consuming_processes(config.n_procs_to_show);
+                xasprintf(&top_proc_sc.output, "Top %lu CPU time consuming processes",
+                                  config.n_procs_to_show);
+
+                if (top_proc.errorcode == OK) {
+                        for (unsigned long i = 0; i < config.n_procs_to_show; i++) {
+                                xasprintf(&top_proc_sc.output, "%s\n%s", top_proc_sc.output,
+                                                  top_proc.top_processes[i]);
+                        }
+                }
+
+                mp_add_subcheck_to_check(&overall, top_proc_sc);
         }
-        return result;
-}
 
+        mp_exit(overall);
+}
 
 /* process command-line arguments */
-static int
-process_arguments (int argc, char **argv)
-{
-        int c = 0;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"warning", required_argument, 0, 'w'},
-                {"critical", required_argument, 0, 'c'},
-                {"percpu", no_argument, 0, 'r'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"procs-to-show", required_argument, 0, 'n'},
-                {0, 0, 0, 0}
+static check_load_config_wrapper process_arguments(int argc, char **argv) {
+
+        enum {
+                output_format_index = CHAR_MAX + 1,
         };
 
-        if (argc < 2)
-                return ERROR;
+        static struct option longopts[] = {{"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"percpu", no_argument, 0, 'r'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"procs-to-show", required_argument, 0, 'n'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
+                                                                           {0, 0, 0, 0}};
+
+        check_load_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_load_config_init(),
+        };
 
-        while (1) {
-                c = getopt_long (argc, argv, "Vhrc:w:n:", longopts, &option);
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-                if (c == -1 || c == EOF)
-                        break;
+        while (true) {
+                int option = 0;
+                int option_index = getopt_long(argc, argv, "Vhrc:w:n:", longopts, &option);
 
-                switch (c) {
-                case 'w': /* warning time threshold */
-                        get_threshold(optarg, wload);
+                if (option_index == -1 || option_index == EOF) {
                         break;
-                case 'c': /* critical time threshold */
-                        get_threshold(optarg, cload);
+                }
+
+                switch (option_index) {
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_set = true;
+                        result.config.output_format = parser.output_format;
                         break;
+                }
+                case 'w': /* warning time threshold */ {
+                        parsed_thresholds warning_range = get_threshold(optarg);
+                        result.config.th_load[0].warning = warning_range.load[0];
+                        result.config.th_load[0].warning_is_set = true;
+
+                        result.config.th_load[1].warning = warning_range.load[1];
+                        result.config.th_load[1].warning_is_set = true;
+
+                        result.config.th_load[2].warning = warning_range.load[2];
+                        result.config.th_load[2].warning_is_set = true;
+                } break;
+                case 'c': /* critical time threshold */ {
+                        parsed_thresholds critical_range = get_threshold(optarg);
+                        result.config.th_load[0].critical = critical_range.load[0];
+                        result.config.th_load[0].critical_is_set = true;
+
+                        result.config.th_load[1].critical = critical_range.load[1];
+                        result.config.th_load[1].critical_is_set = true;
+
+                        result.config.th_load[2].critical = critical_range.load[2];
+                        result.config.th_load[2].critical_is_set = true;
+                } break;
                 case 'r': /* Divide load average by number of CPUs */
-                        take_into_account_cpus = true;
+                        result.config.take_into_account_cpus = true;
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
                 case 'n':
-                        n_procs_to_show = atoi(optarg);
+                        result.config.n_procs_to_show = (unsigned long)atol(optarg);
                         break;
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (c == argc)
-                return validate_arguments ();
+        int index = optind;
+        if (index == argc) {
+                return result;
+        }
 
         /* handle the case if both arguments are missing,
          * but not if only one is given without -c or -w flag */
-        if(c - argc == 2) {
-                get_threshold(argv[c++], wload);
-                get_threshold(argv[c++], cload);
-        }
-        else if(c - argc == 1) {
-                get_threshold(argv[c++], cload);
-        }
-
-        return validate_arguments ();
-}
-
-
-static int
-validate_arguments (void)
-{
-        int i = 0;
-
-        /* match cload first, as it will give the most friendly error message
-         * if user hasn't given the -c switch properly */
-        for(i = 0; i < 3; i++) {
-                if(cload[i] < 0)
-                        die (STATE_UNKNOWN, _("Critical threshold for %d-minute load average is not specified\n"), nums[i]);
-                if(wload[i] < 0)
-                        die (STATE_UNKNOWN, _("Warning threshold for %d-minute load average is not specified\n"), nums[i]);
-                if(wload[i] > cload[i])
-                        die (STATE_UNKNOWN, _("Parameter inconsistency: %d-minute \"warning load\" is greater than \"critical load\"\n"), nums[i]);
+        if (index - argc == 2) {
+                parsed_thresholds warning_range = get_threshold(argv[index++]);
+                result.config.th_load[0].warning = warning_range.load[0];
+                result.config.th_load[0].warning_is_set = true;
+
+                result.config.th_load[1].warning = warning_range.load[1];
+                result.config.th_load[1].warning_is_set = true;
+
+                result.config.th_load[2].warning = warning_range.load[2];
+                result.config.th_load[2].warning_is_set = true;
+                parsed_thresholds critical_range = get_threshold(argv[index++]);
+                result.config.th_load[0].critical = critical_range.load[0];
+                result.config.th_load[0].critical_is_set = true;
+
+                result.config.th_load[1].critical = critical_range.load[1];
+                result.config.th_load[1].critical_is_set = true;
+
+                result.config.th_load[2].critical = critical_range.load[2];
+                result.config.th_load[2].critical_is_set = true;
+        } else if (index - argc == 1) {
+                parsed_thresholds critical_range = get_threshold(argv[index++]);
+                result.config.th_load[0].critical = critical_range.load[0];
+                result.config.th_load[0].critical_is_set = true;
+
+                result.config.th_load[1].critical = critical_range.load[1];
+                result.config.th_load[1].critical_is_set = true;
+
+                result.config.th_load[2].critical = critical_range.load[2];
+                result.config.th_load[2].critical_is_set = true;
         }
 
-        return OK;
+        return result;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+        printf("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("Copyright (c) 1999 Felipe Gustavo de Almeida <galmeida@linux.ime.usp.br>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf(_("This plugin tests the current system load average."));
 
-        printf (_("This plugin tests the current system load average."));
+        printf("\n\n");
 
-        printf ("\n\n");
+        print_usage();
 
-        print_usage ();
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf(" %s\n", "-w, --warning=WLOAD1,WLOAD5,WLOAD15");
+        printf("    %s\n", _("Exit with WARNING status if load average exceeds WLOADn"));
+        printf(" %s\n", "-c, --critical=CLOAD1,CLOAD5,CLOAD15");
+        printf("    %s\n", _("Exit with CRITICAL status if load average exceed CLOADn"));
+        printf("    %s\n", _("the load average format is the same used by \"uptime\" and \"w\""));
+        printf(" %s\n", "-r, --percpu");
+        printf("    %s\n", _("Divide the load averages by the number of CPUs (when possible)"));
+        printf(" %s\n", "-n, --procs-to-show=NUMBER_OF_PROCS");
+        printf("    %s\n", _("Number of processes to show when printing the top consuming processes."));
+        printf("    %s\n", _("NUMBER_OF_PROCS=0 disables this feature. Default value is 0"));
 
-        printf (" %s\n", "-w, --warning=WLOAD1,WLOAD5,WLOAD15");
-        printf ("    %s\n", _("Exit with WARNING status if load average exceeds WLOADn"));
-        printf (" %s\n", "-c, --critical=CLOAD1,CLOAD5,CLOAD15");
-        printf ("    %s\n", _("Exit with CRITICAL status if load average exceed CLOADn"));
-        printf ("    %s\n", _("the load average format is the same used by \"uptime\" and \"w\""));
-        printf (" %s\n", "-r, --percpu");
-        printf ("    %s\n", _("Divide the load averages by the number of CPUs (when possible)"));
-        printf (" %s\n", "-n, --procs-to-show=NUMBER_OF_PROCS");
-        printf ("    %s\n", _("Number of processes to show when printing the top consuming processes."));
-        printf ("    %s\n", _("NUMBER_OF_PROCS=0 disables this feature. Default value is 0"));
-
-        printf (UT_SUPPORT);
+        printf(UT_OUTPUT_FORMAT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s [-r] -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15 [-n NUMBER_OF_PROCS]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s [-r] -w WLOAD1,WLOAD5,WLOAD15 -c CLOAD1,CLOAD5,CLOAD15 [-n NUMBER_OF_PROCS]\n",
+                   progname);
 }
 
 #ifdef PS_USES_PROCPCPU
@@ -356,36 +436,52 @@ int cmpstringp(const void *p1, const void *p2) {
         int procrss = 0;
         float procpcpu = 0;
         char procstat[8];
-#ifdef PS_USES_PROCETIME
+#       ifdef PS_USES_PROCETIME
         char procetime[MAX_INPUT_BUFFER];
-#endif /* PS_USES_PROCETIME */
+#       endif /* PS_USES_PROCETIME */
         char procprog[MAX_INPUT_BUFFER];
         int pos;
-        sscanf (* (char * const *) p1, PS_FORMAT, PS_VARLIST);
+        sscanf(*(char *const *)p1, PS_FORMAT, PS_VARLIST);
         float procpcpu1 = procpcpu;
-        sscanf (* (char * const *) p2, PS_FORMAT, PS_VARLIST);
+        sscanf(*(char *const *)p2, PS_FORMAT, PS_VARLIST);
         return procpcpu1 < procpcpu;
 }
 #endif /* PS_USES_PROCPCPU */
 
-static int print_top_consuming_processes() {
-        int i = 0;
-        struct output chld_out, chld_err;
-        if(np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0) != 0){
+static top_processes_result print_top_consuming_processes(unsigned long n_procs_to_show) {
+        top_processes_result result = {
+                .errorcode = OK,
+        };
+        output chld_out;
+        output chld_err;
+        if (np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0) != 0) {
                 fprintf(stderr, _("'%s' exited with non-zero status.\n"), PS_COMMAND);
-                return STATE_UNKNOWN;
+                result.errorcode = ERROR;
+                return result;
         }
+
         if (chld_out.lines < 2) {
                 fprintf(stderr, _("some error occurred getting procs list.\n"));
-                return STATE_UNKNOWN;
+                result.errorcode = ERROR;
+                return result;
         }
+
 #ifdef PS_USES_PROCPCPU
-        qsort(chld_out.line + 1, chld_out.lines - 1, sizeof(char*), cmpstringp);
+        qsort(chld_out.line + 1, chld_out.lines - 1, sizeof(char *), cmpstringp);
 #endif /* PS_USES_PROCPCPU */
-        int lines_to_show = chld_out.lines < (size_t)(n_procs_to_show + 1)
-                        ? (int)chld_out.lines : n_procs_to_show + 1;
-        for (i = 0; i < lines_to_show; i += 1) {
-                printf("%s\n", chld_out.line[i]);
+        unsigned long lines_to_show =
+                chld_out.lines < (size_t)(n_procs_to_show + 1) ? chld_out.lines : n_procs_to_show + 1;
+
+        result.top_processes = calloc(lines_to_show, sizeof(char *));
+        if (result.top_processes == NULL) {
+                // Failed allocation
+                result.errorcode = ERROR;
+                return result;
         }
-        return OK;
+
+        for (unsigned long i = 0; i < lines_to_show; i += 1) {
+                xasprintf(&result.top_processes[i], "%s", chld_out.line[i]);
+        }
+
+        return result;
 }
diff --git a/plugins/check_load.d/config.h b/plugins/check_load.d/config.h
new file mode 100644
index 00000000..fd735455
--- /dev/null
+++ b/plugins/check_load.d/config.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "output.h"
+#include "thresholds.h"
+typedef struct {
+        mp_thresholds th_load[3];
+
+        bool take_into_account_cpus;
+        unsigned long n_procs_to_show;
+
+        mp_output_format output_format;
+        bool output_format_set;
+} check_load_config;
+
+check_load_config check_load_config_init() {
+        check_load_config tmp = {
+                .th_load =
+                        {
+                                mp_thresholds_init(),
+                                mp_thresholds_init(),
+                                mp_thresholds_init(),
+                        },
+
+                .take_into_account_cpus = false,
+                .n_procs_to_show = 0,
+
+                .output_format_set = false,
+        };
+        return tmp;
+}
diff --git a/plugins/check_mrtg.c b/plugins/check_mrtg.c
index 5bd276dc..cdc2a035 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -29,14 +29,18 @@
  *
  *****************************************************************************/
 
-const char *progname = "check_mrtg";
-const char *copyright = "1999-2024";
-const char *email = "devel@monitoring-plugins.org";
-
 #include "common.h"
+#include "output.h"
+#include "perfdata.h"
+#include "states.h"
+#include "thresholds.h"
 #include "utils.h"
 #include "check_mrtg.d/config.h"
 
+const char *progname = "check_mrtg";
+const char *copyright = "1999-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 typedef struct {
         int errorcode;
         check_mrtg_config config;
@@ -62,11 +66,24 @@ int main(int argc, char **argv) {
 
         const check_mrtg_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
+        mp_check overall = mp_check_init();
+
         /* open the MRTG log file for reading */
+        mp_subcheck sc_open_mrtg_log_file = mp_subcheck_init();
         FILE *mtrg_log_file = fopen(config.log_file, "r");
         if (mtrg_log_file == NULL) {
-                printf(_("Unable to open MRTG log file\n"));
-                return STATE_UNKNOWN;
+                xasprintf(&sc_open_mrtg_log_file.output, "unable to open MRTG log file");
+                sc_open_mrtg_log_file = mp_set_subcheck_state(sc_open_mrtg_log_file, STATE_UNKNOWN);
+                mp_add_subcheck_to_check(&overall, sc_open_mrtg_log_file);
+                mp_exit(overall);
+        } else {
+                xasprintf(&sc_open_mrtg_log_file.output, "opened MRTG log file");
+                sc_open_mrtg_log_file = mp_set_subcheck_state(sc_open_mrtg_log_file, STATE_OK);
+                mp_add_subcheck_to_check(&overall, sc_open_mrtg_log_file);
         }
 
         time_t timestamp = 0;
@@ -120,17 +137,32 @@ int main(int argc, char **argv) {
         fclose(mtrg_log_file);
 
         /* if we couldn't read enough data, return an unknown error */
+        mp_subcheck sc_process_mrtg_log_file = mp_subcheck_init();
         if (line <= 2) {
-                printf(_("Unable to process MRTG log file\n"));
-                return STATE_UNKNOWN;
+                xasprintf(&sc_process_mrtg_log_file.output, "unable to process MRTG log file");
+                sc_process_mrtg_log_file = mp_set_subcheck_state(sc_process_mrtg_log_file, STATE_UNKNOWN);
+                mp_exit(overall);
+        } else {
+                xasprintf(&sc_process_mrtg_log_file.output, "processed MRTG log file");
+                sc_process_mrtg_log_file = mp_set_subcheck_state(sc_process_mrtg_log_file, STATE_OK);
+                mp_add_subcheck_to_check(&overall, sc_process_mrtg_log_file);
         }
 
         /* make sure the MRTG data isn't too old */
         time_t current_time;
         time(&current_time);
+        mp_subcheck sc_data_expired = mp_subcheck_init();
         if (config.expire_minutes > 0 && (current_time - timestamp) > (config.expire_minutes * 60)) {
-                printf(_("MRTG data has expired (%d minutes old)\n"), (int)((current_time - timestamp) / 60));
-                return STATE_WARNING;
+                xasprintf(&sc_data_expired.output, "MRTG data has expired (%d minutes old)",
+                                  (int)((current_time - timestamp) / 60));
+                sc_data_expired = mp_set_subcheck_state(sc_data_expired, STATE_WARNING);
+                mp_add_subcheck_to_check(&overall, sc_data_expired);
+                mp_exit(overall);
+        } else {
+                xasprintf(&sc_data_expired.output, "MRTG data should be valid (%d minutes old)",
+                                  (int)((current_time - timestamp) / 60));
+                sc_data_expired = mp_set_subcheck_state(sc_data_expired, STATE_OK);
+                mp_add_subcheck_to_check(&overall, sc_data_expired);
         }
 
         unsigned long rate = 0L;
@@ -141,27 +173,40 @@ int main(int argc, char **argv) {
                 rate = maximum_value_rate;
         }
 
-        int result = STATE_OK;
-        if (config.value_critical_threshold_set && rate > config.value_critical_threshold) {
-                result = STATE_CRITICAL;
-        } else if (config.value_warning_threshold_set && rate > config.value_warning_threshold) {
-                result = STATE_WARNING;
-        }
+        mp_subcheck sc_values = mp_subcheck_init();
+        mp_perfdata pd_value = perfdata_init();
+        pd_value = mp_set_pd_value(pd_value, rate);
+        pd_value.label = config.label;
+        pd_value = mp_pd_set_thresholds(pd_value, config.values_threshold);
 
-        printf("%s. %s = %lu %s|%s\n", (config.use_average) ? _("Avg") : _("Max"), config.label, rate, config.units,
-                   perfdata(config.label, (long)rate, config.units, config.value_warning_threshold_set, (long)config.value_warning_threshold,
-                                        config.value_critical_threshold_set, (long)config.value_critical_threshold, 0, 0, 0, 0));
+        sc_values = mp_set_subcheck_state(sc_values, mp_get_pd_status(pd_value));
+        xasprintf(&sc_values.output, "%s. %s = %lu %s", (config.use_average) ? _("Avg") : _("Max"),
+                          config.label, rate, config.units);
 
-        return result;
+        mp_add_subcheck_to_check(&overall, sc_values);
+
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
 check_mrtg_config_wrapper process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {
-                {"logfile", required_argument, 0, 'F'},  {"expires", required_argument, 0, 'e'},  {"aggregation", required_argument, 0, 'a'},
-                {"variable", required_argument, 0, 'v'}, {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},
-                {"label", required_argument, 0, 'l'},    {"units", required_argument, 0, 'u'},    {"variable", required_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},        {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
+        enum {
+                output_format_index,
+        };
+
+        static struct option longopts[] = {{"logfile", required_argument, 0, 'F'},
+                                                                           {"expires", required_argument, 0, 'e'},
+                                                                           {"aggregation", required_argument, 0, 'a'},
+                                                                           {"variable", required_argument, 0, 'v'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"label", required_argument, 0, 'l'},
+                                                                           {"units", required_argument, 0, 'u'},
+                                                                           {"variable", required_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
+                                                                           {0, 0, 0, 0}};
 
         check_mrtg_config_wrapper result = {
                 .errorcode = OK,
@@ -208,14 +253,22 @@ check_mrtg_config_wrapper process_arguments(int argc, char **argv) {
                                 usage4(_("Invalid variable number"));
                         }
                         break;
-                case 'w': /* critical time threshold */
-                        result.config.value_warning_threshold_set = true;
-                        result.config.value_warning_threshold = strtoul(optarg, NULL, 10);
-                        break;
-                case 'c': /* warning time threshold */
-                        result.config.value_critical_threshold_set = true;
-                        result.config.value_critical_threshold = strtoul(optarg, NULL, 10);
-                        break;
+                case 'w': /* critical time threshold */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning threshold");
+                        }
+                        result.config.values_threshold =
+                                mp_thresholds_set_warn(result.config.values_threshold, tmp.range);
+                } break;
+                case 'c': /* warning time threshold */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical threshold");
+                        }
+                        result.config.values_threshold =
+                                mp_thresholds_set_crit(result.config.values_threshold, tmp.range);
+                } break;
                 case 'l': /* label */
                         result.config.label = optarg;
                         break;
@@ -230,6 +283,17 @@ check_mrtg_config_wrapper process_arguments(int argc, char **argv) {
                         exit(STATE_UNKNOWN);
                 case '?': /* help */
                         usage5();
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 }
         }
 
@@ -242,7 +306,9 @@ check_mrtg_config_wrapper process_arguments(int argc, char **argv) {
                 if (is_intpos(argv[option_char])) {
                         result.config.expire_minutes = atoi(argv[option_char++]);
                 } else {
-                        die(STATE_UNKNOWN, _("%s is not a valid expiration time\nUse '%s -h' for additional help\n"), argv[option_char], progname);
+                        die(STATE_UNKNOWN,
+                                _("%s is not a valid expiration time\nUse '%s -h' for additional help\n"),
+                                argv[option_char], progname);
                 }
         }
 
@@ -262,14 +328,22 @@ check_mrtg_config_wrapper process_arguments(int argc, char **argv) {
                 }
         }
 
-        if (argc > option_char && !result.config.value_warning_threshold_set) {
-                result.config.value_warning_threshold_set = true;
-                result.config.value_warning_threshold = strtoul(argv[option_char++], NULL, 10);
+        if (argc > option_char && !result.config.values_threshold.warning_is_set) {
+                mp_range_parsed tmp = mp_parse_range_string(argv[option_char++]);
+                if (tmp.error != MP_PARSING_SUCCES) {
+                        die(STATE_UNKNOWN, "failed to parse warning threshold");
+                }
+                result.config.values_threshold =
+                        mp_thresholds_set_warn(result.config.values_threshold, tmp.range);
         }
 
-        if (argc > option_char && !result.config.value_critical_threshold_set) {
-                result.config.value_critical_threshold_set = true;
-                result.config.value_critical_threshold = strtoul(argv[option_char++], NULL, 10);
+        if (argc > option_char && !result.config.values_threshold.critical_is_set) {
+                mp_range_parsed tmp = mp_parse_range_string(argv[option_char++]);
+                if (tmp.error != MP_PARSING_SUCCES) {
+                        die(STATE_UNKNOWN, "failed to parse critical threshold");
+                }
+                result.config.values_threshold =
+                        mp_thresholds_set_crit(result.config.values_threshold, tmp.range);
         }
 
         if (argc > option_char && strlen(result.config.label) == 0) {
@@ -333,26 +407,35 @@ void print_help(void) {
         printf("   %s\n", _("Option units label for data (Example: Packets/Sec, Errors/Sec,"));
         printf("   %s\n", _("\"Bytes Per Second\", \"%% Utilization\")"));
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
-        printf(" %s\n", _("If the value exceeds the <vwl> threshold, a WARNING status is returned. If"));
+        printf(" %s\n",
+                   _("If the value exceeds the <vwl> threshold, a WARNING status is returned. If"));
         printf(" %s\n", _("the value exceeds the <vcl> threshold, a CRITICAL status is returned.  If"));
         printf(" %s\n", _("the data in the log file is older than <expire_minutes> old, a WARNING"));
         printf(" %s\n", _("status is returned and a warning message is printed."));
 
         printf("\n");
-        printf(" %s\n", _("This plugin is useful for monitoring MRTG data that does not correspond to"));
-        printf(" %s\n", _("bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth)."));
-        printf(" %s\n", _("It can be used to monitor any kind of data that MRTG is monitoring - errors,"));
-        printf(" %s\n", _("packets/sec, etc.  I use MRTG in conjunction with the Novell NLM that allows"));
+        printf(" %s\n",
+                   _("This plugin is useful for monitoring MRTG data that does not correspond to"));
+        printf(" %s\n",
+                   _("bandwidth usage.  (Use the check_mrtgtraf plugin for monitoring bandwidth)."));
+        printf(" %s\n",
+                   _("It can be used to monitor any kind of data that MRTG is monitoring - errors,"));
+        printf(" %s\n",
+                   _("packets/sec, etc.  I use MRTG in conjunction with the Novell NLM that allows"));
         printf(" %s\n", _("me to track processor utilization, user connections, drive space, etc and"));
         printf(" %s\n\n", _("this plugin works well for monitoring that kind of data as well."));
 
         printf("%s\n", _("Notes:"));
-        printf(" %s\n", _("- This plugin only monitors one of the two variables stored in the MRTG log"));
+        printf(" %s\n",
+                   _("- This plugin only monitors one of the two variables stored in the MRTG log"));
         printf("   %s\n", _("file.  If you want to monitor both values you will have to define two"));
         printf("   %s\n", _("commands with different values for the <variable> argument.  Of course,"));
         printf("   %s\n", _("you can always hack the code to make this plugin work for you..."));
-        printf(" %s\n", _("- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded from"));
+        printf(" %s\n",
+                   _("- MRTG stands for the Multi Router Traffic Grapher.  It can be downloaded from"));
         printf("   %s\n", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
 
         printf(UT_SUPPORT);
diff --git a/plugins/check_mrtg.d/config.h b/plugins/check_mrtg.d/config.h
index 96b849a2..4a5b5595 100644
--- a/plugins/check_mrtg.d/config.h
+++ b/plugins/check_mrtg.d/config.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
+#include "thresholds.h"
 #include <stddef.h>
 #include <stdlib.h>
 
@@ -12,10 +14,10 @@ typedef struct {
         char *units;
         char *log_file;
 
-        bool value_warning_threshold_set;
-        unsigned long value_warning_threshold;
-        bool value_critical_threshold_set;
-        unsigned long value_critical_threshold;
+        mp_thresholds values_threshold;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_mrtg_config;
 
 check_mrtg_config check_mrtg_config_init() {
@@ -27,10 +29,9 @@ check_mrtg_config check_mrtg_config_init() {
                 .units = NULL,
                 .log_file = NULL,
 
-                .value_warning_threshold_set = false,
-                .value_warning_threshold = 0,
-                .value_critical_threshold_set = false,
-                .value_critical_threshold = 0,
+                .values_threshold = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index 8c7cf8aa..46b94f57 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -29,14 +29,18 @@
  *
  *****************************************************************************/
 
-const char *progname = "check_mrtgtraf";
-const char *copyright = "1999-2024";
-const char *email = "devel@monitoring-plugins.org";
-
 #include "check_mrtgtraf.d/config.h"
 #include "common.h"
+#include "output.h"
+#include "perfdata.h"
+#include "states.h"
+#include "thresholds.h"
 #include "utils.h"
 
+const char *progname = "check_mrtgtraf";
+const char *copyright = "1999-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 typedef struct {
         int errorcode;
         check_mrtgtraf_config config;
@@ -61,10 +65,24 @@ int main(int argc, char **argv) {
 
         const check_mrtgtraf_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
+        mp_check overall = mp_check_init();
+        mp_subcheck sc_open_mrtg_log_file = mp_subcheck_init();
+
         /* open the MRTG log file for reading */
         FILE *mrtg_log_file_ptr = fopen(config.log_file, "r");
         if (mrtg_log_file_ptr == NULL) {
-                usage4(_("Unable to open MRTG log file"));
+                sc_open_mrtg_log_file = mp_set_subcheck_state(sc_open_mrtg_log_file, STATE_UNKNOWN);
+                xasprintf(&sc_open_mrtg_log_file.output, "unable to open MRTG log file");
+                mp_add_subcheck_to_check(&overall, sc_open_mrtg_log_file);
+                mp_exit(overall);
+        } else {
+                sc_open_mrtg_log_file = mp_set_subcheck_state(sc_open_mrtg_log_file, STATE_OK);
+                xasprintf(&sc_open_mrtg_log_file.output, "opened MRTG log file");
+                mp_add_subcheck_to_check(&overall, sc_open_mrtg_log_file);
         }
 
         time_t timestamp = 0L;
@@ -75,7 +93,6 @@ int main(int argc, char **argv) {
         unsigned long maximum_outgoing_rate = 0L;
         int line = 0;
         while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, mrtg_log_file_ptr)) {
-
                 line++;
 
                 /* skip the first line of the log file */
@@ -121,10 +138,20 @@ int main(int argc, char **argv) {
         /* make sure the MRTG data isn't too old */
         time_t current_time;
         time(&current_time);
+        mp_subcheck sc_expired = mp_subcheck_init();
         if ((config.expire_minutes > 0) && (current_time - timestamp) > (config.expire_minutes * 60)) {
-                die(STATE_WARNING, _("MRTG data has expired (%d minutes old)\n"), (int)((current_time - timestamp) / 60));
+                xasprintf(&sc_expired.output, "MRTG data has expired (%d minutes old)",
+                                  (int)((current_time - timestamp) / 60));
+                sc_expired = mp_set_subcheck_state(sc_expired, STATE_WARNING);
+                mp_add_subcheck_to_check(&overall, sc_expired);
+                mp_exit(overall);
         }
 
+        xasprintf(&sc_expired.output, "MRTG data should be valid (%d minutes old)",
+                          (int)((current_time - timestamp) / 60));
+        sc_expired = mp_set_subcheck_state(sc_expired, STATE_WARNING);
+        mp_add_subcheck_to_check(&overall, sc_expired);
+
         unsigned long incoming_rate = 0L;
         unsigned long outgoing_rate = 0L;
         /* else check the incoming/outgoing rates */
@@ -147,60 +174,72 @@ int main(int argc, char **argv) {
         /* report incoming traffic in KBytes/sec */
         else if (incoming_rate < (1024 * 1024)) {
                 strcpy(incoming_speed_rating, "KB");
-                adjusted_incoming_rate = (double)(incoming_rate / 1024.0);
+                adjusted_incoming_rate = ((double)incoming_rate / 1024.0);
         }
 
         /* report incoming traffic in MBytes/sec */
         else {
                 strcpy(incoming_speed_rating, "MB");
-                adjusted_incoming_rate = (double)(incoming_rate / 1024.0 / 1024.0);
+                adjusted_incoming_rate = ((double)incoming_rate / 1024.0 / 1024.0);
         }
 
         double adjusted_outgoing_rate = 0.0;
         char outgoing_speed_rating[8];
-        /* report outgoing traffic in Bytes/sec */
         if (outgoing_rate < 1024) {
+                /* report outgoing traffic in Bytes/sec */
                 strcpy(outgoing_speed_rating, "B");
                 adjusted_outgoing_rate = (double)outgoing_rate;
-        }
-
-        /* report outgoing traffic in KBytes/sec */
-        else if (outgoing_rate < (1024 * 1024)) {
+        } else if (outgoing_rate < (1024 * 1024)) {
+                /* report outgoing traffic in KBytes/sec */
                 strcpy(outgoing_speed_rating, "KB");
-                adjusted_outgoing_rate = (double)(outgoing_rate / 1024.0);
-        }
-
-        /* report outgoing traffic in MBytes/sec */
-        else {
+                adjusted_outgoing_rate = ((double)outgoing_rate / 1024.0);
+        } else {
+                /* report outgoing traffic in MBytes/sec */
                 strcpy(outgoing_speed_rating, "MB");
-                adjusted_outgoing_rate = (outgoing_rate / 1024.0 / 1024.0);
-        }
-
-        int result = STATE_OK;
-        if (incoming_rate > config.incoming_critical_threshold || outgoing_rate > config.outgoing_critical_threshold) {
-                result = STATE_CRITICAL;
-        } else if (incoming_rate > config.incoming_warning_threshold || outgoing_rate > config.outgoing_warning_threshold) {
-                result = STATE_WARNING;
+                adjusted_outgoing_rate = ((double)outgoing_rate / 1024.0 / 1024.0);
         }
 
-        char *error_message;
-        xasprintf(&error_message, _("%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"), (config.use_average) ? _("Avg") : _("Max"),
-                          adjusted_incoming_rate, incoming_speed_rating, (config.use_average) ? _("Avg") : _("Max"), adjusted_outgoing_rate,
-                          outgoing_speed_rating,
-                          fperfdata("in", adjusted_incoming_rate, incoming_speed_rating, (int)config.incoming_warning_threshold,
-                                                config.incoming_warning_threshold, (int)config.incoming_critical_threshold, config.incoming_critical_threshold,
-                                                true, 0, false, 0),
-                          fperfdata("out", adjusted_outgoing_rate, outgoing_speed_rating, (int)config.outgoing_warning_threshold,
-                                                config.outgoing_warning_threshold, (int)config.outgoing_critical_threshold, config.outgoing_critical_threshold,
-                                                true, 0, false, 0));
-
-        printf(_("Traffic %s - %s\n"), state_text(result), error_message);
-
-        return result;
+        mp_perfdata pd_rate_in = perfdata_init();
+        pd_rate_in.label = "in";
+        pd_rate_in = mp_set_pd_value(pd_rate_in, incoming_rate);
+        pd_rate_in.uom = "B";
+        pd_rate_in = mp_pd_set_thresholds(pd_rate_in, config.incoming_thresholds);
+
+        mp_perfdata pd_rate_out = perfdata_init();
+        pd_rate_out.label = "out";
+        pd_rate_out = mp_set_pd_value(pd_rate_out, outgoing_rate);
+        pd_rate_out.uom = "B";
+        pd_rate_out = mp_pd_set_thresholds(pd_rate_out, config.outgoing_thresholds);
+
+        mp_subcheck sc_rate_in = mp_subcheck_init();
+        sc_rate_in = mp_set_subcheck_state(sc_rate_in, mp_get_pd_status(pd_rate_in));
+        mp_add_perfdata_to_subcheck(&sc_rate_in, pd_rate_in);
+        xasprintf(&sc_rate_in.output, "%s. In = %0.1f %s/s", (config.use_average) ? _("Avg") : _("Max"),
+                          adjusted_incoming_rate, incoming_speed_rating);
+
+        mp_subcheck sc_rate_out = mp_subcheck_init();
+        sc_rate_out = mp_set_subcheck_state(sc_rate_out, mp_get_pd_status(pd_rate_out));
+        mp_add_perfdata_to_subcheck(&sc_rate_out, pd_rate_out);
+        xasprintf(&sc_rate_out.output, "%s. Out = %0.1f %s/s",
+                          (config.use_average) ? _("Avg") : _("Max"), adjusted_outgoing_rate,
+                          outgoing_speed_rating);
+
+        mp_subcheck sc_rate = mp_subcheck_init();
+        xasprintf(&sc_rate.output, "Traffic");
+        mp_add_subcheck_to_subcheck(&sc_rate, sc_rate_in);
+        mp_add_subcheck_to_subcheck(&sc_rate, sc_rate_out);
+
+        mp_add_subcheck_to_check(&overall, sc_rate);
+
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
 check_mrtgtraf_config_wrapper process_arguments(int argc, char **argv) {
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
+
         static struct option longopts[] = {{"filename", required_argument, 0, 'F'},
                                                                            {"expires", required_argument, 0, 'e'},
                                                                            {"aggregation", required_argument, 0, 'a'},
@@ -208,6 +247,7 @@ check_mrtgtraf_config_wrapper process_arguments(int argc, char **argv) {
                                                                            {"warning", required_argument, 0, 'w'},
                                                                            {"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
         check_mrtgtraf_config_wrapper result = {
@@ -231,6 +271,14 @@ check_mrtgtraf_config_wrapper process_arguments(int argc, char **argv) {
 
         int option_char;
         int option = 0;
+        unsigned long incoming_warning_threshold = 0;
+        unsigned long incoming_critical_threshold = 0;
+        unsigned long outgoing_warning_threshold = 0;
+        unsigned long outgoing_critical_threshold = 0;
+        bool incoming_warning_set = false;
+        bool incoming_critical_set = false;
+        bool outgoing_warning_set = false;
+        bool outgoing_critical_set = false;
         while (true) {
                 option_char = getopt_long(argc, argv, "hVF:e:a:c:w:", longopts, &option);
 
@@ -248,11 +296,15 @@ check_mrtgtraf_config_wrapper process_arguments(int argc, char **argv) {
                 case 'a': /* aggregation (AVE or MAX) */
                         result.config.use_average = (bool)(strcmp(optarg, "MAX"));
                         break;
-                case 'c': /* warning threshold */
-                        sscanf(optarg, "%lu,%lu", &result.config.incoming_critical_threshold, &result.config.outgoing_critical_threshold);
+                case 'c': /* critical threshold */
+                        sscanf(optarg, "%lu,%lu", &incoming_critical_threshold, &outgoing_critical_threshold);
+                        incoming_critical_set = true;
+                        outgoing_critical_set = true;
                         break;
-                case 'w': /* critical threshold */
-                        sscanf(optarg, "%lu,%lu", &result.config.incoming_warning_threshold, &result.config.outgoing_warning_threshold);
+                case 'w': /* warning threshold */
+                        sscanf(optarg, "%lu,%lu", &incoming_warning_threshold, &outgoing_warning_threshold);
+                        incoming_warning_set = true;
+                        incoming_critical_set = true;
                         break;
                 case 'V': /* version */
                         print_revision(progname, NP_VERSION);
@@ -262,6 +314,17 @@ check_mrtgtraf_config_wrapper process_arguments(int argc, char **argv) {
                         exit(STATE_UNKNOWN);
                 case '?': /* help */
                         usage5();
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 }
         }
 
@@ -282,22 +345,62 @@ check_mrtgtraf_config_wrapper process_arguments(int argc, char **argv) {
                 option_char++;
         }
 
-        if (argc > option_char && result.config.incoming_warning_threshold == 0) {
-                result.config.incoming_warning_threshold = strtoul(argv[option_char++], NULL, 10);
+        if (argc > option_char && incoming_warning_threshold == 0) {
+                incoming_warning_threshold = strtoul(argv[option_char++], NULL, 10);
+                incoming_warning_set = true;
         }
 
-        if (argc > option_char && result.config.incoming_critical_threshold == 0) {
-                result.config.incoming_critical_threshold = strtoul(argv[option_char++], NULL, 10);
+        if (argc > option_char && incoming_critical_threshold == 0) {
+                incoming_critical_threshold = strtoul(argv[option_char++], NULL, 10);
+                incoming_critical_set = true;
         }
 
-        if (argc > option_char && result.config.outgoing_warning_threshold == 0) {
-                result.config.outgoing_warning_threshold = strtoul(argv[option_char++], NULL, 10);
+        if (argc > option_char && outgoing_warning_threshold == 0) {
+                outgoing_warning_threshold = strtoul(argv[option_char++], NULL, 10);
+                outgoing_warning_set = true;
         }
 
-        if (argc > option_char && result.config.outgoing_critical_threshold == 0) {
-                result.config.outgoing_critical_threshold = strtoul(argv[option_char++], NULL, 10);
+        if (argc > option_char && outgoing_critical_threshold == 0) {
+                outgoing_critical_threshold = strtoul(argv[option_char++], NULL, 10);
+                outgoing_critical_set = true;
         }
 
+        mp_range incoming_warning = mp_range_init();
+        if (incoming_warning_set) {
+                incoming_warning =
+                        mp_range_set_end(incoming_warning, mp_create_pd_value(incoming_warning_threshold));
+        }
+
+        result.config.incoming_thresholds =
+                mp_thresholds_set_warn(result.config.incoming_thresholds, incoming_warning);
+
+        mp_range incoming_critical = mp_range_init();
+        if (incoming_critical_set) {
+                incoming_critical =
+                        mp_range_set_end(incoming_critical, mp_create_pd_value(incoming_critical_threshold));
+        }
+
+        result.config.incoming_thresholds =
+                mp_thresholds_set_crit(result.config.incoming_thresholds, incoming_critical);
+
+        mp_range outgoing_warning = mp_range_init();
+        if (outgoing_warning_set) {
+                outgoing_warning =
+                        mp_range_set_end(outgoing_warning, mp_create_pd_value(outgoing_warning_threshold));
+        }
+
+        result.config.outgoing_thresholds =
+                mp_thresholds_set_warn(result.config.outgoing_thresholds, outgoing_warning);
+
+        mp_range outgoing_critical = mp_range_init();
+        if (outgoing_critical_set) {
+                outgoing_critical =
+                        mp_range_set_end(outgoing_critical, mp_create_pd_value(outgoing_critical_threshold));
+        }
+
+        result.config.outgoing_thresholds =
+                mp_thresholds_set_crit(result.config.outgoing_thresholds, outgoing_critical);
+
         return result;
 }
 
@@ -332,6 +435,8 @@ void print_help(void) {
         printf(" %s\n", "-c, --critical");
         printf("    %s\n", _("Critical threshold pair <incoming>,<outgoing>"));
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
         printf("%s\n", _("Notes:"));
         printf(" %s\n", _("- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from"));
diff --git a/plugins/check_mrtgtraf.d/config.h b/plugins/check_mrtgtraf.d/config.h
index 94929ff7..d9737243 100644
--- a/plugins/check_mrtgtraf.d/config.h
+++ b/plugins/check_mrtgtraf.d/config.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
+#include "thresholds.h"
 #include <stddef.h>
 #include <stdlib.h>
 
@@ -8,11 +10,12 @@ typedef struct {
         char *log_file;
         int expire_minutes;
         bool use_average;
-        unsigned long incoming_warning_threshold;
-        unsigned long incoming_critical_threshold;
-        unsigned long outgoing_warning_threshold;
-        unsigned long outgoing_critical_threshold;
 
+        mp_thresholds incoming_thresholds;
+        mp_thresholds outgoing_thresholds;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_mrtgtraf_config;
 
 check_mrtgtraf_config check_mrtgtraf_config_init() {
@@ -21,10 +24,10 @@ check_mrtgtraf_config check_mrtgtraf_config_init() {
                 .expire_minutes = -1,
                 .use_average = true,
 
-                .incoming_warning_threshold = 0,
-                .incoming_critical_threshold = 0,
-                .outgoing_warning_threshold = 0,
-                .outgoing_critical_threshold = 0,
+                .incoming_thresholds = mp_thresholds_init(),
+                .outgoing_thresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index ca3422b5..26730d4c 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -30,13 +30,11 @@
  *
  *****************************************************************************/
 
-const char *progname = "check_mysql";
-const char *copyright = "1999-2024";
-const char *email = "devel@monitoring-plugins.org";
-
-#define REPLICA_RESULTSIZE 96
-
 #include "common.h"
+#include "output.h"
+#include "perfdata.h"
+#include "states.h"
+#include "thresholds.h"
 #include "utils.h"
 #include "utils_base.h"
 #include "netutils.h"
@@ -46,19 +44,33 @@ const char *email = "devel@monitoring-plugins.org";
 #include <mysqld_error.h>
 #include <errmsg.h>
 
+const char *progname = "check_mysql";
+const char *copyright = "1999-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 static int verbose = 0;
 
+#define REPLICA_RESULTSIZE 96
+
 #define LENGTH_METRIC_UNIT 6
 static const char *metric_unit[LENGTH_METRIC_UNIT] = {
-        "Open_files", "Open_tables", "Qcache_free_memory", "Qcache_queries_in_cache", "Threads_connected", "Threads_running"};
+        "Open_files",        "Open_tables",    "Qcache_free_memory", "Qcache_queries_in_cache",
+        "Threads_connected", "Threads_running"};
 
 #define LENGTH_METRIC_COUNTER 9
-static const char *metric_counter[LENGTH_METRIC_COUNTER] = {
-        "Connections", "Qcache_hits",        "Qcache_inserts", "Qcache_lowmem_prunes", "Qcache_not_cached", "Queries",
-        "Questions",   "Table_locks_waited", "Uptime"};
-
-#define MYSQLDUMP_THREADS_QUERY                                                                                                            \
-        "SELECT COUNT(1) mysqldumpThreads FROM information_schema.processlist WHERE info LIKE 'SELECT /*!40001 SQL_NO_CACHE */%'"
+static const char *metric_counter[LENGTH_METRIC_COUNTER] = {"Connections",
+                                                                                                                        "Qcache_hits",
+                                                                                                                        "Qcache_inserts",
+                                                                                                                        "Qcache_lowmem_prunes",
+                                                                                                                        "Qcache_not_cached",
+                                                                                                                        "Queries",
+                                                                                                                        "Questions",
+                                                                                                                        "Table_locks_waited",
+                                                                                                                        "Uptime"};
+
+#define MYSQLDUMP_THREADS_QUERY                                                                    \
+        "SELECT COUNT(1) mysqldumpThreads FROM information_schema.processlist WHERE info LIKE "        \
+        "'SELECT /*!40001 SQL_NO_CACHE */%'"
 
 typedef struct {
         int errorcode;
@@ -84,6 +96,10 @@ int main(int argc, char **argv) {
 
         const check_mysql_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         MYSQL mysql;
         /* initialize mysql  */
         mysql_init(&mysql);
@@ -99,82 +115,130 @@ int main(int argc, char **argv) {
         }
 
         if (config.ssl) {
-                mysql_ssl_set(&mysql, config.key, config.cert, config.ca_cert, config.ca_dir, config.ciphers);
+                mysql_ssl_set(&mysql, config.key, config.cert, config.ca_cert, config.ca_dir,
+                                          config.ciphers);
         }
-        /* establish a connection to the server and error checking */
-        if (!mysql_real_connect(&mysql, config.db_host, config.db_user, config.db_pass, config.db, config.db_port, config.db_socket, 0)) {
+
+        mp_check overall = mp_check_init();
+
+        mp_subcheck sc_connection = mp_subcheck_init();
+        /* establish a connection to the server and check for errors */
+        if (!mysql_real_connect(&mysql, config.db_host, config.db_user, config.db_pass, config.db,
+                                                        config.db_port, config.db_socket, 0)) {
                 /* Depending on internally-selected auth plugin MySQL might return */
                 /* ER_ACCESS_DENIED_NO_PASSWORD_ERROR or ER_ACCESS_DENIED_ERROR. */
                 /* Semantically these errors are the same. */
-                if (config.ignore_auth &&
-                        (mysql_errno(&mysql) == ER_ACCESS_DENIED_ERROR || mysql_errno(&mysql) == ER_ACCESS_DENIED_NO_PASSWORD_ERROR)) {
-                        printf("MySQL OK - Version: %s (protocol %d)\n", mysql_get_server_info(&mysql), mysql_get_proto_info(&mysql));
-                        mysql_close(&mysql);
-                        return STATE_OK;
-                }
+                if (config.ignore_auth && (mysql_errno(&mysql) == ER_ACCESS_DENIED_ERROR ||
+                                                                   mysql_errno(&mysql) == ER_ACCESS_DENIED_NO_PASSWORD_ERROR)) {
+                        xasprintf(&sc_connection.output, "Version: %s (protocol %d)",
+                                          mysql_get_server_info(&mysql), mysql_get_proto_info(&mysql));
+                        sc_connection = mp_set_subcheck_state(sc_connection, STATE_OK);
 
-                if (mysql_errno(&mysql) == CR_UNKNOWN_HOST) {
-                        die(STATE_WARNING, "%s\n", mysql_error(&mysql));
-                } else if (mysql_errno(&mysql) == CR_VERSION_ERROR) {
-                        die(STATE_WARNING, "%s\n", mysql_error(&mysql));
-                } else if (mysql_errno(&mysql) == CR_OUT_OF_MEMORY) {
-                        die(STATE_WARNING, "%s\n", mysql_error(&mysql));
-                } else if (mysql_errno(&mysql) == CR_IPSOCK_ERROR) {
-                        die(STATE_WARNING, "%s\n", mysql_error(&mysql));
-                } else if (mysql_errno(&mysql) == CR_SOCKET_CREATE_ERROR) {
-                        die(STATE_WARNING, "%s\n", mysql_error(&mysql));
+                        mysql_close(&mysql);
                 } else {
-                        die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
+                        if (mysql_errno(&mysql) == CR_UNKNOWN_HOST) {
+                                sc_connection = mp_set_subcheck_state(sc_connection, STATE_WARNING);
+                                xasprintf(&sc_connection.output, "%s", mysql_error(&mysql));
+                        } else if (mysql_errno(&mysql) == CR_VERSION_ERROR) {
+                                sc_connection = mp_set_subcheck_state(sc_connection, STATE_WARNING);
+                                xasprintf(&sc_connection.output, "%s", mysql_error(&mysql));
+                        } else if (mysql_errno(&mysql) == CR_OUT_OF_MEMORY) {
+                                sc_connection = mp_set_subcheck_state(sc_connection, STATE_WARNING);
+                                xasprintf(&sc_connection.output, "%s", mysql_error(&mysql));
+                        } else if (mysql_errno(&mysql) == CR_IPSOCK_ERROR) {
+                                sc_connection = mp_set_subcheck_state(sc_connection, STATE_WARNING);
+                                xasprintf(&sc_connection.output, "%s", mysql_error(&mysql));
+                        } else if (mysql_errno(&mysql) == CR_SOCKET_CREATE_ERROR) {
+                                sc_connection = mp_set_subcheck_state(sc_connection, STATE_WARNING);
+                                xasprintf(&sc_connection.output, "%s", mysql_error(&mysql));
+                        } else {
+                                sc_connection = mp_set_subcheck_state(sc_connection, STATE_CRITICAL);
+                                xasprintf(&sc_connection.output, "%s", mysql_error(&mysql));
+                        }
                 }
+
+                mp_add_subcheck_to_check(&overall, sc_connection);
+                mp_exit(overall);
+        } else {
+                // successful connection
+                sc_connection = mp_set_subcheck_state(sc_connection, STATE_OK);
+                xasprintf(&sc_connection.output, "Version: %s (protocol %d)", mysql_get_server_info(&mysql),
+                                  mysql_get_proto_info(&mysql));
+                mp_add_subcheck_to_check(&overall, sc_connection);
         }
 
         /* get the server stats */
-        char *result = strdup(mysql_stat(&mysql));
+        char *mysql_stats = strdup(mysql_stat(&mysql));
+
+        mp_subcheck sc_stats = mp_subcheck_init();
+        sc_stats = mp_set_subcheck_default_state(sc_stats, STATE_OK);
 
         /* error checking once more */
-        if (mysql_error(&mysql)) {
-                if (mysql_errno(&mysql) == CR_SERVER_GONE_ERROR) {
-                        die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
-                } else if (mysql_errno(&mysql) == CR_SERVER_LOST) {
-                        die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
-                } else if (mysql_errno(&mysql) == CR_UNKNOWN_ERROR) {
-                        die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
+        if (mysql_errno(&mysql) != 0) {
+                if ((mysql_errno(&mysql) == CR_SERVER_GONE_ERROR) ||
+                        (mysql_errno(&mysql) == CR_SERVER_LOST) || (mysql_errno(&mysql) == CR_UNKNOWN_ERROR)) {
+                        sc_stats = mp_set_subcheck_state(sc_stats, STATE_CRITICAL);
+                        xasprintf(&sc_stats.output, "Retrieving stats failed: %s", mysql_error(&mysql));
+                } else {
+                        // not sure which error modes occur here, but mysql_error indicates an error
+                        sc_stats = mp_set_subcheck_state(sc_stats, STATE_WARNING);
+                        xasprintf(&sc_stats.output, "retrieving stats caused an error: %s",
+                                          mysql_error(&mysql));
                 }
+
+                mp_add_subcheck_to_check(&overall, sc_stats);
+                mp_exit(overall);
+        } else {
+                xasprintf(&sc_stats.output, "retrieved stats: %s", mysql_stats);
+                sc_stats = mp_set_subcheck_state(sc_stats, STATE_OK);
+                mp_add_subcheck_to_check(&overall, sc_stats);
         }
 
-        char *perf = strdup("");
-        char *error = NULL;
         MYSQL_RES *res;
         MYSQL_ROW row;
+        mp_subcheck sc_query = mp_subcheck_init();
         /* try to fetch some perf data */
         if (mysql_query(&mysql, "show global status") == 0) {
                 if ((res = mysql_store_result(&mysql)) == NULL) {
-                        error = strdup(mysql_error(&mysql));
+                        xasprintf(&sc_connection.output, "query failed - status store_result error: %s",
+                                          mysql_error(&mysql));
                         mysql_close(&mysql);
-                        die(STATE_CRITICAL, _("status store_result error: %s\n"), error);
+
+                        sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+                        mp_add_subcheck_to_check(&overall, sc_query);
+                        mp_exit(overall);
                 }
 
                 while ((row = mysql_fetch_row(res)) != NULL) {
                         for (int i = 0; i < LENGTH_METRIC_UNIT; i++) {
                                 if (strcmp(row[0], metric_unit[i]) == 0) {
-                                        xasprintf(&perf, "%s%s ", perf, perfdata(metric_unit[i], atol(row[1]), "", false, 0, false, 0, false, 0, false, 0));
+                                        mp_perfdata pd_mysql_stat = perfdata_init();
+                                        pd_mysql_stat.label = (char *)metric_unit[i];
+                                        pd_mysql_stat.value = mp_create_pd_value(atol(row[1]));
+                                        mp_add_perfdata_to_subcheck(&sc_stats, pd_mysql_stat);
                                         continue;
                                 }
                         }
+
                         for (int i = 0; i < LENGTH_METRIC_COUNTER; i++) {
                                 if (strcmp(row[0], metric_counter[i]) == 0) {
-                                        xasprintf(&perf, "%s%s ", perf, perfdata(metric_counter[i], atol(row[1]), "c", false, 0, false, 0, false, 0, false, 0));
+                                        mp_perfdata pd_mysql_stat = perfdata_init();
+                                        pd_mysql_stat.label = (char *)metric_counter[i];
+                                        pd_mysql_stat.value = mp_create_pd_value(atol(row[1]));
+                                        pd_mysql_stat.uom = "c";
+                                        mp_add_perfdata_to_subcheck(&sc_stats, pd_mysql_stat);
                                         continue;
                                 }
                         }
                 }
-                /* remove trailing space */
-                if (strlen(perf) > 0) {
-                        perf[strlen(perf) - 1] = '\0';
-                }
+        } else {
+                // Query failed!
+                xasprintf(&sc_connection.output, "query failed");
+                sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+                mp_add_subcheck_to_check(&overall, sc_query);
+                mp_exit(overall);
         }
 
-        char replica_result[REPLICA_RESULTSIZE] = {0};
         if (config.check_replica) {
                 // Detect which version we are, on older version
                 // "show slave status" should work, on newer ones
@@ -188,9 +252,11 @@ int main(int argc, char **argv) {
                 unsigned long major_version = server_verion_int / 10000;
                 unsigned long minor_version = (server_verion_int % 10000) / 100;
                 unsigned long patch_version = (server_verion_int % 100);
+
                 if (verbose) {
-                        printf("Found MariaDB: %s, main version: %lu, minor version: %lu, patch version: %lu\n", server_version, major_version,
-                                   minor_version, patch_version);
+                        printf("Found MariaDB/MySQL: %s, main version: %lu, minor version: %lu, patch version: "
+                                   "%lu\n",
+                                   server_version, major_version, minor_version, patch_version);
                 }
 
                 if (strstr(server_version, "MariaDB") != NULL) {
@@ -204,16 +270,13 @@ int main(int argc, char **argv) {
                                         use_deprecated_slave_status = true;
                                 }
                         }
-                } else if (strstr(server_version, "MySQL") != NULL) {
-                        // Looks like MySQL
+                } else {
+                        // Looks like MySQL or at least not like MariaDB
                         if (major_version < 8) {
                                 use_deprecated_slave_status = true;
                         } else if (major_version == 10 && minor_version < 4) {
                                 use_deprecated_slave_status = true;
                         }
-                } else {
-                        printf("Not a known sever implementation: %s\n", server_version);
-                        exit(STATE_UNKNOWN);
                 }
 
                 char *replica_query = NULL;
@@ -223,62 +286,80 @@ int main(int argc, char **argv) {
                         replica_query = "show replica status";
                 }
 
+                mp_subcheck sc_replica = mp_subcheck_init();
+
                 /* check the replica status */
                 if (mysql_query(&mysql, replica_query) != 0) {
-                        error = strdup(mysql_error(&mysql));
+                        xasprintf(&sc_replica.output, "replica query error: %s", mysql_error(&mysql));
                         mysql_close(&mysql);
-                        die(STATE_CRITICAL, _("replica query error: %s\n"), error);
+
+                        sc_replica = mp_set_subcheck_state(sc_replica, STATE_CRITICAL);
+                        mp_add_subcheck_to_check(&overall, sc_replica);
+                        mp_exit(overall);
                 }
 
                 /* store the result */
                 if ((res = mysql_store_result(&mysql)) == NULL) {
-                        error = strdup(mysql_error(&mysql));
+                        xasprintf(&sc_replica.output, "replica store_result error: %s", mysql_error(&mysql));
                         mysql_close(&mysql);
-                        die(STATE_CRITICAL, _("replica store_result error: %s\n"), error);
+
+                        sc_replica = mp_set_subcheck_state(sc_replica, STATE_CRITICAL);
+                        mp_add_subcheck_to_check(&overall, sc_replica);
+                        mp_exit(overall);
                 }
 
                 /* Check there is some data */
                 if (mysql_num_rows(res) == 0) {
                         mysql_close(&mysql);
-                        die(STATE_WARNING, "%s\n", _("No replicas defined"));
+
+                        xasprintf(&sc_replica.output, "no replicas defined");
+                        sc_replica = mp_set_subcheck_state(sc_replica, STATE_WARNING);
+                        mp_add_subcheck_to_check(&overall, sc_replica);
+                        mp_exit(overall);
                 }
 
                 /* fetch the first row */
                 if ((row = mysql_fetch_row(res)) == NULL) {
-                        error = strdup(mysql_error(&mysql));
+                        xasprintf(&sc_replica.output, "replica fetch row error: %s", mysql_error(&mysql));
                         mysql_free_result(res);
                         mysql_close(&mysql);
-                        die(STATE_CRITICAL, _("replica fetch row error: %s\n"), error);
+
+                        sc_replica = mp_set_subcheck_state(sc_replica, STATE_CRITICAL);
+                        mp_add_subcheck_to_check(&overall, sc_replica);
+                        mp_exit(overall);
                 }
 
                 if (mysql_field_count(&mysql) == 12) {
                         /* mysql 3.23.x */
-                        snprintf(replica_result, REPLICA_RESULTSIZE, _("Replica running: %s"), row[6]);
+                        xasprintf(&sc_replica.output, "Replica running: %s", row[6]);
                         if (strcmp(row[6], "Yes") != 0) {
                                 mysql_free_result(res);
                                 mysql_close(&mysql);
-                                die(STATE_CRITICAL, "%s\n", replica_result);
-                        }
 
+                                sc_replica = mp_set_subcheck_state(sc_replica, STATE_CRITICAL);
+                                mp_add_subcheck_to_check(&overall, sc_replica);
+                                mp_exit(overall);
+                        }
                 } else {
                         /* mysql 4.x.x and mysql 5.x.x */
                         int replica_io_field = -1;
                         int replica_sql_field = -1;
                         int seconds_behind_field = -1;
-                        int num_fields;
-                        MYSQL_FIELD *fields;
-                        num_fields = mysql_num_fields(res);
-                        fields = mysql_fetch_fields(res);
-                        for (int i = 0; i < num_fields; i++) {
-                                if (strcmp(fields[i].name, "Slave_IO_Running") == 0) {
+                        unsigned int num_fields = mysql_num_fields(res);
+                        MYSQL_FIELD *fields = mysql_fetch_fields(res);
+                        for (int i = 0; i < (int)num_fields; i++) {
+                                if ((strcasecmp(fields[i].name, "Slave_IO_Running") == 0) ||
+                                        (strcasecmp(fields[i].name, "Replica_IO_Running") == 0)) {
                                         replica_io_field = i;
                                         continue;
                                 }
-                                if (strcmp(fields[i].name, "Slave_SQL_Running") == 0) {
+                                if ((strcasecmp(fields[i].name, "Slave_SQL_Running") == 0) ||
+                                        (strcasecmp(fields[i].name, "Replica_SQL_Running") == 0)) {
                                         replica_sql_field = i;
                                         continue;
                                 }
-                                if (strcmp(fields[i].name, "Seconds_Behind_Master") == 0) {
+                                if ((strcasecmp(fields[i].name, "Seconds_Behind_Master") == 0) ||
+                                        (strcasecmp(fields[i].name, "Seconds_Behind_Source") == 0)) {
                                         seconds_behind_field = i;
                                         continue;
                                 }
@@ -288,15 +369,23 @@ int main(int argc, char **argv) {
                         if ((replica_io_field < 0) || (replica_sql_field < 0) || (num_fields == 0)) {
                                 mysql_free_result(res);
                                 mysql_close(&mysql);
-                                die(STATE_CRITICAL, "Replica status unavailable\n");
+
+                                xasprintf(&sc_replica.output, "Replica status unavailable");
+                                sc_replica = mp_set_subcheck_state(sc_replica, STATE_CRITICAL);
+                                mp_add_subcheck_to_check(&overall, sc_replica);
+                                mp_exit(overall);
                         }
 
                         /* Save replica status in replica_result */
-                        snprintf(replica_result, REPLICA_RESULTSIZE, "Replica IO: %s Replica SQL: %s Seconds Behind Master: %s", row[replica_io_field],
-                                         row[replica_sql_field], seconds_behind_field != -1 ? row[seconds_behind_field] : "Unknown");
-
-                        /* Raise critical error if SQL THREAD or IO THREAD are stopped, but only if there are no mysqldump threads running */
-                        if (strcmp(row[replica_io_field], "Yes") != 0 || strcmp(row[replica_sql_field], "Yes") != 0) {
+                        xasprintf(&sc_replica.output,
+                                          "Replica IO: %s Replica SQL: %s Seconds Behind Master: %s",
+                                          row[replica_io_field], row[replica_sql_field],
+                                          seconds_behind_field != -1 ? row[seconds_behind_field] : "Unknown");
+
+                        /* Raise critical error if SQL THREAD or IO THREAD are stopped, but only if there are no
+                         * mysqldump threads running */
+                        if (strcmp(row[replica_io_field], "Yes") != 0 ||
+                                strcmp(row[replica_sql_field], "Yes") != 0) {
                                 MYSQL_RES *res_mysqldump;
                                 MYSQL_ROW row_mysqldump;
                                 unsigned int mysqldump_threads = 0;
@@ -314,10 +403,14 @@ int main(int argc, char **argv) {
                                         }
                                         mysql_close(&mysql);
                                 }
+
                                 if (mysqldump_threads == 0) {
-                                        die(STATE_CRITICAL, "%s\n", replica_result);
+                                        sc_replica = mp_set_subcheck_state(sc_replica, STATE_CRITICAL);
+                                        mp_add_subcheck_to_check(&overall, sc_replica);
+                                        mp_exit(overall);
                                 } else {
-                                        strncat(replica_result, " Mysqldump: in progress", REPLICA_RESULTSIZE - 1);
+                                        xasprintf(&sc_replica.output, "%s %s", sc_replica.output,
+                                                          " Mysqldump: in progress");
                                 }
                         }
 
@@ -325,27 +418,30 @@ int main(int argc, char **argv) {
                                 if (seconds_behind_field == -1) {
                                         printf("seconds_behind_field not found\n");
                                 } else {
-                                        printf("seconds_behind_field(index %d)=%s\n", seconds_behind_field, row[seconds_behind_field]);
+                                        printf("seconds_behind_field(index %d)=%s\n", seconds_behind_field,
+                                                   row[seconds_behind_field]);
                                 }
                         }
 
                         /* Check Seconds Behind against threshold */
-                        if ((seconds_behind_field != -1) && (row[seconds_behind_field] != NULL && strcmp(row[seconds_behind_field], "NULL") != 0)) {
-                                double value = atof(row[seconds_behind_field]);
-                                int status;
-
-                                status = get_status(value, config.my_threshold);
-
-                                xasprintf(&perf, "%s %s", perf,
-                                                  fperfdata("seconds behind master", value, "s", true, (double)config.warning_time, true,
-                                                                        (double)config.critical_time, false, 0, false, 0));
-
-                                if (status == STATE_WARNING) {
-                                        printf("SLOW_REPLICA %s: %s|%s\n", _("WARNING"), replica_result, perf);
-                                        exit(STATE_WARNING);
-                                } else if (status == STATE_CRITICAL) {
-                                        printf("SLOW_REPLICA %s: %s|%s\n", _("CRITICAL"), replica_result, perf);
-                                        exit(STATE_CRITICAL);
+                        if ((seconds_behind_field != -1) && (row[seconds_behind_field] != NULL &&
+                                                                                                 strcmp(row[seconds_behind_field], "NULL") != 0)) {
+                                mp_perfdata pd_seconds_behind = perfdata_init();
+                                pd_seconds_behind.label = "seconds behind master";
+                                pd_seconds_behind.value = mp_create_pd_value(atof(row[seconds_behind_field]));
+                                pd_seconds_behind =
+                                        mp_pd_set_thresholds(pd_seconds_behind, config.replica_thresholds);
+                                pd_seconds_behind.uom = "s";
+                                mp_add_perfdata_to_subcheck(&sc_replica, pd_seconds_behind);
+
+                                mp_state_enum status = mp_get_pd_status(pd_seconds_behind);
+
+                                sc_replica = mp_set_subcheck_state(sc_replica, status);
+
+                                if (status != STATE_OK) {
+                                        xasprintf(&sc_replica.output, "slow replica - %s", sc_replica.output);
+                                        mp_add_subcheck_to_check(&overall, sc_replica);
+                                        mp_exit(overall);
                                 }
                         }
                 }
@@ -357,20 +453,17 @@ int main(int argc, char **argv) {
         /* close the connection */
         mysql_close(&mysql);
 
-        /* print out the result of stats */
-        if (config.check_replica) {
-                printf("%s %s|%s\n", result, replica_result, perf);
-        } else {
-                printf("%s|%s\n", result, perf);
-        }
-
-        return STATE_OK;
+        mp_exit(overall);
 }
 
-#define CHECK_REPLICA_OPT CHAR_MAX + 1
-
 /* process command-line arguments */
 check_mysql_config_wrapper process_arguments(int argc, char **argv) {
+
+        enum {
+                CHECK_REPLICA_OPT = CHAR_MAX + 1,
+                output_format_index,
+        };
+
         static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
                                                                            {"socket", required_argument, 0, 's'},
                                                                            {"database", required_argument, 0, 'd'},
@@ -393,6 +486,7 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
                                                                            {"cert", required_argument, 0, 'a'},
                                                                            {"ca-dir", required_argument, 0, 'D'},
                                                                            {"ciphers", required_argument, 0, 'L'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
         check_mysql_config_wrapper result = {
@@ -405,12 +499,10 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
                 return result;
         }
 
-        char *warning = NULL;
-        char *critical = NULL;
-
         int option = 0;
         while (true) {
-                int option_index = getopt_long(argc, argv, "hlvVnSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
+                int option_index =
+                        getopt_long(argc, argv, "hlvVnSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
 
                 if (option_index == -1 || option_index == EOF) {
                         break;
@@ -478,14 +570,22 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
                 case 'n':
                         result.config.ignore_auth = true; /* ignore-auth */
                         break;
-                case 'w':
-                        warning = optarg;
-                        result.config.warning_time = strtod(warning, NULL);
-                        break;
-                case 'c':
-                        critical = optarg;
-                        result.config.critical_time = strtod(critical, NULL);
-                        break;
+                case 'w': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning time threshold");
+                        }
+                        result.config.replica_thresholds =
+                                mp_thresholds_set_warn(result.config.replica_thresholds, tmp.range);
+                } break;
+                case 'c': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical time threshold");
+                        }
+                        result.config.replica_thresholds =
+                                mp_thresholds_set_crit(result.config.replica_thresholds, tmp.range);
+                } break;
                 case 'V': /* version */
                         print_revision(progname, NP_VERSION);
                         exit(STATE_UNKNOWN);
@@ -497,13 +597,22 @@ check_mysql_config_wrapper process_arguments(int argc, char **argv) {
                         break;
                 case '?': /* help */
                         usage5();
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 }
         }
 
         int index = optind;
 
-        set_thresholds(&result.config.my_threshold, warning, critical);
-
         while (argc > index) {
                 if (result.config.db_host == NULL) {
                         if (is_host(argv[index])) {
@@ -580,15 +689,17 @@ void print_help(void) {
         printf("    ==> %s <==\n", _("IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"));
         printf("    %s\n", _("Your clear-text password could be visible as a process table entry"));
         printf(" %s\n", "-S, --check-slave");
-        printf("    %s\n",
-                   _("Check if the slave thread is running properly. This option is deprecated in favour of check-replica, which does the same"));
+        printf("    %s\n", _("Check if the slave thread is running properly. This option is deprecated "
+                                                 "in favour of check-replica, which does the same"));
         printf(" %s\n", "--check-replica");
         printf("    %s\n", _("Check if the replica thread is running properly."));
         printf(" %s\n", "-w, --warning");
-        printf("    %s\n", _("Exit with WARNING status if replica server is more than INTEGER seconds"));
+        printf("    %s\n",
+                   _("Exit with WARNING status if replica server is more than INTEGER seconds"));
         printf("    %s\n", _("behind master"));
         printf(" %s\n", "-c, --critical");
-        printf("    %s\n", _("Exit with CRITICAL status if replica server is more then INTEGER seconds"));
+        printf("    %s\n",
+                   _("Exit with CRITICAL status if replica server is more then INTEGER seconds"));
         printf("    %s\n", _("behind master"));
         printf(" %s\n", "-l, --ssl");
         printf("    %s\n", _("Use ssl encryption"));
@@ -603,8 +714,11 @@ void print_help(void) {
         printf(" %s\n", "-L, --ciphers=STRING");
         printf("    %s\n", _("List of valid SSL ciphers"));
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
-        printf(" %s\n", _("There are no required arguments. By default, the local database is checked"));
+        printf(" %s\n",
+                   _("There are no required arguments. By default, the local database is checked"));
         printf(" %s\n", _("using the default unix socket. You can force TCP on localhost by using an"));
         printf(" %s\n", _("IP address or FQDN ('localhost' will use the socket as well)."));
 
diff --git a/plugins/check_mysql.d/config.h b/plugins/check_mysql.d/config.h
index 71ddbe8d..1d8c82bb 100644
--- a/plugins/check_mysql.d/config.h
+++ b/plugins/check_mysql.d/config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
 #include "thresholds.h"
 #include <stddef.h>
 #include <mysql.h>
@@ -24,10 +25,10 @@ typedef struct {
         bool check_replica;
         bool ignore_auth;
 
-        double warning_time;
-        double critical_time;
-        thresholds *my_threshold;
+        mp_thresholds replica_thresholds;
 
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_mysql_config;
 
 check_mysql_config check_mysql_config_init() {
@@ -50,9 +51,9 @@ check_mysql_config check_mysql_config_init() {
                 .check_replica = false,
                 .ignore_auth = false,
 
-                .warning_time = 0,
-                .critical_time = 0,
-                .my_threshold = NULL,
+                .replica_thresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 5e04a94b..ae6cc15d 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -29,11 +29,11 @@
  *
  *****************************************************************************/
 
-const char *progname = "check_mysql_query";
-const char *copyright = "1999-2024";
-const char *email = "devel@monitoring-plugins.org";
-
 #include "common.h"
+#include "output.h"
+#include "perfdata.h"
+#include "states.h"
+#include "thresholds.h"
 #include "utils.h"
 #include "utils_base.h"
 #include "netutils.h"
@@ -42,12 +42,17 @@ const char *email = "devel@monitoring-plugins.org";
 #include <mysql.h>
 #include <errmsg.h>
 
+const char *progname = "check_mysql_query";
+const char *copyright = "1999-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 typedef struct {
         int errorcode;
         check_mysql_query_config config;
 } check_mysql_query_config_wrapper;
 static check_mysql_query_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
-static check_mysql_query_config_wrapper validate_arguments(check_mysql_query_config_wrapper /*config_wrapper*/);
+static check_mysql_query_config_wrapper
+        validate_arguments(check_mysql_query_config_wrapper /*config_wrapper*/);
 static void print_help(void);
 void print_usage(void);
 
@@ -68,6 +73,10 @@ int main(int argc, char **argv) {
 
         const check_mysql_query_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         MYSQL mysql;
         /* initialize mysql  */
         mysql_init(&mysql);
@@ -82,26 +91,38 @@ int main(int argc, char **argv) {
                 mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "client");
         }
 
+        mp_check overall = mp_check_init();
+        mp_subcheck sc_connect = mp_subcheck_init();
+
         /* establish a connection to the server and error checking */
-        if (!mysql_real_connect(&mysql, config.db_host, config.db_user, config.db_pass, config.db, config.db_port, config.db_socket, 0)) {
+        if (!mysql_real_connect(&mysql, config.db_host, config.db_user, config.db_pass, config.db,
+                                                        config.db_port, config.db_socket, 0)) {
+                xasprintf(&sc_connect.output, "query failed: %s", mysql_error(&mysql));
+
                 if (mysql_errno(&mysql) == CR_UNKNOWN_HOST) {
-                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                        sc_connect = mp_set_subcheck_state(sc_connect, STATE_WARNING);
                 } else if (mysql_errno(&mysql) == CR_VERSION_ERROR) {
-                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                        sc_connect = mp_set_subcheck_state(sc_connect, STATE_WARNING);
                 } else if (mysql_errno(&mysql) == CR_OUT_OF_MEMORY) {
-                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                        sc_connect = mp_set_subcheck_state(sc_connect, STATE_WARNING);
                 } else if (mysql_errno(&mysql) == CR_IPSOCK_ERROR) {
-                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                        sc_connect = mp_set_subcheck_state(sc_connect, STATE_WARNING);
                 } else if (mysql_errno(&mysql) == CR_SOCKET_CREATE_ERROR) {
-                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                        sc_connect = mp_set_subcheck_state(sc_connect, STATE_WARNING);
                 } else {
-                        die(STATE_CRITICAL, "QUERY %s: %s\n", _("CRITICAL"), mysql_error(&mysql));
+                        sc_connect = mp_set_subcheck_state(sc_connect, STATE_CRITICAL);
                 }
+
+                mp_add_subcheck_to_check(&overall, sc_connect);
+                mp_exit(overall);
         }
 
-        char *error = NULL;
+        sc_connect = mp_set_subcheck_state(sc_connect, STATE_OK);
+        xasprintf(&sc_connect.output, "query succeeded");
+        mp_add_subcheck_to_check(&overall, sc_connect);
+
         if (mysql_query(&mysql, config.sql_query) != 0) {
-                error = strdup(mysql_error(&mysql));
+                char *error = strdup(mysql_error(&mysql));
                 mysql_close(&mysql);
                 die(STATE_CRITICAL, "QUERY %s: %s - %s\n", _("CRITICAL"), _("Error with query"), error);
         }
@@ -109,7 +130,7 @@ int main(int argc, char **argv) {
         MYSQL_RES *res;
         /* store the result */
         if ((res = mysql_store_result(&mysql)) == NULL) {
-                error = strdup(mysql_error(&mysql));
+                char *error = strdup(mysql_error(&mysql));
                 mysql_close(&mysql);
                 die(STATE_CRITICAL, "QUERY %s: Error with store_result - %s\n", _("CRITICAL"), error);
         }
@@ -120,17 +141,24 @@ int main(int argc, char **argv) {
                 die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), _("No rows returned"));
         }
 
+        mp_subcheck sc_value = mp_subcheck_init();
         MYSQL_ROW row;
         /* fetch the first row */
         if ((row = mysql_fetch_row(res)) == NULL) {
-                error = strdup(mysql_error(&mysql));
+                xasprintf(&sc_value.output, "fetch row error - %s", mysql_error(&mysql));
                 mysql_free_result(res);
                 mysql_close(&mysql);
-                die(STATE_CRITICAL, "QUERY %s: Fetch row error - %s\n", _("CRITICAL"), error);
+
+                sc_value = mp_set_subcheck_state(sc_value, STATE_CRITICAL);
+                mp_add_subcheck_to_check(&overall, sc_value);
+                mp_exit(overall);
         }
 
         if (!is_numeric(row[0])) {
-                die(STATE_CRITICAL, "QUERY %s: %s - '%s'\n", _("CRITICAL"), _("Is not a numeric"), row[0]);
+                xasprintf(&sc_value.output, "query result is not numeric");
+                sc_value = mp_set_subcheck_state(sc_value, STATE_CRITICAL);
+                mp_add_subcheck_to_check(&overall, sc_value);
+                mp_exit(overall);
         }
 
         double value = strtod(row[0], NULL);
@@ -145,31 +173,42 @@ int main(int argc, char **argv) {
                 printf("mysql result: %f\n", value);
         }
 
-        int status = get_status(value, config.my_thresholds);
+        mp_perfdata pd_query_result = perfdata_init();
+        pd_query_result = mp_set_pd_value(pd_query_result, value);
+        pd_query_result = mp_pd_set_thresholds(pd_query_result, config.thresholds);
+        pd_query_result.label = "result";
+        mp_add_perfdata_to_subcheck(&sc_value, pd_query_result);
 
-        if (status == STATE_OK) {
-                printf("QUERY %s: ", _("OK"));
-        } else if (status == STATE_WARNING) {
-                printf("QUERY %s: ", _("WARNING"));
-        } else if (status == STATE_CRITICAL) {
-                printf("QUERY %s: ", _("CRITICAL"));
-        }
-        printf(_("'%s' returned %f | %s"), config.sql_query, value,
-                   fperfdata("result", value, "", config.my_thresholds->warning, config.my_thresholds->warning ? config.my_thresholds->warning->end : 0,
-                                         config.my_thresholds->critical, config.my_thresholds->critical ? config.my_thresholds->critical->end : 0, false, 0, false, 0));
-        printf("\n");
+        sc_value = mp_set_subcheck_state(sc_value, mp_get_pd_status(pd_query_result));
+        xasprintf(&sc_value.output, "'%s' returned '%f'", config.sql_query, value);
+
+        mp_add_subcheck_to_check(&overall, sc_value);
 
-        return status;
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
 check_mysql_query_config_wrapper process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'}, {"socket", required_argument, 0, 's'},   {"database", required_argument, 0, 'd'},
-                {"username", required_argument, 0, 'u'}, {"password", required_argument, 0, 'p'}, {"file", required_argument, 0, 'f'},
-                {"group", required_argument, 0, 'g'},    {"port", required_argument, 0, 'P'},     {"verbose", no_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},        {"help", no_argument, 0, 'h'},           {"query", required_argument, 0, 'q'},
-                {"warning", required_argument, 0, 'w'},  {"critical", required_argument, 0, 'c'}, {0, 0, 0, 0}};
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
+
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"socket", required_argument, 0, 's'},
+                                                                           {"database", required_argument, 0, 'd'},
+                                                                           {"username", required_argument, 0, 'u'},
+                                                                           {"password", required_argument, 0, 'p'},
+                                                                           {"file", required_argument, 0, 'f'},
+                                                                           {"group", required_argument, 0, 'g'},
+                                                                           {"port", required_argument, 0, 'P'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"query", required_argument, 0, 'q'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
+                                                                           {0, 0, 0, 0}};
 
         check_mysql_query_config_wrapper result = {
                 .errorcode = OK,
@@ -181,9 +220,6 @@ check_mysql_query_config_wrapper process_arguments(int argc, char **argv) {
                 return result;
         }
 
-        char *warning = NULL;
-        char *critical = NULL;
-
         while (true) {
                 int option = 0;
                 int option_char = getopt_long(argc, argv, "hvVP:p:u:d:H:s:q:w:c:f:g:", longopts, &option);
@@ -239,23 +275,41 @@ check_mysql_query_config_wrapper process_arguments(int argc, char **argv) {
                 case 'q':
                         xasprintf(&result.config.sql_query, "%s", optarg);
                         break;
-                case 'w':
-                        warning = optarg;
-                        break;
-                case 'c':
-                        critical = optarg;
-                        break;
+                case 'w': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning threshold");
+                        }
+                        result.config.thresholds = mp_thresholds_set_warn(result.config.thresholds, tmp.range);
+                } break;
+                case 'c': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical threshold");
+                        }
+                        result.config.thresholds = mp_thresholds_set_crit(result.config.thresholds, tmp.range);
+                } break;
                 case '?': /* help */
                         usage5();
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 }
         }
 
-        set_thresholds(&result.config.my_thresholds, warning, critical);
-
         return validate_arguments(result);
 }
 
-check_mysql_query_config_wrapper validate_arguments(check_mysql_query_config_wrapper config_wrapper) {
+check_mysql_query_config_wrapper
+validate_arguments(check_mysql_query_config_wrapper config_wrapper) {
         if (config_wrapper.config.sql_query == NULL) {
                 usage("Must specify a SQL query to run");
         }
@@ -310,6 +364,8 @@ void print_help(void) {
         printf("    ==> %s <==\n", _("IMPORTANT: THIS FORM OF AUTHENTICATION IS NOT SECURE!!!"));
         printf("    %s\n", _("Your clear-text password could be visible as a process table entry"));
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf("\n");
         printf(" %s\n", _("A query is required. The result from the query should be numeric."));
         printf(" %s\n", _("For extra security, create a user with minimal access."));
diff --git a/plugins/check_mysql_query.d/config.h b/plugins/check_mysql_query.d/config.h
index be019160..32ab455a 100644
--- a/plugins/check_mysql_query.d/config.h
+++ b/plugins/check_mysql_query.d/config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
 #include "thresholds.h"
 #include <mysql.h>
 
@@ -15,7 +16,10 @@ typedef struct {
         unsigned int db_port;
 
         char *sql_query;
-        thresholds *my_thresholds;
+        mp_thresholds thresholds;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_mysql_query_config;
 
 check_mysql_query_config check_mysql_query_config_init() {
@@ -30,7 +34,9 @@ check_mysql_query_config check_mysql_query_config_init() {
                 .db_port = MYSQL_PORT,
 
                 .sql_query = NULL,
-                .my_thresholds = NULL,
+                .thresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
deleted file mode 100644
index 7dd23e5c..00000000
--- a/plugins/check_nt.c
+++ /dev/null
@@ -1,756 +0,0 @@
-/*****************************************************************************
- *
- * Monitoring check_nt plugin
- *
- * License: GPL
- * Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
- * Copyright (c) 2003-2024 Monitoring Plugins Development Team
- *
- * Description:
- *
- * This file contains the check_nt plugin
- *
- * This plugin collects data from the NSClient service running on a
- * Windows NT/2000/XP/2003 server.
- * This plugin requires NSClient software to run on NT
- * (https://nsclient.org/)
- *
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- *****************************************************************************/
-
-const char *progname = "check_nt";
-const char *copyright = "2000-2024";
-const char *email = "devel@monitoring-plugins.org";
-
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-#include "check_nt.d/config.h"
-
-enum {
-        MAX_VALUE_LIST = 30,
-};
-
-static char recv_buffer[MAX_INPUT_BUFFER];
-
-static void fetch_data(const char *address, int port, const char *sendb);
-
-typedef struct {
-        int errorcode;
-        check_nt_config config;
-} check_nt_config_wrapper;
-static check_nt_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
-
-static void preparelist(char *string);
-static bool strtoularray(unsigned long *array, char *string, const char *delim);
-static void print_help(void);
-void print_usage(void);
-
-int main(int argc, char **argv) {
-        setlocale(LC_ALL, "");
-        bindtextdomain(PACKAGE, LOCALEDIR);
-        textdomain(PACKAGE);
-
-        /* Parse extra opts if any */
-        argv = np_extra_opts(&argc, argv, progname);
-
-        check_nt_config_wrapper tmp_config = process_arguments(argc, argv);
-        if (tmp_config.errorcode == ERROR) {
-                usage4(_("Could not parse arguments"));
-        }
-
-        const check_nt_config config = tmp_config.config;
-
-        /* initialize alarm signal handling */
-        signal(SIGALRM, socket_timeout_alarm_handler);
-
-        /* set socket timeout */
-        alarm(socket_timeout);
-
-        int return_code = STATE_UNKNOWN;
-        char *send_buffer = NULL;
-        char *output_message = NULL;
-        char *perfdata = NULL;
-        char *temp_string = NULL;
-        char *temp_string_perf = NULL;
-        char *description = NULL;
-        char *counter_unit = NULL;
-        char *errcvt = NULL;
-        unsigned long lvalue_list[MAX_VALUE_LIST];
-        switch (config.vars_to_check) {
-        case CHECK_CLIENTVERSION:
-                xasprintf(&send_buffer, "%s&1", config.req_password);
-                fetch_data(config.server_address, config.server_port, send_buffer);
-                if (config.value_list != NULL && strcmp(recv_buffer, config.value_list) != 0) {
-                        xasprintf(&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, config.value_list);
-                        return_code = STATE_WARNING;
-                } else {
-                        xasprintf(&output_message, "%s", recv_buffer);
-                        return_code = STATE_OK;
-                }
-                break;
-        case CHECK_CPULOAD:
-                if (config.value_list == NULL) {
-                        output_message = strdup(_("missing -l parameters"));
-                } else if (!strtoularray(lvalue_list, config.value_list, ",")) {
-                        output_message = strdup(_("wrong -l parameter."));
-                } else {
-                        /* -l parameters is present with only integers */
-                        return_code = STATE_OK;
-                        temp_string = strdup(_("CPU Load"));
-                        temp_string_perf = strdup(" ");
-
-                        /* loop until one of the parameters is wrong or not present */
-                        int offset = 0;
-                        while (lvalue_list[0 + offset] > (unsigned long)0 && lvalue_list[0 + offset] <= (unsigned long)17280 &&
-                                   lvalue_list[1 + offset] > (unsigned long)0 && lvalue_list[1 + offset] <= (unsigned long)100 &&
-                                   lvalue_list[2 + offset] > (unsigned long)0 && lvalue_list[2 + offset] <= (unsigned long)100) {
-
-                                /* Send request and retrieve data */
-                                xasprintf(&send_buffer, "%s&2&%lu", config.req_password, lvalue_list[0 + offset]);
-                                fetch_data(config.server_address, config.server_port, send_buffer);
-
-                                unsigned long utilization = strtoul(recv_buffer, NULL, 10);
-
-                                /* Check if any of the request is in a warning or critical state */
-                                if (utilization >= lvalue_list[2 + offset]) {
-                                        return_code = STATE_CRITICAL;
-                                } else if (utilization >= lvalue_list[1 + offset] && return_code < STATE_WARNING) {
-                                        return_code = STATE_WARNING;
-                                }
-
-                                xasprintf(&output_message, _(" %lu%% (%lu min average)"), utilization, lvalue_list[0 + offset]);
-                                xasprintf(&temp_string, "%s%s", temp_string, output_message);
-                                xasprintf(&perfdata, _(" '%lu min avg Load'=%lu%%;%lu;%lu;0;100"), lvalue_list[0 + offset], utilization,
-                                                  lvalue_list[1 + offset], lvalue_list[2 + offset]);
-                                xasprintf(&temp_string_perf, "%s%s", temp_string_perf, perfdata);
-                                offset += 3; /* move across the array */
-                        }
-
-                        if (strlen(temp_string) > 10) { /* we had at least one loop */
-                                output_message = strdup(temp_string);
-                                perfdata = temp_string_perf;
-                        } else {
-                                output_message = strdup(_("not enough values for -l parameters"));
-                        }
-                }
-                break;
-        case CHECK_UPTIME: {
-                char *tmp_value_list = config.value_list;
-                if (config.value_list == NULL) {
-                        tmp_value_list = "minutes";
-                }
-                if (strncmp(tmp_value_list, "seconds", strlen("seconds") + 1) && strncmp(tmp_value_list, "minutes", strlen("minutes") + 1) &&
-                        strncmp(config.value_list, "hours", strlen("hours") + 1) && strncmp(tmp_value_list, "days", strlen("days") + 1)) {
-
-                        output_message = strdup(_("wrong -l argument"));
-                } else {
-                        xasprintf(&send_buffer, "%s&3", config.req_password);
-                        fetch_data(config.server_address, config.server_port, send_buffer);
-                        unsigned long uptime = strtoul(recv_buffer, NULL, 10);
-                        int updays = uptime / 86400;
-                        int uphours = (uptime % 86400) / 3600;
-                        int upminutes = ((uptime % 86400) % 3600) / 60;
-
-                        if (!strncmp(tmp_value_list, "minutes", strlen("minutes"))) {
-                                uptime = uptime / 60;
-                        } else if (!strncmp(tmp_value_list, "hours", strlen("hours"))) {
-                                uptime = uptime / 3600;
-                        } else if (!strncmp(tmp_value_list, "days", strlen("days"))) {
-                                uptime = uptime / 86400;
-                        }
-                        /* else uptime in seconds, nothing to do */
-
-                        xasprintf(&output_message, _("System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"), updays, uphours, upminutes,
-                                          uptime);
-
-                        if (config.check_critical_value && uptime <= config.critical_value) {
-                                return_code = STATE_CRITICAL;
-                        } else if (config.check_warning_value && uptime <= config.warning_value) {
-                                return_code = STATE_WARNING;
-                        } else {
-                                return_code = STATE_OK;
-                        }
-                }
-        } break;
-        case CHECK_USEDDISKSPACE:
-                if (config.value_list == NULL) {
-                        output_message = strdup(_("missing -l parameters"));
-                } else if (strlen(config.value_list) != 1) {
-                        output_message = strdup(_("wrong -l argument"));
-                } else {
-                        xasprintf(&send_buffer, "%s&4&%s", config.req_password, config.value_list);
-                        fetch_data(config.server_address, config.server_port, send_buffer);
-                        char *fds = strtok(recv_buffer, "&");
-                        char *tds = strtok(NULL, "&");
-                        double total_disk_space = 0;
-                        double free_disk_space = 0;
-                        if (fds != NULL) {
-                                free_disk_space = atof(fds);
-                        }
-                        if (tds != NULL) {
-                                total_disk_space = atof(tds);
-                        }
-
-                        if (total_disk_space > 0 && free_disk_space >= 0) {
-                                double percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
-                                double warning_used_space = ((float)config.warning_value / 100) * total_disk_space;
-                                double critical_used_space = ((float)config.critical_value / 100) * total_disk_space;
-
-                                xasprintf(&temp_string, _("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"), config.value_list,
-                                                  total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824, percent_used_space,
-                                                  free_disk_space / 1073741824, (free_disk_space / total_disk_space) * 100);
-                                xasprintf(&temp_string_perf, _("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), config.value_list,
-                                                  (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
-                                                  critical_used_space / 1073741824, total_disk_space / 1073741824);
-
-                                if (config.check_critical_value && percent_used_space >= config.critical_value) {
-                                        return_code = STATE_CRITICAL;
-                                } else if (config.check_warning_value && percent_used_space >= config.warning_value) {
-                                        return_code = STATE_WARNING;
-                                } else {
-                                        return_code = STATE_OK;
-                                }
-
-                                output_message = strdup(temp_string);
-                                perfdata = temp_string_perf;
-                        } else {
-                                output_message = strdup(_("Free disk space : Invalid drive"));
-                                return_code = STATE_UNKNOWN;
-                        }
-                }
-                break;
-        case CHECK_SERVICESTATE:
-        case CHECK_PROCSTATE:
-                if (config.value_list == NULL) {
-                        output_message = strdup(_("No service/process specified"));
-                } else {
-                        preparelist(config.value_list); /* replace , between services with & to send the request */
-                        xasprintf(&send_buffer, "%s&%u&%s&%s", config.req_password, (config.vars_to_check == CHECK_SERVICESTATE) ? 5 : 6,
-                                          (config.show_all) ? "ShowAll" : "ShowFail", config.value_list);
-                        fetch_data(config.server_address, config.server_port, send_buffer);
-                        char *numstr = strtok(recv_buffer, "&");
-                        if (numstr == NULL) {
-                                die(STATE_UNKNOWN, _("could not fetch information from server\n"));
-                        }
-                        return_code = atoi(numstr);
-                        temp_string = strtok(NULL, "&");
-                        output_message = strdup(temp_string);
-                }
-                break;
-        case CHECK_MEMUSE:
-                xasprintf(&send_buffer, "%s&7", config.req_password);
-                fetch_data(config.server_address, config.server_port, send_buffer);
-                char *numstr = strtok(recv_buffer, "&");
-                if (numstr == NULL) {
-                        die(STATE_UNKNOWN, _("could not fetch information from server\n"));
-                }
-                double mem_commitLimit = atof(numstr);
-                numstr = strtok(NULL, "&");
-                if (numstr == NULL) {
-                        die(STATE_UNKNOWN, _("could not fetch information from server\n"));
-                }
-                double mem_commitByte = atof(numstr);
-                double percent_used_space = (mem_commitByte / mem_commitLimit) * 100;
-                double warning_used_space = ((float)config.warning_value / 100) * mem_commitLimit;
-                double critical_used_space = ((float)config.critical_value / 100) * mem_commitLimit;
-
-                /* Divisor should be 1048567, not 3044515, as we are measuring "Commit Charge" here,
-                which equals RAM + Pagefiles. */
-                xasprintf(&output_message, _("Memory usage: total:%.2f MB - used: %.2f MB (%.0f%%) - free: %.2f MB (%.0f%%)"),
-                                  mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space, (mem_commitLimit - mem_commitByte) / 1048567,
-                                  (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
-                xasprintf(&perfdata, _("'Memory usage'=%.2fMB;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567, warning_used_space / 1048567,
-                                  critical_used_space / 1048567, mem_commitLimit / 1048567);
-
-                return_code = STATE_OK;
-                if (config.check_critical_value && percent_used_space >= config.critical_value) {
-                        return_code = STATE_CRITICAL;
-                } else if (config.check_warning_value && percent_used_space >= config.warning_value) {
-                        return_code = STATE_WARNING;
-                }
-
-                break;
-        case CHECK_COUNTER: {
-                /*
-                CHECK_COUNTER has been modified to provide extensive perfdata information.
-                In order to do this, some modifications have been done to the code
-                and some constraints have been introduced.
-
-                1) For the sake of simplicity of the code, perfdata information will only be
-                 provided when the "description" field is added.
-
-                2) If the counter you're going to measure is percent-based, the code will detect
-                 the percent sign in its name and will attribute minimum (0%) and maximum (100%)
-                 values automagically, as well the "%" sign to graph units.
-
-                3) OTOH, if the counter is "absolute", you'll have to provide the following
-                 the counter unit - that is, the dimensions of the counter you're getting. Examples:
-                 pages/s, packets transferred, etc.
-
-                4) If you want, you may provide the minimum and maximum values to expect. They aren't mandatory,
-                 but once specified they MUST have the same order of magnitude and units of -w and -c; otherwise.
-                 strange things will happen when you make graphs of your data.
-                */
-
-                double counter_value = 0.0;
-                if (config.value_list == NULL) {
-                        output_message = strdup(_("No counter specified"));
-                } else {
-                        preparelist(config.value_list); /* replace , between services with & to send the request */
-                        bool isPercent = (strchr(config.value_list, '%') != NULL);
-
-                        strtok(config.value_list, "&"); /* burn the first parameters */
-                        description = strtok(NULL, "&");
-                        counter_unit = strtok(NULL, "&");
-                        xasprintf(&send_buffer, "%s&8&%s", config.req_password, config.value_list);
-                        fetch_data(config.server_address, config.server_port, send_buffer);
-                        counter_value = atof(recv_buffer);
-
-                        bool allRight = false;
-                        if (description == NULL) {
-                                xasprintf(&output_message, "%.f", counter_value);
-                        } else if (isPercent) {
-                                counter_unit = strdup("%");
-                                allRight = true;
-                        }
-
-                        char *minval = NULL;
-                        char *maxval = NULL;
-                        double fminval = 0;
-                        double fmaxval = 0;
-                        if ((counter_unit != NULL) && (!allRight)) {
-                                minval = strtok(NULL, "&");
-                                maxval = strtok(NULL, "&");
-
-                                /* All parameters specified. Let's check the numbers */
-
-                                fminval = (minval != NULL) ? strtod(minval, &errcvt) : -1;
-                                fmaxval = (minval != NULL) ? strtod(maxval, &errcvt) : -1;
-
-                                if ((fminval == 0) && (minval == errcvt)) {
-                                        output_message = strdup(_("Minimum value contains non-numbers"));
-                                } else {
-                                        if ((fmaxval == 0) && (maxval == errcvt)) {
-                                                output_message = strdup(_("Maximum value contains non-numbers"));
-                                        } else {
-                                                allRight = true; /* Everything is OK. */
-                                        }
-                                }
-                        } else if ((counter_unit == NULL) && (description != NULL)) {
-                                output_message = strdup(_("No unit counter specified"));
-                        }
-
-                        if (allRight) {
-                                /* Let's format the output string, finally... */
-                                if (strstr(description, "%") == NULL) {
-                                        xasprintf(&output_message, "%s = %.2f %s", description, counter_value, counter_unit);
-                                } else {
-                                        /* has formatting, will segv if wrong */
-                                        xasprintf(&output_message, description, counter_value);
-                                }
-                                xasprintf(&output_message, "%s |", output_message);
-                                xasprintf(&output_message, "%s %s", output_message,
-                                                  fperfdata(description, counter_value, counter_unit, 1, config.warning_value, 1, config.critical_value,
-                                                                        (!(isPercent) && (minval != NULL)), fminval, (!(isPercent) && (minval != NULL)), fmaxval));
-                        }
-                }
-
-                if (config.critical_value > config.warning_value) { /* Normal thresholds */
-                        if (config.check_critical_value && counter_value >= config.critical_value) {
-                                return_code = STATE_CRITICAL;
-                        } else if (config.check_warning_value && counter_value >= config.warning_value) {
-                                return_code = STATE_WARNING;
-                        } else {
-                                return_code = STATE_OK;
-                        }
-                } else { /* inverse thresholds */
-                        return_code = STATE_OK;
-                        if (config.check_critical_value && counter_value <= config.critical_value) {
-                                return_code = STATE_CRITICAL;
-                        } else if (config.check_warning_value && counter_value <= config.warning_value) {
-                                return_code = STATE_WARNING;
-                        }
-                }
-        } break;
-        case CHECK_FILEAGE:
-                if (config.value_list == NULL) {
-                        output_message = strdup(_("No counter specified"));
-                } else {
-                        preparelist(config.value_list); /* replace , between services with & to send the request */
-                        xasprintf(&send_buffer, "%s&9&%s", config.req_password, config.value_list);
-                        fetch_data(config.server_address, config.server_port, send_buffer);
-                        unsigned long age_in_minutes = atoi(strtok(recv_buffer, "&"));
-                        description = strtok(NULL, "&");
-                        output_message = strdup(description);
-
-                        if (config.critical_value > config.warning_value) { /* Normal thresholds */
-                                if (config.check_critical_value && age_in_minutes >= config.critical_value) {
-                                        return_code = STATE_CRITICAL;
-                                } else if (config.check_warning_value && age_in_minutes >= config.warning_value) {
-                                        return_code = STATE_WARNING;
-                                } else {
-                                        return_code = STATE_OK;
-                                }
-                        } else { /* inverse thresholds */
-                                if (config.check_critical_value && age_in_minutes <= config.critical_value) {
-                                        return_code = STATE_CRITICAL;
-                                } else if (config.check_warning_value && age_in_minutes <= config.warning_value) {
-                                        return_code = STATE_WARNING;
-                                } else {
-                                        return_code = STATE_OK;
-                                }
-                        }
-                }
-                break;
-
-        case CHECK_INSTANCES:
-                if (config.value_list == NULL) {
-                        output_message = strdup(_("No counter specified"));
-                } else {
-                        xasprintf(&send_buffer, "%s&10&%s", config.req_password, config.value_list);
-                        fetch_data(config.server_address, config.server_port, send_buffer);
-                        if (!strncmp(recv_buffer, "ERROR", 5)) {
-                                printf("NSClient - %s\n", recv_buffer);
-                                exit(STATE_UNKNOWN);
-                        }
-                        xasprintf(&output_message, "%s", recv_buffer);
-                        return_code = STATE_OK;
-                }
-                break;
-
-        case CHECK_NONE:
-        default:
-                usage4(_("Please specify a variable to check"));
-                break;
-        }
-
-        /* reset timeout */
-        alarm(0);
-
-        if (perfdata == NULL) {
-                printf("%s\n", output_message);
-        } else {
-                printf("%s | %s\n", output_message, perfdata);
-        }
-        return return_code;
-}
-
-/* process command-line arguments */
-check_nt_config_wrapper process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {{"port", required_argument, 0, 'p'},
-                                                                           {"timeout", required_argument, 0, 't'},
-                                                                           {"critical", required_argument, 0, 'c'},
-                                                                           {"warning", required_argument, 0, 'w'},
-                                                                           {"variable", required_argument, 0, 'v'},
-                                                                           {"hostname", required_argument, 0, 'H'},
-                                                                           {"params", required_argument, 0, 'l'},
-                                                                           {"secret", required_argument, 0, 's'},
-                                                                           {"display", required_argument, 0, 'd'},
-                                                                           {"unknown-timeout", no_argument, 0, 'u'},
-                                                                           {"version", no_argument, 0, 'V'},
-                                                                           {"help", no_argument, 0, 'h'},
-                                                                           {0, 0, 0, 0}};
-
-        check_nt_config_wrapper result = {
-                .errorcode = OK,
-                .config = check_nt_config_init(),
-        };
-
-        /* no options were supplied */
-        if (argc < 2) {
-                result.errorcode = ERROR;
-                return result;
-        }
-
-        /* backwards compatibility */
-        if (!is_option(argv[1])) {
-                result.config.server_address = strdup(argv[1]);
-                argv[1] = argv[0];
-                argv = &argv[1];
-                argc--;
-        }
-
-        for (int index = 1; index < argc; index++) {
-                if (strcmp("-to", argv[index]) == 0) {
-                        strcpy(argv[index], "-t");
-                } else if (strcmp("-wv", argv[index]) == 0) {
-                        strcpy(argv[index], "-w");
-                } else if (strcmp("-cv", argv[index]) == 0) {
-                        strcpy(argv[index], "-c");
-                }
-        }
-
-        int option = 0;
-        while (true) {
-                int option_index = getopt_long(argc, argv, "+hVH:t:c:w:p:v:l:s:d:u", longopts, &option);
-
-                if (option_index == -1 || option_index == EOF || option_index == 1) {
-                        break;
-                }
-
-                switch (option_index) {
-                case '?': /* print short usage statement if args not parsable */
-                        usage5();
-                case 'h': /* help */
-                        print_help();
-                        exit(STATE_UNKNOWN);
-                case 'V': /* version */
-                        print_revision(progname, NP_VERSION);
-                        exit(STATE_UNKNOWN);
-                case 'H': /* hostname */
-                        result.config.server_address = optarg;
-                        break;
-                case 's': /* password */
-                        result.config.req_password = optarg;
-                        break;
-                case 'p': /* port */
-                        if (is_intnonneg(optarg)) {
-                                result.config.server_port = atoi(optarg);
-                        } else {
-                                die(STATE_UNKNOWN, _("Server port must be an integer\n"));
-                        }
-                        break;
-                case 'v':
-                        if (strlen(optarg) < 4) {
-                                result.errorcode = ERROR;
-                                return result;
-                        }
-                        if (!strcmp(optarg, "CLIENTVERSION")) {
-                                result.config.vars_to_check = CHECK_CLIENTVERSION;
-                        } else if (!strcmp(optarg, "CPULOAD")) {
-                                result.config.vars_to_check = CHECK_CPULOAD;
-                        } else if (!strcmp(optarg, "UPTIME")) {
-                                result.config.vars_to_check = CHECK_UPTIME;
-                        } else if (!strcmp(optarg, "USEDDISKSPACE")) {
-                                result.config.vars_to_check = CHECK_USEDDISKSPACE;
-                        } else if (!strcmp(optarg, "SERVICESTATE")) {
-                                result.config.vars_to_check = CHECK_SERVICESTATE;
-                        } else if (!strcmp(optarg, "PROCSTATE")) {
-                                result.config.vars_to_check = CHECK_PROCSTATE;
-                        } else if (!strcmp(optarg, "MEMUSE")) {
-                                result.config.vars_to_check = CHECK_MEMUSE;
-                        } else if (!strcmp(optarg, "COUNTER")) {
-                                result.config.vars_to_check = CHECK_COUNTER;
-                        } else if (!strcmp(optarg, "FILEAGE")) {
-                                result.config.vars_to_check = CHECK_FILEAGE;
-                        } else if (!strcmp(optarg, "INSTANCES")) {
-                                result.config.vars_to_check = CHECK_INSTANCES;
-                        } else {
-                                result.errorcode = ERROR;
-                                return result;
-                        }
-                        break;
-                case 'l': /* value list */
-                        result.config.value_list = optarg;
-                        break;
-                case 'w': /* warning threshold */
-                        result.config.warning_value = strtoul(optarg, NULL, 10);
-                        result.config.check_warning_value = true;
-                        break;
-                case 'c': /* critical threshold */
-                        result.config.critical_value = strtoul(optarg, NULL, 10);
-                        result.config.check_critical_value = true;
-                        break;
-                case 'd': /* Display select for services */
-                        if (!strcmp(optarg, "SHOWALL")) {
-                                result.config.show_all = true;
-                        }
-                        break;
-                case 'u':
-                        socket_timeout_state = STATE_UNKNOWN;
-                        break;
-                case 't': /* timeout */
-                        socket_timeout = atoi(optarg);
-                        if (socket_timeout <= 0) {
-                                result.errorcode = ERROR;
-                                return result;
-                        }
-                }
-        }
-        if (result.config.server_address == NULL) {
-                usage4(_("You must provide a server address or host name"));
-        }
-
-        if (result.config.vars_to_check == CHECK_NONE) {
-                result.errorcode = ERROR;
-                return result;
-        }
-
-        if (result.config.req_password == NULL) {
-                result.config.req_password = strdup(_("None"));
-        }
-
-        return result;
-}
-
-void fetch_data(const char *address, int port, const char *sendb) {
-        int result = process_tcp_request(address, port, sendb, recv_buffer, sizeof(recv_buffer));
-
-        if (result != STATE_OK) {
-                die(result, _("could not fetch information from server\n"));
-        }
-
-        if (!strncmp(recv_buffer, "ERROR", 5)) {
-                die(STATE_UNKNOWN, "NSClient - %s\n", recv_buffer);
-        }
-}
-
-bool strtoularray(unsigned long *array, char *string, const char *delim) {
-        /* split a <delim> delimited string into a long array */
-        for (int idx = 0; idx < MAX_VALUE_LIST; idx++) {
-                array[idx] = 0;
-        }
-
-        int idx = 0;
-        for (char *t1 = strtok(string, delim); t1 != NULL; t1 = strtok(NULL, delim)) {
-                if (is_numeric(t1) && idx < MAX_VALUE_LIST) {
-                        array[idx] = strtoul(t1, NULL, 10);
-                        idx++;
-                } else {
-                        return false;
-                }
-        }
-        return true;
-}
-
-void preparelist(char *string) {
-        /* Replace all , with & which is the delimiter for the request */
-        for (int i = 0; (size_t)i < strlen(string); i++) {
-                if (string[i] == ',') {
-                        string[i] = '&';
-                }
-        }
-}
-
-void print_help(void) {
-        print_revision(progname, NP_VERSION);
-
-        printf("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
-        printf(COPYRIGHT, copyright, email);
-
-        printf("%s\n", _("This plugin collects data from the NSClient service running on a"));
-        printf("%s\n", _("Windows NT/2000/XP/2003 server."));
-
-        printf("\n\n");
-
-        print_usage();
-
-        printf(UT_HELP_VRSN);
-        printf(UT_EXTRA_OPTS);
-
-        printf("%s\n", _("Options:"));
-        printf(" %s\n", "-H, --hostname=HOST");
-        printf("   %s\n", _("Name of the host to check"));
-        printf(" %s\n", "-p, --port=INTEGER");
-        printf("   %s", _("Optional port number (default: "));
-        printf("%d)\n", PORT);
-        printf(" %s\n", "-s, --secret=<password>");
-        printf("   %s\n", _("Password needed for the request"));
-        printf(" %s\n", "-w, --warning=INTEGER");
-        printf("   %s\n", _("Threshold which will result in a warning status"));
-        printf(" %s\n", "-c, --critical=INTEGER");
-        printf("   %s\n", _("Threshold which will result in a critical status"));
-        printf(" %s\n", "-t, --timeout=INTEGER");
-        printf("   %s", _("Seconds before connection attempt times out (default: "));
-        printf(" %s\n", "-l, --params=<parameters>");
-        printf("   %s", _("Parameters passed to specified check (see below)"));
-        printf(" %s\n", "-d, --display={SHOWALL}");
-        printf("   %s", _("Display options (currently only SHOWALL works)"));
-        printf(" %s\n", "-u, --unknown-timeout");
-        printf("   %s", _("Return UNKNOWN on timeouts"));
-        printf("%d)\n", DEFAULT_SOCKET_TIMEOUT);
-        printf(" %s\n", "-h, --help");
-        printf("   %s\n", _("Print this help screen"));
-        printf(" %s\n", "-V, --version");
-        printf("   %s\n", _("Print version information"));
-        printf(" %s\n", "-v, --variable=STRING");
-        printf("   %s\n\n", _("Variable to check"));
-        printf("%s\n", _("Valid variables are:"));
-        printf(" %s", "CLIENTVERSION =");
-        printf(" %s\n", _("Get the NSClient version"));
-        printf("  %s\n", _("If -l <version> is specified, will return warning if versions differ."));
-        printf(" %s\n", "CPULOAD =");
-        printf("  %s\n", _("Average CPU load on last x minutes."));
-        printf("  %s\n", _("Request a -l parameter with the following syntax:"));
-        printf("  %s\n", _("-l <minutes range>,<warning threshold>,<critical threshold>."));
-        printf("  %s\n", _("<minute range> should be less than 24*60."));
-        printf("  %s\n", _("Thresholds are percentage and up to 10 requests can be done in one shot."));
-        printf("  %s\n", "ie: -l 60,90,95,120,90,95");
-        printf(" %s\n", "UPTIME =");
-        printf("  %s\n", _("Get the uptime of the machine."));
-        printf("  %s\n", _("-l <unit> "));
-        printf("  %s\n", _("<unit> = seconds, minutes, hours, or days. (default: minutes)"));
-        printf("  %s\n", _("Thresholds will use the unit specified above."));
-        printf(" %s\n", "USEDDISKSPACE =");
-        printf("  %s\n", _("Size and percentage of disk use."));
-        printf("  %s\n", _("Request a -l parameter containing the drive letter only."));
-        printf("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
-        printf(" %s\n", "MEMUSE =");
-        printf("  %s\n", _("Memory use."));
-        printf("  %s\n", _("Warning and critical thresholds can be specified with -w and -c."));
-        printf(" %s\n", "SERVICESTATE =");
-        printf("  %s\n", _("Check the state of one or several services."));
-        printf("  %s\n", _("Request a -l parameters with the following syntax:"));
-        printf("  %s\n", _("-l <service1>,<service2>,<service3>,..."));
-        printf("  %s\n", _("You can specify -d SHOWALL in case you want to see working services"));
-        printf("  %s\n", _("in the returned string."));
-        printf(" %s\n", "PROCSTATE =");
-        printf("  %s\n", _("Check if one or several process are running."));
-        printf("  %s\n", _("Same syntax as SERVICESTATE."));
-        printf(" %s\n", "COUNTER =");
-        printf("  %s\n", _("Check any performance counter of Windows NT/2000."));
-        printf("        %s\n", _("Request a -l parameters with the following syntax:"));
-        printf("        %s\n", _("-l \"\\\\<performance object>\\\\counter\",\"<description>"));
-        printf("        %s\n", _("The <description> parameter is optional and is given to a printf "));
-        printf("  %s\n", _("output command which requires a float parameter."));
-        printf("  %s\n", _("If <description> does not include \"%%\", it is used as a label."));
-        printf("  %s\n", _("Some examples:"));
-        printf("  %s\n", "\"Paging file usage is %%.2f %%%%\"");
-        printf("  %s\n", "\"%%.f %%%% paging file used.\"");
-        printf(" %s\n", "INSTANCES =");
-        printf("  %s\n", _("Check any performance counter object of Windows NT/2000."));
-        printf("  %s\n", _("Syntax: check_nt -H <hostname> -p <port> -v INSTANCES -l <counter object>"));
-        printf("  %s\n", _("<counter object> is a Windows Perfmon Counter object (eg. Process),"));
-        printf("  %s\n", _("if it is two words, it should be enclosed in quotes"));
-        printf("  %s\n", _("The returned results will be a comma-separated list of instances on "));
-        printf("  %s\n", _(" the selected computer for that object."));
-        printf("  %s\n", _("The purpose of this is to be run from command line to determine what instances"));
-        printf("  %s\n", _(" are available for monitoring without having to log onto the Windows server"));
-        printf("  %s\n", _("  to run Perfmon directly."));
-        printf("  %s\n", _("It can also be used in scripts that automatically create the monitoring service"));
-        printf("  %s\n", _(" configuration files."));
-        printf("  %s\n", _("Some examples:"));
-        printf("  %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process"));
-
-        printf("%s\n", _("Notes:"));
-        printf(" %s\n", _("- The NSClient service should be running on the server to get any information"));
-        printf("   %s\n", "(http://nsclient.ready2run.nl).");
-        printf(" %s\n", _("- Critical thresholds should be lower than warning thresholds"));
-        printf(" %s\n", _("- Default port 1248 is sometimes in use by other services. The error"));
-        printf("   %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\"."));
-        printf("   %s\n", _("One fix for this is to change the port to something else on check_nt "));
-        printf("   %s\n", _("and on the client service it\'s connecting to."));
-
-        printf(UT_SUPPORT);
-}
-
-void print_usage(void) {
-        printf("%s\n", _("Usage:"));
-        printf("%s -H host -v variable [-p port] [-w warning] [-c critical]\n", progname);
-        printf("[-l params] [-d SHOWALL] [-u] [-t timeout]\n");
-}
diff --git a/plugins/check_nt.d/config.h b/plugins/check_nt.d/config.h
deleted file mode 100644
index 431889cb..00000000
--- a/plugins/check_nt.d/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "../../config.h"
-#include <stddef.h>
-
-enum {
-        PORT = 1248,
-};
-
-enum checkvars {
-        CHECK_NONE,
-        CHECK_CLIENTVERSION,
-        CHECK_CPULOAD,
-        CHECK_UPTIME,
-        CHECK_USEDDISKSPACE,
-        CHECK_SERVICESTATE,
-        CHECK_PROCSTATE,
-        CHECK_MEMUSE,
-        CHECK_COUNTER,
-        CHECK_FILEAGE,
-        CHECK_INSTANCES
-};
-
-typedef struct {
-        char *server_address;
-        int server_port;
-        char *req_password;
-        enum checkvars vars_to_check;
-        bool show_all;
-        char *value_list;
-        bool check_warning_value;
-        unsigned long warning_value;
-        bool check_critical_value;
-        unsigned long critical_value;
-} check_nt_config;
-
-check_nt_config check_nt_config_init() {
-        check_nt_config tmp = {
-                .server_address = NULL,
-                .server_port = PORT,
-                .req_password = NULL,
-
-                .vars_to_check = CHECK_NONE,
-                .show_all = false,
-                .value_list = NULL,
-
-                .check_warning_value = false,
-                .warning_value = 0,
-                .check_critical_value = false,
-                .critical_value = 0,
-        };
-        return tmp;
-}
diff --git a/plugins/check_ntp.c b/plugins/check_ntp.c
deleted file mode 100644
index d33f8786..00000000
--- a/plugins/check_ntp.c
+++ /dev/null
@@ -1,901 +0,0 @@
-/*****************************************************************************
-* 
-* Monitoring check_ntp plugin
-* 
-* License: GPL
-* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2024 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ntp plugin
-* 
-* This plugin to check ntp servers independent of any commandline
-* programs or external libraries.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
-
-const char *progname = "check_ntp";
-const char *copyright = "2006-2024";
-const char *email = "devel@monitoring-plugins.org";
-
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-
-static char *server_address=NULL;
-static int verbose=0;
-static bool do_offset = false;
-static char *owarn="60";
-static char *ocrit="120";
-static bool do_jitter = false;
-static char *jwarn="5000";
-static char *jcrit="10000";
-
-static int process_arguments (int /*argc*/, char ** /*argv*/);
-static thresholds *offset_thresholds = NULL;
-static thresholds *jitter_thresholds = NULL;
-static void print_help (void);
-void print_usage (void);
-
-/* number of times to perform each request to get a good average. */
-#ifndef AVG_NUM
-#define AVG_NUM 4
-#endif
-
-/* max size of control message data */
-#define MAX_CM_SIZE 468
-
-/* this structure holds everything in an ntp request/response as per rfc1305 */
-typedef struct {
-        uint8_t flags;       /* byte with leapindicator,vers,mode. see macros */
-        uint8_t stratum;     /* clock stratum */
-        int8_t poll;         /* polling interval */
-        int8_t precision;    /* precision of the local clock */
-        int32_t rtdelay;     /* total rt delay, as a fixed point num. see macros */
-        uint32_t rtdisp;     /* like above, but for max err to primary src */
-        uint32_t refid;      /* ref clock identifier */
-        uint64_t refts;      /* reference timestamp.  local time local clock */
-        uint64_t origts;     /* time at which request departed client */
-        uint64_t rxts;       /* time at which request arrived at server */
-        uint64_t txts;       /* time at which request departed server */
-} ntp_message;
-
-/* this structure holds data about results from querying offset from a peer */
-typedef struct {
-        time_t waiting;         /* ts set when we started waiting for a response */
-        int num_responses;      /* number of successfully received responses */
-        uint8_t stratum;        /* copied verbatim from the ntp_message */
-        double rtdelay;         /* converted from the ntp_message */
-        double rtdisp;          /* converted from the ntp_message */
-        double offset[AVG_NUM]; /* offsets from each response */
-        uint8_t flags;       /* byte with leapindicator,vers,mode. see macros */
-} ntp_server_results;
-
-/* this structure holds everything in an ntp control message as per rfc1305 */
-typedef struct {
-        uint8_t flags;       /* byte with leapindicator,vers,mode. see macros */
-        uint8_t op;          /* R,E,M bits and Opcode */
-        uint16_t seq;        /* Packet sequence */
-        uint16_t status;     /* Clock status */
-        uint16_t assoc;      /* Association */
-        uint16_t offset;     /* Similar to TCP sequence # */
-        uint16_t count;      /* # bytes of data */
-        char data[MAX_CM_SIZE]; /* ASCII data of the request */
-                                /* NB: not necessarily NULL terminated! */
-} ntp_control_message;
-
-/* this is an association/status-word pair found in control packet responses */
-typedef struct {
-        uint16_t assoc;
-        uint16_t status;
-} ntp_assoc_status_pair;
-
-/* bits 1,2 are the leap indicator */
-#define LI_MASK 0xc0
-#define LI(x) ((x&LI_MASK)>>6)
-#define LI_SET(x,y) do{ x |= ((y<<6)&LI_MASK); }while(0)
-/* and these are the values of the leap indicator */
-#define LI_NOWARNING 0x00
-#define LI_EXTRASEC 0x01
-#define LI_MISSINGSEC 0x02
-#define LI_ALARM 0x03
-/* bits 3,4,5 are the ntp version */
-#define VN_MASK 0x38
-#define VN(x)   ((x&VN_MASK)>>3)
-#define VN_SET(x,y)     do{ x |= ((y<<3)&VN_MASK); }while(0)
-#define VN_RESERVED 0x02
-/* bits 6,7,8 are the ntp mode */
-#define MODE_MASK 0x07
-#define MODE(x) (x&MODE_MASK)
-#define MODE_SET(x,y)   do{ x |= (y&MODE_MASK); }while(0)
-/* here are some values */
-#define MODE_CLIENT 0x03
-#define MODE_CONTROLMSG 0x06
-/* In control message, bits 8-10 are R,E,M bits */
-#define REM_MASK 0xe0
-#define REM_RESP 0x80
-#define REM_ERROR 0x40
-#define REM_MORE 0x20
-/* In control message, bits 11 - 15 are opcode */
-#define OP_MASK 0x1f
-#define OP_SET(x,y)   do{ x |= (y&OP_MASK); }while(0)
-#define OP_READSTAT 0x01
-#define OP_READVAR  0x02
-/* In peer status bytes, bits 6,7,8 determine clock selection status */
-#define PEER_SEL(x) ((ntohs(x)>>8)&0x07)
-#define PEER_INCLUDED 0x04
-#define PEER_SYNCSOURCE 0x06
-
-/**
- ** a note about the 32-bit "fixed point" numbers:
- **
- they are divided into halves, each being a 16-bit int in network byte order:
- - the first 16 bits are an int on the left side of a decimal point.
- - the second 16 bits represent a fraction n/(2^16)
- likewise for the 64-bit "fixed point" numbers with everything doubled :)
- **/
-
-/* macros to access the left/right 16 bits of a 32-bit ntp "fixed point"
-   number.  note that these can be used as lvalues too */
-#define L16(x) (((uint16_t*)&x)[0])
-#define R16(x) (((uint16_t*)&x)[1])
-/* macros to access the left/right 32 bits of a 64-bit ntp "fixed point"
-   number.  these too can be used as lvalues */
-#define L32(x) (((uint32_t*)&x)[0])
-#define R32(x) (((uint32_t*)&x)[1])
-
-/* ntp wants seconds since 1/1/00, epoch is 1/1/70.  this is the difference */
-#define EPOCHDIFF 0x83aa7e80UL
-
-/* extract a 32-bit ntp fixed point number into a double */
-#define NTP32asDOUBLE(x) (ntohs(L16(x)) + (double)ntohs(R16(x))/65536.0)
-
-/* likewise for a 64-bit ntp fp number */
-#define NTP64asDOUBLE(n) (double)(((uint64_t)n)?\
-                         (ntohl(L32(n))-EPOCHDIFF) + \
-                         (.00000001*(0.5+(double)(ntohl(R32(n))/42.94967296))):\
-                         0)
-
-/* convert a struct timeval to a double */
-#define TVasDOUBLE(x) (double)(x.tv_sec+(0.000001*x.tv_usec))
-
-/* convert an ntp 64-bit fp number to a struct timeval */
-#define NTP64toTV(n,t) \
-        do{ if(!n) t.tv_sec = t.tv_usec = 0; \
-            else { \
-                        t.tv_sec=ntohl(L32(n))-EPOCHDIFF; \
-                        t.tv_usec=(int)(0.5+(double)(ntohl(R32(n))/4294.967296)); \
-                } \
-        }while(0)
-
-/* convert a struct timeval to an ntp 64-bit fp number */
-#define TVtoNTP64(t,n) \
-        do{ if(!t.tv_usec && !t.tv_sec) n=0x0UL; \
-                else { \
-                        L32(n)=htonl(t.tv_sec + EPOCHDIFF); \
-                        R32(n)=htonl((uint64_t)((4294.967296*t.tv_usec)+.5)); \
-                } \
-        } while(0)
-
-/* NTP control message header is 12 bytes, plus any data in the data
- * field, plus null padding to the nearest 32-bit boundary per rfc.
- */
-#define SIZEOF_NTPCM(m) (12+ntohs(m.count)+((ntohs(m.count)%4)?4-(ntohs(m.count)%4):0))
-
-/* finally, a little helper or two for debugging: */
-#define DBG(x) do{if(verbose>1){ x; }}while(0);
-#define PRINTSOCKADDR(x) \
-        do{ \
-                printf("%u.%u.%u.%u", (x>>24)&0xff, (x>>16)&0xff, (x>>8)&0xff, x&0xff);\
-        }while(0);
-
-/* calculate the offset of the local clock */
-static inline double calc_offset(const ntp_message *m, const struct timeval *t){
-        double client_tx, peer_rx, peer_tx, client_rx;
-        client_tx = NTP64asDOUBLE(m->origts);
-        peer_rx = NTP64asDOUBLE(m->rxts);
-        peer_tx = NTP64asDOUBLE(m->txts);
-        client_rx=TVasDOUBLE((*t));
-        return (.5*((peer_tx-client_rx)+(peer_rx-client_tx)));
-}
-
-/* print out a ntp packet in human readable/debuggable format */
-void print_ntp_message(const ntp_message *p){
-        struct timeval ref, orig, rx, tx;
-
-        NTP64toTV(p->refts,ref);
-        NTP64toTV(p->origts,orig);
-        NTP64toTV(p->rxts,rx);
-        NTP64toTV(p->txts,tx);
-
-        printf("packet contents:\n");
-        printf("\tflags: 0x%.2x\n", p->flags);
-        printf("\t  li=%d (0x%.2x)\n", LI(p->flags), p->flags&LI_MASK);
-        printf("\t  vn=%d (0x%.2x)\n", VN(p->flags), p->flags&VN_MASK);
-        printf("\t  mode=%d (0x%.2x)\n", MODE(p->flags), p->flags&MODE_MASK);
-        printf("\tstratum = %d\n", p->stratum);
-        printf("\tpoll = %g\n", pow(2, p->poll));
-        printf("\tprecision = %g\n", pow(2, p->precision));
-        printf("\trtdelay = %-.16g\n", NTP32asDOUBLE(p->rtdelay));
-        printf("\trtdisp = %-.16g\n", NTP32asDOUBLE(p->rtdisp));
-        printf("\trefid = %x\n", p->refid);
-        printf("\trefts = %-.16g\n", NTP64asDOUBLE(p->refts));
-        printf("\torigts = %-.16g\n", NTP64asDOUBLE(p->origts));
-        printf("\trxts = %-.16g\n", NTP64asDOUBLE(p->rxts));
-        printf("\ttxts = %-.16g\n", NTP64asDOUBLE(p->txts));
-}
-
-void print_ntp_control_message(const ntp_control_message *p){
-        int i=0, numpeers=0;
-        const ntp_assoc_status_pair *peer=NULL;
-
-        printf("control packet contents:\n");
-        printf("\tflags: 0x%.2x , 0x%.2x\n", p->flags, p->op);
-        printf("\t  li=%d (0x%.2x)\n", LI(p->flags), p->flags&LI_MASK);
-        printf("\t  vn=%d (0x%.2x)\n", VN(p->flags), p->flags&VN_MASK);
-        printf("\t  mode=%d (0x%.2x)\n", MODE(p->flags), p->flags&MODE_MASK);
-        printf("\t  response=%d (0x%.2x)\n", (p->op&REM_RESP)>0, p->op&REM_RESP);
-        printf("\t  more=%d (0x%.2x)\n", (p->op&REM_MORE)>0, p->op&REM_MORE);
-        printf("\t  error=%d (0x%.2x)\n", (p->op&REM_ERROR)>0, p->op&REM_ERROR);
-        printf("\t  op=%d (0x%.2x)\n", p->op&OP_MASK, p->op&OP_MASK);
-        printf("\tsequence: %d (0x%.2x)\n", ntohs(p->seq), ntohs(p->seq));
-        printf("\tstatus: %d (0x%.2x)\n", ntohs(p->status), ntohs(p->status));
-        printf("\tassoc: %d (0x%.2x)\n", ntohs(p->assoc), ntohs(p->assoc));
-        printf("\toffset: %d (0x%.2x)\n", ntohs(p->offset), ntohs(p->offset));
-        printf("\tcount: %d (0x%.2x)\n", ntohs(p->count), ntohs(p->count));
-        numpeers=ntohs(p->count)/(sizeof(ntp_assoc_status_pair));
-        if(p->op&REM_RESP && p->op&OP_READSTAT){
-                peer=(ntp_assoc_status_pair*)p->data;
-                for(i=0;i<numpeers;i++){
-                        printf("\tpeer id %.2x status %.2x",
-                               ntohs(peer[i].assoc), ntohs(peer[i].status));
-                        if (PEER_SEL(peer[i].status) >= PEER_INCLUDED){
-                                if(PEER_SEL(peer[i].status) >= PEER_SYNCSOURCE){
-                                        printf(" <-- current sync source");
-                                } else {
-                                        printf(" <-- current sync candidate");
-                                }
-                        }
-                        printf("\n");
-                }
-        }
-}
-
-void setup_request(ntp_message *p){
-        struct timeval t;
-
-        memset(p, 0, sizeof(ntp_message));
-        LI_SET(p->flags, LI_ALARM);
-        VN_SET(p->flags, 4);
-        MODE_SET(p->flags, MODE_CLIENT);
-        p->poll=4;
-        p->precision=(int8_t)0xfa;
-        L16(p->rtdelay)=htons(1);
-        L16(p->rtdisp)=htons(1);
-
-        gettimeofday(&t, NULL);
-        TVtoNTP64(t,p->txts);
-}
-
-/* select the "best" server from a list of servers, and return its index.
- * this is done by filtering servers based on stratum, dispersion, and
- * finally round-trip delay. */
-int best_offset_server(const ntp_server_results *slist, int nservers){
-        int cserver=0, best_server=-1;
-
-        /* for each server */
-        for(cserver=0; cserver<nservers; cserver++){
-                /* We don't want any servers that fails these tests */
-                /* Sort out servers that didn't respond or responede with a 0 stratum;
-                 * stratum 0 is for reference clocks so no NTP server should ever report
-                 * a stratum 0 */
-                if ( slist[cserver].stratum == 0){
-                        if (verbose) printf("discarding peer %d: stratum=%d\n", cserver, slist[cserver].stratum);
-                        continue;
-                }
-                /* Sort out servers with error flags */
-                if ( LI(slist[cserver].flags) == LI_ALARM ){
-                        if (verbose) printf("discarding peer %d: flags=%d\n", cserver, LI(slist[cserver].flags));
-                        continue;
-                }
-
-                /* If we don't have a server yet, use the first one */
-                if (best_server == -1) {
-                        best_server = cserver;
-                        DBG(printf("using peer %d as our first candidate\n", best_server));
-                        continue;
-                }
-
-                /* compare the server to the best one we've seen so far */
-                /* does it have an equal or better stratum? */
-                DBG(printf("comparing peer %d with peer %d\n", cserver, best_server));
-                if(slist[cserver].stratum <= slist[best_server].stratum){
-                        DBG(printf("stratum for peer %d <= peer %d\n", cserver, best_server));
-                        /* does it have an equal or better dispersion? */
-                        if(slist[cserver].rtdisp <= slist[best_server].rtdisp){
-                                DBG(printf("dispersion for peer %d <= peer %d\n", cserver, best_server));
-                                /* does it have a better rtdelay? */
-                                if(slist[cserver].rtdelay < slist[best_server].rtdelay){
-                                        DBG(printf("rtdelay for peer %d < peer %d\n", cserver, best_server));
-                                        best_server = cserver;
-                                        DBG(printf("peer %d is now our best candidate\n", best_server));
-                                }
-                        }
-                }
-        }
-
-        if(best_server >= 0) {
-                DBG(printf("best server selected: peer %d\n", best_server));
-                return best_server;
-        } else {
-                DBG(printf("no peers meeting synchronization criteria :(\n"));
-                return -1;
-        }
-}
-
-/* do everything we need to get the total average offset
- * - we use a certain amount of parallelization with poll() to ensure
- *   we don't waste time sitting around waiting for single packets.
- * - we also "manually" handle resolving host names and connecting, because
- *   we have to do it in a way that our lazy macros don't handle currently :( */
-double offset_request(const char *host, int *status){
-        int i=0, ga_result=0, num_hosts=0, *socklist=NULL, respnum=0;
-        int servers_completed=0, one_read=0, servers_readable=0, best_index=-1;
-        time_t now_time=0, start_ts=0;
-        ntp_message *req=NULL;
-        double avg_offset=0.;
-        struct timeval recv_time;
-        struct addrinfo *ai=NULL, *ai_tmp=NULL, hints;
-        struct pollfd *ufds=NULL;
-        ntp_server_results *servers=NULL;
-
-        /* setup hints to only return results from getaddrinfo that we'd like */
-        memset(&hints, 0, sizeof(struct addrinfo));
-        hints.ai_family = address_family;
-        hints.ai_protocol = IPPROTO_UDP;
-        hints.ai_socktype = SOCK_DGRAM;
-
-        /* fill in ai with the list of hosts resolved by the host name */
-        ga_result = getaddrinfo(host, "123", &hints, &ai);
-        if(ga_result!=0){
-                die(STATE_UNKNOWN, "error getting address for %s: %s\n",
-                    host, gai_strerror(ga_result));
-        }
-
-        /* count the number of returned hosts, and allocate stuff accordingly */
-        for(ai_tmp=ai; ai_tmp!=NULL; ai_tmp=ai_tmp->ai_next){ num_hosts++; }
-        req=(ntp_message*)malloc(sizeof(ntp_message)*num_hosts);
-        if(req==NULL) die(STATE_UNKNOWN, "can not allocate ntp message array");
-        socklist=(int*)malloc(sizeof(int)*num_hosts);
-        if(socklist==NULL) die(STATE_UNKNOWN, "can not allocate socket array");
-        ufds=(struct pollfd*)malloc(sizeof(struct pollfd)*num_hosts);
-        if(ufds==NULL) die(STATE_UNKNOWN, "can not allocate socket array");
-        servers=(ntp_server_results*)malloc(sizeof(ntp_server_results)*num_hosts);
-        if(servers==NULL) die(STATE_UNKNOWN, "can not allocate server array");
-        memset(servers, 0, sizeof(ntp_server_results)*num_hosts);
-        DBG(printf("Found %d peers to check\n", num_hosts));
-
-        /* setup each socket for writing, and the corresponding struct pollfd */
-        ai_tmp=ai;
-        for(i=0;ai_tmp;i++){
-                socklist[i]=socket(ai_tmp->ai_family, SOCK_DGRAM, IPPROTO_UDP);
-                if(socklist[i] == -1) {
-                        perror(NULL);
-                        die(STATE_UNKNOWN, "can not create new socket");
-                }
-                if(connect(socklist[i], ai_tmp->ai_addr, ai_tmp->ai_addrlen)){
-                        /* don't die here, because it is enough if there is one server
-                           answering in time. This also would break for dual ipv4/6 stacked
-                           ntp servers when the client only supports on of them.
-                         */
-                        DBG(printf("can't create socket connection on peer %i: %s\n", i, strerror(errno)));
-                } else {
-                        ufds[i].fd=socklist[i];
-                        ufds[i].events=POLLIN;
-                        ufds[i].revents=0;
-                }
-                ai_tmp = ai_tmp->ai_next;
-        }
-
-        /* now do AVG_NUM checks to each host.  we stop before timeout/2 seconds
-         * have passed in order to ensure post-processing and jitter time. */
-        now_time=start_ts=time(NULL);
-        while(servers_completed<num_hosts && now_time-start_ts <= socket_timeout/2){
-                /* loop through each server and find each one which hasn't
-                 * been touched in the past second or so and is still lacking
-                 * some responses.  for each of these servers, send a new request,
-                 * and update the "waiting" timestamp with the current time. */
-                now_time=time(NULL);
-
-                for(i=0; i<num_hosts; i++){
-                        if(servers[i].waiting<now_time && servers[i].num_responses<AVG_NUM){
-                                if(verbose && servers[i].waiting != 0) printf("re-");
-                                if(verbose) printf("sending request to peer %d\n", i);
-                                setup_request(&req[i]);
-                                write(socklist[i], &req[i], sizeof(ntp_message));
-                                servers[i].waiting=now_time;
-                                break;
-                        }
-                }
-
-                /* quickly poll for any sockets with pending data */
-                servers_readable=poll(ufds, num_hosts, 100);
-                if(servers_readable==-1){
-                        perror("polling ntp sockets");
-                        die(STATE_UNKNOWN, "communication errors");
-                }
-
-                /* read from any sockets with pending data */
-                for(i=0; servers_readable && i<num_hosts; i++){
-                        if(ufds[i].revents&POLLIN && servers[i].num_responses < AVG_NUM){
-                                if(verbose) {
-                                        printf("response from peer %d: ", i);
-                                }
-
-                                read(ufds[i].fd, &req[i], sizeof(ntp_message));
-                                gettimeofday(&recv_time, NULL);
-                                DBG(print_ntp_message(&req[i]));
-                                respnum=servers[i].num_responses++;
-                                servers[i].offset[respnum]=calc_offset(&req[i], &recv_time);
-                                if(verbose) {
-                                        printf("offset %.10g\n", servers[i].offset[respnum]);
-                                }
-                                servers[i].stratum=req[i].stratum;
-                                servers[i].rtdisp=NTP32asDOUBLE(req[i].rtdisp);
-                                servers[i].rtdelay=NTP32asDOUBLE(req[i].rtdelay);
-                                servers[i].waiting=0;
-                                servers[i].flags=req[i].flags;
-                                servers_readable--;
-                                one_read = 1;
-                                if(servers[i].num_responses==AVG_NUM) servers_completed++;
-                        }
-                }
-                /* lather, rinse, repeat. */
-        }
-
-        if (one_read == 0) {
-                die(STATE_CRITICAL, "NTP CRITICAL: No response from NTP server\n");
-        }
-
-        /* now, pick the best server from the list */
-        best_index=best_offset_server(servers, num_hosts);
-        if(best_index < 0){
-                *status=STATE_UNKNOWN;
-        } else {
-                /* finally, calculate the average offset */
-                for(i=0; i<servers[best_index].num_responses;i++){
-                        avg_offset+=servers[best_index].offset[i];
-                }
-                avg_offset/=servers[best_index].num_responses;
-        }
-
-        /* cleanup */
-        /* FIXME: Not closing the socket to avoid reuse of the local port
-         * which can cause old NTP packets to be read instead of NTP control
-         * packets in jitter_request(). THERE MUST BE ANOTHER WAY...
-         * for(j=0; j<num_hosts; j++){ close(socklist[j]); } */
-        free(socklist);
-        free(ufds);
-        free(servers);
-        free(req);
-        freeaddrinfo(ai);
-
-        if(verbose) printf("overall average offset: %.10g\n", avg_offset);
-        return avg_offset;
-}
-
-void
-setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){
-        memset(p, 0, sizeof(ntp_control_message));
-        LI_SET(p->flags, LI_NOWARNING);
-        VN_SET(p->flags, VN_RESERVED);
-        MODE_SET(p->flags, MODE_CONTROLMSG);
-        OP_SET(p->op, opcode);
-        p->seq = htons(seq);
-        /* Remaining fields are zero for requests */
-}
-
-/* XXX handle responses with the error bit set */
-double jitter_request(int *status){
-        int conn=-1, i, npeers=0, num_candidates=0;
-        bool syncsource_found = false;
-        int run=0, min_peer_sel=PEER_INCLUDED, num_selected=0, num_valid=0;
-        int peers_size=0, peer_offset=0;
-        ntp_assoc_status_pair *peers=NULL;
-        ntp_control_message req;
-        const char *getvar = "jitter";
-        double rval = 0.0, jitter = -1.0;
-        char *startofvalue=NULL, *nptr=NULL;
-        void *tmp;
-
-        /* Long-winded explanation:
-         * Getting the jitter requires a number of steps:
-         * 1) Send a READSTAT request.
-         * 2) Interpret the READSTAT reply
-         *  a) The data section contains a list of peer identifiers (16 bits)
-         *     and associated status words (16 bits)
-         *  b) We want the value of 0x06 in the SEL (peer selection) value,
-         *     which means "current synchronizatin source".  If that's missing,
-         *     we take anything better than 0x04 (see the rfc for details) but
-         *     set a minimum of warning.
-         * 3) Send a READVAR request for information on each peer identified
-         *    in 2b greater than the minimum selection value.
-         * 4) Extract the jitter value from the data[] (it's ASCII)
-         */
-        my_udp_connect(server_address, 123, &conn);
-
-        /* keep sending requests until the server stops setting the
-         * REM_MORE bit, though usually this is only 1 packet. */
-        do{
-                setup_control_request(&req, OP_READSTAT, 1);
-                DBG(printf("sending READSTAT request"));
-                write(conn, &req, SIZEOF_NTPCM(req));
-                DBG(print_ntp_control_message(&req));
-                /* Attempt to read the largest size packet possible */
-                req.count=htons(MAX_CM_SIZE);
-                DBG(printf("receiving READSTAT response"))
-                read(conn, &req, SIZEOF_NTPCM(req));
-                DBG(print_ntp_control_message(&req));
-                /* Each peer identifier is 4 bytes in the data section, which
-                 * we represent as a ntp_assoc_status_pair datatype.
-                 */
-                peers_size+=ntohs(req.count);
-                if((tmp=realloc(peers, peers_size)) == NULL)
-                        free(peers), die(STATE_UNKNOWN, "can not (re)allocate 'peers' buffer\n");
-                peers=tmp;
-                memcpy((void*)((ptrdiff_t)peers+peer_offset), (void*)req.data, ntohs(req.count));
-                npeers=peers_size/sizeof(ntp_assoc_status_pair);
-                peer_offset+=ntohs(req.count);
-        } while(req.op&REM_MORE);
-
-        /* first, let's find out if we have a sync source, or if there are
-         * at least some candidates.  in the case of the latter we'll issue
-         * a warning but go ahead with the check on them. */
-        for (i = 0; i < npeers; i++){
-                if (PEER_SEL(peers[i].status) >= PEER_INCLUDED){
-                        num_candidates++;
-                        if(PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE){
-                                syncsource_found = true;
-                                min_peer_sel=PEER_SYNCSOURCE;
-                        }
-                }
-        }
-        if(verbose) printf("%d candidate peers available\n", num_candidates);
-        if(verbose && syncsource_found) printf("synchronization source found\n");
-        if(! syncsource_found){
-                *status = STATE_UNKNOWN;
-                if(verbose) printf("warning: no synchronization source found\n");
-        }
-
-
-        for (run=0; run<AVG_NUM; run++){
-                if(verbose) printf("jitter run %d of %d\n", run+1, AVG_NUM);
-                for (i = 0; i < npeers; i++){
-                        /* Only query this server if it is the current sync source */
-                        if (PEER_SEL(peers[i].status) >= min_peer_sel){
-                                char jitter_data[MAX_CM_SIZE+1];
-                                size_t jitter_data_count;
-
-                                num_selected++;
-                                setup_control_request(&req, OP_READVAR, 2);
-                                req.assoc = peers[i].assoc;
-                                /* By spec, putting the variable name "jitter"  in the request
-                                 * should cause the server to provide _only_ the jitter value.
-                                 * thus reducing net traffic, guaranteeing us only a single
-                                 * datagram in reply, and making interpretation much simpler
-                                 */
-                                /* Older servers doesn't know what jitter is, so if we get an
-                                 * error on the first pass we redo it with "dispersion" */
-                                strncpy(req.data, getvar, MAX_CM_SIZE-1);
-                                req.count = htons(strlen(getvar));
-                                DBG(printf("sending READVAR request...\n"));
-                                write(conn, &req, SIZEOF_NTPCM(req));
-                                DBG(print_ntp_control_message(&req));
-
-                                req.count = htons(MAX_CM_SIZE);
-                                DBG(printf("receiving READVAR response...\n"));
-                                read(conn, &req, SIZEOF_NTPCM(req));
-                                DBG(print_ntp_control_message(&req));
-
-                                if(req.op&REM_ERROR && strstr(getvar, "jitter")) {
-                                        if(verbose) printf("The 'jitter' command failed (old ntp server?)\nRestarting with 'dispersion'...\n");
-                                        getvar = "dispersion";
-                                        num_selected--;
-                                        i--;
-                                        continue;
-                                }
-
-                                /* get to the float value */
-                                if(verbose) {
-                                        printf("parsing jitter from peer %.2x: ", ntohs(peers[i].assoc));
-                                }
-                                if((jitter_data_count = ntohs(req.count)) >= sizeof(jitter_data)){
-                                        die(STATE_UNKNOWN,
-                                            _("jitter response too large (%lu bytes)\n"),
-                                            (unsigned long)jitter_data_count);
-                                }
-                                memcpy(jitter_data, req.data, jitter_data_count);
-                                jitter_data[jitter_data_count] = '\0';
-                                startofvalue = strchr(jitter_data, '=');
-                                if(startofvalue != NULL) {
-                                        startofvalue++;
-                                        jitter = strtod(startofvalue, &nptr);
-                                }
-                                if(startofvalue == NULL || startofvalue==nptr){
-                                        printf("warning: unable to read server jitter response.\n");
-                                        *status = STATE_UNKNOWN;
-                                } else {
-                                        if(verbose) printf("%g\n", jitter);
-                                        num_valid++;
-                                        rval += jitter;
-                                }
-                        }
-                }
-                if(verbose){
-                        printf("jitter parsed from %d/%d peers\n", num_valid, num_selected);
-                }
-        }
-
-        rval = num_valid ? rval / num_valid : -1.0;
-
-        close(conn);
-        if(peers!=NULL) free(peers);
-        /* If we return -1.0, it means no synchronization source was found */
-        return rval;
-}
-
-int process_arguments(int argc, char **argv){
-        int c;
-        int option=0;
-        static struct option longopts[] = {
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"verbose", no_argument, 0, 'v'},
-                {"use-ipv4", no_argument, 0, '4'},
-                {"use-ipv6", no_argument, 0, '6'},
-                {"warning", required_argument, 0, 'w'},
-                {"critical", required_argument, 0, 'c'},
-                {"jwarn", required_argument, 0, 'j'},
-                {"jcrit", required_argument, 0, 'k'},
-                {"timeout", required_argument, 0, 't'},
-                {"hostname", required_argument, 0, 'H'},
-                {0, 0, 0, 0}
-        };
-
-
-        if (argc < 2)
-                usage ("\n");
-
-        while (1) {
-                c = getopt_long (argc, argv, "Vhv46w:c:j:k:t:H:", longopts, &option);
-                if (c == -1 || c == EOF || c == 1)
-                        break;
-
-                switch (c) {
-                case 'h':
-                        print_help();
-                        exit(STATE_UNKNOWN);
-                        break;
-                case 'V':
-                        print_revision(progname, NP_VERSION);
-                        exit(STATE_UNKNOWN);
-                        break;
-                case 'v':
-                        verbose++;
-                        break;
-                case 'w':
-                        do_offset = true;
-                        owarn = optarg;
-                        break;
-                case 'c':
-                        do_offset = true;
-                        ocrit = optarg;
-                        break;
-                case 'j':
-                        do_jitter = true;
-                        jwarn = optarg;
-                        break;
-                case 'k':
-                        do_jitter = true;
-                        jcrit = optarg;
-                        break;
-                case 'H':
-                        if(!is_host(optarg))
-                                usage2(_("Invalid hostname/address"), optarg);
-                        server_address = strdup(optarg);
-                        break;
-                case 't':
-                        socket_timeout=atoi(optarg);
-                        break;
-                case '4':
-                        address_family = AF_INET;
-                        break;
-                case '6':
-#ifdef USE_IPV6
-                        address_family = AF_INET6;
-#else
-                        usage4 (_("IPv6 support not available"));
-#endif
-                        break;
-                case '?':
-                        /* print short usage statement if args not parsable */
-                        usage5 ();
-                        break;
-                }
-        }
-
-        if(server_address == NULL){
-                usage4(_("Hostname was not supplied"));
-        }
-
-        return 0;
-}
-
-char *perfd_offset (double offset)
-{
-        return fperfdata ("offset", offset, "s",
-                true, offset_thresholds->warning->end,
-                true, offset_thresholds->critical->end,
-                false, 0, false, 0);
-}
-
-char *perfd_jitter (double jitter)
-{
-        return fperfdata ("jitter", jitter, "s",
-                do_jitter, jitter_thresholds->warning->end,
-                do_jitter, jitter_thresholds->critical->end,
-                true, 0, false, 0);
-}
-
-int main(int argc, char *argv[]){
-        int result, offset_result, jitter_result;
-        double offset=0, jitter=0;
-        char *result_line, *perfdata_line;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
-
-        result = offset_result = jitter_result = STATE_OK;
-
-        /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
-
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
-
-        set_thresholds(&offset_thresholds, owarn, ocrit);
-        set_thresholds(&jitter_thresholds, jwarn, jcrit);
-
-        /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
-
-        /* set socket timeout */
-        alarm (socket_timeout);
-
-        offset = offset_request(server_address, &offset_result);
-        /* check_ntp used to always return CRITICAL if offset_result == STATE_UNKNOWN.
-         * Now we'll only do that is the offset thresholds were set */
-        if (do_offset && offset_result == STATE_UNKNOWN) {
-                result = STATE_CRITICAL;
-        } else {
-                result = get_status(fabs(offset), offset_thresholds);
-        }
-
-        /* If not told to check the jitter, we don't even send packets.
-         * jitter is checked using NTP control packets, which not all
-         * servers recognize.  Trying to check the jitter on OpenNTPD
-         * (for example) will result in an error
-         */
-        if(do_jitter){
-                jitter=jitter_request(&jitter_result);
-                result = max_state_alt(result, get_status(jitter, jitter_thresholds));
-                /* -1 indicates that we couldn't calculate the jitter
-                 * Only overrides STATE_OK from the offset */
-                if(jitter == -1.0 && result == STATE_OK)
-                        result = STATE_UNKNOWN;
-        }
-        result = max_state_alt(result, jitter_result);
-
-        switch (result) {
-                case STATE_CRITICAL :
-                        xasprintf(&result_line, _("NTP CRITICAL:"));
-                        break;
-                case STATE_WARNING :
-                        xasprintf(&result_line, _("NTP WARNING:"));
-                        break;
-                case STATE_OK :
-                        xasprintf(&result_line, _("NTP OK:"));
-                        break;
-                default :
-                        xasprintf(&result_line, _("NTP UNKNOWN:"));
-                        break;
-        }
-        if(offset_result == STATE_UNKNOWN){
-                xasprintf(&result_line, "%s %s", result_line, _("Offset unknown"));
-                xasprintf(&perfdata_line, "");
-        } else {
-                xasprintf(&result_line, "%s %s %.10g secs", result_line, _("Offset"), offset);
-                xasprintf(&perfdata_line, "%s", perfd_offset(offset));
-        }
-        if (do_jitter) {
-                xasprintf(&result_line, "%s, jitter=%f", result_line, jitter);
-                xasprintf(&perfdata_line, "%s %s", perfdata_line,  perfd_jitter(jitter));
-        }
-        printf("%s|%s\n", result_line, perfdata_line);
-
-        if(server_address!=NULL) free(server_address);
-        return result;
-}
-
-
-
-void print_help(void){
-        print_revision(progname, NP_VERSION);
-
-        printf ("Copyright (c) 2006 Sean Finney\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf ("%s\n", _("This plugin checks the selected ntp server"));
-
-        printf ("\n\n");
-
-        print_usage();
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        printf (UT_HOST_PORT, 'p', "123");
-        printf (UT_IPv46);
-        printf (" %s\n", "-w, --warning=THRESHOLD");
-        printf ("    %s\n", _("Offset to result in warning status (seconds)"));
-        printf (" %s\n", "-c, --critical=THRESHOLD");
-        printf ("    %s\n", _("Offset to result in critical status (seconds)"));
-        printf (" %s\n", "-j, --jwarn=THRESHOLD");
-        printf ("    %s\n", _("Warning threshold for jitter"));
-        printf (" %s\n", "-k, --jcrit=THRESHOLD");
-        printf ("    %s\n", _("Critical threshold for jitter"));
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-        printf (UT_VERBOSE);
-
-        printf("\n");
-        printf("%s\n", _("Notes:"));
-        printf(UT_THRESHOLDS_NOTES);
-
-        printf("\n");
-        printf("%s\n", _("Examples:"));
-        printf(" %s\n", _("Normal offset check:"));
-        printf("  %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1"));
-        printf("\n");
-        printf(" %s\n", _("Check jitter too, avoiding critical notifications if jitter isn't available"));
-        printf(" %s\n", _("(See Notes above for more details on thresholds formats):"));
-        printf("  %s\n", ("./check_ntp -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200"));
-
-        printf (UT_SUPPORT);
-
-        printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
-        printf ("%s\n\n", _("check_ntp_time instead."));
-}
-
-void
-print_usage(void)
-{
-        printf ("%s\n", _("WARNING: check_ntp is deprecated. Please use check_ntp_peer or"));
-        printf ("%s\n\n", _("check_ntp_time instead."));
-        printf ("%s\n", _("Usage:"));
-        printf(" %s -H <host> [-w <warn>] [-c <crit>] [-j <warn>] [-k <crit>] [-4|-6] [-v verbose]\n", progname);
-}
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index f99e5032..26f74286 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -39,33 +39,23 @@ const char *progname = "check_ntp_peer";
 const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
+#include "output.h"
+#include "perfdata.h"
+#include <openssl/x509.h>
+#include "thresholds.h"
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
+#include "../lib/states.h"
+#include "check_ntp_peer.d/config.h"
 
-static char *server_address = NULL;
-static int port = 123;
 static int verbose = 0;
-static bool quiet = false;
-static char *owarn = "60";
-static char *ocrit = "120";
-static bool do_stratum = false;
-static char *swarn = "-1:16";
-static char *scrit = "-1:16";
-static bool do_jitter = false;
-static char *jwarn = "-1:5000";
-static char *jcrit = "-1:10000";
-static bool do_truechimers = false;
-static char *twarn = "0:";
-static char *tcrit = "0:";
-static bool syncsource_found = false;
-static bool li_alarm = false;
-
-static int process_arguments(int /*argc*/, char ** /*argv*/);
-static thresholds *offset_thresholds = NULL;
-static thresholds *jitter_thresholds = NULL;
-static thresholds *stratum_thresholds = NULL;
-static thresholds *truechimer_thresholds = NULL;
+
+typedef struct {
+        int errorcode;
+        check_ntp_peer_config config;
+} check_ntp_peer_config_wrapper;
+static check_ntp_peer_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 static void print_help(void);
 void print_usage(void);
 
@@ -94,9 +84,9 @@ typedef struct {
 /* bits 1,2 are the leap indicator */
 #define LI_MASK 0xc0
 #define LI(x)   ((x & LI_MASK) >> 6)
-#define LI_SET(x, y)                                                                                                                       \
-        do {                                                                                                                                   \
-                x |= ((y << 6) & LI_MASK);                                                                                                         \
+#define LI_SET(x, y)                                                                               \
+        do {                                                                                           \
+                x |= ((y << 6) & LI_MASK);                                                                 \
         } while (0)
 /* and these are the values of the leap indicator */
 #define LI_NOWARNING  0x00
@@ -106,17 +96,17 @@ typedef struct {
 /* bits 3,4,5 are the ntp version */
 #define VN_MASK 0x38
 #define VN(x)   ((x & VN_MASK) >> 3)
-#define VN_SET(x, y)                                                                                                                       \
-        do {                                                                                                                                   \
-                x |= ((y << 3) & VN_MASK);                                                                                                         \
+#define VN_SET(x, y)                                                                               \
+        do {                                                                                           \
+                x |= ((y << 3) & VN_MASK);                                                                 \
         } while (0)
 #define VN_RESERVED 0x02
 /* bits 6,7,8 are the ntp mode */
 #define MODE_MASK 0x07
 #define MODE(x)   (x & MODE_MASK)
-#define MODE_SET(x, y)                                                                                                                     \
-        do {                                                                                                                                   \
-                x |= (y & MODE_MASK);                                                                                                              \
+#define MODE_SET(x, y)                                                                             \
+        do {                                                                                           \
+                x |= (y & MODE_MASK);                                                                      \
         } while (0)
 /* here are some values */
 #define MODE_CLIENT     0x03
@@ -128,9 +118,9 @@ typedef struct {
 #define REM_MORE  0x20
 /* In control message, bits 11 - 15 are opcode */
 #define OP_MASK 0x1f
-#define OP_SET(x, y)                                                                                                                       \
-        do {                                                                                                                                   \
-                x |= (y & OP_MASK);                                                                                                                \
+#define OP_SET(x, y)                                                                               \
+        do {                                                                                           \
+                x |= (y & OP_MASK);                                                                        \
         } while (0)
 #define OP_READSTAT 0x01
 #define OP_READVAR  0x02
@@ -143,39 +133,40 @@ typedef struct {
 /* NTP control message header is 12 bytes, plus any data in the data
  * field, plus null padding to the nearest 32-bit boundary per rfc.
  */
-#define SIZEOF_NTPCM(m) (12 + ntohs(m.count) + ((ntohs(m.count) % 4) ? 4 - (ntohs(m.count) % 4) : 0))
+#define SIZEOF_NTPCM(m)                                                                            \
+        (12 + ntohs(m.count) + ((ntohs(m.count) % 4) ? 4 - (ntohs(m.count) % 4) : 0))
 
 /* finally, a little helper or two for debugging: */
-#define DBG(x)                                                                                                                             \
-        do {                                                                                                                                   \
-                if (verbose > 1) {                                                                                                                 \
-                        x;                                                                                                                             \
-                }                                                                                                                                  \
+#define DBG(x)                                                                                     \
+        do {                                                                                           \
+                if (verbose > 1) {                                                                         \
+                        x;                                                                                     \
+                }                                                                                          \
         } while (0);
-#define PRINTSOCKADDR(x)                                                                                                                   \
-        do {                                                                                                                                   \
-                printf("%u.%u.%u.%u", (x >> 24) & 0xff, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);                                              \
+#define PRINTSOCKADDR(x)                                                                           \
+        do {                                                                                           \
+                printf("%u.%u.%u.%u", (x >> 24) & 0xff, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);      \
         } while (0);
 
-void print_ntp_control_message(const ntp_control_message *p) {
+void print_ntp_control_message(const ntp_control_message *message) {
         printf("control packet contents:\n");
-        printf("\tflags: 0x%.2x , 0x%.2x\n", p->flags, p->op);
-        printf("\t  li=%d (0x%.2x)\n", LI(p->flags), p->flags & LI_MASK);
-        printf("\t  vn=%d (0x%.2x)\n", VN(p->flags), p->flags & VN_MASK);
-        printf("\t  mode=%d (0x%.2x)\n", MODE(p->flags), p->flags & MODE_MASK);
-        printf("\t  response=%d (0x%.2x)\n", (p->op & REM_RESP) > 0, p->op & REM_RESP);
-        printf("\t  more=%d (0x%.2x)\n", (p->op & REM_MORE) > 0, p->op & REM_MORE);
-        printf("\t  error=%d (0x%.2x)\n", (p->op & REM_ERROR) > 0, p->op & REM_ERROR);
-        printf("\t  op=%d (0x%.2x)\n", p->op & OP_MASK, p->op & OP_MASK);
-        printf("\tsequence: %d (0x%.2x)\n", ntohs(p->seq), ntohs(p->seq));
-        printf("\tstatus: %d (0x%.2x)\n", ntohs(p->status), ntohs(p->status));
-        printf("\tassoc: %d (0x%.2x)\n", ntohs(p->assoc), ntohs(p->assoc));
-        printf("\toffset: %d (0x%.2x)\n", ntohs(p->offset), ntohs(p->offset));
-        printf("\tcount: %d (0x%.2x)\n", ntohs(p->count), ntohs(p->count));
-
-        int numpeers = ntohs(p->count) / (sizeof(ntp_assoc_status_pair));
-        if (p->op & REM_RESP && p->op & OP_READSTAT) {
-                const ntp_assoc_status_pair *peer = (ntp_assoc_status_pair *)p->data;
+        printf("\tflags: 0x%.2x , 0x%.2x\n", message->flags, message->op);
+        printf("\t  li=%d (0x%.2x)\n", LI(message->flags), message->flags & LI_MASK);
+        printf("\t  vn=%d (0x%.2x)\n", VN(message->flags), message->flags & VN_MASK);
+        printf("\t  mode=%d (0x%.2x)\n", MODE(message->flags), message->flags & MODE_MASK);
+        printf("\t  response=%d (0x%.2x)\n", (message->op & REM_RESP) > 0, message->op & REM_RESP);
+        printf("\t  more=%d (0x%.2x)\n", (message->op & REM_MORE) > 0, message->op & REM_MORE);
+        printf("\t  error=%d (0x%.2x)\n", (message->op & REM_ERROR) > 0, message->op & REM_ERROR);
+        printf("\t  op=%d (0x%.2x)\n", message->op & OP_MASK, message->op & OP_MASK);
+        printf("\tsequence: %d (0x%.2x)\n", ntohs(message->seq), ntohs(message->seq));
+        printf("\tstatus: %d (0x%.2x)\n", ntohs(message->status), ntohs(message->status));
+        printf("\tassoc: %d (0x%.2x)\n", ntohs(message->assoc), ntohs(message->assoc));
+        printf("\toffset: %d (0x%.2x)\n", ntohs(message->offset), ntohs(message->offset));
+        printf("\tcount: %d (0x%.2x)\n", ntohs(message->count), ntohs(message->count));
+
+        int numpeers = ntohs(message->count) / (sizeof(ntp_assoc_status_pair));
+        if (message->op & REM_RESP && message->op & OP_READSTAT) {
+                const ntp_assoc_status_pair *peer = (ntp_assoc_status_pair *)message->data;
                 for (int i = 0; i < numpeers; i++) {
                         printf("\tpeer id %.2x status %.2x", ntohs(peer[i].assoc), ntohs(peer[i].status));
                         if (PEER_SEL(peer[i].status) >= PEER_SYNCSOURCE) {
@@ -190,13 +181,13 @@ void print_ntp_control_message(const ntp_control_message *p) {
         }
 }
 
-void setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq) {
-        memset(p, 0, sizeof(ntp_control_message));
-        LI_SET(p->flags, LI_NOWARNING);
-        VN_SET(p->flags, VN_RESERVED);
-        MODE_SET(p->flags, MODE_CONTROLMSG);
-        OP_SET(p->op, opcode);
-        p->seq = htons(seq);
+void setup_control_request(ntp_control_message *message, uint8_t opcode, uint16_t seq) {
+        memset(message, 0, sizeof(ntp_control_message));
+        LI_SET(message->flags, LI_NOWARNING);
+        VN_SET(message->flags, VN_RESERVED);
+        MODE_SET(message->flags, MODE_CONTROLMSG);
+        OP_SET(message->op, opcode);
+        message->seq = htons(seq);
         /* Remaining fields are zero for requests */
 }
 
@@ -208,13 +199,28 @@ void setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq)
  *    positive value means a success retrieving the value.
  *  - status is set to WARNING if there's no sync.peer (otherwise OK) and is
  *    the return value of the function.
- *  status is pretty much useless as syncsource_found is a global variable
- *  used later in main to check is the server was synchronized. It works
- *  so I left it alone */
-int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum, int *num_truechimers) {
-        *offset_result = STATE_UNKNOWN;
-        *jitter = *stratum = -1;
-        *num_truechimers = 0;
+ */
+typedef struct {
+        mp_state_enum state;
+        mp_state_enum offset_result;
+        double offset;
+        double jitter;
+        long stratum;
+        int num_truechimers;
+        bool syncsource_found;
+        bool li_alarm;
+} ntp_request_result;
+ntp_request_result ntp_request(const check_ntp_peer_config config) {
+
+        ntp_request_result result = {
+                .state = STATE_OK,
+                .offset_result = STATE_UNKNOWN,
+                .jitter = -1,
+                .stratum = -1,
+                .num_truechimers = 0,
+                .syncsource_found = false,
+                .li_alarm = false,
+        };
 
         /* Long-winded explanation:
          * Getting the sync peer offset, jitter and stratum requires a number of
@@ -232,19 +238,16 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
          * 4) Extract the offset, jitter and stratum value from the data[]
          *    (it's ASCII)
          */
-        int min_peer_sel = PEER_INCLUDED;
-        int num_candidates = 0;
-        void *tmp;
-        ntp_assoc_status_pair *peers = NULL;
-        int peer_offset = 0;
-        int peers_size = 0;
-        int npeers = 0;
         int conn = -1;
-        my_udp_connect(server_address, port, &conn);
+        my_udp_connect(config.server_address, config.port, &conn);
 
         /* keep sending requests until the server stops setting the
          * REM_MORE bit, though usually this is only 1 packet. */
         ntp_control_message req;
+        ntp_assoc_status_pair *peers = NULL;
+        int peer_offset = 0;
+        size_t peers_size = 0;
+        size_t npeers = 0;
         do {
                 setup_control_request(&req, OP_READSTAT, 1);
                 DBG(printf("sending READSTAT request"));
@@ -255,24 +258,29 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                         /* Attempt to read the largest size packet possible */
                         req.count = htons(MAX_CM_SIZE);
                         DBG(printf("receiving READSTAT response"))
-                        if (read(conn, &req, SIZEOF_NTPCM(req)) == -1)
+                        if (read(conn, &req, SIZEOF_NTPCM(req)) == -1) {
                                 die(STATE_CRITICAL, "NTP CRITICAL: No response from NTP server\n");
+                        }
                         DBG(print_ntp_control_message(&req));
                         /* discard obviously invalid packets */
-                        if (ntohs(req.count) > MAX_CM_SIZE)
+                        if (ntohs(req.count) > MAX_CM_SIZE) {
                                 die(STATE_CRITICAL, "NTP CRITICAL: Invalid packet received from NTP server\n");
+                        }
                 } while (!(req.op & OP_READSTAT && ntohs(req.seq) == 1));
 
-                if (LI(req.flags) == LI_ALARM)
-                        li_alarm = true;
+                if (LI(req.flags) == LI_ALARM) {
+                        result.li_alarm = true;
+                }
                 /* Each peer identifier is 4 bytes in the data section, which
                  * we represent as a ntp_assoc_status_pair datatype.
                  */
                 peers_size += ntohs(req.count);
-                if ((tmp = realloc(peers, peers_size)) == NULL)
+                void *tmp;
+                if ((tmp = realloc(peers, peers_size)) == NULL) {
                         free(peers), die(STATE_UNKNOWN, "can not (re)allocate 'peers' buffer\n");
+                }
                 peers = tmp;
-                memcpy((void *)((ptrdiff_t)peers + peer_offset), (void *)req.data, ntohs(req.count));
+                memcpy((peers + peer_offset), (void *)req.data, ntohs(req.count));
                 npeers = peers_size / sizeof(ntp_assoc_status_pair);
                 peer_offset += ntohs(req.count);
         } while (req.op & REM_MORE);
@@ -280,45 +288,51 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
         /* first, let's find out if we have a sync source, or if there are
          * at least some candidates. In the latter case we'll issue
          * a warning but go ahead with the check on them. */
-        for (int i = 0; i < npeers; i++) {
+        int min_peer_sel = PEER_INCLUDED;
+        int num_candidates = 0;
+        for (size_t i = 0; i < npeers; i++) {
                 if (PEER_SEL(peers[i].status) >= PEER_TRUECHIMER) {
-                        (*num_truechimers)++;
+                        result.num_truechimers++;
                         if (PEER_SEL(peers[i].status) >= PEER_INCLUDED) {
                                 num_candidates++;
                                 if (PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE) {
-                                        syncsource_found = true;
+                                        result.syncsource_found = true;
                                         min_peer_sel = PEER_SYNCSOURCE;
                                 }
                         }
                 }
         }
 
-        if (verbose)
+        if (verbose) {
                 printf("%d candidate peers available\n", num_candidates);
-        if (verbose && syncsource_found)
-                printf("synchronization source found\n");
+                if (result.syncsource_found) {
+                        printf("synchronization source found\n");
+                }
+        }
 
-        int status = STATE_OK;
-        if (!syncsource_found) {
-                status = STATE_WARNING;
-                if (verbose)
+        if (!result.syncsource_found) {
+                result.state = STATE_WARNING;
+                if (verbose) {
                         printf("warning: no synchronization source found\n");
+                }
         }
-        if (li_alarm) {
-                status = STATE_WARNING;
-                if (verbose)
+        if (result.li_alarm) {
+                result.state = STATE_WARNING;
+                if (verbose) {
                         printf("warning: LI_ALARM bit is set\n");
+                }
         }
 
         const char *getvar = "stratum,offset,jitter";
         char *data;
-        for (int i = 0; i < npeers; i++) {
+        for (size_t i = 0; i < npeers; i++) {
                 /* Only query this server if it is the current sync source */
                 /* If there's no sync.peer, query all candidates and use the best one */
                 if (PEER_SEL(peers[i].status) >= min_peer_sel) {
-                        if (verbose)
+                        if (verbose) {
                                 printf("Getting offset, jitter and stratum for peer %.2x\n", ntohs(peers[i].assoc));
-                        xasprintf(&data, "");
+                        }
+                        data = strdup("");
                         do {
                                 setup_control_request(&req, OP_READVAR, 2);
                                 req.assoc = peers[i].assoc;
@@ -342,81 +356,95 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                                         DBG(print_ntp_control_message(&req));
                                 } while (!(req.op & OP_READVAR && ntohs(req.seq) == 2));
 
-                                if (!(req.op & REM_ERROR))
+                                if (!(req.op & REM_ERROR)) {
                                         xasprintf(&data, "%s%s", data, req.data);
+                                }
                         } while (req.op & REM_MORE);
 
                         if (req.op & REM_ERROR) {
                                 if (strstr(getvar, "jitter")) {
-                                        if (verbose)
-                                                printf("The command failed. This is usually caused by servers refusing the 'jitter'\nvariable. Restarting with "
+                                        if (verbose) {
+                                                printf("The command failed. This is usually caused by servers refusing the "
+                                                           "'jitter'\nvariable. Restarting with "
                                                            "'dispersion'...\n");
+                                        }
                                         getvar = "stratum,offset,dispersion";
                                         i--;
                                         continue;
                                 }
                                 if (strlen(getvar)) {
-                                        if (verbose)
+                                        if (verbose) {
                                                 printf("Server didn't like dispersion either; will retrieve everything\n");
+                                        }
                                         getvar = "";
                                         i--;
                                         continue;
                                 }
                         }
 
-                        if (verbose > 1)
+                        if (verbose > 1) {
                                 printf("Server responded: >>>%s<<<\n", data);
+                        }
 
                         double tmp_offset = 0;
                         char *value;
                         char *nptr;
                         /* get the offset */
-                        if (verbose)
+                        if (verbose) {
                                 printf("parsing offset from peer %.2x: ", ntohs(peers[i].assoc));
+                        }
 
                         value = np_extract_ntpvar(data, "offset");
                         nptr = NULL;
                         /* Convert the value if we have one */
-                        if (value != NULL)
+                        if (value != NULL) {
                                 tmp_offset = strtod(value, &nptr) / 1000;
+                        }
                         /* If value is null or no conversion was performed */
                         if (value == NULL || value == nptr) {
-                                if (verbose)
+                                if (verbose) {
                                         printf("error: unable to read server offset response.\n");
+                                }
                         } else {
-                                if (verbose)
+                                if (verbose) {
                                         printf("%.10g\n", tmp_offset);
-                                if (*offset_result == STATE_UNKNOWN || fabs(tmp_offset) < fabs(*offset)) {
-                                        *offset = tmp_offset;
-                                        *offset_result = STATE_OK;
+                                }
+                                if (result.offset_result == STATE_UNKNOWN ||
+                                        fabs(tmp_offset) < fabs(result.offset)) {
+                                        result.offset = tmp_offset;
+                                        result.offset_result = STATE_OK;
                                 } else {
                                         /* Skip this one; move to the next */
                                         continue;
                                 }
                         }
 
-                        if (do_jitter) {
+                        if (config.do_jitter) {
                                 /* get the jitter */
                                 if (verbose) {
-                                        printf("parsing %s from peer %.2x: ", strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter",
+                                        printf("parsing %s from peer %.2x: ",
+                                                   strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter",
                                                    ntohs(peers[i].assoc));
                                 }
-                                value = np_extract_ntpvar(data, strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter");
+                                value = np_extract_ntpvar(data, strstr(getvar, "dispersion") != NULL ? "dispersion"
+                                                                                                                                                                         : "jitter");
                                 nptr = NULL;
                                 /* Convert the value if we have one */
-                                if (value != NULL)
-                                        *jitter = strtod(value, &nptr);
+                                if (value != NULL) {
+                                        result.jitter = strtod(value, &nptr);
+                                }
                                 /* If value is null or no conversion was performed */
                                 if (value == NULL || value == nptr) {
-                                        if (verbose)
+                                        if (verbose) {
                                                 printf("error: unable to read server jitter/dispersion response.\n");
-                                        *jitter = -1;
+                                        }
+                                        result.jitter = -1;
                                 } else if (verbose) {
-                                        printf("%.10g\n", *jitter);
+                                        printf("%.10g\n", result.jitter);
                                 }
                         }
 
-                        if (do_stratum) {
+                        if (config.do_stratum) {
                                 /* get the stratum */
                                 if (verbose) {
                                         printf("parsing stratum from peer %.2x: ", ntohs(peers[i].assoc));
@@ -424,46 +452,86 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                                 value = np_extract_ntpvar(data, "stratum");
                                 nptr = NULL;
                                 /* Convert the value if we have one */
-                                if (value != NULL)
-                                        *stratum = strtol(value, &nptr, 10);
+                                if (value != NULL) {
+                                        result.stratum = strtol(value, &nptr, 10);
+                                }
                                 if (value == NULL || value == nptr) {
-                                        if (verbose)
+                                        if (verbose) {
                                                 printf("error: unable to read server stratum response.\n");
-                                        *stratum = -1;
+                                        }
+                                        result.stratum = -1;
                                 } else {
-                                        if (verbose)
-                                                printf("%i\n", *stratum);
+                                        if (verbose) {
+                                                printf("%li\n", result.stratum);
+                                        }
                                 }
                         }
                 } /* if (PEER_SEL(peers[i].status) >= min_peer_sel) */
-        }     /* for (i = 0; i < npeers; i++) */
+        } /* for (i = 0; i < npeers; i++) */
 
         close(conn);
-        if (peers != NULL)
+        if (peers != NULL) {
                 free(peers);
+        }
 
-        return status;
+        return result;
 }
 
-int process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {
-                {"version", no_argument, 0, 'V'},        {"help", no_argument, 0, 'h'},           {"verbose", no_argument, 0, 'v'},
-                {"use-ipv4", no_argument, 0, '4'},       {"use-ipv6", no_argument, 0, '6'},       {"quiet", no_argument, 0, 'q'},
-                {"warning", required_argument, 0, 'w'},  {"critical", required_argument, 0, 'c'}, {"swarn", required_argument, 0, 'W'},
-                {"scrit", required_argument, 0, 'C'},    {"jwarn", required_argument, 0, 'j'},    {"jcrit", required_argument, 0, 'k'},
-                {"twarn", required_argument, 0, 'm'},    {"tcrit", required_argument, 0, 'n'},    {"timeout", required_argument, 0, 't'},
-                {"hostname", required_argument, 0, 'H'}, {"port", required_argument, 0, 'p'},     {0, 0, 0, 0}};
-
-        if (argc < 2)
+check_ntp_peer_config_wrapper process_arguments(int argc, char **argv) {
+
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
+
+        static struct option longopts[] = {{"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {"quiet", no_argument, 0, 'q'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"swarn", required_argument, 0, 'W'},
+                                                                           {"scrit", required_argument, 0, 'C'},
+                                                                           {"jwarn", required_argument, 0, 'j'},
+                                                                           {"jcrit", required_argument, 0, 'k'},
+                                                                           {"twarn", required_argument, 0, 'm'},
+                                                                           {"tcrit", required_argument, 0, 'n'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"hostname", required_argument, 0, 'H'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
+                                                                           {0, 0, 0, 0}};
+
+        if (argc < 2) {
                 usage("\n");
+        }
+
+        check_ntp_peer_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_ntp_peer_config_init(),
+        };
 
         while (true) {
                 int option = 0;
-                int option_char = getopt_long(argc, argv, "Vhv46qw:c:W:C:j:k:m:n:t:H:p:", longopts, &option);
-                if (option_char == -1 || option_char == EOF || option_char == 1)
+                int option_char =
+                        getopt_long(argc, argv, "Vhv46qw:c:W:C:j:k:m:n:t:H:p:", longopts, &option);
+                if (option_char == -1 || option_char == EOF || option_char == 1) {
                         break;
+                }
 
                 switch (option_char) {
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 case 'h':
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -476,45 +544,94 @@ int process_arguments(int argc, char **argv) {
                         verbose++;
                         break;
                 case 'q':
-                        quiet = true;
-                        break;
-                case 'w':
-                        owarn = optarg;
-                        break;
-                case 'c':
-                        ocrit = optarg;
-                        break;
-                case 'W':
-                        do_stratum = true;
-                        swarn = optarg;
-                        break;
-                case 'C':
-                        do_stratum = true;
-                        scrit = optarg;
-                        break;
-                case 'j':
-                        do_jitter = true;
-                        jwarn = optarg;
-                        break;
-                case 'k':
-                        do_jitter = true;
-                        jcrit = optarg;
-                        break;
-                case 'm':
-                        do_truechimers = true;
-                        twarn = optarg;
-                        break;
-                case 'n':
-                        do_truechimers = true;
-                        tcrit = optarg;
+                        result.config.quiet = true;
                         break;
+                case 'w': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning offset threshold");
+                        }
+
+                        result.config.offset_thresholds =
+                                mp_thresholds_set_warn(result.config.offset_thresholds, tmp.range);
+                } break;
+                case 'c': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical offset threshold");
+                        }
+
+                        result.config.offset_thresholds =
+                                mp_thresholds_set_crit(result.config.offset_thresholds, tmp.range);
+                } break;
+                case 'W': {
+                        result.config.do_stratum = true;
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning stratum threshold");
+                        }
+
+                        result.config.stratum_thresholds =
+                                mp_thresholds_set_warn(result.config.stratum_thresholds, tmp.range);
+                } break;
+                case 'C': {
+                        result.config.do_stratum = true;
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical stratum threshold");
+                        }
+
+                        result.config.stratum_thresholds =
+                                mp_thresholds_set_crit(result.config.stratum_thresholds, tmp.range);
+                } break;
+                case 'j': {
+                        result.config.do_jitter = true;
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning jitter threshold");
+                        }
+
+                        result.config.jitter_thresholds =
+                                mp_thresholds_set_warn(result.config.jitter_thresholds, tmp.range);
+                } break;
+                case 'k': {
+                        result.config.do_jitter = true;
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical jitter threshold");
+                        }
+
+                        result.config.jitter_thresholds =
+                                mp_thresholds_set_crit(result.config.jitter_thresholds, tmp.range);
+                } break;
+                case 'm': {
+                        result.config.do_truechimers = true;
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning truechimer threshold");
+                        }
+
+                        result.config.truechimer_thresholds =
+                                mp_thresholds_set_warn(result.config.truechimer_thresholds, tmp.range);
+                } break;
+                case 'n': {
+                        result.config.do_truechimers = true;
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical truechimer threshold");
+                        }
+
+                        result.config.truechimer_thresholds =
+                                mp_thresholds_set_crit(result.config.truechimer_thresholds, tmp.range);
+                } break;
                 case 'H':
-                        if (!is_host(optarg))
+                        if (!is_host(optarg) && (optarg[0] != '/')) {
                                 usage2(_("Invalid hostname/address"), optarg);
-                        server_address = strdup(optarg);
+                        }
+                        result.config.server_address = strdup(optarg);
                         break;
                 case 'p':
-                        port = atoi(optarg);
+                        result.config.port = atoi(optarg);
                         break;
                 case 't':
                         socket_timeout = atoi(optarg);
@@ -536,30 +653,32 @@ int process_arguments(int argc, char **argv) {
                 }
         }
 
-        if (server_address == NULL) {
+        if (result.config.server_address == NULL) {
                 usage4(_("Hostname was not supplied"));
         }
 
-        return 0;
+        return result;
 }
 
-char *perfd_offset(double offset) {
-        return fperfdata("offset", offset, "s", true, offset_thresholds->warning->end, true, offset_thresholds->critical->end, false, 0, false,
-                                         0);
+char *perfd_offset(double offset, thresholds *offset_thresholds) {
+        return fperfdata("offset", offset, "s", true, offset_thresholds->warning->end, true,
+                                         offset_thresholds->critical->end, false, 0, false, 0);
 }
 
-char *perfd_jitter(double jitter) {
-        return fperfdata("jitter", jitter, "", do_jitter, jitter_thresholds->warning->end, do_jitter, jitter_thresholds->critical->end, true, 0,
-                                         false, 0);
+char *perfd_jitter(double jitter, bool do_jitter, thresholds *jitter_thresholds) {
+        return fperfdata("jitter", jitter, "", do_jitter, jitter_thresholds->warning->end, do_jitter,
+                                         jitter_thresholds->critical->end, true, 0, false, 0);
 }
 
-char *perfd_stratum(int stratum) {
-        return perfdata("stratum", stratum, "", do_stratum, (int)stratum_thresholds->warning->end, do_stratum,
-                                        (int)stratum_thresholds->critical->end, true, 0, true, 16);
+char *perfd_stratum(int stratum, bool do_stratum, thresholds *stratum_thresholds) {
+        return perfdata("stratum", stratum, "", do_stratum, (int)stratum_thresholds->warning->end,
+                                        do_stratum, (int)stratum_thresholds->critical->end, true, 0, true, 16);
 }
 
-char *perfd_truechimers(int num_truechimers) {
-        return perfdata("truechimers", num_truechimers, "", do_truechimers, (int)truechimer_thresholds->warning->end, do_truechimers,
+char *perfd_truechimers(int num_truechimers, const bool do_truechimers,
+                                                thresholds *truechimer_thresholds) {
+        return perfdata("truechimers", num_truechimers, "", do_truechimers,
+                                        (int)truechimer_thresholds->warning->end, do_truechimers,
                                         (int)truechimer_thresholds->critical->end, true, 0, false, 0);
 }
 
@@ -571,13 +690,17 @@ int main(int argc, char *argv[]) {
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
+        check_ntp_peer_config_wrapper tmp_config = process_arguments(argc, argv);
+
+        if (tmp_config.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
+        }
+
+        const check_ntp_peer_config config = tmp_config.config;
 
-        set_thresholds(&offset_thresholds, owarn, ocrit);
-        set_thresholds(&jitter_thresholds, jwarn, jcrit);
-        set_thresholds(&stratum_thresholds, swarn, scrit);
-        set_thresholds(&truechimer_thresholds, twarn, tcrit);
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
 
         /* initialize alarm signal handling */
         signal(SIGALRM, socket_timeout_alarm_handler);
@@ -585,115 +708,114 @@ int main(int argc, char *argv[]) {
         /* set socket timeout */
         alarm(socket_timeout);
 
-        int offset_result;
-        int stratum;
-        int num_truechimers;
-        double offset = 0;
-        double jitter = 0;
         /* This returns either OK or WARNING (See comment preceding ntp_request) */
-        int result = ntp_request(&offset, &offset_result, &jitter, &stratum, &num_truechimers);
+        const ntp_request_result ntp_res = ntp_request(config);
+        mp_check overall = mp_check_init();
 
-        if (offset_result == STATE_UNKNOWN) {
+        mp_subcheck sc_offset = mp_subcheck_init();
+        xasprintf(&sc_offset.output, "offset");
+        if (ntp_res.offset_result == STATE_UNKNOWN) {
                 /* if there's no sync peer (this overrides ntp_request output): */
-                result = (quiet ? STATE_UNKNOWN : STATE_CRITICAL);
+                sc_offset =
+                        mp_set_subcheck_state(sc_offset, (config.quiet ? STATE_UNKNOWN : STATE_CRITICAL));
+                xasprintf(&sc_offset.output, "%s unknown", sc_offset.output);
         } else {
                 /* Be quiet if there's no candidates either */
-                if (quiet && result == STATE_WARNING)
-                        result = STATE_UNKNOWN;
-                result = max_state_alt(result, get_status(fabs(offset), offset_thresholds));
-        }
+                mp_state_enum tmp = STATE_OK;
+                if (config.quiet && ntp_res.state == STATE_WARNING) {
+                        tmp = STATE_UNKNOWN;
+                }
 
-        int oresult = result;
+                xasprintf(&sc_offset.output, "%s: %.6fs", sc_offset.output, ntp_res.offset);
 
-        int tresult = STATE_UNKNOWN;
+                mp_perfdata pd_offset = perfdata_init();
+                pd_offset.value = mp_create_pd_value(fabs(ntp_res.offset));
+                pd_offset = mp_pd_set_thresholds(pd_offset, config.offset_thresholds);
+                pd_offset.label = "offset";
+                pd_offset.uom = "s";
+                mp_add_perfdata_to_subcheck(&sc_offset, pd_offset);
 
-        if (do_truechimers) {
-                tresult = get_status(num_truechimers, truechimer_thresholds);
-                result = max_state_alt(result, tresult);
+                tmp = max_state_alt(tmp, mp_get_pd_status(pd_offset));
+                sc_offset = mp_set_subcheck_state(sc_offset, tmp);
         }
 
-        int sresult = STATE_UNKNOWN;
+        mp_add_subcheck_to_check(&overall, sc_offset);
 
-        if (do_stratum) {
-                sresult = get_status(stratum, stratum_thresholds);
-                result = max_state_alt(result, sresult);
-        }
+        // truechimers
+        if (config.do_truechimers) {
+                mp_subcheck sc_truechimers = mp_subcheck_init();
+                xasprintf(&sc_truechimers.output, "truechimers: %i", ntp_res.num_truechimers);
+
+                mp_perfdata pd_truechimers = perfdata_init();
+                pd_truechimers.value = mp_create_pd_value(ntp_res.num_truechimers);
+                pd_truechimers.label = "truechimers";
+                pd_truechimers = mp_pd_set_thresholds(pd_truechimers, config.truechimer_thresholds);
+
+                mp_add_perfdata_to_subcheck(&sc_truechimers, pd_truechimers);
 
-        int jresult = STATE_UNKNOWN;
+                sc_truechimers = mp_set_subcheck_state(sc_truechimers, mp_get_pd_status(pd_truechimers));
 
-        if (do_jitter) {
-                jresult = get_status(jitter, jitter_thresholds);
-                result = max_state_alt(result, jresult);
+                mp_add_subcheck_to_check(&overall, sc_truechimers);
         }
 
-        char *result_line;
-        switch (result) {
-        case STATE_CRITICAL:
-                xasprintf(&result_line, _("NTP CRITICAL:"));
-                break;
-        case STATE_WARNING:
-                xasprintf(&result_line, _("NTP WARNING:"));
-                break;
-        case STATE_OK:
-                xasprintf(&result_line, _("NTP OK:"));
-                break;
-        default:
-                xasprintf(&result_line, _("NTP UNKNOWN:"));
-                break;
+        if (config.do_stratum) {
+                mp_subcheck sc_stratum = mp_subcheck_init();
+                xasprintf(&sc_stratum.output, "stratum: %li", ntp_res.stratum);
+
+                mp_perfdata pd_stratum = perfdata_init();
+                pd_stratum.value = mp_create_pd_value(ntp_res.stratum);
+                pd_stratum = mp_pd_set_thresholds(pd_stratum, config.stratum_thresholds);
+                pd_stratum.label = "stratum";
+
+                mp_add_perfdata_to_subcheck(&sc_stratum, pd_stratum);
+
+                sc_stratum = mp_set_subcheck_state(sc_stratum, mp_get_pd_status(pd_stratum));
+
+                mp_add_subcheck_to_check(&overall, sc_stratum);
         }
-        if (!syncsource_found)
-                xasprintf(&result_line, "%s %s,", result_line, _("Server not synchronized"));
-        else if (li_alarm)
-                xasprintf(&result_line, "%s %s,", result_line, _("Server has the LI_ALARM bit set"));
-
-        char *perfdata_line;
-        if (offset_result == STATE_UNKNOWN) {
-                xasprintf(&result_line, "%s %s", result_line, _("Offset unknown"));
-                xasprintf(&perfdata_line, "");
-        } else if (oresult == STATE_WARNING) {
-                xasprintf(&result_line, "%s %s %.10g secs (WARNING)", result_line, _("Offset"), offset);
-        } else if (oresult == STATE_CRITICAL) {
-                xasprintf(&result_line, "%s %s %.10g secs (CRITICAL)", result_line, _("Offset"), offset);
-        } else {
-                xasprintf(&result_line, "%s %s %.10g secs", result_line, _("Offset"), offset);
+
+        if (config.do_jitter) {
+                mp_subcheck sc_jitter = mp_subcheck_init();
+                xasprintf(&sc_jitter.output, "jitter: %f", ntp_res.jitter);
+
+                mp_perfdata pd_jitter = perfdata_init();
+                pd_jitter.value = mp_create_pd_value(ntp_res.jitter);
+                pd_jitter = mp_pd_set_thresholds(pd_jitter, config.jitter_thresholds);
+                pd_jitter.label = "jitter";
+
+                mp_add_perfdata_to_subcheck(&sc_jitter, pd_jitter);
+
+                sc_jitter = mp_set_subcheck_state(sc_jitter, mp_get_pd_status(pd_jitter));
+                mp_add_subcheck_to_check(&overall, sc_jitter);
         }
-        xasprintf(&perfdata_line, "%s", perfd_offset(offset));
-
-        if (do_jitter) {
-                if (jresult == STATE_WARNING) {
-                        xasprintf(&result_line, "%s, jitter=%f (WARNING)", result_line, jitter);
-                } else if (jresult == STATE_CRITICAL) {
-                        xasprintf(&result_line, "%s, jitter=%f (CRITICAL)", result_line, jitter);
-                } else {
-                        xasprintf(&result_line, "%s, jitter=%f", result_line, jitter);
-                }
-                xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_jitter(jitter));
+
+        mp_subcheck sc_other_info = mp_subcheck_init();
+        sc_other_info = mp_set_subcheck_default_state(sc_other_info, STATE_OK);
+        if (!ntp_res.syncsource_found) {
+                xasprintf(&sc_other_info.output, "%s", _("Server not synchronized"));
+                mp_add_subcheck_to_check(&overall, sc_other_info);
+        } else if (ntp_res.li_alarm) {
+                xasprintf(&sc_other_info.output, "%s", _("Server has the LI_ALARM bit set"));
+                mp_add_subcheck_to_check(&overall, sc_other_info);
         }
-        if (do_stratum) {
-                if (sresult == STATE_WARNING) {
-                        xasprintf(&result_line, "%s, stratum=%i (WARNING)", result_line, stratum);
-                } else if (sresult == STATE_CRITICAL) {
-                        xasprintf(&result_line, "%s, stratum=%i (CRITICAL)", result_line, stratum);
-                } else {
-                        xasprintf(&result_line, "%s, stratum=%i", result_line, stratum);
-                }
-                xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_stratum(stratum));
+
+        {
+                mp_subcheck sc_offset = mp_subcheck_init();
+                sc_offset = mp_set_subcheck_default_state(sc_offset, STATE_OK);
+                xasprintf(&sc_offset.output, "offset: %.10gs", ntp_res.offset);
+
+                mp_perfdata pd_offset = perfdata_init();
+                pd_offset.value = mp_create_pd_value(ntp_res.offset);
+                pd_offset = mp_pd_set_thresholds(pd_offset, config.offset_thresholds);
+
+                sc_offset = mp_set_subcheck_state(sc_offset, ntp_res.offset_result);
         }
-        if (do_truechimers) {
-                if (tresult == STATE_WARNING) {
-                        xasprintf(&result_line, "%s, truechimers=%i (WARNING)", result_line, num_truechimers);
-                } else if (tresult == STATE_CRITICAL) {
-                        xasprintf(&result_line, "%s, truechimers=%i (CRITICAL)", result_line, num_truechimers);
-                } else {
-                        xasprintf(&result_line, "%s, truechimers=%i", result_line, num_truechimers);
-                }
-                xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_truechimers(num_truechimers));
+
+        if (config.server_address != NULL) {
+                free(config.server_address);
         }
-        printf("%s|%s\n", result_line, perfdata_line);
 
-        if (server_address != NULL)
-                free(server_address);
-        return result;
+        mp_exit(overall);
 }
 
 void print_help(void) {
@@ -712,7 +834,8 @@ void print_help(void) {
         printf(UT_IPv46);
         printf(UT_HOST_PORT, 'p', "123");
         printf(" %s\n", "-q, --quiet");
-        printf("    %s\n", _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
+        printf("    %s\n",
+                   _("Returns UNKNOWN instead of CRITICAL or WARNING if server isn't synchronized"));
         printf(" %s\n", "-w, --warning=THRESHOLD");
         printf("    %s\n", _("Offset to result in warning status (seconds)"));
         printf(" %s\n", "-c, --critical=THRESHOLD");
@@ -731,6 +854,7 @@ void print_help(void) {
         printf("    %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")"));
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf(UT_VERBOSE);
+        printf(UT_OUTPUT_FORMAT);
 
         printf("\n");
         printf("%s\n", _("This plugin checks an NTP server independent of any commandline"));
@@ -749,7 +873,8 @@ void print_help(void) {
         printf(" %s\n", _("Simple NTP server check:"));
         printf("  %s\n", ("./check_ntp_peer -H ntpserv -w 0.5 -c 1"));
         printf("\n");
-        printf(" %s\n", _("Check jitter too, avoiding critical notifications if jitter isn't available"));
+        printf(" %s\n",
+                   _("Check jitter too, avoiding critical notifications if jitter isn't available"));
         printf(" %s\n", _("(See Notes above for more details on thresholds formats):"));
         printf("  %s\n", ("./check_ntp_peer -H ntpserv -w 0.5 -c 1 -j -1:100 -k -1:200"));
         printf("\n");
diff --git a/plugins/check_ntp_peer.d/config.h b/plugins/check_ntp_peer.d/config.h
new file mode 100644
index 00000000..488d936c
--- /dev/null
+++ b/plugins/check_ntp_peer.d/config.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include "../../config.h"
+#include "output.h"
+#include "perfdata.h"
+#include "thresholds.h"
+#include <stddef.h>
+
+enum {
+        DEFAULT_NTP_PORT = 123,
+};
+
+typedef struct {
+        char *server_address;
+        int port;
+
+        bool quiet;
+
+        // truechimer stuff
+        bool do_truechimers;
+        mp_thresholds truechimer_thresholds;
+
+        // offset thresholds
+        mp_thresholds offset_thresholds;
+
+        // stratum stuff
+        bool do_stratum;
+        mp_thresholds stratum_thresholds;
+
+        // jitter stuff
+        bool do_jitter;
+        mp_thresholds jitter_thresholds;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
+} check_ntp_peer_config;
+
+check_ntp_peer_config check_ntp_peer_config_init() {
+        check_ntp_peer_config tmp = {
+                .server_address = NULL,
+                .port = DEFAULT_NTP_PORT,
+
+                .quiet = false,
+                .do_truechimers = false,
+                .truechimer_thresholds = mp_thresholds_init(),
+
+                .offset_thresholds = mp_thresholds_init(),
+
+                .do_stratum = false,
+                .stratum_thresholds = mp_thresholds_init(),
+
+                .do_jitter = false,
+                .jitter_thresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
+        };
+
+        mp_range stratum_default = mp_range_init();
+        stratum_default = mp_range_set_start(stratum_default, mp_create_pd_value(-1));
+        stratum_default = mp_range_set_end(stratum_default, mp_create_pd_value(16));
+        tmp.stratum_thresholds = mp_thresholds_set_warn(tmp.stratum_thresholds, stratum_default);
+        tmp.stratum_thresholds = mp_thresholds_set_crit(tmp.stratum_thresholds, stratum_default);
+
+        mp_range jitter_w_default = mp_range_init();
+        jitter_w_default = mp_range_set_start(jitter_w_default, mp_create_pd_value(-1));
+        jitter_w_default = mp_range_set_end(jitter_w_default, mp_create_pd_value(5000));
+        tmp.jitter_thresholds = mp_thresholds_set_warn(tmp.jitter_thresholds, jitter_w_default);
+
+        mp_range jitter_c_default = mp_range_init();
+        jitter_c_default = mp_range_set_start(jitter_c_default, mp_create_pd_value(-1));
+        jitter_c_default = mp_range_set_end(jitter_c_default, mp_create_pd_value(10000));
+        tmp.jitter_thresholds = mp_thresholds_set_crit(tmp.jitter_thresholds, jitter_c_default);
+
+        mp_range offset_w_default = mp_range_init();
+        offset_w_default = mp_range_set_end(offset_w_default, mp_create_pd_value(60));
+        tmp.offset_thresholds = mp_thresholds_set_warn(tmp.offset_thresholds, offset_w_default);
+
+        mp_range offset_c_default = mp_range_init();
+        offset_c_default = mp_range_set_end(offset_c_default, mp_create_pd_value(120));
+        tmp.offset_thresholds = mp_thresholds_set_crit(tmp.offset_thresholds, offset_c_default);
+        return tmp;
+}
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index 31162883..9e0beb9c 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -34,19 +34,23 @@
  *
  *****************************************************************************/
 
-const char *progname = "check_ntp_time";
-const char *copyright = "2006-2024";
-const char *email = "devel@monitoring-plugins.org";
-
+#include "output.h"
 #include "common.h"
 #include "netutils.h"
+#include "perfdata.h"
 #include "utils.h"
 #include "states.h"
 #include "thresholds.h"
 #include "check_ntp_time.d/config.h"
+#include <netinet/in.h>
+#include <sys/socket.h>
 
 static int verbose = 0;
 
+const char *progname = "check_ntp_time";
+const char *copyright = "2006-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 typedef struct {
         int errorcode;
         check_ntp_time_config config;
@@ -61,9 +65,6 @@ void print_usage(void);
 #       define AVG_NUM 4
 #endif
 
-/* max size of control message data */
-#define MAX_CM_SIZE 468
-
 /* this structure holds everything in an ntp request/response as per rfc1305 */
 typedef struct {
         uint8_t flags;    /* byte with leapindicator,vers,mode. see macros */
@@ -93,9 +94,9 @@ typedef struct {
 /* bits 1,2 are the leap indicator */
 #define LI_MASK 0xc0
 #define LI(x)   ((x & LI_MASK) >> 6)
-#define LI_SET(x, y)                                                                                                                       \
-        do {                                                                                                                                   \
-                x |= ((y << 6) & LI_MASK);                                                                                                         \
+#define LI_SET(x, y)                                                                               \
+        do {                                                                                           \
+                x |= ((y << 6) & LI_MASK);                                                                 \
         } while (0)
 /* and these are the values of the leap indicator */
 #define LI_NOWARNING  0x00
@@ -105,17 +106,17 @@ typedef struct {
 /* bits 3,4,5 are the ntp version */
 #define VN_MASK 0x38
 #define VN(x)   ((x & VN_MASK) >> 3)
-#define VN_SET(x, y)                                                                                                                       \
-        do {                                                                                                                                   \
-                x |= ((y << 3) & VN_MASK);                                                                                                         \
+#define VN_SET(x, y)                                                                               \
+        do {                                                                                           \
+                x |= ((y << 3) & VN_MASK);                                                                 \
         } while (0)
 #define VN_RESERVED 0x02
 /* bits 6,7,8 are the ntp mode */
 #define MODE_MASK 0x07
 #define MODE(x)   (x & MODE_MASK)
-#define MODE_SET(x, y)                                                                                                                     \
-        do {                                                                                                                                   \
-                x |= (y & MODE_MASK);                                                                                                              \
+#define MODE_SET(x, y)                                                                             \
+        do {                                                                                           \
+                x |= (y & MODE_MASK);                                                                      \
         } while (0)
 /* here are some values */
 #define MODE_CLIENT     0x03
@@ -127,9 +128,9 @@ typedef struct {
 #define REM_MORE  0x20
 /* In control message, bits 11 - 15 are opcode */
 #define OP_MASK 0x1f
-#define OP_SET(x, y)                                                                                                                       \
-        do {                                                                                                                                   \
-                x |= (y & OP_MASK);                                                                                                                \
+#define OP_SET(x, y)                                                                               \
+        do {                                                                                           \
+                x |= (y & OP_MASK);                                                                        \
         } while (0)
 #define OP_READSTAT 0x01
 #define OP_READVAR  0x02
@@ -163,32 +164,36 @@ typedef struct {
 #define NTP32asDOUBLE(x) (ntohs(L16(x)) + ((double)ntohs(R16(x)) / 65536.0))
 
 /* likewise for a 64-bit ntp fp number */
-#define NTP64asDOUBLE(n)                                                                                                                   \
-        (double)(((uint64_t)n) ? (ntohl(L32(n)) - EPOCHDIFF) + (.00000001 * (0.5 + (double)(ntohl(R32(n)) / 42.94967296))) : 0)
+#define NTP64asDOUBLE(n)                                                                           \
+        (double)(((uint64_t)n) ? (ntohl(L32(n)) - EPOCHDIFF) +                                         \
+                                                                 (.00000001 * (0.5 + (double)(ntohl(R32(n)) / 42.94967296)))       \
+                                                   : 0)
 
 /* convert a struct timeval to a double */
-#define TVasDOUBLE(x) (double)(x.tv_sec + (0.000001 * x.tv_usec))
+static double TVasDOUBLE(struct timeval time) {
+        return ((double)time.tv_sec + (0.000001 * (double)time.tv_usec));
+}
 
 /* convert an ntp 64-bit fp number to a struct timeval */
-#define NTP64toTV(n, t)                                                                                                                    \
-        do {                                                                                                                                   \
-                if (!n)                                                                                                                            \
-                        t.tv_sec = t.tv_usec = 0;                                                                                                      \
-                else {                                                                                                                             \
-                        t.tv_sec = ntohl(L32(n)) - EPOCHDIFF;                                                                                          \
-                        t.tv_usec = (int)(0.5 + (double)(ntohl(R32(n)) / 4294.967296));                                                                \
-                }                                                                                                                                  \
+#define NTP64toTV(n, t)                                                                            \
+        do {                                                                                           \
+                if (!n)                                                                                    \
+                        t.tv_sec = t.tv_usec = 0;                                                              \
+                else {                                                                                     \
+                        t.tv_sec = ntohl(L32(n)) - EPOCHDIFF;                                                  \
+                        t.tv_usec = (int)(0.5 + (double)(ntohl(R32(n)) / 4294.967296));                        \
+                }                                                                                          \
         } while (0)
 
 /* convert a struct timeval to an ntp 64-bit fp number */
-#define TVtoNTP64(t, n)                                                                                                                    \
-        do {                                                                                                                                   \
-                if (!t.tv_usec && !t.tv_sec)                                                                                                       \
-                        n = 0x0UL;                                                                                                                     \
-                else {                                                                                                                             \
-                        L32(n) = htonl(t.tv_sec + EPOCHDIFF);                                                                                          \
-                        R32(n) = htonl((uint64_t)((4294.967296 * t.tv_usec) + .5));                                                                    \
-                }                                                                                                                                  \
+#define TVtoNTP64(t, n)                                                                            \
+        do {                                                                                           \
+                if (!t.tv_usec && !t.tv_sec)                                                               \
+                        n = 0x0UL;                                                                             \
+                else {                                                                                     \
+                        L32(n) = htonl(t.tv_sec + EPOCHDIFF);                                                  \
+                        R32(n) = htonl((uint64_t)((4294.967296 * t.tv_usec) + .5));                            \
+                }                                                                                          \
         } while (0)
 
 /* NTP control message header is 12 bytes, plus any data in the data
@@ -197,15 +202,15 @@ typedef struct {
 #define SIZEOF_NTPCM(m) (12 + ntohs(m.count) + ((m.count) ? 4 - (ntohs(m.count) % 4) : 0))
 
 /* finally, a little helper or two for debugging: */
-#define DBG(x)                                                                                                                             \
-        do {                                                                                                                                   \
-                if (verbose > 1) {                                                                                                                 \
-                        x;                                                                                                                             \
-                }                                                                                                                                  \
+#define DBG(x)                                                                                     \
+        do {                                                                                           \
+                if (verbose > 1) {                                                                         \
+                        x;                                                                                     \
+                }                                                                                          \
         } while (0);
-#define PRINTSOCKADDR(x)                                                                                                                   \
-        do {                                                                                                                                   \
-                printf("%u.%u.%u.%u", (x >> 24) & 0xff, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);                                              \
+#define PRINTSOCKADDR(x)                                                                           \
+        do {                                                                                           \
+                printf("%u.%u.%u.%u", (x >> 24) & 0xff, (x >> 16) & 0xff, (x >> 8) & 0xff, x & 0xff);      \
         } while (0);
 
 /* calculate the offset of the local clock */
@@ -260,8 +265,8 @@ void setup_request(ntp_message *message) {
 /* select the "best" server from a list of servers, and return its index.
  * this is done by filtering servers based on stratum, dispersion, and
  * finally round-trip delay. */
-int best_offset_server(const ntp_server_results *slist, int nservers) {
-        int best_server = -1;
+static int best_offset_server(const ntp_server_results *slist, int nservers) {
+        int best_server_index = -1;
 
         /* for each server */
         for (int cserver = 0; cserver < nservers; cserver++) {
@@ -284,33 +289,33 @@ int best_offset_server(const ntp_server_results *slist, int nservers) {
                 }
 
                 /* If we don't have a server yet, use the first one */
-                if (best_server == -1) {
-                        best_server = cserver;
-                        DBG(printf("using peer %d as our first candidate\n", best_server));
+                if (best_server_index == -1) {
+                        best_server_index = cserver;
+                        DBG(printf("using peer %d as our first candidate\n", best_server_index));
                         continue;
                 }
 
                 /* compare the server to the best one we've seen so far */
                 /* does it have an equal or better stratum? */
-                DBG(printf("comparing peer %d with peer %d\n", cserver, best_server));
-                if (slist[cserver].stratum <= slist[best_server].stratum) {
-                        DBG(printf("stratum for peer %d <= peer %d\n", cserver, best_server));
+                DBG(printf("comparing peer %d with peer %d\n", cserver, best_server_index));
+                if (slist[cserver].stratum <= slist[best_server_index].stratum) {
+                        DBG(printf("stratum for peer %d <= peer %d\n", cserver, best_server_index));
                         /* does it have an equal or better dispersion? */
-                        if (slist[cserver].rtdisp <= slist[best_server].rtdisp) {
-                                DBG(printf("dispersion for peer %d <= peer %d\n", cserver, best_server));
+                        if (slist[cserver].rtdisp <= slist[best_server_index].rtdisp) {
+                                DBG(printf("dispersion for peer %d <= peer %d\n", cserver, best_server_index));
                                 /* does it have a better rtdelay? */
-                                if (slist[cserver].rtdelay < slist[best_server].rtdelay) {
-                                        DBG(printf("rtdelay for peer %d < peer %d\n", cserver, best_server));
-                                        best_server = cserver;
-                                        DBG(printf("peer %d is now our best candidate\n", best_server));
+                                if (slist[cserver].rtdelay < slist[best_server_index].rtdelay) {
+                                        DBG(printf("rtdelay for peer %d < peer %d\n", cserver, best_server_index));
+                                        best_server_index = cserver;
+                                        DBG(printf("peer %d is now our best candidate\n", best_server_index));
                                 }
                         }
                 }
         }
 
-        if (best_server >= 0) {
-                DBG(printf("best server selected: peer %d\n", best_server));
-                return best_server;
+        if (best_server_index >= 0) {
+                DBG(printf("best server selected: peer %d\n", best_server_index));
+                return best_server_index;
         }
         DBG(printf("no peers meeting synchronization criteria :(\n"));
         return -1;
@@ -321,7 +326,11 @@ int best_offset_server(const ntp_server_results *slist, int nservers) {
  *   we don't waste time sitting around waiting for single packets.
  * - we also "manually" handle resolving host names and connecting, because
  *   we have to do it in a way that our lazy macros don't handle currently :( */
-double offset_request(const char *host, const char *port, mp_state_enum *status, int time_offset) {
+typedef struct {
+        mp_state_enum offset_result;
+        double offset;
+} offset_request_wrapper;
+static offset_request_wrapper offset_request(const char *host, const char *port, int time_offset) {
         /* setup hints to only return results from getaddrinfo that we'd like */
         struct addrinfo hints;
         memset(&hints, 0, sizeof(struct addrinfo));
@@ -329,17 +338,25 @@ double offset_request(const char *host, const char *port, mp_state_enum *status,
         hints.ai_protocol = IPPROTO_UDP;
         hints.ai_socktype = SOCK_DGRAM;
 
-        /* fill in ai with the list of hosts resolved by the host name */
+        bool is_socket;
         struct addrinfo *addresses = NULL;
-        int ga_result = getaddrinfo(host, port, &hints, &addresses);
-        if (ga_result != 0) {
-                die(STATE_UNKNOWN, "error getting address for %s: %s\n", host, gai_strerror(ga_result));
-        }
-
-        /* count the number of returned hosts, and allocate stuff accordingly */
         size_t num_hosts = 0;
-        for (struct addrinfo *ai_tmp = addresses; ai_tmp != NULL; ai_tmp = ai_tmp->ai_next) {
-                num_hosts++;
+        if (host[0] == '/') {
+                num_hosts = 1;
+                is_socket = true;
+        } else {
+                is_socket = false;
+
+                /* fill in ai with the list of hosts resolved by the host name */
+                int ga_result = getaddrinfo(host, port, &hints, &addresses);
+                if (ga_result != 0) {
+                        die(STATE_UNKNOWN, "error getting address for %s: %s\n", host, gai_strerror(ga_result));
+                }
+
+                /* count the number of returned hosts, and allocate stuff accordingly */
+                for (struct addrinfo *ai_tmp = addresses; ai_tmp != NULL; ai_tmp = ai_tmp->ai_next) {
+                        num_hosts++;
+                }
         }
 
         ntp_message *req = (ntp_message *)malloc(sizeof(ntp_message) * num_hosts);
@@ -358,7 +375,8 @@ double offset_request(const char *host, const char *port, mp_state_enum *status,
                 die(STATE_UNKNOWN, "can not allocate socket array");
         }
 
-        ntp_server_results *servers = (ntp_server_results *)malloc(sizeof(ntp_server_results) * num_hosts);
+        ntp_server_results *servers =
+                (ntp_server_results *)malloc(sizeof(ntp_server_results) * num_hosts);
         if (servers == NULL) {
                 die(STATE_UNKNOWN, "can not allocate server array");
         }
@@ -366,25 +384,51 @@ double offset_request(const char *host, const char *port, mp_state_enum *status,
         DBG(printf("Found %zu peers to check\n", num_hosts));
 
         /* setup each socket for writing, and the corresponding struct pollfd */
-        struct addrinfo *ai_tmp = addresses;
-        for (int i = 0; ai_tmp; i++) {
-                socklist[i] = socket(ai_tmp->ai_family, SOCK_DGRAM, IPPROTO_UDP);
-                if (socklist[i] == -1) {
-                        perror(NULL);
-                        die(STATE_UNKNOWN, "can not create new socket");
+        if (is_socket) {
+                socklist[0] = socket(AF_UNIX, SOCK_STREAM, 0);
+                if (socklist[0] == -1) {
+                        DBG(printf("can't create socket: %s\n", strerror(errno)));
+                        die(STATE_UNKNOWN, "can not create new socket\n");
                 }
-                if (connect(socklist[i], ai_tmp->ai_addr, ai_tmp->ai_addrlen)) {
+
+                struct sockaddr_un unix_socket = {
+                        .sun_family = AF_UNIX,
+                };
+
+                strncpy(unix_socket.sun_path, host, strlen(host));
+
+                if (connect(socklist[0], &unix_socket, sizeof(unix_socket))) {
                         /* don't die here, because it is enough if there is one server
                            answering in time. This also would break for dual ipv4/6 stacked
                            ntp servers when the client only supports on of them.
                          */
-                        DBG(printf("can't create socket connection on peer %i: %s\n", i, strerror(errno)));
+                        DBG(printf("can't create socket connection on peer %i: %s\n", 0, strerror(errno)));
                 } else {
-                        ufds[i].fd = socklist[i];
-                        ufds[i].events = POLLIN;
-                        ufds[i].revents = 0;
+                        ufds[0].fd = socklist[0];
+                        ufds[0].events = POLLIN;
+                        ufds[0].revents = 0;
+                }
+        } else {
+                struct addrinfo *ai_tmp = addresses;
+                for (int i = 0; ai_tmp; i++) {
+                        socklist[i] = socket(ai_tmp->ai_family, SOCK_DGRAM, IPPROTO_UDP);
+                        if (socklist[i] == -1) {
+                                perror(NULL);
+                                die(STATE_UNKNOWN, "can not create new socket");
+                        }
+                        if (connect(socklist[i], ai_tmp->ai_addr, ai_tmp->ai_addrlen)) {
+                                /* don't die here, because it is enough if there is one server
+                                   answering in time. This also would break for dual ipv4/6 stacked
+                                   ntp servers when the client only supports on of them.
+                                 */
+                                DBG(printf("can't create socket connection on peer %i: %s\n", i, strerror(errno)));
+                        } else {
+                                ufds[i].fd = socklist[i];
+                                ufds[i].events = POLLIN;
+                                ufds[i].revents = 0;
+                        }
+                        ai_tmp = ai_tmp->ai_next;
                 }
-                ai_tmp = ai_tmp->ai_next;
         }
 
         /* now do AVG_NUM checks to each host. We stop before timeout/2 seconds
@@ -459,12 +503,18 @@ double offset_request(const char *host, const char *port, mp_state_enum *status,
                 die(STATE_CRITICAL, "NTP CRITICAL: No response from NTP server\n");
         }
 
+        offset_request_wrapper result = {
+                .offset = 0,
+                .offset_result = STATE_UNKNOWN,
+        };
+
         /* now, pick the best server from the list */
         double avg_offset = 0.;
         int best_index = best_offset_server(servers, num_hosts);
         if (best_index < 0) {
-                *status = STATE_UNKNOWN;
+                result.offset_result = STATE_UNKNOWN;
         } else {
+                result.offset_result = STATE_OK;
                 /* finally, calculate the average offset */
                 for (int i = 0; i < servers[best_index].num_responses; i++) {
                         avg_offset += servers[best_index].offset[i];
@@ -485,22 +535,30 @@ double offset_request(const char *host, const char *port, mp_state_enum *status,
         if (verbose) {
                 printf("overall average offset: %.10g\n", avg_offset);
         }
-        return avg_offset;
+
+        result.offset = avg_offset;
+        return result;
 }
 
-check_ntp_time_config_wrapper process_arguments(int argc, char **argv) {
+static check_ntp_time_config_wrapper process_arguments(int argc, char **argv) {
+
+        enum {
+                output_format_index = CHAR_MAX + 1,
+        };
+
         static struct option longopts[] = {{"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
                                                                            {"verbose", no_argument, 0, 'v'},
                                                                            {"use-ipv4", no_argument, 0, '4'},
                                                                            {"use-ipv6", no_argument, 0, '6'},
                                                                            {"quiet", no_argument, 0, 'q'},
-                                                                           {"time-offset", optional_argument, 0, 'o'},
+                                                                           {"time-offset", required_argument, 0, 'o'},
                                                                            {"warning", required_argument, 0, 'w'},
                                                                            {"critical", required_argument, 0, 'c'},
                                                                            {"timeout", required_argument, 0, 't'},
                                                                            {"hostname", required_argument, 0, 'H'},
                                                                            {"port", required_argument, 0, 'p'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
         if (argc < 2) {
@@ -512,9 +570,6 @@ check_ntp_time_config_wrapper process_arguments(int argc, char **argv) {
                 .config = check_ntp_time_config_init(),
         };
 
-        char *owarn = "60";
-        char *ocrit = "120";
-
         while (true) {
                 int option = 0;
                 int option_char = getopt_long(argc, argv, "Vhv46qw:c:t:H:p:o:", longopts, &option);
@@ -523,6 +578,17 @@ check_ntp_time_config_wrapper process_arguments(int argc, char **argv) {
                 }
 
                 switch (option_char) {
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 case 'h':
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -537,14 +603,26 @@ check_ntp_time_config_wrapper process_arguments(int argc, char **argv) {
                 case 'q':
                         result.config.quiet = true;
                         break;
-                case 'w':
-                        owarn = optarg;
-                        break;
-                case 'c':
-                        ocrit = optarg;
-                        break;
+                case 'w': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning threshold");
+                        }
+
+                        result.config.offset_thresholds =
+                                mp_thresholds_set_warn(result.config.offset_thresholds, tmp.range);
+                } break;
+                case 'c': {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse crit threshold");
+                        }
+
+                        result.config.offset_thresholds =
+                                mp_thresholds_set_crit(result.config.offset_thresholds, tmp.range);
+                } break;
                 case 'H':
-                        if (!is_host(optarg)) {
+                        if (!is_host(optarg) && (optarg[0] != '/')) {
                                 usage2(_("Invalid hostname/address"), optarg);
                         }
                         result.config.server_address = strdup(optarg);
@@ -579,16 +657,9 @@ check_ntp_time_config_wrapper process_arguments(int argc, char **argv) {
                 usage4(_("Hostname was not supplied"));
         }
 
-        set_thresholds(&result.config.offset_thresholds, owarn, ocrit);
-
         return result;
 }
 
-char *perfd_offset(double offset, thresholds *offset_thresholds) {
-        return fperfdata("offset", offset, "s", true, offset_thresholds->warning->end, true, offset_thresholds->critical->end, false, 0, false,
-                                         0);
-}
-
 int main(int argc, char *argv[]) {
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
@@ -605,51 +676,47 @@ int main(int argc, char *argv[]) {
 
         const check_ntp_time_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* initialize alarm signal handling */
         signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
         alarm(socket_timeout);
 
-        mp_state_enum offset_result = STATE_OK;
-        mp_state_enum result = STATE_OK;
-        double offset = offset_request(config.server_address, config.port, &offset_result, config.time_offset);
-        if (offset_result == STATE_UNKNOWN) {
-                result = ((!config.quiet) ? STATE_UNKNOWN : STATE_CRITICAL);
-        } else {
-                result = get_status(fabs(offset), config.offset_thresholds);
-        }
+        mp_check overall = mp_check_init();
 
-        char *result_line;
-        switch (result) {
-        case STATE_CRITICAL:
-                xasprintf(&result_line, _("NTP CRITICAL:"));
-                break;
-        case STATE_WARNING:
-                xasprintf(&result_line, _("NTP WARNING:"));
-                break;
-        case STATE_OK:
-                xasprintf(&result_line, _("NTP OK:"));
-                break;
-        default:
-                xasprintf(&result_line, _("NTP UNKNOWN:"));
-                break;
-        }
+        mp_subcheck sc_offset = mp_subcheck_init();
+        offset_request_wrapper offset_result =
+                offset_request(config.server_address, config.port, config.time_offset);
 
-        char *perfdata_line;
-        if (offset_result == STATE_UNKNOWN) {
-                xasprintf(&result_line, "%s %s", result_line, _("Offset unknown"));
-                xasprintf(&perfdata_line, "");
-        } else {
-                xasprintf(&result_line, "%s %s %.10g secs", result_line, _("Offset"), offset);
-                xasprintf(&perfdata_line, "%s", perfd_offset(offset, config.offset_thresholds));
+        if (offset_result.offset_result == STATE_UNKNOWN) {
+                sc_offset =
+                        mp_set_subcheck_state(sc_offset, (!config.quiet) ? STATE_UNKNOWN : STATE_CRITICAL);
+                xasprintf(&sc_offset.output, "Offset unknown");
+                mp_add_subcheck_to_check(&overall, sc_offset);
+                mp_exit(overall);
         }
-        printf("%s|%s\n", result_line, perfdata_line);
+
+        xasprintf(&sc_offset.output, "Offset: %.6fs", offset_result.offset);
+
+        mp_perfdata pd_offset = perfdata_init();
+        pd_offset = mp_set_pd_value(pd_offset, fabs(offset_result.offset));
+        pd_offset.label = "offset";
+        pd_offset.uom = "s";
+        pd_offset = mp_pd_set_thresholds(pd_offset, config.offset_thresholds);
+
+        sc_offset = mp_set_subcheck_state(sc_offset, mp_get_pd_status(pd_offset));
+
+        mp_add_perfdata_to_subcheck(&sc_offset, pd_offset);
+        mp_add_subcheck_to_check(&overall, sc_offset);
 
         if (config.server_address != NULL) {
                 free(config.server_address);
         }
-        exit(result);
+        mp_exit(overall);
 }
 
 void print_help(void) {
@@ -673,10 +740,11 @@ void print_help(void) {
         printf("    %s\n", _("Offset to result in warning status (seconds)"));
         printf(" %s\n", "-c, --critical=THRESHOLD");
         printf("    %s\n", _("Offset to result in critical status (seconds)"));
-        printf(" %s\n", "-o, --time_offset=INTEGER");
+        printf(" %s\n", "-o, --time-offset=INTEGER");
         printf("    %s\n", _("Expected offset of the ntp server relative to local server (seconds)"));
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
         printf(UT_VERBOSE);
+        printf(UT_OUTPUT_FORMAT);
 
         printf("\n");
         printf("%s\n", _("This plugin checks the clock offset between the local host and a"));
@@ -701,5 +769,6 @@ void print_help(void) {
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-v verbose] [-o <time offset>]\n", progname);
+        printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-v verbose] [-o <time offset>]\n",
+                   progname);
 }
diff --git a/plugins/check_ntp_time.d/config.h b/plugins/check_ntp_time.d/config.h
index 99dabbbd..9bbd82aa 100644
--- a/plugins/check_ntp_time.d/config.h
+++ b/plugins/check_ntp_time.d/config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
 #include "thresholds.h"
 #include <stddef.h>
 
@@ -11,7 +12,10 @@ typedef struct {
         bool quiet;
         int time_offset;
 
-        thresholds *offset_thresholds;
+        mp_thresholds offset_thresholds;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_ntp_time_config;
 
 check_ntp_time_config check_ntp_time_config_init() {
@@ -22,7 +26,18 @@ check_ntp_time_config check_ntp_time_config_init() {
                 .quiet = false,
                 .time_offset = 0,
 
-                .offset_thresholds = NULL,
+                .offset_thresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
+
+        mp_range warning = mp_range_init();
+        warning = mp_range_set_end(warning, mp_create_pd_value(60));
+        tmp.offset_thresholds = mp_thresholds_set_warn(tmp.offset_thresholds, warning);
+
+        mp_range critical = mp_range_init();
+        critical = mp_range_set_end(warning, mp_create_pd_value(120));
+        tmp.offset_thresholds = mp_thresholds_set_crit(tmp.offset_thresholds, critical);
+
         return tmp;
 }
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
deleted file mode 100644
index 176dfbc8..00000000
--- a/plugins/check_nwstat.c
+++ /dev/null
@@ -1,1527 +0,0 @@
-/*****************************************************************************
- *
- * Monitoring check_nwstat plugin
- *
- * License: GPL
- * Copyright (c) 2000-2024 Monitoring Plugins Development Team
- *
- * Description:
- *
- * This file contains the check_nwstat plugin
- *
- * This plugin attempts to contact the MRTGEXT NLM running on a
- * Novell server to gather the requested system information.
- *
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- *****************************************************************************/
-
-const char *progname = "check_nwstat";
-const char *copyright = "2000-2024";
-const char *email = "devel@monitoring-plugins.org";
-
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-
-enum checkvar {
-        NONE,
-        LOAD1,      /* check 1 minute CPU load */
-        LOAD5,      /* check 5 minute CPU load */
-        LOAD15,     /* check 15 minute CPU load */
-        CONNS,      /* check number of connections */
-        VPF,        /* check % free space on volume */
-        VMF,        /* check MB free space on volume */
-        VMU,        /* check MB used space on volume */
-        VPU,        /* check % used space on volume */
-        VMP,        /* check MB purgeable space on volume */
-        VKF,        /* check KB free space on volume */
-        LTCH,       /* check long-term cache hit percentage */
-        CBUFF,      /* check total cache buffers */
-        CDBUFF,     /* check dirty cache buffers */
-        LRUM,       /* check LRU sitting time in minutes */
-        DSDB,       /* check to see if DS Database is open */
-        LOGINS,     /* check to see if logins are enabled */
-        NRMH,       /* check to see NRM Health Status */
-        PUPRB,      /* check % of used packet receive buffers */
-        UPRB,       /* check used packet receive buffers */
-        SAPENTRIES, /* check SAP entries */
-        OFILES,     /* check number of open files */
-        VKP,        /* check KB purgeable space on volume */
-        VPP,        /* check % purgeable space on volume */
-        VKNP,       /* check KB not yet purgeable space on volume */
-        VPNP,       /* check % not yet purgeable space on volume */
-        ABENDS,     /* check abended thread count */
-        CSPROCS,    /* check number of current service processes */
-        TSYNC,      /* check timesync status 0=no 1=yes in sync to the network */
-        LRUS,       /* check LRU sitting time in seconds */
-        DCB,        /* check dirty cache buffers as a percentage of the total */
-        TCB,        /* check total cache buffers as a percentage of the original */
-        DSVER,      /* check NDS version */
-        UPTIME,     /* check server uptime */
-        NLM,        /* check NLM loaded */
-        NRMP,       /* check NRM Process Values */
-        NRMM,       /* check NRM Memory Values */
-        NRMS,       /* check NRM Values */
-        NSS1,       /* check Statistics from _Admin:Manage_NSS\GeneralStats.xml */
-        NSS2,       /* check Statistics from _Admin:Manage_NSS\BufferCache.xml */
-        NSS3,       /* check statistics from _Admin:Manage_NSS\NameCache.xml */
-        NSS4,       /* check statistics from _Admin:Manage_NSS\FileStats.xml */
-        NSS5,       /* check statistics from _Admin:Manage_NSS\ObjectCache.xml */
-        NSS6,       /* check statistics from _Admin:Manage_NSS\Thread.xml */
-        NSS7        /* check statistics from _Admin:Manage_NSS\AuthorizationCache.xml */
-};
-
-enum {
-        PORT = 9999
-};
-
-static char *server_address = NULL;
-static char *volume_name = NULL;
-static char *nlm_name = NULL;
-static char *nrmp_name = NULL;
-static char *nrmm_name = NULL;
-static char *nrms_name = NULL;
-static char *nss1_name = NULL;
-static char *nss2_name = NULL;
-static char *nss3_name = NULL;
-static char *nss4_name = NULL;
-static char *nss5_name = NULL;
-static char *nss6_name = NULL;
-static char *nss7_name = NULL;
-static int server_port = PORT;
-static unsigned long warning_value = 0L;
-static unsigned long critical_value = 0L;
-static bool check_warning_value = false;
-static bool check_critical_value = false;
-static bool check_netware_version = false;
-static enum checkvar vars_to_check = NONE;
-static int sap_number = -1;
-
-static int process_arguments(int /*argc*/, char ** /*argv*/);
-static void print_help(void);
-void print_usage(void);
-
-int main(int argc, char **argv) {
-        int result = STATE_UNKNOWN;
-        int sd;
-        char *send_buffer = NULL;
-        char recv_buffer[MAX_INPUT_BUFFER];
-        char *output_message = NULL;
-        char *temp_buffer = NULL;
-        char *netware_version = NULL;
-
-        int time_sync_status = 0;
-        int nrm_health_status = 0;
-        unsigned long total_cache_buffers = 0;
-        unsigned long dirty_cache_buffers = 0;
-        unsigned long open_files = 0;
-        unsigned long abended_threads = 0;
-        unsigned long max_service_processes = 0;
-        unsigned long current_service_processes = 0;
-        unsigned long free_disk_space = 0L;
-        unsigned long nrmp_value = 0L;
-        unsigned long nrmm_value = 0L;
-        unsigned long nrms_value = 0L;
-        unsigned long nss1_value = 0L;
-        unsigned long nss2_value = 0L;
-        unsigned long nss3_value = 0L;
-        unsigned long nss4_value = 0L;
-        unsigned long nss5_value = 0L;
-        unsigned long nss6_value = 0L;
-        unsigned long nss7_value = 0L;
-        unsigned long total_disk_space = 0L;
-        unsigned long used_disk_space = 0L;
-        unsigned long percent_used_disk_space = 0L;
-        unsigned long purgeable_disk_space = 0L;
-        unsigned long non_purgeable_disk_space = 0L;
-        unsigned long percent_free_space = 0;
-        unsigned long percent_purgeable_space = 0;
-        unsigned long percent_non_purgeable_space = 0;
-        unsigned long current_connections = 0L;
-        unsigned long utilization = 0L;
-        unsigned long cache_hits = 0;
-        unsigned long cache_buffers = 0L;
-        unsigned long lru_time = 0L;
-        unsigned long max_packet_receive_buffers = 0;
-        unsigned long used_packet_receive_buffers = 0;
-        unsigned long percent_used_packet_receive_buffers = 0L;
-        unsigned long sap_entries = 0;
-        char uptime[MAX_INPUT_BUFFER];
-
-        setlocale(LC_ALL, "");
-        bindtextdomain(PACKAGE, LOCALEDIR);
-        textdomain(PACKAGE);
-
-        /* Parse extra opts if any */
-        argv = np_extra_opts(&argc, argv, progname);
-
-        if (process_arguments(argc, argv) == ERROR)
-                usage4(_("Could not parse arguments"));
-
-        /* initialize alarm signal handling */
-        signal(SIGALRM, socket_timeout_alarm_handler);
-
-        /* set socket timeout */
-        alarm(socket_timeout);
-
-        /* open connection */
-        my_tcp_connect(server_address, server_port, &sd);
-
-        /* get OS version string */
-        if (check_netware_version) {
-                send_buffer = strdup("S19\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                if (!strcmp(recv_buffer, "-1\n"))
-                        netware_version = strdup("");
-                else {
-                        recv_buffer[strlen(recv_buffer) - 1] = 0;
-                        xasprintf(&netware_version, _("NetWare %s: "), recv_buffer);
-                }
-        } else
-                netware_version = strdup("");
-
-        /* check CPU load */
-        if (vars_to_check == LOAD1 || vars_to_check == LOAD5 || vars_to_check == LOAD15) {
-
-                switch (vars_to_check) {
-                case LOAD1:
-                        temp_buffer = strdup("1");
-                        break;
-                case LOAD5:
-                        temp_buffer = strdup("5");
-                        break;
-                default:
-                        temp_buffer = strdup("15");
-                        break;
-                }
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "UTIL%s\r\n", temp_buffer);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                utilization = strtoul(recv_buffer, NULL, 10);
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("UPTIME\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                recv_buffer[strlen(recv_buffer) - 1] = 0;
-                sprintf(uptime, _("Up %s,"), recv_buffer);
-
-                if (check_critical_value && utilization >= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && utilization >= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("Load %s - %s %s-min load average = %lu%%|load%s=%lu;%lu;%lu;0;100"), state_text(result), uptime,
-                                  temp_buffer, utilization, temp_buffer, utilization, warning_value, critical_value);
-
-                /* check number of user connections */
-        } else if (vars_to_check == CONNS) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("CONNECT\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                current_connections = strtoul(recv_buffer, NULL, 10);
-
-                if (check_critical_value && current_connections >= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && current_connections >= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("Conns %s - %lu current connections|Conns=%lu;%lu;%lu;;"), state_text(result), current_connections,
-                                  current_connections, warning_value, critical_value);
-
-                /* check % long term cache hits */
-        } else if (vars_to_check == LTCH) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S1\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                cache_hits = atoi(recv_buffer);
-
-                if (check_critical_value && cache_hits <= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && cache_hits <= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("%s: Long term cache hits = %lu%%"), state_text(result), cache_hits);
-
-                /* check cache buffers */
-        } else if (vars_to_check == CBUFF) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S2\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                cache_buffers = strtoul(recv_buffer, NULL, 10);
-
-                if (check_critical_value && cache_buffers <= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && cache_buffers <= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("%s: Total cache buffers = %lu|Cachebuffers=%lu;%lu;%lu;;"), state_text(result), cache_buffers,
-                                  cache_buffers, warning_value, critical_value);
-
-                /* check dirty cache buffers */
-        } else if (vars_to_check == CDBUFF) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S3\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                cache_buffers = strtoul(recv_buffer, NULL, 10);
-
-                if (check_critical_value && cache_buffers >= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && cache_buffers >= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("%s: Dirty cache buffers = %lu|Dirty-Cache-Buffers=%lu;%lu;%lu;;"), state_text(result), cache_buffers,
-                                  cache_buffers, warning_value, critical_value);
-
-                /* check LRU sitting time in minutes */
-        } else if (vars_to_check == LRUM) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S5\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                lru_time = strtoul(recv_buffer, NULL, 10);
-
-                if (check_critical_value && lru_time <= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && lru_time <= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("%s: LRU sitting time = %lu minutes"), state_text(result), lru_time);
-
-                /* check KB free space on volume */
-        } else if (vars_to_check == VKF) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "VKF%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        free_disk_space = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && free_disk_space <= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && free_disk_space <= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s%lu KB free on volume %s|KBFree%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
-                                          free_disk_space, volume_name, volume_name, free_disk_space, warning_value, critical_value);
-                }
-
-                /* check MB free space on volume */
-        } else if (vars_to_check == VMF) {
-
-                xasprintf(&send_buffer, "VMF%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        free_disk_space = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && free_disk_space <= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && free_disk_space <= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s%lu MB free on volume %s|MBFree%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
-                                          free_disk_space, volume_name, volume_name, free_disk_space, warning_value, critical_value);
-                }
-                /* check MB used space on volume */
-        } else if (vars_to_check == VMU) {
-
-                xasprintf(&send_buffer, "VMU%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        free_disk_space = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && free_disk_space <= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && free_disk_space <= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s%lu MB used on volume %s|MBUsed%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
-                                          free_disk_space, volume_name, volume_name, free_disk_space, warning_value, critical_value);
-                }
-                /* check % used space on volume */
-        } else if (vars_to_check == VPU) {
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                asprintf(&send_buffer, "VMU%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        asprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-
-                } else {
-                        used_disk_space = strtoul(recv_buffer, NULL, 10);
-                        close(sd);
-                        my_tcp_connect(server_address, server_port, &sd);
-                        /* get total volume in MB */
-                        asprintf(&send_buffer, "VMS%s\r\n", volume_name);
-                        result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                        if (result != STATE_OK)
-                                return result;
-                        total_disk_space = strtoul(recv_buffer, NULL, 10);
-                        /* calculate percent used on volume */
-                        percent_used_disk_space = (unsigned long)(((double)used_disk_space / (double)total_disk_space) * 100.0);
-
-                        if (check_critical_value && percent_used_disk_space >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && percent_used_disk_space >= warning_value)
-                                result = STATE_WARNING;
-
-                        asprintf(&output_message, _("%lu MB (%lu%%) used on volume %s - total %lu MB|Used space in percent on %s=%lu;%lu;%lu;0;100"),
-                                         used_disk_space, percent_used_disk_space, volume_name, total_disk_space, volume_name, percent_used_disk_space,
-                                         warning_value, critical_value);
-                }
-
-                /* check % free space on volume */
-        } else if (vars_to_check == VPF) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "VKF%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-
-                } else {
-
-                        free_disk_space = strtoul(recv_buffer, NULL, 10);
-
-                        close(sd);
-                        my_tcp_connect(server_address, server_port, &sd);
-
-                        xasprintf(&send_buffer, "VKS%s\r\n", volume_name);
-                        result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                        if (result != STATE_OK)
-                                return result;
-                        total_disk_space = strtoul(recv_buffer, NULL, 10);
-
-                        percent_free_space = (unsigned long)(((double)free_disk_space / (double)total_disk_space) * 100.0);
-
-                        if (check_critical_value && percent_free_space <= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && percent_free_space <= warning_value)
-                                result = STATE_WARNING;
-                        free_disk_space /= 1024;
-                        total_disk_space /= 1024;
-                        xasprintf(&output_message, _("%lu MB (%lu%%) free on volume %s - total %lu MB|FreeMB%s=%lu;%lu;%lu;0;100"), free_disk_space,
-                                          percent_free_space, volume_name, total_disk_space, volume_name, percent_free_space, warning_value, critical_value);
-                }
-
-                /* check to see if DS Database is open or closed */
-        } else if (vars_to_check == DSDB) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S11\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                if (atoi(recv_buffer) == 1)
-                        result = STATE_OK;
-                else
-                        result = STATE_WARNING;
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S13\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                temp_buffer = strtok(recv_buffer, "\r\n");
-
-                xasprintf(&output_message, _("Directory Services Database is %s (DS version %s)"), (result == STATE_OK) ? "open" : "closed",
-                                  temp_buffer);
-
-                /* check to see if logins are enabled */
-        } else if (vars_to_check == LOGINS) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S12\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                if (atoi(recv_buffer) == 1)
-                        result = STATE_OK;
-                else
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("Logins are %s"), (result == STATE_OK) ? _("enabled") : _("disabled"));
-
-                /* check NRM Health Status Summary*/
-        } else if (vars_to_check == NRMH) {
-
-                xasprintf(&send_buffer, "NRMH\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                nrm_health_status = atoi(recv_buffer);
-
-                if (nrm_health_status == 2) {
-                        result = STATE_OK;
-                        xasprintf(&output_message, _("CRITICAL - NRM Status is bad!"));
-                } else {
-                        if (nrm_health_status == 1) {
-                                result = STATE_WARNING;
-                                xasprintf(&output_message, _("Warning - NRM Status is suspect!"));
-                        }
-
-                        xasprintf(&output_message, _("OK - NRM Status is good!"));
-                }
-
-                /* check packet receive buffers */
-        } else if (vars_to_check == UPRB || vars_to_check == PUPRB) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S15\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                used_packet_receive_buffers = atoi(recv_buffer);
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S16\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                max_packet_receive_buffers = atoi(recv_buffer);
-
-                percent_used_packet_receive_buffers =
-                        (unsigned long)(((double)used_packet_receive_buffers / (double)max_packet_receive_buffers) * 100.0);
-
-                if (vars_to_check == UPRB) {
-                        if (check_critical_value && used_packet_receive_buffers >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && used_packet_receive_buffers >= warning_value)
-                                result = STATE_WARNING;
-                } else {
-                        if (check_critical_value && percent_used_packet_receive_buffers >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && percent_used_packet_receive_buffers >= warning_value)
-                                result = STATE_WARNING;
-                }
-
-                xasprintf(&output_message, _("%lu of %lu (%lu%%) packet receive buffers used"), used_packet_receive_buffers,
-                                  max_packet_receive_buffers, percent_used_packet_receive_buffers);
-
-                /* check SAP table entries */
-        } else if (vars_to_check == SAPENTRIES) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                if (sap_number == -1)
-                        xasprintf(&send_buffer, "S9\r\n");
-                else
-                        xasprintf(&send_buffer, "S9.%d\r\n", sap_number);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                sap_entries = atoi(recv_buffer);
-
-                if (check_critical_value && sap_entries >= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && sap_entries >= warning_value)
-                        result = STATE_WARNING;
-
-                if (sap_number == -1)
-                        xasprintf(&output_message, _("%lu entries in SAP table"), sap_entries);
-                else
-                        xasprintf(&output_message, _("%lu entries in SAP table for SAP type %d"), sap_entries, sap_number);
-
-                /* check KB purgeable space on volume */
-        } else if (vars_to_check == VKP) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "VKP%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && purgeable_disk_space >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && purgeable_disk_space >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s%lu KB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
-                                          purgeable_disk_space, volume_name, volume_name, purgeable_disk_space, warning_value, critical_value);
-                }
-                /* check MB purgeable space on volume */
-        } else if (vars_to_check == VMP) {
-
-                xasprintf(&send_buffer, "VMP%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && purgeable_disk_space >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && purgeable_disk_space >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s%lu MB purgeable on volume %s|Purge%s=%lu;%lu;%lu;;"), (result == STATE_OK) ? "" : _("Only "),
-                                          purgeable_disk_space, volume_name, volume_name, purgeable_disk_space, warning_value, critical_value);
-                }
-
-                /* check % purgeable space on volume */
-        } else if (vars_to_check == VPP) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "VKP%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-
-                } else {
-
-                        purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
-
-                        close(sd);
-                        my_tcp_connect(server_address, server_port, &sd);
-
-                        xasprintf(&send_buffer, "VKS%s\r\n", volume_name);
-                        result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                        if (result != STATE_OK)
-                                return result;
-                        total_disk_space = strtoul(recv_buffer, NULL, 10);
-
-                        percent_purgeable_space = (unsigned long)(((double)purgeable_disk_space / (double)total_disk_space) * 100.0);
-
-                        if (check_critical_value && percent_purgeable_space >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && percent_purgeable_space >= warning_value)
-                                result = STATE_WARNING;
-                        purgeable_disk_space /= 1024;
-                        xasprintf(&output_message, _("%lu MB (%lu%%) purgeable on volume %s|Purgeable%s=%lu;%lu;%lu;0;100"), purgeable_disk_space,
-                                          percent_purgeable_space, volume_name, volume_name, percent_purgeable_space, warning_value, critical_value);
-                }
-
-                /* check KB not yet purgeable space on volume */
-        } else if (vars_to_check == VKNP) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "VKNP%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        non_purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && non_purgeable_disk_space >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && non_purgeable_disk_space >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s%lu KB not yet purgeable on volume %s"), (result == STATE_OK) ? "" : _("Only "),
-                                          non_purgeable_disk_space, volume_name);
-                }
-
-                /* check % not yet purgeable space on volume */
-        } else if (vars_to_check == VPNP) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "VKNP%s\r\n", volume_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-
-                        xasprintf(&output_message, _("CRITICAL - Volume '%s' does not exist!"), volume_name);
-                        result = STATE_CRITICAL;
-
-                } else {
-
-                        non_purgeable_disk_space = strtoul(recv_buffer, NULL, 10);
-
-                        close(sd);
-                        my_tcp_connect(server_address, server_port, &sd);
-
-                        xasprintf(&send_buffer, "VKS%s\r\n", volume_name);
-                        result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                        if (result != STATE_OK)
-                                return result;
-                        total_disk_space = strtoul(recv_buffer, NULL, 10);
-
-                        percent_non_purgeable_space = (unsigned long)(((double)non_purgeable_disk_space / (double)total_disk_space) * 100.0);
-
-                        if (check_critical_value && percent_non_purgeable_space >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && percent_non_purgeable_space >= warning_value)
-                                result = STATE_WARNING;
-                        purgeable_disk_space /= 1024;
-                        xasprintf(&output_message, _("%lu MB (%lu%%) not yet purgeable on volume %s"), non_purgeable_disk_space,
-                                          percent_non_purgeable_space, volume_name);
-                }
-
-                /* check # of open files */
-        } else if (vars_to_check == OFILES) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S18\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                open_files = atoi(recv_buffer);
-
-                if (check_critical_value && open_files >= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && open_files >= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("%lu open files|Openfiles=%lu;%lu;%lu;0,0"), open_files, open_files, warning_value, critical_value);
-
-                /* check # of abended threads (Netware > 5.x only) */
-        } else if (vars_to_check == ABENDS) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S17\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                abended_threads = atoi(recv_buffer);
-
-                if (check_critical_value && abended_threads >= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && abended_threads >= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("%lu abended threads|Abends=%lu;%lu;%lu;;"), abended_threads, abended_threads, warning_value,
-                                  critical_value);
-
-                /* check # of current service processes (Netware 5.x only) */
-        } else if (vars_to_check == CSPROCS) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S20\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                max_service_processes = atoi(recv_buffer);
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S21\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                current_service_processes = atoi(recv_buffer);
-
-                if (check_critical_value && current_service_processes >= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && current_service_processes >= warning_value)
-                        result = STATE_WARNING;
-
-                xasprintf(&output_message, _("%lu current service processes (%lu max)|Processes=%lu;%lu;%lu;0;%lu"), current_service_processes,
-                                  max_service_processes, current_service_processes, warning_value, critical_value, max_service_processes);
-
-                /* check # Timesync Status */
-        } else if (vars_to_check == TSYNC) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S22\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                time_sync_status = atoi(recv_buffer);
-
-                if (time_sync_status == 0) {
-                        result = STATE_CRITICAL;
-                        xasprintf(&output_message, _("CRITICAL - Time not in sync with network!"));
-                } else {
-                        xasprintf(&output_message, _("OK - Time in sync with network!"));
-                }
-
-                /* check LRU sitting time in secondss */
-        } else if (vars_to_check == LRUS) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S4\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                lru_time = strtoul(recv_buffer, NULL, 10);
-
-                if (check_critical_value && lru_time <= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && lru_time <= warning_value)
-                        result = STATE_WARNING;
-                xasprintf(&output_message, _("LRU sitting time = %lu seconds"), lru_time);
-
-                /* check % dirty cacheobuffers as a percentage of the total*/
-        } else if (vars_to_check == DCB) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S6\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                dirty_cache_buffers = atoi(recv_buffer);
-
-                if (check_critical_value && dirty_cache_buffers <= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && dirty_cache_buffers <= warning_value)
-                        result = STATE_WARNING;
-                xasprintf(&output_message, _("Dirty cache buffers = %lu%% of the total|DCB=%lu;%lu;%lu;0;100"), dirty_cache_buffers,
-                                  dirty_cache_buffers, warning_value, critical_value);
-
-                /* check % total cache buffers as a percentage of the original*/
-        } else if (vars_to_check == TCB) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                send_buffer = strdup("S7\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-                total_cache_buffers = atoi(recv_buffer);
-
-                if (check_critical_value && total_cache_buffers <= critical_value)
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && total_cache_buffers <= warning_value)
-                        result = STATE_WARNING;
-                xasprintf(&output_message, _("Total cache buffers = %lu%% of the original|TCB=%lu;%lu;%lu;0;100"), total_cache_buffers,
-                                  total_cache_buffers, warning_value, critical_value);
-
-        } else if (vars_to_check == DSVER) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S13\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                recv_buffer[strlen(recv_buffer) - 1] = 0;
-
-                xasprintf(&output_message, _("NDS Version %s"), recv_buffer);
-
-        } else if (vars_to_check == UPTIME) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "UPTIME\r\n");
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                recv_buffer[sizeof(recv_buffer) - 1] = 0;
-                recv_buffer[strlen(recv_buffer) - 1] = 0;
-
-                xasprintf(&output_message, _("Up %s"), recv_buffer);
-
-        } else if (vars_to_check == NLM) {
-
-                close(sd);
-                my_tcp_connect(server_address, server_port, &sd);
-
-                xasprintf(&send_buffer, "S24:%s\r\n", nlm_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                recv_buffer[strlen(recv_buffer) - 1] = 0;
-                if (strcmp(recv_buffer, "-1")) {
-                        xasprintf(&output_message, _("Module %s version %s is loaded"), nlm_name, recv_buffer);
-                } else {
-                        result = STATE_CRITICAL;
-                        xasprintf(&output_message, _("Module %s is not loaded"), nlm_name);
-                }
-        } else if (vars_to_check == NRMP) {
-
-                xasprintf(&send_buffer, "NRMP:%s\r\n", nrmp_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nrmp_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nrmp_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nrmp_value <= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nrmp_value <= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nrmp_name, nrmp_value, nrmp_name, nrmp_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NRMM) {
-
-                xasprintf(&send_buffer, "NRMM:%s\r\n", nrmm_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nrmm_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nrmm_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nrmm_value <= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nrmm_value <= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nrmm_name, nrmm_value, nrmm_name, nrmm_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NRMS) {
-
-                xasprintf(&send_buffer, "NRMS:%s\r\n", nrms_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nrms_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nrms_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nrms_value >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nrms_value >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nrms_name, nrms_value, nrms_name, nrms_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NSS1) {
-
-                xasprintf(&send_buffer, "NSS1:%s\r\n", nss1_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss1_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nss1_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nss1_value >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nss1_value >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss1_name, nss1_value, nss1_name, nss1_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NSS2) {
-
-                xasprintf(&send_buffer, "NSS2:%s\r\n", nss2_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss2_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nss2_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nss2_value >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nss2_value >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss2_name, nss2_value, nss2_name, nss2_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NSS3) {
-
-                xasprintf(&send_buffer, "NSS3:%s\r\n", nss3_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss3_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nss3_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nss3_value >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nss3_value >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss3_name, nss3_value, nss3_name, nss3_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NSS4) {
-
-                xasprintf(&send_buffer, "NSS4:%s\r\n", nss4_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss4_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nss4_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nss4_value >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nss4_value >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss4_name, nss4_value, nss4_name, nss4_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NSS5) {
-
-                xasprintf(&send_buffer, "NSS5:%s\r\n", nss5_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss5_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nss5_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nss5_value >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nss5_value >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss5_name, nss5_value, nss5_name, nss5_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NSS6) {
-
-                xasprintf(&send_buffer, "NSS6:%s\r\n", nss6_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss6_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nss6_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nss6_value >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nss6_value >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss6_name, nss6_value, nss6_name, nss6_value, warning_value,
-                                          critical_value);
-                }
-
-        } else if (vars_to_check == NSS7) {
-
-                xasprintf(&send_buffer, "NSS7:%s\r\n", nss7_name);
-                result = send_tcp_request(sd, send_buffer, recv_buffer, sizeof(recv_buffer));
-                if (result != STATE_OK)
-                        return result;
-
-                if (!strcmp(recv_buffer, "-1\n")) {
-                        xasprintf(&output_message, _("CRITICAL - Value '%s' does not exist!"), nss7_name);
-                        result = STATE_CRITICAL;
-                } else {
-                        nss7_value = strtoul(recv_buffer, NULL, 10);
-                        if (check_critical_value && nss7_value >= critical_value)
-                                result = STATE_CRITICAL;
-                        else if (check_warning_value && nss7_value >= warning_value)
-                                result = STATE_WARNING;
-                        xasprintf(&output_message, _("%s is  %lu|%s=%lu;%lu;%lu;;"), nss7_name, nss7_value, nss7_name, nss7_value, warning_value,
-                                          critical_value);
-                }
-
-        } else {
-
-                output_message = strdup(_("Nothing to check!\n"));
-                result = STATE_UNKNOWN;
-        }
-
-        close(sd);
-
-        /* reset timeout */
-        alarm(0);
-
-        printf("%s%s\n", netware_version, output_message);
-
-        return result;
-}
-
-/* process command-line arguments */
-int process_arguments(int argc, char **argv) {
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {{"port", required_argument, 0, 'p'},     {"timeout", required_argument, 0, 't'},
-                                                                           {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},
-                                                                           {"variable", required_argument, 0, 'v'}, {"hostname", required_argument, 0, 'H'},
-                                                                           {"osversion", no_argument, 0, 'o'},      {"version", no_argument, 0, 'V'},
-                                                                           {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
-
-        /* no options were supplied */
-        if (argc < 2)
-                return ERROR;
-
-        /* backwards compatibility */
-        if (!is_option(argv[1])) {
-                server_address = argv[1];
-                argv[1] = argv[0];
-                argv = &argv[1];
-                argc--;
-        }
-
-        for (c = 1; c < argc; c++) {
-                if (strcmp("-to", argv[c]) == 0)
-                        strcpy(argv[c], "-t");
-                else if (strcmp("-wv", argv[c]) == 0)
-                        strcpy(argv[c], "-w");
-                else if (strcmp("-cv", argv[c]) == 0)
-                        strcpy(argv[c], "-c");
-        }
-
-        while (1) {
-                c = getopt_long(argc, argv, "+hoVH:t:c:w:p:v:", longopts, &option);
-
-                if (c == -1 || c == EOF || c == 1)
-                        break;
-
-                switch (c) {
-                case '?': /* print short usage statement if args not parsable */
-                        usage5();
-                case 'h': /* help */
-                        print_help();
-                        exit(STATE_UNKNOWN);
-                case 'V': /* version */
-                        print_revision(progname, NP_VERSION);
-                        exit(STATE_UNKNOWN);
-                case 'H': /* hostname */
-                        server_address = optarg;
-                        break;
-                case 'o': /* display nos version */
-                        check_netware_version = true;
-                        break;
-                case 'p': /* port */
-                        if (is_intnonneg(optarg))
-                                server_port = atoi(optarg);
-                        else
-                                die(STATE_UNKNOWN, _("Server port an integer\n"));
-                        break;
-                case 'v':
-                        if (strlen(optarg) < 3)
-                                return ERROR;
-                        if (!strcmp(optarg, "LOAD1"))
-                                vars_to_check = LOAD1;
-                        else if (!strcmp(optarg, "LOAD5"))
-                                vars_to_check = LOAD5;
-                        else if (!strcmp(optarg, "LOAD15"))
-                                vars_to_check = LOAD15;
-                        else if (!strcmp(optarg, "CONNS"))
-                                vars_to_check = CONNS;
-                        else if (!strcmp(optarg, "LTCH"))
-                                vars_to_check = LTCH;
-                        else if (!strcmp(optarg, "DCB"))
-                                vars_to_check = DCB;
-                        else if (!strcmp(optarg, "TCB"))
-                                vars_to_check = TCB;
-                        else if (!strcmp(optarg, "CBUFF"))
-                                vars_to_check = CBUFF;
-                        else if (!strcmp(optarg, "CDBUFF"))
-                                vars_to_check = CDBUFF;
-                        else if (!strcmp(optarg, "LRUM"))
-                                vars_to_check = LRUM;
-                        else if (!strcmp(optarg, "LRUS"))
-                                vars_to_check = LRUS;
-                        else if (strncmp(optarg, "VPF", 3) == 0) {
-                                vars_to_check = VPF;
-                                volume_name = strdup(optarg + 3);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (strncmp(optarg, "VKF", 3) == 0) {
-                                vars_to_check = VKF;
-                                volume_name = strdup(optarg + 3);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (strncmp(optarg, "VMF", 3) == 0) {
-                                vars_to_check = VMF;
-                                volume_name = strdup(optarg + 3);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (!strcmp(optarg, "DSDB"))
-                                vars_to_check = DSDB;
-                        else if (!strcmp(optarg, "LOGINS"))
-                                vars_to_check = LOGINS;
-                        else if (!strcmp(optarg, "NRMH"))
-                                vars_to_check = NRMH;
-                        else if (!strcmp(optarg, "UPRB"))
-                                vars_to_check = UPRB;
-                        else if (!strcmp(optarg, "PUPRB"))
-                                vars_to_check = PUPRB;
-                        else if (!strncmp(optarg, "SAPENTRIES", 10)) {
-                                vars_to_check = SAPENTRIES;
-                                if (strlen(optarg) > 10)
-                                        sap_number = atoi(optarg + 10);
-                                else
-                                        sap_number = -1;
-                        } else if (!strcmp(optarg, "OFILES"))
-                                vars_to_check = OFILES;
-                        else if (strncmp(optarg, "VKP", 3) == 0) {
-                                vars_to_check = VKP;
-                                volume_name = strdup(optarg + 3);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (strncmp(optarg, "VMP", 3) == 0) {
-                                vars_to_check = VMP;
-                                volume_name = strdup(optarg + 3);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (strncmp(optarg, "VMU", 3) == 0) {
-                                vars_to_check = VMU;
-                                volume_name = strdup(optarg + 3);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (strncmp(optarg, "VPU", 3) == 0) {
-                                vars_to_check = VPU;
-                                volume_name = strdup(optarg + 3);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (strncmp(optarg, "VPP", 3) == 0) {
-                                vars_to_check = VPP;
-                                volume_name = strdup(optarg + 3);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (strncmp(optarg, "VKNP", 4) == 0) {
-                                vars_to_check = VKNP;
-                                volume_name = strdup(optarg + 4);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (strncmp(optarg, "VPNP", 4) == 0) {
-                                vars_to_check = VPNP;
-                                volume_name = strdup(optarg + 4);
-                                if (!strcmp(volume_name, ""))
-                                        volume_name = strdup("SYS");
-                        } else if (!strcmp(optarg, "ABENDS"))
-                                vars_to_check = ABENDS;
-                        else if (!strcmp(optarg, "CSPROCS"))
-                                vars_to_check = CSPROCS;
-                        else if (!strcmp(optarg, "TSYNC"))
-                                vars_to_check = TSYNC;
-                        else if (!strcmp(optarg, "DSVER"))
-                                vars_to_check = DSVER;
-                        else if (!strcmp(optarg, "UPTIME")) {
-                                vars_to_check = UPTIME;
-                        } else if (strncmp(optarg, "NLM:", 4) == 0) {
-                                vars_to_check = NLM;
-                                nlm_name = strdup(optarg + 4);
-                        } else if (strncmp(optarg, "NRMP", 4) == 0) {
-                                vars_to_check = NRMP;
-                                nrmp_name = strdup(optarg + 4);
-                                if (!strcmp(nrmp_name, ""))
-                                        nrmp_name = strdup("AVAILABLE_MEMORY");
-                        } else if (strncmp(optarg, "NRMM", 4) == 0) {
-                                vars_to_check = NRMM;
-                                nrmm_name = strdup(optarg + 4);
-                                if (!strcmp(nrmm_name, ""))
-                                        nrmm_name = strdup("AVAILABLE_CACHE_MEMORY");
-
-                        }
-
-                        else if (strncmp(optarg, "NRMS", 4) == 0) {
-                                vars_to_check = NRMS;
-                                nrms_name = strdup(optarg + 4);
-                                if (!strcmp(nrms_name, ""))
-                                        nrms_name = strdup("USED_SWAP_SPACE");
-
-                        }
-
-                        else if (strncmp(optarg, "NSS1", 4) == 0) {
-                                vars_to_check = NSS1;
-                                nss1_name = strdup(optarg + 4);
-                                if (!strcmp(nss1_name, ""))
-                                        nss1_name = strdup("CURRENTBUFFERCACHESIZE");
-
-                        }
-
-                        else if (strncmp(optarg, "NSS2", 4) == 0) {
-                                vars_to_check = NSS2;
-                                nss2_name = strdup(optarg + 4);
-                                if (!strcmp(nss2_name, ""))
-                                        nss2_name = strdup("CACHEHITS");
-
-                        }
-
-                        else if (strncmp(optarg, "NSS3", 4) == 0) {
-                                vars_to_check = NSS3;
-                                nss3_name = strdup(optarg + 4);
-                                if (!strcmp(nss3_name, ""))
-                                        nss3_name = strdup("CACHEGITPERCENT");
-
-                        }
-
-                        else if (strncmp(optarg, "NSS4", 4) == 0) {
-                                vars_to_check = NSS4;
-                                nss4_name = strdup(optarg + 4);
-                                if (!strcmp(nss4_name, ""))
-                                        nss4_name = strdup("CURRENTOPENCOUNT");
-
-                        }
-
-                        else if (strncmp(optarg, "NSS5", 4) == 0) {
-                                vars_to_check = NSS5;
-                                nss5_name = strdup(optarg + 4);
-                                if (!strcmp(nss5_name, ""))
-                                        nss5_name = strdup("CACHEMISSES");
-
-                        }
-
-                        else if (strncmp(optarg, "NSS6", 4) == 0) {
-                                vars_to_check = NSS6;
-                                nss6_name = strdup(optarg + 4);
-                                if (!strcmp(nss6_name, ""))
-                                        nss6_name = strdup("PENDINGWORKSCOUNT");
-
-                        }
-
-                        else if (strncmp(optarg, "NSS7", 4) == 0) {
-                                vars_to_check = NSS7;
-                                nss7_name = strdup(optarg + 4);
-                                if (!strcmp(nss7_name, ""))
-                                        nss7_name = strdup("CACHESIZE");
-
-                        }
-
-                        else
-                                return ERROR;
-                        break;
-                case 'w': /* warning threshold */
-                        warning_value = strtoul(optarg, NULL, 10);
-                        check_warning_value = true;
-                        break;
-                case 'c': /* critical threshold */
-                        critical_value = strtoul(optarg, NULL, 10);
-                        check_critical_value = true;
-                        break;
-                case 't': /* timeout */
-                        socket_timeout = atoi(optarg);
-                        if (socket_timeout <= 0)
-                                return ERROR;
-                }
-        }
-
-        return OK;
-}
-
-void print_help(void) {
-        char *myport;
-        xasprintf(&myport, "%d", PORT);
-
-        print_revision(progname, NP_VERSION);
-
-        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf(COPYRIGHT, copyright, email);
-
-        printf("%s\n", _("This plugin attempts to contact the MRTGEXT NLM running on a"));
-        printf("%s\n", _("Novell server to gather the requested system information."));
-
-        printf("\n\n");
-
-        print_usage();
-
-        printf(UT_HELP_VRSN);
-        printf(UT_EXTRA_OPTS);
-
-        printf(UT_HOST_PORT, 'p', myport);
-
-        printf(" %s\n", "-v, --variable=STRING");
-        printf("   %s\n", _("Variable to check.  Valid variables include:"));
-        printf("    %s\n", _("LOAD1     = 1 minute average CPU load"));
-        printf("    %s\n", _("LOAD5     = 5 minute average CPU load"));
-        printf("    %s\n", _("LOAD15    = 15 minute average CPU load"));
-        printf("    %s\n", _("CSPROCS   = number of current service processes (NW 5.x only)"));
-        printf("    %s\n", _("ABENDS    = number of abended threads (NW 5.x only)"));
-        printf("    %s\n", _("UPTIME    = server uptime"));
-        printf("    %s\n", _("LTCH      = percent long term cache hits"));
-        printf("    %s\n", _("CBUFF     = current number of cache buffers"));
-        printf("    %s\n", _("CDBUFF    = current number of dirty cache buffers"));
-        printf("    %s\n", _("DCB       = dirty cache buffers as a percentage of the total"));
-        printf("    %s\n", _("TCB       = dirty cache buffers as a percentage of the original"));
-        printf("    %s\n", _("OFILES    = number of open files"));
-        printf("    %s\n", _("    VMF<vol>  = MB of free space on Volume <vol>"));
-        printf("    %s\n", _("    VMU<vol>  = MB used space on Volume <vol>"));
-        printf("    %s\n", _("    VPU<vol>  = percent used space on Volume <vol>"));
-        printf("    %s\n", _("    VMP<vol>  = MB of purgeable space on Volume <vol>"));
-        printf("    %s\n", _("    VPF<vol>  = percent free space on volume <vol>"));
-        printf("    %s\n", _("    VKF<vol>  = KB of free space on volume <vol>"));
-        printf("    %s\n", _("    VPP<vol>  = percent purgeable space on volume <vol>"));
-        printf("    %s\n", _("    VKP<vol>  = KB of purgeable space on volume <vol>"));
-        printf("    %s\n", _("    VPNP<vol> = percent not yet purgeable space on volume <vol>"));
-        printf("    %s\n", _("    VKNP<vol> = KB of not yet purgeable space on volume <vol>"));
-        printf("    %s\n", _("    LRUM      = LRU sitting time in minutes"));
-        printf("    %s\n", _("    LRUS      = LRU sitting time in seconds"));
-        printf("    %s\n", _("    DSDB      = check to see if DS Database is open"));
-        printf("    %s\n", _("    DSVER     = NDS version"));
-        printf("    %s\n", _("    UPRB      = used packet receive buffers"));
-        printf("    %s\n", _("    PUPRB     = percent (of max) used packet receive buffers"));
-        printf("    %s\n", _("    SAPENTRIES = number of entries in the SAP table"));
-        printf("    %s\n", _("    SAPENTRIES<n> = number of entries in the SAP table for SAP type <n>"));
-        printf("    %s\n", _("    TSYNC     = timesync status"));
-        printf("    %s\n", _("    LOGINS    = check to see if logins are enabled"));
-        printf("    %s\n", _("    CONNS     = number of currently licensed connections"));
-        printf("    %s\n", _("    NRMH  = NRM Summary Status"));
-        printf("    %s\n", _("    NRMP<stat> = Returns the current value for a NRM health item"));
-        printf("    %s\n", _("    NRMM<stat> = Returns the current memory stats from NRM"));
-        printf("    %s\n", _("    NRMS<stat> = Returns the current Swapfile stats from NRM"));
-        printf("    %s\n", _("    NSS1<stat> = Statistics from _Admin:Manage_NSS\\GeneralStats.xml"));
-        printf("    %s\n", _("    NSS3<stat> = Statistics from _Admin:Manage_NSS\\NameCache.xml"));
-        printf("    %s\n", _("    NSS4<stat> = Statistics from _Admin:Manage_NSS\\FileStats.xml"));
-        printf("    %s\n", _("    NSS5<stat> = Statistics from _Admin:Manage_NSS\\ObjectCache.xml"));
-        printf("    %s\n", _("    NSS6<stat> = Statistics from _Admin:Manage_NSS\\Thread.xml"));
-        printf("    %s\n", _("    NSS7<stat> = Statistics from _Admin:Manage_NSS\\AuthorizationCache.xml"));
-        printf("    %s\n", _("    NLM:<nlm> = check if NLM is loaded and report version"));
-        printf("    %s\n", _("                (e.g. NLM:TSANDS.NLM)"));
-        printf("\n");
-        printf(" %s\n", "-w, --warning=INTEGER");
-        printf("    %s\n", _("Threshold which will result in a warning status"));
-        printf(" %s\n", "-c, --critical=INTEGER");
-        printf("    %s\n", _("Threshold which will result in a critical status"));
-        printf(" %s\n", "-o, --osversion");
-        printf("    %s\n", _("Include server version string in results"));
-
-        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-        printf("\n");
-        printf("%s\n", _("Notes:"));
-        printf(" %s\n", _("- This plugin requires that the MRTGEXT.NLM file from James Drews' MRTG"));
-        printf(" %s\n", _("  extension for NetWare be loaded on the Novell servers you wish to check."));
-        printf(" %s\n", _("  (available from http://www.engr.wisc.edu/~drews/mrtg/)"));
-        printf(" %s\n", _("- Values for critical thresholds should be lower than warning thresholds"));
-        printf(" %s\n", _("  when the following variables are checked: VPF, VKF, LTCH, CBUFF, DCB, "));
-        printf(" %s\n", _("  TCB, LRUS and LRUM."));
-
-        printf(UT_SUPPORT);
-}
-
-void print_usage(void) {
-        printf("%s\n", _("Usage:"));
-        printf("%s -H host [-p port] [-v variable] [-w warning] [-c critical] [-t timeout]\n", progname);
-}
diff --git a/plugins/check_pgsql.c b/plugins/check_pgsql.c
index 84305adb..0ce75e0a 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -28,32 +28,35 @@
  *
  *****************************************************************************/
 
+#include "output.h"
+#include "perfdata.h"
 #include "states.h"
-const char *progname = "check_pgsql";
-const char *copyright = "1999-2024";
-const char *email = "devel@monitoring-plugins.org";
-
 #include "common.h"
 #include "utils.h"
 #include "utils_cmd.h"
 #include "check_pgsql.d/config.h"
 #include "thresholds.h"
-
 #include "netutils.h"
 #include <libpq-fe.h>
 #include <pg_config_manual.h>
 
+const char *progname = "check_pgsql";
+const char *copyright = "1999-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 #define DEFAULT_HOST "127.0.0.1"
 
 /* return the PSQL server version as a 3-tuple */
-#define PSQL_SERVER_VERSION3(server_version)                                                                                               \
-        (server_version) / 10000, (server_version) / 100 - (int)((server_version) / 10000) * 100,                                              \
-                (server_version) - (int)((server_version) / 100) * 100
+#define PSQL_SERVER_VERSION3(server_version)                                                       \
+        ((server_version) / 10000),                                                                    \
+                (((server_version) / 100) - (int)(((server_version) / 10000) * 100)),                      \
+                (server_version) - (int)(((server_version) / 100) * 100)
 /* return true if the given host is a UNIX domain socket */
 #define PSQL_IS_UNIX_DOMAIN_SOCKET(host) ((NULL == (host)) || ('\0' == *(host)) || ('/' == *(host)))
 /* return a 3-tuple identifying a host/port independent of the socket type */
-#define PSQL_SOCKET3(host, port)                                                                                                           \
-        ((NULL == (host)) || ('\0' == *(host))) ? DEFAULT_PGSOCKET_DIR : host, PSQL_IS_UNIX_DOMAIN_SOCKET(host) ? "/.s.PGSQL." : ":", port
+#define PSQL_SOCKET3(host, port)                                                                   \
+        ((NULL == (host)) || ('\0' == *(host))) ? DEFAULT_PGSOCKET_DIR : host,                         \
+                PSQL_IS_UNIX_DOMAIN_SOCKET(host) ? "/.s.PGSQL." : ":", port
 
 typedef struct {
         int errorcode;
@@ -63,14 +66,25 @@ static check_pgsql_config_wrapper process_arguments(int /*argc*/, char ** /*argv
 
 static void print_help(void);
 static bool is_pg_logname(char * /*username*/);
-static mp_state_enum do_query(PGconn * /*conn*/, char * /*query*/, const char /*pgqueryname*/[], thresholds * /*qthresholds*/,
-                                                          char * /*query_warning*/, char * /*query_critical*/);
+
+typedef enum {
+        QUERY_OK,
+        ERROR_WITH_QUERY,     // critical
+        NO_ROWS_RETURNED,     // warning
+        NO_COLUMNS_RETURNED,  // warning
+        NO_DATA_RETURNED,     // critica/
+        RESULT_IS_NOT_NUMERIC // critical
+} do_query_errorcode;
+
+typedef struct {
+        do_query_errorcode error_code;
+        double numerical_result;
+} do_query_wrapper;
+static do_query_wrapper do_query(PGconn * /*conn*/, char * /*query*/);
 void print_usage(void);
 
 static int verbose = 0;
 
-#define OPTID_QUERYNAME -1000
-
 /******************************************************************************
 
 The (pseudo?)literate programming XML is contained within \@\@\- <XML> \-\@\@
@@ -136,8 +150,8 @@ int main(int argc, char **argv) {
 
         const check_pgsql_config config = tmp_config.config;
 
-        if (verbose > 2) {
-                printf("Arguments initialized\n");
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
         }
 
         /* Set signal handling and alarm */
@@ -167,7 +181,8 @@ int main(int argc, char **argv) {
         }
 
         if (verbose) { /* do not include password (see right below) in output */
-                printf("Connecting to PostgreSQL using conninfo: %s%s\n", conninfo, config.pgpasswd ? " password = <hidden>" : "");
+                printf("Connecting to PostgreSQL using conninfo: %s%s\n", conninfo,
+                           config.pgpasswd ? " password = <hidden>" : "");
         }
 
         if (config.pgpasswd) {
@@ -185,8 +200,8 @@ int main(int argc, char **argv) {
                 --end_timeval.tv_sec;
                 end_timeval.tv_usec += 1000000;
         }
-        double elapsed_time =
-                (double)(end_timeval.tv_sec - start_timeval.tv_sec) + ((double)(end_timeval.tv_usec - start_timeval.tv_usec) / 1000000.0);
+        double elapsed_time = (double)(end_timeval.tv_sec - start_timeval.tv_sec) +
+                                                  ((double)(end_timeval.tv_usec - start_timeval.tv_usec) / 1000000.0);
 
         if (verbose) {
                 printf("Time elapsed: %f\n", elapsed_time);
@@ -196,21 +211,41 @@ int main(int argc, char **argv) {
         if (verbose) {
                 printf("Verifying connection\n");
         }
+
+        mp_check overall = mp_check_init();
+
+        mp_subcheck sc_connection = mp_subcheck_init();
+
         if (PQstatus(conn) == CONNECTION_BAD) {
-                printf(_("CRITICAL - no connection to '%s' (%s).\n"), config.dbName, PQerrorMessage(conn));
+                sc_connection = mp_set_subcheck_state(sc_connection, STATE_CRITICAL);
+                xasprintf(&sc_connection.output, "no connection to '%s' (%s)", config.dbName,
+                                  PQerrorMessage(conn));
                 PQfinish(conn);
-                return STATE_CRITICAL;
-        }
-
-        mp_state_enum status = STATE_UNKNOWN;
-        if (elapsed_time > config.tcrit) {
-                status = STATE_CRITICAL;
-        } else if (elapsed_time > config.twarn) {
-                status = STATE_WARNING;
+                mp_add_subcheck_to_check(&overall, sc_connection);
+                mp_exit(overall);
         } else {
-                status = STATE_OK;
+                sc_connection = mp_set_subcheck_state(sc_connection, STATE_OK);
+                xasprintf(&sc_connection.output, "connected to '%s'", config.dbName);
+                mp_add_subcheck_to_check(&overall, sc_connection);
         }
 
+        mp_subcheck sc_connection_time = mp_subcheck_init();
+        sc_connection_time = mp_set_subcheck_default_state(sc_connection_time, STATE_UNKNOWN);
+
+        xasprintf(&sc_connection_time.output, "connection time: %.10g", elapsed_time);
+
+        mp_perfdata pd_connection_time = perfdata_init();
+        pd_connection_time.label = "time";
+        pd_connection_time.uom = "s";
+        pd_connection_time = mp_set_pd_value(pd_connection_time, elapsed_time);
+        pd_connection_time = mp_pd_set_thresholds(pd_connection_time, config.time_thresholds);
+
+        mp_add_perfdata_to_subcheck(&sc_connection_time, pd_connection_time);
+        sc_connection_time =
+                mp_set_subcheck_state(sc_connection_time, mp_get_pd_status(pd_connection_time));
+
+        mp_add_subcheck_to_check(&overall, sc_connection_time);
+
         if (verbose) {
                 char *server_host = PQhost(conn);
                 int server_version = PQserverVersion(conn);
@@ -218,27 +253,91 @@ int main(int argc, char **argv) {
                 printf("Successfully connected to database %s (user %s) "
                            "at server %s%s%s (server version: %d.%d.%d, "
                            "protocol version: %d, pid: %d)\n",
-                           PQdb(conn), PQuser(conn), PSQL_SOCKET3(server_host, PQport(conn)), PSQL_SERVER_VERSION3(server_version),
-                           PQprotocolVersion(conn), PQbackendPID(conn));
+                           PQdb(conn), PQuser(conn), PSQL_SOCKET3(server_host, PQport(conn)),
+                           PSQL_SERVER_VERSION3(server_version), PQprotocolVersion(conn), PQbackendPID(conn));
         }
 
-        printf(_(" %s - database %s (%f sec.)|%s\n"), state_text(status), config.dbName, elapsed_time,
-                   fperfdata("time", elapsed_time, "s", (config.twarn > 0.0), config.twarn, (config.tcrit > 0.0), config.tcrit, true, 0, false, 0));
-
-        mp_state_enum query_status = STATE_UNKNOWN;
         if (config.pgquery) {
-                query_status = do_query(conn, config.pgquery, config.pgqueryname, config.qthresholds, config.query_warning, config.query_critical);
+                mp_subcheck sc_query = mp_subcheck_init();
+                sc_query = mp_set_subcheck_default_state(sc_query, STATE_UNKNOWN);
+                if (config.pgqueryname) {
+                        xasprintf(&sc_query.output, "query '%s'", config.pgqueryname);
+                } else {
+                        xasprintf(&sc_query.output, "query '%s'", config.pgquery);
+                }
+
+                do_query_wrapper query_result = do_query(conn, config.pgquery);
+
+                switch (query_result.error_code) {
+                case QUERY_OK: {
+                        // Query was successful and there is a numerical result
+                        sc_query = mp_set_subcheck_state(sc_query, STATE_OK);
+                        xasprintf(&sc_query.output, "%s succeeded", sc_query.output);
+
+                        mp_perfdata pd_query = perfdata_init();
+                        pd_query = mp_set_pd_value(pd_query, query_result.numerical_result);
+                        pd_query = mp_pd_set_thresholds(pd_query, config.qthresholds);
+                        pd_query.label = "query";
+
+                        mp_subcheck sc_query_compare = mp_subcheck_init();
+                        mp_state_enum query_compare_state = mp_get_pd_status(pd_query);
+
+                        sc_query_compare = mp_set_subcheck_state(sc_query_compare, query_compare_state);
+                        mp_add_perfdata_to_subcheck(&sc_query_compare, pd_query);
+
+                        if (query_compare_state == STATE_OK) {
+                                xasprintf(&sc_query_compare.output, "query result '%f' is within thresholds",
+                                                  query_result.numerical_result);
+                        } else {
+                                xasprintf(&sc_query_compare.output, "query result '%f' is violating thresholds",
+                                                  query_result.numerical_result);
+                        }
+                        mp_add_subcheck_to_check(&overall, sc_query_compare);
+
+                } break;
+                case ERROR_WITH_QUERY:
+                        xasprintf(&sc_query.output, "%s - Error with query: %s", sc_query.output,
+                                          PQerrorMessage(conn));
+                        sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+                        break;
+                case NO_ROWS_RETURNED:
+                        xasprintf(&sc_query.output, "%s - no rows were returned by the query", sc_query.output);
+                        sc_query = mp_set_subcheck_state(sc_query, STATE_WARNING);
+                        break;
+                case NO_COLUMNS_RETURNED:
+                        xasprintf(&sc_query.output, "%s - no columns were returned by the query",
+                                          sc_query.output);
+                        sc_query = mp_set_subcheck_state(sc_query, STATE_WARNING);
+                        break;
+                case NO_DATA_RETURNED:
+                        xasprintf(&sc_query.output, "%s - no data was returned by the query", sc_query.output);
+                        sc_query = mp_set_subcheck_state(sc_query, STATE_WARNING);
+                        break;
+                case RESULT_IS_NOT_NUMERIC:
+                        xasprintf(&sc_query.output, "%s - result of the query is not numeric", sc_query.output);
+                        sc_query = mp_set_subcheck_state(sc_query, STATE_CRITICAL);
+                        break;
+                };
+
+                mp_add_subcheck_to_check(&overall, sc_query);
         }
 
         if (verbose) {
                 printf("Closing connection\n");
         }
         PQfinish(conn);
-        return (config.pgquery && query_status > status) ? query_status : status;
+
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
-check_pgsql_config_wrapper process_arguments(int argc, char **argv) {
+static check_pgsql_config_wrapper process_arguments(int argc, char **argv) {
+
+        enum {
+                OPTID_QUERYNAME = CHAR_MAX + 1,
+                output_format_index,
+        };
+
         static struct option longopts[] = {{"help", no_argument, 0, 'h'},
                                                                            {"version", no_argument, 0, 'V'},
                                                                            {"timeout", required_argument, 0, 't'},
@@ -256,6 +355,7 @@ check_pgsql_config_wrapper process_arguments(int argc, char **argv) {
                                                                            {"query_critical", required_argument, 0, 'C'},
                                                                            {"query_warning", required_argument, 0, 'W'},
                                                                            {"verbose", no_argument, 0, 'v'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
         check_pgsql_config_wrapper result = {
@@ -265,13 +365,25 @@ check_pgsql_config_wrapper process_arguments(int argc, char **argv) {
 
         while (true) {
                 int option = 0;
-                int option_char = getopt_long(argc, argv, "hVt:c:w:H:P:d:l:p:a:o:q:C:W:v", longopts, &option);
+                int option_char =
+                        getopt_long(argc, argv, "hVt:c:w:H:P:d:l:p:a:o:q:C:W:v", longopts, &option);
 
                 if (option_char == EOF) {
                         break;
                 }
 
                 switch (option_char) {
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 case '?': /* usage */
                         usage5();
                 case 'h': /* help */
@@ -287,26 +399,40 @@ check_pgsql_config_wrapper process_arguments(int argc, char **argv) {
                                 timeout_interval = atoi(optarg);
                         }
                         break;
-                case 'c': /* critical time threshold */
-                        if (!is_nonnegative(optarg)) {
-                                usage2(_("Critical threshold must be a positive integer"), optarg);
-                        } else {
-                                result.config.tcrit = strtod(optarg, NULL);
+                case 'c': /* critical time threshold */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical time threshold");
                         }
-                        break;
-                case 'w': /* warning time threshold */
-                        if (!is_nonnegative(optarg)) {
-                                usage2(_("Warning threshold must be a positive integer"), optarg);
-                        } else {
-                                result.config.twarn = strtod(optarg, NULL);
+                        result.config.time_thresholds =
+                                mp_thresholds_set_crit(result.config.time_thresholds, tmp.range);
+                } break;
+                case 'w': /* warning time threshold */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning time threshold");
                         }
-                        break;
-                case 'C': /* critical query threshold */
-                        result.config.query_critical = optarg;
-                        break;
-                case 'W': /* warning query threshold */
-                        result.config.query_warning = optarg;
-                        break;
+                        result.config.time_thresholds =
+                                mp_thresholds_set_warn(result.config.time_thresholds, tmp.range);
+                } break;
+                case 'C': /* critical query threshold */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical query threshold");
+                        }
+
+                        result.config.qthresholds =
+                                mp_thresholds_set_crit(result.config.qthresholds, tmp.range);
+
+                } break;
+                case 'W': /* warning query threshold */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning query threshold");
+                        }
+                        result.config.qthresholds =
+                                mp_thresholds_set_warn(result.config.qthresholds, tmp.range);
+                } break;
                 case 'H': /* host */
                         if ((*optarg != '/') && (!is_host(optarg))) {
                                 usage2(_("Invalid hostname/address"), optarg);
@@ -357,8 +483,6 @@ check_pgsql_config_wrapper process_arguments(int argc, char **argv) {
                 }
         }
 
-        set_thresholds(&result.config.qthresholds, result.config.query_warning, result.config.query_critical);
-
         return result;
 }
 
@@ -386,7 +510,7 @@ should be added.</para>
 -@@
 ******************************************************************************/
 
-bool is_pg_logname(char *username) {
+static bool is_pg_logname(char *username) {
         if (strlen(username) > NAMEDATALEN - 1) {
                 return (false);
         }
@@ -440,12 +564,13 @@ void print_help(void) {
         printf(" %s\n", "--queryname=STRING");
         printf("    %s\n", _("A name for the query, this string is used instead of the query"));
         printf("    %s\n", _("in the long output of the plugin"));
-        printf(" %s\n", "-W, --query-warning=RANGE");
+        printf(" %s\n", "-W, --query_warning=RANGE");
         printf("    %s\n", _("SQL query value to result in warning status (double)"));
-        printf(" %s\n", "-C, --query-critical=RANGE");
+        printf(" %s\n", "-C, --query_critical=RANGE");
         printf("    %s\n", _("SQL query value to result in critical status (double)"));
 
         printf(UT_VERBOSE);
+        printf(UT_OUTPUT_FORMAT);
 
         printf("\n");
         printf(" %s\n", _("All parameters are optional."));
@@ -457,29 +582,39 @@ void print_help(void) {
 
         printf(" %s\n", _("If a query is specified using the -q option, it will be executed after"));
         printf(" %s\n", _("connecting to the server. The result from the query has to be numeric."));
-        printf(" %s\n", _("Multiple SQL commands, separated by semicolon, are allowed but the result "));
+        printf(" %s\n",
+                   _("Multiple SQL commands, separated by semicolon, are allowed but the result "));
         printf(" %s\n", _("of the last command is taken into account only. The value of the first"));
-        printf(" %s\n", _("column in the first row is used as the check result. If a second column is"));
+        printf(" %s\n",
+                   _("column in the first row is used as the check result. If a second column is"));
         printf(" %s\n", _("present in the result set, this is added to the plugin output with a"));
-        printf(" %s\n", _("prefix of \"Extra Info:\". This information can be displayed in the system"));
+        printf(" %s\n",
+                   _("prefix of \"Extra Info:\". This information can be displayed in the system"));
         printf(" %s\n\n", _("executing the plugin."));
 
         printf(" %s\n", _("See the chapter \"Monitoring Database Activity\" of the PostgreSQL manual"));
-        printf(" %s\n\n", _("for details about how to access internal statistics of the database server."));
+        printf(" %s\n\n",
+                   _("for details about how to access internal statistics of the database server."));
 
-        printf(" %s\n", _("For a list of available connection parameters which may be used with the -o"));
-        printf(" %s\n", _("command line option, see the documentation for PQconnectdb() in the chapter"));
+        printf(" %s\n",
+                   _("For a list of available connection parameters which may be used with the -o"));
+        printf(" %s\n",
+                   _("command line option, see the documentation for PQconnectdb() in the chapter"));
         printf(" %s\n", _("\"libpq - C Library\" of the PostgreSQL manual. For example, this may be"));
-        printf(" %s\n", _("used to specify a service name in pg_service.conf to be used for additional"));
+        printf(" %s\n",
+                   _("used to specify a service name in pg_service.conf to be used for additional"));
         printf(" %s\n", _("connection parameters: -o 'service=<name>' or to specify the SSL mode:"));
         printf(" %s\n\n", _("-o 'sslmode=require'."));
 
         printf(" %s\n", _("The plugin will connect to a local postmaster if no host is specified. To"));
-        printf(" %s\n", _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP"));
+        printf(" %s\n",
+                   _("connect to a remote host, be sure that the remote postmaster accepts TCP/IP"));
         printf(" %s\n\n", _("connections (start the postmaster with the -i option)."));
 
-        printf(" %s\n", _("Typically, the monitoring user (unless the --logname option is used) should be"));
-        printf(" %s\n", _("able to connect to the database without a password. The plugin can also send"));
+        printf(" %s\n",
+                   _("Typically, the monitoring user (unless the --logname option is used) should be"));
+        printf(" %s\n",
+                   _("able to connect to the database without a password. The plugin can also send"));
         printf(" %s\n", _("a password, but no effort is made to obscure or encrypt the password."));
 
         printf(UT_SUPPORT);
@@ -492,32 +627,44 @@ void print_usage(void) {
                    "[-q <query>] [-C <critical query range>] [-W <warning query range>]\n");
 }
 
-mp_state_enum do_query(PGconn *conn, char *query, const char pgqueryname[], thresholds *qthresholds, char *query_warning,
-                                           char *query_critical) {
+static do_query_wrapper do_query(PGconn *conn, char *query) {
         if (verbose) {
                 printf("Executing SQL query \"%s\".\n", query);
         }
         PGresult *res = PQexec(conn, query);
 
+        do_query_wrapper result = {
+                .error_code = QUERY_OK,
+        };
+
         if (PGRES_TUPLES_OK != PQresultStatus(res)) {
-                printf(_("QUERY %s - %s: %s.\n"), _("CRITICAL"), _("Error with query"), PQerrorMessage(conn));
-                return STATE_CRITICAL;
+                // TODO
+                // printf(_("QUERY %s - %s: %s.\n"), _("CRITICAL"), _("Error with query"),
+                // PQerrorMessage(conn));
+                result.error_code = ERROR_WITH_QUERY;
+                return result;
         }
 
         if (PQntuples(res) < 1) {
-                printf("QUERY %s - %s.\n", _("WARNING"), _("No rows returned"));
-                return STATE_WARNING;
+                // TODO
+                // printf("QUERY %s - %s.\n", _("WARNING"), _("No rows returned"));
+                result.error_code = NO_ROWS_RETURNED;
+                return result;
         }
 
         if (PQnfields(res) < 1) {
-                printf("QUERY %s - %s.\n", _("WARNING"), _("No columns returned"));
-                return STATE_WARNING;
+                // TODO
+                // printf("QUERY %s - %s.\n", _("WARNING"), _("No columns returned"));
+                result.error_code = NO_COLUMNS_RETURNED;
+                return result;
         }
 
         char *val_str = PQgetvalue(res, 0, 0);
         if (!val_str) {
-                printf("QUERY %s - %s.\n", _("CRITICAL"), _("No data returned"));
-                return STATE_CRITICAL;
+                // TODO
+                // printf("QUERY %s - %s.\n", _("CRITICAL"), _("No data returned"));
+                result.error_code = NO_DATA_RETURNED;
+                return result;
         }
 
         char *endptr = NULL;
@@ -527,8 +674,10 @@ mp_state_enum do_query(PGconn *conn, char *query, const char pgqueryname[], thre
         }
 
         if (endptr == val_str) {
-                printf("QUERY %s - %s: %s\n", _("CRITICAL"), _("Is not a numeric"), val_str);
-                return STATE_CRITICAL;
+                // TODO
+                // printf("QUERY %s - %s: %s\n", _("CRITICAL"), _("Is not a numeric"), val_str);
+                result.error_code = RESULT_IS_NOT_NUMERIC;
+                return result;
         }
 
         if ((endptr != NULL) && (*endptr != '\0')) {
@@ -537,23 +686,7 @@ mp_state_enum do_query(PGconn *conn, char *query, const char pgqueryname[], thre
                 }
         }
 
-        mp_state_enum my_status = get_status(value, qthresholds);
-        printf("QUERY %s - ", (my_status == STATE_OK)         ? _("OK")
-                                                  : (my_status == STATE_WARNING)  ? _("WARNING")
-                                                  : (my_status == STATE_CRITICAL) ? _("CRITICAL")
-                                                                                                                  : _("UNKNOWN"));
-        if (pgqueryname) {
-                printf(_("%s returned %f"), pgqueryname, value);
-        } else {
-                printf(_("'%s' returned %f"), query, value);
-        }
+        result.numerical_result = value;
 
-        printf("|query=%f;%s;%s;;\n", value, query_warning ? query_warning : "", query_critical ? query_critical : "");
-        if (PQnfields(res) > 1) {
-                char *extra_info = PQgetvalue(res, 0, 1);
-                if (extra_info != NULL) {
-                        printf("Extra Info: %s\n", extra_info);
-                }
-        }
-        return my_status;
+        return result;
 }
diff --git a/plugins/check_pgsql.d/config.h b/plugins/check_pgsql.d/config.h
index 2d4b8b89..7cf0637b 100644
--- a/plugins/check_pgsql.d/config.h
+++ b/plugins/check_pgsql.d/config.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
+#include "perfdata.h"
 #include "thresholds.h"
 #include <stddef.h>
 #include <pg_config_manual.h>
@@ -24,11 +26,11 @@ typedef struct {
         char *pgquery;
         char *pgqueryname;
 
-        double twarn;
-        double tcrit;
-        thresholds *qthresholds;
-        char *query_warning;
-        char *query_critical;
+        mp_thresholds time_thresholds;
+        mp_thresholds qthresholds;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_pgsql_config;
 
 /* begin, by setting the parameters for a backend connection if the
@@ -51,11 +53,18 @@ check_pgsql_config check_pgsql_config_init() {
                 .pgquery = NULL,
                 .pgqueryname = NULL,
 
-                .twarn = (double)DEFAULT_WARN,
-                .tcrit = (double)DEFAULT_CRIT,
-                .qthresholds = NULL,
-                .query_warning = NULL,
-                .query_critical = NULL,
+                .time_thresholds = mp_thresholds_init(),
+                .qthresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
         };
+
+        mp_range tmp_range = mp_range_init();
+        tmp_range = mp_range_set_end(tmp_range, mp_create_pd_value(DEFAULT_WARN));
+        tmp.time_thresholds = mp_thresholds_set_warn(tmp.time_thresholds, tmp_range);
+
+        tmp_range = mp_range_set_end(tmp_range, mp_create_pd_value(DEFAULT_CRIT));
+        tmp.time_thresholds = mp_thresholds_set_crit(tmp.time_thresholds, tmp_range);
+
         return tmp;
 }
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 4aafaf41..61feb958 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -36,61 +36,52 @@ const char *email = "devel@monitoring-plugins.org";
 #include "netutils.h"
 #include "popen.h"
 #include "utils.h"
+#include "check_ping.d/config.h"
+#include "../lib/states.h"
 
 #include <signal.h>
 
-#define WARN_DUPLICATES   "DUPLICATES FOUND! "
-#define UNKNOWN_TRIP_TIME -1.0 /* -1 seconds */
+#define WARN_DUPLICATES "DUPLICATES FOUND! "
 
-enum {
-        UNKNOWN_PACKET_LOSS = 200, /* 200% */
-        DEFAULT_MAX_PACKETS = 5    /* default no. of ICMP ECHO packets */
-};
+typedef struct {
+        int errorcode;
+        check_ping_config config;
+} check_ping_config_wrapper;
+static check_ping_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_ping_config_wrapper validate_arguments(check_ping_config_wrapper /*config_wrapper*/);
 
-static int process_arguments(int /*argc*/, char ** /*argv*/);
-static int get_threshold(char * /*arg*/, float * /*trta*/, int * /*tpl*/);
-static int validate_arguments(void);
-static int run_ping(const char *cmd, const char *addr);
-static int error_scan(char buf[MAX_INPUT_BUFFER], const char *addr);
+static int get_threshold(char * /*arg*/, double * /*trta*/, int * /*tpl*/);
+
+typedef struct {
+        mp_state_enum state;
+        double round_trip_average;
+        int packet_loss;
+} ping_result;
+static ping_result run_ping(const char *cmd, const char *addr, double /*crta*/);
+
+static mp_state_enum error_scan(char buf[MAX_INPUT_BUFFER], const char *addr);
 static void print_help(void);
 void print_usage(void);
 
-static bool display_html = false;
-static int wpl = UNKNOWN_PACKET_LOSS;
-static int cpl = UNKNOWN_PACKET_LOSS;
-static float wrta = UNKNOWN_TRIP_TIME;
-static float crta = UNKNOWN_TRIP_TIME;
-static char **addresses = NULL;
-static int n_addresses = 0;
-static int max_addr = 1;
-static int max_packets = -1;
 static int verbose = 0;
 
-static float rta = UNKNOWN_TRIP_TIME;
-static int pl = UNKNOWN_PACKET_LOSS;
-
 static char *warn_text;
 
 int main(int argc, char **argv) {
-        char *cmd = NULL;
-        char *rawcmd = NULL;
-        int result = STATE_UNKNOWN;
-        int this_result = STATE_UNKNOWN;
-        int i;
-
         setlocale(LC_ALL, "");
         setlocale(LC_NUMERIC, "C");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
-        addresses = malloc(sizeof(char *) * max_addr);
-        addresses[0] = NULL;
-
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
+        check_ping_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
+        }
+
+        const check_ping_config config = tmp_config.config;
 
         /* Set signal handling and alarm */
         if (signal(SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
@@ -105,71 +96,90 @@ int main(int argc, char **argv) {
         alarm(timeout_interval);
 #endif
 
-        for (i = 0; i < n_addresses; i++) {
-
+        int result = STATE_UNKNOWN;
+        char *rawcmd = NULL;
+        for (size_t i = 0; i < config.n_addresses; i++) {
 #ifdef PING6_COMMAND
-                if (address_family != AF_INET && is_inet6_addr(addresses[i]))
+                if (address_family != AF_INET && is_inet6_addr(config.addresses[i])) {
                         rawcmd = strdup(PING6_COMMAND);
-                else
+                } else {
                         rawcmd = strdup(PING_COMMAND);
+                }
 #else
                 rawcmd = strdup(PING_COMMAND);
 #endif
 
-                        /* does the host address of number of packets argument come first? */
+                char *cmd = NULL;
+
+                /* does the host address of number of packets argument come first? */
 #ifdef PING_PACKETS_FIRST
 #       ifdef PING_HAS_TIMEOUT
-                xasprintf(&cmd, rawcmd, timeout_interval, max_packets, addresses[i]);
+                xasprintf(&cmd, rawcmd, timeout_interval, config.max_packets, config.addresses[i]);
 #       else
-                xasprintf(&cmd, rawcmd, max_packets, addresses[i]);
+                xasprintf(&cmd, rawcmd, config.max_packets, config.addresses[i]);
 #       endif
 #else
-                xasprintf(&cmd, rawcmd, addresses[i], max_packets);
+                xasprintf(&cmd, rawcmd, config.addresses[i], config.max_packets);
 #endif
 
-                if (verbose >= 2)
+                if (verbose >= 2) {
                         printf("CMD: %s\n", cmd);
+                }
 
                 /* run the command */
-                this_result = run_ping(cmd, addresses[i]);
 
-                if (pl == UNKNOWN_PACKET_LOSS || rta < 0.0) {
+                ping_result pinged = run_ping(cmd, config.addresses[i], config.crta);
+
+                if (pinged.packet_loss == UNKNOWN_PACKET_LOSS || pinged.round_trip_average < 0.0) {
                         printf("%s\n", cmd);
                         die(STATE_UNKNOWN, _("CRITICAL - Could not interpret output from ping command\n"));
                 }
 
-                if (pl >= cpl || rta >= crta || rta < 0)
-                        this_result = STATE_CRITICAL;
-                else if (pl >= wpl || rta >= wrta)
-                        this_result = STATE_WARNING;
-                else if (pl >= 0 && rta >= 0)
-                        this_result = max_state(STATE_OK, this_result);
-
-                if (n_addresses > 1 && this_result != STATE_UNKNOWN)
-                        die(STATE_OK, "%s is alive\n", addresses[i]);
-
-                if (display_html == true)
-                        printf("<A HREF='%s/traceroute.cgi?%s'>", CGIURL, addresses[i]);
-                if (pl == 100)
-                        printf(_("PING %s - %sPacket loss = %d%%"), state_text(this_result), warn_text, pl);
-                else
-                        printf(_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text(this_result), warn_text, pl, rta);
-                if (display_html == true)
+                if (pinged.packet_loss >= config.cpl || pinged.round_trip_average >= config.crta ||
+                        pinged.round_trip_average < 0) {
+                        pinged.state = STATE_CRITICAL;
+                } else if (pinged.packet_loss >= config.wpl || pinged.round_trip_average >= config.wrta) {
+                        pinged.state = STATE_WARNING;
+                } else if (pinged.packet_loss >= 0 && pinged.round_trip_average >= 0) {
+                        pinged.state = max_state(STATE_OK, pinged.state);
+                }
+
+                if (config.n_addresses > 1 && pinged.state != STATE_UNKNOWN) {
+                        die(STATE_OK, "%s is alive\n", config.addresses[i]);
+                }
+
+                if (config.display_html) {
+                        printf("<A HREF='%s/traceroute.cgi?%s'>", CGIURL, config.addresses[i]);
+                }
+                if (pinged.packet_loss == 100) {
+                        printf(_("PING %s - %sPacket loss = %d%%"), state_text(pinged.state), warn_text,
+                                   pinged.packet_loss);
+                } else {
+                        printf(_("PING %s - %sPacket loss = %d%%, RTA = %2.2f ms"), state_text(pinged.state),
+                                   warn_text, pinged.packet_loss, pinged.round_trip_average);
+                }
+                if (config.display_html) {
                         printf("</A>");
+                }
 
                 /* Print performance data */
-                if (pl != 100) {
+                if (pinged.packet_loss != 100) {
                         printf("|%s",
-                                   fperfdata("rta", (double)rta, "ms", wrta > 0 ? true : false, wrta, crta > 0 ? true : false, crta, true, 0, false, 0));
+                                   fperfdata("rta", pinged.round_trip_average, "ms", (bool)(config.wrta > 0),
+                                                         config.wrta, (bool)(config.crta > 0), config.crta, true, 0, false, 0));
                 } else {
-                        printf("| rta=U;%f;%f;;", wrta, crta);
+                        printf("| rta=U;%f;%f;;", config.wrta, config.crta);
                 }
-                printf(" %s\n", perfdata("pl", (long)pl, "%", wpl > 0 ? true : false, wpl, cpl > 0 ? true : false, cpl, true, 0, false, 0));
 
-                if (verbose >= 2)
-                        printf("%f:%d%% %f:%d%%\n", wrta, wpl, crta, cpl);
+                printf(" %s\n",
+                           perfdata("pl", (long)pinged.packet_loss, "%", (bool)(config.wpl > 0), config.wpl,
+                                                (bool)(config.cpl > 0), config.cpl, true, 0, false, 0));
+
+                if (verbose >= 2) {
+                        printf("%f:%d%% %f:%d%%\n", config.wrta, config.wpl, config.crta, config.cpl);
+                }
 
-                result = max_state(result, this_result);
+                result = max_state(result, pinged.state);
                 free(rawcmd);
                 free(cmd);
         }
@@ -178,11 +188,7 @@ int main(int argc, char **argv) {
 }
 
 /* process command-line arguments */
-int process_arguments(int argc, char **argv) {
-        int c = 1;
-        char *ptr;
-
-        int option = 0;
+check_ping_config_wrapper process_arguments(int argc, char **argv) {
         static struct option longopts[] = {STD_LONG_OPTS,
                                                                            {"packets", required_argument, 0, 'p'},
                                                                            {"nohtml", no_argument, 0, 'n'},
@@ -191,23 +197,35 @@ int process_arguments(int argc, char **argv) {
                                                                            {"use-ipv6", no_argument, 0, '6'},
                                                                            {0, 0, 0, 0}};
 
-        if (argc < 2)
-                return ERROR;
+        check_ping_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_ping_config_init(),
+        };
+
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp("-to", argv[c]) == 0)
-                        strcpy(argv[c], "-t");
-                if (strcmp("-nohtml", argv[c]) == 0)
-                        strcpy(argv[c], "-n");
+        for (int index = 1; index < argc; index++) {
+                if (strcmp("-to", argv[index]) == 0) {
+                        strcpy(argv[index], "-t");
+                }
+                if (strcmp("-nohtml", argv[index]) == 0) {
+                        strcpy(argv[index], "-n");
+                }
         }
 
-        while (1) {
-                c = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
+        int option = 0;
+        size_t max_addr = MAX_ADDR_START;
+        while (true) {
+                int option_index = getopt_long(argc, argv, "VvhnL46t:c:w:H:p:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_index == -1 || option_index == EOF) {
                         break;
+                }
 
-                switch (c) {
+                switch (option_index) {
                 case '?': /* usage */
                         usage5();
                 case 'h': /* help */
@@ -234,17 +252,19 @@ int process_arguments(int argc, char **argv) {
                         usage(_("IPv6 support not available\n"));
 #endif
                         break;
-                case 'H': /* hostname */
-                        ptr = optarg;
-                        while (1) {
-                                n_addresses++;
-                                if (n_addresses > max_addr) {
+                case 'H': /* hostname */ {
+                        char *ptr = optarg;
+                        while (true) {
+                                result.config.n_addresses++;
+                                if (result.config.n_addresses > max_addr) {
                                         max_addr *= 2;
-                                        addresses = realloc(addresses, sizeof(char *) * max_addr);
-                                        if (addresses == NULL)
+                                        result.config.addresses =
+                                                realloc(result.config.addresses, sizeof(char *) * max_addr);
+                                        if (result.config.addresses == NULL) {
                                                 die(STATE_UNKNOWN, _("Could not realloc() addresses\n"));
+                                        }
                                 }
-                                addresses[n_addresses - 1] = ptr;
+                                result.config.addresses[result.config.n_addresses - 1] = ptr;
                                 if ((ptr = index(ptr, ','))) {
                                         strcpy(ptr, "");
                                         ptr += sizeof(char);
@@ -252,219 +272,302 @@ int process_arguments(int argc, char **argv) {
                                         break;
                                 }
                         }
-                        break;
+                } break;
                 case 'p': /* number of packets to send */
-                        if (is_intnonneg(optarg))
-                                max_packets = atoi(optarg);
-                        else
+                        if (is_intnonneg(optarg)) {
+                                result.config.max_packets = atoi(optarg);
+                        } else {
                                 usage2(_("<max_packets> (%s) must be a non-negative number\n"), optarg);
+                        }
                         break;
                 case 'n': /* no HTML */
-                        display_html = false;
+                        result.config.display_html = false;
                         break;
                 case 'L': /* show HTML */
-                        display_html = true;
+                        result.config.display_html = true;
                         break;
                 case 'c':
-                        get_threshold(optarg, &crta, &cpl);
+                        get_threshold(optarg, &result.config.crta, &result.config.cpl);
                         break;
                 case 'w':
-                        get_threshold(optarg, &wrta, &wpl);
+                        get_threshold(optarg, &result.config.wrta, &result.config.wpl);
                         break;
                 }
         }
 
-        c = optind;
-        if (c == argc)
-                return validate_arguments();
+        int arg_counter = optind;
+        if (arg_counter == argc) {
+                return validate_arguments(result);
+        }
 
-        if (addresses[0] == NULL) {
-                if (!is_host(argv[c])) {
-                        usage2(_("Invalid hostname/address"), argv[c]);
+        if (result.config.addresses[0] == NULL) {
+                if (!is_host(argv[arg_counter])) {
+                        usage2(_("Invalid hostname/address"), argv[arg_counter]);
                 } else {
-                        addresses[0] = argv[c++];
-                        n_addresses++;
-                        if (c == argc)
-                                return validate_arguments();
+                        result.config.addresses[0] = argv[arg_counter++];
+                        result.config.n_addresses++;
+                        if (arg_counter == argc) {
+                                return validate_arguments(result);
+                        }
                 }
         }
 
-        if (wpl == UNKNOWN_PACKET_LOSS) {
-                if (!is_intpercent(argv[c])) {
-                        printf(_("<wpl> (%s) must be an integer percentage\n"), argv[c]);
-                        return ERROR;
-                } else {
-                        wpl = atoi(argv[c++]);
-                        if (c == argc)
-                                return validate_arguments();
+        if (result.config.wpl == UNKNOWN_PACKET_LOSS) {
+                if (!is_intpercent(argv[arg_counter])) {
+                        printf(_("<wpl> (%s) must be an integer percentage\n"), argv[arg_counter]);
+                        result.errorcode = ERROR;
+                        return result;
+                }
+                result.config.wpl = atoi(argv[arg_counter++]);
+                if (arg_counter == argc) {
+                        return validate_arguments(result);
                 }
         }
 
-        if (cpl == UNKNOWN_PACKET_LOSS) {
-                if (!is_intpercent(argv[c])) {
-                        printf(_("<cpl> (%s) must be an integer percentage\n"), argv[c]);
-                        return ERROR;
-                } else {
-                        cpl = atoi(argv[c++]);
-                        if (c == argc)
-                                return validate_arguments();
+        if (result.config.cpl == UNKNOWN_PACKET_LOSS) {
+                if (!is_intpercent(argv[arg_counter])) {
+                        printf(_("<cpl> (%s) must be an integer percentage\n"), argv[arg_counter]);
+                        result.errorcode = ERROR;
+                        return result;
+                }
+                result.config.cpl = atoi(argv[arg_counter++]);
+                if (arg_counter == argc) {
+                        return validate_arguments(result);
                 }
         }
 
-        if (wrta < 0.0) {
-                if (is_negative(argv[c])) {
-                        printf(_("<wrta> (%s) must be a non-negative number\n"), argv[c]);
-                        return ERROR;
-                } else {
-                        wrta = atof(argv[c++]);
-                        if (c == argc)
-                                return validate_arguments();
+        if (result.config.wrta < 0.0) {
+                if (is_negative(argv[arg_counter])) {
+                        printf(_("<wrta> (%s) must be a non-negative number\n"), argv[arg_counter]);
+                        result.errorcode = ERROR;
+                        return result;
+                }
+                result.config.wrta = atof(argv[arg_counter++]);
+                if (arg_counter == argc) {
+                        return validate_arguments(result);
                 }
         }
 
-        if (crta < 0.0) {
-                if (is_negative(argv[c])) {
-                        printf(_("<crta> (%s) must be a non-negative number\n"), argv[c]);
-                        return ERROR;
-                } else {
-                        crta = atof(argv[c++]);
-                        if (c == argc)
-                                return validate_arguments();
+        if (result.config.crta < 0.0) {
+                if (is_negative(argv[arg_counter])) {
+                        printf(_("<crta> (%s) must be a non-negative number\n"), argv[arg_counter]);
+                        result.errorcode = ERROR;
+                        return result;
+                }
+                result.config.crta = atof(argv[arg_counter++]);
+                if (arg_counter == argc) {
+                        return validate_arguments(result);
                 }
         }
 
-        if (max_packets == -1) {
-                if (is_intnonneg(argv[c])) {
-                        max_packets = atoi(argv[c++]);
+        if (result.config.max_packets == -1) {
+                if (is_intnonneg(argv[arg_counter])) {
+                        result.config.max_packets = atoi(argv[arg_counter++]);
                 } else {
-                        printf(_("<max_packets> (%s) must be a non-negative number\n"), argv[c]);
-                        return ERROR;
+                        printf(_("<max_packets> (%s) must be a non-negative number\n"), argv[arg_counter]);
+                        result.errorcode = ERROR;
+                        return result;
                 }
         }
 
-        return validate_arguments();
+        return validate_arguments(result);
 }
 
-int get_threshold(char *arg, float *trta, int *tpl) {
-        if (is_intnonneg(arg) && sscanf(arg, "%f", trta) == 1)
+int get_threshold(char *arg, double *trta, int *tpl) {
+        if (is_intnonneg(arg) && sscanf(arg, "%lf", trta) == 1) {
                 return OK;
-        else if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%f%*[:,]%d%%", trta, tpl) == 2)
+        }
+
+        if (strpbrk(arg, ",:") && strstr(arg, "%") && sscanf(arg, "%lf%*[:,]%d%%", trta, tpl) == 2) {
                 return OK;
-        else if (strstr(arg, "%") && sscanf(arg, "%d%%", tpl) == 1)
+        }
+
+        if (strstr(arg, "%") && sscanf(arg, "%d%%", tpl) == 1) {
                 return OK;
+        }
 
         usage2(_("%s: Warning threshold must be integer or percentage!\n\n"), arg);
         return STATE_UNKNOWN;
 }
 
-int validate_arguments() {
-        float max_seconds;
-        int i;
-
-        if (wrta < 0.0) {
+check_ping_config_wrapper validate_arguments(check_ping_config_wrapper config_wrapper) {
+        if (config_wrapper.config.wrta < 0.0) {
                 printf(_("<wrta> was not set\n"));
-                return ERROR;
-        } else if (crta < 0.0) {
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
+        }
+
+        if (config_wrapper.config.crta < 0.0) {
                 printf(_("<crta> was not set\n"));
-                return ERROR;
-        } else if (wpl == UNKNOWN_PACKET_LOSS) {
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
+        }
+
+        if (config_wrapper.config.wpl == UNKNOWN_PACKET_LOSS) {
                 printf(_("<wpl> was not set\n"));
-                return ERROR;
-        } else if (cpl == UNKNOWN_PACKET_LOSS) {
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
+        }
+
+        if (config_wrapper.config.cpl == UNKNOWN_PACKET_LOSS) {
                 printf(_("<cpl> was not set\n"));
-                return ERROR;
-        } else if (wrta > crta) {
-                printf(_("<wrta> (%f) cannot be larger than <crta> (%f)\n"), wrta, crta);
-                return ERROR;
-        } else if (wpl > cpl) {
-                printf(_("<wpl> (%d) cannot be larger than <cpl> (%d)\n"), wpl, cpl);
-                return ERROR;
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
+        }
+
+        if (config_wrapper.config.wrta > config_wrapper.config.crta) {
+                printf(_("<wrta> (%f) cannot be larger than <crta> (%f)\n"), config_wrapper.config.wrta,
+                           config_wrapper.config.crta);
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
         }
 
-        if (max_packets == -1)
-                max_packets = DEFAULT_MAX_PACKETS;
+        if (config_wrapper.config.wpl > config_wrapper.config.cpl) {
+                printf(_("<wpl> (%d) cannot be larger than <cpl> (%d)\n"), config_wrapper.config.wpl,
+                           config_wrapper.config.cpl);
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
+        }
 
-        max_seconds = crta / 1000.0 * max_packets + max_packets;
-        if (max_seconds > timeout_interval)
-                timeout_interval = (int)max_seconds;
+        if (config_wrapper.config.max_packets == -1) {
+                config_wrapper.config.max_packets = DEFAULT_MAX_PACKETS;
+        }
 
-        for (i = 0; i < n_addresses; i++) {
-                if (!is_host(addresses[i]))
-                        usage2(_("Invalid hostname/address"), addresses[i]);
+        double max_seconds = (config_wrapper.config.crta / 1000.0 * config_wrapper.config.max_packets) +
+                                                 config_wrapper.config.max_packets;
+        if (max_seconds > timeout_interval) {
+                timeout_interval = (unsigned int)max_seconds;
+        }
+
+        for (size_t i = 0; i < config_wrapper.config.n_addresses; i++) {
+                if (!is_host(config_wrapper.config.addresses[i])) {
+                        usage2(_("Invalid hostname/address"), config_wrapper.config.addresses[i]);
+                }
         }
 
-        if (n_addresses == 0) {
+        if (config_wrapper.config.n_addresses == 0) {
                 usage(_("You must specify a server address or host name"));
         }
 
-        return OK;
+        return config_wrapper;
 }
 
-int run_ping(const char *cmd, const char *addr) {
-        char buf[MAX_INPUT_BUFFER];
-        int result = STATE_UNKNOWN;
-        int match;
-
-        if ((child_process = spopen(cmd)) == NULL)
+ping_result run_ping(const char *cmd, const char *addr, double crta) {
+        if ((child_process = spopen(cmd)) == NULL) {
                 die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
+        }
 
         child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
-        if (child_stderr == NULL)
+        if (child_stderr == NULL) {
                 printf(_("Cannot open stderr for %s\n"), cmd);
+        }
 
-        while (fgets(buf, MAX_INPUT_BUFFER - 1, child_process)) {
+        char buf[MAX_INPUT_BUFFER];
+        ping_result result = {
+                .state = STATE_UNKNOWN,
+                .packet_loss = UNKNOWN_PACKET_LOSS,
+                .round_trip_average = UNKNOWN_TRIP_TIME,
+        };
 
-                if (verbose >= 3)
+        while (fgets(buf, MAX_INPUT_BUFFER - 1, child_process)) {
+                if (verbose >= 3) {
                         printf("Output: %s", buf);
+                }
 
-                result = max_state(result, error_scan(buf, addr));
+                result.state = max_state(result.state, error_scan(buf, addr));
 
                 /* get the percent loss statistics */
-                match = 0;
-                if ((sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet loss%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n", &pl, &match) && match) ||
-                        (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &pl, &match) && match))
+                int match = 0;
+                if ((sscanf(
+                                 buf,
+                                 "%*d packets transmitted, %*d packets received, +%*d errors, %d%% packet loss%n",
+                                 &result.packet_loss, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf,
+                                        "%*d packets transmitted, %*d packets received, +%*d duplicates, %d%% packet "
+                                        "loss%n",
+                                        &result.packet_loss, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf,
+                                        "%*d packets transmitted, %*d received, +%*d duplicates, %d%% packet loss%n",
+                                        &result.packet_loss, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% packet loss%n",
+                                        &result.packet_loss, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d packets received, %d%% loss, time%n",
+                                        &result.packet_loss, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d received, %d%% loss, time%n",
+                                        &result.packet_loss, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "%*d packets transmitted, %*d received, %d%% packet loss, time%n",
+                                        &result.packet_loss, &match) == 1 &&
+                         match) == 1 ||
+                        (sscanf(buf, "%*d packets transmitted, %*d received, +%*d errors, %d%% packet loss%n",
+                                        &result.packet_loss, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "%*d packets transmitted %*d received, +%*d errors, %d%% packet loss%n",
+                                        &result.packet_loss, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "%*[^(](%d%% %*[^)])%n", &result.packet_loss, &match) == 1 && match)) {
                         continue;
+                }
 
                 /* get the round trip average */
-                else if ((sscanf(buf, "round-trip min/avg/max = %*f/%f/%*f%n", &rta, &match) && match) ||
-                                 (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
-                                 (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
-                                 (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
-                                 (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
-                                 (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%f/%*f%n", &rta, &match) && match) ||
-                                 (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%f/%*f/%*f%n", &rta, &match) && match) ||
-                                 (sscanf(buf, "rtt min/avg/max/mdev = %*f/%f/%*f/%*f ms%n", &rta, &match) && match) ||
-                                 (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %fms%n", &rta, &match) && match))
+                if ((sscanf(buf, "round-trip min/avg/max = %*f/%lf/%*f%n", &result.round_trip_average,
+                                        &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "round-trip min/avg/max/mdev = %*f/%lf/%*f/%*f%n",
+                                        &result.round_trip_average, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "round-trip min/avg/max/sdev = %*f/%lf/%*f/%*f%n",
+                                        &result.round_trip_average, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "round-trip min/avg/max/stddev = %*f/%lf/%*f/%*f%n",
+                                        &result.round_trip_average, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "round-trip min/avg/max/std-dev = %*f/%lf/%*f/%*f%n",
+                                        &result.round_trip_average, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "round-trip (ms) min/avg/max = %*f/%lf/%*f%n", &result.round_trip_average,
+                                        &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "round-trip (ms) min/avg/max/stddev = %*f/%lf/%*f/%*f%n",
+                                        &result.round_trip_average, &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "rtt min/avg/max/mdev = %*f/%lf/%*f/%*f ms%n", &result.round_trip_average,
+                                        &match) == 1 &&
+                         match) ||
+                        (sscanf(buf, "%*[^=] = %*fms, %*[^=] = %*fms, %*[^=] = %lfms%n",
+                                        &result.round_trip_average, &match) == 1 &&
+                         match)) {
                         continue;
+                }
         }
 
         /* this is needed because there is no rta if all packets are lost */
-        if (pl == 100)
-                rta = crta;
+        if (result.packet_loss == 100) {
+                result.round_trip_average = crta;
+        }
 
         /* check stderr, setting at least WARNING if there is output here */
         /* Add warning into warn_text */
         while (fgets(buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
-                if (!strstr(buf, "WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP") && !strstr(buf, "Warning: time of day goes back")
+                if (!strstr(buf, "WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP") &&
+                        !strstr(buf, "Warning: time of day goes back")
 
                 ) {
                         if (verbose >= 3) {
                                 printf("Got stderr: %s", buf);
                         }
-                        if ((result = error_scan(buf, addr)) == STATE_OK) {
-                                result = STATE_WARNING;
+                        if ((result.state = error_scan(buf, addr)) == STATE_OK) {
+                                result.state = STATE_WARNING;
                                 if (warn_text == NULL) {
                                         warn_text = strdup(_("System call sent warnings to stderr "));
                                 } else {
-                                        xasprintf(&warn_text, "%s %s", warn_text, _("System call sent warnings to stderr "));
+                                        xasprintf(&warn_text, "%s %s", warn_text,
+                                                          _("System call sent warnings to stderr "));
                                 }
                         }
                 }
@@ -474,43 +577,48 @@ int run_ping(const char *cmd, const char *addr) {
 
         spclose(child_process);
 
-        if (warn_text == NULL)
+        if (warn_text == NULL) {
                 warn_text = strdup("");
+        }
 
         return result;
 }
 
-int error_scan(char buf[MAX_INPUT_BUFFER], const char *addr) {
-        if (strstr(buf, "Network is unreachable") || strstr(buf, "Destination Net Unreachable") || strstr(buf, "No route"))
+mp_state_enum error_scan(char buf[MAX_INPUT_BUFFER], const char *addr) {
+        if (strstr(buf, "Network is unreachable") || strstr(buf, "Destination Net Unreachable") ||
+                strstr(buf, "No route")) {
                 die(STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)\n"), addr);
-        else if (strstr(buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable"))
+        } else if (strstr(buf, "Destination Host Unreachable") || strstr(buf, "Address unreachable")) {
                 die(STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)\n"), addr);
-        else if (strstr(buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable"))
+        } else if (strstr(buf, "Destination Port Unreachable") || strstr(buf, "Port unreachable")) {
                 die(STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"), addr);
-        else if (strstr(buf, "Destination Protocol Unreachable"))
+        } else if (strstr(buf, "Destination Protocol Unreachable")) {
                 die(STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"), addr);
-        else if (strstr(buf, "Destination Net Prohibited"))
+        } else if (strstr(buf, "Destination Net Prohibited")) {
                 die(STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr);
-        else if (strstr(buf, "Destination Host Prohibited"))
+        } else if (strstr(buf, "Destination Host Prohibited")) {
                 die(STATE_CRITICAL, _("CRITICAL - Host Prohibited (%s)\n"), addr);
-        else if (strstr(buf, "Packet filtered") || strstr(buf, "Administratively prohibited"))
+        } else if (strstr(buf, "Packet filtered") || strstr(buf, "Administratively prohibited")) {
                 die(STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr);
-        else if (strstr(buf, "unknown host"))
+        } else if (strstr(buf, "unknown host")) {
                 die(STATE_CRITICAL, _("CRITICAL - Host not found (%s)\n"), addr);
-        else if (strstr(buf, "Time to live exceeded") || strstr(buf, "Time exceeded"))
+        } else if (strstr(buf, "Time to live exceeded") || strstr(buf, "Time exceeded")) {
                 die(STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)\n"), addr);
-        else if (strstr(buf, "Destination unreachable: "))
+        } else if (strstr(buf, "Destination unreachable: ")) {
                 die(STATE_CRITICAL, _("CRITICAL - Destination Unreachable (%s)\n"), addr);
+        }
 
         if (strstr(buf, "(DUP!)") || strstr(buf, "DUPLICATES FOUND")) {
-                if (warn_text == NULL)
+                if (warn_text == NULL) {
                         warn_text = strdup(_(WARN_DUPLICATES));
-                else if (!strstr(warn_text, _(WARN_DUPLICATES)) && xasprintf(&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1)
+                } else if (!strstr(warn_text, _(WARN_DUPLICATES)) &&
+                                   xasprintf(&warn_text, "%s %s", warn_text, _(WARN_DUPLICATES)) == -1) {
                         die(STATE_UNKNOWN, _("Unable to realloc warn_text\n"));
-                return (STATE_WARNING);
+                }
+                return STATE_WARNING;
         }
 
-        return (STATE_OK);
+        return STATE_OK;
 }
 
 void print_help(void) {
@@ -550,10 +658,10 @@ void print_help(void) {
         printf("%s\n", _("percentage of packet loss to trigger an alarm state."));
 
         printf("\n");
-        printf("%s\n", _("This plugin uses the ping command to probe the specified host for packet loss"));
-        printf("%s\n", _("(percentage) and round trip average (milliseconds). It can produce HTML output"));
-        printf("%s\n", _("linking to a traceroute CGI contributed by Ian Cass. The CGI can be found in"));
-        printf("%s\n", _("the contrib area of the downloads section at http://www.nagios.org/"));
+        printf("%s\n",
+                   _("This plugin uses the ping command to probe the specified host for packet loss"));
+        printf("%s\n",
+                   _("(percentage) and round trip average (milliseconds). It can produce HTML output."));
 
         printf(UT_SUPPORT);
 }
diff --git a/plugins/check_ping.d/config.h b/plugins/check_ping.d/config.h
new file mode 100644
index 00000000..eb2735a7
--- /dev/null
+++ b/plugins/check_ping.d/config.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+#include <stdlib.h>
+
+enum {
+        UNKNOWN_PACKET_LOSS = 200, /* 200% */
+        DEFAULT_MAX_PACKETS = 5    /* default no. of ICMP ECHO packets */
+};
+
+#define UNKNOWN_TRIP_TIME -1.0 /* -1 seconds */
+
+#define MAX_ADDR_START 1
+
+typedef struct {
+        bool display_html;
+        int max_packets;
+
+        char **addresses;
+        size_t n_addresses;
+
+        int wpl;
+        int cpl;
+        double wrta;
+        double crta;
+} check_ping_config;
+
+check_ping_config check_ping_config_init() {
+        check_ping_config tmp = {
+                .display_html = false,
+                .max_packets = -1,
+
+                .addresses = NULL,
+                .n_addresses = 0,
+
+                .wpl = UNKNOWN_PACKET_LOSS,
+                .cpl = UNKNOWN_PACKET_LOSS,
+                .wrta = UNKNOWN_TRIP_TIME,
+                .crta = UNKNOWN_TRIP_TIME,
+        };
+
+        tmp.addresses = calloc(MAX_ADDR_START, sizeof(char *));
+        tmp.addresses[0] = NULL;
+        return tmp;
+}
diff --git a/plugins/check_procs.c b/plugins/check_procs.c
index 1d78ccee..ae6e9c23 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -1,41 +1,41 @@
 /*****************************************************************************
-*
-* Monitoring check_procs plugin
-*
-* License: GPL
-* Copyright (c) 2000-2024 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_procs plugin
-*
-* Checks all processes and generates WARNING or CRITICAL states if the
-* specified metric is outside the required threshold ranges. The metric
-* defaults to number of processes.  Search filters can be applied to limit
-* the processes to check.
-*
-* The parent process, check_procs itself and any child process of 
-* check_procs (ps) are excluded from any checks to prevent false positives.
-*
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring check_procs plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_procs plugin
+ *
+ * Checks all processes and generates WARNING or CRITICAL states if the
+ * specified metric is outside the required threshold ranges. The metric
+ * defaults to number of processes.  Search filters can be applied to limit
+ * the processes to check.
+ *
+ * The parent process, check_procs itself and any child process of
+ * check_procs (ps) are excluded from any checks to prevent false positives.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_procs";
-const char *program_name = "check_procs";  /* Required for coreutils libs */
+const char *program_name = "check_procs"; /* Required for coreutils libs */
 const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
@@ -43,313 +43,297 @@ const char *email = "devel@monitoring-plugins.org";
 #include "utils.h"
 #include "utils_cmd.h"
 #include "regex.h"
+#include "states.h"
+#include "check_procs.d/config.h"
 
 #include <pwd.h>
 #include <errno.h>
 
 #ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
+#       include <sys/stat.h>
 #endif
 
-static int process_arguments (int /*argc*/, char ** /*argv*/);
-static int validate_arguments (void);
-static int convert_to_seconds (char * /*etime*/);
-static void print_help (void);
-void print_usage (void);
-
-static char *warning_range = NULL;
-static char *critical_range = NULL;
-static thresholds *procs_thresholds = NULL;
-
-static int options = 0; /* bitmask of filter criteria to test against */
-#define ALL 1
-#define STAT 2
-#define PPID 4
-#define USER 8
-#define PROG 16
-#define ARGS 32
-#define VSZ  64
-#define RSS  128
-#define PCPU 256
-#define ELAPSED 512
-#define EREG_ARGS 1024
+typedef struct {
+        int errorcode;
+        check_procs_config config;
+} check_procs_config_wrapper;
+static check_procs_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_procs_config_wrapper validate_arguments(check_procs_config_wrapper /*config_wrapper*/);
+
+static int convert_to_seconds(char * /*etime*/, enum metric /*metric*/);
+static void print_help(void);
+void print_usage(void);
+
+#define ALL           1
+#define STAT          2
+#define PPID          4
+#define USER          8
+#define PROG          16
+#define ARGS          32
+#define VSZ           64
+#define RSS           128
+#define PCPU          256
+#define ELAPSED       512
+#define EREG_ARGS     1024
 #define EXCLUDE_PROGS 2048
 
-#define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads:
-                                                        ppid of procs are compared to pid of this proc*/
-
-/* Different metrics */
-char *metric_name;
-enum metric {
-        METRIC_PROCS,
-        METRIC_VSZ,
-        METRIC_RSS,
-        METRIC_CPU,
-        METRIC_ELAPSED
-};
-enum metric metric = METRIC_PROCS;
+#define KTHREAD_PARENT                                                                             \
+        "kthreadd" /* the parent process of kernel threads:                                            \
+                 ppid of procs are compared to pid of this proc*/
 
 static int verbose = 0;
-static int uid;
-static pid_t ppid;
-static int vsz;
-static int rss;
-static float pcpu;
-static char *statopts;
-static char *prog;
-static char *exclude_progs;
-static char **exclude_progs_arr = NULL;
-static char exclude_progs_counter = 0;
-static char *args;
-static char *input_filename = NULL;
-static regex_t re_args;
-static char *fmt;
-static char *fails;
-static char tmp[MAX_INPUT_BUFFER];
-static int kthread_filter = 0;
-static int usepid = 0; /* whether to test for pid or /proc/pid/exe */
-
-static int
-stat_exe (const pid_t pid, struct stat *buf) {
+
+static int stat_exe(const pid_t pid, struct stat *buf) {
         char *path;
-        int ret;
         xasprintf(&path, "/proc/%d/exe", pid);
-        ret = stat(path, buf);
+        int ret = stat(path, buf);
         free(path);
         return ret;
 }
 
-
-int
-main (int argc, char **argv)
-{
-        char *input_buffer;
-        char *input_line;
-        char *procprog;
-
-        pid_t mypid = 0;
-        pid_t myppid = 0;
-        struct stat statbuf;
-        dev_t mydev = 0;
-        ino_t myino = 0;
-        int procuid = 0;
-        pid_t procpid = 0;
-        pid_t procppid = 0;
-        pid_t kthread_ppid = 0;
-        int procvsz = 0;
-        int procrss = 0;
-        int procseconds = 0;
-        float procpcpu = 0;
-        char procstat[8];
-        char procetime[MAX_INPUT_BUFFER] = { '\0' };
-        char *procargs;
-
-        const char *zombie = "Z";
-
-        int resultsum = 0; /* bitmask of the filter criteria met by a process */
-        int found = 0; /* counter for number of lines returned in `ps` output */
-        int procs = 0; /* counter for number of processes meeting filter criteria */
-        int pos; /* number of spaces before 'args' in `ps` output */
-        int cols; /* number of columns in ps output */
-        int expected_cols = PS_COLS - 1;
-        int warn = 0; /* number of processes in warn state */
-        int crit = 0; /* number of processes in crit state */
-        int i = 0;
-        int result = STATE_UNKNOWN;
-        int ret = 0;
-        output chld_out, chld_err;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
         setlocale(LC_NUMERIC, "POSIX");
-
-        input_buffer = malloc (MAX_INPUT_BUFFER);
-        procprog = malloc (MAX_INPUT_BUFFER);
-
-        xasprintf (&metric_name, "PROCS");
-        metric = METRIC_PROCS;
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_procs_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        check_procs_config config = tmp_config.config;
 
         /* find ourself */
-        mypid = getpid();
-        myppid = getppid();
-        if (usepid || stat_exe(mypid, &statbuf) == -1) {
+        pid_t mypid = getpid();
+        pid_t myppid = getppid();
+        dev_t mydev = 0;
+        ino_t myino = 0;
+        struct stat statbuf;
+        if (config.usepid || stat_exe(mypid, &statbuf) == -1) {
                 /* usepid might have been set by -T */
-                usepid = 1;
+                config.usepid = true;
         } else {
-                usepid = 0;
+                config.usepid = false;
                 mydev = statbuf.st_dev;
                 myino = statbuf.st_ino;
         }
 
         /* Set signal handling and alarm timeout */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
-                die (STATE_UNKNOWN, _("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+                die(STATE_UNKNOWN, _("Cannot catch SIGALRM"));
         }
-        (void) alarm ((unsigned) timeout_interval);
+        (void)alarm(timeout_interval);
 
-        if (verbose >= 2)
-                printf (_("CMD: %s\n"), PS_COMMAND);
+        if (verbose >= 2) {
+                printf(_("CMD: %s\n"), PS_COMMAND);
+        }
 
-        if (input_filename == NULL) {
-                result = cmd_run( PS_COMMAND, &chld_out, &chld_err, 0);
+        output chld_out;
+        output chld_err;
+        mp_state_enum result = STATE_UNKNOWN;
+        if (config.input_filename == NULL) {
+                result = cmd_run(PS_COMMAND, &chld_out, &chld_err, 0);
                 if (chld_err.lines > 0) {
-                        printf ("%s: %s", _("System call sent warnings to stderr"), chld_err.line[0]);
+                        printf("%s: %s", _("System call sent warnings to stderr"), chld_err.line[0]);
                         exit(STATE_WARNING);
                 }
         } else {
-                result = cmd_file_read( input_filename, &chld_out, 0);
+                result = cmd_file_read(config.input_filename, &chld_out, 0);
         }
 
+        int pos; /* number of spaces before 'args' in `ps` output */
+        uid_t procuid = 0;
+        pid_t procpid = 0;
+        pid_t procppid = 0;
+        pid_t kthread_ppid = 0;
+        int warn = 0; /* number of processes in warn state */
+        int crit = 0; /* number of processes in crit state */
+        int procvsz = 0;
+        int procrss = 0;
+        int procseconds = 0;
+        float procpcpu = 0;
+        char procstat[8];
+        char procetime[MAX_INPUT_BUFFER] = {'\0'};
+        int resultsum = 0; /* bitmask of the filter criteria met by a process */
+        int found = 0;     /* counter for number of lines returned in `ps` output */
+        int procs = 0;     /* counter for number of processes meeting filter criteria */
+        char *input_buffer = malloc(MAX_INPUT_BUFFER);
+        char *procprog = malloc(MAX_INPUT_BUFFER);
+        const int expected_cols = PS_COLS - 1;
+
         /* flush first line: j starts at 1 */
         for (size_t j = 1; j < chld_out.lines; j++) {
-                input_line = chld_out.line[j];
+                char *input_line = chld_out.line[j];
 
-                if (verbose >= 3)
-                        printf ("%s", input_line);
+                if (verbose >= 3) {
+                        printf("%s", input_line);
+                }
 
-                strcpy (procprog, "");
-                xasprintf (&procargs, "%s", "");
+                strcpy(procprog, "");
+                char *procargs;
+                xasprintf(&procargs, "%s", "");
 
-                cols = sscanf (input_line, PS_FORMAT, PS_VARLIST);
+                /* number of columns in ps output */
+                int cols = sscanf(input_line, PS_FORMAT, PS_VARLIST);
 
                 /* Zombie processes do not give a procprog command */
-                if ( cols < expected_cols && strstr(procstat, zombie) ) {
+                const char *zombie = "Z";
+                if (cols < expected_cols && strstr(procstat, zombie)) {
                         cols = expected_cols;
                 }
-                if ( cols >= expected_cols ) {
+                if (cols >= expected_cols) {
                         resultsum = 0;
-                        xasprintf (&procargs, "%s", input_line + pos);
-                        strip (procargs);
+                        xasprintf(&procargs, "%s", input_line + pos);
+                        strip(procargs);
 
                         /* Some ps return full pathname for command. This removes path */
                         strcpy(procprog, base_name(procprog));
 
                         /* we need to convert the elapsed time to seconds */
-                        procseconds = convert_to_seconds(procetime);
+                        procseconds = convert_to_seconds(procetime, config.metric);
 
-                        if (verbose >= 3)
-                                printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
-                                        procs, procuid, procvsz, procrss,
-                                        procpid, procppid, procpcpu, procstat,
-                                        procetime, procprog, procargs);
+                        if (verbose >= 3) {
+                                printf("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s "
+                                           "prog=%s args=%s\n",
+                                           procs, procuid, procvsz, procrss, procpid, procppid, procpcpu, procstat,
+                                           procetime, procprog, procargs);
+                        }
 
                         /* Ignore self */
-                        if ((usepid && mypid == procpid) ||
-                                ( ((!usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) && statbuf.st_dev == mydev && statbuf.st_ino == myino)) ||
-                                 (ret == -1 && errno == ENOENT))
-                                ) {
-                                if (verbose >= 3)
-                                         printf("not considering - is myself or gone\n");
+                        int ret = 0;
+                        if ((config.usepid && mypid == procpid) ||
+                                (((!config.usepid) && ((ret = stat_exe(procpid, &statbuf) != -1) &&
+                                                                           statbuf.st_dev == mydev && statbuf.st_ino == myino)) ||
+                                 (ret == -1 && errno == ENOENT))) {
+                                if (verbose >= 3) {
+                                        printf("not considering - is myself or gone\n");
+                                }
                                 continue;
                         }
                         /* Ignore parent*/
-                        else if (myppid == procpid) {
-                                if (verbose >= 3)
-                                         printf("not considering - is parent\n");
+                        if (myppid == procpid) {
+                                if (verbose >= 3) {
+                                        printf("not considering - is parent\n");
+                                }
                                 continue;
                         }
 
                         /* Ignore our own children */
                         if (procppid == mypid) {
-                                if (verbose >= 3)
-                                         printf("not considering - is our child\n");
+                                if (verbose >= 3) {
+                                        printf("not considering - is our child\n");
+                                }
                                 continue;
                         }
 
                         /* Ignore excluded processes by name */
-                        if(options & EXCLUDE_PROGS) {
-                          int found = 0;
-                          int i = 0;
-
-                          for(i=0; i < (exclude_progs_counter); i++) {
-                            if(!strcmp(procprog, exclude_progs_arr[i])) {
-                              found = 1;
-                            }
-                          }
-                          if(found == 0) {
-                            resultsum |= EXCLUDE_PROGS;
-                          } else
-                          {
-                            if(verbose >= 3)
-                              printf("excluding - by ignorelist\n");
-                          }
+                        if (config.options & EXCLUDE_PROGS) {
+                                bool found = false;
+                                for (int i = 0; i < (config.exclude_progs_counter); i++) {
+                                        if (!strcmp(procprog, config.exclude_progs_arr[i])) {
+                                                found = true;
+                                        }
+                                }
+                                if (!found) {
+                                        resultsum |= EXCLUDE_PROGS;
+                                } else {
+                                        if (verbose >= 3) {
+                                                printf("excluding - by ignorelist\n");
+                                        }
+                                }
                         }
 
                         /* filter kernel threads (children of KTHREAD_PARENT)*/
                         /* TODO adapt for other OSes than GNU/Linux
                                         sorry for not doing that, but I've no other OSes to test :-( */
-                        if (kthread_filter == 1) {
+                        if (config.kthread_filter) {
                                 /* get pid KTHREAD_PARENT */
-                                if (kthread_ppid == 0 && !strcmp(procprog, KTHREAD_PARENT) )
+                                if (kthread_ppid == 0 && !strcmp(procprog, KTHREAD_PARENT)) {
                                         kthread_ppid = procpid;
+                                }
 
                                 if (kthread_ppid == procppid) {
-                                        if (verbose >= 2)
-                                                printf ("Ignore kernel thread: pid=%d ppid=%d prog=%s args=%s\n", procpid, procppid, procprog, procargs);
+                                        if (verbose >= 2) {
+                                                printf("Ignore kernel thread: pid=%d ppid=%d prog=%s args=%s\n", procpid,
+                                                           procppid, procprog, procargs);
+                                        }
                                         continue;
                                 }
                         }
 
-                        if ((options & STAT) && (strstr (procstat, statopts)))
+                        if ((config.options & STAT) && (strstr(procstat, config.statopts))) {
                                 resultsum |= STAT;
-                        if ((options & ARGS) && procargs && (strstr (procargs, args) != NULL))
+                        }
+                        if ((config.options & ARGS) && procargs && (strstr(procargs, config.args) != NULL)) {
                                 resultsum |= ARGS;
-                        if ((options & EREG_ARGS) && procargs && (regexec(&re_args, procargs, (size_t) 0, NULL, 0) == 0))
+                        }
+                        if ((config.options & EREG_ARGS) && procargs &&
+                                (regexec(&config.re_args, procargs, (size_t)0, NULL, 0) == 0)) {
                                 resultsum |= EREG_ARGS;
-                        if ((options & PROG) && procprog && (strcmp (prog, procprog) == 0))
+                        }
+                        if ((config.options & PROG) && procprog && (strcmp(config.prog, procprog) == 0)) {
                                 resultsum |= PROG;
-                        if ((options & PPID) && (procppid == ppid))
+                        }
+                        if ((config.options & PPID) && (procppid == config.ppid)) {
                                 resultsum |= PPID;
-                        if ((options & USER) && (procuid == uid))
+                        }
+                        if ((config.options & USER) && (procuid == config.uid)) {
                                 resultsum |= USER;
-                        if ((options & VSZ)  && (procvsz >= vsz))
+                        }
+                        if ((config.options & VSZ) && (procvsz >= config.vsz)) {
                                 resultsum |= VSZ;
-                        if ((options & RSS)  && (procrss >= rss))
+                        }
+                        if ((config.options & RSS) && (procrss >= config.rss)) {
                                 resultsum |= RSS;
-                        if ((options & PCPU)  && (procpcpu >= pcpu))
+                        }
+                        if ((config.options & PCPU) && (procpcpu >= config.pcpu)) {
                                 resultsum |= PCPU;
+                        }
 
                         found++;
 
                         /* Next line if filters not matched */
-                        if (!(options == resultsum || options == ALL))
+                        if (!(config.options == resultsum || config.options == ALL)) {
                                 continue;
+                        }
 
                         procs++;
                         if (verbose >= 2) {
-                                printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n",
-                                        procuid, procvsz, procrss,
-                                        procpid, procppid, procpcpu, procstat,
-                                        procetime, procprog, procargs);
+                                printf("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s "
+                                           "prog=%s args=%s\n",
+                                           procuid, procvsz, procrss, procpid, procppid, procpcpu, procstat, procetime,
+                                           procprog, procargs);
                         }
 
-                        if (metric == METRIC_VSZ)
-                                i = get_status ((double)procvsz, procs_thresholds);
-                        else if (metric == METRIC_RSS)
-                                i = get_status ((double)procrss, procs_thresholds);
+                        mp_state_enum temporary_result = STATE_OK;
+                        if (config.metric == METRIC_VSZ) {
+                                temporary_result = get_status((double)procvsz, config.procs_thresholds);
+                        } else if (config.metric == METRIC_RSS) {
+                                temporary_result = get_status((double)procrss, config.procs_thresholds);
+                        }
                         /* TODO? float thresholds for --metric=CPU */
-                        else if (metric == METRIC_CPU)
-                                i = get_status (procpcpu, procs_thresholds);
-                        else if (metric == METRIC_ELAPSED)
-                                i = get_status ((double)procseconds, procs_thresholds);
+                        else if (config.metric == METRIC_CPU) {
+                                temporary_result = get_status(procpcpu, config.procs_thresholds);
+                        } else if (config.metric == METRIC_ELAPSED) {
+                                temporary_result = get_status((double)procseconds, config.procs_thresholds);
+                        }
 
-                        if (metric != METRIC_PROCS) {
-                                if (i == STATE_WARNING) {
+                        if (config.metric != METRIC_PROCS) {
+                                if (temporary_result == STATE_WARNING) {
                                         warn++;
-                                        xasprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), procprog);
-                                        result = max_state (result, i);
+                                        xasprintf(&config.fails, "%s%s%s", config.fails,
+                                                          (strcmp(config.fails, "") ? ", " : ""), procprog);
+                                        result = max_state(result, temporary_result);
                                 }
-                                if (i == STATE_CRITICAL) {
+                                if (temporary_result == STATE_CRITICAL) {
                                         crit++;
-                                        xasprintf (&fails, "%s%s%s", fails, (strcmp(fails,"") ? ", " : ""), procprog);
-                                        result = max_state (result, i);
+                                        xasprintf(&config.fails, "%s%s%s", config.fails,
+                                                          (strcmp(config.fails, "") ? ", " : ""), procprog);
+                                        result = max_state(result, temporary_result);
                                 }
                         }
                 }
@@ -359,339 +343,366 @@ main (int argc, char **argv)
                 }
         }
 
-        if (found == 0) {                                                       /* no process lines parsed so return STATE_UNKNOWN */
-                printf (_("Unable to read output\n"));
+        if (found == 0) { /* no process lines parsed so return STATE_UNKNOWN */
+                printf(_("Unable to read output\n"));
                 return STATE_UNKNOWN;
         }
 
-        if ( result == STATE_UNKNOWN )
+        if (result == STATE_UNKNOWN) {
                 result = STATE_OK;
+        }
 
         /* Needed if procs found, but none match filter */
-        if ( metric == METRIC_PROCS ) {
-                result = max_state (result, get_status ((double)procs, procs_thresholds) );
+        if (config.metric == METRIC_PROCS) {
+                result = max_state(result, get_status((double)procs, config.procs_thresholds));
         }
 
-        if ( result == STATE_OK ) {
-                printf ("%s %s: ", metric_name, _("OK"));
+        if (result == STATE_OK) {
+                printf("%s %s: ", config.metric_name, _("OK"));
         } else if (result == STATE_WARNING) {
-                printf ("%s %s: ", metric_name, _("WARNING"));
-                if ( metric != METRIC_PROCS ) {
-                        printf (_("%d warn out of "), warn);
+                printf("%s %s: ", config.metric_name, _("WARNING"));
+                if (config.metric != METRIC_PROCS) {
+                        printf(_("%d warn out of "), warn);
                 }
         } else if (result == STATE_CRITICAL) {
-                printf ("%s %s: ", metric_name, _("CRITICAL"));
-                if (metric != METRIC_PROCS) {
-                        printf (_("%d crit, %d warn out of "), crit, warn);
+                printf("%s %s: ", config.metric_name, _("CRITICAL"));
+                if (config.metric != METRIC_PROCS) {
+                        printf(_("%d crit, %d warn out of "), crit, warn);
                 }
         }
-        printf (ngettext ("%d process", "%d processes", (unsigned long) procs), procs);
+        printf(ngettext("%d process", "%d processes", (unsigned long)procs), procs);
 
-        if (strcmp(fmt,"") != 0) {
-                printf (_(" with %s"), fmt);
+        if (strcmp(config.fmt, "") != 0) {
+                printf(_(" with %s"), config.fmt);
         }
 
-        if ( verbose >= 1 && strcmp(fails,"") )
-                printf (" [%s]", fails);
+        if (verbose >= 1 && strcmp(config.fails, "")) {
+                printf(" [%s]", config.fails);
+        }
 
-        if (metric == METRIC_PROCS)
-                printf (" | procs=%d;%s;%s;0;", procs,
-                                warning_range ? warning_range : "",
-                                critical_range ? critical_range : "");
-        else
-                printf (" | procs=%d;;;0; procs_warn=%d;;;0; procs_crit=%d;;;0;", procs, warn, crit);
+        if (config.metric == METRIC_PROCS) {
+                printf(" | procs=%d;%s;%s;0;", procs, config.warning_range ? config.warning_range : "",
+                           config.critical_range ? config.critical_range : "");
+        } else {
+                printf(" | procs=%d;;;0; procs_warn=%d;;;0; procs_crit=%d;;;0;", procs, warn, crit);
+        }
 
-        printf ("\n");
-        return result;
+        printf("\n");
+        exit(result);
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c = 1;
-        char *user;
-        struct passwd *pw;
-        int option = 0;
-        int err;
-        int cflags = REG_NOSUB | REG_EXTENDED;
-        char errbuf[MAX_INPUT_BUFFER];
-        char *temp_string;
-        int i=0;
-        static struct option longopts[] = {
-                {"warning", required_argument, 0, 'w'},
-                {"critical", required_argument, 0, 'c'},
-                {"metric", required_argument, 0, 'm'},
-                {"timeout", required_argument, 0, 't'},
-                {"status", required_argument, 0, 's'},
-                {"ppid", required_argument, 0, 'p'},
-                {"user", required_argument, 0, 'u'},
-                {"command", required_argument, 0, 'C'},
-                {"vsz", required_argument, 0, 'z'},
-                {"rss", required_argument, 0, 'r'},
-                {"pcpu", required_argument, 0, 'P'},
-                {"elapsed", required_argument, 0, 'e'},
-                {"argument-array", required_argument, 0, 'a'},
-                {"help", no_argument, 0, 'h'},
-                {"version", no_argument, 0, 'V'},
-                {"verbose", no_argument, 0, 'v'},
-                {"ereg-argument-array", required_argument, 0, CHAR_MAX+1},
-                {"input-file", required_argument, 0, CHAR_MAX+2},
-                {"no-kthreads", required_argument, 0, 'k'},
-                {"traditional-filter", no_argument, 0, 'T'},
-                {"exclude-process", required_argument, 0, 'X'},
-                {0, 0, 0, 0}
-        };
+check_procs_config_wrapper process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"metric", required_argument, 0, 'm'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"status", required_argument, 0, 's'},
+                                                                           {"ppid", required_argument, 0, 'p'},
+                                                                           {"user", required_argument, 0, 'u'},
+                                                                           {"command", required_argument, 0, 'C'},
+                                                                           {"vsz", required_argument, 0, 'z'},
+                                                                           {"rss", required_argument, 0, 'r'},
+                                                                           {"pcpu", required_argument, 0, 'P'},
+                                                                           {"elapsed", required_argument, 0, 'e'},
+                                                                           {"argument-array", required_argument, 0, 'a'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"ereg-argument-array", required_argument, 0, CHAR_MAX + 1},
+                                                                           {"input-file", required_argument, 0, CHAR_MAX + 2},
+                                                                           {"no-kthreads", required_argument, 0, 'k'},
+                                                                           {"traditional-filter", no_argument, 0, 'T'},
+                                                                           {"exclude-process", required_argument, 0, 'X'},
+                                                                           {0, 0, 0, 0}};
+
+        for (int index = 1; index < argc; index++) {
+                if (strcmp("-to", argv[index]) == 0) {
+                        strcpy(argv[index], "-t");
+                }
+        }
 
-        for (c = 1; c < argc; c++)
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
+        check_procs_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_procs_config_init(),
+        };
 
-        while (1) {
-                c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:",
-                        longopts, &option);
+        while (true) {
+                int option = 0;
+                int option_index =
+                        getopt_long(argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T:X:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_index == -1 || option_index == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case '?':                                                                       /* help */
-                        usage5 ();
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 't':                                                                       /* timeout period */
-                        if (!is_integer (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
-                        else
-                                timeout_interval = atoi (optarg);
+                switch (option_index) {
+                case '?': /* help */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 't': /* timeout period */
+                        if (!is_integer(optarg)) {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        } else {
+                                timeout_interval = atoi(optarg);
+                        }
                         break;
-                case 'c':                                                                       /* critical threshold */
-                        critical_range = optarg;
+                case 'c': /* critical threshold */
+                        result.config.critical_range = optarg;
                         break;
-                case 'w':                                                                       /* warning threshold */
-                        warning_range = optarg;
+                case 'w': /* warning threshold */
+                        result.config.warning_range = optarg;
                         break;
-                case 'p':                                                                       /* process id */
-                        if (sscanf (optarg, "%d%[^0-9]", &ppid, tmp) == 1) {
-                                xasprintf (&fmt, "%s%sPPID = %d", (fmt ? fmt : "") , (options ? ", " : ""), ppid);
-                                options |= PPID;
+                case 'p': { /* process id */
+                        static char tmp[MAX_INPUT_BUFFER];
+                        if (sscanf(optarg, "%d%[^0-9]", &result.config.ppid, tmp) == 1) {
+                                xasprintf(&result.config.fmt, "%s%sPPID = %d",
+                                                  (result.config.fmt ? result.config.fmt : ""),
+                                                  (result.config.options ? ", " : ""), result.config.ppid);
+                                result.config.options |= PPID;
                                 break;
                         }
-                        usage4 (_("Parent Process ID must be an integer!"));
-                case 's':                                                                       /* status */
-                        if (statopts)
+                        usage4(_("Parent Process ID must be an integer!"));
+                }
+                case 's': /* status */
+                        if (result.config.statopts) {
                                 break;
-                        else
-                                statopts = optarg;
-                        xasprintf (&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts);
-                        options |= STAT;
+                        } else {
+                                result.config.statopts = optarg;
+                        }
+                        xasprintf(&result.config.fmt, _("%s%sSTATE = %s"),
+                                          (result.config.fmt ? result.config.fmt : ""),
+                                          (result.config.options ? ", " : ""), result.config.statopts);
+                        result.config.options |= STAT;
                         break;
-                case 'u':                                                                       /* user or user id */
-                        if (is_integer (optarg)) {
-                                uid = atoi (optarg);
-                                pw = getpwuid ((uid_t) uid);
+                case 'u': /* user or user id */ {
+                        struct passwd *pw;
+                        if (is_integer(optarg)) {
+                                result.config.uid = atoi(optarg);
+                                pw = getpwuid(result.config.uid);
                                 /*  check to be sure user exists */
-                                if (pw == NULL)
-                                        usage2 (_("UID was not found"), optarg);
-                        }
-                        else {
-                                pw = getpwnam (optarg);
+                                if (pw == NULL) {
+                                        usage2(_("UID was not found"), optarg);
+                                }
+                        } else {
+                                pw = getpwnam(optarg);
                                 /*  check to be sure user exists */
-                                if (pw == NULL)
-                                        usage2 (_("User name was not found"), optarg);
+                                if (pw == NULL) {
+                                        usage2(_("User name was not found"), optarg);
+                                }
                                 /*  then get uid */
-                                uid = pw->pw_uid;
+                                result.config.uid = pw->pw_uid;
                         }
-                        user = pw->pw_name;
-                        xasprintf (&fmt, "%s%sUID = %d (%s)", (fmt ? fmt : ""), (options ? ", " : ""),
-                                  uid, user);
-                        options |= USER;
-                        break;
-                case 'C':                                                                       /* command */
+
+                        char *user = pw->pw_name;
+                        xasprintf(&result.config.fmt, "%s%sUID = %d (%s)",
+                                          (result.config.fmt ? result.config.fmt : ""),
+                                          (result.config.options ? ", " : ""), result.config.uid, user);
+                        result.config.options |= USER;
+                } break;
+                case 'C': /* command */
                         /* TODO: allow this to be passed in with --metric */
-                        if (prog)
+                        if (result.config.prog) {
                                 break;
-                        else
-                                prog = optarg;
-                        xasprintf (&fmt, _("%s%scommand name '%s'"), (fmt ? fmt : ""), (options ? ", " : ""),
-                                  prog);
-                        options |= PROG;
+                        } else {
+                                result.config.prog = optarg;
+                        }
+                        xasprintf(&result.config.fmt, _("%s%scommand name '%s'"),
+                                          (result.config.fmt ? result.config.fmt : ""),
+                                          (result.config.options ? ", " : ""), result.config.prog);
+                        result.config.options |= PROG;
                         break;
                 case 'X':
-                        if(exclude_progs)
-                          break;
-                        else
-                          exclude_progs = optarg;
-                        xasprintf (&fmt, _("%s%sexclude progs '%s'"), (fmt ? fmt : ""), (options ? ", " : ""),
-                                   exclude_progs);
-                        char *p = strtok(exclude_progs, ",");
-
-                        while(p){
-                          exclude_progs_arr = realloc(exclude_progs_arr, sizeof(char*) * ++exclude_progs_counter);
-                          exclude_progs_arr[exclude_progs_counter-1] = p;
-                          p = strtok(NULL, ",");
+                        if (result.config.exclude_progs) {
+                                break;
+                        } else {
+                                result.config.exclude_progs = optarg;
+                        }
+                        xasprintf(&result.config.fmt, _("%s%sexclude progs '%s'"),
+                                          (result.config.fmt ? result.config.fmt : ""),
+                                          (result.config.options ? ", " : ""), result.config.exclude_progs);
+                        char *tmp_pointer = strtok(result.config.exclude_progs, ",");
+
+                        while (tmp_pointer) {
+                                result.config.exclude_progs_arr =
+                                        realloc(result.config.exclude_progs_arr,
+                                                        sizeof(char *) * ++result.config.exclude_progs_counter);
+                                result.config.exclude_progs_arr[result.config.exclude_progs_counter - 1] =
+                                        tmp_pointer;
+                                tmp_pointer = strtok(NULL, ",");
                         }
 
-                        options |= EXCLUDE_PROGS;
+                        result.config.options |= EXCLUDE_PROGS;
                         break;
-                case 'a':                                                                       /* args (full path name with args) */
+                case 'a': /* args (full path name with args) */
                         /* TODO: allow this to be passed in with --metric */
-                        if (args)
+                        if (result.config.args) {
                                 break;
-                        else
-                                args = optarg;
-                        xasprintf (&fmt, "%s%sargs '%s'", (fmt ? fmt : ""), (options ? ", " : ""), args);
-                        options |= ARGS;
+                        } else {
+                                result.config.args = optarg;
+                        }
+                        xasprintf(&result.config.fmt, "%s%sargs '%s'",
+                                          (result.config.fmt ? result.config.fmt : ""),
+                                          (result.config.options ? ", " : ""), result.config.args);
+                        result.config.options |= ARGS;
                         break;
-                case CHAR_MAX+1:
-                        err = regcomp(&re_args, optarg, cflags);
+                case CHAR_MAX + 1: {
+                        int cflags = REG_NOSUB | REG_EXTENDED;
+                        int err = regcomp(&result.config.re_args, optarg, cflags);
                         if (err != 0) {
-                                regerror (err, &re_args, errbuf, MAX_INPUT_BUFFER);
-                                die (STATE_UNKNOWN, "PROCS %s: %s - %s\n", _("UNKNOWN"), _("Could not compile regular expression"), errbuf);
+                                char errbuf[MAX_INPUT_BUFFER];
+                                regerror(err, &result.config.re_args, errbuf, MAX_INPUT_BUFFER);
+                                die(STATE_UNKNOWN, "PROCS %s: %s - %s\n", _("UNKNOWN"),
+                                        _("Could not compile regular expression"), errbuf);
                         }
                         /* Strip off any | within the regex optarg */
-                        temp_string = strdup(optarg);
-                        while(temp_string[i]!='\0'){
-                                if(temp_string[i]=='|')
-                                        temp_string[i]=',';
-                                i++;
-                        }
-                        xasprintf (&fmt, "%s%sregex args '%s'", (fmt ? fmt : ""), (options ? ", " : ""), temp_string);
-                        options |= EREG_ARGS;
-                        break;
-                case 'r':                                       /* RSS */
-                        if (sscanf (optarg, "%d%[^0-9]", &rss, tmp) == 1) {
-                                xasprintf (&fmt, "%s%sRSS >= %d", (fmt ? fmt : ""), (options ? ", " : ""), rss);
-                                options |= RSS;
+                        char *temp_string = strdup(optarg);
+                        int index = 0;
+                        while (temp_string[index] != '\0') {
+                                if (temp_string[index] == '|') {
+                                        temp_string[index] = ',';
+                                }
+                                index++;
+                        }
+                        xasprintf(&result.config.fmt, "%s%sregex args '%s'",
+                                          (result.config.fmt ? result.config.fmt : ""),
+                                          (result.config.options ? ", " : ""), temp_string);
+                        result.config.options |= EREG_ARGS;
+                } break;
+                case 'r': { /* RSS */
+                        static char tmp[MAX_INPUT_BUFFER];
+                        if (sscanf(optarg, "%d%[^0-9]", &result.config.rss, tmp) == 1) {
+                                xasprintf(&result.config.fmt, "%s%sRSS >= %d",
+                                                  (result.config.fmt ? result.config.fmt : ""),
+                                                  (result.config.options ? ", " : ""), result.config.rss);
+                                result.config.options |= RSS;
                                 break;
                         }
-                        usage4 (_("RSS must be an integer!"));
-                case 'z':                                       /* VSZ */
-                        if (sscanf (optarg, "%d%[^0-9]", &vsz, tmp) == 1) {
-                                xasprintf (&fmt, "%s%sVSZ >= %d", (fmt ? fmt : ""), (options ? ", " : ""), vsz);
-                                options |= VSZ;
+                        usage4(_("RSS must be an integer!"));
+                }
+                case 'z': { /* VSZ */
+                        static char tmp[MAX_INPUT_BUFFER];
+                        if (sscanf(optarg, "%d%[^0-9]", &result.config.vsz, tmp) == 1) {
+                                xasprintf(&result.config.fmt, "%s%sVSZ >= %d",
+                                                  (result.config.fmt ? result.config.fmt : ""),
+                                                  (result.config.options ? ", " : ""), result.config.vsz);
+                                result.config.options |= VSZ;
                                 break;
                         }
-                        usage4 (_("VSZ must be an integer!"));
-                case 'P':                                       /* PCPU */
+                        usage4(_("VSZ must be an integer!"));
+                }
+                case 'P': { /* PCPU */
                         /* TODO: -P 1.5.5 is accepted */
-                        if (sscanf (optarg, "%f%[^0-9.]", &pcpu, tmp) == 1) {
-                                xasprintf (&fmt, "%s%sPCPU >= %.2f", (fmt ? fmt : ""), (options ? ", " : ""), pcpu);
-                                options |= PCPU;
+                        static char tmp[MAX_INPUT_BUFFER];
+                        if (sscanf(optarg, "%f%[^0-9.]", &result.config.pcpu, tmp) == 1) {
+                                xasprintf(&result.config.fmt, "%s%sPCPU >= %.2f",
+                                                  (result.config.fmt ? result.config.fmt : ""),
+                                                  (result.config.options ? ", " : ""), result.config.pcpu);
+                                result.config.options |= PCPU;
                                 break;
                         }
-                        usage4 (_("PCPU must be a float!"));
+                        usage4(_("PCPU must be a float!"));
+                }
                 case 'm':
-                        xasprintf (&metric_name, "%s", optarg);
-                        if ( strcmp(optarg, "PROCS") == 0) {
-                                metric = METRIC_PROCS;
+                        xasprintf(&result.config.metric_name, "%s", optarg);
+                        if (strcmp(optarg, "PROCS") == 0) {
+                                result.config.metric = METRIC_PROCS;
                                 break;
                         }
-                        else if ( strcmp(optarg, "VSZ") == 0) {
-                                metric = METRIC_VSZ;
+                        if (strcmp(optarg, "VSZ") == 0) {
+                                result.config.metric = METRIC_VSZ;
                                 break;
                         }
-                        else if ( strcmp(optarg, "RSS") == 0 ) {
-                                metric = METRIC_RSS;
+                        if (strcmp(optarg, "RSS") == 0) {
+                                result.config.metric = METRIC_RSS;
                                 break;
                         }
-                        else if ( strcmp(optarg, "CPU") == 0 ) {
-                                metric = METRIC_CPU;
+                        if (strcmp(optarg, "CPU") == 0) {
+                                result.config.metric = METRIC_CPU;
                                 break;
                         }
-                        else if ( strcmp(optarg, "ELAPSED") == 0) {
-                                metric = METRIC_ELAPSED;
+                        if (strcmp(optarg, "ELAPSED") == 0) {
+                                result.config.metric = METRIC_ELAPSED;
                                 break;
                         }
 
-                        usage4 (_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"));
-                case 'k':       /* linux kernel thread filter */
-                        kthread_filter = 1;
+                        usage4(_("Metric must be one of PROCS, VSZ, RSS, CPU, ELAPSED!"));
+                case 'k': /* linux kernel thread filter */
+                        result.config.kthread_filter = true;
                         break;
-                case 'v':                                                                       /* command */
+                case 'v': /* command */
                         verbose++;
                         break;
                 case 'T':
-                        usepid = 1;
+                        result.config.usepid = true;
                         break;
-                case CHAR_MAX+2:
-                        input_filename = optarg;
+                case CHAR_MAX + 2:
+                        result.config.input_filename = optarg;
                         break;
                 }
         }
 
-        c = optind;
-        if ((! warning_range) && argv[c])
-                warning_range = argv[c++];
-        if ((! critical_range) && argv[c])
-                critical_range = argv[c++];
-        if (statopts == NULL && argv[c]) {
-                xasprintf (&statopts, "%s", argv[c++]);
-                xasprintf (&fmt, _("%s%sSTATE = %s"), (fmt ? fmt : ""), (options ? ", " : ""), statopts);
-                options |= STAT;
+        int index = optind;
+        if ((!result.config.warning_range) && argv[index]) {
+                result.config.warning_range = argv[index++];
+        }
+        if ((!result.config.critical_range) && argv[index]) {
+                result.config.critical_range = argv[index++];
+        }
+        if (result.config.statopts == NULL && argv[index]) {
+                xasprintf(&result.config.statopts, "%s", argv[index++]);
+                xasprintf(&result.config.fmt, _("%s%sSTATE = %s"),
+                                  (result.config.fmt ? result.config.fmt : ""), (result.config.options ? ", " : ""),
+                                  result.config.statopts);
+                result.config.options |= STAT;
         }
 
         /* this will abort in case of invalid ranges */
-        set_thresholds (&procs_thresholds, warning_range, critical_range);
+        set_thresholds(&result.config.procs_thresholds, result.config.warning_range,
+                                   result.config.critical_range);
 
-        return validate_arguments ();
+        return validate_arguments(result);
 }
 
+check_procs_config_wrapper validate_arguments(check_procs_config_wrapper config_wrapper) {
+        if (config_wrapper.config.options == 0) {
+                config_wrapper.config.options = ALL;
+        }
 
+        if (config_wrapper.config.statopts == NULL) {
+                config_wrapper.config.statopts = strdup("");
+        }
 
-int
-validate_arguments ()
-{
-        if (options == 0)
-                options = ALL;
-
-        if (statopts==NULL)
-                statopts = strdup("");
-
-        if (prog==NULL)
-                prog = strdup("");
+        if (config_wrapper.config.prog == NULL) {
+                config_wrapper.config.prog = strdup("");
+        }
 
-        if (args==NULL)
-                args = strdup("");
+        if (config_wrapper.config.args == NULL) {
+                config_wrapper.config.args = strdup("");
+        }
 
-        if (fmt==NULL)
-                fmt = strdup("");
+        if (config_wrapper.config.fmt == NULL) {
+                config_wrapper.config.fmt = strdup("");
+        }
 
-        if (fails==NULL)
-                fails = strdup("");
+        if (config_wrapper.config.fails == NULL) {
+                config_wrapper.config.fails = strdup("");
+        }
 
-        return options;
+        // return options;
+        return config_wrapper;
 }
 
-
 /* convert the elapsed time to seconds */
-int
-convert_to_seconds(char *etime) {
-
-        char *ptr;
-        int total;
-
-        int hyphcnt;
-        int coloncnt;
-        int days;
-        int hours;
-        int minutes;
-        int seconds;
-
-        hyphcnt = 0;
-        coloncnt = 0;
-        days = 0;
-        hours = 0;
-        minutes = 0;
-        seconds = 0;
-
-        for (ptr = etime; *ptr != '\0'; ptr++) {
+int convert_to_seconds(char *etime, enum metric metric) {
+        int hyphcnt = 0;
+        int coloncnt = 0;
+        for (char *ptr = etime; *ptr != '\0'; ptr++) {
 
                 if (*ptr == '-') {
                         hyphcnt++;
@@ -703,9 +714,12 @@ convert_to_seconds(char *etime) {
                 }
         }
 
+        int days = 0;
+        int hours = 0;
+        int minutes = 0;
+        int seconds = 0;
         if (hyphcnt > 0) {
-                sscanf(etime, "%d-%d:%d:%d",
-                                &days, &hours, &minutes, &seconds);
+                sscanf(etime, "%d-%d:%d:%d", &days, &hours, &minutes, &seconds);
                 /* linux 2.6.5/2.6.6 reporting some processes with infinite
                  * elapsed times for some reason */
                 if (days == 49710) {
@@ -713,135 +727,129 @@ convert_to_seconds(char *etime) {
                 }
         } else {
                 if (coloncnt == 2) {
-                        sscanf(etime, "%d:%d:%d",
-                                &hours, &minutes, &seconds);
+                        sscanf(etime, "%d:%d:%d", &hours, &minutes, &seconds);
                 } else if (coloncnt == 1) {
-                        sscanf(etime, "%d:%d",
-                                &minutes, &seconds);
+                        sscanf(etime, "%d:%d", &minutes, &seconds);
                 }
         }
 
-        total = (days * 86400) +
-                (hours * 3600) +
-                (minutes * 60) +
-                seconds;
+        int total = (days * 86400) + (hours * 3600) + (minutes * 60) + seconds;
 
         if (verbose >= 3 && metric == METRIC_ELAPSED) {
-                        printf("seconds: %d\n", total);
+                printf("seconds: %d\n", total);
         }
         return total;
 }
 
-
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
-
-  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-  printf (COPYRIGHT, copyright, email);
-
-  printf ("%s\n", _("Checks all processes and generates WARNING or CRITICAL states if the specified"));
-  printf ("%s\n", _("metric is outside the required threshold ranges. The metric defaults to number"));
-  printf ("%s\n", _("of processes.  Search filters can be applied to limit the processes to check."));
-
-  printf ("\n\n");
-
-  printf ("%s\n", _("The parent process, check_procs itself and any child process of check_procs (ps)"));
-  printf ("%s\n", _("are excluded from any checks to prevent false positives."));
-
-  printf ("\n\n");
-
-  print_usage ();
-
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
-  printf (" %s\n", "-w, --warning=RANGE");
-  printf ("   %s\n", _("Generate warning state if metric is outside this range"));
-  printf (" %s\n", "-c, --critical=RANGE");
-  printf ("   %s\n", _("Generate critical state if metric is outside this range"));
-  printf (" %s\n", "-m, --metric=TYPE");
-  printf ("  %s\n", _("Check thresholds against metric. Valid types:"));
-  printf ("  %s\n", _("PROCS   - number of processes (default)"));
-  printf ("  %s\n", _("VSZ     - virtual memory size"));
-  printf ("  %s\n", _("RSS     - resident set memory size"));
-  printf ("  %s\n", _("CPU     - percentage CPU"));
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
+
+        printf("%s\n",
+                   _("Checks all processes and generates WARNING or CRITICAL states if the specified"));
+        printf("%s\n",
+                   _("metric is outside the required threshold ranges. The metric defaults to number"));
+        printf("%s\n",
+                   _("of processes.  Search filters can be applied to limit the processes to check."));
+
+        printf("\n\n");
+
+        printf("%s\n",
+                   _("The parent process, check_procs itself and any child process of check_procs (ps)"));
+        printf("%s\n", _("are excluded from any checks to prevent false positives."));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        printf(" %s\n", "-w, --warning=RANGE");
+        printf("   %s\n", _("Generate warning state if metric is outside this range"));
+        printf(" %s\n", "-c, --critical=RANGE");
+        printf("   %s\n", _("Generate critical state if metric is outside this range"));
+        printf(" %s\n", "-m, --metric=TYPE");
+        printf("  %s\n", _("Check thresholds against metric. Valid types:"));
+        printf("  %s\n", _("PROCS   - number of processes (default)"));
+        printf("  %s\n", _("VSZ     - virtual memory size"));
+        printf("  %s\n", _("RSS     - resident set memory size"));
+        printf("  %s\n", _("CPU     - percentage CPU"));
 /* only linux etime is support currently */
-#if defined( __linux__ )
-  printf ("  %s\n", _("ELAPSED - time elapsed in seconds"));
+#if defined(__linux__)
+        printf("  %s\n", _("ELAPSED - time elapsed in seconds"));
 #endif /* defined(__linux__) */
-  printf (UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-  printf (" %s\n", "-v, --verbose");
-  printf ("    %s\n", _("Extra information. Up to 3 verbosity levels"));
-
-  printf (" %s\n", "-T, --traditional");
-  printf ("   %s\n", _("Filter own process the traditional way by PID instead of /proc/pid/exe"));
-
-  printf ("\n");
-        printf ("%s\n", "Filters:");
-  printf (" %s\n", "-s, --state=STATUSFLAGS");
-  printf ("   %s\n", _("Only scan for processes that have, in the output of `ps`, one or"));
-  printf ("   %s\n", _("more of the status flags you specify (for example R, Z, S, RS,"));
-  printf ("   %s\n", _("RSZDT, plus others based on the output of your 'ps' command)."));
-  printf (" %s\n", "-p, --ppid=PPID");
-  printf ("   %s\n", _("Only scan for children of the parent process ID indicated."));
-  printf (" %s\n", "-z, --vsz=VSZ");
-  printf ("   %s\n", _("Only scan for processes with VSZ higher than indicated."));
-  printf (" %s\n", "-r, --rss=RSS");
-  printf ("   %s\n", _("Only scan for processes with RSS higher than indicated."));
-  printf (" %s\n", "-P, --pcpu=PCPU");
-  printf ("   %s\n", _("Only scan for processes with PCPU higher than indicated."));
-  printf (" %s\n", "-u, --user=USER");
-  printf ("   %s\n", _("Only scan for processes with user name or ID indicated."));
-  printf (" %s\n", "-a, --argument-array=STRING");
-  printf ("   %s\n", _("Only scan for processes with args that contain STRING."));
-  printf (" %s\n", "--ereg-argument-array=STRING");
-  printf ("   %s\n", _("Only scan for processes with args that contain the regex STRING."));
-  printf (" %s\n", "-C, --command=COMMAND");
-  printf ("   %s\n", _("Only scan for exact matches of COMMAND (without path)."));
-  printf (" %s\n", "-X, --exclude-process");
-  printf ("   %s\n", _("Exclude processes which match this comma separated list"));
-  printf (" %s\n", "-k, --no-kthreads");
-  printf ("   %s\n", _("Only scan for non kernel threads (works on Linux only)."));
-
-  printf(_("\n\
+        printf(UT_PLUG_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf(" %s\n", "-v, --verbose");
+        printf("    %s\n", _("Extra information. Up to 3 verbosity levels"));
+
+        printf(" %s\n", "-T, --traditional");
+        printf("   %s\n", _("Filter own process the traditional way by PID instead of /proc/pid/exe"));
+
+        printf("\n");
+        printf("%s\n", "Filters:");
+        printf(" %s\n", "-s, --state=STATUSFLAGS");
+        printf("   %s\n", _("Only scan for processes that have, in the output of `ps`, one or"));
+        printf("   %s\n", _("more of the status flags you specify (for example R, Z, S, RS,"));
+        printf("   %s\n", _("RSZDT, plus others based on the output of your 'ps' command)."));
+        printf(" %s\n", "-p, --ppid=PPID");
+        printf("   %s\n", _("Only scan for children of the parent process ID indicated."));
+        printf(" %s\n", "-z, --vsz=VSZ");
+        printf("   %s\n", _("Only scan for processes with VSZ higher than indicated."));
+        printf(" %s\n", "-r, --rss=RSS");
+        printf("   %s\n", _("Only scan for processes with RSS higher than indicated."));
+        printf(" %s\n", "-P, --pcpu=PCPU");
+        printf("   %s\n", _("Only scan for processes with PCPU higher than indicated."));
+        printf(" %s\n", "-u, --user=USER");
+        printf("   %s\n", _("Only scan for processes with user name or ID indicated."));
+        printf(" %s\n", "-a, --argument-array=STRING");
+        printf("   %s\n", _("Only scan for processes with args that contain STRING."));
+        printf(" %s\n", "--ereg-argument-array=STRING");
+        printf("   %s\n", _("Only scan for processes with args that contain the regex STRING."));
+        printf(" %s\n", "-C, --command=COMMAND");
+        printf("   %s\n", _("Only scan for exact matches of COMMAND (without path)."));
+        printf(" %s\n", "-X, --exclude-process");
+        printf("   %s\n", _("Exclude processes which match this comma separated list"));
+        printf(" %s\n", "-k, --no-kthreads");
+        printf("   %s\n", _("Only scan for non kernel threads (works on Linux only)."));
+
+        printf(_("\n\
 RANGEs are specified 'min:max' or 'min:' or ':max' (or 'max'). If\n\
 specified 'max:min', a warning status will be generated if the\n\
 count is inside the specified range\n\n"));
 
-  printf(_("\
+        printf(_("\
 This plugin checks the number of currently running processes and\n\
 generates WARNING or CRITICAL states if the process count is outside\n\
 the specified threshold ranges. The process count can be filtered by\n\
 process owner, parent process PID, current state (e.g., 'Z'), or may\n\
 be the total number of running processes\n\n"));
 
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry");
-  printf ("  %s\n", _("Warning if not two processes with command name portsentry."));
-  printf ("  %s\n\n", _("Critical if < 2 or > 1024 processes"));
-  printf (" %s\n", "check_procs -c 1: -C sshd");
-  printf ("  %s\n", _("Critical if not at least 1 process with command sshd"));
-  printf (" %s\n", "check_procs -w 1024 -c 1: -C sshd");
-  printf ("  %s\n", _("Warning if > 1024 processes with command name sshd."));
-  printf ("  %s\n\n", _("Critical if < 1 processes with command name sshd."));
-  printf (" %s\n", "check_procs -w 10 -a '/usr/local/bin/perl' -u root");
-  printf ("  %s\n", _("Warning alert if > 10 processes with command arguments containing"));
-  printf ("  %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
-  printf (" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
-  printf ("  %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
-  printf (" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
-  printf ("  %s\n", _("Alert if CPU of any processes over 10%% or 20%%"));
-
-  printf (UT_SUPPORT);
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "check_procs -w 2:2 -c 2:1024 -C portsentry");
+        printf("  %s\n", _("Warning if not two processes with command name portsentry."));
+        printf("  %s\n\n", _("Critical if < 2 or > 1024 processes"));
+        printf(" %s\n", "check_procs -c 1: -C sshd");
+        printf("  %s\n", _("Critical if not at least 1 process with command sshd"));
+        printf(" %s\n", "check_procs -w 1024 -c 1: -C sshd");
+        printf("  %s\n", _("Warning if > 1024 processes with command name sshd."));
+        printf("  %s\n\n", _("Critical if < 1 processes with command name sshd."));
+        printf(" %s\n", "check_procs -w 10 -a '/usr/local/bin/perl' -u root");
+        printf("  %s\n", _("Warning alert if > 10 processes with command arguments containing"));
+        printf("  %s\n\n", _("'/usr/local/bin/perl' and owned by root"));
+        printf(" %s\n", "check_procs -w 50000 -c 100000 --metric=VSZ");
+        printf("  %s\n\n", _("Alert if VSZ of any processes over 50K or 100K"));
+        printf(" %s\n", "check_procs -w 10 -c 20 --metric=CPU");
+        printf("  %s\n", _("Alert if CPU of any processes over 10%% or 20%%"));
+
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf ("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
-  printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n");
-  printf (" [-C command] [-X process_to_exclude] [-k] [-t timeout] [-v]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -w <range> -c <range> [-m metric] [-s state] [-p ppid]\n", progname);
+        printf(" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n");
+        printf(" [-C command] [-X process_to_exclude] [-k] [-t timeout] [-v]\n");
 }
diff --git a/plugins/check_procs.d/config.h b/plugins/check_procs.d/config.h
new file mode 100644
index 00000000..e32ca066
--- /dev/null
+++ b/plugins/check_procs.d/config.h
@@ -0,0 +1,75 @@
+#pragma once
+
+#include "../../config.h"
+#include "regex.h"
+#include "thresholds.h"
+#include <stddef.h>
+#include <string.h>
+#include <sys/types.h>
+
+enum metric {
+        METRIC_PROCS,
+        METRIC_VSZ,
+        METRIC_RSS,
+        METRIC_CPU,
+        METRIC_ELAPSED
+};
+
+typedef struct {
+        int options; /* bitmask of filter criteria to test against */
+        enum metric metric;
+        char *metric_name;
+        char *input_filename;
+        char *prog;
+        char *args;
+        char *fmt;
+        char *fails;
+        char *exclude_progs;
+        char **exclude_progs_arr;
+        char exclude_progs_counter;
+        regex_t re_args;
+
+        bool kthread_filter;
+        bool usepid; /* whether to test for pid or /proc/pid/exe */
+        uid_t uid;
+        pid_t ppid;
+        int vsz;
+        int rss;
+        float pcpu;
+        char *statopts;
+
+        char *warning_range;
+        char *critical_range;
+        thresholds *procs_thresholds;
+} check_procs_config;
+
+check_procs_config check_procs_config_init() {
+        check_procs_config tmp = {
+                .options = 0,
+                .metric = METRIC_PROCS,
+                .metric_name = strdup("PROCS"),
+                .input_filename = NULL,
+                .prog = NULL,
+                .args = NULL,
+                .fmt = NULL,
+                .fails = NULL,
+                .exclude_progs = NULL,
+                .exclude_progs_arr = NULL,
+                .exclude_progs_counter = 0,
+                .re_args = {0},
+
+                .kthread_filter = false,
+                .usepid = false,
+                .uid = 0,
+                .ppid = 0,
+                .vsz = 0,
+                .rss = 0,
+                .pcpu = 0,
+                .statopts = NULL,
+
+                .warning_range = NULL,
+                .critical_range = NULL,
+                .procs_thresholds = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index d9ff8fa7..d26f7cf3 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -1,32 +1,32 @@
 /*****************************************************************************
-* 
-* Monitoring check_radius plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2024 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_radius plugin
-* 
-* Tests to see if a radius server is accepting connections.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring check_radius plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_radius plugin
+ *
+ * Tests to see if a radius server is accepting connections.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 const char *progname = "check_radius";
 const char *copyright = "2000-2024";
@@ -35,64 +35,58 @@ const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
 #include "netutils.h"
+#include "states.h"
+#include "check_radius.d/config.h"
 
 #if defined(HAVE_LIBRADCLI)
-#include <radcli/radcli.h>
+#       include <radcli/radcli.h>
 #elif defined(HAVE_LIBFREERADIUS_CLIENT)
-#include <freeradius-client.h>
+#       include <freeradius-client.h>
 #elif defined(HAVE_LIBRADIUSCLIENT_NG)
-#include <radiusclient-ng.h>
+#       include <radiusclient-ng.h>
 #else
-#include <radiusclient.h>
+#       include <radiusclient.h>
 #endif
 
-static int process_arguments (int /*argc*/, char ** /*argv*/);
-static void print_help (void);
-void print_usage (void);
-
-#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) || defined(HAVE_LIBRADCLI)
-#define my_rc_conf_str(a) rc_conf_str(rch,a)
-#if defined(HAVE_LIBRADCLI)
-#define my_rc_send_server(a,b) rc_send_server(rch,a,b,AUTH)
-#else
-#define my_rc_send_server(a,b) rc_send_server(rch,a,b)
-#endif
-#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADCLI)
-#define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(rch,a,b,c,d,(a)->secret,e,f)
+typedef struct {
+        int errorcode;
+        check_radius_config config;
+} check_radius_config_wrapper;
+static check_radius_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
+void print_usage(void);
+
+#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) ||                      \
+        defined(HAVE_LIBRADCLI)
+#       define my_rc_conf_str(a) rc_conf_str(rch, a)
+#       if defined(HAVE_LIBRADCLI)
+#               define my_rc_send_server(a, b) rc_send_server(rch, a, b, AUTH)
+#       else
+#               define my_rc_send_server(a, b) rc_send_server(rch, a, b)
+#       endif
+#       if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADCLI)
+#               define my_rc_buildreq(a, b, c, d, e, f) rc_buildreq(rch, a, b, c, d, (a)->secret, e, f)
+#       else
+#               define my_rc_buildreq(a, b, c, d, e, f) rc_buildreq(rch, a, b, c, d, e, f)
+#       endif
+#       define my_rc_avpair_add(a, b, c, d) rc_avpair_add(rch, a, b, c, -1, d)
+#       define my_rc_read_dictionary(a)     rc_read_dictionary(rch, a)
 #else
-#define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(rch,a,b,c,d,e,f)
-#endif
-#define my_rc_avpair_add(a,b,c,d) rc_avpair_add(rch,a,b,c,-1,d)
-#define my_rc_read_dictionary(a) rc_read_dictionary(rch, a)
-#else
-#define my_rc_conf_str(a) rc_conf_str(a)
-#define my_rc_send_server(a,b) rc_send_server(a, b)
-#define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(a,b,c,d,e,f)
-#define my_rc_avpair_add(a,b,c,d) rc_avpair_add(a, b, c, d)
-#define my_rc_read_dictionary(a) rc_read_dictionary(a)
+#       define my_rc_conf_str(a)                rc_conf_str(a)
+#       define my_rc_send_server(a, b)          rc_send_server(a, b)
+#       define my_rc_buildreq(a, b, c, d, e, f) rc_buildreq(a, b, c, d, e, f)
+#       define my_rc_avpair_add(a, b, c, d)     rc_avpair_add(a, b, c, d)
+#       define my_rc_read_dictionary(a)         rc_read_dictionary(a)
 #endif
 
 /* REJECT_RC is only defined in some version of radiusclient. It has
  * been reported from radiusclient-ng 0.5.6 on FreeBSD 7.2-RELEASE */
 #ifndef REJECT_RC
-#define REJECT_RC BADRESP_RC
+#       define REJECT_RC BADRESP_RC
 #endif
 
-static int my_rc_read_config(char * /*a*/);
-
-#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) || defined(HAVE_LIBRADCLI)
-static rc_handle *rch = NULL;
-#endif
+static int my_rc_read_config(char * /*a*/, rc_handle ** /*rch*/);
 
-static char *server = NULL;
-static char *username = NULL;
-static char *password = NULL;
-static char *nasid = NULL;
-static char *nasipaddress = NULL;
-static char *expect = NULL;
-static char *config_file = NULL;
-static unsigned short port = PW_AUTH_UDP_PORT;
-static int retries = 1;
 static bool verbose = false;
 
 /******************************************************************************
@@ -148,149 +142,171 @@ Please note that all tags must be lowercase to use the DocBook XML DTD.
 -@@
 ******************************************************************************/
 
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_radius_config_wrapper tmp_config = process_arguments(argc, argv);
+
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        check_radius_config config = tmp_config.config;
+
+#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) ||                      \
+        defined(HAVE_LIBRADCLI)
+        rc_handle *rch = NULL;
+#endif
+
+        char *str = strdup("dictionary");
+        if ((config.config_file && my_rc_read_config(config.config_file, &rch)) ||
+                my_rc_read_dictionary(my_rc_conf_str(str))) {
+                die(STATE_UNKNOWN, _("Config file error\n"));
+        }
+
+        uint32_t service = PW_AUTHENTICATE_ONLY;
+
+        SEND_DATA data;
+        memset(&data, 0, sizeof(data));
+        if (!(my_rc_avpair_add(&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
+                  my_rc_avpair_add(&data.send_pairs, PW_USER_NAME, config.username, 0) &&
+                  my_rc_avpair_add(&data.send_pairs, PW_USER_PASSWORD, config.password, 0))) {
+                die(STATE_UNKNOWN, _("Out of Memory?\n"));
+        }
+
+        if (config.nas_id != NULL) {
+                if (!(my_rc_avpair_add(&data.send_pairs, PW_NAS_IDENTIFIER, config.nas_id, 0))) {
+                        die(STATE_UNKNOWN, _("Invalid NAS-Identifier\n"));
+                }
+        }
 
-int
-main (int argc, char **argv)
-{
-        struct sockaddr_storage ss;
         char name[HOST_NAME_MAX];
+        if (config.nas_ip_address == NULL) {
+                if (gethostname(name, sizeof(name)) != 0) {
+                        die(STATE_UNKNOWN, _("gethostname() failed!\n"));
+                }
+                config.nas_ip_address = name;
+        }
+
+        struct sockaddr_storage radius_server_socket;
+        if (!dns_lookup(config.nas_ip_address, &radius_server_socket, AF_UNSPEC)) {
+                die(STATE_UNKNOWN, _("Invalid NAS-IP-Address\n"));
+        }
+
+        uint32_t client_id = ntohl(((struct sockaddr_in *)&radius_server_socket)->sin_addr.s_addr);
+        if (my_rc_avpair_add(&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == NULL) {
+                die(STATE_UNKNOWN, _("Invalid NAS-IP-Address\n"));
+        }
+
+        my_rc_buildreq(&data, PW_ACCESS_REQUEST, config.server, config.port, (int)timeout_interval,
+                                   config.retries);
+
 #ifdef RC_BUFFER_LEN
         char msg[RC_BUFFER_LEN];
 #else
         char msg[BUFFER_LEN];
 #endif
-        SEND_DATA data;
-        int result = STATE_UNKNOWN;
-        uint32_t client_id, service;
-        char *str;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
-
-        /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        int result = my_rc_send_server(&data, msg);
+        rc_avpair_free(data.send_pairs);
+        if (data.receive_pairs) {
+                rc_avpair_free(data.receive_pairs);
+        }
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (result == TIMEOUT_RC) {
+                printf("Timeout\n");
+                exit(STATE_CRITICAL);
+        }
 
-        str = strdup ("dictionary");
-        if ((config_file && my_rc_read_config (config_file)) ||
-                        my_rc_read_dictionary (my_rc_conf_str (str)))
-                die (STATE_UNKNOWN, _("Config file error\n"));
+        if (result == ERROR_RC) {
+                printf(_("Auth Error\n"));
+                exit(STATE_CRITICAL);
+        }
 
-        service = PW_AUTHENTICATE_ONLY;
+        if (result == REJECT_RC) {
+                printf(_("Auth Failed\n"));
+                exit(STATE_WARNING);
+        }
 
-        memset (&data, 0, sizeof(data));
-        if (!(my_rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
-                                my_rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
-                                my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0)
-                                ))
-                die (STATE_UNKNOWN, _("Out of Memory?\n"));
+        if (result == BADRESP_RC) {
+                printf(_("Bad Response\n"));
+                exit(STATE_WARNING);
+        }
 
-        if (nasid != NULL) {
-                if (!(my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0)))
-                        die (STATE_UNKNOWN, _("Invalid NAS-Identifier\n"));
+        if (config.expect && !strstr(msg, config.expect)) {
+                printf("%s\n", msg);
+                exit(STATE_WARNING);
         }
 
-        if (nasipaddress == NULL) {
-                if (gethostname (name, sizeof(name)) != 0)
-                        die (STATE_UNKNOWN, _("gethostname() failed!\n"));
-                nasipaddress = name;
+        if (result == OK_RC) {
+                printf(_("Auth OK\n"));
+                exit(STATE_OK);
         }
-        if (!dns_lookup (nasipaddress, &ss, AF_INET)) /* TODO: Support IPv6. */
-                die (STATE_UNKNOWN, _("Invalid NAS-IP-Address\n"));
-        client_id = ntohl (((struct sockaddr_in *)&ss)->sin_addr.s_addr);
-        if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == NULL)
-                die (STATE_UNKNOWN, _("Invalid NAS-IP-Address\n"));
-
-        my_rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
-                     retries);
-
-        result = my_rc_send_server (&data, msg);
-        rc_avpair_free (data.send_pairs);
-        if (data.receive_pairs)
-                rc_avpair_free (data.receive_pairs);
-
-        if (result == TIMEOUT_RC)
-                die (STATE_CRITICAL, _("Timeout\n"));
-        if (result == ERROR_RC)
-                die (STATE_CRITICAL, _("Auth Error\n"));
-        if (result == REJECT_RC)
-                die (STATE_WARNING, _("Auth Failed\n"));
-        if (result == BADRESP_RC)
-                die (STATE_WARNING, _("Bad Response\n"));
-        if (expect && !strstr (msg, expect))
-                die (STATE_WARNING, "%s\n", msg);
-        if (result == OK_RC)
-                die (STATE_OK, _("Auth OK\n"));
+
         (void)snprintf(msg, sizeof(msg), _("Unexpected result code %d"), result);
-        die (STATE_UNKNOWN, "%s\n", msg);
+        printf("%s\n", msg);
+        exit(STATE_UNKNOWN);
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
+check_radius_config_wrapper process_arguments(int argc, char **argv) {
         static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"port", required_argument, 0, 'P'},
-                {"username", required_argument, 0, 'u'},
-                {"password", required_argument, 0, 'p'},
-                {"nas-id", required_argument, 0, 'n'},
-                {"nas-ip-address", required_argument, 0, 'N'},
-                {"filename", required_argument, 0, 'F'},
-                {"expect", required_argument, 0, 'e'},
-                {"retries", required_argument, 0, 'r'},
-                {"timeout", required_argument, 0, 't'},
-                {"verbose", no_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
+                {"hostname", required_argument, 0, 'H'}, {"port", required_argument, 0, 'P'},
+                {"username", required_argument, 0, 'u'}, {"password", required_argument, 0, 'p'},
+                {"nas-id", required_argument, 0, 'n'},   {"nas-ip-address", required_argument, 0, 'N'},
+                {"filename", required_argument, 0, 'F'}, {"expect", required_argument, 0, 'e'},
+                {"retries", required_argument, 0, 'r'},  {"timeout", required_argument, 0, 't'},
+                {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
+
+        check_radius_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_radius_config_init(),
         };
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:N:t:r:e:", longopts,
-                                                                         &option);
+        while (true) {
+                int option = 0;
+                int option_index = getopt_long(argc, argv, "+hVvH:P:F:u:p:n:N:t:r:e:", longopts, &option);
 
-                if (c == -1 || c == EOF || c == 1)
+                if (option_index == -1 || option_index == EOF || option_index == 1) {
                         break;
+                }
 
-                switch (c) {
-                case '?':                                                                       /* print short usage statement if args not parsable */
-                        usage5 ();
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'v':                                                                       /* verbose mode */
+                switch (option_index) {
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'v': /* verbose mode */
                         verbose = true;
                         break;
-                case 'H':                                                                       /* hostname */
-                        if (!is_host (optarg)) {
-                                usage2 (_("Invalid hostname/address"), optarg);
+                case 'H': /* hostname */
+                        if (!is_host(optarg)) {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
-                        server = optarg;
+                        result.config.server = optarg;
                         break;
-                case 'P':                                                                       /* port */
-                        if (is_intnonneg (optarg))
-                                port = (unsigned short)atoi (optarg);
-                        else
-                                usage4 (_("Port must be a positive integer"));
+                case 'P': /* port */
+                        if (is_intnonneg(optarg)) {
+                                result.config.port = (unsigned short)atoi(optarg);
+                        } else {
+                                usage4(_("Port must be a positive integer"));
+                        }
                         break;
-                case 'u':                                                                       /* username */
-                        username = optarg;
+                case 'u': /* username */
+                        result.config.username = optarg;
                         break;
-                case 'p':                                                                       /* password */
-                        password = strdup(optarg);
+                case 'p': /* password */
+                        result.config.password = strdup(optarg);
 
                         /* Delete the password from process list */
                         while (*optarg != '\0') {
@@ -298,119 +314,118 @@ process_arguments (int argc, char **argv)
                                 optarg++;
                         }
                         break;
-                case 'n':                                                                       /* nas id */
-                        nasid = optarg;
+                case 'n': /* nas id */
+                        result.config.nas_id = optarg;
                         break;
-                case 'N':                                                                       /* nas ip address */
-                        nasipaddress = optarg;
+                case 'N': /* nas ip address */
+                        result.config.nas_ip_address = optarg;
                         break;
-                case 'F':                                                                       /* configuration file */
-                        config_file = optarg;
+                case 'F': /* configuration file */
+                        result.config.config_file = optarg;
                         break;
-                case 'e':                                                                       /* expect */
-                        expect = optarg;
+                case 'e': /* expect */
+                        result.config.expect = optarg;
                         break;
-                case 'r':                                                                       /* retries */
-                        if (is_intpos (optarg))
-                                retries = atoi (optarg);
-                        else
-                                usage4 (_("Number of retries must be a positive integer"));
+                case 'r': /* retries */
+                        if (is_intpos(optarg)) {
+                                result.config.retries = atoi(optarg);
+                        } else {
+                                usage4(_("Number of retries must be a positive integer"));
+                        }
                         break;
-                case 't':                                                                       /* timeout */
-                        if (is_intpos (optarg))
-                                timeout_interval = (unsigned)atoi (optarg);
-                        else
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
+                case 't': /* timeout */
+                        if (is_intpos(optarg)) {
+                                timeout_interval = (unsigned)atoi(optarg);
+                        } else {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        }
                         break;
                 }
         }
 
-        if (server == NULL)
-                usage4 (_("Hostname was not supplied"));
-        if (username == NULL)
-                usage4 (_("User not specified"));
-        if (password == NULL)
-                usage4 (_("Password not specified"));
-        if (config_file == NULL)
-                usage4 (_("Configuration file not specified"));
+        if (result.config.server == NULL) {
+                usage4(_("Hostname was not supplied"));
+        }
+        if (result.config.username == NULL) {
+                usage4(_("User not specified"));
+        }
+        if (result.config.password == NULL) {
+                usage4(_("Password not specified"));
+        }
+        if (result.config.config_file == NULL) {
+                usage4(_("Configuration file not specified"));
+        }
 
-        return OK;
+        return result;
 }
 
-
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", PW_AUTH_UDP_PORT);
+        xasprintf(&myport, "%d", PW_AUTH_UDP_PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Robert August Vincent II\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Robert August Vincent II\n");
+        printf(COPYRIGHT, copyright, email);
 
         printf("%s\n", _("Tests to see if a RADIUS server is accepting connections."));
 
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (UT_HOST_PORT, 'P', myport);
-
-        printf (" %s\n", "-u, --username=STRING");
-  printf ("    %s\n", _("The user to authenticate"));
-  printf (" %s\n", "-p, --password=STRING");
-  printf ("    %s\n", _("Password for authentication (SECURITY RISK)"));
-  printf (" %s\n", "-n, --nas-id=STRING");
-  printf ("    %s\n", _("NAS identifier"));
-  printf (" %s\n", "-N, --nas-ip-address=STRING");
-  printf ("    %s\n", _("NAS IP Address"));
-  printf (" %s\n", "-F, --filename=STRING");
-  printf ("    %s\n", _("Configuration file"));
-  printf (" %s\n", "-e, --expect=STRING");
-  printf ("    %s\n", _("Response string to expect from the server"));
-  printf (" %s\n", "-r, --retries=INTEGER");
-  printf ("    %s\n", _("Number of times to retry a failed connection"));
-
-        printf (UT_CONN_TIMEOUT, timeout_interval);
-
-  printf ("\n");
-  printf ("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
-  printf ("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
-  printf ("%s\n", _("name and password. A configuration file must be present. The format of"));
-  printf ("%s\n", _("the configuration file is described in the radiusclient library sources."));
-        printf ("%s\n", _("The password option presents a substantial security issue because the"));
-  printf ("%s\n", _("password can possibly be determined by careful watching of the command line"));
-  printf ("%s\n", _("in a process listing. This risk is exacerbated because the plugin will"));
-  printf ("%s\n", _("typically be executed at regular predictable intervals. Please be sure that"));
-  printf ("%s\n", _("the password used does not allow access to sensitive system resources."));
-
-        printf (UT_SUPPORT);
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_HOST_PORT, 'P', myport);
+
+        printf(" %s\n", "-u, --username=STRING");
+        printf("    %s\n", _("The user to authenticate"));
+        printf(" %s\n", "-p, --password=STRING");
+        printf("    %s\n", _("Password for authentication (SECURITY RISK)"));
+        printf(" %s\n", "-n, --nas-id=STRING");
+        printf("    %s\n", _("NAS identifier"));
+        printf(" %s\n", "-N, --nas-ip-address=STRING");
+        printf("    %s\n", _("NAS IP Address"));
+        printf(" %s\n", "-F, --filename=STRING");
+        printf("    %s\n", _("Configuration file"));
+        printf(" %s\n", "-e, --expect=STRING");
+        printf("    %s\n", _("Response string to expect from the server"));
+        printf(" %s\n", "-r, --retries=INTEGER");
+        printf("    %s\n", _("Number of times to retry a failed connection"));
+
+        printf(UT_CONN_TIMEOUT, timeout_interval);
+
+        printf("\n");
+        printf("%s\n", _("This plugin tests a RADIUS server to see if it is accepting connections."));
+        printf("%s\n", _("The server to test must be specified in the invocation, as well as a user"));
+        printf("%s\n", _("name and password. A configuration file must be present. The format of"));
+        printf("%s\n", _("the configuration file is described in the radiusclient library sources."));
+        printf("%s\n", _("The password option presents a substantial security issue because the"));
+        printf("%s\n",
+                   _("password can possibly be determined by careful watching of the command line"));
+        printf("%s\n", _("in a process listing. This risk is exacerbated because the plugin will"));
+        printf("%s\n",
+                   _("typically be executed at regular predictable intervals. Please be sure that"));
+        printf("%s\n", _("the password used does not allow access to sensitive system resources."));
+
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H host -F config_file -u username -p password\n\
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host -F config_file -u username -p password\n\
                         [-P port] [-t timeout] [-r retries] [-e expect]\n\
-                        [-n nas-id] [-N nas-ip-addr]\n", progname);
+                        [-n nas-id] [-N nas-ip-addr]\n",
+                   progname);
 }
 
-
-
-int my_rc_read_config(char * a)
-{
-#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) || defined(HAVE_LIBRADCLI)
-        rch = rc_read_config(a);
+int my_rc_read_config(char *config_file_name, rc_handle **rch) {
+#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) ||                      \
+        defined(HAVE_LIBRADCLI)
+        *rch = rc_read_config(config_file_name);
         return (rch == NULL) ? 1 : 0;
 #else
-        return rc_read_config(a);
+        return rc_read_config(config_file_name);
 #endif
 }
diff --git a/plugins/check_radius.d/config.h b/plugins/check_radius.d/config.h
new file mode 100644
index 00000000..b27d31e7
--- /dev/null
+++ b/plugins/check_radius.d/config.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+#if defined(HAVE_LIBRADCLI)
+#       include <radcli/radcli.h>
+#elif defined(HAVE_LIBFREERADIUS_CLIENT)
+#       include <freeradius-client.h>
+#elif defined(HAVE_LIBRADIUSCLIENT_NG)
+#       include <radiusclient-ng.h>
+#else
+#       include <radiusclient.h>
+#endif
+
+typedef struct {
+        char *server;
+        char *username;
+        char *password;
+        char *config_file;
+        char *nas_id;
+        char *nas_ip_address;
+        int retries;
+        unsigned short port;
+
+        char *expect;
+} check_radius_config;
+
+check_radius_config check_radius_config_init() {
+        check_radius_config tmp = {
+                .server = NULL,
+                .username = NULL,
+                .password = NULL,
+                .config_file = NULL,
+                .nas_id = NULL,
+                .nas_ip_address = NULL,
+                .retries = 1,
+                .port = PW_AUTH_UDP_PORT,
+
+                .expect = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_real.c b/plugins/check_real.c
index 369a88b1..66d07f8f 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -28,6 +28,8 @@
  *
  *****************************************************************************/
 
+#include "states.h"
+#include <stdio.h>
 const char *progname = "check_real";
 const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
@@ -35,27 +37,20 @@ const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
-
-enum {
-        PORT = 554
-};
+#include "check_real.d/config.h"
 
 #define EXPECT "RTSP/1."
 #define URL    ""
 
-static int process_arguments(int, char **);
+typedef struct {
+        int errorcode;
+        check_real_config config;
+} check_real_config_wrapper;
+static check_real_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+
 static void print_help(void);
 void print_usage(void);
 
-static int server_port = PORT;
-static char *server_address;
-static char *host_name;
-static char *server_url = NULL;
-static char *server_expect;
-static int warning_time = 0;
-static bool check_warning_time = false;
-static int critical_time = 0;
-static bool check_critical_time = false;
 static bool verbose = false;
 
 int main(int argc, char **argv) {
@@ -66,8 +61,12 @@ int main(int argc, char **argv) {
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
+        check_real_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
+        }
+
+        const check_real_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
         signal(SIGALRM, socket_timeout_alarm_handler);
@@ -78,38 +77,52 @@ int main(int argc, char **argv) {
 
         /* try to connect to the host at the given port number */
         int socket;
-        if (my_tcp_connect(server_address, server_port, &socket) != STATE_OK)
-                die(STATE_CRITICAL, _("Unable to connect to %s on port %d\n"), server_address, server_port);
+        if (my_tcp_connect(config.server_address, config.server_port, &socket) != STATE_OK) {
+                die(STATE_CRITICAL, _("Unable to connect to %s on port %d\n"), config.server_address,
+                        config.server_port);
+        }
 
         /* Part I - Server Check */
 
         /* send the OPTIONS request */
         char buffer[MAX_INPUT_BUFFER];
-        sprintf(buffer, "OPTIONS rtsp://%s:%d RTSP/1.0\r\n", host_name, server_port);
-        int result = send(socket, buffer, strlen(buffer), 0);
+        sprintf(buffer, "OPTIONS rtsp://%s:%d RTSP/1.0\r\n", config.host_name, config.server_port);
+        ssize_t sent_bytes = send(socket, buffer, strlen(buffer), 0);
+        if (sent_bytes == -1) {
+                die(STATE_CRITICAL, _("Sending options to %s failed\n"), config.host_name);
+        }
 
         /* send the header sync */
         sprintf(buffer, "CSeq: 1\r\n");
-        result = send(socket, buffer, strlen(buffer), 0);
+        sent_bytes = send(socket, buffer, strlen(buffer), 0);
+        if (sent_bytes == -1) {
+                die(STATE_CRITICAL, _("Sending header sync to %s failed\n"), config.host_name);
+        }
 
         /* send a newline so the server knows we're done with the request */
         sprintf(buffer, "\r\n");
-        result = send(socket, buffer, strlen(buffer), 0);
+        sent_bytes = send(socket, buffer, strlen(buffer), 0);
+        if (sent_bytes == -1) {
+                die(STATE_CRITICAL, _("Sending newline to %s failed\n"), config.host_name);
+        }
 
         /* watch for the REAL connection string */
-        result = recv(socket, buffer, MAX_INPUT_BUFFER - 1, 0);
+        ssize_t received_bytes = recv(socket, buffer, MAX_INPUT_BUFFER - 1, 0);
 
         /* return a CRITICAL status if we couldn't read any data */
-        if (result == -1)
-                die(STATE_CRITICAL, _("No data received from %s\n"), host_name);
+        if (received_bytes == -1) {
+                die(STATE_CRITICAL, _("No data received from %s\n"), config.host_name);
+        }
 
+        mp_state_enum result = STATE_OK;
         char *status_line = NULL;
         /* make sure we find the response we are looking for */
-        if (!strstr(buffer, server_expect)) {
-                if (server_port == PORT)
+        if (!strstr(buffer, config.server_expect)) {
+                if (config.server_port == PORT) {
                         printf("%s\n", _("Invalid REAL response received from host"));
-                else
-                        printf(_("Invalid REAL response received from host on port %d\n"), server_port);
+                } else {
+                        printf(_("Invalid REAL response received from host on port %d\n"), config.server_port);
+                }
         } else {
                 /* else we got the REAL string, so check the return code */
 
@@ -117,69 +130,81 @@ int main(int argc, char **argv) {
 
                 result = STATE_OK;
 
-                status_line = (char *)strtok(buffer, "\n");
+                status_line = strtok(buffer, "\n");
 
-                if (strstr(status_line, "200"))
+                if (strstr(status_line, "200")) {
                         result = STATE_OK;
+                }
 
                 /* client errors result in a warning state */
-                else if (strstr(status_line, "400"))
+                else if (strstr(status_line, "400")) {
                         result = STATE_WARNING;
-                else if (strstr(status_line, "401"))
+                } else if (strstr(status_line, "401")) {
                         result = STATE_WARNING;
-                else if (strstr(status_line, "402"))
+                } else if (strstr(status_line, "402")) {
                         result = STATE_WARNING;
-                else if (strstr(status_line, "403"))
+                } else if (strstr(status_line, "403")) {
                         result = STATE_WARNING;
-                else if (strstr(status_line, "404"))
+                } else if (strstr(status_line, "404")) {
                         result = STATE_WARNING;
-
-                /* server errors result in a critical state */
-                else if (strstr(status_line, "500"))
+                } else if (strstr(status_line, "500")) {
+                        /* server errors result in a critical state */
                         result = STATE_CRITICAL;
-                else if (strstr(status_line, "501"))
+                } else if (strstr(status_line, "501")) {
                         result = STATE_CRITICAL;
-                else if (strstr(status_line, "502"))
+                } else if (strstr(status_line, "502")) {
                         result = STATE_CRITICAL;
-                else if (strstr(status_line, "503"))
+                } else if (strstr(status_line, "503")) {
                         result = STATE_CRITICAL;
-
-                else
+                } else {
                         result = STATE_UNKNOWN;
+                }
         }
 
         /* Part II - Check stream exists and is ok */
-        if ((result == STATE_OK) && (server_url != NULL)) {
+        if ((result == STATE_OK) && (config.server_url != NULL)) {
 
                 /* Part I - Server Check */
 
                 /* send the DESCRIBE request */
-                sprintf(buffer, "DESCRIBE rtsp://%s:%d%s RTSP/1.0\r\n", host_name, server_port, server_url);
-                result = send(socket, buffer, strlen(buffer), 0);
+                sprintf(buffer, "DESCRIBE rtsp://%s:%d%s RTSP/1.0\r\n", config.host_name,
+                                config.server_port, config.server_url);
+
+                ssize_t sent_bytes = send(socket, buffer, strlen(buffer), 0);
+                if (sent_bytes == -1) {
+                        die(STATE_CRITICAL, _("Sending DESCRIBE request to %s failed\n"), config.host_name);
+                }
 
                 /* send the header sync */
                 sprintf(buffer, "CSeq: 2\r\n");
-                result = send(socket, buffer, strlen(buffer), 0);
+                sent_bytes = send(socket, buffer, strlen(buffer), 0);
+                if (sent_bytes == -1) {
+                        die(STATE_CRITICAL, _("Sending DESCRIBE request to %s failed\n"), config.host_name);
+                }
 
                 /* send a newline so the server knows we're done with the request */
                 sprintf(buffer, "\r\n");
-                result = send(socket, buffer, strlen(buffer), 0);
+                sent_bytes = send(socket, buffer, strlen(buffer), 0);
+                if (sent_bytes == -1) {
+                        die(STATE_CRITICAL, _("Sending DESCRIBE request to %s failed\n"), config.host_name);
+                }
 
                 /* watch for the REAL connection string */
-                result = recv(socket, buffer, MAX_INPUT_BUFFER - 1, 0);
-                buffer[result] = '\0'; /* null terminate received buffer */
-
-                /* return a CRITICAL status if we couldn't read any data */
-                if (result == -1) {
+                ssize_t recv_bytes = recv(socket, buffer, MAX_INPUT_BUFFER - 1, 0);
+                if (recv_bytes == -1) {
+                        /* return a CRITICAL status if we couldn't read any data */
                         printf(_("No data received from host\n"));
                         result = STATE_CRITICAL;
                 } else {
+                        buffer[result] = '\0'; /* null terminate received buffer */
                         /* make sure we find the response we are looking for */
-                        if (!strstr(buffer, server_expect)) {
-                                if (server_port == PORT)
+                        if (!strstr(buffer, config.server_expect)) {
+                                if (config.server_port == PORT) {
                                         printf("%s\n", _("Invalid REAL response received from host"));
-                                else
-                                        printf(_("Invalid REAL response received from host on port %d\n"), server_port);
+                                } else {
+                                        printf(_("Invalid REAL response received from host on port %d\n"),
+                                                   config.server_port);
+                                }
                         } else {
 
                                 /* else we got the REAL string, so check the return code */
@@ -188,51 +213,57 @@ int main(int argc, char **argv) {
 
                                 result = STATE_OK;
 
-                                status_line = (char *)strtok(buffer, "\n");
+                                status_line = strtok(buffer, "\n");
 
-                                if (strstr(status_line, "200"))
+                                if (strstr(status_line, "200")) {
                                         result = STATE_OK;
+                                }
 
                                 /* client errors result in a warning state */
-                                else if (strstr(status_line, "400"))
+                                else if (strstr(status_line, "400")) {
                                         result = STATE_WARNING;
-                                else if (strstr(status_line, "401"))
+                                } else if (strstr(status_line, "401")) {
                                         result = STATE_WARNING;
-                                else if (strstr(status_line, "402"))
+                                } else if (strstr(status_line, "402")) {
                                         result = STATE_WARNING;
-                                else if (strstr(status_line, "403"))
+                                } else if (strstr(status_line, "403")) {
                                         result = STATE_WARNING;
-                                else if (strstr(status_line, "404"))
+                                } else if (strstr(status_line, "404")) {
                                         result = STATE_WARNING;
+                                }
 
                                 /* server errors result in a critical state */
-                                else if (strstr(status_line, "500"))
+                                else if (strstr(status_line, "500")) {
                                         result = STATE_CRITICAL;
-                                else if (strstr(status_line, "501"))
+                                } else if (strstr(status_line, "501")) {
                                         result = STATE_CRITICAL;
-                                else if (strstr(status_line, "502"))
+                                } else if (strstr(status_line, "502")) {
                                         result = STATE_CRITICAL;
-                                else if (strstr(status_line, "503"))
+                                } else if (strstr(status_line, "503")) {
                                         result = STATE_CRITICAL;
+                                }
 
-                                else
+                                else {
                                         result = STATE_UNKNOWN;
+                                }
                         }
                 }
         }
 
         /* Return results */
         if (result == STATE_OK) {
-
-                if (check_critical_time && (end_time - start_time) > critical_time)
+                if (config.check_critical_time && (end_time - start_time) > config.critical_time) {
                         result = STATE_CRITICAL;
-                else if (check_warning_time && (end_time - start_time) > warning_time)
+                } else if (config.check_warning_time && (end_time - start_time) > config.warning_time) {
                         result = STATE_WARNING;
+                }
 
                 /* Put some HTML in here to create a dynamic link */
-                printf(_("REAL %s - %d second response time\n"), state_text(result), (int)(end_time - start_time));
-        } else
+                printf(_("REAL %s - %d second response time\n"), state_text(result),
+                           (int)(end_time - start_time));
+        } else {
                 printf("%s\n", status_line);
+        }
 
         /* close the connection */
         close(socket);
@@ -240,73 +271,83 @@ int main(int argc, char **argv) {
         /* reset the alarm */
         alarm(0);
 
-        return result;
+        exit(result);
 }
 
 /* process command-line arguments */
-int process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'}, {"IPaddress", required_argument, 0, 'I'},
-                                                                           {"expect", required_argument, 0, 'e'},   {"url", required_argument, 0, 'u'},
-                                                                           {"port", required_argument, 0, 'p'},     {"critical", required_argument, 0, 'c'},
-                                                                           {"warning", required_argument, 0, 'w'},  {"timeout", required_argument, 0, 't'},
-                                                                           {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
-                                                                           {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
-
-        if (argc < 2)
-                return ERROR;
+check_real_config_wrapper process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {
+                {"hostname", required_argument, 0, 'H'}, {"IPaddress", required_argument, 0, 'I'},
+                {"expect", required_argument, 0, 'e'},   {"url", required_argument, 0, 'u'},
+                {"port", required_argument, 0, 'p'},     {"critical", required_argument, 0, 'c'},
+                {"warning", required_argument, 0, 'w'},  {"timeout", required_argument, 0, 't'},
+                {"verbose", no_argument, 0, 'v'},        {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},           {0, 0, 0, 0}};
+
+        check_real_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_real_config_init(),
+        };
+
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
         for (int i = 1; i < argc; i++) {
-                if (strcmp("-to", argv[i]) == 0)
+                if (strcmp("-to", argv[i]) == 0) {
                         strcpy(argv[i], "-t");
-                else if (strcmp("-wt", argv[i]) == 0)
+                } else if (strcmp("-wt", argv[i]) == 0) {
                         strcpy(argv[i], "-w");
-                else if (strcmp("-ct", argv[i]) == 0)
+                } else if (strcmp("-ct", argv[i]) == 0) {
                         strcpy(argv[i], "-c");
+                }
         }
 
-        int option_char;
         while (true) {
                 int option = 0;
-                option_char = getopt_long(argc, argv, "+hvVI:H:e:u:p:w:c:t:", longopts, &option);
+                int option_char = getopt_long(argc, argv, "+hvVI:H:e:u:p:w:c:t:", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
                 switch (option_char) {
                 case 'I': /* hostname */
                 case 'H': /* hostname */
-                        if (server_address)
+                        if (result.config.server_address) {
                                 break;
-                        else if (is_host(optarg))
-                                server_address = optarg;
-                        else
+                        } else if (is_host(optarg)) {
+                                result.config.server_address = optarg;
+                        } else {
                                 usage2(_("Invalid hostname/address"), optarg);
+                        }
                         break;
                 case 'e': /* string to expect in response header */
-                        server_expect = optarg;
+                        result.config.server_expect = optarg;
                         break;
                 case 'u': /* server URL */
-                        server_url = optarg;
+                        result.config.server_url = optarg;
                         break;
                 case 'p': /* port */
                         if (is_intpos(optarg)) {
-                                server_port = atoi(optarg);
+                                result.config.server_port = atoi(optarg);
                         } else {
                                 usage4(_("Port must be a positive integer"));
                         }
                         break;
                 case 'w': /* warning time threshold */
                         if (is_intnonneg(optarg)) {
-                                warning_time = atoi(optarg);
-                                check_warning_time = true;
+                                result.config.warning_time = atoi(optarg);
+                                result.config.check_warning_time = true;
                         } else {
                                 usage4(_("Warning time must be a positive integer"));
                         }
                         break;
                 case 'c': /* critical time threshold */
                         if (is_intnonneg(optarg)) {
-                                critical_time = atoi(optarg);
-                                check_critical_time = true;
+                                result.config.critical_time = atoi(optarg);
+                                result.config.check_critical_time = true;
                         } else {
                                 usage4(_("Critical time must be a positive integer"));
                         }
@@ -332,25 +373,28 @@ int process_arguments(int argc, char **argv) {
                 }
         }
 
-        option_char = optind;
-        if (server_address == NULL && argc > option_char) {
+        int option_char = optind;
+        if (result.config.server_address == NULL && argc > option_char) {
                 if (is_host(argv[option_char])) {
-                        server_address = argv[option_char++];
+                        result.config.server_address = argv[option_char++];
                 } else {
                         usage2(_("Invalid hostname/address"), argv[option_char]);
                 }
         }
 
-        if (server_address == NULL)
+        if (result.config.server_address == NULL) {
                 usage4(_("You must provide a server to check"));
+        }
 
-        if (host_name == NULL)
-                host_name = strdup(server_address);
+        if (result.config.host_name == NULL) {
+                result.config.host_name = strdup(result.config.server_address);
+        }
 
-        if (server_expect == NULL)
-                server_expect = strdup(EXPECT);
+        if (result.config.server_expect == NULL) {
+                result.config.server_expect = strdup(EXPECT);
+        }
 
-        return OK;
+        return result;
 }
 
 void print_help(void) {
@@ -388,7 +432,8 @@ void print_help(void) {
         printf("%s\n", _("This plugin will attempt to open an RTSP connection with the host."));
         printf("%s\n", _("Successful connects return STATE_OK, refusals and timeouts return"));
         printf("%s\n", _("STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful connects,"));
-        printf("%s\n", _("but incorrect response messages from the host result in STATE_WARNING return"));
+        printf("%s\n",
+                   _("but incorrect response messages from the host result in STATE_WARNING return"));
         printf("%s\n", _("values."));
 
         printf(UT_SUPPORT);
diff --git a/plugins/check_real.d/config.h b/plugins/check_real.d/config.h
new file mode 100644
index 00000000..c4663cf9
--- /dev/null
+++ b/plugins/check_real.d/config.h
@@ -0,0 +1,37 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+enum {
+        PORT = 554
+};
+
+typedef struct {
+        char *server_address;
+        char *host_name;
+        int server_port;
+        char *server_url;
+
+        char *server_expect;
+        int warning_time;
+        bool check_warning_time;
+        int critical_time;
+        bool check_critical_time;
+} check_real_config;
+
+check_real_config check_real_config_init() {
+        check_real_config tmp = {
+                .server_address = NULL,
+                .host_name = NULL,
+                .server_port = PORT,
+                .server_url = NULL,
+
+                .server_expect = NULL,
+                .warning_time = 0,
+                .check_warning_time = false,
+                .critical_time = 0,
+                .check_critical_time = false,
+        };
+        return tmp;
+}
diff --git a/plugins/check_smtp.c b/plugins/check_smtp.c
index 44b735f9..e8c35f58 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -28,20 +28,24 @@
  *
  *****************************************************************************/
 
-const char *progname = "check_smtp";
-const char *copyright = "2000-2024";
-const char *email = "devel@monitoring-plugins.org";
-
 #include "common.h"
 #include "netutils.h"
+#include "output.h"
+#include "perfdata.h"
+#include "thresholds.h"
 #include "utils.h"
 #include "base64.h"
 #include "regex.h"
 
 #include <ctype.h>
+#include <string.h>
 #include "check_smtp.d/config.h"
 #include "../lib/states.h"
 
+const char *progname = "check_smtp";
+const char *copyright = "2000-2024";
+const char *email = "devel@monitoring-plugins.org";
+
 #define PROXY_PREFIX    "PROXY TCP4 0.0.0.0 0.0.0.0 25 25\r\n"
 #define SMTP_HELO       "HELO "
 #define SMTP_EHLO       "EHLO "
@@ -58,7 +62,8 @@ typedef struct {
 } check_smtp_config_wrapper;
 static check_smtp_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 
-int my_recv(check_smtp_config config, void *buf, int num, int socket_descriptor, bool ssl_established) {
+int my_recv(check_smtp_config config, void *buf, int num, int socket_descriptor,
+                        bool ssl_established) {
 #ifdef HAVE_SSL
         if ((config.use_starttls || config.use_ssl) && ssl_established) {
                 return np_net_ssl_read(buf, num);
@@ -69,7 +74,8 @@ int my_recv(check_smtp_config config, void *buf, int num, int socket_descriptor,
 #endif
 }
 
-int my_send(check_smtp_config config, void *buf, int num, int socket_descriptor, bool ssl_established) {
+int my_send(check_smtp_config config, void *buf, int num, int socket_descriptor,
+                        bool ssl_established) {
 #ifdef HAVE_SSL
         if ((config.use_starttls || config.use_ssl) && ssl_established) {
 
@@ -83,10 +89,12 @@ int my_send(check_smtp_config config, void *buf, int num, int socket_descriptor,
 
 static void print_help(void);
 void print_usage(void);
-static char *smtp_quit(check_smtp_config /*config*/, char /*buffer*/[MAX_INPUT_BUFFER], int /*socket_descriptor*/,
-                                           bool /*ssl_established*/);
-static int recvline(char * /*buf*/, size_t /*bufsize*/, check_smtp_config /*config*/, int /*socket_descriptor*/, bool /*ssl_established*/);
-static int recvlines(check_smtp_config /*config*/, char * /*buf*/, size_t /*bufsize*/, int /*socket_descriptor*/, bool /*ssl_established*/);
+static char *smtp_quit(check_smtp_config /*config*/, char /*buffer*/[MAX_INPUT_BUFFER],
+                                           int /*socket_descriptor*/, bool /*ssl_established*/);
+static int recvline(char * /*buf*/, size_t /*bufsize*/, check_smtp_config /*config*/,
+                                        int /*socket_descriptor*/, bool /*ssl_established*/);
+static int recvlines(check_smtp_config /*config*/, char * /*buf*/, size_t /*bufsize*/,
+                                         int /*socket_descriptor*/, bool /*ssl_established*/);
 static int my_close(int /*socket_descriptor*/);
 
 static int verbose = 0;
@@ -107,6 +115,10 @@ int main(int argc, char **argv) {
 
         const check_smtp_config config = tmp_config.config;
 
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* If localhostname not set on command line, use gethostname to set */
         char *localhostname = config.localhostname;
         if (!localhostname) {
@@ -157,342 +169,459 @@ int main(int argc, char **argv) {
         gettimeofday(&start_time, NULL);
 
         int socket_descriptor = 0;
+
         /* try to connect to the host at the given port number */
-        mp_state_enum result = my_tcp_connect(config.server_address, config.server_port, &socket_descriptor);
+        mp_state_enum tcp_result =
+                my_tcp_connect(config.server_address, config.server_port, &socket_descriptor);
 
-        char *error_msg = "";
+        mp_check overall = mp_check_init();
+        mp_subcheck sc_tcp_connect = mp_subcheck_init();
         char buffer[MAX_INPUT_BUFFER];
         bool ssl_established = false;
-        if (result == STATE_OK) { /* we connected */
-                /* If requested, send PROXY header */
-                if (config.use_proxy_prefix) {
-                        if (verbose) {
-                                printf("Sending header %s\n", PROXY_PREFIX);
-                        }
-                        my_send(config, PROXY_PREFIX, strlen(PROXY_PREFIX), socket_descriptor, ssl_established);
+
+        if (tcp_result != STATE_OK) {
+                // Connect failed
+                sc_tcp_connect = mp_set_subcheck_state(sc_tcp_connect, STATE_CRITICAL);
+                xasprintf(&sc_tcp_connect.output, "TCP connect to '%s' failed", config.server_address);
+                mp_add_subcheck_to_check(&overall, sc_tcp_connect);
+                mp_exit(overall);
+        }
+
+        /* we connected */
+        /* If requested, send PROXY header */
+        if (config.use_proxy_prefix) {
+                if (verbose) {
+                        printf("Sending header %s\n", PROXY_PREFIX);
                 }
+                my_send(config, PROXY_PREFIX, strlen(PROXY_PREFIX), socket_descriptor, ssl_established);
+        }
 
 #ifdef HAVE_SSL
-                if (config.use_ssl) {
-                        result = np_net_ssl_init_with_hostname(socket_descriptor, (config.use_sni ? config.server_address : NULL));
-                        if (result != STATE_OK) {
-                                printf(_("CRITICAL - Cannot create SSL context.\n"));
-                                close(socket_descriptor);
-                                np_net_ssl_cleanup();
-                                exit(STATE_CRITICAL);
-                        }
-                        ssl_established = true;
+        if (config.use_ssl) {
+                int tls_result = np_net_ssl_init_with_hostname(
+                        socket_descriptor, (config.use_sni ? config.server_address : NULL));
+
+                mp_subcheck sc_tls_connection = mp_subcheck_init();
+
+                if (tls_result != STATE_OK) {
+                        close(socket_descriptor);
+                        np_net_ssl_cleanup();
+
+                        sc_tls_connection = mp_set_subcheck_state(sc_tls_connection, STATE_CRITICAL);
+                        xasprintf(&sc_tls_connection.output, "cannot create TLS context");
+                        mp_add_subcheck_to_check(&overall, sc_tls_connection);
+                        mp_exit(overall);
                 }
+
+                sc_tls_connection = mp_set_subcheck_state(sc_tls_connection, STATE_OK);
+                xasprintf(&sc_tls_connection.output, "TLS context established");
+                mp_add_subcheck_to_check(&overall, sc_tls_connection);
+                ssl_established = true;
+        }
 #endif
 
-                /* watch for the SMTP connection string and */
-                /* return a WARNING status if we couldn't read any data */
-                if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) <= 0) {
-                        printf(_("recv() failed\n"));
-                        exit(STATE_WARNING);
-                }
+        /* watch for the SMTP connection string and */
+        /* return a WARNING status if we couldn't read any data */
+        if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) <= 0) {
+                mp_subcheck sc_read_data = mp_subcheck_init();
+                sc_read_data = mp_set_subcheck_state(sc_read_data, STATE_WARNING);
+                xasprintf(&sc_read_data.output, "recv() failed");
+                mp_add_subcheck_to_check(&overall, sc_read_data);
+                mp_exit(overall);
+        }
 
-                char *server_response = NULL;
-                /* save connect return (220 hostname ..) for later use */
-                xasprintf(&server_response, "%s", buffer);
+        char *server_response = NULL;
+        /* save connect return (220 hostname ..) for later use */
+        xasprintf(&server_response, "%s", buffer);
 
-                /* send the HELO/EHLO command */
-                my_send(config, helocmd, (int)strlen(helocmd), socket_descriptor, ssl_established);
+        /* send the HELO/EHLO command */
+        my_send(config, helocmd, (int)strlen(helocmd), socket_descriptor, ssl_established);
 
-                /* allow for response to helo command to reach us */
-                if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) <= 0) {
-                        printf(_("recv() failed\n"));
-                        exit(STATE_WARNING);
-                }
+        /* allow for response to helo command to reach us */
+        if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) <= 0) {
+                mp_subcheck sc_read_data = mp_subcheck_init();
+                sc_read_data = mp_set_subcheck_state(sc_read_data, STATE_WARNING);
+                xasprintf(&sc_read_data.output, "recv() failed");
+                mp_add_subcheck_to_check(&overall, sc_read_data);
+                mp_exit(overall);
+        }
 
-                bool supports_tls = false;
-                if (config.use_ehlo || config.use_lhlo) {
-                        if (strstr(buffer, "250 STARTTLS") != NULL || strstr(buffer, "250-STARTTLS") != NULL) {
-                                supports_tls = true;
-                        }
+        bool supports_tls = false;
+        if (config.use_ehlo || config.use_lhlo) {
+                if (strstr(buffer, "250 STARTTLS") != NULL || strstr(buffer, "250-STARTTLS") != NULL) {
+                        supports_tls = true;
                 }
+        }
 
-                if (config.use_starttls && !supports_tls) {
-                        printf(_("WARNING - TLS not supported by server\n"));
+        if (config.use_starttls && !supports_tls) {
+                smtp_quit(config, buffer, socket_descriptor, ssl_established);
+
+                mp_subcheck sc_read_data = mp_subcheck_init();
+                sc_read_data = mp_set_subcheck_state(sc_read_data, STATE_WARNING);
+                xasprintf(&sc_read_data.output, "StartTLS not supported by server");
+                mp_add_subcheck_to_check(&overall, sc_read_data);
+                mp_exit(overall);
+        }
+
+#ifdef HAVE_SSL
+        if (config.use_starttls) {
+                /* send the STARTTLS command */
+                send(socket_descriptor, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0);
+
+                mp_subcheck sc_starttls_init = mp_subcheck_init();
+                recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor,
+                                  ssl_established); /* wait for it */
+                if (!strstr(buffer, SMTP_EXPECT)) {
                         smtp_quit(config, buffer, socket_descriptor, ssl_established);
-                        exit(STATE_WARNING);
+
+                        xasprintf(&sc_starttls_init.output, "StartTLS not supported by server");
+                        sc_starttls_init = mp_set_subcheck_state(sc_starttls_init, STATE_UNKNOWN);
+                        mp_add_subcheck_to_check(&overall, sc_starttls_init);
+                        mp_exit(overall);
                 }
 
-#ifdef HAVE_SSL
-                if (config.use_starttls) {
-                        /* send the STARTTLS command */
-                        send(socket_descriptor, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0);
-
-                        recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established); /* wait for it */
-                        if (!strstr(buffer, SMTP_EXPECT)) {
-                                printf(_("Server does not support STARTTLS\n"));
-                                smtp_quit(config, buffer, socket_descriptor, ssl_established);
-                                exit(STATE_UNKNOWN);
-                        }
+                mp_state_enum starttls_result = np_net_ssl_init_with_hostname(
+                        socket_descriptor, (config.use_sni ? config.server_address : NULL));
+                if (starttls_result != STATE_OK) {
+                        close(socket_descriptor);
+                        np_net_ssl_cleanup();
 
-                        result = np_net_ssl_init_with_hostname(socket_descriptor, (config.use_sni ? config.server_address : NULL));
-                        if (result != STATE_OK) {
-                                printf(_("CRITICAL - Cannot create SSL context.\n"));
-                                close(socket_descriptor);
-                                np_net_ssl_cleanup();
-                                exit(STATE_CRITICAL);
-                        }
+                        sc_starttls_init = mp_set_subcheck_state(sc_starttls_init, STATE_CRITICAL);
+                        xasprintf(&sc_starttls_init.output, "failed to create StartTLS context");
+                        mp_add_subcheck_to_check(&overall, sc_starttls_init);
+                        mp_exit(overall);
+                }
+                sc_starttls_init = mp_set_subcheck_state(sc_starttls_init, STATE_OK);
+                xasprintf(&sc_starttls_init.output, "created StartTLS context");
+                mp_add_subcheck_to_check(&overall, sc_starttls_init);
+
+                ssl_established = true;
+
+                /*
+                 * Resend the EHLO command.
+                 *
+                 * RFC 3207 (4.2) says: ``The client MUST discard any knowledge
+                 * obtained from the server, such as the list of SMTP service
+                 * extensions, which was not obtained from the TLS negotiation
+                 * itself.  The client SHOULD send an EHLO command as the first
+                 * command after a successful TLS negotiation.''  For this
+                 * reason, some MTAs will not allow an AUTH LOGIN command before
+                 * we resent EHLO via TLS.
+                 */
+                if (my_send(config, helocmd, (int)strlen(helocmd), socket_descriptor, ssl_established) <=
+                        0) {
+                        my_close(socket_descriptor);
+
+                        mp_subcheck sc_ehlo = mp_subcheck_init();
+                        sc_ehlo = mp_set_subcheck_state(sc_ehlo, STATE_UNKNOWN);
+                        xasprintf(&sc_ehlo.output, "cannot send EHLO command via StartTLS");
+                        mp_add_subcheck_to_check(&overall, sc_ehlo);
+                        mp_exit(overall);
+                }
 
-                        ssl_established = true;
-
-                        /*
-                         * Resend the EHLO command.
-                         *
-                         * RFC 3207 (4.2) says: ``The client MUST discard any knowledge
-                         * obtained from the server, such as the list of SMTP service
-                         * extensions, which was not obtained from the TLS negotiation
-                         * itself.  The client SHOULD send an EHLO command as the first
-                         * command after a successful TLS negotiation.''  For this
-                         * reason, some MTAs will not allow an AUTH LOGIN command before
-                         * we resent EHLO via TLS.
-                         */
-                        if (my_send(config, helocmd, strlen(helocmd), socket_descriptor, ssl_established) <= 0) {
-                                printf("%s\n", _("SMTP UNKNOWN - Cannot send EHLO command via TLS."));
-                                my_close(socket_descriptor);
-                                exit(STATE_UNKNOWN);
-                        }
+                if (verbose) {
+                        printf(_("sent %s"), helocmd);
+                }
 
-                        if (verbose) {
-                                printf(_("sent %s"), helocmd);
-                        }
+                if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) <= 0) {
+                        my_close(socket_descriptor);
 
-                        if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) <= 0) {
-                                printf("%s\n", _("SMTP UNKNOWN - Cannot read EHLO response via TLS."));
-                                my_close(socket_descriptor);
-                                exit(STATE_UNKNOWN);
-                        }
+                        mp_subcheck sc_ehlo = mp_subcheck_init();
+                        sc_ehlo = mp_set_subcheck_state(sc_ehlo, STATE_UNKNOWN);
+                        xasprintf(&sc_ehlo.output, "cannot read EHLO response via StartTLS");
+                        mp_add_subcheck_to_check(&overall, sc_ehlo);
+                        mp_exit(overall);
+                }
 
-                        if (verbose) {
-                                printf("%s", buffer);
-                        }
+                if (verbose) {
+                        printf("%s", buffer);
+                }
+        }
 
 #       ifdef USE_OPENSSL
-                        if (config.check_cert) {
-                                result = np_net_ssl_check_cert(config.days_till_exp_warn, config.days_till_exp_crit);
-                                smtp_quit(config, buffer, socket_descriptor, ssl_established);
-                                my_close(socket_descriptor);
-                                exit(result);
+        if (ssl_established) {
+                net_ssl_check_cert_result cert_check_result =
+                        np_net_ssl_check_cert2(config.days_till_exp_warn, config.days_till_exp_crit);
+
+                mp_subcheck sc_cert_check = mp_subcheck_init();
+
+                switch (cert_check_result.errors) {
+                case ALL_OK: {
+
+                        if (cert_check_result.result_state != STATE_OK &&
+                                config.ignore_certificate_expiration) {
+                                xasprintf(&sc_cert_check.output,
+                                                  "Remaining certificate lifetime: %d days. Expiration will be ignored",
+                                                  (int)(cert_check_result.remaining_seconds / 86400));
+                                sc_cert_check = mp_set_subcheck_state(sc_cert_check, STATE_OK);
+                        } else {
+                                xasprintf(&sc_cert_check.output, "Remaining certificate lifetime: %d days",
+                                                  (int)(cert_check_result.remaining_seconds / 86400));
+                                sc_cert_check =
+                                        mp_set_subcheck_state(sc_cert_check, cert_check_result.result_state);
                         }
+                } break;
+                case NO_SERVER_CERTIFICATE_PRESENT: {
+                        xasprintf(&sc_cert_check.output, "no server certificate present");
+                        sc_cert_check = mp_set_subcheck_state(sc_cert_check, cert_check_result.result_state);
+                } break;
+                case UNABLE_TO_RETRIEVE_CERTIFICATE_SUBJECT: {
+                        xasprintf(&sc_cert_check.output, "can not retrieve certificate subject");
+                        sc_cert_check = mp_set_subcheck_state(sc_cert_check, cert_check_result.result_state);
+                } break;
+                case WRONG_TIME_FORMAT_IN_CERTIFICATE: {
+                        xasprintf(&sc_cert_check.output, "wrong time format in certificate");
+                        sc_cert_check = mp_set_subcheck_state(sc_cert_check, cert_check_result.result_state);
+                } break;
+                };
+
+                mp_add_subcheck_to_check(&overall, sc_cert_check);
+        }
 #       endif /* USE_OPENSSL */
-                }
+
 #endif
 
-                if (verbose) {
+        if (verbose) {
+                printf("%s", buffer);
+        }
+
+        /* save buffer for later use */
+        xasprintf(&server_response, "%s%s", server_response, buffer);
+        /* strip the buffer of carriage returns */
+        strip(server_response);
+
+        /* make sure we find the droids we are looking for */
+        mp_subcheck sc_expect_response = mp_subcheck_init();
+
+        if (!strstr(server_response, config.server_expect)) {
+                sc_expect_response = mp_set_subcheck_state(sc_expect_response, STATE_WARNING);
+                if (config.server_port == SMTP_PORT) {
+                        xasprintf(&sc_expect_response.output, _("invalid SMTP response received from host: %s"),
+                                          server_response);
+                } else {
+                        xasprintf(&sc_expect_response.output,
+                                          _("invalid SMTP response received from host on port %d: %s"),
+                                          config.server_port, server_response);
+                }
+                exit(STATE_WARNING);
+        } else {
+                xasprintf(&sc_expect_response.output, "received valid SMTP response '%s' from host: '%s'",
+                                  config.server_expect, server_response);
+                sc_expect_response = mp_set_subcheck_state(sc_expect_response, STATE_OK);
+        }
+
+        mp_add_subcheck_to_check(&overall, sc_expect_response);
+
+        if (config.send_mail_from) {
+                my_send(config, cmd_str, (int)strlen(cmd_str), socket_descriptor, ssl_established);
+                if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) >= 1 &&
+                        verbose) {
                         printf("%s", buffer);
                 }
+        }
 
-                /* save buffer for later use */
-                xasprintf(&server_response, "%s%s", server_response, buffer);
-                /* strip the buffer of carriage returns */
-                strip(server_response);
+        size_t counter = 0;
+        while (counter < config.ncommands) {
+                xasprintf(&cmd_str, "%s%s", config.commands[counter], "\r\n");
+                my_send(config, cmd_str, (int)strlen(cmd_str), socket_descriptor, ssl_established);
+                if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) >= 1 &&
+                        verbose) {
+                        printf("%s", buffer);
+                }
 
-                /* make sure we find the droids we are looking for */
-                if (!strstr(server_response, config.server_expect)) {
-                        if (config.server_port == SMTP_PORT) {
-                                printf(_("Invalid SMTP response received from host: %s\n"), server_response);
-                        } else {
-                                printf(_("Invalid SMTP response received from host on port %d: %s\n"), config.server_port, server_response);
+                strip(buffer);
+
+                if (counter < config.nresponses) {
+                        int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+                        regex_t preg;
+                        int errcode = regcomp(&preg, config.responses[counter], cflags);
+                        char errbuf[MAX_INPUT_BUFFER];
+                        if (errcode != 0) {
+                                regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                printf(_("Could Not Compile Regular Expression"));
+                                exit(STATE_UNKNOWN);
                         }
-                        exit(STATE_WARNING);
-                }
 
-                if (config.send_mail_from) {
-                        my_send(config, cmd_str, (int)strlen(cmd_str), socket_descriptor, ssl_established);
-                        if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) >= 1 && verbose) {
-                                printf("%s", buffer);
+                        regmatch_t pmatch[10];
+                        int eflags = 0;
+                        int excode = regexec(&preg, buffer, 10, pmatch, eflags);
+                        mp_subcheck sc_expected_responses = mp_subcheck_init();
+                        if (excode == 0) {
+                                xasprintf(&sc_expected_responses.output, "valid response '%s' to command '%s'",
+                                                  buffer, config.commands[counter]);
+                                sc_expected_responses = mp_set_subcheck_state(sc_expected_responses, STATE_OK);
+                        } else if (excode == REG_NOMATCH) {
+                                sc_expected_responses = mp_set_subcheck_state(sc_expected_responses, STATE_WARNING);
+                                xasprintf(&sc_expected_responses.output, "invalid response '%s' to command '%s'",
+                                                  buffer, config.commands[counter]);
+                        } else {
+                                regerror(excode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                xasprintf(&sc_expected_responses.output, "regexec execute error: %s", errbuf);
+                                sc_expected_responses = mp_set_subcheck_state(sc_expected_responses, STATE_UNKNOWN);
                         }
                 }
+                counter++;
+        }
 
-                int counter = 0;
-                while (counter < config.ncommands) {
-                        xasprintf(&cmd_str, "%s%s", config.commands[counter], "\r\n");
-                        my_send(config, cmd_str, (int)strlen(cmd_str), socket_descriptor, ssl_established);
-                        if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) >= 1 && verbose) {
-                                printf("%s", buffer);
-                        }
-                        strip(buffer);
-                        if (counter < config.nresponses) {
-                                int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-                                regex_t preg;
-                                int errcode = regcomp(&preg, config.responses[counter], cflags);
-                                char errbuf[MAX_INPUT_BUFFER];
-                                if (errcode != 0) {
-                                        regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-                                        printf(_("Could Not Compile Regular Expression"));
-                                        exit(STATE_UNKNOWN);
+        if (config.authtype != NULL) {
+                mp_subcheck sc_auth = mp_subcheck_init();
+
+                if (strcmp(config.authtype, "LOGIN") == 0) {
+                        char *abuf;
+                        int ret;
+                        do {
+                                /* send AUTH LOGIN */
+                                my_send(config, SMTP_AUTH_LOGIN, strlen(SMTP_AUTH_LOGIN), socket_descriptor,
+                                                ssl_established);
+
+                                if (verbose) {
+                                        printf(_("sent %s\n"), "AUTH LOGIN");
                                 }
 
-                                regmatch_t pmatch[10];
-                                int eflags = 0;
-                                int excode = regexec(&preg, buffer, 10, pmatch, eflags);
-                                if (excode == 0) {
-                                        result = STATE_OK;
-                                } else if (excode == REG_NOMATCH) {
-                                        result = STATE_WARNING;
-                                        printf(_("SMTP %s - Invalid response '%s' to command '%s'\n"), state_text(result), buffer, config.commands[counter]);
-                                } else {
-                                        regerror(excode, &preg, errbuf, MAX_INPUT_BUFFER);
-                                        printf(_("Execute Error: %s\n"), errbuf);
-                                        result = STATE_UNKNOWN;
+                                if ((ret = recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor,
+                                                                         ssl_established)) <= 0) {
+                                        xasprintf(&sc_auth.output, _("recv() failed after AUTH LOGIN"));
+                                        sc_auth = mp_set_subcheck_state(sc_auth, STATE_WARNING);
+                                        break;
                                 }
-                        }
-                        counter++;
-                }
 
-                if (config.authtype != NULL) {
-                        if (strcmp(config.authtype, "LOGIN") == 0) {
-                                char *abuf;
-                                int ret;
-                                do {
-                                        if (config.authuser == NULL) {
-                                                result = STATE_CRITICAL;
-                                                xasprintf(&error_msg, _("no authuser specified, "));
-                                                break;
-                                        }
-                                        if (config.authpass == NULL) {
-                                                result = STATE_CRITICAL;
-                                                xasprintf(&error_msg, _("no authpass specified, "));
-                                                break;
-                                        }
-
-                                        /* send AUTH LOGIN */
-                                        my_send(config, SMTP_AUTH_LOGIN, strlen(SMTP_AUTH_LOGIN), socket_descriptor, ssl_established);
-                                        if (verbose) {
-                                                printf(_("sent %s\n"), "AUTH LOGIN");
-                                        }
-
-                                        if ((ret = recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established)) <= 0) {
-                                                xasprintf(&error_msg, _("recv() failed after AUTH LOGIN, "));
-                                                result = STATE_WARNING;
-                                                break;
-                                        }
-                                        if (verbose) {
-                                                printf(_("received %s\n"), buffer);
-                                        }
-
-                                        if (strncmp(buffer, "334", 3) != 0) {
-                                                result = STATE_CRITICAL;
-                                                xasprintf(&error_msg, _("invalid response received after AUTH LOGIN, "));
-                                                break;
-                                        }
-
-                                        /* encode authuser with base64 */
-                                        base64_encode_alloc(config.authuser, strlen(config.authuser), &abuf);
-                                        xasprintf(&abuf, "%s\r\n", abuf);
-                                        my_send(config, abuf, (int)strlen(abuf), socket_descriptor, ssl_established);
-                                        if (verbose) {
-                                                printf(_("sent %s\n"), abuf);
-                                        }
-
-                                        if ((ret = recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established)) <= 0) {
-                                                result = STATE_CRITICAL;
-                                                xasprintf(&error_msg, _("recv() failed after sending authuser, "));
-                                                break;
-                                        }
-                                        if (verbose) {
-                                                printf(_("received %s\n"), buffer);
-                                        }
-                                        if (strncmp(buffer, "334", 3) != 0) {
-                                                result = STATE_CRITICAL;
-                                                xasprintf(&error_msg, _("invalid response received after authuser, "));
-                                                break;
-                                        }
-                                        /* encode authpass with base64 */
-                                        base64_encode_alloc(config.authpass, strlen(config.authpass), &abuf);
-                                        xasprintf(&abuf, "%s\r\n", abuf);
-                                        my_send(config, abuf, (int)strlen(abuf), socket_descriptor, ssl_established);
-                                        if (verbose) {
-                                                printf(_("sent %s\n"), abuf);
-                                        }
-                                        if ((ret = recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established)) <= 0) {
-                                                result = STATE_CRITICAL;
-                                                xasprintf(&error_msg, _("recv() failed after sending authpass, "));
-                                                break;
-                                        }
-                                        if (verbose) {
-                                                printf(_("received %s\n"), buffer);
-                                        }
-                                        if (strncmp(buffer, "235", 3) != 0) {
-                                                result = STATE_CRITICAL;
-                                                xasprintf(&error_msg, _("invalid response received after authpass, "));
-                                                break;
-                                        }
+                                if (verbose) {
+                                        printf(_("received %s\n"), buffer);
+                                }
+
+                                if (strncmp(buffer, "334", 3) != 0) {
+                                        xasprintf(&sc_auth.output, "invalid response received after AUTH LOGIN");
+                                        sc_auth = mp_set_subcheck_state(sc_auth, STATE_CRITICAL);
                                         break;
-                                } while (false);
-                        } else {
-                                result = STATE_CRITICAL;
-                                xasprintf(&error_msg, _("only authtype LOGIN is supported, "));
-                        }
-                }
+                                }
 
-                /* tell the server we're done */
-                smtp_quit(config, buffer, socket_descriptor, ssl_established);
+                                /* encode authuser with base64 */
+                                base64_encode_alloc(config.authuser, strlen(config.authuser), &abuf);
+                                xasprintf(&abuf, "%s\r\n", abuf);
+                                my_send(config, abuf, (int)strlen(abuf), socket_descriptor, ssl_established);
+                                if (verbose) {
+                                        printf(_("sent %s\n"), abuf);
+                                }
+
+                                if ((ret = recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor,
+                                                                         ssl_established)) <= 0) {
+                                        xasprintf(&sc_auth.output, "recv() failed after sending authuser");
+                                        sc_auth = mp_set_subcheck_state(sc_auth, STATE_CRITICAL);
+                                        break;
+                                }
+
+                                if (verbose) {
+                                        printf(_("received %s\n"), buffer);
+                                }
+
+                                if (strncmp(buffer, "334", 3) != 0) {
+                                        xasprintf(&sc_auth.output, "invalid response received after authuser");
+                                        sc_auth = mp_set_subcheck_state(sc_auth, STATE_CRITICAL);
+                                        break;
+                                }
 
-                /* finally close the connection */
-                close(socket_descriptor);
+                                /* encode authpass with base64 */
+                                base64_encode_alloc(config.authpass, strlen(config.authpass), &abuf);
+                                xasprintf(&abuf, "%s\r\n", abuf);
+                                my_send(config, abuf, (int)strlen(abuf), socket_descriptor, ssl_established);
+
+                                if (verbose) {
+                                        printf(_("sent %s\n"), abuf);
+                                }
+
+                                if ((ret = recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor,
+                                                                         ssl_established)) <= 0) {
+                                        xasprintf(&sc_auth.output, "recv() failed after sending authpass");
+                                        sc_auth = mp_set_subcheck_state(sc_auth, STATE_CRITICAL);
+                                        break;
+                                }
+
+                                if (verbose) {
+                                        printf(_("received %s\n"), buffer);
+                                }
+
+                                if (strncmp(buffer, "235", 3) != 0) {
+                                        xasprintf(&sc_auth.output, "invalid response received after authpass");
+                                        sc_auth = mp_set_subcheck_state(sc_auth, STATE_CRITICAL);
+                                        break;
+                                }
+                                break;
+                        } while (false);
+                } else {
+                        sc_auth = mp_set_subcheck_state(sc_auth, STATE_CRITICAL);
+                        xasprintf(&sc_auth.output, "only authtype LOGIN is supported");
+                }
+
+                mp_add_subcheck_to_check(&overall, sc_auth);
         }
 
+        /* tell the server we're done */
+        smtp_quit(config, buffer, socket_descriptor, ssl_established);
+
+        /* finally close the connection */
+        close(socket_descriptor);
+
         /* reset the alarm */
         alarm(0);
 
         long microsec = deltime(start_time);
         double elapsed_time = (double)microsec / 1.0e6;
 
-        if (result == STATE_OK) {
-                if (config.check_critical_time && elapsed_time > config.critical_time) {
-                        result = STATE_CRITICAL;
-                } else if (config.check_warning_time && elapsed_time > config.warning_time) {
-                        result = STATE_WARNING;
-                }
-        }
+        mp_perfdata pd_elapsed_time = perfdata_init();
+        pd_elapsed_time = mp_set_pd_value(pd_elapsed_time, elapsed_time);
+        pd_elapsed_time.label = "time";
+        pd_elapsed_time.uom = "s";
+
+        pd_elapsed_time = mp_pd_set_thresholds(pd_elapsed_time, config.connection_time);
 
-        printf(_("SMTP %s - %s%.3f sec. response time%s%s|%s\n"), state_text(result), error_msg, elapsed_time, verbose ? ", " : "",
-                   verbose ? buffer : "",
-                   fperfdata("time", elapsed_time, "s", config.check_warning_time, config.warning_time, config.check_critical_time,
-                                         config.critical_time, true, 0, false, 0));
+        mp_subcheck sc_connection_time = mp_subcheck_init();
+        xasprintf(&sc_connection_time.output, "connection time: %.3gs", elapsed_time);
+        sc_connection_time =
+                mp_set_subcheck_state(sc_connection_time, mp_get_pd_status(pd_elapsed_time));
+        mp_add_subcheck_to_check(&overall, sc_connection_time);
 
-        exit(result);
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
 check_smtp_config_wrapper process_arguments(int argc, char **argv) {
         enum {
-                SNI_OPTION = CHAR_MAX + 1
+                SNI_OPTION = CHAR_MAX + 1,
+                output_format_index,
+                ignore_certificate_expiration_index,
         };
 
         int option = 0;
-        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
-                                                                           {"expect", required_argument, 0, 'e'},
-                                                                           {"critical", required_argument, 0, 'c'},
-                                                                           {"warning", required_argument, 0, 'w'},
-                                                                           {"timeout", required_argument, 0, 't'},
-                                                                           {"port", required_argument, 0, 'p'},
-                                                                           {"from", required_argument, 0, 'f'},
-                                                                           {"fqdn", required_argument, 0, 'F'},
-                                                                           {"authtype", required_argument, 0, 'A'},
-                                                                           {"authuser", required_argument, 0, 'U'},
-                                                                           {"authpass", required_argument, 0, 'P'},
-                                                                           {"command", required_argument, 0, 'C'},
-                                                                           {"response", required_argument, 0, 'R'},
-                                                                           {"verbose", no_argument, 0, 'v'},
-                                                                           {"version", no_argument, 0, 'V'},
-                                                                           {"use-ipv4", no_argument, 0, '4'},
-                                                                           {"use-ipv6", no_argument, 0, '6'},
-                                                                           {"help", no_argument, 0, 'h'},
-                                                                           {"lmtp", no_argument, 0, 'L'},
-                                                                           {"ssl", no_argument, 0, 's'},
-                                                                           {"tls", no_argument, 0, 's'},
-                                                                           {"starttls", no_argument, 0, 'S'},
-                                                                           {"sni", no_argument, 0, SNI_OPTION},
-                                                                           {"certificate", required_argument, 0, 'D'},
-                                                                           {"ignore-quit-failure", no_argument, 0, 'q'},
-                                                                           {"proxy", no_argument, 0, 'r'},
-                                                                           {0, 0, 0, 0}};
+        static struct option longopts[] = {
+                {"hostname", required_argument, 0, 'H'},
+                {"expect", required_argument, 0, 'e'},
+                {"critical", required_argument, 0, 'c'},
+                {"warning", required_argument, 0, 'w'},
+                {"timeout", required_argument, 0, 't'},
+                {"port", required_argument, 0, 'p'},
+                {"from", required_argument, 0, 'f'},
+                {"fqdn", required_argument, 0, 'F'},
+                {"authtype", required_argument, 0, 'A'},
+                {"authuser", required_argument, 0, 'U'},
+                {"authpass", required_argument, 0, 'P'},
+                {"command", required_argument, 0, 'C'},
+                {"response", required_argument, 0, 'R'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"help", no_argument, 0, 'h'},
+                {"lmtp", no_argument, 0, 'L'},
+                {"ssl", no_argument, 0, 's'},
+                {"tls", no_argument, 0, 's'},
+                {"starttls", no_argument, 0, 'S'},
+                {"sni", no_argument, 0, SNI_OPTION},
+                {"certificate", required_argument, 0, 'D'},
+                {"ignore-quit-failure", no_argument, 0, 'q'},
+                {"proxy", no_argument, 0, 'r'},
+                {"ignore-certificate-expiration", no_argument, 0, ignore_certificate_expiration_index},
+                {"output-format", required_argument, 0, output_format_index},
+                {0, 0, 0, 0}};
 
         check_smtp_config_wrapper result = {
                 .config = check_smtp_config_init(),
@@ -514,12 +643,13 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
                 }
         }
 
-        int command_size = 0;
-        int response_size = 0;
+        unsigned long command_size = 0;
+        unsigned long response_size = 0;
         bool implicit_tls = false;
         int server_port_option = 0;
         while (true) {
-                int opt_index = getopt_long(argc, argv, "+hVv46Lrt:p:f:e:c:w:H:C:R:sSD:F:A:U:P:q", longopts, &option);
+                int opt_index =
+                        getopt_long(argc, argv, "+hVv46Lrt:p:f:e:c:w:H:C:R:sSD:F:A:U:P:q", longopts, &option);
 
                 if (opt_index == -1 || opt_index == EOF) {
                         break;
@@ -546,7 +676,8 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
                         break;
                 case 'f': /* from argument */
                         result.config.from_arg = optarg + strspn(optarg, "<");
-                        result.config.from_arg = strndup(result.config.from_arg, strcspn(result.config.from_arg, ">"));
+                        result.config.from_arg =
+                                strndup(result.config.from_arg, strcspn(result.config.from_arg, ">"));
                         result.config.send_mail_from = true;
                         break;
                 case 'A':
@@ -565,9 +696,11 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
                 case 'C': /* commands  */
                         if (result.config.ncommands >= command_size) {
                                 command_size += 8;
-                                result.config.commands = realloc(result.config.commands, sizeof(char *) * command_size);
+                                result.config.commands =
+                                        realloc(result.config.commands, sizeof(char *) * command_size);
                                 if (result.config.commands == NULL) {
-                                        die(STATE_UNKNOWN, _("Could not realloc() units [%d]\n"), result.config.ncommands);
+                                        die(STATE_UNKNOWN, _("Could not realloc() units [%lu]\n"),
+                                                result.config.ncommands);
                                 }
                         }
                         result.config.commands[result.config.ncommands] = (char *)malloc(sizeof(char) * 255);
@@ -577,31 +710,33 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
                 case 'R': /* server responses */
                         if (result.config.nresponses >= response_size) {
                                 response_size += 8;
-                                result.config.responses = realloc(result.config.responses, sizeof(char *) * response_size);
+                                result.config.responses =
+                                        realloc(result.config.responses, sizeof(char *) * response_size);
                                 if (result.config.responses == NULL) {
-                                        die(STATE_UNKNOWN, _("Could not realloc() units [%d]\n"), result.config.nresponses);
+                                        die(STATE_UNKNOWN, _("Could not realloc() units [%lu]\n"),
+                                                result.config.nresponses);
                                 }
                         }
                         result.config.responses[result.config.nresponses] = (char *)malloc(sizeof(char) * 255);
                         strncpy(result.config.responses[result.config.nresponses], optarg, 255);
                         result.config.nresponses++;
                         break;
-                case 'c': /* critical time threshold */
-                        if (!is_nonnegative(optarg)) {
-                                usage4(_("Critical time must be a positive"));
-                        } else {
-                                result.config.critical_time = strtod(optarg, NULL);
-                                result.config.check_critical_time = true;
+                case 'c': /* critical time threshold */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse critical time threshold");
                         }
-                        break;
-                case 'w': /* warning time threshold */
-                        if (!is_nonnegative(optarg)) {
-                                usage4(_("Warning time must be a positive"));
-                        } else {
-                                result.config.warning_time = strtod(optarg, NULL);
-                                result.config.check_warning_time = true;
+                        result.config.connection_time =
+                                mp_thresholds_set_warn(result.config.connection_time, tmp.range);
+                } break;
+                case 'w': /* warning time threshold */ {
+                        mp_range_parsed tmp = mp_parse_range_string(optarg);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "failed to parse warning time threshold");
                         }
-                        break;
+                        result.config.connection_time =
+                                mp_thresholds_set_crit(result.config.connection_time, tmp.range);
+                } break;
                 case 'v': /* verbose */
                         verbose++;
                         break;
@@ -638,7 +773,6 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
                                 }
                                 result.config.days_till_exp_warn = atoi(optarg);
                         }
-                        result.config.check_cert = true;
                         result.config.ignore_send_quit_failure = true;
 #else
                         usage(_("SSL support not available - install OpenSSL and recompile"));
@@ -687,6 +821,21 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
                         exit(STATE_UNKNOWN);
                 case '?': /* help */
                         usage5();
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
+                case ignore_certificate_expiration_index: {
+                        result.config.ignore_certificate_expiration = true;
+                }
                 }
         }
 
@@ -715,11 +864,26 @@ check_smtp_config_wrapper process_arguments(int argc, char **argv) {
                 result.config.server_port = server_port_option;
         }
 
+        if (result.config.authtype) {
+                if (strcmp(result.config.authtype, "LOGIN") == 0) {
+                        if (result.config.authuser == NULL) {
+                                usage4("no authuser specified");
+                        }
+                        if (result.config.authpass == NULL) {
+                                usage4("no authpass specified");
+                        }
+                } else {
+                        usage4("only authtype LOGIN is supported");
+                }
+        }
+
         return result;
 }
 
-char *smtp_quit(check_smtp_config config, char buffer[MAX_INPUT_BUFFER], int socket_descriptor, bool ssl_established) {
-        int sent_bytes = my_send(config, SMTP_QUIT, strlen(SMTP_QUIT), socket_descriptor, ssl_established);
+char *smtp_quit(check_smtp_config config, char buffer[MAX_INPUT_BUFFER], int socket_descriptor,
+                                bool ssl_established) {
+        int sent_bytes =
+                my_send(config, SMTP_QUIT, strlen(SMTP_QUIT), socket_descriptor, ssl_established);
         if (sent_bytes < 0) {
                 if (config.ignore_send_quit_failure) {
                         if (verbose) {
@@ -759,9 +923,10 @@ char *smtp_quit(check_smtp_config config, char buffer[MAX_INPUT_BUFFER], int soc
  * function which buffers the data, move that to netutils.c and change
  * check_smtp and other plugins to use that.  Also, remove (\r)\n.
  */
-int recvline(char *buf, size_t bufsize, check_smtp_config config, int socket_descriptor, bool ssl_established) {
+int recvline(char *buf, size_t bufsize, check_smtp_config config, int socket_descriptor,
+                         bool ssl_established) {
         int result;
-        int counter;
+        size_t counter;
 
         for (counter = result = 0; counter < bufsize - 1; counter++) {
                 if ((result = my_recv(config, &buf[counter], 1, socket_descriptor, ssl_established)) != 1) {
@@ -769,7 +934,7 @@ int recvline(char *buf, size_t bufsize, check_smtp_config config, int socket_des
                 }
                 if (buf[counter] == '\n') {
                         buf[++counter] = '\0';
-                        return counter;
+                        return (int)counter;
                 }
         }
         return (result == 1 || counter == 0) ? -2 : result; /* -2 if out of space */
@@ -789,13 +954,16 @@ int recvline(char *buf, size_t bufsize, check_smtp_config config, int socket_des
  *
  * TODO: Move this to netutils.c.  Also, remove \r and possibly the final \n.
  */
-int recvlines(check_smtp_config config, char *buf, size_t bufsize, int socket_descriptor, bool ssl_established) {
+int recvlines(check_smtp_config config, char *buf, size_t bufsize, int socket_descriptor,
+                          bool ssl_established) {
         int result;
         int counter;
 
         for (counter = 0; /* forever */; counter += result) {
-                if (!((result = recvline(buf + counter, bufsize - counter, config, socket_descriptor, ssl_established)) > 3 &&
-                          isdigit((int)buf[counter]) && isdigit((int)buf[counter + 1]) && isdigit((int)buf[counter + 2]) && buf[counter + 3] == '-')) {
+                if (!((result = recvline(buf + counter, bufsize - counter, config, socket_descriptor,
+                                                                 ssl_established)) > 3 &&
+                          isdigit((int)buf[counter]) && isdigit((int)buf[counter + 1]) &&
+                          isdigit((int)buf[counter + 2]) && buf[counter + 3] == '-')) {
                         break;
                 }
         }
@@ -835,13 +1003,15 @@ void print_help(void) {
         printf(UT_IPv46);
 
         printf(" %s\n", "-e, --expect=STRING");
-        printf(_("    String to expect in first line of server response (default: '%s')\n"), SMTP_EXPECT);
+        printf(_("    String to expect in first line of server response (default: '%s')\n"),
+                   SMTP_EXPECT);
         printf(" %s\n", "-C, --command=STRING");
         printf("    %s\n", _("SMTP command (may be used repeatedly)"));
         printf(" %s\n", "-R, --response=STRING");
         printf("    %s\n", _("Expected response to command (may be used repeatedly)"));
         printf(" %s\n", "-f, --from=STRING");
-        printf("    %s\n", _("FROM-address to include in MAIL command, required by Exchange 2000")), printf(" %s\n", "-F, --fqdn=STRING");
+        printf("    %s\n", _("FROM-address to include in MAIL command, required by Exchange 2000")),
+                printf(" %s\n", "-F, --fqdn=STRING");
         printf("    %s\n", _("FQDN used for HELO"));
         printf(" %s\n", "-r, --proxy");
         printf("    %s\n", _("Use PROXY protocol prefix for the connection."));
@@ -867,11 +1037,15 @@ void print_help(void) {
         printf("    %s\n", _("Send LHLO instead of HELO/EHLO"));
         printf(" %s\n", "-q, --ignore-quit-failure");
         printf("    %s\n", _("Ignore failure when sending QUIT command to server"));
+        printf(" %s\n", "--ignore-certificate-expiration");
+        printf("    %s\n", _("Ignore certificate expiration"));
 
         printf(UT_WARN_CRIT);
 
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
+        printf(UT_OUTPUT_FORMAT);
+
         printf(UT_VERBOSE);
 
         printf("\n");
@@ -885,7 +1059,9 @@ void print_help(void) {
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf("%s -H host [-p port] [-4|-6] [-e expect] [-C command] [-R response] [-f from addr]\n", progname);
+        printf("%s -H host [-p port] [-4|-6] [-e expect] [-C command] [-R response] [-f from addr]\n",
+                   progname);
         printf("[-A authtype -U authuser -P authpass] [-w warn] [-c crit] [-t timeout] [-q]\n");
-        printf("[-F fqdn] [-S] [-L] [-D warn days cert expire[,crit days cert expire]] [-r] [--sni] [-v] \n");
+        printf("[-F fqdn] [-S] [-L] [-D warn days cert expire[,crit days cert expire]] [-r] [--sni] "
+                   "[-v] \n");
 }
diff --git a/plugins/check_smtp.d/config.h b/plugins/check_smtp.d/config.h
index 0a6511ef..b0d42ed1 100644
--- a/plugins/check_smtp.d/config.h
+++ b/plugins/check_smtp.d/config.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include "../../config.h"
+#include "output.h"
+#include "thresholds.h"
 #include <stddef.h>
 #include <string.h>
 
@@ -18,20 +20,18 @@ typedef struct {
         char *server_expect;
         bool ignore_send_quit_failure;
 
-        double warning_time;
-        bool check_warning_time;
-        double critical_time;
-        bool check_critical_time;
+        mp_thresholds connection_time;
+
         bool use_ehlo;
         bool use_lhlo;
 
         char *from_arg;
         bool send_mail_from;
 
-        int ncommands;
+        unsigned long ncommands;
         char **commands;
 
-        int nresponses;
+        unsigned long nresponses;
         char **responses;
 
         char *authtype;
@@ -40,13 +40,17 @@ typedef struct {
 
         bool use_proxy_prefix;
 #ifdef HAVE_SSL
-        bool check_cert;
         int days_till_exp_warn;
         int days_till_exp_crit;
         bool use_ssl;
         bool use_starttls;
         bool use_sni;
+
+        bool ignore_certificate_expiration;
 #endif
+
+        bool output_format_is_set;
+        mp_output_format output_format;
 } check_smtp_config;
 
 check_smtp_config check_smtp_config_init() {
@@ -58,10 +62,7 @@ check_smtp_config check_smtp_config_init() {
                 .server_expect = SMTP_EXPECT,
                 .ignore_send_quit_failure = false,
 
-                .warning_time = 0,
-                .check_warning_time = false,
-                .critical_time = 0,
-                .check_critical_time = false,
+                .connection_time = mp_thresholds_init(),
                 .use_ehlo = false,
                 .use_lhlo = false,
 
@@ -80,13 +81,16 @@ check_smtp_config check_smtp_config_init() {
 
                 .use_proxy_prefix = false,
 #ifdef HAVE_SSL
-                .check_cert = false,
                 .days_till_exp_warn = 0,
                 .days_till_exp_crit = 0,
                 .use_ssl = false,
                 .use_starttls = false,
                 .use_sni = false,
+
+                .ignore_certificate_expiration = false,
 #endif
+
+                .output_format_is_set = false,
         };
         return tmp;
 }
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index c1d8e2dd..f470d222 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -32,716 +32,492 @@ const char *progname = "check_snmp";
 const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
-#include "common.h"
-#include "runcmd.h"
-#include "utils.h"
-#include "utils_cmd.h"
-
-#define DEFAULT_COMMUNITY        "public"
-#define DEFAULT_PORT             "161"
-#define DEFAULT_MIBLIST          "ALL"
-#define DEFAULT_PROTOCOL         "1"
-#define DEFAULT_RETRIES          5
-#define DEFAULT_AUTH_PROTOCOL    "MD5"
-#define DEFAULT_PRIV_PROTOCOL    "DES"
-#define DEFAULT_DELIMITER        "="
-#define DEFAULT_OUTPUT_DELIMITER " "
-#define DEFAULT_BUFFER_SIZE      100
-
-#define mark(a) ((a) != 0 ? "*" : "")
-
-#define CHECK_UNDEF  0
-#define CRIT_PRESENT 1
-#define CRIT_STRING  2
-#define CRIT_REGEX   4
-#define WARN_PRESENT 8
-
-#define OID_COUNT_STEP 8
-
-/* Longopts only arguments */
-#define L_CALCULATE_RATE            CHAR_MAX + 1
-#define L_RATE_MULTIPLIER           CHAR_MAX + 2
-#define L_INVERT_SEARCH             CHAR_MAX + 3
-#define L_OFFSET                    CHAR_MAX + 4
-#define L_IGNORE_MIB_PARSING_ERRORS CHAR_MAX + 5
-
-/* Gobble to string - stop incrementing c when c[0] match one of the
- * characters in s */
-#define GOBBLE_TOS(c, s)                                                                                                                   \
-        while (c[0] != '\0' && strchr(s, c[0]) == NULL) {                                                                                      \
-                c++;                                                                                                                               \
+#include "./common.h"
+#include "./runcmd.h"
+#include "./utils.h"
+#include "../lib/states.h"
+
+#include "../lib/utils_base.h"
+#include "../lib/output.h"
+#include "check_snmp.d/check_snmp_helpers.h"
+
+#include <strings.h>
+#include <stdint.h>
+
+#include "check_snmp.d/config.h"
+#include <stdlib.h>
+#include <arpa/inet.h>
+#include <net-snmp/library/parse.h>
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/library/snmp.h>
+#include <net-snmp/library/keytools.h>
+#include <net-snmp/library/snmp_api.h>
+#include <net-snmp/session_api.h>
+#include <net-snmp/definitions.h>
+#include <net-snmp/library/asn1.h>
+#include <net-snmp/mib_api.h>
+#include <net-snmp/library/snmp_impl.h>
+#include <string.h>
+#include "../gl/regex.h"
+#include "../gl/base64.h"
+#include <assert.h>
+
+const char DEFAULT_COMMUNITY[] = "public";
+const char DEFAULT_MIBLIST[] = "ALL";
+#define DEFAULT_AUTH_PROTOCOL "MD5"
+
+#ifdef HAVE_USM_DES_PRIV_PROTOCOL
+#       define DEFAULT_PRIV_PROTOCOL "DES"
+#else
+#       define DEFAULT_PRIV_PROTOCOL "AES"
+#endif
+
+typedef struct proces_arguments_wrapper {
+        int errorcode;
+        check_snmp_config config;
+} process_arguments_wrapper;
+
+static process_arguments_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static char *trim_whitespaces_and_check_quoting(char *str);
+static char *get_next_argument(char *str);
+void print_usage(void);
+void print_help(void);
+
+int verbose = 0;
+
+typedef struct {
+        int errorcode;
+        char *state_string;
+} gen_state_string_type;
+gen_state_string_type gen_state_string(check_snmp_state_entry *entries, size_t num_of_entries) {
+        char *encoded_string = NULL;
+        gen_state_string_type result = {.errorcode = OK, .state_string = NULL};
+
+        if (verbose > 1) {
+                printf("%s:\n", __FUNCTION__);
+                for (size_t i = 0; i < num_of_entries; i++) {
+                        printf("Entry timestamp %lu: %s", entries[i].timestamp, ctime(&entries[i].timestamp));
+                        switch (entries[i].type) {
+                        case ASN_GAUGE:
+                                printf("Type GAUGE\n");
+                                break;
+                        case ASN_TIMETICKS:
+                                printf("Type TIMETICKS\n");
+                                break;
+                        case ASN_COUNTER:
+                                printf("Type COUNTER\n");
+                                break;
+                        case ASN_UINTEGER:
+                                printf("Type UINTEGER\n");
+                                break;
+                        case ASN_COUNTER64:
+                                printf("Type COUNTER64\n");
+                                break;
+                        case ASN_FLOAT:
+                                printf("Type FLOAT\n");
+                        case ASN_DOUBLE:
+                                printf("Type DOUBLE\n");
+                                break;
+                        case ASN_INTEGER:
+                                printf("Type INTEGER\n");
+                                break;
+                        }
+
+                        switch (entries[i].type) {
+                        case ASN_GAUGE:
+                        case ASN_TIMETICKS:
+                        case ASN_COUNTER:
+                        case ASN_UINTEGER:
+                        case ASN_COUNTER64:
+                                printf("Value %llu\n", entries[i].value.uIntVal);
+                                break;
+                        case ASN_FLOAT:
+                        case ASN_DOUBLE:
+                                printf("Value %f\n", entries[i].value.doubleVal);
+                                break;
+                        case ASN_INTEGER:
+                                printf("Value %lld\n", entries[i].value.intVal);
+                                break;
+                        }
+                }
+        }
+
+        idx_t encoded = base64_encode_alloc((const char *)entries,
+                                                                                (idx_t)(num_of_entries * sizeof(check_snmp_state_entry)),
+                                                                                &encoded_string);
+
+        if (encoded > 0 && encoded_string != NULL) {
+                // success
+                if (verbose > 1) {
+                        printf("encoded string: %s\n", encoded_string);
+                        printf("encoded string length: %lu\n", strlen(encoded_string));
+                }
+                result.state_string = encoded_string;
+                return result;
         }
-/* Given c, keep track of backslashes (bk) and double-quotes (dq)
- * from c[0] */
-#define COUNT_SEQ(c, bk, dq)                                                                                                               \
-        switch (c[0]) {                                                                                                                        \
-        case '\\':                                                                                                                             \
-                if (bk)                                                                                                                            \
-                        bk--;                                                                                                                          \
-                else                                                                                                                               \
-                        bk++;                                                                                                                          \
-                break;                                                                                                                             \
-        case '"':                                                                                                                              \
-                if (!dq) {                                                                                                                         \
-                        dq++;                                                                                                                          \
-                } else if (!bk) {                                                                                                                  \
-                        dq--;                                                                                                                          \
-                } else {                                                                                                                           \
-                        bk--;                                                                                                                          \
-                }                                                                                                                                  \
-                break;                                                                                                                             \
+        result.errorcode = ERROR;
+        return result;
+}
+
+typedef struct {
+        int errorcode;
+        check_snmp_state_entry *state;
+} recover_state_data_type;
+recover_state_data_type recover_state_data(char *state_string, idx_t state_string_length) {
+        recover_state_data_type result = {.errorcode = OK, .state = NULL};
+
+        if (verbose > 1) {
+                printf("%s:\n", __FUNCTION__);
+                printf("State string: %s\n", state_string);
+                printf("State string length: %lu\n", state_string_length);
         }
 
-static int process_arguments(int, char **);
-static int validate_arguments(void);
-static char *thisarg(char *str);
-static char *nextarg(char *str);
-void print_usage(void);
-static void print_help(void);
-static char *multiply(char *str);
-
-#include "regex.h"
-static char regex_expect[MAX_INPUT_BUFFER] = "";
-static regex_t preg;
-static regmatch_t pmatch[10];
-static char errbuf[MAX_INPUT_BUFFER] = "";
-static char perfstr[MAX_INPUT_BUFFER] = "| ";
-static int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-static int eflags = 0;
-static int errcode, excode;
-
-static char *server_address = NULL;
-static char *community = NULL;
-static char **contextargs = NULL;
-static char *context = NULL;
-static char **authpriv = NULL;
-static char *proto = NULL;
-static char *seclevel = NULL;
-static char *secname = NULL;
-static char *authproto = NULL;
-static char *privproto = NULL;
-static char *authpasswd = NULL;
-static char *privpasswd = NULL;
-static int nulloid = STATE_UNKNOWN;
-static char **oids = NULL;
-static size_t oids_size = 0;
-static char *label;
-static char *units;
-static char *port;
-static char *snmpcmd;
-static char string_value[MAX_INPUT_BUFFER] = "";
-static int invert_search = 0;
-static char **labels = NULL;
-static char **unitv = NULL;
-static size_t nlabels = 0;
-static size_t labels_size = OID_COUNT_STEP;
-static size_t nunits = 0;
-static size_t unitv_size = OID_COUNT_STEP;
-static size_t numoids = 0;
-static int numauthpriv = 0;
-static int numcontext = 0;
-static int verbose = 0;
-static bool usesnmpgetnext = false;
-static char *warning_thresholds = NULL;
-static char *critical_thresholds = NULL;
-static thresholds **thlds;
-static size_t thlds_size = OID_COUNT_STEP;
-static double *response_value;
-static size_t response_size = OID_COUNT_STEP;
-static int retries = 0;
-static int *eval_method;
-static size_t eval_size = OID_COUNT_STEP;
-static char *delimiter;
-static char *output_delim;
-static char *miblist = NULL;
-static bool needmibs = false;
-static int calculate_rate = 0;
-static double offset = 0.0;
-static int rate_multiplier = 1;
-static state_data *previous_state;
-static double *previous_value;
-static size_t previous_size = OID_COUNT_STEP;
-static int perf_labels = 1;
-static char *ip_version = "";
-static double multiplier = 1.0;
-static char *fmtstr = "";
-static bool fmtstr_set = false;
-static char buffer[DEFAULT_BUFFER_SIZE];
-static bool ignore_mib_parsing_errors = false;
-
-static char *fix_snmp_range(char *th) {
-        double left;
-        double right;
-        char *colon;
-        char *ret;
-
-        if ((colon = strchr(th, ':')) == NULL || *(colon + 1) == '\0')
-                return th;
-
-        left = strtod(th, NULL);
-        right = strtod(colon + 1, NULL);
-        if (right >= left)
-                return th;
-
-        if ((ret = malloc(strlen(th) + 2)) == NULL)
-                die(STATE_UNKNOWN, _("Cannot malloc"));
-        *colon = '\0';
-        sprintf(ret, "@%s:%s", colon + 1, th);
-        free(th);
-        return ret;
+        idx_t outlen = 0;
+        bool decoded =
+                base64_decode_alloc(state_string, state_string_length, (char **)&result.state, &outlen);
+
+        if (!decoded) {
+                if (verbose) {
+                        printf("Failed to decode state string\n");
+                }
+                // failure to decode
+                result.errorcode = ERROR;
+                return result;
+        }
+
+        if (result.state == NULL) {
+                // Memory Error?
+                result.errorcode = ERROR;
+                return result;
+        }
+
+        if (verbose > 1) {
+                printf("Recovered %lu entries of size %lu\n",
+                           (size_t)outlen / sizeof(check_snmp_state_entry), outlen);
+
+                for (size_t i = 0; i < (size_t)outlen / sizeof(check_snmp_state_entry); i++) {
+                        printf("Entry timestamp %lu: %s", result.state[i].timestamp,
+                                   ctime(&result.state[i].timestamp));
+                        switch (result.state[i].type) {
+                        case ASN_GAUGE:
+                                printf("Type GAUGE\n");
+                                break;
+                        case ASN_TIMETICKS:
+                                printf("Type TIMETICKS\n");
+                                break;
+                        case ASN_COUNTER:
+                                printf("Type COUNTER\n");
+                                break;
+                        case ASN_UINTEGER:
+                                printf("Type UINTEGER\n");
+                                break;
+                        case ASN_COUNTER64:
+                                printf("Type COUNTER64\n");
+                                break;
+                        case ASN_FLOAT:
+                                printf("Type FLOAT\n");
+                        case ASN_DOUBLE:
+                                printf("Type DOUBLE\n");
+                                break;
+                        case ASN_INTEGER:
+                                printf("Type INTEGER\n");
+                                break;
+                        }
+
+                        switch (result.state[i].type) {
+                        case ASN_GAUGE:
+                        case ASN_TIMETICKS:
+                        case ASN_COUNTER:
+                        case ASN_UINTEGER:
+                        case ASN_COUNTER64:
+                                printf("Value %llu\n", result.state[i].value.uIntVal);
+                                break;
+                        case ASN_FLOAT:
+                        case ASN_DOUBLE:
+                                printf("Value %f\n", result.state[i].value.doubleVal);
+                                break;
+                        case ASN_INTEGER:
+                                printf("Value %lld\n", result.state[i].value.intVal);
+                                break;
+                        }
+                }
+        }
+
+        return result;
 }
 
 int main(int argc, char **argv) {
-        int len;
-        int total_oids;
-        size_t line;
-        unsigned int bk_count = 0;
-        unsigned int dq_count = 0;
-        int iresult = STATE_UNKNOWN;
-        int result = STATE_UNKNOWN;
-        int return_code = 0;
-        int external_error = 0;
-        char **command_line = NULL;
-        char *cl_hidden_auth = NULL;
-        char *oidname = NULL;
-        char *response = NULL;
-        char *mult_resp = NULL;
-        char *outbuff;
-        char *ptr = NULL;
-        char *show = NULL;
-        char *th_warn = NULL;
-        char *th_crit = NULL;
-        char type[8] = "";
-        output chld_out;
-        output chld_err;
-        char *previous_string = NULL;
-        char *ap = NULL;
-        char *state_string = NULL;
-        size_t response_length;
-        size_t current_length;
-        size_t string_length;
-        char *temp_string = NULL;
-        char *quote_string = NULL;
-        time_t current_time;
-        double temp_double;
-        time_t duration;
-        char *conv = "12345678";
-        int is_counter = 0;
-
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
 
-        labels = malloc(labels_size * sizeof(*labels));
-        unitv = malloc(unitv_size * sizeof(*unitv));
-        thlds = malloc(thlds_size * sizeof(*thlds));
-        response_value = malloc(response_size * sizeof(*response_value));
-        previous_value = malloc(previous_size * sizeof(*previous_value));
-        eval_method = calloc(eval_size, sizeof(*eval_method));
-        oids = calloc(oids_size, sizeof(char *));
-
-        label = strdup("SNMP");
-        units = strdup("");
-        port = strdup(DEFAULT_PORT);
-        outbuff = strdup("");
-        delimiter = strdup(" = ");
-        output_delim = strdup(DEFAULT_OUTPUT_DELIMITER);
         timeout_interval = DEFAULT_SOCKET_TIMEOUT;
-        retries = DEFAULT_RETRIES;
 
         np_init((char *)progname, argc, argv);
 
+        state_key stateKey = np_enable_state(NULL, 1, progname, argc, argv);
+
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
         np_set_args(argc, argv);
 
-        time(&current_time);
+        // Initialize net-snmp before touching the session we are going to use
+        init_snmp("check_snmp");
 
-        if (process_arguments(argc, argv) == ERROR)
+        process_arguments_wrapper paw_tmp = process_arguments(argc, argv);
+        if (paw_tmp.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
-
-        if (calculate_rate) {
-                if (!strcmp(label, "SNMP"))
-                        label = strdup("SNMP RATE");
-
-                size_t i = 0;
-
-                previous_state = np_state_read();
-                if (previous_state != NULL) {
-                        /* Split colon separated values */
-                        previous_string = strdup((char *)previous_state->data);
-                        while ((ap = strsep(&previous_string, ":")) != NULL) {
-                                if (verbose > 2)
-                                        printf("State for %zd=%s\n", i, ap);
-                                while (i >= previous_size) {
-                                        previous_size += OID_COUNT_STEP;
-                                        previous_value = realloc(previous_value, previous_size * sizeof(*previous_value));
-                                }
-                                previous_value[i++] = strtod(ap, NULL);
-                        }
-                }
         }
 
-        /* Populate the thresholds */
-        th_warn = warning_thresholds;
-        th_crit = critical_thresholds;
-        for (size_t i = 0; i < numoids; i++) {
-                char *w = th_warn ? strndup(th_warn, strcspn(th_warn, ",")) : NULL;
-                char *c = th_crit ? strndup(th_crit, strcspn(th_crit, ",")) : NULL;
-                /* translate "2:1" to "@1:2" for backwards compatibility */
-                w = w ? fix_snmp_range(w) : NULL;
-                c = c ? fix_snmp_range(c) : NULL;
-
-                while (i >= thlds_size) {
-                        thlds_size += OID_COUNT_STEP;
-                        thlds = realloc(thlds, thlds_size * sizeof(*thlds));
-                }
-
-                /* Skip empty thresholds, while avoiding segfault */
-                set_thresholds(&thlds[i], w ? strpbrk(w, NP_THRESHOLDS_CHARS) : NULL, c ? strpbrk(c, NP_THRESHOLDS_CHARS) : NULL);
-                if (w) {
-                        th_warn = strchr(th_warn, ',');
-                        if (th_warn)
-                                th_warn++;
-                        free(w);
-                }
-                if (c) {
-                        th_crit = strchr(th_crit, ',');
-                        if (th_crit)
-                                th_crit++;
-                        free(c);
-                }
-        }
+        check_snmp_config config = paw_tmp.config;
 
-        /* Create the command array to execute */
-        if (usesnmpgetnext) {
-                snmpcmd = strdup(PATH_TO_SNMPGETNEXT);
-        } else {
-                snmpcmd = strdup(PATH_TO_SNMPGET);
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
         }
 
-        /* 10 arguments to pass before context and authpriv options + 1 for host and numoids. Add one for terminating NULL */
-
-        unsigned index = 0;
-        command_line = calloc(11 + numcontext + numauthpriv + 1 + numoids + 1, sizeof(char *));
-
-        command_line[index++] = snmpcmd;
-        command_line[index++] = strdup("-Le");
-        command_line[index++] = strdup("-t");
-        xasprintf(&command_line[index++], "%d", timeout_interval);
-        command_line[index++] = strdup("-r");
-        xasprintf(&command_line[index++], "%d", retries);
-        command_line[index++] = strdup("-m");
-        command_line[index++] = strdup(miblist);
-        command_line[index++] = "-v";
-        command_line[index++] = strdup(proto);
-
-        xasprintf(&cl_hidden_auth, "%s -Le -t %d -r %d -m %s -v %s", snmpcmd, timeout_interval, retries, strlen(miblist) ? miblist : "''",
-                          proto);
-
-        if (ignore_mib_parsing_errors) {
-                command_line[index++] = "-Pe";
-                xasprintf(&cl_hidden_auth, "%s -Pe", cl_hidden_auth);
+        /* Set signal handling and alarm */
+        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGALRM"));
         }
 
-        for (int i = 0; i < numcontext; i++) {
-                command_line[index++] = contextargs[i];
-        }
+        time_t current_time;
+        time(&current_time);
 
-        for (int i = 0; i < numauthpriv; i++) {
-                command_line[index++] = authpriv[i];
+        if (verbose > 2) {
+                printf("current time: %s (timestamp: %lu)\n", ctime(&current_time), current_time);
         }
 
-        xasprintf(&command_line[index++], "%s:%s", server_address, port);
+        snmp_responces response = do_snmp_query(config.snmp_params);
 
-        xasprintf(&cl_hidden_auth, "%s [context] [authpriv] %s:%s", cl_hidden_auth, server_address, port);
+        mp_check overall = mp_check_init();
 
-        for (size_t i = 0; i < numoids; i++) {
-                command_line[index++] = oids[i];
-                xasprintf(&cl_hidden_auth, "%s %s", cl_hidden_auth, oids[i]);
+        if (response.errorcode == OK) {
+                mp_subcheck sc_successfull_query = mp_subcheck_init();
+                xasprintf(&sc_successfull_query.output, "SNMP query was successful");
+                sc_successfull_query = mp_set_subcheck_state(sc_successfull_query, STATE_OK);
+                mp_add_subcheck_to_check(&overall, sc_successfull_query);
+        } else {
+                // Error treatment here, either partial or whole
+                mp_subcheck sc_failed_query = mp_subcheck_init();
+                xasprintf(&sc_failed_query.output, "SNMP query failed");
+                sc_failed_query = mp_set_subcheck_state(sc_failed_query, STATE_OK);
+                mp_add_subcheck_to_check(&overall, sc_failed_query);
+                mp_exit(overall);
         }
 
-        command_line[index++] = NULL;
+        check_snmp_state_entry *prev_state = NULL;
+        bool have_previous_state = false;
 
-        if (verbose) {
-                printf("%s\n", cl_hidden_auth);
-        }
+        if (config.evaluation_params.calculate_rate) {
+                state_data *previous_state = np_state_read(stateKey);
+                if (previous_state == NULL) {
+                        // failed to recover state
+                        // or no previous state
+                        have_previous_state = false;
+                } else {
+                        // sanity check
+                        recover_state_data_type prev_state_wrapper =
+                                recover_state_data(previous_state->data, (idx_t)previous_state->length);
 
-        /* Set signal handling and alarm */
-        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
-                usage4(_("Cannot catch SIGALRM"));
-        }
-        alarm(timeout_interval * retries + 5);
-
-        /* Run the command */
-        return_code = cmd_run_array(command_line, &chld_out, &chld_err, 0);
-
-        /* disable alarm again */
-        alarm(0);
-
-        /* Due to net-snmp sometimes showing stderr messages with poorly formed MIBs,
-           only return state unknown if return code is non zero or there is no stdout.
-           Do this way so that if there is stderr, will get added to output, which helps problem diagnosis
-        */
-        if (return_code != 0)
-                external_error = 1;
-        if (chld_out.lines == 0)
-                external_error = 1;
-        if (external_error) {
-                if (chld_err.lines > 0) {
-                        printf(_("External command error: %s\n"), chld_err.line[0]);
-                        for (size_t i = 1; i < chld_err.lines; i++) {
-                                printf("%s\n", chld_err.line[i]);
+                        if (prev_state_wrapper.errorcode == OK) {
+                                have_previous_state = true;
+                                prev_state = prev_state_wrapper.state;
+                        } else {
+                                have_previous_state = false;
+                                prev_state = NULL;
                         }
-                } else {
-                        printf(_("External command error with no output (return code: %d)\n"), return_code);
                 }
-                exit(STATE_UNKNOWN);
         }
 
-        if (verbose) {
-                for (size_t i = 0; i < chld_out.lines; i++) {
-                        printf("%s\n", chld_out.line[i]);
+        check_snmp_state_entry *new_state = NULL;
+        if (config.evaluation_params.calculate_rate) {
+                new_state = calloc(config.snmp_params.num_of_test_units, sizeof(check_snmp_state_entry));
+                if (new_state == NULL) {
+                        die(STATE_UNKNOWN, "memory allocation failed");
                 }
         }
 
-        line = 0;
-        total_oids = 0;
-        for (size_t i = 0; line < chld_out.lines && i < numoids; line++, i++, total_oids++) {
-                if (calculate_rate)
-                        conv = "%.10g";
-                else
-                        conv = "%.0f";
-
-                ptr = chld_out.line[line];
-                oidname = strpcpy(oidname, ptr, delimiter);
-                response = strstr(ptr, delimiter);
-                if (response == NULL)
-                        break;
-
-                if (verbose > 2) {
-                        printf("Processing oid %zi (line %zi)\n  oidname: %s\n  response: %s\n", i + 1, line + 1, oidname, response);
+        // We got the the query results, now process them
+        for (size_t loop_index = 0; loop_index < config.snmp_params.num_of_test_units; loop_index++) {
+                if (verbose > 0) {
+                        printf("loop_index: %zu\n", loop_index);
                 }
 
-                /* Clean up type array - Sol10 does not necessarily zero it out */
-                bzero(type, sizeof(type));
-
-                is_counter = 0;
-                /* We strip out the datatype indicator for PHBs */
-                if (strstr(response, "Gauge: ")) {
-                        show = multiply(strstr(response, "Gauge: ") + 7);
-                } else if (strstr(response, "Gauge32: ")) {
-                        show = multiply(strstr(response, "Gauge32: ") + 9);
-                } else if (strstr(response, "Counter32: ")) {
-                        show = strstr(response, "Counter32: ") + 11;
-                        is_counter = 1;
-                        if (!calculate_rate)
-                                strcpy(type, "c");
-                } else if (strstr(response, "Counter64: ")) {
-                        show = strstr(response, "Counter64: ") + 11;
-                        is_counter = 1;
-                        if (!calculate_rate)
-                                strcpy(type, "c");
-                } else if (strstr(response, "INTEGER: ")) {
-                        show = multiply(strstr(response, "INTEGER: ") + 9);
-
-                        if (fmtstr_set) {
-                                conv = fmtstr;
-                        }
-                } else if (strstr(response, "OID: ")) {
-                        show = strstr(response, "OID: ") + 5;
-                } else if (strstr(response, "STRING: ")) {
-                        show = strstr(response, "STRING: ") + 8;
-                        conv = "%.10g";
-
-                        /* Get the rest of the string on multi-line strings */
-                        ptr = show;
-                        COUNT_SEQ(ptr, bk_count, dq_count)
-                        while (dq_count && ptr[0] != '\n' && ptr[0] != '\0') {
-                                ptr++;
-                                GOBBLE_TOS(ptr, "\n\"\\")
-                                COUNT_SEQ(ptr, bk_count, dq_count)
-                        }
-
-                        if (dq_count) { /* unfinished line */
-                                /* copy show verbatim first */
-                                if (!mult_resp)
-                                        mult_resp = strdup("");
-                                xasprintf(&mult_resp, "%s%s:\n%s\n", mult_resp, oids[i], show);
-                                /* then strip out unmatched double-quote from single-line output */
-                                if (show[0] == '"')
-                                        show++;
-
-                                /* Keep reading until we match end of double-quoted string */
-                                for (line++; line < chld_out.lines; line++) {
-                                        ptr = chld_out.line[line];
-                                        xasprintf(&mult_resp, "%s%s\n", mult_resp, ptr);
-
-                                        COUNT_SEQ(ptr, bk_count, dq_count)
-                                        while (dq_count && ptr[0] != '\n' && ptr[0] != '\0') {
-                                                ptr++;
-                                                GOBBLE_TOS(ptr, "\n\"\\")
-                                                COUNT_SEQ(ptr, bk_count, dq_count)
-                                        }
-                                        /* Break for loop before next line increment when done */
-                                        if (!dq_count)
-                                                break;
-                                }
-                        }
-
-                } else if (strstr(response, "Timeticks: ")) {
-                        show = strstr(response, "Timeticks: ");
-                } else
-                        show = response + 3;
+                check_snmp_state_entry previous_unit_state = {};
+                if (config.evaluation_params.calculate_rate && have_previous_state) {
+                        previous_unit_state = prev_state[loop_index];
+                }
 
-                iresult = STATE_DEPENDENT;
+                check_snmp_evaluation single_eval =
+                        evaluate_single_unit(response.response_values[loop_index], config.evaluation_params,
+                                                                 config.snmp_params.test_units[loop_index], current_time,
+                                                                 previous_unit_state, have_previous_state);
 
-                /* Process this block for numeric comparisons */
-                /* Make some special values,like Timeticks numeric only if a threshold is defined */
-                if (thlds[i]->warning || thlds[i]->critical || calculate_rate) {
-                        if (verbose > 2) {
-                                print_thresholds("  thresholds", thlds[i]);
-                        }
-                        ptr = strpbrk(show, "-0123456789");
-                        if (ptr == NULL) {
-                                if (nulloid == 3)
-                                        die(STATE_UNKNOWN, _("No valid data returned (%s)\n"), show);
-                                else if (nulloid == 0)
-                                        die(STATE_OK, _("No valid data returned (%s)\n"), show);
-                                else if (nulloid == 1)
-                                        die(STATE_WARNING, _("No valid data returned (%s)\n"), show);
-                                else if (nulloid == 2)
-                                        die(STATE_CRITICAL, _("No valid data returned (%s)\n"), show);
-                        }
-                        while (i >= response_size) {
-                                response_size += OID_COUNT_STEP;
-                                response_value = realloc(response_value, response_size * sizeof(*response_value));
-                        }
-                        response_value[i] = strtod(ptr, NULL) + offset;
-
-                        if (calculate_rate) {
-                                if (previous_state != NULL) {
-                                        duration = current_time - previous_state->time;
-                                        if (duration <= 0)
-                                                die(STATE_UNKNOWN, _("Time duration between plugin calls is invalid"));
-                                        temp_double = response_value[i] - previous_value[i];
-                                        /* Simple overflow catcher (same as in rrdtool, rrd_update.c) */
-                                        if (is_counter) {
-                                                if (temp_double < (double)0.0)
-                                                        temp_double += (double)4294967296.0; /* 2^32 */
-                                                if (temp_double < (double)0.0)
-                                                        temp_double += (double)18446744069414584320.0; /* 2^64-2^32 */
-                                                ;
-                                        }
-                                        /* Convert to per second, then use multiplier */
-                                        temp_double = temp_double / duration * rate_multiplier;
-                                        iresult = get_status(temp_double, thlds[i]);
-                                        xasprintf(&show, conv, temp_double);
-                                }
-                        } else {
-                                iresult = get_status(response_value[i], thlds[i]);
-                                xasprintf(&show, conv, response_value[i]);
-                        }
+                if (config.evaluation_params.calculate_rate &&
+                        mp_compute_subcheck_state(single_eval.sc) != STATE_UNKNOWN) {
+                        new_state[loop_index] = single_eval.state;
                 }
 
-                /* Process this block for string matching */
-                else if (eval_size > i && eval_method[i] & CRIT_STRING) {
-                        if (strcmp(show, string_value))
-                                iresult = (invert_search == 0) ? STATE_CRITICAL : STATE_OK;
-                        else
-                                iresult = (invert_search == 0) ? STATE_OK : STATE_CRITICAL;
-                }
+                mp_add_subcheck_to_check(&overall, single_eval.sc);
+        }
 
-                /* Process this block for regex matching */
-                else if (eval_size > i && eval_method[i] & CRIT_REGEX) {
-                        excode = regexec(&preg, response, 10, pmatch, eflags);
-                        if (excode == 0) {
-                                iresult = (invert_search == 0) ? STATE_OK : STATE_CRITICAL;
-                        } else if (excode != REG_NOMATCH) {
-                                regerror(excode, &preg, errbuf, MAX_INPUT_BUFFER);
-                                printf(_("Execute Error: %s\n"), errbuf);
-                                exit(STATE_CRITICAL);
-                        } else {
-                                iresult = (invert_search == 0) ? STATE_CRITICAL : STATE_OK;
-                        }
-                }
+        if (config.evaluation_params.calculate_rate) {
+                // store state
+                gen_state_string_type current_state_wrapper =
+                        gen_state_string(new_state, config.snmp_params.num_of_test_units);
 
-                /* Process this block for existence-nonexistence checks */
-                /* TV: Should this be outside of this else block? */
-                else {
-                        if (eval_size > i && eval_method[i] & CRIT_PRESENT)
-                                iresult = STATE_CRITICAL;
-                        else if (eval_size > i && eval_method[i] & WARN_PRESENT)
-                                iresult = STATE_WARNING;
-                        else if (response && iresult == STATE_DEPENDENT)
-                                iresult = STATE_OK;
+                if (current_state_wrapper.errorcode == OK) {
+                        np_state_write_string(stateKey, current_time, current_state_wrapper.state_string);
+                } else {
+                        die(STATE_UNKNOWN, "failed to create state string");
                 }
+        }
+        mp_exit(overall);
+}
 
-                /* Result is the worst outcome of all the OIDs tested */
-                result = max_state(result, iresult);
-
-                /* Prepend a label for this OID if there is one */
-                if (nlabels >= (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
-                        xasprintf(&outbuff, "%s%s%s %s%s%s", outbuff, (i == 0) ? " " : output_delim, labels[i], mark(iresult), show, mark(iresult));
-                else
-                        xasprintf(&outbuff, "%s%s%s%s%s", outbuff, (i == 0) ? " " : output_delim, mark(iresult), show, mark(iresult));
-
-                /* Append a unit string for this OID if there is one */
-                if (nunits > (size_t)0 && (size_t)i < nunits && unitv[i] != NULL)
-                        xasprintf(&outbuff, "%s %s", outbuff, unitv[i]);
-
-                /* Write perfdata with whatever can be parsed by strtod, if possible */
-                ptr = NULL;
-                strtod(show, &ptr);
-                if (ptr > show) {
-                        if (perf_labels && nlabels >= (size_t)1 && (size_t)i < nlabels && labels[i] != NULL)
-                                temp_string = labels[i];
-                        else
-                                temp_string = oidname;
-                        if (strpbrk(temp_string, " ='\"") == NULL) {
-                                strncat(perfstr, temp_string, sizeof(perfstr) - strlen(perfstr) - 1);
-                        } else {
-                                if (strpbrk(temp_string, "'") == NULL) {
-                                        quote_string = "'";
-                                } else {
-                                        quote_string = "\"";
-                                }
-                                strncat(perfstr, quote_string, sizeof(perfstr) - strlen(perfstr) - 1);
-                                strncat(perfstr, temp_string, sizeof(perfstr) - strlen(perfstr) - 1);
-                                strncat(perfstr, quote_string, sizeof(perfstr) - strlen(perfstr) - 1);
-                        }
-                        strncat(perfstr, "=", sizeof(perfstr) - strlen(perfstr) - 1);
-                        len = sizeof(perfstr) - strlen(perfstr) - 1;
-                        strncat(perfstr, show, len > ptr - show ? ptr - show : len);
+/* process command-line arguments */
+static process_arguments_wrapper process_arguments(int argc, char **argv) {
+        enum {
+                /* Longopts only arguments */
+                invert_search_index = CHAR_MAX + 1,
+                offset_index,
+                ignore_mib_parsing_errors_index,
+                connection_prefix_index,
+                output_format_index,
+                calculate_rate,
+                rate_multiplier
+        };
+
+        static struct option longopts[] = {
+                STD_LONG_OPTS,
+                {"community", required_argument, 0, 'C'},
+                {"oid", required_argument, 0, 'o'},
+                {"object", required_argument, 0, 'o'},
+                {"delimiter", required_argument, 0, 'd'},
+                {"nulloid", required_argument, 0, 'z'},
+                {"output-delimiter", required_argument, 0, 'D'},
+                {"string", required_argument, 0, 's'},
+                {"timeout", required_argument, 0, 't'},
+                {"regex", required_argument, 0, 'r'},
+                {"ereg", required_argument, 0, 'r'},
+                {"eregi", required_argument, 0, 'R'},
+                {"label", required_argument, 0, 'l'},
+                {"units", required_argument, 0, 'u'},
+                {"port", required_argument, 0, 'p'},
+                {"retries", required_argument, 0, 'e'},
+                {"miblist", required_argument, 0, 'm'},
+                {"protocol", required_argument, 0, 'P'},
+                {"context", required_argument, 0, 'N'},
+                {"seclevel", required_argument, 0, 'L'},
+                {"secname", required_argument, 0, 'U'},
+                {"authproto", required_argument, 0, 'a'},
+                {"privproto", required_argument, 0, 'x'},
+                {"authpasswd", required_argument, 0, 'A'},
+                {"privpasswd", required_argument, 0, 'X'},
+                {"next", no_argument, 0, 'n'},
+                {"offset", required_argument, 0, offset_index},
+                {"invert-search", no_argument, 0, invert_search_index},
+                {"perf-oids", no_argument, 0, 'O'},
+                {"ipv4", no_argument, 0, '4'},
+                {"ipv6", no_argument, 0, '6'},
+                {"multiplier", required_argument, 0, 'M'},
+                {"ignore-mib-parsing-errors", no_argument, 0, ignore_mib_parsing_errors_index},
+                {"connection-prefix", required_argument, 0, connection_prefix_index},
+                {"output-format", required_argument, 0, output_format_index},
+                {"rate", no_argument, 0, calculate_rate},
+                {"rate-multiplier", required_argument, 0, rate_multiplier},
+                {0, 0, 0, 0}};
+
+        if (argc < 2) {
+                process_arguments_wrapper result = {
+                        .errorcode = ERROR,
+                };
+                return result;
+        }
 
-                        if (strcmp(type, "") != 0) {
-                                strncat(perfstr, type, sizeof(perfstr) - strlen(perfstr) - 1);
-                        }
+        // Count number of OIDs here first
+        int option = 0;
+        size_t oid_counter = 0;
+        while (true) {
+                int option_char = getopt_long(
+                        argc, argv,
+                        "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:M:f:z:", longopts, &option);
 
-                        if (warning_thresholds) {
-                                strncat(perfstr, ";", sizeof(perfstr) - strlen(perfstr) - 1);
-                                if (thlds[i]->warning && thlds[i]->warning->text)
-                                        strncat(perfstr, thlds[i]->warning->text, sizeof(perfstr) - strlen(perfstr) - 1);
-                        }
+                if (option_char == -1 || option_char == EOF) {
+                        break;
+                }
 
-                        if (critical_thresholds) {
-                                if (!warning_thresholds)
-                                        strncat(perfstr, ";", sizeof(perfstr) - strlen(perfstr) - 1);
-                                strncat(perfstr, ";", sizeof(perfstr) - strlen(perfstr) - 1);
-                                if (thlds[i]->critical && thlds[i]->critical->text)
-                                        strncat(perfstr, thlds[i]->critical->text, sizeof(perfstr) - strlen(perfstr) - 1);
+                switch (option_char) {
+                case 'o': {
+                        // we are going to parse this again, so we work on a copy of that string
+                        char *tmp_oids = strdup(optarg);
+                        if (tmp_oids == NULL) {
+                                die(STATE_UNKNOWN, "strdup failed");
                         }
 
-                        strncat(perfstr, " ", sizeof(perfstr) - strlen(perfstr) - 1);
-                }
-        }
-
-        /* Save state data, as all data collected now */
-        if (calculate_rate) {
-                string_length = 1024;
-                state_string = malloc(string_length);
-                if (state_string == NULL)
-                        die(STATE_UNKNOWN, _("Cannot malloc"));
-
-                current_length = 0;
-                for (int i = 0; i < total_oids; i++) {
-                        xasprintf(&temp_string, "%.0f", response_value[i]);
-                        if (temp_string == NULL)
-                                die(STATE_UNKNOWN, _("Cannot asprintf()"));
-                        response_length = strlen(temp_string);
-                        if (current_length + response_length > string_length) {
-                                string_length = current_length + 1024;
-                                state_string = realloc(state_string, string_length);
-                                if (state_string == NULL)
-                                        die(STATE_UNKNOWN, _("Cannot realloc()"));
+                        for (char *ptr = strtok(tmp_oids, ", "); ptr != NULL;
+                                 ptr = strtok(NULL, ", "), oid_counter++) {
                         }
-                        strcpy(&state_string[current_length], temp_string);
-                        current_length = current_length + response_length;
-                        state_string[current_length] = ':';
-                        current_length++;
-                        free(temp_string);
+                        break;
                 }
-                state_string[--current_length] = '\0';
-                if (verbose > 2)
-                        printf("State string=%s\n", state_string);
+                case '?': /* usage */
+                        usage5();
+                        // fallthrough
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
 
-                /* This is not strictly the same as time now, but any subtle variations will cancel out */
-                np_state_write_string(current_time, state_string);
-                if (previous_state == NULL) {
-                        /* Or should this be highest state? */
-                        die(STATE_OK, _("No previous data to calculate rate - assume okay"));
+                default:
+                        continue;
                 }
         }
 
-        printf("%s %s -%s %s\n", label, state_text(result), outbuff, perfstr);
-        if (mult_resp)
-                printf("%s", mult_resp);
+        /* Check whether at least one OID was given */
+        if (oid_counter == 0) {
+                die(STATE_UNKNOWN, _("No OIDs specified\n"));
+        }
 
-        return result;
-}
+        // Allocate space for test units
+        check_snmp_test_unit *tmp = calloc(oid_counter, sizeof(check_snmp_test_unit));
+        if (tmp == NULL) {
+                die(STATE_UNKNOWN, "Failed to calloc");
+        }
 
-/* process command-line arguments */
-int process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {STD_LONG_OPTS,
-                                                                           {"community", required_argument, 0, 'C'},
-                                                                           {"oid", required_argument, 0, 'o'},
-                                                                           {"object", required_argument, 0, 'o'},
-                                                                           {"delimiter", required_argument, 0, 'd'},
-                                                                           {"nulloid", required_argument, 0, 'z'},
-                                                                           {"output-delimiter", required_argument, 0, 'D'},
-                                                                           {"string", required_argument, 0, 's'},
-                                                                           {"timeout", required_argument, 0, 't'},
-                                                                           {"regex", required_argument, 0, 'r'},
-                                                                           {"ereg", required_argument, 0, 'r'},
-                                                                           {"eregi", required_argument, 0, 'R'},
-                                                                           {"label", required_argument, 0, 'l'},
-                                                                           {"units", required_argument, 0, 'u'},
-                                                                           {"port", required_argument, 0, 'p'},
-                                                                           {"retries", required_argument, 0, 'e'},
-                                                                           {"miblist", required_argument, 0, 'm'},
-                                                                           {"protocol", required_argument, 0, 'P'},
-                                                                           {"context", required_argument, 0, 'N'},
-                                                                           {"seclevel", required_argument, 0, 'L'},
-                                                                           {"secname", required_argument, 0, 'U'},
-                                                                           {"authproto", required_argument, 0, 'a'},
-                                                                           {"privproto", required_argument, 0, 'x'},
-                                                                           {"authpasswd", required_argument, 0, 'A'},
-                                                                           {"privpasswd", required_argument, 0, 'X'},
-                                                                           {"next", no_argument, 0, 'n'},
-                                                                           {"rate", no_argument, 0, L_CALCULATE_RATE},
-                                                                           {"rate-multiplier", required_argument, 0, L_RATE_MULTIPLIER},
-                                                                           {"offset", required_argument, 0, L_OFFSET},
-                                                                           {"invert-search", no_argument, 0, L_INVERT_SEARCH},
-                                                                           {"perf-oids", no_argument, 0, 'O'},
-                                                                           {"ipv4", no_argument, 0, '4'},
-                                                                           {"ipv6", no_argument, 0, '6'},
-                                                                           {"multiplier", required_argument, 0, 'M'},
-                                                                           {"fmtstr", required_argument, 0, 'f'},
-                                                                           {"ignore-mib-parsing-errors", no_argument, false, L_IGNORE_MIB_PARSING_ERRORS},
-                                                                           {0, 0, 0, 0}};
-
-        if (argc < 2)
-                return ERROR;
-
-        /* reverse compatibility for very old non-POSIX usage forms */
-        for (int c = 1; c < argc; c++) {
-                if (strcmp("-to", argv[c]) == 0)
-                        strcpy(argv[c], "-t");
-                if (strcmp("-wv", argv[c]) == 0)
-                        strcpy(argv[c], "-w");
-                if (strcmp("-cv", argv[c]) == 0)
-                        strcpy(argv[c], "-c");
+        for (size_t i = 0; i < oid_counter; i++) {
+                tmp[i] = check_snmp_test_unit_init();
         }
 
-        size_t j = 0;
-        size_t jj = 0;
+        check_snmp_config config = check_snmp_config_init();
+        config.snmp_params.test_units = tmp;
+        config.snmp_params.num_of_test_units = oid_counter;
+
+        option = 0;
+        optind = 1; // Reset argument scanner
+        size_t tmp_oid_counter = 0;
+        size_t eval_counter = 0;
+        size_t unitv_counter = 0;
+        size_t labels_counter = 0;
+        unsigned char *authpasswd = NULL;
+        unsigned char *privpasswd = NULL;
+        int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+        char *port = NULL;
+        char *miblist = NULL;
+        char *connection_prefix = NULL;
+        bool snmp_version_set_explicitely = false;
+        // TODO error checking
         while (true) {
-                int option = 0;
-                int option_char = getopt_long(argc, argv, "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:M:f:z:", longopts, &option);
+                int option_char = getopt_long(
+                        argc, argv,
+                        "nhvVO46t:c:w:H:C:o:e:E:d:D:s:t:R:r:l:u:p:m:P:N:L:U:a:x:A:X:M:f:z:", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
                 switch (option_char) {
                 case '?': /* usage */
@@ -758,64 +534,155 @@ int process_arguments(int argc, char **argv) {
 
                         /* Connection info */
                 case 'C': /* group or community */
-                        community = optarg;
+                        config.snmp_params.snmp_session.community = (unsigned char *)optarg;
+                        config.snmp_params.snmp_session.community_len = strlen(optarg);
                         break;
                 case 'H': /* Host or server */
-                        server_address = optarg;
+                        config.snmp_params.snmp_session.peername = optarg;
                         break;
-                case 'p': /* TCP port number */
+                case 'p': /*port number */
+                        // Add port to "peername" below to not rely on argument order
                         port = optarg;
                         break;
                 case 'm': /* List of MIBS */
                         miblist = optarg;
                         break;
-                case 'n': /* usesnmpgetnext */
-                        usesnmpgetnext = true;
+                case 'n': /* use_getnext instead of get */
+                        config.snmp_params.use_getnext = true;
                         break;
                 case 'P': /* SNMP protocol version */
-                        proto = optarg;
+                        if (strcasecmp("1", optarg) == 0) {
+                                config.snmp_params.snmp_session.version = SNMP_VERSION_1;
+                        } else if (strcasecmp("2c", optarg) == 0) {
+                                config.snmp_params.snmp_session.version = SNMP_VERSION_2c;
+                        } else if (strcasecmp("3", optarg) == 0) {
+                                config.snmp_params.snmp_session.version = SNMP_VERSION_3;
+                        } else {
+                                die(STATE_UNKNOWN, "invalid SNMP version/protocol: %s", optarg);
+                        }
+                        snmp_version_set_explicitely = true;
+
                         break;
-                case 'N': /* SNMPv3 context */
-                        context = optarg;
+                case 'N': /* SNMPv3 context name */
+                        config.snmp_params.snmp_session.contextName = optarg;
+                        config.snmp_params.snmp_session.contextNameLen = strlen(optarg);
                         break;
                 case 'L': /* security level */
-                        seclevel = optarg;
+                        if (strcasecmp("noAuthNoPriv", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityLevel = SNMP_SEC_LEVEL_NOAUTH;
+                        } else if (strcasecmp("authNoPriv", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityLevel = SNMP_SEC_LEVEL_AUTHNOPRIV;
+                        } else if (strcasecmp("authPriv", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityLevel = SNMP_SEC_LEVEL_AUTHPRIV;
+                        } else {
+                                die(STATE_UNKNOWN, "invalid security level: %s", optarg);
+                        }
                         break;
                 case 'U': /* security username */
-                        secname = optarg;
+                        config.snmp_params.snmp_session.securityName = optarg;
+                        config.snmp_params.snmp_session.securityNameLen = strlen(optarg);
                         break;
                 case 'a': /* auth protocol */
-                        authproto = optarg;
+                        // SNMPv3: SHA or MD5
+                        // TODO Test for availability of individual protocols
+                        if (strcasecmp("MD5", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmHMACMD5AuthProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmHMACMD5AuthProtocol);
+                        } else if (strcasecmp("SHA", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmHMACSHA1AuthProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmHMACSHA1AuthProtocol);
+                        } else if (strcasecmp("SHA224", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmHMAC128SHA224AuthProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmHMAC128SHA224AuthProtocol);
+                        } else if (strcasecmp("SHA256", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmHMAC192SHA256AuthProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmHMAC192SHA256AuthProtocol);
+                        } else if (strcasecmp("SHA384", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmHMAC256SHA384AuthProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmHMAC256SHA384AuthProtocol);
+                        } else if (strcasecmp("SHA512", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmHMAC384SHA512AuthProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmHMAC384SHA512AuthProtocol);
+                        } else {
+                                die(STATE_UNKNOWN, "Unknown authentication protocol");
+                        }
                         break;
                 case 'x': /* priv protocol */
-                        privproto = optarg;
+                        if (strcasecmp("DES", optarg) == 0) {
+#ifdef HAVE_USM_DES_PRIV_PROTOCOL
+                                config.snmp_params.snmp_session.securityAuthProto = usmDESPrivProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmDESPrivProtocol);
+#else
+                                die(STATE_UNKNOWN, "DES Privacy Protocol not available on this platform");
+#endif
+                        } else if (strcasecmp("AES", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmAESPrivProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmAESPrivProtocol);
+                                // } else if (strcasecmp("AES128", optarg)) {
+                                //      config.snmp_session.securityAuthProto = usmAES128PrivProtocol;
+                                //      config.snmp_session.securityAuthProtoLen = OID_LENGTH(usmAES128PrivProtocol)
+                                // / OID_LENGTH(oid);
+                        } else if (strcasecmp("AES192", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmAES192PrivProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmAES192PrivProtocol);
+                        } else if (strcasecmp("AES256", optarg) == 0) {
+                                config.snmp_params.snmp_session.securityAuthProto = usmAES256PrivProtocol;
+                                config.snmp_params.snmp_session.securityAuthProtoLen =
+                                        OID_LENGTH(usmAES256PrivProtocol);
+                                // } else if (strcasecmp("AES192Cisco", optarg)) {
+                                //      config.snmp_session.securityAuthProto = usmAES192CiscoPrivProtocol;
+                                //      config.snmp_session.securityAuthProtoLen =
+                                // sizeof(usmAES192CiscoPrivProtocol) / sizeof(oid); } else if
+                                // (strcasecmp("AES256Cisco", optarg)) { config.snmp_session.securityAuthProto =
+                                // usmAES256CiscoPrivProtocol;  config.snmp_session.securityAuthProtoLen =
+                                // sizeof(usmAES256CiscoPrivProtocol) / sizeof(oid); } else if
+                                // (strcasecmp("AES192Cisco2", optarg)) { config.snmp_session.securityAuthProto
+                                // = usmAES192Cisco2PrivProtocol;       config.snmp_session.securityAuthProtoLen =
+                                // sizeof(usmAES192Cisco2PrivProtocol) / sizeof(oid); } else if
+                                // (strcasecmp("AES256Cisco2", optarg)) { config.snmp_session.securityAuthProto
+                                // = usmAES256Cisco2PrivProtocol;       config.snmp_session.securityAuthProtoLen =
+                                // sizeof(usmAES256Cisco2PrivProtocol) / sizeof(oid);
+                        } else {
+                                die(STATE_UNKNOWN, "Unknown privacy protocol");
+                        }
                         break;
                 case 'A': /* auth passwd */
-                        authpasswd = optarg;
+                        authpasswd = (unsigned char *)optarg;
                         break;
                 case 'X': /* priv passwd */
-                        privpasswd = optarg;
+                        privpasswd = (unsigned char *)optarg;
+                        break;
+                case 'e':
+                case 'E':
+                        if (!is_integer(optarg)) {
+                                usage2(_("Retries interval must be a positive integer"), optarg);
+                        } else {
+                                config.snmp_params.snmp_session.retries = atoi(optarg);
+                        }
                         break;
                 case 't': /* timeout period */
-                        if (!is_integer(optarg))
+                        if (!is_integer(optarg)) {
                                 usage2(_("Timeout interval must be a positive integer"), optarg);
-                        else
-                                timeout_interval = atoi(optarg);
+                        } else {
+                                timeout_interval = (unsigned int)atoi(optarg);
+                        }
                         break;
 
                         /* Test parameters */
                 case 'c': /* critical threshold */
-                        critical_thresholds = optarg;
+                        check_snmp_set_thresholds(optarg, config.snmp_params.test_units, oid_counter, true);
                         break;
                 case 'w': /* warning threshold */
-                        warning_thresholds = optarg;
-                        break;
-                case 'e': /* PRELIMINARY - may change */
-                case 'E': /* PRELIMINARY - may change */
-                        if (!is_integer(optarg))
-                                usage2(_("Retries interval must be a positive integer"), optarg);
-                        else
-                                retries = atoi(optarg);
+                        check_snmp_set_thresholds(optarg, config.snmp_params.test_units, oid_counter, false);
                         break;
                 case 'o': /* object identifier */
                         if (strspn(optarg, "0123456789.,") != strlen(optarg)) {
@@ -824,306 +691,292 @@ int process_arguments(int argc, char **argv) {
                                  * so we have a mib variable, rather than just an SNMP OID,
                                  * so we have to actually read the mib files
                                  */
-                                needmibs = true;
-                        }
-                        for (char *ptr = strtok(optarg, ", "); ptr != NULL; ptr = strtok(NULL, ", "), j++) {
-                                while (j >= oids_size) {
-                                        oids_size += OID_COUNT_STEP;
-                                        oids = realloc(oids, oids_size * sizeof(*oids));
-                                }
-                                oids[j] = strdup(ptr);
+                                config.snmp_params.need_mibs = true;
                         }
-                        numoids = j;
-                        if (option_char == 'E' || option_char == 'e') {
-                                jj++;
-                                while (j + 1 >= eval_size) {
-                                        eval_size += OID_COUNT_STEP;
-                                        eval_method = realloc(eval_method, eval_size * sizeof(*eval_method));
-                                        memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8);
-                                }
-                                if (option_char == 'E')
-                                        eval_method[j + 1] |= WARN_PRESENT;
-                                else if (option_char == 'e')
-                                        eval_method[j + 1] |= CRIT_PRESENT;
+
+                        for (char *ptr = strtok(optarg, ", "); ptr != NULL;
+                                 ptr = strtok(NULL, ", "), tmp_oid_counter++) {
+                                config.snmp_params.test_units[tmp_oid_counter].oid = strdup(ptr);
                         }
                         break;
                 case 'z': /* Null OID Return Check */
-                        if (!is_integer(optarg))
+                        if (!is_integer(optarg)) {
                                 usage2(_("Exit status must be a positive integer"), optarg);
-                        else
-                                nulloid = atoi(optarg);
+                        } else {
+                                config.evaluation_params.nulloid_result = atoi(optarg);
+                        }
                         break;
                 case 's': /* string or substring */
-                        strncpy(string_value, optarg, sizeof(string_value) - 1);
-                        string_value[sizeof(string_value) - 1] = 0;
-                        while (jj >= eval_size) {
-                                eval_size += OID_COUNT_STEP;
-                                eval_method = realloc(eval_method, eval_size * sizeof(*eval_method));
-                                memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8);
-                        }
-                        eval_method[jj++] = CRIT_STRING;
+                        strncpy(config.evaluation_params.string_cmp_value, optarg,
+                                        sizeof(config.evaluation_params.string_cmp_value) - 1);
+                        config.evaluation_params
+                                .string_cmp_value[sizeof(config.evaluation_params.string_cmp_value) - 1] = 0;
+                        config.snmp_params.test_units[eval_counter++].eval_mthd.crit_string = true;
                         break;
                 case 'R': /* regex */
                         cflags = REG_ICASE;
                         // fall through
                 case 'r': /* regex */
+                {
+                        char regex_expect[MAX_INPUT_BUFFER] = "";
                         cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
                         strncpy(regex_expect, optarg, sizeof(regex_expect) - 1);
                         regex_expect[sizeof(regex_expect) - 1] = 0;
-                        errcode = regcomp(&preg, regex_expect, cflags);
+                        int errcode = regcomp(&config.evaluation_params.regex_cmp_value, regex_expect, cflags);
                         if (errcode != 0) {
-                                regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-                                printf(_("Could Not Compile Regular Expression"));
-                                return ERROR;
-                        }
-                        while (jj >= eval_size) {
-                                eval_size += OID_COUNT_STEP;
-                                eval_method = realloc(eval_method, eval_size * sizeof(*eval_method));
-                                memset(eval_method + eval_size - OID_COUNT_STEP, 0, 8);
+                                char errbuf[MAX_INPUT_BUFFER] = "";
+                                regerror(errcode, &config.evaluation_params.regex_cmp_value, errbuf,
+                                                 MAX_INPUT_BUFFER);
+                                printf("Could Not Compile Regular Expression: %s", errbuf);
+                                process_arguments_wrapper result = {
+                                        .errorcode = ERROR,
+                                };
+                                return result;
                         }
-                        eval_method[jj++] = CRIT_REGEX;
-                        break;
-
-                        /* Format */
-                case 'd': /* delimiter */
-                        delimiter = strscpy(delimiter, optarg);
-                        break;
-                case 'D': /* output-delimiter */
-                        output_delim = strscpy(output_delim, optarg);
-                        break;
+                        config.snmp_params.test_units[eval_counter++].eval_mthd.crit_regex = true;
+                } break;
                 case 'l': /* label */
-                        nlabels++;
-                        if (nlabels > labels_size) {
-                                labels_size += 8;
-                                labels = realloc(labels, labels_size * sizeof(*labels));
-                                if (labels == NULL)
-                                        die(STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
+                {
+                        if (labels_counter >= config.snmp_params.num_of_test_units) {
+                                break;
+                        }
+                        char *ptr = trim_whitespaces_and_check_quoting(optarg);
+                        if (ptr[0] == '\'') {
+                                config.snmp_params.test_units[labels_counter].label = ptr + 1;
+                        } else {
+                                config.snmp_params.test_units[labels_counter].label = ptr;
                         }
-                        labels[nlabels - 1] = optarg;
-                        char *ptr = thisarg(optarg);
-                        labels[nlabels - 1] = ptr;
-                        if (ptr[0] == '\'')
-                                labels[nlabels - 1] = ptr + 1;
-                        while (ptr && (ptr = nextarg(ptr))) {
-                                nlabels++;
-                                if (nlabels > labels_size) {
-                                        labels_size += 8;
-                                        labels = realloc(labels, labels_size * sizeof(*labels));
-                                        if (labels == NULL)
-                                                die(STATE_UNKNOWN, _("Could not reallocate labels\n"));
+
+                        while (ptr && (ptr = get_next_argument(ptr))) {
+                                labels_counter++;
+                                ptr = trim_whitespaces_and_check_quoting(ptr);
+                                if (ptr[0] == '\'') {
+                                        config.snmp_params.test_units[labels_counter].label = ptr + 1;
+                                } else {
+                                        config.snmp_params.test_units[labels_counter].label = ptr;
                                 }
-                                ptr = thisarg(ptr);
-                                if (ptr[0] == '\'')
-                                        labels[nlabels - 1] = ptr + 1;
-                                else
-                                        labels[nlabels - 1] = ptr;
                         }
-                        break;
+                        labels_counter++;
+                } break;
                 case 'u': /* units */
-                        units = optarg;
-                        nunits++;
-                        if (nunits > unitv_size) {
-                                unitv_size += 8;
-                                unitv = realloc(unitv, unitv_size * sizeof(*unitv));
-                                if (unitv == NULL)
-                                        die(STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
+                {
+                        if (unitv_counter >= config.snmp_params.num_of_test_units) {
+                                break;
                         }
-                        unitv[nunits - 1] = optarg;
-                        ptr = thisarg(optarg);
-                        unitv[nunits - 1] = ptr;
-                        if (ptr[0] == '\'')
-                                unitv[nunits - 1] = ptr + 1;
-                        while (ptr && (ptr = nextarg(ptr))) {
-                                if (nunits > unitv_size) {
-                                        unitv_size += 8;
-                                        unitv = realloc(unitv, unitv_size * sizeof(*unitv));
-                                        if (units == NULL)
-                                                die(STATE_UNKNOWN, _("Could not realloc() units\n"));
+                        char *ptr = trim_whitespaces_and_check_quoting(optarg);
+                        if (ptr[0] == '\'') {
+                                config.snmp_params.test_units[unitv_counter].unit_value = ptr + 1;
+                        } else {
+                                config.snmp_params.test_units[unitv_counter].unit_value = ptr;
+                        }
+                        while (ptr && (ptr = get_next_argument(ptr))) {
+                                unitv_counter++;
+                                ptr = trim_whitespaces_and_check_quoting(ptr);
+                                if (ptr[0] == '\'') {
+                                        config.snmp_params.test_units[unitv_counter].unit_value = ptr + 1;
+                                } else {
+                                        config.snmp_params.test_units[unitv_counter].unit_value = ptr;
                                 }
-                                nunits++;
-                                ptr = thisarg(ptr);
-                                if (ptr[0] == '\'')
-                                        unitv[nunits - 1] = ptr + 1;
-                                else
-                                        unitv[nunits - 1] = ptr;
                         }
+                        unitv_counter++;
+                } break;
+                case offset_index:
+                        config.evaluation_params.offset = strtod(optarg, NULL);
+                        config.evaluation_params.offset_set = true;
                         break;
-                case L_CALCULATE_RATE:
-                        if (calculate_rate == 0)
-                                np_enable_state(NULL, 1);
-                        calculate_rate = 1;
-                        break;
-                case L_RATE_MULTIPLIER:
-                        if (!is_integer(optarg) || ((rate_multiplier = atoi(optarg)) <= 0))
-                                usage2(_("Rate multiplier must be a positive integer"), optarg);
-                        break;
-                case L_OFFSET:
-                        offset = strtod(optarg, NULL);
-                        break;
-                case L_INVERT_SEARCH:
-                        invert_search = 1;
+                case invert_search_index:
+                        config.evaluation_params.invert_search = false;
                         break;
                 case 'O':
-                        perf_labels = 0;
+                        config.evaluation_params.use_oid_as_perf_data_label = true;
                         break;
                 case '4':
+                        // The default, do something here to be exclusive to -6 instead of doing nothing?
+                        connection_prefix = "udp";
                         break;
                 case '6':
-                        xasprintf(&ip_version, "udp6:");
-                        if (verbose > 2)
-                                printf("IPv6 detected! Will pass \"udp6:\" to snmpget.\n");
+                        connection_prefix = "udp6";
+                        break;
+                case connection_prefix_index:
+                        connection_prefix = optarg;
                         break;
                 case 'M':
                         if (strspn(optarg, "0123456789.,") == strlen(optarg)) {
-                                multiplier = strtod(optarg, NULL);
+                                config.evaluation_params.multiplier = strtod(optarg, NULL);
+                                config.evaluation_params.multiplier_set = true;
                         }
                         break;
-                case 'f':
-                        if (multiplier != 1.0) {
-                                fmtstr = optarg;
-                                fmtstr_set = true;
+                case ignore_mib_parsing_errors_index:
+                        config.snmp_params.ignore_mib_parsing_errors = true;
+                        break;
+                case 'f': // Deprecated format option for floating point values
+                        break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        config.output_format_is_set = true;
+                        config.output_format = parser.output_format;
+                        break;
+                }
+                case calculate_rate:
+                        config.evaluation_params.calculate_rate = true;
+                        break;
+                case rate_multiplier:
+                        if (!is_integer(optarg) ||
+                                ((config.evaluation_params.rate_multiplier = (unsigned int)atoi(optarg)) <= 0)) {
+                                usage2(_("Rate multiplier must be a positive integer"), optarg);
                         }
                         break;
-                case L_IGNORE_MIB_PARSING_ERRORS:
-                        ignore_mib_parsing_errors = true;
+                default:
+                        die(STATE_UNKNOWN, "Unknown option");
                 }
         }
 
-        if (server_address == NULL)
-                server_address = argv[optind];
-
-        if (community == NULL)
-                community = strdup(DEFAULT_COMMUNITY);
-
-        return validate_arguments();
-}
-
-/******************************************************************************
-
-@@-
-<sect3>
-<title>validate_arguments</title>
-
-<para>&PROTO_validate_arguments;</para>
-
-<para>Checks to see if the default miblist needs to be loaded. Also verifies
-the authentication and authorization combinations based on protocol version
-selected.</para>
-
-<para></para>
-
-</sect3>
--@@
-******************************************************************************/
+        if (config.snmp_params.snmp_session.peername == NULL) {
+                config.snmp_params.snmp_session.peername = argv[optind];
+        }
 
-static int validate_arguments() {
-        /* check whether to load locally installed MIBS (CPU/disk intensive) */
-        if (miblist == NULL) {
-                if (needmibs) {
-                        miblist = strdup(DEFAULT_MIBLIST);
+        // Build true peername here if necessary
+        if (connection_prefix != NULL) {
+                // We got something in the connection prefix
+                if (strcasecmp(connection_prefix, "udp") == 0) {
+                        // The default, do nothing
+                } else if (strcasecmp(connection_prefix, "tcp") == 0) {
+                        // use tcp/ipv4
+                        xasprintf(&config.snmp_params.snmp_session.peername, "tcp:%s",
+                                          config.snmp_params.snmp_session.peername);
+                } else if (strcasecmp(connection_prefix, "tcp6") == 0 ||
+                                   strcasecmp(connection_prefix, "tcpv6") == 0 ||
+                                   strcasecmp(connection_prefix, "tcpipv6") == 0 ||
+                                   strcasecmp(connection_prefix, "udp6") == 0 ||
+                                   strcasecmp(connection_prefix, "udpipv6") == 0 ||
+                                   strcasecmp(connection_prefix, "udpv6") == 0) {
+                        // Man page (or net-snmp) code says IPv6 addresses should be wrapped in [], but it
+                        // works anyway therefore do nothing here
+                        xasprintf(&config.snmp_params.snmp_session.peername, "%s:%s", connection_prefix,
+                                          config.snmp_params.snmp_session.peername);
+                } else if (strcmp(connection_prefix, "tls") == 0) {
+                        // TODO: Anything else to do here?
+                        xasprintf(&config.snmp_params.snmp_session.peername, "tls:%s",
+                                          config.snmp_params.snmp_session.peername);
+                } else if (strcmp(connection_prefix, "dtls") == 0) {
+                        // TODO: Anything else to do here?
+                        xasprintf(&config.snmp_params.snmp_session.peername, "dtls:%s",
+                                          config.snmp_params.snmp_session.peername);
+                } else if (strcmp(connection_prefix, "unix") == 0) {
+                        // TODO: Check whether this is a valid path?
+                        xasprintf(&config.snmp_params.snmp_session.peername, "unix:%s",
+                                          config.snmp_params.snmp_session.peername);
+                } else if (strcmp(connection_prefix, "ipx") == 0) {
+                        xasprintf(&config.snmp_params.snmp_session.peername, "ipx:%s",
+                                          config.snmp_params.snmp_session.peername);
                 } else {
-                        miblist = ""; /* don't read any mib files for numeric oids */
+                        // Don't know that prefix, die here
+                        die(STATE_UNKNOWN, "Unknown connection prefix");
                 }
         }
 
         /* Check server_address is given */
-        if (server_address == NULL)
+        if (config.snmp_params.snmp_session.peername == NULL) {
                 die(STATE_UNKNOWN, _("No host specified\n"));
+        }
 
-        /* Check oid is given */
-        if (numoids == 0)
-                die(STATE_UNKNOWN, _("No OIDs specified\n"));
+        if (port != NULL) {
+                xasprintf(&config.snmp_params.snmp_session.peername, "%s:%s",
+                                  config.snmp_params.snmp_session.peername, port);
+        }
 
-        if (proto == NULL)
-                xasprintf(&proto, DEFAULT_PROTOCOL);
-
-        if ((strcmp(proto, "1") == 0) || (strcmp(proto, "2c") == 0)) { /* snmpv1 or snmpv2c */
-                numauthpriv = 2;
-                authpriv = calloc(numauthpriv, sizeof(char *));
-                authpriv[0] = strdup("-c");
-                authpriv[1] = strdup(community);
-        } else if (strcmp(proto, "3") == 0) { /* snmpv3 args */
-                if (!(context == NULL)) {
-                        numcontext = 2;
-                        contextargs = calloc(numcontext, sizeof(char *));
-                        contextargs[0] = strdup("-n");
-                        contextargs[1] = strdup(context);
+        /* check whether to load locally installed MIBS (CPU/disk intensive) */
+        if (miblist == NULL) {
+                if (config.snmp_params.need_mibs) {
+                        setenv("MIBLS", DEFAULT_MIBLIST, 1);
+                } else {
+                        setenv("MIBLS", "NONE", 1);
+                        miblist = ""; /* don't read any mib files for numeric oids */
                 }
+        } else {
+                // Blatantly stolen from snmplib/snmp_parse_args
+                setenv("MIBS", miblist, 1);
+        }
 
-                if (seclevel == NULL)
-                        xasprintf(&seclevel, "noAuthNoPriv");
+        // Historical default is SNMP v2c
+        if (!snmp_version_set_explicitely && config.snmp_params.snmp_session.community != NULL) {
+                config.snmp_params.snmp_session.version = SNMP_VERSION_2c;
+        }
 
-                if (secname == NULL)
+        if ((config.snmp_params.snmp_session.version == SNMP_VERSION_1) ||
+                (config.snmp_params.snmp_session.version == SNMP_VERSION_2c)) {     /* snmpv1 or snmpv2c */
+                                                                                                                                                        /*
+                                                                                                                                                        config.numauthpriv = 2;
+                                                                                                                                                        config.authpriv = calloc(config.numauthpriv, sizeof(char *));
+                                                                                                                                                        config.authpriv[0] = strdup("-c");
+                                                                                                                                                        config.authpriv[1] = strdup(community);
+                                                                                                                                                        */
+        } else if (config.snmp_params.snmp_session.version == SNMP_VERSION_3) { /* snmpv3 args */
+                // generate keys for priv and auth here (if demanded)
+
+                if (config.snmp_params.snmp_session.securityName == NULL) {
                         die(STATE_UNKNOWN, _("Required parameter: %s\n"), "secname");
+                }
 
-                if (strcmp(seclevel, "noAuthNoPriv") == 0) {
-                        numauthpriv = 4;
-                        authpriv = calloc(numauthpriv, sizeof(char *));
-                        authpriv[0] = strdup("-l");
-                        authpriv[1] = strdup("noAuthNoPriv");
-                        authpriv[2] = strdup("-u");
-                        authpriv[3] = strdup(secname);
-                } else {
-                        if (!((strcmp(seclevel, "authNoPriv") == 0) || (strcmp(seclevel, "authPriv") == 0))) {
-                                usage2(_("Invalid seclevel"), seclevel);
+                switch (config.snmp_params.snmp_session.securityLevel) {
+                case SNMP_SEC_LEVEL_AUTHPRIV: {
+                        if (authpasswd == NULL) {
+                                die(STATE_UNKNOWN,
+                                        "No authentication passphrase was given, but authorization was requested");
                         }
-
-                        if (authproto == NULL)
-                                xasprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
-
-                        if (authpasswd == NULL)
-                                die(STATE_UNKNOWN, _("Required parameter: %s\n"), "authpasswd");
-
-                        if (strcmp(seclevel, "authNoPriv") == 0) {
-                                numauthpriv = 8;
-                                authpriv = calloc(numauthpriv, sizeof(char *));
-                                authpriv[0] = strdup("-l");
-                                authpriv[1] = strdup("authNoPriv");
-                                authpriv[2] = strdup("-a");
-                                authpriv[3] = strdup(authproto);
-                                authpriv[4] = strdup("-u");
-                                authpriv[5] = strdup(secname);
-                                authpriv[6] = strdup("-A");
-                                authpriv[7] = strdup(authpasswd);
-                        } else if (strcmp(seclevel, "authPriv") == 0) {
-                                if (privproto == NULL)
-                                        xasprintf(&privproto, DEFAULT_PRIV_PROTOCOL);
-
-                                if (privpasswd == NULL)
-                                        die(STATE_UNKNOWN, _("Required parameter: %s\n"), "privpasswd");
-
-                                numauthpriv = 12;
-                                authpriv = calloc(numauthpriv, sizeof(char *));
-                                authpriv[0] = strdup("-l");
-                                authpriv[1] = strdup("authPriv");
-                                authpriv[2] = strdup("-a");
-                                authpriv[3] = strdup(authproto);
-                                authpriv[4] = strdup("-u");
-                                authpriv[5] = strdup(secname);
-                                authpriv[6] = strdup("-A");
-                                authpriv[7] = strdup(authpasswd);
-                                authpriv[8] = strdup("-x");
-                                authpriv[9] = strdup(privproto);
-                                authpriv[10] = strdup("-X");
-                                authpriv[11] = strdup(privpasswd);
+                        // auth and priv
+                        int priv_key_generated = generate_Ku(
+                                config.snmp_params.snmp_session.securityPrivProto,
+                                (unsigned int)config.snmp_params.snmp_session.securityPrivProtoLen, authpasswd,
+                                strlen((const char *)authpasswd), config.snmp_params.snmp_session.securityPrivKey,
+                                &config.snmp_params.snmp_session.securityPrivKeyLen);
+
+                        if (priv_key_generated != SNMPERR_SUCCESS) {
+                                die(STATE_UNKNOWN, "Failed to generate privacy key");
                         }
                 }
-
-        } else {
-                usage2(_("Invalid SNMP version"), proto);
+                // fall through
+                case SNMP_SEC_LEVEL_AUTHNOPRIV: {
+                        if (privpasswd == NULL) {
+                                die(STATE_UNKNOWN, "No privacy passphrase was given, but privacy was requested");
+                        }
+                        int auth_key_generated = generate_Ku(
+                                config.snmp_params.snmp_session.securityAuthProto,
+                                (unsigned int)config.snmp_params.snmp_session.securityAuthProtoLen, privpasswd,
+                                strlen((const char *)privpasswd), config.snmp_params.snmp_session.securityAuthKey,
+                                &config.snmp_params.snmp_session.securityAuthKeyLen);
+
+                        if (auth_key_generated != SNMPERR_SUCCESS) {
+                                die(STATE_UNKNOWN, "Failed to generate privacy key");
+                        }
+                } break;
+                case SNMP_SEC_LEVEL_NOAUTH:
+                        // No auth, no priv, not much todo
+                        break;
+                }
         }
 
-        return OK;
+        process_arguments_wrapper result = {
+                .config = config,
+                .errorcode = OK,
+        };
+        return result;
 }
 
 /* trim leading whitespace
          if there is a leading quote, make sure it balances */
-
-static char *thisarg(char *str) {
+char *trim_whitespaces_and_check_quoting(char *str) {
         str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
         if (str[0] == '\'') {          /* handle SIMPLE quoted strings */
-                if (strlen(str) == 1 || !strstr(str + 1, "'"))
+                if (strlen(str) == 1 || !strstr(str + 1, "'")) {
                         die(STATE_UNKNOWN, _("Unbalanced quotes\n"));
+                }
         }
         return str;
 }
@@ -1132,23 +985,21 @@ static char *thisarg(char *str) {
          set the trailing quote to '\x0'
          if the string continues, advance beyond the comma */
 
-static char *nextarg(char *str) {
+char *get_next_argument(char *str) {
         if (str[0] == '\'') {
                 str[0] = 0;
                 if (strlen(str) > 1) {
                         str = strstr(str + 1, "'");
                         return (++str);
-                } else {
-                        return NULL;
                 }
+                return NULL;
         }
         if (str[0] == ',') {
                 str[0] = 0;
                 if (strlen(str) > 1) {
                         return (++str);
-                } else {
-                        return NULL;
                 }
+                return NULL;
         }
         if ((str = strstr(str, ",")) && strlen(str) > 1) {
                 str[0] = 0;
@@ -1157,41 +1008,7 @@ static char *nextarg(char *str) {
         return NULL;
 }
 
-/* multiply result (values 0 < n < 1 work as divider) */
-static char *multiply(char *str) {
-        if (multiplier == 1)
-                return (str);
-
-        if (verbose > 2)
-                printf("    multiply input: %s\n", str);
-
-        char *endptr;
-        double val = strtod(str, &endptr);
-        if ((val == 0.0) && (endptr == str)) {
-                die(STATE_UNKNOWN, _("multiplier set (%.1f), but input is not a number: %s"), multiplier, str);
-        }
-
-        if (verbose > 2)
-                printf("    multiply extracted double: %f\n", val);
-
-        val *= multiplier;
-        char *conv = "%f";
-        if (fmtstr_set) {
-                conv = fmtstr;
-        }
-        if (val == (int)val) {
-                snprintf(buffer, DEFAULT_BUFFER_SIZE, "%.0f", val);
-        } else {
-                if (verbose > 2)
-                        printf("    multiply using format: %s\n", conv);
-                snprintf(buffer, DEFAULT_BUFFER_SIZE, conv, val);
-        }
-        if (verbose > 2)
-                printf("    multiply result: %s\n", buffer);
-        return buffer;
-}
-
-static void print_help(void) {
+void print_help(void) {
         print_revision(progname, NP_VERSION);
 
         printf(COPYRIGHT, copyright, email);
@@ -1204,8 +1021,6 @@ static void print_help(void) {
 
         printf(UT_HELP_VRSN);
         printf(UT_EXTRA_OPTS);
-        printf(UT_IPv46);
-
         printf(UT_HOST_PORT, 'p', DEFAULT_PORT);
 
         /* SNMP and Authentication Protocol */
@@ -1217,13 +1032,15 @@ static void print_help(void) {
         printf("    %s\n", _("SNMPv3 context"));
         printf(" %s\n", "-L, --seclevel=[noAuthNoPriv|authNoPriv|authPriv]");
         printf("    %s\n", _("SNMPv3 securityLevel"));
-        printf(" %s\n", "-a, --authproto=AUTHENTICATION_PROTOCOL");
-        printf("    %s\n",
-                   _("SNMPv3 authentication protocol (default MD5), available options depend on the specific version of the net-snmp tools"));
-        printf("    %s\n", _("if < 5.8 SHA (1) and MD5 should be available, if >= 5.8 additionally SHA-224, SHA-256, SHA-384 and SHA-512"));
-        printf(" %s\n", "-x, --privproto=PRIVACY_PROTOCOL");
-        printf("    %s\n", _("SNMPv3 privacy protocol (default DES), available options depend on the specific version of the net-snmp tools"));
-        printf("    %s\n", _("if < 5.8 DES and AES should be available, if >= 5.8 additionally AES-192 and AES-256"));
+        printf(" %s\n", "-a, --authproto=[MD5|SHA]");
+        printf("    %s\n", _("SNMPv3 auth proto"));
+#ifdef HAVE_USM_DES_PRIV_PROTOCOL
+        printf(" %s\n", "-x, --privproto=[DES|AES]");
+        printf("    %s\n", _("SNMPv3 priv proto (default DES)"));
+#else
+        printf(" %s\n", "-x, --privproto=[AES]");
+        printf("    %s\n", _("SNMPv3 priv proto (default AES)"));
+#endif
 
         /* Authentication Tokens*/
         printf(" %s\n", "-C, --community=STRING");
@@ -1235,15 +1052,18 @@ static void print_help(void) {
         printf("    %s\n", _("SNMPv3 authentication password"));
         printf(" %s\n", "-X, --privpasswd=PASSWORD");
         printf("    %s\n", _("SNMPv3 privacy password"));
+        printf(" %s\n", "--connection-prefix");
+        printf("    Connection prefix, may be one of udp, udp6, tcp, unix, ipx, udp6, udpv6, udpipv6, "
+                   "tcp6, tcpv6, tcpipv6, tls, dtls - "
+                   "default is \"udp\"\n");
 
         /* OID Stuff */
         printf(" %s\n", "-o, --oid=OID(s)");
         printf("    %s\n", _("Object identifier(s) or SNMP variables whose value you wish to query"));
         printf(" %s\n", "-m, --miblist=STRING");
-        printf("    %s\n", _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"));
+        printf("    %s\n",
+                   _("List of MIBS to be loaded (default = none if using numeric OIDs or 'ALL'"));
         printf("    %s\n", _("for symbolic OIDs.)"));
-        printf(" %s\n", "-d, --delimiter=STRING");
-        printf("    %s \"%s\"\n", _("Delimiter to use when parsing returned data. Default is"), DEFAULT_DELIMITER);
         printf("    %s\n", _("Any data on the right hand side of the delimiter is considered"));
         printf("    %s\n", _("to be the data that should be used in the evaluation."));
         printf(" %s\n", "-z, --nulloid=#");
@@ -1260,10 +1080,6 @@ static void print_help(void) {
         printf("    %s\n", _("Warning threshold range(s)"));
         printf(" %s\n", "-c, --critical=THRESHOLD(s)");
         printf("    %s\n", _("Critical threshold range(s)"));
-        printf(" %s\n", "--rate");
-        printf("    %s\n", _("Enable rate calculation. See 'Rate Calculation' below"));
-        printf(" %s\n", "--rate-multiplier");
-        printf("    %s\n", _("Converts rate per second. For example, set to 60 to convert to per minute"));
         printf(" %s\n", "--offset=OFFSET");
         printf("    %s\n", _("Add/subtract the specified OFFSET to numeric sensor data"));
 
@@ -1271,9 +1087,11 @@ static void print_help(void) {
         printf(" %s\n", "-s, --string=STRING");
         printf("    %s\n", _("Return OK state (for that OID) if STRING is an exact match"));
         printf(" %s\n", "-r, --ereg=REGEX");
-        printf("    %s\n", _("Return OK state (for that OID) if extended regular expression REGEX matches"));
+        printf("    %s\n",
+                   _("Return OK state (for that OID) if extended regular expression REGEX matches"));
         printf(" %s\n", "-R, --eregi=REGEX");
-        printf("    %s\n", _("Return OK state (for that OID) if case-insensitive extended REGEX matches"));
+        printf("    %s\n",
+                   _("Return OK state (for that OID) if case-insensitive extended REGEX matches"));
         printf(" %s\n", "--invert-search");
         printf("    %s\n", _("Invert search result (CRITICAL if found)"));
 
@@ -1282,53 +1100,46 @@ static void print_help(void) {
         printf("    %s\n", _("Prefix label for output from plugin"));
         printf(" %s\n", "-u, --units=STRING");
         printf("    %s\n", _("Units label(s) for output data (e.g., 'sec.')."));
-        printf(" %s\n", "-D, --output-delimiter=STRING");
-        printf("    %s\n", _("Separates output on multiple OID requests"));
         printf(" %s\n", "-M, --multiplier=FLOAT");
         printf("    %s\n", _("Multiplies current value, 0 < n < 1 works as divider, defaults to 1"));
-        printf(" %s\n", "-f, --fmtstr=STRING");
-        printf("    %s\n", _("C-style format string for float values (see option -M)"));
+        printf(UT_OUTPUT_FORMAT);
 
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-        printf("    %s\n", _("NOTE the final timeout value is calculated using this formula: timeout_interval * retries + 5"));
+        printf("    %s\n", _("NOTE the final timeout value is calculated using this formula: "
+                                                 "timeout_interval * retries + 5"));
         printf(" %s\n", "-e, --retries=INTEGER");
-        printf("    %s%i\n", _("Number of retries to be used in the requests, default: "), DEFAULT_RETRIES);
+        printf("    %s%i\n", _("Number of retries to be used in the requests, default: "),
+                   DEFAULT_RETRIES);
 
         printf(" %s\n", "-O, --perf-oids");
         printf("    %s\n", _("Label performance data with OIDs instead of --label's"));
 
         printf(" %s\n", "--ignore-mib-parsing-errors");
-        printf("    %s\n", _("Tell snmpget to not print errors encountered when parsing MIB files"));
+        printf("    %s\n", _("Do to not print errors encountered when parsing MIB files"));
 
         printf(UT_VERBOSE);
 
         printf("\n");
-        printf("%s\n", _("This plugin uses the 'snmpget' command included with the NET-SNMP package."));
-        printf("%s\n", _("if you don't have the package installed, you will need to download it from"));
+        printf("%s\n", _("This plugin relies (links against) on the NET-SNMP libraries."));
+        printf("%s\n",
+                   _("if you don't have the libraries installed, you will need to download them from"));
         printf("%s\n", _("http://net-snmp.sourceforge.net before you can use this plugin."));
 
         printf("\n");
         printf("%s\n", _("Notes:"));
-        printf(" %s\n", _("- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "));
+        printf(" %s\n",
+                   _("- Multiple OIDs (and labels) may be indicated by a comma or space-delimited  "));
         printf("   %s\n", _("list (lists with internal spaces must be quoted)."));
 
         printf(" -%s", UT_THRESHOLDS_NOTES);
 
-        printf(" %s\n", _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'"));
+        printf(" %s\n",
+                   _("- When checking multiple OIDs, separate ranges by commas like '-w 1:10,1:,:20'"));
         printf(" %s\n", _("- Note that only one string and one regex may be checked at present"));
-        printf(" %s\n", _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
+        printf(" %s\n",
+                   _("- All evaluation methods other than PR, STR, and SUBSTR expect that the value"));
         printf("   %s\n", _("returned from the SNMP query is an unsigned integer."));
 
-        printf("\n");
-        printf("%s\n", _("Rate Calculation:"));
-        printf(" %s\n", _("In many places, SNMP returns counters that are only meaningful when"));
-        printf(" %s\n", _("calculating the counter difference since the last check. check_snmp"));
-        printf(" %s\n", _("saves the last state information in a file so that the rate per second"));
-        printf(" %s\n", _("can be calculated. Use the --rate option to save state information."));
-        printf(" %s\n", _("On the first run, there will be no prior state - this will return with OK."));
-        printf(" %s\n", _("The state is uniquely determined by the arguments to the plugin, so"));
-        printf(" %s\n", _("changing the arguments will create a new state file."));
-
         printf(UT_SUPPORT);
 }
 
@@ -1339,5 +1150,5 @@ void print_usage(void) {
         printf("[-l label] [-u units] [-p port-number] [-d delimiter] [-D output-delimiter]\n");
         printf("[-m miblist] [-P snmp version] [-N context] [-L seclevel] [-U secname]\n");
         printf("[-a authproto] [-A authpasswd] [-x privproto] [-X privpasswd] [-4|6]\n");
-        printf("[-M multiplier [-f format]]\n");
+        printf("[-M multiplier]\n");
 }
diff --git a/plugins/check_snmp.d/check_snmp_helpers.c b/plugins/check_snmp.d/check_snmp_helpers.c
new file mode 100644
index 00000000..f506537a
--- /dev/null
+++ b/plugins/check_snmp.d/check_snmp_helpers.c
@@ -0,0 +1,936 @@
+#include "./check_snmp_helpers.h"
+#include <string.h>
+#include "../../lib/utils_base.h"
+#include "config.h"
+#include <assert.h>
+#include "../utils.h"
+#include "output.h"
+#include "states.h"
+#include <sys/stat.h>
+#include <ctype.h>
+
+extern int verbose;
+
+check_snmp_test_unit check_snmp_test_unit_init() {
+        check_snmp_test_unit tmp = {
+                .threshold = mp_thresholds_init(),
+        };
+        return tmp;
+}
+
+int check_snmp_set_thresholds(const char *threshold_string, check_snmp_test_unit test_units[],
+                                                          size_t max_test_units, bool is_critical) {
+
+        if (threshold_string == NULL || strlen(threshold_string) == 0) {
+                // No input, do nothing
+                return 0;
+        }
+
+        if (strchr(threshold_string, ',') != NULL) {
+                // Got a comma in the string, should be multiple values
+                size_t tu_index = 0;
+
+                while (threshold_string[0] == ',') {
+                        // got commas at the beginning, so skip some values
+                        tu_index++;
+                        threshold_string++;
+                }
+
+                for (char *ptr = strtok(threshold_string, ", "); ptr != NULL;
+                         ptr = strtok(NULL, ", "), tu_index++) {
+
+                        if (tu_index > max_test_units) {
+                                // More thresholds then values, just ignore them
+                                return 0;
+                        }
+
+                        // edge case: maybe we got `,,` to skip a value
+                        if (strlen(ptr) == 0) {
+                                // no threshold given, do not set it then
+                                continue;
+                        }
+
+                        mp_range_parsed tmp = mp_parse_range_string(ptr);
+                        if (tmp.error != MP_PARSING_SUCCES) {
+                                die(STATE_UNKNOWN, "Unable to parse critical threshold range: %s", ptr);
+                        }
+
+                        if (is_critical) {
+                                test_units[tu_index].threshold.critical = tmp.range;
+                                test_units[tu_index].threshold.critical_is_set = true;
+                        } else {
+                                test_units[tu_index].threshold.warning = tmp.range;
+                                test_units[tu_index].threshold.warning_is_set = true;
+                        }
+                }
+
+        } else {
+                // Single value
+                // only valid for the first test unit
+                mp_range_parsed tmp = mp_parse_range_string(threshold_string);
+                if (tmp.error != MP_PARSING_SUCCES) {
+                        die(STATE_UNKNOWN, "Unable to parse critical threshold range: %s", threshold_string);
+                }
+
+                if (is_critical) {
+                        test_units[0].threshold.critical = tmp.range;
+                        test_units[0].threshold.critical_is_set = true;
+                } else {
+                        test_units[0].threshold.warning = tmp.range;
+                        test_units[0].threshold.warning_is_set = true;
+                }
+        }
+
+        return 0;
+}
+
+const int DEFAULT_PROTOCOL = SNMP_VERSION_1;
+const char DEFAULT_OUTPUT_DELIMITER[] = " ";
+
+const int RANDOM_STATE_DATA_LENGTH_PREDICTION = 8192;
+
+check_snmp_config check_snmp_config_init() {
+        check_snmp_config tmp = {
+                .snmp_params =
+                        {
+                                .use_getnext = false,
+
+                                .ignore_mib_parsing_errors = false,
+                                .need_mibs = false,
+
+                                .test_units = NULL,
+                                .num_of_test_units = 0,
+                        },
+
+                .evaluation_params =
+                        {
+                                .nulloid_result = STATE_UNKNOWN, // state to return if no result for query
+
+                                .invert_search = true,
+                                .regex_cmp_value = {},
+                                .string_cmp_value = "",
+
+                                .multiplier = 1.0,
+                                .multiplier_set = false,
+                                .offset = 0,
+                                .offset_set = false,
+
+                                .use_oid_as_perf_data_label = false,
+
+                                .calculate_rate = false,
+                                .rate_multiplier = 1,
+                        },
+        };
+
+        snmp_sess_init(&tmp.snmp_params.snmp_session);
+
+        tmp.snmp_params.snmp_session.retries = DEFAULT_RETRIES;
+        tmp.snmp_params.snmp_session.version = DEFAULT_SNMP_VERSION;
+        tmp.snmp_params.snmp_session.securityLevel = SNMP_SEC_LEVEL_NOAUTH;
+        tmp.snmp_params.snmp_session.community = (unsigned char *)"public";
+        tmp.snmp_params.snmp_session.community_len = strlen("public");
+        return tmp;
+}
+
+snmp_responces do_snmp_query(check_snmp_config_snmp_parameters parameters) {
+        if (parameters.ignore_mib_parsing_errors) {
+                char *opt_toggle_res = snmp_mib_toggle_options("e");
+                if (opt_toggle_res != NULL) {
+                        die(STATE_UNKNOWN, "Unable to disable MIB parsing errors");
+                }
+        }
+
+        struct snmp_pdu *pdu = NULL;
+        if (parameters.use_getnext) {
+                pdu = snmp_pdu_create(SNMP_MSG_GETNEXT);
+        } else {
+                pdu = snmp_pdu_create(SNMP_MSG_GET);
+        }
+
+        for (size_t i = 0; i < parameters.num_of_test_units; i++) {
+                assert(parameters.test_units[i].oid != NULL);
+                if (verbose > 0) {
+                        printf("OID %zu to parse: %s\n", i, parameters.test_units[i].oid);
+                }
+
+                oid tmp_OID[MAX_OID_LEN];
+                size_t tmp_OID_len = MAX_OID_LEN;
+                if (snmp_parse_oid(parameters.test_units[i].oid, tmp_OID, &tmp_OID_len) != NULL) {
+                        // success
+                        snmp_add_null_var(pdu, tmp_OID, tmp_OID_len);
+                } else {
+                        // failed
+                        snmp_perror("Parsing failure");
+                        die(STATE_UNKNOWN, "Failed to parse OID\n");
+                }
+        }
+
+        const int timeout_safety_tolerance = 5;
+        alarm((timeout_interval * (unsigned int)parameters.snmp_session.retries) +
+                  timeout_safety_tolerance);
+
+        struct snmp_session *active_session = snmp_open(&parameters.snmp_session);
+        if (active_session == NULL) {
+                int pcliberr = 0;
+                int psnmperr = 0;
+                char *pperrstring = NULL;
+                snmp_error(&parameters.snmp_session, &pcliberr, &psnmperr, &pperrstring);
+                die(STATE_UNKNOWN, "Failed to open SNMP session: %s\n", pperrstring);
+        }
+
+        struct snmp_pdu *response = NULL;
+        int snmp_query_status = snmp_synch_response(active_session, pdu, &response);
+
+        if (!(snmp_query_status == STAT_SUCCESS && response->errstat == SNMP_ERR_NOERROR)) {
+                int pcliberr = 0;
+                int psnmperr = 0;
+                char *pperrstring = NULL;
+                snmp_error(active_session, &pcliberr, &psnmperr, &pperrstring);
+
+                if (psnmperr == SNMPERR_TIMEOUT) {
+                        // We exit with critical here for some historical reason
+                        die(STATE_CRITICAL, "SNMP query ran into a timeout\n");
+                }
+                die(STATE_UNKNOWN, "SNMP query failed: %s\n", pperrstring);
+        }
+
+        snmp_close(active_session);
+
+        /* disable alarm again */
+        alarm(0);
+
+        snmp_responces result = {
+                .errorcode = OK,
+                .response_values = calloc(parameters.num_of_test_units, sizeof(response_value)),
+        };
+
+        if (result.response_values == NULL) {
+                result.errorcode = ERROR;
+                return result;
+        }
+
+        // We got the the query results, now process them
+        size_t loop_index = 0;
+        for (netsnmp_variable_list *vars = response->variables; vars;
+                 vars = vars->next_variable, loop_index++) {
+
+                for (size_t jdx = 0; jdx < vars->name_length; jdx++) {
+                        result.response_values[loop_index].oid[jdx] = vars->name[jdx];
+                }
+                result.response_values[loop_index].oid_length = vars->name_length;
+
+                switch (vars->type) {
+                case ASN_OCTET_STR: {
+                        result.response_values[loop_index].string_response = strdup((char *)vars->val.string);
+                        result.response_values[loop_index].type = vars->type;
+                        if (verbose) {
+                                printf("Debug: Got a string as response: %s\n", vars->val.string);
+                        }
+                }
+                        continue;
+                case ASN_OPAQUE:
+                        if (verbose) {
+                                printf("Debug: Got OPAQUE\n");
+                        }
+                        break;
+                /* Numerical values */
+                case ASN_COUNTER64: {
+                        if (verbose) {
+                                printf("Debug: Got counter64\n");
+                        }
+                        struct counter64 tmp = *(vars->val.counter64);
+                        uint64_t counter = (tmp.high << 32) + tmp.low;
+                        result.response_values[loop_index].value.uIntVal = counter;
+                        result.response_values[loop_index].type = vars->type;
+                } break;
+                case ASN_GAUGE: // same as ASN_UNSIGNED
+                case ASN_TIMETICKS:
+                case ASN_COUNTER:
+                case ASN_UINTEGER: {
+                        if (verbose) {
+                                printf("Debug: Got a Integer like\n");
+                        }
+                        result.response_values[loop_index].value.uIntVal = (unsigned long)*(vars->val.integer);
+                        result.response_values[loop_index].type = vars->type;
+                } break;
+                case ASN_INTEGER: {
+                        if (verbose) {
+                                printf("Debug: Got a Integer\n");
+                        }
+                        result.response_values[loop_index].value.intVal = *(vars->val.integer);
+                        result.response_values[loop_index].type = vars->type;
+                } break;
+                case ASN_FLOAT: {
+                        if (verbose) {
+                                printf("Debug: Got a float\n");
+                        }
+                        result.response_values[loop_index].value.doubleVal = *(vars->val.floatVal);
+                        result.response_values[loop_index].type = vars->type;
+                } break;
+                case ASN_DOUBLE: {
+                        if (verbose) {
+                                printf("Debug: Got a double\n");
+                        }
+                        result.response_values[loop_index].value.doubleVal = *(vars->val.doubleVal);
+                        result.response_values[loop_index].type = vars->type;
+                } break;
+                case ASN_IPADDRESS:
+                        if (verbose) {
+                                printf("Debug: Got an IP address\n");
+                        }
+                        result.response_values[loop_index].type = vars->type;
+
+                        // TODO: print address here, state always ok? or regex match?
+                        break;
+                default:
+                        if (verbose) {
+                                printf("Debug: Got a unmatched result type: %hhu\n", vars->type);
+                        }
+                        // TODO: Error here?
+                        break;
+                }
+        }
+
+        return result;
+}
+
+check_snmp_evaluation evaluate_single_unit(response_value response,
+                                                                                   check_snmp_evaluation_parameters eval_params,
+                                                                                   check_snmp_test_unit test_unit, time_t query_timestamp,
+                                                                                   check_snmp_state_entry prev_state,
+                                                                                   bool have_previous_state) {
+        mp_subcheck sc_oid_test = mp_subcheck_init();
+
+        if ((test_unit.label != NULL) && (strcmp(test_unit.label, "") != 0)) {
+                xasprintf(&sc_oid_test.output, "%s - ", test_unit.label);
+        } else {
+                sc_oid_test.output = strdup("");
+        }
+
+        char oid_string[(MAX_OID_LEN * 2) + 1] = {};
+
+        int oid_string_result =
+                snprint_objid(oid_string, (MAX_OID_LEN * 2) + 1, response.oid, response.oid_length);
+        if (oid_string_result <= 0) {
+                // TODO error here
+                die(STATE_UNKNOWN, "snprint_objid failed\n");
+        }
+
+        xasprintf(&sc_oid_test.output, "%sOID: %s", sc_oid_test.output, oid_string);
+        sc_oid_test = mp_set_subcheck_default_state(sc_oid_test, STATE_OK);
+
+        if (verbose > 2) {
+                printf("Processing oid %s\n", oid_string);
+        }
+
+        bool got_a_numerical_value = false;
+        mp_perfdata_value pd_result_val = {0};
+
+        check_snmp_state_entry result_state = {
+                .timestamp = query_timestamp,
+                .oid_length = response.oid_length,
+                .type = response.type,
+        };
+
+        for (size_t i = 0; i < response.oid_length; i++) {
+                result_state.oid[i] = response.oid[i];
+        }
+
+        if (have_previous_state) {
+                if (query_timestamp == prev_state.timestamp) {
+                        // somehow we have the same timestamp again, that can't be good
+                        sc_oid_test = mp_set_subcheck_state(sc_oid_test, STATE_UNKNOWN);
+                        xasprintf(&sc_oid_test.output, "Time duration between plugin calls is invalid");
+
+                        check_snmp_evaluation result = {
+                                .sc = sc_oid_test,
+                                .state = result_state,
+                        };
+
+                        return result;
+                }
+        }
+        // compute rate time difference
+        double timeDiff = 0;
+        if (have_previous_state) {
+                if (verbose) {
+                        printf("Previous timestamp: %s", ctime(&prev_state.timestamp));
+                        printf("Current timestamp: %s", ctime(&query_timestamp));
+                }
+                timeDiff = difftime(query_timestamp, prev_state.timestamp) / eval_params.rate_multiplier;
+        }
+
+        mp_perfdata pd_num_val = {};
+
+        switch (response.type) {
+        case ASN_OCTET_STR: {
+                char *tmp = response.string_response;
+                if (strchr(tmp, '"') != NULL) {
+                        // got double quote in the string
+                        if (strchr(tmp, '\'') != NULL) {
+                                // got single quote in the string too
+                                // dont quote that at all to avoid even more confusion
+                                xasprintf(&sc_oid_test.output, "%s - Value: %s", sc_oid_test.output, tmp);
+                        } else {
+                                // quote with single quotes
+                                xasprintf(&sc_oid_test.output, "%s - Value: '%s'", sc_oid_test.output, tmp);
+                        }
+                } else {
+                        // quote with double quotes
+                        xasprintf(&sc_oid_test.output, "%s - Value: \"%s\"", sc_oid_test.output, tmp);
+                }
+
+                if (strlen(tmp) == 0) {
+                        sc_oid_test = mp_set_subcheck_state(sc_oid_test, eval_params.nulloid_result);
+                }
+
+                // String matching test
+                if ((test_unit.eval_mthd.crit_string)) {
+                        if (strcmp(tmp, eval_params.string_cmp_value)) {
+                                sc_oid_test = mp_set_subcheck_state(
+                                        sc_oid_test, (eval_params.invert_search) ? STATE_CRITICAL : STATE_OK);
+                        } else {
+                                sc_oid_test = mp_set_subcheck_state(
+                                        sc_oid_test, (eval_params.invert_search) ? STATE_OK : STATE_CRITICAL);
+                        }
+                } else if (test_unit.eval_mthd.crit_regex) {
+                        const size_t nmatch = eval_params.regex_cmp_value.re_nsub + 1;
+                        regmatch_t pmatch[nmatch];
+                        memset(pmatch, '\0', sizeof(regmatch_t) * nmatch);
+
+                        int excode = regexec(&eval_params.regex_cmp_value, tmp, nmatch, pmatch, 0);
+                        if (excode == 0) {
+                                sc_oid_test = mp_set_subcheck_state(
+                                        sc_oid_test, (eval_params.invert_search) ? STATE_OK : STATE_CRITICAL);
+                        } else if (excode != REG_NOMATCH) {
+                                char errbuf[MAX_INPUT_BUFFER] = "";
+                                regerror(excode, &eval_params.regex_cmp_value, errbuf, MAX_INPUT_BUFFER);
+                                printf(_("Execute Error: %s\n"), errbuf);
+                                exit(STATE_CRITICAL);
+                        } else { // REG_NOMATCH
+                                sc_oid_test = mp_set_subcheck_state(
+                                        sc_oid_test, eval_params.invert_search ? STATE_CRITICAL : STATE_OK);
+                        }
+                }
+        } break;
+        case ASN_COUNTER64:
+                got_a_numerical_value = true;
+
+                result_state.value.uIntVal = response.value.uIntVal;
+                result_state.type = response.type;
+
+                // TODO: perfdata unit counter
+                if (eval_params.calculate_rate && have_previous_state) {
+                        if (prev_state.value.uIntVal > response.value.uIntVal) {
+                                // overflow
+                                unsigned long long tmp =
+                                        (UINT64_MAX - prev_state.value.uIntVal) + response.value.uIntVal;
+
+                                tmp /= timeDiff;
+                                pd_result_val = mp_create_pd_value(tmp);
+                        } else {
+                                pd_result_val = mp_create_pd_value(
+                                        (response.value.uIntVal - prev_state.value.uIntVal) / timeDiff);
+                        }
+                } else {
+                        // It's only a counter if we cont compute rate
+                        pd_num_val.uom = "c";
+                        pd_result_val = mp_create_pd_value(response.value.uIntVal);
+                }
+                break;
+        case ASN_GAUGE: // same as ASN_UNSIGNED
+        case ASN_TIMETICKS:
+        case ASN_COUNTER:
+        case ASN_UINTEGER: {
+                got_a_numerical_value = true;
+                long long treated_value = (long long)response.value.uIntVal;
+
+                if (eval_params.multiplier_set || eval_params.offset_set) {
+                        double processed = (double)response.value.uIntVal;
+
+                        if (eval_params.offset_set) {
+                                processed += eval_params.offset;
+                        }
+
+                        if (eval_params.multiplier_set) {
+                                processed = processed * eval_params.multiplier;
+                        }
+
+                        treated_value = lround(processed);
+                }
+
+                result_state.value.intVal = treated_value;
+
+                if (eval_params.calculate_rate && have_previous_state) {
+                        if (verbose > 2) {
+                                printf("%s: Rate calculation (int/counter/gauge): prev: %lli\n", __FUNCTION__,
+                                           prev_state.value.intVal);
+                                printf("%s: Rate calculation (int/counter/gauge): current: %lli\n", __FUNCTION__,
+                                           treated_value);
+                        }
+                        double rate = (treated_value - prev_state.value.intVal) / timeDiff;
+                        pd_result_val = mp_create_pd_value(rate);
+                } else {
+                        pd_result_val = mp_create_pd_value(treated_value);
+
+                        if (response.type == ASN_COUNTER) {
+                                pd_num_val.uom = "c";
+                        }
+                }
+
+        } break;
+        case ASN_INTEGER: {
+                if (eval_params.multiplier_set || eval_params.offset_set) {
+                        double processed = (double)response.value.intVal;
+
+                        if (eval_params.offset_set) {
+                                processed += eval_params.offset;
+                        }
+
+                        if (eval_params.multiplier_set) {
+                                processed *= eval_params.multiplier;
+                        }
+
+                        result_state.value.doubleVal = processed;
+
+                        if (eval_params.calculate_rate && have_previous_state) {
+                                pd_result_val =
+                                        mp_create_pd_value((processed - prev_state.value.doubleVal) / timeDiff);
+                        } else {
+                                pd_result_val = mp_create_pd_value(processed);
+                        }
+                } else {
+                        result_state.value.intVal = response.value.intVal;
+
+                        if (eval_params.calculate_rate && have_previous_state) {
+                                pd_result_val = mp_create_pd_value(
+                                        (response.value.intVal - prev_state.value.intVal) / timeDiff);
+                        } else {
+                                pd_result_val = mp_create_pd_value(response.value.intVal);
+                        }
+                }
+
+                got_a_numerical_value = true;
+        } break;
+        case ASN_FLOAT: // fallthrough
+        case ASN_DOUBLE: {
+                got_a_numerical_value = true;
+                double tmp = response.value.doubleVal;
+                if (eval_params.offset_set) {
+                        tmp += eval_params.offset;
+                }
+
+                if (eval_params.multiplier_set) {
+                        tmp *= eval_params.multiplier;
+                }
+
+                if (eval_params.calculate_rate && have_previous_state) {
+                        pd_result_val = mp_create_pd_value((tmp - prev_state.value.doubleVal) / timeDiff);
+                } else {
+                        pd_result_val = mp_create_pd_value(tmp);
+                }
+                got_a_numerical_value = true;
+
+                result_state.value.doubleVal = tmp;
+        } break;
+        case ASN_IPADDRESS:
+                // TODO
+                break;
+        }
+
+        if (got_a_numerical_value) {
+                if (eval_params.use_oid_as_perf_data_label) {
+                        // Use oid for perdata label
+                        pd_num_val.label = strdup(oid_string);
+                        // TODO strdup error checking
+                } else if (test_unit.label != NULL && strcmp(test_unit.label, "") != 0) {
+                        pd_num_val.label = strdup(test_unit.label);
+                } else {
+                        pd_num_val.label = strdup(test_unit.oid);
+                }
+
+                if (!(eval_params.calculate_rate && !have_previous_state)) {
+                        // some kind of numerical value
+                        if (test_unit.unit_value != NULL && strcmp(test_unit.unit_value, "") != 0) {
+                                pd_num_val.uom = test_unit.unit_value;
+                        }
+
+                        pd_num_val.value = pd_result_val;
+
+                        xasprintf(&sc_oid_test.output, "%s Value: %s", sc_oid_test.output,
+                                          pd_value_to_string(pd_result_val));
+
+                        if (test_unit.unit_value != NULL && strcmp(test_unit.unit_value, "") != 0) {
+                                xasprintf(&sc_oid_test.output, "%s%s", sc_oid_test.output, test_unit.unit_value);
+                        }
+
+                        if (test_unit.threshold.warning_is_set || test_unit.threshold.critical_is_set) {
+                                pd_num_val = mp_pd_set_thresholds(pd_num_val, test_unit.threshold);
+                                mp_state_enum tmp_state = mp_get_pd_status(pd_num_val);
+
+                                if (tmp_state == STATE_WARNING) {
+                                        sc_oid_test = mp_set_subcheck_state(sc_oid_test, STATE_WARNING);
+                                        xasprintf(&sc_oid_test.output, "%s - number violates warning threshold",
+                                                          sc_oid_test.output);
+                                } else if (tmp_state == STATE_CRITICAL) {
+                                        sc_oid_test = mp_set_subcheck_state(sc_oid_test, STATE_CRITICAL);
+                                        xasprintf(&sc_oid_test.output, "%s - number violates critical threshold",
+                                                          sc_oid_test.output);
+                                }
+                        }
+
+                        mp_add_perfdata_to_subcheck(&sc_oid_test, pd_num_val);
+                } else {
+                        // should calculate rate, but there is no previous state, so first run
+                        // exit with ok now
+                        sc_oid_test = mp_set_subcheck_state(sc_oid_test, STATE_OK);
+                        xasprintf(&sc_oid_test.output, "%s - No previous data to calculate rate - assume okay",
+                                          sc_oid_test.output);
+                }
+        }
+
+        check_snmp_evaluation result = {
+                .sc = sc_oid_test,
+                .state = result_state,
+        };
+
+        return result;
+}
+
+char *_np_state_generate_key(int argc, char **argv);
+
+/*
+ * If time=NULL, use current time. Create state file, with state format
+ * version, default text. Writes version, time, and data. Avoid locking
+ * problems - use mv to write and then swap. Possible loss of state data if
+ * two things writing to same key at same time.
+ * Will die with UNKNOWN if errors
+ */
+void np_state_write_string(state_key stateKey, time_t timestamp, char *stringToStore) {
+        time_t current_time;
+        if (timestamp == 0) {
+                time(&current_time);
+        } else {
+                current_time = timestamp;
+        }
+
+        int result = 0;
+
+        /* If file doesn't currently exist, create directories */
+        if (access(stateKey._filename, F_OK) != 0) {
+                char *directories = NULL;
+                result = asprintf(&directories, "%s", stateKey._filename);
+                if (result < 0) {
+                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+                }
+
+                for (char *p = directories + 1; *p; p++) {
+                        if (*p == '/') {
+                                *p = '\0';
+                                if ((access(directories, F_OK) != 0) && (mkdir(directories, S_IRWXU) != 0)) {
+                                        /* Can't free this! Otherwise error message is wrong! */
+                                        /* np_free(directories); */
+                                        die(STATE_UNKNOWN, _("Cannot create directory: %s"), directories);
+                                }
+                                *p = '/';
+                        }
+                }
+
+                if (directories) {
+                        free(directories);
+                }
+        }
+
+        char *temp_file = NULL;
+        result = asprintf(&temp_file, "%s.XXXXXX", stateKey._filename);
+        if (result < 0) {
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+        }
+
+        int temp_file_desc = 0;
+        if ((temp_file_desc = mkstemp(temp_file)) == -1) {
+                if (temp_file) {
+                        free(temp_file);
+                }
+                die(STATE_UNKNOWN, _("Cannot create temporary filename"));
+        }
+
+        FILE *temp_file_pointer = fdopen(temp_file_desc, "w");
+        if (temp_file_pointer == NULL) {
+                close(temp_file_desc);
+                unlink(temp_file);
+                if (temp_file) {
+                        free(temp_file);
+                }
+                die(STATE_UNKNOWN, _("Unable to open temporary state file"));
+        }
+
+        fprintf(temp_file_pointer, "# NP State file\n");
+        fprintf(temp_file_pointer, "%d\n", NP_STATE_FORMAT_VERSION);
+        fprintf(temp_file_pointer, "%d\n", stateKey.data_version);
+        fprintf(temp_file_pointer, "%lu\n", current_time);
+        fprintf(temp_file_pointer, "%s\n", stringToStore);
+
+        fchmod(temp_file_desc, S_IRUSR | S_IWUSR | S_IRGRP);
+
+        fflush(temp_file_pointer);
+
+        result = fclose(temp_file_pointer);
+
+        fsync(temp_file_desc);
+
+        if (result != 0) {
+                unlink(temp_file);
+                if (temp_file) {
+                        free(temp_file);
+                }
+                die(STATE_UNKNOWN, _("Error writing temp file"));
+        }
+
+        if (rename(temp_file, stateKey._filename) != 0) {
+                unlink(temp_file);
+                if (temp_file) {
+                        free(temp_file);
+                }
+                die(STATE_UNKNOWN, _("Cannot rename state temp file"));
+        }
+
+        if (temp_file) {
+                free(temp_file);
+        }
+}
+
+/*
+ * Read the state file
+ */
+bool _np_state_read_file(FILE *state_file, state_key stateKey) {
+        time_t current_time;
+        time(&current_time);
+
+        /* Note: This introduces a limit of 8192 bytes in the string data */
+        char *line = (char *)calloc(1, 8192);
+        if (line == NULL) {
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+        }
+
+        bool status = false;
+        enum {
+                STATE_FILE_VERSION,
+                STATE_DATA_VERSION,
+                STATE_DATA_TIME,
+                STATE_DATA_TEXT,
+                STATE_DATA_END
+        } expected = STATE_FILE_VERSION;
+
+        int failure = 0;
+        while (!failure && (fgets(line, 8192, state_file)) != NULL) {
+                size_t pos = strlen(line);
+                if (line[pos - 1] == '\n') {
+                        line[pos - 1] = '\0';
+                }
+
+                if (line[0] == '#') {
+                        continue;
+                }
+
+                switch (expected) {
+                case STATE_FILE_VERSION: {
+                        int i = atoi(line);
+                        if (i != NP_STATE_FORMAT_VERSION) {
+                                failure++;
+                        } else {
+                                expected = STATE_DATA_VERSION;
+                        }
+                } break;
+                case STATE_DATA_VERSION: {
+                        int i = atoi(line);
+                        if (i != stateKey.data_version) {
+                                failure++;
+                        } else {
+                                expected = STATE_DATA_TIME;
+                        }
+                } break;
+                case STATE_DATA_TIME: {
+                        /* If time > now, error */
+                        time_t data_time = strtoul(line, NULL, 10);
+                        if (data_time > current_time) {
+                                failure++;
+                        } else {
+                                stateKey.state_data->time = data_time;
+                                expected = STATE_DATA_TEXT;
+                        }
+                } break;
+                case STATE_DATA_TEXT:
+                        stateKey.state_data->data = strdup(line);
+                        if (stateKey.state_data->data == NULL) {
+                                die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
+                        }
+                        stateKey.state_data->length = strlen(line);
+                        expected = STATE_DATA_END;
+                        status = true;
+                        break;
+                case STATE_DATA_END:;
+                }
+        }
+
+        if (line) {
+                free(line);
+        }
+        return status;
+}
+/*
+ * Will return NULL if no data is available (first run). If key currently
+ * exists, read data. If state file format version is not expected, return
+ * as if no data. Get state data version number and compares to expected.
+ * If numerically lower, then return as no previous state. die with UNKNOWN
+ * if exceptional error.
+ */
+state_data *np_state_read(state_key stateKey) {
+        /* Open file. If this fails, no previous state found */
+        FILE *statefile = fopen(stateKey._filename, "r");
+        state_data *this_state_data = (state_data *)calloc(1, sizeof(state_data));
+        if (statefile != NULL) {
+
+                if (this_state_data == NULL) {
+                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+                }
+
+                this_state_data->data = NULL;
+                stateKey.state_data = this_state_data;
+
+                if (_np_state_read_file(statefile, stateKey)) {
+                        this_state_data->errorcode = OK;
+                } else {
+                        this_state_data->errorcode = ERROR;
+                }
+
+                fclose(statefile);
+        } else {
+                // Failed to open state file
+                this_state_data->errorcode = ERROR;
+        }
+
+        return stateKey.state_data;
+}
+
+/*
+ * Internal function. Returns either:
+ *   envvar NAGIOS_PLUGIN_STATE_DIRECTORY
+ *   statically compiled shared state directory
+ */
+char *_np_state_calculate_location_prefix(void) {
+        char *env_dir;
+
+        /* Do not allow passing MP_STATE_PATH in setuid plugins
+         * for security reasons */
+        if (!mp_suid()) {
+                env_dir = getenv("MP_STATE_PATH");
+                if (env_dir && env_dir[0] != '\0') {
+                        return env_dir;
+                }
+                /* This is the former ENV, for backward-compatibility */
+                env_dir = getenv("NAGIOS_PLUGIN_STATE_DIRECTORY");
+                if (env_dir && env_dir[0] != '\0') {
+                        return env_dir;
+                }
+        }
+
+        return NP_STATE_DIR_PREFIX;
+}
+
+/*
+ * Initiatializer for state routines.
+ * Sets variables. Generates filename. Returns np_state_key. die with
+ * UNKNOWN if exception
+ */
+state_key np_enable_state(char *keyname, int expected_data_version, char *plugin_name, int argc,
+                                                  char **argv) {
+        state_key *this_state = (state_key *)calloc(1, sizeof(state_key));
+        if (this_state == NULL) {
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+        }
+
+        char *temp_keyname = NULL;
+        if (keyname == NULL) {
+                temp_keyname = _np_state_generate_key(argc, argv);
+        } else {
+                temp_keyname = strdup(keyname);
+                if (temp_keyname == NULL) {
+                        die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
+                }
+        }
+
+        /* Die if invalid characters used for keyname */
+        char *tmp_char = temp_keyname;
+        while (*tmp_char != '\0') {
+                if (!(isalnum(*tmp_char) || *tmp_char == '_')) {
+                        die(STATE_UNKNOWN, _("Invalid character for keyname - only alphanumerics or '_'"));
+                }
+                tmp_char++;
+        }
+        this_state->name = temp_keyname;
+        this_state->plugin_name = plugin_name;
+        this_state->data_version = expected_data_version;
+        this_state->state_data = NULL;
+
+        /* Calculate filename */
+        char *temp_filename = NULL;
+        int error = asprintf(&temp_filename, "%s/%lu/%s/%s", _np_state_calculate_location_prefix(),
+                                                 (unsigned long)geteuid(), plugin_name, this_state->name);
+        if (error < 0) {
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+        }
+
+        this_state->_filename = temp_filename;
+
+        return *this_state;
+}
+
+/*
+ * Returns a string to use as a keyname, based on an md5 hash of argv, thus
+ * hopefully a unique key per service/plugin invocation. Use the extra-opts
+ * parse of argv, so that uniqueness in parameters are reflected there.
+ */
+char *_np_state_generate_key(int argc, char **argv) {
+        unsigned char result[256];
+
+#ifdef USE_OPENSSL
+        /*
+         * This code path is chosen if openssl is available (which should be the most common
+         * scenario). Alternatively, the gnulib implementation/
+         *
+         */
+        EVP_MD_CTX *ctx = EVP_MD_CTX_new();
+
+        EVP_DigestInit(ctx, EVP_sha256());
+
+        for (int i = 0; i < argc; i++) {
+                EVP_DigestUpdate(ctx, argv[i], strlen(argv[i]));
+        }
+
+        EVP_DigestFinal(ctx, result, NULL);
+#else
+
+        struct sha256_ctx ctx;
+
+        for (int i = 0; i < this_monitoring_plugin->argc; i++) {
+                sha256_process_bytes(argv[i], strlen(argv[i]), &ctx);
+        }
+
+        sha256_finish_ctx(&ctx, result);
+#endif // FOUNDOPENSSL
+
+        char keyname[41];
+        for (int i = 0; i < 20; ++i) {
+                sprintf(&keyname[2 * i], "%02x", result[i]);
+        }
+
+        keyname[40] = '\0';
+
+        char *keyname_copy = strdup(keyname);
+        if (keyname_copy == NULL) {
+                die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
+        }
+
+        return keyname_copy;
+}
diff --git a/plugins/check_snmp.d/check_snmp_helpers.h b/plugins/check_snmp.d/check_snmp_helpers.h
new file mode 100644
index 00000000..0f7780b1
--- /dev/null
+++ b/plugins/check_snmp.d/check_snmp_helpers.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include "./config.h"
+#include <net-snmp/library/asn1.h>
+
+check_snmp_test_unit check_snmp_test_unit_init();
+int check_snmp_set_thresholds(const char *, check_snmp_test_unit[], size_t, bool);
+check_snmp_config check_snmp_config_init();
+
+typedef struct {
+        oid oid[MAX_OID_LEN];
+        size_t oid_length;
+        unsigned char type;
+        union {
+                uint64_t uIntVal;
+                int64_t intVal;
+                double doubleVal;
+        } value;
+        char *string_response;
+} response_value;
+
+typedef struct {
+        int errorcode;
+        response_value *response_values;
+} snmp_responces;
+snmp_responces do_snmp_query(check_snmp_config_snmp_parameters parameters);
+
+// state is similar to response, but only numerics and a timestamp
+typedef struct {
+        time_t timestamp;
+        oid oid[MAX_OID_LEN];
+        size_t oid_length;
+        unsigned char type;
+        union {
+                unsigned long long uIntVal;
+                long long intVal;
+                double doubleVal;
+        } value;
+} check_snmp_state_entry;
+
+typedef struct {
+        check_snmp_state_entry state;
+        mp_subcheck sc;
+} check_snmp_evaluation;
+check_snmp_evaluation evaluate_single_unit(response_value response,
+                                                                                   check_snmp_evaluation_parameters eval_params,
+                                                                                   check_snmp_test_unit test_unit, time_t query_timestamp,
+                                                                                   check_snmp_state_entry prev_state,
+                                                                                   bool have_previous_state);
+
+#define NP_STATE_FORMAT_VERSION 1
+
+typedef struct state_data_struct {
+        time_t time;
+        void *data;
+        size_t length; /* Of binary data */
+        int errorcode;
+} state_data;
+
+typedef struct state_key_struct {
+        char *name;
+        char *plugin_name;
+        int data_version;
+        char *_filename;
+        state_data *state_data;
+} state_key;
+
+state_data *np_state_read(state_key stateKey);
+state_key np_enable_state(char *keyname, int expected_data_version, char *plugin_name, int argc,
+                                                  char **argv);
+void np_state_write_string(state_key stateKey, time_t timestamp, char *stringToStore);
diff --git a/plugins/check_snmp.d/config.h b/plugins/check_snmp.d/config.h
new file mode 100644
index 00000000..e7b6d1b3
--- /dev/null
+++ b/plugins/check_snmp.d/config.h
@@ -0,0 +1,81 @@
+#pragma once
+
+#include "../../lib/thresholds.h"
+#include "../../lib/states.h"
+#include <stdlib.h>
+#include <stdbool.h>
+#include <regex.h>
+#include "../common.h"
+
+// defines for snmp libs
+#define u_char  unsigned char
+#define u_long  unsigned long
+#define u_short unsigned short
+#define u_int   unsigned int
+
+#include <net-snmp/net-snmp-config.h>
+#include <net-snmp/net-snmp-includes.h>
+#include <net-snmp/library/snmp.h>
+#include <net-snmp/session_api.h>
+
+#define DEFAULT_PORT    "161"
+#define DEFAULT_RETRIES 5
+
+typedef struct eval_method {
+        bool crit_string;
+        bool crit_regex;
+} eval_method;
+
+typedef struct check_snmp_test_unit {
+        char *oid;
+        char *label;
+        char *unit_value;
+        eval_method eval_mthd;
+        mp_thresholds threshold;
+} check_snmp_test_unit;
+
+typedef struct {
+        struct snmp_session snmp_session;
+        // use getnet instead of get
+        bool use_getnext;
+
+        // TODO actually make these useful
+        bool ignore_mib_parsing_errors;
+        bool need_mibs;
+
+        check_snmp_test_unit *test_units;
+        size_t num_of_test_units;
+} check_snmp_config_snmp_parameters;
+
+typedef struct {
+        // State if an empty value is encountered
+        mp_state_enum nulloid_result;
+
+        // String evaluation stuff
+        bool invert_search;
+        regex_t regex_cmp_value; // regex to match query results against
+        char string_cmp_value[MAX_INPUT_BUFFER];
+
+        // Modify data
+        double multiplier;
+        bool multiplier_set;
+        double offset;
+        bool offset_set;
+
+        // Modify output
+        bool use_oid_as_perf_data_label;
+
+        // activate rate calculation
+        bool calculate_rate;
+        unsigned int rate_multiplier;
+} check_snmp_evaluation_parameters;
+
+typedef struct check_snmp_config {
+        // SNMP session to use
+        check_snmp_config_snmp_parameters snmp_params;
+
+        check_snmp_evaluation_parameters evaluation_params;
+
+        mp_output_format output_format;
+        bool output_format_is_set;
+} check_snmp_config;
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 9d0d7cde..f6c8d551 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -57,7 +57,8 @@ static process_arguments_wrapper process_arguments(int /*argc*/, char ** /*argv*
 static void print_help(void);
 void print_usage(void);
 
-static int ssh_connect(mp_check *overall, char *haddr, int hport, char *remote_version, char *remote_protocol);
+static int ssh_connect(mp_check *overall, char *haddr, int hport, char *remote_version,
+                                           char *remote_protocol);
 
 int main(int argc, char **argv) {
         setlocale(LC_ALL, "");
@@ -85,7 +86,8 @@ int main(int argc, char **argv) {
         alarm(socket_timeout);
 
         /* ssh_connect exits if error is found */
-        ssh_connect(&overall, config.server_name, config.port, config.remote_version, config.remote_protocol);
+        ssh_connect(&overall, config.server_name, config.port, config.remote_version,
+                                config.remote_protocol);
 
         alarm(0);
 
@@ -96,19 +98,20 @@ int main(int argc, char **argv) {
 
 /* process command-line arguments */
 process_arguments_wrapper process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {{"help", no_argument, 0, 'h'},
-                                                                           {"version", no_argument, 0, 'V'},
-                                                                           {"host", required_argument, 0, 'H'}, /* backward compatibility */
-                                                                           {"hostname", required_argument, 0, 'H'},
-                                                                           {"port", required_argument, 0, 'p'},
-                                                                           {"use-ipv4", no_argument, 0, '4'},
-                                                                           {"use-ipv6", no_argument, 0, '6'},
-                                                                           {"timeout", required_argument, 0, 't'},
-                                                                           {"verbose", no_argument, 0, 'v'},
-                                                                           {"remote-version", required_argument, 0, 'r'},
-                                                                           {"remote-protocol", required_argument, 0, 'P'},
-                                                                           {"output-format", required_argument, 0, output_format_index},
-                                                                           {0, 0, 0, 0}};
+        static struct option longopts[] = {
+                {"help", no_argument, 0, 'h'},
+                {"version", no_argument, 0, 'V'},
+                {"host", required_argument, 0, 'H'}, /* backward compatibility */
+                {"hostname", required_argument, 0, 'H'},
+                {"port", required_argument, 0, 'p'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"timeout", required_argument, 0, 't'},
+                {"verbose", no_argument, 0, 'v'},
+                {"remote-version", required_argument, 0, 'r'},
+                {"remote-protocol", required_argument, 0, 'P'},
+                {"output-format", required_argument, 0, output_format_index},
+                {0, 0, 0, 0}};
 
         process_arguments_wrapper result = {
                 .config = check_ssh_config_init(),
@@ -228,7 +231,8 @@ process_arguments_wrapper process_arguments(int argc, char **argv) {
  *
  *-----------------------------------------------------------------------*/
 
-int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_version, char *desired_remote_protocol) {
+int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_version,
+                                char *desired_remote_protocol) {
         struct timeval tv;
         gettimeofday(&tv, NULL);
 
@@ -238,32 +242,34 @@ int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_
         mp_subcheck connection_sc = mp_subcheck_init();
         if (result != STATE_OK) {
                 connection_sc = mp_set_subcheck_state(connection_sc, STATE_CRITICAL);
-                xasprintf(&connection_sc.output, "Failed to establish TCP connection to Host %s and Port %d", haddr, hport);
+                xasprintf(&connection_sc.output,
+                                  "Failed to establish TCP connection to Host %s and Port %d", haddr, hport);
                 mp_add_subcheck_to_check(overall, connection_sc);
                 return result;
         }
 
         char *output = (char *)calloc(BUFF_SZ + 1, sizeof(char));
         char *buffer = NULL;
-        size_t recv_ret = 0;
+        ssize_t recv_ret = 0;
         char *version_control_string = NULL;
         size_t byte_offset = 0;
         while ((version_control_string == NULL) &&
-                   (recv_ret = recv(socket, output + byte_offset, (unsigned long)(BUFF_SZ - byte_offset), 0) > 0)) {
+                   (recv_ret = recv(socket, output + byte_offset, (unsigned long)(BUFF_SZ - byte_offset),
+                                                        0) > 0)) {
 
                 if (strchr(output, '\n')) { /* we've got at least one full line, start parsing*/
                         byte_offset = 0;
 
                         char *index = NULL;
-                        unsigned long len = 0;
                         while ((index = strchr(output + byte_offset, '\n')) != NULL) {
                                 /*Partition the buffer so that this line is a separate string,
                                  * by replacing the newline with NUL*/
                                 output[(index - output)] = '\0';
-                                len = strlen(output + byte_offset);
+                                size_t len = strlen(output + byte_offset);
 
                                 if ((len >= 4) && (strncmp(output + byte_offset, "SSH-", 4) == 0)) {
-                                        /*if the string starts with SSH-, this _should_ be a valid version control string*/
+                                        /*if the string starts with SSH-, this _should_ be a valid version control
+                                         * string*/
                                         version_control_string = output + byte_offset;
                                         break;
                                 }
@@ -273,21 +279,23 @@ int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_
                         }
 
                         if (version_control_string == NULL) {
-                                /* move unconsumed data to beginning of buffer, null rest */
-                                memmove((void *)output, (void *)(output + byte_offset + 1), BUFF_SZ - len + 1);
-                                memset(output + byte_offset + 1, 0, BUFF_SZ - byte_offset + 1);
+                                /* move unconsumed data to beginning of buffer */
+                                memmove((void *)output, (void *)(output + byte_offset), BUFF_SZ - byte_offset);
 
                                 /*start reading from end of current line chunk on next recv*/
                                 byte_offset = strlen(output);
+
+                                /* NUL the rest of the buffer */
+                                memset(output + byte_offset, 0, BUFF_SZ - byte_offset);
                         }
                 } else {
-                        byte_offset += recv_ret;
+                        byte_offset += (size_t)recv_ret;
                 }
         }
 
         if (recv_ret < 0) {
                 connection_sc = mp_set_subcheck_state(connection_sc, STATE_CRITICAL);
-                xasprintf(&connection_sc.output, "%s", "SSH CRITICAL - %s", strerror(errno));
+                xasprintf(&connection_sc.output, "%s - %s", "SSH CRITICAL - ", strerror(errno));
                 mp_add_subcheck_to_check(overall, connection_sc);
                 return OK;
         }
@@ -333,7 +341,8 @@ int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_
          * "1.x" (e.g., "1.5" or "1.3")."
          *              - RFC 4253:5
          */
-        char *ssh_server = ssh_proto + strspn(ssh_proto, "0123456789.") + 1; /* (+1 for the '-' separating protoversion from softwareversion) */
+        char *ssh_server = ssh_proto + strspn(ssh_proto, "0123456789.") +
+                                           1; /* (+1 for the '-' separating protoversion from softwareversion) */
 
         /* If there's a space in the version string, whatever's after the space is a comment
          * (which is NOT part of the server name/version)*/
@@ -345,13 +354,15 @@ int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_
         mp_subcheck protocol_validity_sc = mp_subcheck_init();
         if (strlen(ssh_proto) == 0 || strlen(ssh_server) == 0) {
                 protocol_validity_sc = mp_set_subcheck_state(protocol_validity_sc, STATE_CRITICAL);
-                xasprintf(&protocol_validity_sc.output, "Invalid protocol version control string %s", version_control_string);
+                xasprintf(&protocol_validity_sc.output, "Invalid protocol version control string %s",
+                                  version_control_string);
                 mp_add_subcheck_to_check(overall, protocol_validity_sc);
                 return OK;
         }
 
         protocol_validity_sc = mp_set_subcheck_state(protocol_validity_sc, STATE_OK);
-        xasprintf(&protocol_validity_sc.output, "Valid protocol version control string %s", version_control_string);
+        xasprintf(&protocol_validity_sc.output, "Valid protocol version control string %s",
+                          version_control_string);
         mp_add_subcheck_to_check(overall, protocol_validity_sc);
 
         ssh_proto[strspn(ssh_proto, "0123456789. ")] = 0;
@@ -366,8 +377,8 @@ int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_
         if (desired_remote_version && strcmp(desired_remote_version, ssh_server)) {
                 mp_subcheck remote_version_sc = mp_subcheck_init();
                 remote_version_sc = mp_set_subcheck_state(remote_version_sc, STATE_CRITICAL);
-                xasprintf(&remote_version_sc.output, _("%s (protocol %s) version mismatch, expected '%s'"), ssh_server, ssh_proto,
-                                  desired_remote_version);
+                xasprintf(&remote_version_sc.output, _("%s (protocol %s) version mismatch, expected '%s'"),
+                                  ssh_server, ssh_proto, desired_remote_version);
                 close(socket);
                 mp_add_subcheck_to_check(overall, remote_version_sc);
                 return OK;
@@ -385,11 +396,13 @@ int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_
 
         if (desired_remote_protocol && strcmp(desired_remote_protocol, ssh_proto)) {
                 protocol_version_sc = mp_set_subcheck_state(protocol_version_sc, STATE_CRITICAL);
-                xasprintf(&protocol_version_sc.output, _("%s (protocol %s) protocol version mismatch, expected '%s'"), ssh_server, ssh_proto,
-                                  desired_remote_protocol);
+                xasprintf(&protocol_version_sc.output,
+                                  _("%s (protocol %s) protocol version mismatch, expected '%s'"), ssh_server,
+                                  ssh_proto, desired_remote_protocol);
         } else {
                 protocol_version_sc = mp_set_subcheck_state(protocol_version_sc, STATE_OK);
-                xasprintf(&protocol_version_sc.output, "SSH server version: %s (protocol version: %s)", ssh_server, ssh_proto);
+                xasprintf(&protocol_version_sc.output, "SSH server version: %s (protocol version: %s)",
+                                  ssh_server, ssh_proto);
         }
 
         mp_add_subcheck_to_check(overall, protocol_version_sc);
@@ -422,7 +435,8 @@ void print_help(void) {
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
         printf(" %s\n", "-r, --remote-version=STRING");
-        printf("    %s\n", _("Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
+        printf("    %s\n",
+                   _("Alert if string doesn't match expected server version (ex: OpenSSH_3.9p1)"));
 
         printf(" %s\n", "-P, --remote-protocol=STRING");
         printf("    %s\n", _("Alert if protocol doesn't match expected protocol version (ex: 2.0)"));
@@ -435,5 +449,6 @@ void print_help(void) {
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf("%s  [-4|-6] [-t <timeout>] [-r <remote version>] [-p <port>] --hostname <host>\n", progname);
+        printf("%s  [-4|-6] [-t <timeout>] [-r <remote version>] [-p <port>] --hostname <host>\n",
+                   progname);
 }
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index cb95949a..dbf53a00 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -90,6 +90,14 @@ int main(int argc, char **argv) {
                 exit(STATE_UNKNOWN);
         }
 
+        if (verbose) {
+                printf("Swap retrieval result:\n"
+                           "\tFree: %llu\n"
+                           "\tUsed: %llu\n"
+                           "\tTotal: %llu\n",
+                           data.metrics.free, data.metrics.used, data.metrics.total);
+        }
+
         double percent_used;
         mp_check overall = mp_check_init();
         if (config.output_format_is_set) {
@@ -164,7 +172,8 @@ int main(int argc, char **argv) {
         }
 
         if (config.warn_is_set) {
-                if ((config.warn.is_percentage && (percent_used >= (100 - (double)config.warn.value))) || config.warn.value >= data.metrics.free) {
+                if ((config.warn.is_percentage && (percent_used >= (100 - (double)config.warn.value))) ||
+                        config.warn.value >= data.metrics.free) {
                         sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
                 }
         }
@@ -174,13 +183,14 @@ int main(int argc, char **argv) {
         }
 
         if (config.crit_is_set) {
-                if ((config.crit.is_percentage && (percent_used >= (100 - (double)config.crit.value))) || config.crit.value >= data.metrics.free) {
+                if ((config.crit.is_percentage && (percent_used >= (100 - (double)config.crit.value))) ||
+                        config.crit.value >= data.metrics.free) {
                         sc1 = mp_set_subcheck_state(sc1, STATE_CRITICAL);
                 }
         }
 
-        xasprintf(&sc1.output, _("%g%% free (%lluMiB out of %lluMiB)"), (100 - percent_used), data.metrics.free >> 20,
-                          data.metrics.total >> 20);
+        xasprintf(&sc1.output, _("%g%% free (%lluMiB out of %lluMiB)"), (100 - percent_used),
+                          data.metrics.free >> 20, data.metrics.total >> 20);
 
         overall.summary = "Swap";
         mp_add_subcheck_to_check(&overall, sc1);
@@ -193,7 +203,9 @@ int check_swap(float free_swap_mb, float total_swap_mb, swap_config config) {
                 return config.no_swap_state;
         }
 
-        uint64_t free_swap = (uint64_t)(free_swap_mb * (1024 * 1024)); /* Convert back to bytes as warn and crit specified in bytes */
+        uint64_t free_swap =
+                (uint64_t)(free_swap_mb *
+                                   (1024 * 1024)); /* Convert back to bytes as warn and crit specified in bytes */
 
         if (!config.crit.is_percentage && config.crit.value >= free_swap) {
                 return STATE_CRITICAL;
@@ -202,13 +214,16 @@ int check_swap(float free_swap_mb, float total_swap_mb, swap_config config) {
                 return STATE_WARNING;
         }
 
-        uint64_t usage_percentage = (uint64_t)((total_swap_mb - free_swap_mb) / total_swap_mb) * HUNDRED_PERCENT;
+        uint64_t usage_percentage =
+                (uint64_t)((total_swap_mb - free_swap_mb) / total_swap_mb) * HUNDRED_PERCENT;
 
-        if (config.crit.is_percentage && config.crit.value != 0 && usage_percentage >= (HUNDRED_PERCENT - config.crit.value)) {
+        if (config.crit.is_percentage && config.crit.value != 0 &&
+                usage_percentage >= (HUNDRED_PERCENT - config.crit.value)) {
                 return STATE_CRITICAL;
         }
 
-        if (config.warn.is_percentage && config.warn.value != 0 && usage_percentage >= (HUNDRED_PERCENT - config.warn.value)) {
+        if (config.warn.is_percentage && config.warn.value != 0 &&
+                usage_percentage >= (HUNDRED_PERCENT - config.warn.value)) {
                 return STATE_WARNING;
         }
 
diff --git a/plugins/check_swap.d/check_swap.h b/plugins/check_swap.d/check_swap.h
index 1000fc9e..8d3c7fcf 100644
--- a/plugins/check_swap.d/check_swap.h
+++ b/plugins/check_swap.d/check_swap.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include "../common.h"
-#include "output.h"
+#include "../../lib/output.h"
+#include "../../lib/states.h"
 
 #ifndef SWAP_CONVERSION
 #       define SWAP_CONVERSION 1
@@ -26,7 +27,7 @@ typedef struct {
 
 typedef struct {
         bool allswaps;
-        int no_swap_state;
+        mp_state_enum no_swap_state;
         bool warn_is_set;
         check_swap_threshold warn;
         bool crit_is_set;
@@ -42,6 +43,7 @@ swap_config swap_config_init(void);
 
 swap_result get_swap_data(swap_config config);
 swap_result getSwapFromProcMeminfo(char path_to_proc_meminfo[]);
-swap_result getSwapFromSwapCommand(swap_config config, const char swap_command[], const char swap_format[]);
+swap_result getSwapFromSwapCommand(swap_config config, const char swap_command[],
+                                                                   const char swap_format[]);
 swap_result getSwapFromSwapctl_BSD(swap_config config);
 swap_result getSwapFromSwap_SRV4(swap_config config);
diff --git a/plugins/check_swap.d/swap.c b/plugins/check_swap.d/swap.c
index 180d5037..58213a3c 100644
--- a/plugins/check_swap.d/swap.c
+++ b/plugins/check_swap.d/swap.c
@@ -52,10 +52,10 @@ swap_result get_swap_data(swap_config config) {
         }
 #       else // HAVE_SWAP
 #               ifdef CHECK_SWAP_SWAPCTL_SVR4
-        return getSwapFromSwapctl_SRV4();
+        return getSwapFromSwapctl_SRV4(config);
 #               else // CHECK_SWAP_SWAPCTL_SVR4
 #                       ifdef CHECK_SWAP_SWAPCTL_BSD
-        return getSwapFromSwapctl_BSD();
+        return getSwapFromSwapctl_BSD(config);
 #                       else // CHECK_SWAP_SWAPCTL_BSD
 #                               error No way found to retrieve swap
 #                       endif /* CHECK_SWAP_SWAPCTL_BSD */
@@ -68,7 +68,7 @@ swap_result getSwapFromProcMeminfo(char proc_meminfo[]) {
         FILE *meminfo_file_ptr;
         meminfo_file_ptr = fopen(proc_meminfo, "r");
 
-        swap_result result = {0};
+        swap_result result = {};
         result.errorcode = STATE_UNKNOWN;
 
         if (meminfo_file_ptr == NULL) {
@@ -78,90 +78,81 @@ swap_result getSwapFromProcMeminfo(char proc_meminfo[]) {
                 return result;
         }
 
-        uint64_t swap_total = 0;
-        uint64_t swap_used = 0;
-        uint64_t swap_free = 0;
+        unsigned long swap_total = 0;
+        unsigned long swap_used = 0;
+        unsigned long swap_free = 0;
 
         bool found_total = false;
-        bool found_used = false;
         bool found_free = false;
 
         char input_buffer[MAX_INPUT_BUFFER];
         char str[32];
 
         while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, meminfo_file_ptr)) {
-                uint64_t tmp_KB = 0;
 
                 /*
                  * The following sscanf call looks for a line looking like: "Swap: 123
-                 * 123 123" On which kind of system this format exists, I can not say,
-                 * but I wanted to document this for people who are not adapt with
-                 * sscanf anymore, like me
-                 * Also the units used here are unclear and probably wrong
+                 * 123 123" which exists on NetBSD (at least),
+                 * The unit should be Bytes
                  */
-                if (sscanf(input_buffer, "%*[S]%*[w]%*[a]%*[p]%*[:] %lu %lu %lu", &swap_total, &swap_used, &swap_free) == 3) {
-
-                        result.metrics.total += swap_total;
-                        result.metrics.used += swap_used;
-                        result.metrics.free += swap_free;
-
+                if (sscanf(input_buffer, "%*[S]%*[w]%*[a]%*[p]%*[:] %lu %lu %lu", &swap_total, &swap_used,
+                                   &swap_free) == 3) {
                         found_total = true;
                         found_free = true;
-                        found_used = true;
-
                         // Set error
                         result.errorcode = STATE_OK;
+                        // Break out of fgets here, since both scanf expressions might match (NetBSD for
+                        // example)
+                        break;
+                }
+
+                /*
+                 * The following sscanf call looks for lines looking like:
+                 * "SwapTotal: 123" and "SwapFree: 123" This format exists at least
+                 * on Debian Linux with a 5.* kernel
+                 */
+                unsigned long tmp_KB = 0;
+                int sscanf_result = sscanf(input_buffer,
+                                                                   "%*[S]%*[w]%*[a]%*[p]%[TotalFreCchd]%*[:] %lu "
+                                                                   "%*[k]%*[B]",
+                                                                   str, &tmp_KB);
+
+                if (sscanf_result == 2) {
+
+                        if (verbose >= 3) {
+                                printf("Got %s with %lu\n", str, tmp_KB);
+                        }
 
-                        /*
-                         * The following sscanf call looks for lines looking like:
-                         * "SwapTotal: 123" and "SwapFree: 123" This format exists at least
-                         * on Debian Linux with a 5.* kernel
-                         */
-                } else {
-                        int sscanf_result = sscanf(input_buffer,
-                                                                           "%*[S]%*[w]%*[a]%*[p]%[TotalFreCchd]%*[:] %lu "
-                                                                           "%*[k]%*[B]",
-                                                                           str, &tmp_KB);
-
-                        if (sscanf_result == 2) {
-
-                                if (verbose >= 3) {
-                                        printf("Got %s with %lu\n", str, tmp_KB);
-                                }
-
-                                /* I think this part is always in Kb, so convert to bytes */
-                                if (strcmp("Total", str) == 0) {
-                                        swap_total = tmp_KB * 1000;
-                                        found_total = true;
-                                } else if (strcmp("Free", str) == 0) {
-                                        swap_free = swap_free + tmp_KB * 1000;
-                                        found_free = true;
-                                        found_used = true; // No explicit used metric available
-                                } else if (strcmp("Cached", str) == 0) {
-                                        swap_free = swap_free + tmp_KB * 1000;
-                                        found_free = true;
-                                        found_used = true; // No explicit used metric available
-                                }
-
-                                result.errorcode = STATE_OK;
+                        /* I think this part is always in Kb, so convert to bytes */
+                        if (strcmp("Total", str) == 0) {
+                                swap_total = tmp_KB * 1000;
+                                found_total = true;
+                        } else if (strcmp("Free", str) == 0) {
+                                swap_free += tmp_KB * 1000;
+                                found_free = true;
+                        } else if (strcmp("Cached", str) == 0) {
+                                swap_free += tmp_KB * 1000;
                         }
+
+                        result.errorcode = STATE_OK;
                 }
         }
 
         fclose(meminfo_file_ptr);
 
         result.metrics.total = swap_total;
-        result.metrics.used = swap_total - swap_free;
         result.metrics.free = swap_free;
+        result.metrics.used = swap_total - swap_free;
 
-        if (!found_free || !found_total || !found_used) {
+        if (!found_free || !found_total) {
                 result.errorcode = STATE_UNKNOWN;
         }
 
         return result;
 }
 
-swap_result getSwapFromSwapCommand(swap_config config, const char swap_command[], const char swap_format[]) {
+swap_result getSwapFromSwapCommand(swap_config config, const char swap_command[],
+                                                                   const char swap_format[]) {
         swap_result result = {0};
 
         char *temp_buffer;
@@ -224,7 +215,8 @@ swap_result getSwapFromSwapCommand(swap_config config, const char swap_command[]
                 used_swap_mb = total_swap_mb - free_swap_mb;
 
                 if (verbose >= 3) {
-                        printf(_("total=%.0f, used=%.0f, free=%.0f\n"), total_swap_mb, used_swap_mb, free_swap_mb);
+                        printf(_("total=%.0f, used=%.0f, free=%.0f\n"), total_swap_mb, used_swap_mb,
+                                   free_swap_mb);
                 }
         } else {
                 while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
@@ -297,8 +289,14 @@ struct swapent {
 };
 
 #else
+
+// Includes for NetBSD
+#       include <unistd.h>
+#       include <sys/swap.h>
+
 #       define bsd_swapctl swapctl
-#endif
+
+#endif // CHECK_SWAP_SWAPCTL_BSD
 
 swap_result getSwapFromSwapctl_BSD(swap_config config) {
         /* get the number of active swap devices */
@@ -322,8 +320,8 @@ swap_result getSwapFromSwapctl_BSD(swap_config config) {
         unsigned long long used_swap_mb = 0;
 
         for (int i = 0; i < nswaps; i++) {
-                dsktotal_mb = (float)ent[i].se_nblks / (float)config.conversion_factor;
-                dskused_mb = (float)ent[i].se_inuse / (float)config.conversion_factor;
+                dsktotal_mb = (double)ent[i].se_nblks / (double)config.conversion_factor;
+                dskused_mb = (double)ent[i].se_inuse / (double)config.conversion_factor;
                 dskfree_mb = (dsktotal_mb - dskused_mb);
 
                 if (config.allswaps && dsktotal_mb > 0) {
@@ -404,7 +402,8 @@ swap_result getSwapFromSwap_SRV4(swap_config config) {
         }
 
         /* initialize swap table + entries */
-        swaptbl_t *tbl = (swaptbl_t *)malloc(sizeof(swaptbl_t) + (sizeof(swapent_t) * (unsigned long)nswaps));
+        swaptbl_t *tbl =
+                (swaptbl_t *)malloc(sizeof(swaptbl_t) + (sizeof(swapent_t) * (unsigned long)nswaps));
 
         if (tbl == NULL) {
                 die(STATE_UNKNOWN, _("malloc() failed!\n"));
@@ -439,7 +438,8 @@ swap_result getSwapFromSwap_SRV4(swap_config config) {
                 dskused_mb = (dsktotal_mb - dskfree_mb);
 
                 if (verbose >= 3) {
-                        printf("dsktotal_mb=%.0f dskfree_mb=%.0f dskused_mb=%.0f\n", dsktotal_mb, dskfree_mb, dskused_mb);
+                        printf("dsktotal_mb=%.0f dskfree_mb=%.0f dskused_mb=%.0f\n", dsktotal_mb, dskfree_mb,
+                                   dskused_mb);
                 }
 
                 if (config.allswaps && dsktotal_mb > 0) {
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 49ad096c..09806373 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -3,7 +3,7 @@
  * Monitoring check_tcp plugin
  *
  * License: GPL
- * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ * Copyright (c) 1999-2025 Monitoring Plugins Development Team
  *
  * Description:
  *
@@ -29,74 +29,64 @@
 
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
-const char *copyright = "1999-2024";
+const char *copyright = "1999-2025";
 const char *email = "devel@monitoring-plugins.org";
 
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-#include "utils_tcp.h"
+#include "./common.h"
+#include "./netutils.h"
+#include "./utils.h"
+#include "./check_tcp.d/config.h"
+#include "output.h"
+#include "states.h"
 
+#include <sys/types.h>
 #include <ctype.h>
 #include <sys/select.h>
 
+ssize_t my_recv(int socket_descriptor, char *buf, size_t len, bool use_tls) {
 #ifdef HAVE_SSL
-static bool check_cert = false;
-static int days_till_exp_warn, days_till_exp_crit;
-#       define my_recv(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
-#       define my_send(buf, len) ((flags & FLAG_SSL) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
-#else
-#       define my_recv(buf, len) read(sd, buf, len)
-#       define my_send(buf, len) send(sd, buf, len, 0)
+        if (use_tls) {
+                return np_net_ssl_read(buf, (int)len);
+        }
+#endif
+        return read(socket_descriptor, buf, len);
+}
+
+ssize_t my_send(int socket_descriptor, char *buf, size_t len, bool use_tls) {
+#ifdef HAVE_SSL
+        if (use_tls) {
+                return np_net_ssl_write(buf, (int)len);
+        }
 #endif
+        return write(socket_descriptor, buf, len);
+}
 
-/* int my_recv(char *, size_t); */
-static int process_arguments(int /*argc*/, char ** /*argv*/);
-static void print_help(void);
+typedef struct {
+        int errorcode;
+        check_tcp_config config;
+} check_tcp_config_wrapper;
+static check_tcp_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/,
+                                                                                                  check_tcp_config /*config*/);
+void print_help(const char *service);
 void print_usage(void);
 
-#define EXPECT server_expect[0]
-static char *SERVICE = "TCP";
-static char *SEND = NULL;
-static char *QUIT = NULL;
-static int PROTOCOL = IPPROTO_TCP; /* most common is default */
-static int PORT = 0;
-static int READ_TIMEOUT = 2;
-
-static int server_port = 0;
-static char *server_address = NULL;
-static bool host_specified = false;
-static char *server_send = NULL;
-static char *server_quit = NULL;
-static char **server_expect;
-static size_t server_expect_count = 0;
-static ssize_t maxbytes = 0;
-static char **warn_codes = NULL;
-static size_t warn_codes_count = 0;
-static char **crit_codes = NULL;
-static size_t crit_codes_count = 0;
-static unsigned int delay = 0;
-static double warning_time = 0;
-static double critical_time = 0;
-static double elapsed_time = 0;
-static long microsec;
-static int sd = 0;
-#define MAXBUF 1024
-static char buffer[MAXBUF];
-static int expect_mismatch_state = STATE_WARNING;
-static int match_flags = NP_MATCH_EXACT;
+int verbosity = 0;
 
-#ifdef HAVE_SSL
-static char *sni = NULL;
-static bool sni_specified = false;
-#endif
+static const int READ_TIMEOUT = 2;
+
+const int MAXBUF = 1024;
 
-#define FLAG_SSL         0x01
-#define FLAG_VERBOSE     0x02
-#define FLAG_TIME_WARN   0x04
-#define FLAG_TIME_CRIT   0x08
-#define FLAG_HIDE_OUTPUT 0x10
-static size_t flags;
+const int DEFAULT_FTP_PORT = 21;
+const int DEFAULT_POP_PORT = 110;
+const int DEFAULT_SPOP_PORT = 995;
+const int DEFAULT_SMTP_PORT = 25;
+const int DEFAULT_SSMTP_PORT = 465;
+const int DEFAULT_IMAP_PORT = 143;
+const int DEFAULT_SIMAP_PORT = 993;
+const int DEFAULT_XMPP_C2S_PORT = 5222;
+const int DEFAULT_NNTP_PORT = 119;
+const int DEFAULT_NNTPS_PORT = 563;
+const int DEFAULT_CLAMD_PORT = 3310;
 
 int main(int argc, char **argv) {
         setlocale(LC_ALL, "");
@@ -105,353 +95,482 @@ int main(int argc, char **argv) {
 
         /* determine program- and service-name quickly */
         progname = strrchr(argv[0], '/');
-        if (progname != NULL)
+        if (progname != NULL) {
                 progname++;
-        else
+        } else {
                 progname = argv[0];
+        }
+
+        // Initialize config here with values from above,
+        // might be changed by on disk config or cli commands
+        check_tcp_config config = check_tcp_config_init();
 
         size_t prog_name_len = strlen(progname);
-        if (prog_name_len > 6 && !memcmp(progname, "check_", 6)) {
-                SERVICE = strdup(progname + 6);
-                for (size_t i = 0; i < prog_name_len - 6; i++)
-                        SERVICE[i] = toupper(SERVICE[i]);
+        const size_t prefix_length = strlen("check_");
+
+        if (prog_name_len <= prefix_length) {
+                die(STATE_UNKNOWN, _("Weird progname"));
+        }
+
+        if (!memcmp(progname, "check_", prefix_length)) {
+                config.service = strdup(progname + prefix_length);
+                if (config.service == NULL) {
+                        die(STATE_UNKNOWN, _("Allocation failed"));
+                }
+
+                for (size_t i = 0; i < prog_name_len - prefix_length; i++) {
+                        config.service[i] = toupper(config.service[i]);
+                }
         }
 
         /* set up a reasonable buffer at first (will be realloc()'ed if
          * user specifies other options) */
-        server_expect = calloc(2, sizeof(char *));
+        config.server_expect = calloc(2, sizeof(char *));
+
+        if (config.server_expect == NULL) {
+                die(STATE_UNKNOWN, _("Allocation failed"));
+        }
 
         /* determine defaults for this service's protocol */
-        if (!strncmp(SERVICE, "UDP", 3)) {
-                PROTOCOL = IPPROTO_UDP;
-        } else if (!strncmp(SERVICE, "FTP", 3)) {
-                EXPECT = "220";
-                QUIT = "QUIT\r\n";
-                PORT = 21;
-        } else if (!strncmp(SERVICE, "POP", 3) || !strncmp(SERVICE, "POP3", 4)) {
-                EXPECT = "+OK";
-                QUIT = "QUIT\r\n";
-                PORT = 110;
-        } else if (!strncmp(SERVICE, "SMTP", 4)) {
-                EXPECT = "220";
-                QUIT = "QUIT\r\n";
-                PORT = 25;
-        } else if (!strncmp(SERVICE, "IMAP", 4)) {
-                EXPECT = "* OK";
-                QUIT = "a1 LOGOUT\r\n";
-                PORT = 143;
+        if (!strncmp(config.service, "UDP", strlen("UDP"))) {
+                config.protocol = IPPROTO_UDP;
+        } else if (!strncmp(config.service, "FTP", strlen("FTP"))) {
+                config.server_expect[0] = "220";
+                config.quit = "QUIT\r\n";
+                config.server_port = DEFAULT_FTP_PORT;
+        } else if (!strncmp(config.service, "POP", strlen("POP")) ||
+                           !strncmp(config.service, "POP3", strlen("POP3"))) {
+                config.server_expect[0] = "+OK";
+                config.quit = "QUIT\r\n";
+                config.server_port = DEFAULT_POP_PORT;
+        } else if (!strncmp(config.service, "SMTP", strlen("SMTP"))) {
+                config.server_expect[0] = "220";
+                config.quit = "QUIT\r\n";
+                config.server_port = DEFAULT_SMTP_PORT;
+        } else if (!strncmp(config.service, "IMAP", strlen("IMAP"))) {
+                config.server_expect[0] = "* OK";
+                config.quit = "a1 LOGOUT\r\n";
+                config.server_port = DEFAULT_IMAP_PORT;
         }
 #ifdef HAVE_SSL
-        else if (!strncmp(SERVICE, "SIMAP", 5)) {
-                EXPECT = "* OK";
-                QUIT = "a1 LOGOUT\r\n";
-                flags |= FLAG_SSL;
-                PORT = 993;
-        } else if (!strncmp(SERVICE, "SPOP", 4)) {
-                EXPECT = "+OK";
-                QUIT = "QUIT\r\n";
-                flags |= FLAG_SSL;
-                PORT = 995;
-        } else if (!strncmp(SERVICE, "SSMTP", 5)) {
-                EXPECT = "220";
-                QUIT = "QUIT\r\n";
-                flags |= FLAG_SSL;
-                PORT = 465;
-        } else if (!strncmp(SERVICE, "JABBER", 6)) {
-                SEND = "<stream:stream to=\'host\' xmlns=\'jabber:client\' xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
-                EXPECT = "<?xml version=\'1.0\'";
-                QUIT = "</stream:stream>\n";
-                flags |= FLAG_HIDE_OUTPUT;
-                PORT = 5222;
-        } else if (!strncmp(SERVICE, "NNTPS", 5)) {
-                server_expect_count = 2;
-                server_expect[0] = "200";
-                server_expect[1] = "201";
-                QUIT = "QUIT\r\n";
-                flags |= FLAG_SSL;
-                PORT = 563;
+        else if (!strncmp(config.service, "SIMAP", strlen("SIMAP"))) {
+                config.server_expect[0] = "* OK";
+                config.quit = "a1 LOGOUT\r\n";
+                config.use_tls = true;
+                config.server_port = DEFAULT_SIMAP_PORT;
+        } else if (!strncmp(config.service, "SPOP", strlen("SPOP"))) {
+                config.server_expect[0] = "+OK";
+                config.quit = "QUIT\r\n";
+                config.use_tls = true;
+                config.server_port = DEFAULT_SPOP_PORT;
+        } else if (!strncmp(config.service, "SSMTP", strlen("SSMTP"))) {
+                config.server_expect[0] = "220";
+                config.quit = "QUIT\r\n";
+                config.use_tls = true;
+                config.server_port = DEFAULT_SSMTP_PORT;
+        } else if (!strncmp(config.service, "JABBER", strlen("JABBER"))) {
+                config.send = "<stream:stream to=\'host\' xmlns=\'jabber:client\' "
+                                          "xmlns:stream=\'http://etherx.jabber.org/streams\'>\n";
+                config.server_expect[0] = "<?xml version=\'1.0\'";
+                config.quit = "</stream:stream>\n";
+                config.hide_output = true;
+                config.server_port = DEFAULT_XMPP_C2S_PORT;
+        } else if (!strncmp(config.service, "NNTPS", strlen("NNTPS"))) {
+                config.server_expect_count = 2;
+                config.server_expect[0] = "200";
+                config.server_expect[1] = "201";
+                config.quit = "QUIT\r\n";
+                config.use_tls = true;
+                config.server_port = DEFAULT_NNTPS_PORT;
         }
 #endif
-        else if (!strncmp(SERVICE, "NNTP", 4)) {
-                server_expect_count = 2;
-                server_expect = malloc(sizeof(char *) * server_expect_count);
-                server_expect[0] = strdup("200");
-                server_expect[1] = strdup("201");
-                QUIT = "QUIT\r\n";
-                PORT = 119;
-        } else if (!strncmp(SERVICE, "CLAMD", 5)) {
-                SEND = "PING";
-                EXPECT = "PONG";
-                QUIT = NULL;
-                PORT = 3310;
+        else if (!strncmp(config.service, "NNTP", strlen("NNTP"))) {
+                config.server_expect_count = 2;
+                char **tmp = realloc(config.server_expect, config.server_expect_count * sizeof(char *));
+                if (tmp == NULL) {
+                        free(config.server_expect);
+                        die(STATE_UNKNOWN, _("Allocation failed"));
+                }
+                config.server_expect = tmp;
+
+                config.server_expect[0] = strdup("200");
+                config.server_expect[1] = strdup("201");
+                config.quit = "QUIT\r\n";
+                config.server_port = DEFAULT_NNTP_PORT;
+        } else if (!strncmp(config.service, "CLAMD", strlen("CLAMD"))) {
+                config.send = "PING";
+                config.server_expect[0] = "PONG";
+                config.quit = NULL;
+                config.server_port = DEFAULT_CLAMD_PORT;
         }
         /* fallthrough check, so it's supposed to use reverse matching */
-        else if (strcmp(SERVICE, "TCP"))
+        else if (strcmp(config.service, "TCP")) {
                 usage(_("CRITICAL - Generic check_tcp called with unknown service\n"));
-
-        server_address = "127.0.0.1";
-        server_port = PORT;
-        server_send = SEND;
-        server_quit = QUIT;
-        char *status = NULL;
+        }
 
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
+        check_tcp_config_wrapper paw = process_arguments(argc, argv, config);
+        if (paw.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
+        }
+
+        config = paw.config;
 
-        if (flags & FLAG_VERBOSE) {
-                printf("Using service %s\n", SERVICE);
-                printf("Port: %d\n", server_port);
-                printf("flags: 0x%x\n", (int)flags);
+        if (verbosity > 0) {
+                printf("Using service %s\n", config.service);
+                printf("Port: %d\n", config.server_port);
         }
 
-        if (EXPECT && !server_expect_count)
-                server_expect_count++;
+        if ((config.server_expect_count == 0) && config.server_expect[0]) {
+                config.server_expect_count++;
+        }
 
-        if (PROTOCOL == IPPROTO_UDP && !(server_expect_count && server_send)) {
+        if (config.protocol == IPPROTO_UDP && !(config.server_expect_count && config.send)) {
                 usage(_("With UDP checks, a send/expect string must be specified."));
         }
 
+        // Initialize check stuff before setting timers
+        mp_check overall = mp_check_init();
+        if (config.output_format_set) {
+                mp_set_format(config.output_format);
+        }
+
         /* set up the timer */
         signal(SIGALRM, socket_timeout_alarm_handler);
         alarm(socket_timeout);
 
         /* try to connect to the host at the given port number */
-        struct timeval tv;
-        gettimeofday(&tv, NULL);
-
-        int result = STATE_UNKNOWN;
-        result = np_net_connect(server_address, server_port, &sd, PROTOCOL);
-        if (result == STATE_CRITICAL)
-                return econn_refuse_state;
+        struct timeval start_time;
+        gettimeofday(&start_time, NULL);
+
+        int socket_descriptor = 0;
+        mp_subcheck inital_connect_result = mp_subcheck_init();
+
+        // Try initial connection
+        if (np_net_connect(config.server_address, config.server_port, &socket_descriptor,
+                                           config.protocol) == STATE_CRITICAL) {
+                // Early exit here, we got connection refused
+                inital_connect_result =
+                        mp_set_subcheck_state(inital_connect_result, config.econn_refuse_state);
+                xasprintf(&inital_connect_result.output, "Connection to %s on port %i was REFUSED",
+                                  config.server_address, config.server_port);
+                mp_add_subcheck_to_check(&overall, inital_connect_result);
+                mp_exit(overall);
+        } else {
+                inital_connect_result = mp_set_subcheck_state(inital_connect_result, STATE_OK);
+                xasprintf(&inital_connect_result.output, "Connection to %s on port %i was a SUCCESS",
+                                  config.server_address, config.server_port);
+                mp_add_subcheck_to_check(&overall, inital_connect_result);
+        }
 
 #ifdef HAVE_SSL
-        if (flags & FLAG_SSL) {
-                result = np_net_ssl_init_with_hostname(sd, (sni_specified ? sni : NULL));
-                if (result == STATE_OK && check_cert) {
-                        result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
+        if (config.use_tls) {
+                mp_subcheck tls_connection_result = mp_subcheck_init();
+                mp_state_enum result = np_net_ssl_init_with_hostname(
+                        socket_descriptor, (config.sni_specified ? config.sni : NULL));
+                tls_connection_result = mp_set_subcheck_default_state(tls_connection_result, result);
+
+                if (result == STATE_OK) {
+                        xasprintf(&tls_connection_result.output, "TLS connection succeeded");
+
+                        if (config.check_cert) {
+                                result =
+                                        np_net_ssl_check_cert(config.days_till_exp_warn, config.days_till_exp_crit);
+
+                                mp_subcheck tls_certificate_lifetime_result = mp_subcheck_init();
+                                tls_certificate_lifetime_result =
+                                        mp_set_subcheck_state(tls_certificate_lifetime_result, result);
+
+                                if (result == STATE_OK) {
+                                        xasprintf(&tls_certificate_lifetime_result.output,
+                                                          "Certificate lifetime is within thresholds");
+                                } else if (result == STATE_WARNING) {
+                                        xasprintf(&tls_certificate_lifetime_result.output,
+                                                          "Certificate lifetime is violating warning threshold (%i)",
+                                                          config.days_till_exp_warn);
+                                } else if (result == STATE_CRITICAL) {
+                                        xasprintf(&tls_certificate_lifetime_result.output,
+                                                          "Certificate lifetime is violating critical threshold (%i)",
+                                                          config.days_till_exp_crit);
+                                } else {
+                                        xasprintf(&tls_certificate_lifetime_result.output,
+                                                          "Certificate lifetime is somehow unknown");
+                                }
+
+                                mp_add_subcheck_to_subcheck(&tls_connection_result,
+                                                                                        tls_certificate_lifetime_result);
+                        }
+
+                        mp_add_subcheck_to_check(&overall, tls_connection_result);
+                } else {
+                        xasprintf(&tls_connection_result.output, "TLS connection failed");
+                        mp_add_subcheck_to_check(&overall, tls_connection_result);
+
+                        if (socket_descriptor) {
+                                close(socket_descriptor);
+                        }
+                        np_net_ssl_cleanup();
+
+                        mp_exit(overall);
                 }
         }
-        if (result != STATE_OK) {
-                if (sd)
-                        close(sd);
-                np_net_ssl_cleanup();
-                return result;
-        }
 #endif /* HAVE_SSL */
 
-        if (server_send != NULL) { /* Something to send? */
-                my_send(server_send, strlen(server_send));
+        if (config.send != NULL) { /* Something to send? */
+                my_send(socket_descriptor, config.send, strlen(config.send), config.use_tls);
         }
 
-        if (delay > 0) {
-                tv.tv_sec += delay;
-                sleep(delay);
+        if (config.delay > 0) {
+                start_time.tv_sec += config.delay;
+                sleep(config.delay);
         }
 
-        if (flags & FLAG_VERBOSE) {
-                if (server_send) {
-                        printf("Send string: %s\n", server_send);
+        if (verbosity > 0) {
+                if (config.send) {
+                        printf("Send string: %s\n", config.send);
+                }
+                if (config.quit) {
+                        printf("Quit string: %s\n", config.quit);
                 }
-                if (server_quit) {
-                        printf("Quit string: %s\n", server_quit);
+                printf("server_expect_count: %d\n", (int)config.server_expect_count);
+                for (size_t i = 0; i < config.server_expect_count; i++) {
+                        printf("\t%zd: %s\n", i, config.server_expect[i]);
                 }
-                printf("server_expect_count: %d\n", (int)server_expect_count);
-                for (size_t i = 0; i < server_expect_count; i++)
-                        printf("\t%zd: %s\n", i, server_expect[i]);
         }
 
         /* if(len) later on, we know we have a non-NULL response */
         ssize_t len = 0;
+        char *received_buffer = NULL;
+        enum np_match_result match = NP_MATCH_NONE;
+        mp_subcheck expected_data_result = mp_subcheck_init();
 
-        int match = -1;
-        struct timeval timeout;
-        fd_set rfds;
-        FD_ZERO(&rfds);
-        if (server_expect_count) {
+        if (config.server_expect_count) {
                 ssize_t received = 0;
+                char buffer[MAXBUF];
 
                 /* watch for the expect string */
-                while ((received = my_recv(buffer, sizeof(buffer))) > 0) {
-                        status = realloc(status, len + received + 1);
-                        memcpy(&status[len], buffer, received);
+                while ((received = my_recv(socket_descriptor, buffer, sizeof(buffer), config.use_tls)) >
+                           0) {
+                        received_buffer = realloc(received_buffer, len + received + 1);
+
+                        if (received_buffer == NULL) {
+                                die(STATE_UNKNOWN, _("Allocation failed"));
+                        }
+
+                        memcpy(&received_buffer[len], buffer, received);
                         len += received;
-                        status[len] = '\0';
+                        received_buffer[len] = '\0';
 
                         /* stop reading if user-forced */
-                        if (maxbytes && len >= maxbytes)
+                        if (config.maxbytes && len >= config.maxbytes) {
                                 break;
+                        }
 
-                        if ((match = np_expect_match(status, server_expect, server_expect_count, match_flags)) != NP_MATCH_RETRY)
+                        if ((match = np_expect_match(received_buffer, config.server_expect,
+                                                                                 config.server_expect_count, config.match_flags)) !=
+                                NP_MATCH_RETRY) {
                                 break;
+                        }
+
+                        fd_set rfds;
+                        FD_ZERO(&rfds);
+                        FD_SET(socket_descriptor, &rfds);
 
                         /* some protocols wait for further input, so make sure we don't wait forever */
-                        FD_SET(sd, &rfds);
+                        struct timeval timeout;
                         timeout.tv_sec = READ_TIMEOUT;
                         timeout.tv_usec = 0;
-                        if (select(sd + 1, &rfds, NULL, NULL, &timeout) <= 0)
+
+                        if (select(socket_descriptor + 1, &rfds, NULL, NULL, &timeout) <= 0) {
                                 break;
+                        }
                 }
 
-                if (match == NP_MATCH_RETRY)
+                if (match == NP_MATCH_RETRY) {
                         match = NP_MATCH_FAILURE;
+                }
 
                 /* no data when expected, so return critical */
-                if (len == 0)
-                        die(STATE_CRITICAL, _("No data received from host\n"));
+                if (len == 0) {
+                        xasprintf(&expected_data_result.output, "Received no data when some was expected");
+                        expected_data_result = mp_set_subcheck_state(expected_data_result, STATE_CRITICAL);
+                        mp_add_subcheck_to_check(&overall, expected_data_result);
+                        mp_exit(overall);
+                }
 
                 /* print raw output if we're debugging */
-                if (flags & FLAG_VERBOSE)
-                        printf("received %d bytes from host\n#-raw-recv-------#\n%s\n#-raw-recv-------#\n", (int)len + 1, status);
+                if (verbosity > 0) {
+                        printf("received %d bytes from host\n#-raw-recv-------#\n%s\n#-raw-recv-------#\n",
+                                   (int)len + 1, received_buffer);
+                }
                 /* strip whitespace from end of output */
-                while (--len > 0 && isspace(status[len]))
-                        status[len] = '\0';
+                while (--len > 0 && isspace(received_buffer[len])) {
+                        received_buffer[len] = '\0';
+                }
         }
 
-        if (server_quit != NULL) {
-                my_send(server_quit, strlen(server_quit));
+        if (config.quit != NULL) {
+                my_send(socket_descriptor, config.quit, strlen(config.quit), config.use_tls);
+        }
+
+        if (socket_descriptor) {
+                close(socket_descriptor);
         }
-        if (sd)
-                close(sd);
 #ifdef HAVE_SSL
         np_net_ssl_cleanup();
 #endif
 
-        microsec = deltime(tv);
-        elapsed_time = (double)microsec / 1.0e6;
+        long microsec = deltime(start_time);
+        double elapsed_time = (double)microsec / 1.0e6;
+
+        mp_subcheck elapsed_time_result = mp_subcheck_init();
+
+        mp_perfdata time_pd = perfdata_init();
+        time_pd = mp_set_pd_value(time_pd, elapsed_time);
+        time_pd.label = "time";
+        time_pd.uom = "s";
+
+        if (config.critical_time_set && elapsed_time > config.critical_time) {
+                xasprintf(&elapsed_time_result.output,
+                                  "Connection time %fs exceeded critical threshold (%f)", elapsed_time,
+                                  config.critical_time);
+
+                elapsed_time_result = mp_set_subcheck_state(elapsed_time_result, STATE_CRITICAL);
+                time_pd.crit_present = true;
+                mp_range crit_val = mp_range_init();
+
+                crit_val.end = mp_create_pd_value(config.critical_time);
+                crit_val.end_infinity = false;
+
+                time_pd.crit = crit_val;
+        } else if (config.warning_time_set && elapsed_time > config.warning_time) {
+                xasprintf(&elapsed_time_result.output,
+                                  "Connection time %fs exceeded warning threshold (%f)", elapsed_time,
+                                  config.critical_time);
+
+                elapsed_time_result = mp_set_subcheck_state(elapsed_time_result, STATE_WARNING);
+                time_pd.warn_present = true;
+                mp_range warn_val = mp_range_init();
+                warn_val.end = mp_create_pd_value(config.critical_time);
+                warn_val.end_infinity = false;
+
+                time_pd.warn = warn_val;
+        } else {
+                elapsed_time_result = mp_set_subcheck_state(elapsed_time_result, STATE_OK);
+                xasprintf(&elapsed_time_result.output, "Connection time %fs is within thresholds",
+                                  elapsed_time);
+        }
 
-        if (flags & FLAG_TIME_CRIT && elapsed_time > critical_time)
-                result = STATE_CRITICAL;
-        else if (flags & FLAG_TIME_WARN && elapsed_time > warning_time)
-                result = STATE_WARNING;
+        mp_add_perfdata_to_subcheck(&elapsed_time_result, time_pd);
+        mp_add_subcheck_to_check(&overall, elapsed_time_result);
 
         /* did we get the response we hoped? */
-        if (match == NP_MATCH_FAILURE && result != STATE_CRITICAL)
-                result = expect_mismatch_state;
+        if (match == NP_MATCH_FAILURE) {
+                expected_data_result =
+                        mp_set_subcheck_state(expected_data_result, config.expect_mismatch_state);
+                xasprintf(&expected_data_result.output, "Answer failed to match expectation");
+                mp_add_subcheck_to_check(&overall, expected_data_result);
+        } else if (match == NP_MATCH_SUCCESS) {
+                expected_data_result = mp_set_subcheck_state(expected_data_result, STATE_OK);
+                xasprintf(&expected_data_result.output, "The answer of the server matched the expectation");
+                mp_add_subcheck_to_check(&overall, expected_data_result);
+        }
 
         /* reset the alarm */
         alarm(0);
 
-        /* this is a bit stupid, because we don't want to print the
-         * response time (which can look ok to the user) if we didn't get
-         * the response we were looking for. if-else */
-        printf("%s %s - ", SERVICE, state_text(result));
-
-        if (match == NP_MATCH_FAILURE && len && !(flags & FLAG_HIDE_OUTPUT))
-                printf("Unexpected response from host/socket: %s", status);
-        else {
-                if (match == NP_MATCH_FAILURE)
-                        printf("Unexpected response from host/socket on ");
-                else
-                        printf("%.3f second response time on ", elapsed_time);
-                if (server_address[0] != '/') {
-                        if (host_specified)
-                                printf("%s port %d", server_address, server_port);
-                        else
-                                printf("port %d", server_port);
-                } else
-                        printf("socket %s", server_address);
-        }
-
-        if (match != NP_MATCH_FAILURE && !(flags & FLAG_HIDE_OUTPUT) && len)
-                printf(" [%s]", status);
-
-        /* perf-data doesn't apply when server doesn't talk properly,
-         * so print all zeroes on warn and crit. Use fperfdata since
-         * localisation settings can make different outputs */
-        if (match == NP_MATCH_FAILURE)
-                printf("|%s", fperfdata("time", elapsed_time, "s", (flags & FLAG_TIME_WARN ? true : false), 0,
-                                                                (flags & FLAG_TIME_CRIT ? true : false), 0, true, 0, true, socket_timeout));
-        else
-                printf("|%s", fperfdata("time", elapsed_time, "s", (flags & FLAG_TIME_WARN ? true : false), warning_time,
-                                                                (flags & FLAG_TIME_CRIT ? true : false), critical_time, true, 0, true, socket_timeout));
-
-        putchar('\n');
-        return result;
+        mp_exit(overall);
 }
 
 /* process command-line arguments */
-static int process_arguments(int argc, char **argv) {
+static check_tcp_config_wrapper process_arguments(int argc, char **argv, check_tcp_config config) {
         enum {
-                SNI_OPTION = CHAR_MAX + 1
+                SNI_OPTION = CHAR_MAX + 1,
+                output_format_index,
         };
 
-        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
-                                                                           {"critical", required_argument, 0, 'c'},
-                                                                           {"warning", required_argument, 0, 'w'},
-                                                                           {"critical-codes", required_argument, 0, 'C'},
-                                                                           {"warning-codes", required_argument, 0, 'W'},
-                                                                           {"timeout", required_argument, 0, 't'},
-                                                                           {"protocol", required_argument, 0, 'P'}, /* FIXME: Unhandled */
-                                                                           {"port", required_argument, 0, 'p'},
-                                                                           {"escape", no_argument, 0, 'E'},
-                                                                           {"all", no_argument, 0, 'A'},
-                                                                           {"send", required_argument, 0, 's'},
-                                                                           {"expect", required_argument, 0, 'e'},
-                                                                           {"maxbytes", required_argument, 0, 'm'},
-                                                                           {"quit", required_argument, 0, 'q'},
-                                                                           {"jail", no_argument, 0, 'j'},
-                                                                           {"delay", required_argument, 0, 'd'},
-                                                                           {"refuse", required_argument, 0, 'r'},
-                                                                           {"mismatch", required_argument, 0, 'M'},
-                                                                           {"use-ipv4", no_argument, 0, '4'},
-                                                                           {"use-ipv6", no_argument, 0, '6'},
-                                                                           {"verbose", no_argument, 0, 'v'},
-                                                                           {"version", no_argument, 0, 'V'},
-                                                                           {"help", no_argument, 0, 'h'},
-                                                                           {"ssl", no_argument, 0, 'S'},
-                                                                           {"sni", required_argument, 0, SNI_OPTION},
-                                                                           {"certificate", required_argument, 0, 'D'},
-                                                                           {0, 0, 0, 0}};
-
-        if (argc < 2)
+        static struct option longopts[] = {
+                {"hostname", required_argument, 0, 'H'},
+                {"critical", required_argument, 0, 'c'},
+                {"warning", required_argument, 0, 'w'},
+                {"critical-codes", required_argument, 0, 'C'},
+                {"warning-codes", required_argument, 0, 'W'},
+                {"timeout", required_argument, 0, 't'},
+                {"protocol", required_argument, 0, 'P'}, /* FIXME: Unhandled */
+                {"port", required_argument, 0, 'p'},
+                {"escape", no_argument, 0, 'E'},
+                {"all", no_argument, 0, 'A'},
+                {"send", required_argument, 0, 's'},
+                {"expect", required_argument, 0, 'e'},
+                {"maxbytes", required_argument, 0, 'm'},
+                {"quit", required_argument, 0, 'q'},
+                {"jail", no_argument, 0, 'j'},
+                {"delay", required_argument, 0, 'd'},
+                {"refuse", required_argument, 0, 'r'},
+                {"mismatch", required_argument, 0, 'M'},
+                {"use-ipv4", no_argument, 0, '4'},
+                {"use-ipv6", no_argument, 0, '6'},
+                {"verbose", no_argument, 0, 'v'},
+                {"version", no_argument, 0, 'V'},
+                {"help", no_argument, 0, 'h'},
+                {"ssl", no_argument, 0, 'S'},
+                {"sni", required_argument, 0, SNI_OPTION},
+                {"certificate", required_argument, 0, 'D'},
+                {"output-format", required_argument, 0, output_format_index},
+                {0, 0, 0, 0}};
+
+        if (argc < 2) {
                 usage4(_("No arguments found"));
+        }
 
         /* backwards compatibility */
         for (int i = 1; i < argc; i++) {
-                if (strcmp("-to", argv[i]) == 0)
+                if (strcmp("-to", argv[i]) == 0) {
                         strcpy(argv[i], "-t");
-                else if (strcmp("-wt", argv[i]) == 0)
+                } else if (strcmp("-wt", argv[i]) == 0) {
                         strcpy(argv[i], "-w");
-                else if (strcmp("-ct", argv[i]) == 0)
+                } else if (strcmp("-ct", argv[i]) == 0) {
                         strcpy(argv[i], "-c");
+                }
         }
 
         if (!is_option(argv[1])) {
-                server_address = argv[1];
+                config.server_address = argv[1];
                 argv[1] = argv[0];
                 argv = &argv[1];
                 argc--;
         }
 
-        int option_char;
         bool escape = false;
+
         while (true) {
                 int option = 0;
-                option_char = getopt_long(argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", longopts, &option);
+                int option_index =
+                        getopt_long(argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF || option_char == 1)
+                if (option_index == -1 || option_index == EOF || option_index == 1) {
                         break;
+                }
 
-                switch (option_char) {
+                switch (option_index) {
                 case '?': /* print short usage statement if args not parsable */
                         usage5();
                 case 'h': /* help */
-                        print_help();
+                        print_help(config.service);
                         exit(STATE_UNKNOWN);
                 case 'V': /* version */
                         print_revision(progname, NP_VERSION);
                         exit(STATE_UNKNOWN);
                 case 'v': /* verbose mode */
-                        flags |= FLAG_VERBOSE;
-                        match_flags |= NP_MATCH_VERBOSE;
+                        verbosity++;
+                        config.match_flags |= NP_MATCH_VERBOSE;
                         break;
-                case '4':
+                case '4': // Apparently unused TODO
                         address_family = AF_INET;
                         break;
-                case '6':
+                case '6': // Apparently unused TODO
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
@@ -459,163 +578,192 @@ static int process_arguments(int argc, char **argv) {
 #endif
                         break;
                 case 'H': /* hostname */
-                        host_specified = true;
-                        server_address = optarg;
+                        config.host_specified = true;
+                        config.server_address = optarg;
                         break;
                 case 'c': /* critical */
-                        critical_time = strtod(optarg, NULL);
-                        flags |= FLAG_TIME_CRIT;
+                        config.critical_time = strtod(optarg, NULL);
+                        config.critical_time_set = true;
                         break;
                 case 'j': /* hide output */
-                        flags |= FLAG_HIDE_OUTPUT;
+                        config.hide_output = true;
                         break;
                 case 'w': /* warning */
-                        warning_time = strtod(optarg, NULL);
-                        flags |= FLAG_TIME_WARN;
-                        break;
-                case 'C':
-                        crit_codes = realloc(crit_codes, ++crit_codes_count);
-                        crit_codes[crit_codes_count - 1] = optarg;
-                        break;
-                case 'W':
-                        warn_codes = realloc(warn_codes, ++warn_codes_count);
-                        warn_codes[warn_codes_count - 1] = optarg;
+                        config.warning_time = strtod(optarg, NULL);
+                        config.warning_time_set = true;
                         break;
                 case 't': /* timeout */
-                        if (!is_intpos(optarg))
+                        if (!is_intpos(optarg)) {
                                 usage4(_("Timeout interval must be a positive integer"));
-                        else
+                        } else {
                                 socket_timeout = atoi(optarg);
+                        }
                         break;
                 case 'p': /* port */
-                        if (!is_intpos(optarg))
+                        if (!is_intpos(optarg)) {
                                 usage4(_("Port must be a positive integer"));
-                        else
-                                server_port = atoi(optarg);
+                        } else {
+                                config.server_port = atoi(optarg);
+                        }
                         break;
                 case 'E':
                         escape = true;
                         break;
                 case 's':
-                        if (escape)
-                                server_send = np_escaped_string(optarg);
-                        else
-                                xasprintf(&server_send, "%s", optarg);
+                        if (escape) {
+                                config.send = np_escaped_string(optarg);
+                        } else {
+                                xasprintf(&config.send, "%s", optarg);
+                        }
                         break;
                 case 'e': /* expect string (may be repeated) */
-                        match_flags &= ~NP_MATCH_EXACT;
-                        if (server_expect_count == 0)
-                                server_expect = malloc(sizeof(char *) * (++server_expect_count));
-                        else
-                                server_expect = realloc(server_expect, sizeof(char *) * (++server_expect_count));
-                        server_expect[server_expect_count - 1] = optarg;
+                        config.match_flags &= ~NP_MATCH_EXACT;
+                        if (config.server_expect_count == 0) {
+                                config.server_expect = malloc(sizeof(char *) * (++config.server_expect_count));
+                        } else {
+                                config.server_expect =
+                                        realloc(config.server_expect, sizeof(char *) * (++config.server_expect_count));
+                        }
+
+                        if (config.server_expect == NULL) {
+                                die(STATE_UNKNOWN, _("Allocation failed"));
+                        }
+                        config.server_expect[config.server_expect_count - 1] = optarg;
                         break;
                 case 'm':
-                        if (!is_intpos(optarg))
+                        if (!is_intpos(optarg)) {
                                 usage4(_("Maxbytes must be a positive integer"));
-                        else
-                                maxbytes = strtol(optarg, NULL, 0);
+                        } else {
+                                config.maxbytes = strtol(optarg, NULL, 0);
+                        }
                         break;
                 case 'q':
-                        if (escape)
-                                server_quit = np_escaped_string(optarg);
-                        else
-                                xasprintf(&server_quit, "%s\r\n", optarg);
+                        if (escape) {
+                                config.quit = np_escaped_string(optarg);
+                        } else {
+                                xasprintf(&config.quit, "%s\r\n", optarg);
+                        }
                         break;
                 case 'r':
-                        if (!strncmp(optarg, "ok", 2))
-                                econn_refuse_state = STATE_OK;
-                        else if (!strncmp(optarg, "warn", 4))
-                                econn_refuse_state = STATE_WARNING;
-                        else if (!strncmp(optarg, "crit", 4))
-                                econn_refuse_state = STATE_CRITICAL;
-                        else
+                        if (!strncmp(optarg, "ok", 2)) {
+                                config.econn_refuse_state = STATE_OK;
+                        } else if (!strncmp(optarg, "warn", 4)) {
+                                config.econn_refuse_state = STATE_WARNING;
+                        } else if (!strncmp(optarg, "crit", 4)) {
+                                config.econn_refuse_state = STATE_CRITICAL;
+                        } else {
                                 usage4(_("Refuse must be one of ok, warn, crit"));
+                        }
                         break;
                 case 'M':
-                        if (!strncmp(optarg, "ok", 2))
-                                expect_mismatch_state = STATE_OK;
-                        else if (!strncmp(optarg, "warn", 4))
-                                expect_mismatch_state = STATE_WARNING;
-                        else if (!strncmp(optarg, "crit", 4))
-                                expect_mismatch_state = STATE_CRITICAL;
-                        else
+                        if (!strncmp(optarg, "ok", 2)) {
+                                config.expect_mismatch_state = STATE_OK;
+                        } else if (!strncmp(optarg, "warn", 4)) {
+                                config.expect_mismatch_state = STATE_WARNING;
+                        } else if (!strncmp(optarg, "crit", 4)) {
+                                config.expect_mismatch_state = STATE_CRITICAL;
+                        } else {
                                 usage4(_("Mismatch must be one of ok, warn, crit"));
+                        }
                         break;
                 case 'd':
-                        if (is_intpos(optarg))
-                                delay = atoi(optarg);
-                        else
+                        if (is_intpos(optarg)) {
+                                config.delay = atoi(optarg);
+                        } else {
                                 usage4(_("Delay must be a positive integer"));
+                        }
                         break;
-                case 'D': { /* Check SSL cert validity - days 'til certificate expiration */
+                case 'D': /* Check SSL cert validity - days 'til certificate expiration */
 #ifdef HAVE_SSL
 #       ifdef USE_OPENSSL /* XXX */
+                {
                         char *temp;
                         if ((temp = strchr(optarg, ',')) != NULL) {
                                 *temp = '\0';
-                                if (!is_intnonneg(optarg))
+                                if (!is_intnonneg(optarg)) {
                                         usage2(_("Invalid certificate expiration period"), optarg);
-                                days_till_exp_warn = atoi(optarg);
+                                }
+                                config.days_till_exp_warn = atoi(optarg);
                                 *temp = ',';
                                 temp++;
-                                if (!is_intnonneg(temp))
+                                if (!is_intnonneg(temp)) {
                                         usage2(_("Invalid certificate expiration period"), temp);
-                                days_till_exp_crit = atoi(temp);
+                                }
+                                config.days_till_exp_crit = atoi(temp);
                         } else {
-                                days_till_exp_crit = 0;
-                                if (!is_intnonneg(optarg))
+                                config.days_till_exp_crit = 0;
+                                if (!is_intnonneg(optarg)) {
                                         usage2(_("Invalid certificate expiration period"), optarg);
-                                days_till_exp_warn = atoi(optarg);
+                                }
+                                config.days_till_exp_warn = atoi(optarg);
                         }
-                        check_cert = true;
-                        flags |= FLAG_SSL;
+                        config.check_cert = true;
+                        config.use_tls = true;
                 } break;
 #       endif /* USE_OPENSSL */
 #endif
                         /* fallthrough if we don't have ssl */
                 case 'S':
 #ifdef HAVE_SSL
-                        flags |= FLAG_SSL;
+                        config.use_tls = true;
 #else
                         die(STATE_UNKNOWN, _("Invalid option - SSL is not available"));
 #endif
                         break;
                 case SNI_OPTION:
 #ifdef HAVE_SSL
-                        flags |= FLAG_SSL;
-                        sni_specified = true;
-                        sni = optarg;
+                        config.use_tls = true;
+                        config.sni_specified = true;
+                        config.sni = optarg;
 #else
                         die(STATE_UNKNOWN, _("Invalid option - SSL is not available"));
 #endif
                         break;
                 case 'A':
-                        match_flags |= NP_MATCH_ALL;
+                        config.match_flags |= NP_MATCH_ALL;
+                        break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        config.output_format_set = true;
+                        config.output_format = parser.output_format;
                         break;
                 }
+                }
         }
 
-        option_char = optind;
-        if (!host_specified && option_char < argc)
-                server_address = strdup(argv[option_char++]);
+        int index = optind;
+        if (!config.host_specified && index < argc) {
+                config.server_address = strdup(argv[index++]);
+        }
 
-        if (server_address == NULL)
+        if (config.server_address == NULL) {
                 usage4(_("You must provide a server address"));
-        else if (server_address[0] != '/' && !is_host(server_address))
-                die(STATE_CRITICAL, "%s %s - %s: %s\n", SERVICE, state_text(STATE_CRITICAL), _("Invalid hostname, address or socket"),
-                        server_address);
+        } else if (config.server_address[0] != '/' && !is_host(config.server_address)) {
+                die(STATE_CRITICAL, "%s %s - %s: %s\n", config.service, state_text(STATE_CRITICAL),
+                        _("Invalid hostname, address or socket"), config.server_address);
+        }
 
-        return OK;
+        check_tcp_config_wrapper result = {
+                .config = config,
+                .errorcode = OK,
+        };
+        return result;
 }
 
-void print_help(void) {
+void print_help(const char *service) {
         print_revision(progname, NP_VERSION);
 
         printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
         printf(COPYRIGHT, copyright, email);
 
-        printf(_("This plugin tests %s connections with the specified host (or unix socket).\n\n"), SERVICE);
+        printf(_("This plugin tests %s connections with the specified host (or unix socket).\n\n"),
+                   service);
 
         print_usage();
 
@@ -627,7 +775,8 @@ void print_help(void) {
         printf(UT_IPv46);
 
         printf(" %s\n", "-E, --escape");
-        printf("    %s\n", _("Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before send or quit option"));
+        printf("    %s\n", _("Can use \\n, \\r, \\t or \\\\ in send or quit string. Must come before "
+                                                 "send or quit option"));
         printf("    %s\n", _("Default: nothing added to send, \\r\\n added to end of quit"));
         printf(" %s\n", "-s, --send=STRING");
         printf("    %s\n", _("String to send to the server"));
@@ -640,7 +789,8 @@ void print_help(void) {
         printf(" %s\n", "-r, --refuse=ok|warn|crit");
         printf("    %s\n", _("Accept TCP refusals with states ok, warn, crit (default: crit)"));
         printf(" %s\n", "-M, --mismatch=ok|warn|crit");
-        printf("    %s\n", _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
+        printf("    %s\n",
+                   _("Accept expected string mismatches with states ok, warn, crit (default: warn)"));
         printf(" %s\n", "-j, --jail");
         printf("    %s\n", _("Hide output from TCP socket"));
         printf(" %s\n", "-m, --maxbytes=INTEGER");
@@ -662,6 +812,7 @@ void print_help(void) {
 
         printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
+        printf(UT_OUTPUT_FORMAT);
         printf(UT_VERBOSE);
 
         printf(UT_SUPPORT);
@@ -669,7 +820,8 @@ void print_help(void) {
 
 void print_usage(void) {
         printf("%s\n", _("Usage:"));
-        printf("%s -H host -p port [-w <warning time>] [-c <critical time>] [-s <send string>]\n", progname);
+        printf("%s -H host -p port [-w <warning time>] [-c <critical time>] [-s <send string>]\n",
+                   progname);
         printf("[-e <expect string>] [-q <quit string>][-m <maximum bytes>] [-d <delay>]\n");
         printf("[-t <timeout seconds>] [-r <refuse state>] [-M <mismatch state>] [-v] [-4|-6] [-j]\n");
         printf("[-D <warn days cert expire>[,<crit days cert expire>]] [-S <use SSL>] [-E]\n");
diff --git a/plugins/check_tcp.d/config.h b/plugins/check_tcp.d/config.h
new file mode 100644
index 00000000..dc25d79e
--- /dev/null
+++ b/plugins/check_tcp.d/config.h
@@ -0,0 +1,84 @@
+#pragma once
+
+#include "../../lib/utils_tcp.h"
+#include "output.h"
+#include "states.h"
+#include <netinet/in.h>
+
+typedef struct {
+        char *server_address;
+        bool host_specified;
+        int server_port; // TODO can this be a uint16?
+
+        int protocol; /* most common is default */
+        char *service;
+        char *send;
+        char *quit;
+        char **server_expect;
+        size_t server_expect_count;
+        bool use_tls;
+#ifdef HAVE_SSL
+        char *sni;
+        bool sni_specified;
+        bool check_cert;
+        int days_till_exp_warn;
+        int days_till_exp_crit;
+#endif // HAVE_SSL
+        int match_flags;
+        mp_state_enum expect_mismatch_state;
+        unsigned int delay;
+
+        bool warning_time_set;
+        double warning_time;
+        bool critical_time_set;
+        double critical_time;
+
+        mp_state_enum econn_refuse_state;
+
+        ssize_t maxbytes;
+
+        bool hide_output;
+
+        bool output_format_set;
+        mp_output_format output_format;
+} check_tcp_config;
+
+check_tcp_config check_tcp_config_init() {
+        check_tcp_config result = {
+                .server_address = "127.0.0.1",
+                .host_specified = false,
+                .server_port = 0,
+
+                .protocol = IPPROTO_TCP,
+                .service = "TCP",
+                .send = NULL,
+                .quit = NULL,
+                .server_expect = NULL,
+                .server_expect_count = 0,
+                .use_tls = false,
+#ifdef HAVE_SSL
+                .sni = NULL,
+                .sni_specified = false,
+                .check_cert = false,
+                .days_till_exp_warn = 0,
+                .days_till_exp_crit = 0,
+#endif // HAVE_SSL
+                .match_flags = NP_MATCH_EXACT,
+                .expect_mismatch_state = STATE_WARNING,
+                .delay = 0,
+
+                .warning_time_set = false,
+                .warning_time = 0,
+                .critical_time_set = false,
+                .critical_time = 0,
+
+                .econn_refuse_state = STATE_CRITICAL,
+
+                .maxbytes = 0,
+
+                .hide_output = false,
+
+                .output_format_set = false,
+        };
+        return result;
+}
diff --git a/plugins/check_time.c b/plugins/check_time.c
index d1f50683..fc9ba3f9 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -28,6 +28,7 @@
  *
  *****************************************************************************/
 
+#include "states.h"
 const char *progname = "check_time";
 const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
@@ -35,28 +36,15 @@ const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
-
-enum {
-        TIME_PORT = 37
-};
+#include "check_time.d/config.h"
 
 #define UNIX_EPOCH 2208988800UL
 
-static uint32_t raw_server_time;
-static unsigned long server_time, diff_time;
-static int warning_time = 0;
-static bool check_warning_time = false;
-static int critical_time = 0;
-static bool check_critical_time = false;
-static unsigned long warning_diff = 0;
-static bool check_warning_diff = false;
-static unsigned long critical_diff = 0;
-static bool check_critical_diff = false;
-static int server_port = TIME_PORT;
-static char *server_address = NULL;
-static bool use_udp = false;
-
-static int process_arguments(int, char **);
+typedef struct {
+        int errorcode;
+        check_time_config config;
+} check_time_config_wrapper;
+static check_time_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 static void print_help(void);
 void print_usage(void);
 
@@ -68,8 +56,12 @@ int main(int argc, char **argv) {
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
+        check_time_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
+        }
+
+        const check_time_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
         signal(SIGALRM, socket_timeout_alarm_handler);
@@ -79,37 +71,42 @@ int main(int argc, char **argv) {
         time(&start_time);
 
         int socket;
-        int result = STATE_UNKNOWN;
+        mp_state_enum result = STATE_UNKNOWN;
         /* try to connect to the host at the given port number */
-        if (use_udp) {
-                result = my_udp_connect(server_address, server_port, &socket);
+        if (config.use_udp) {
+                result = my_udp_connect(config.server_address, config.server_port, &socket);
         } else {
-                result = my_tcp_connect(server_address, server_port, &socket);
+                result = my_tcp_connect(config.server_address, config.server_port, &socket);
         }
 
         if (result != STATE_OK) {
-                if (check_critical_time)
+                if (config.check_critical_time) {
                         result = STATE_CRITICAL;
-                else if (check_warning_time)
+                } else if (config.check_warning_time) {
                         result = STATE_WARNING;
-                else
+                } else {
                         result = STATE_UNKNOWN;
-                die(result, _("TIME UNKNOWN - could not connect to server %s, port %d\n"), server_address, server_port);
+                }
+                die(result, _("TIME UNKNOWN - could not connect to server %s, port %d\n"),
+                        config.server_address, config.server_port);
         }
 
-        if (use_udp) {
+        if (config.use_udp) {
                 if (send(socket, "", 0, 0) < 0) {
-                        if (check_critical_time)
+                        if (config.check_critical_time) {
                                 result = STATE_CRITICAL;
-                        else if (check_warning_time)
+                        } else if (config.check_warning_time) {
                                 result = STATE_WARNING;
-                        else
+                        } else {
                                 result = STATE_UNKNOWN;
-                        die(result, _("TIME UNKNOWN - could not send UDP request to server %s, port %d\n"), server_address, server_port);
+                        }
+                        die(result, _("TIME UNKNOWN - could not send UDP request to server %s, port %d\n"),
+                                config.server_address, config.server_port);
                 }
         }
 
         /* watch for the connection string */
+        uint32_t raw_server_time;
         result = recv(socket, (void *)&raw_server_time, sizeof(raw_server_time), 0);
 
         /* close the connection */
@@ -121,48 +118,59 @@ int main(int argc, char **argv) {
 
         /* return a WARNING status if we couldn't read any data */
         if (result <= 0) {
-                if (check_critical_time)
+                if (config.check_critical_time) {
                         result = STATE_CRITICAL;
-                else if (check_warning_time)
+                } else if (config.check_warning_time) {
                         result = STATE_WARNING;
-                else
+                } else {
                         result = STATE_UNKNOWN;
-                die(result, _("TIME UNKNOWN - no data received from server %s, port %d\n"), server_address, server_port);
+                }
+                die(result, _("TIME UNKNOWN - no data received from server %s, port %d\n"),
+                        config.server_address, config.server_port);
         }
 
         result = STATE_OK;
 
         time_t conntime = (end_time - start_time);
-        if (check_critical_time && conntime > critical_time)
+        if (config.check_critical_time && conntime > config.critical_time) {
                 result = STATE_CRITICAL;
-        else if (check_warning_time && conntime > warning_time)
+        } else if (config.check_warning_time && conntime > config.warning_time) {
                 result = STATE_WARNING;
+        }
 
-        if (result != STATE_OK)
+        if (result != STATE_OK) {
                 die(result, _("TIME %s - %d second response time|%s\n"), state_text(result), (int)conntime,
-                        perfdata("time", (long)conntime, "s", check_warning_time, (long)warning_time, check_critical_time, (long)critical_time, true, 0,
-                                         false, 0));
+                        perfdata("time", (long)conntime, "s", config.check_warning_time,
+                                         (long)config.warning_time, config.check_critical_time,
+                                         (long)config.critical_time, true, 0, false, 0));
+        }
 
+        unsigned long server_time;
+        unsigned long diff_time;
         server_time = ntohl(raw_server_time) - UNIX_EPOCH;
-        if (server_time > (unsigned long)end_time)
+        if (server_time > (unsigned long)end_time) {
                 diff_time = server_time - (unsigned long)end_time;
-        else
+        } else {
                 diff_time = (unsigned long)end_time - server_time;
+        }
 
-        if (check_critical_diff && diff_time > critical_diff)
+        if (config.check_critical_diff && diff_time > config.critical_diff) {
                 result = STATE_CRITICAL;
-        else if (check_warning_diff && diff_time > warning_diff)
+        } else if (config.check_warning_diff && diff_time > config.warning_diff) {
                 result = STATE_WARNING;
+        }
 
         printf(_("TIME %s - %lu second time difference|%s %s\n"), state_text(result), diff_time,
-                   perfdata("time", (long)conntime, "s", check_warning_time, (long)warning_time, check_critical_time, (long)critical_time, true, 0,
-                                        false, 0),
-                   perfdata("offset", diff_time, "s", check_warning_diff, warning_diff, check_critical_diff, critical_diff, true, 0, false, 0));
+                   perfdata("time", (long)conntime, "s", config.check_warning_time,
+                                        (long)config.warning_time, config.check_critical_time,
+                                        (long)config.critical_time, true, 0, false, 0),
+                   perfdata("offset", diff_time, "s", config.check_warning_diff, config.warning_diff,
+                                        config.check_critical_diff, config.critical_diff, true, 0, false, 0));
         return result;
 }
 
 /* process command-line arguments */
-int process_arguments(int argc, char **argv) {
+check_time_config_wrapper process_arguments(int argc, char **argv) {
         static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
                                                                            {"warning-variance", required_argument, 0, 'w'},
                                                                            {"critical-variance", required_argument, 0, 'c'},
@@ -175,29 +183,37 @@ int process_arguments(int argc, char **argv) {
                                                                            {"help", no_argument, 0, 'h'},
                                                                            {0, 0, 0, 0}};
 
-        if (argc < 2)
+        if (argc < 2) {
                 usage("\n");
+        }
 
         for (int i = 1; i < argc; i++) {
-                if (strcmp("-to", argv[i]) == 0)
+                if (strcmp("-to", argv[i]) == 0) {
                         strcpy(argv[i], "-t");
-                else if (strcmp("-wd", argv[i]) == 0)
+                } else if (strcmp("-wd", argv[i]) == 0) {
                         strcpy(argv[i], "-w");
-                else if (strcmp("-cd", argv[i]) == 0)
+                } else if (strcmp("-cd", argv[i]) == 0) {
                         strcpy(argv[i], "-c");
-                else if (strcmp("-wt", argv[i]) == 0)
+                } else if (strcmp("-wt", argv[i]) == 0) {
                         strcpy(argv[i], "-W");
-                else if (strcmp("-ct", argv[i]) == 0)
+                } else if (strcmp("-ct", argv[i]) == 0) {
                         strcpy(argv[i], "-C");
+                }
         }
 
+        check_time_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_time_config_init(),
+        };
+
         int option_char;
         while (true) {
                 int option = 0;
                 option_char = getopt_long(argc, argv, "hVH:w:c:W:C:p:t:u", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
                 switch (option_char) {
                 case '?': /* print short usage statement if args not parsable */
@@ -209,18 +225,20 @@ int process_arguments(int argc, char **argv) {
                         print_revision(progname, NP_VERSION);
                         exit(STATE_UNKNOWN);
                 case 'H': /* hostname */
-                        if (!is_host(optarg))
+                        if (!is_host(optarg)) {
                                 usage2(_("Invalid hostname/address"), optarg);
-                        server_address = optarg;
+                        }
+                        result.config.server_address = optarg;
                         break;
                 case 'w': /* warning-variance */
                         if (is_intnonneg(optarg)) {
-                                warning_diff = strtoul(optarg, NULL, 10);
-                                check_warning_diff = true;
+                                result.config.warning_diff = strtoul(optarg, NULL, 10);
+                                result.config.check_warning_diff = true;
                         } else if (strspn(optarg, "0123456789:,") > 0) {
-                                if (sscanf(optarg, "%lu%*[:,]%d", &warning_diff, &warning_time) == 2) {
-                                        check_warning_diff = true;
-                                        check_warning_time = true;
+                                if (sscanf(optarg, "%lu%*[:,]%d", &result.config.warning_diff,
+                                                   &result.config.warning_time) == 2) {
+                                        result.config.check_warning_diff = true;
+                                        result.config.check_warning_time = true;
                                 } else {
                                         usage4(_("Warning thresholds must be a positive integer"));
                                 }
@@ -230,12 +248,13 @@ int process_arguments(int argc, char **argv) {
                         break;
                 case 'c': /* critical-variance */
                         if (is_intnonneg(optarg)) {
-                                critical_diff = strtoul(optarg, NULL, 10);
-                                check_critical_diff = true;
+                                result.config.critical_diff = strtoul(optarg, NULL, 10);
+                                result.config.check_critical_diff = true;
                         } else if (strspn(optarg, "0123456789:,") > 0) {
-                                if (sscanf(optarg, "%lu%*[:,]%d", &critical_diff, &critical_time) == 2) {
-                                        check_critical_diff = true;
-                                        check_critical_time = true;
+                                if (sscanf(optarg, "%lu%*[:,]%d", &result.config.critical_diff,
+                                                   &result.config.critical_time) == 2) {
+                                        result.config.check_critical_diff = true;
+                                        result.config.check_critical_time = true;
                                 } else {
                                         usage4(_("Critical thresholds must be a positive integer"));
                                 }
@@ -244,48 +263,53 @@ int process_arguments(int argc, char **argv) {
                         }
                         break;
                 case 'W': /* warning-connect */
-                        if (!is_intnonneg(optarg))
+                        if (!is_intnonneg(optarg)) {
                                 usage4(_("Warning threshold must be a positive integer"));
-                        else
-                                warning_time = atoi(optarg);
-                        check_warning_time = true;
+                        } else {
+                                result.config.warning_time = atoi(optarg);
+                        }
+                        result.config.check_warning_time = true;
                         break;
                 case 'C': /* critical-connect */
-                        if (!is_intnonneg(optarg))
+                        if (!is_intnonneg(optarg)) {
                                 usage4(_("Critical threshold must be a positive integer"));
-                        else
-                                critical_time = atoi(optarg);
-                        check_critical_time = true;
+                        } else {
+                                result.config.critical_time = atoi(optarg);
+                        }
+                        result.config.check_critical_time = true;
                         break;
                 case 'p': /* port */
-                        if (!is_intnonneg(optarg))
+                        if (!is_intnonneg(optarg)) {
                                 usage4(_("Port must be a positive integer"));
-                        else
-                                server_port = atoi(optarg);
+                        } else {
+                                result.config.server_port = atoi(optarg);
+                        }
                         break;
                 case 't': /* timeout */
-                        if (!is_intnonneg(optarg))
+                        if (!is_intnonneg(optarg)) {
                                 usage2(_("Timeout interval must be a positive integer"), optarg);
-                        else
+                        } else {
                                 socket_timeout = atoi(optarg);
+                        }
                         break;
                 case 'u': /* udp */
-                        use_udp = true;
+                        result.config.use_udp = true;
                 }
         }
 
         option_char = optind;
-        if (server_address == NULL) {
+        if (result.config.server_address == NULL) {
                 if (argc > option_char) {
-                        if (!is_host(argv[option_char]))
+                        if (!is_host(argv[option_char])) {
                                 usage2(_("Invalid hostname/address"), optarg);
-                        server_address = argv[option_char];
+                        }
+                        result.config.server_address = argv[option_char];
                 } else {
                         usage4(_("Hostname was not supplied"));
                 }
         }
 
-        return OK;
+        return result;
 }
 
 void print_help(void) {
diff --git a/plugins/check_time.d/config.h b/plugins/check_time.d/config.h
new file mode 100644
index 00000000..09bd7c45
--- /dev/null
+++ b/plugins/check_time.d/config.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+enum {
+        TIME_PORT = 37
+};
+
+typedef struct {
+        char *server_address;
+        int server_port;
+        bool use_udp;
+
+        int warning_time;
+        bool check_warning_time;
+        int critical_time;
+        bool check_critical_time;
+        unsigned long warning_diff;
+        bool check_warning_diff;
+        unsigned long critical_diff;
+        bool check_critical_diff;
+} check_time_config;
+
+check_time_config check_time_config_init() {
+        check_time_config tmp = {
+                .server_address = NULL,
+                .server_port = TIME_PORT,
+                .use_udp = false,
+
+                .warning_time = 0,
+                .check_warning_time = false,
+                .critical_time = 0,
+                .check_critical_time = false,
+
+                .warning_diff = 0,
+                .check_warning_diff = false,
+                .critical_diff = 0,
+                .check_critical_diff = false,
+        };
+        return tmp;
+}
diff --git a/plugins/check_ups.c b/plugins/check_ups.c
index 526a29df..54decce3 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -39,69 +39,29 @@ const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
-
-enum {
-        PORT = 3493
-};
-
-#define UPS_NONE      0  /* no supported options */
-#define UPS_UTILITY   1  /* supports utility line    */
-#define UPS_BATTPCT   2  /* supports percent battery remaining */
-#define UPS_STATUS    4  /* supports UPS status */
-#define UPS_TEMP      8  /* supports UPS temperature */
-#define UPS_LOADPCT   16 /* supports load percent */
-#define UPS_REALPOWER 32 /* supports real power */
-
-#define UPSSTATUS_NONE    0
-#define UPSSTATUS_OFF     1
-#define UPSSTATUS_OL      2
-#define UPSSTATUS_OB      4
-#define UPSSTATUS_LB      8
-#define UPSSTATUS_CAL     16
-#define UPSSTATUS_RB      32 /*Replace Battery */
-#define UPSSTATUS_BYPASS  64
-#define UPSSTATUS_OVER    128
-#define UPSSTATUS_TRIM    256
-#define UPSSTATUS_BOOST   512
-#define UPSSTATUS_CHRG    1024
-#define UPSSTATUS_DISCHRG 2048
-#define UPSSTATUS_UNKNOWN 4096
-#define UPSSTATUS_ALARM   8192
+#include "check_ups.d/config.h"
+#include "states.h"
 
 enum {
         NOSUCHVAR = ERROR - 1
 };
 
-typedef struct ups_config {
-        unsigned int server_port;
-        char *server_address;
-        char *ups_name;
-        double warning_value;
-        double critical_value;
-        bool check_warn;
-        bool check_crit;
-        int check_variable;
-        int status;
-        bool temp_output_c;
-} ups_config;
-
-ups_config ups_config_init(void) {
-        ups_config tmp = {0};
-        tmp.server_port = PORT;
-        tmp.server_address = NULL;
-        tmp.ups_name = NULL;
-        tmp.check_variable = UPS_NONE;
-        tmp.status = UPSSTATUS_NONE;
-
-        return tmp;
-}
-
 // Forward declarations
-static int determine_status(ups_config * /*config*/, int *supported_options);
-static int get_ups_variable(const char * /*varname*/, char * /*buf*/, ups_config config);
+typedef struct {
+        int errorcode;
+        int ups_status;
+        int supported_options;
+} determine_status_result;
+static determine_status_result determine_status(check_ups_config /*config*/);
+static int get_ups_variable(const char * /*varname*/, char * /*buf*/, check_ups_config config);
+
+typedef struct {
+        int errorcode;
+        check_ups_config config;
+} check_ups_config_wrapper;
+static check_ups_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_ups_config_wrapper validate_arguments(check_ups_config_wrapper /*config_wrapper*/);
 
-static int process_arguments(int /*argc*/, char ** /*argv*/, ups_config * /*config*/);
-static int validate_arguments(ups_config /*config*/);
 static void print_help(void);
 void print_usage(void);
 
@@ -109,28 +69,16 @@ int main(int argc, char **argv) {
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
-
-        char *ups_status;
-        ups_status = strdup("N/A");
-
-        char *data;
-        data = strdup("");
-
-        char *message;
-        message = strdup("");
-
-        // Exit result
-        int result = STATE_UNKNOWN;
-
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        // Config from commandline
-        ups_config config = ups_config_init();
+        check_ups_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        if (process_arguments(argc, argv, &config) == ERROR) {
+        if (tmp_config.errorcode == ERROR) {
                 usage4(_("Could not parse arguments"));
         }
+        // Config from commandline
+        check_ups_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
         signal(SIGALRM, socket_timeout_alarm_handler);
@@ -138,71 +86,76 @@ int main(int argc, char **argv) {
         /* set socket timeout */
         alarm(socket_timeout);
 
-        int supported_options = UPS_NONE;
-
         /* get the ups status if possible */
-        if (determine_status(&config, &supported_options) != OK) {
+        determine_status_result query_result = determine_status(config);
+        if (query_result.errorcode != OK) {
                 return STATE_CRITICAL;
         }
 
-        if (supported_options & UPS_STATUS) {
+        int ups_status_flags = query_result.ups_status;
+        int supported_options = query_result.supported_options;
 
-                ups_status = strdup("");
+        // Exit result
+        mp_state_enum result = STATE_UNKNOWN;
+        char *message = NULL;
 
+        if (supported_options & UPS_STATUS) {
+                char *ups_status = strdup("");
                 result = STATE_OK;
 
-                if (config.status & UPSSTATUS_OFF) {
+                if (ups_status_flags & UPSSTATUS_OFF) {
                         xasprintf(&ups_status, "Off");
                         result = STATE_CRITICAL;
-                } else if ((config.status & (UPSSTATUS_OB | UPSSTATUS_LB)) == (UPSSTATUS_OB | UPSSTATUS_LB)) {
+                } else if ((ups_status_flags & (UPSSTATUS_OB | UPSSTATUS_LB)) ==
+                                   (UPSSTATUS_OB | UPSSTATUS_LB)) {
                         xasprintf(&ups_status, _("On Battery, Low Battery"));
                         result = STATE_CRITICAL;
                 } else {
-                        if (config.status & UPSSTATUS_OL) {
+                        if (ups_status_flags & UPSSTATUS_OL) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _("Online"));
                         }
-                        if (config.status & UPSSTATUS_OB) {
+                        if (ups_status_flags & UPSSTATUS_OB) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _("On Battery"));
                                 result = max_state(result, STATE_WARNING);
                         }
-                        if (config.status & UPSSTATUS_LB) {
+                        if (ups_status_flags & UPSSTATUS_LB) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Low Battery"));
                                 result = max_state(result, STATE_WARNING);
                         }
-                        if (config.status & UPSSTATUS_CAL) {
+                        if (ups_status_flags & UPSSTATUS_CAL) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Calibrating"));
                         }
-                        if (config.status & UPSSTATUS_RB) {
+                        if (ups_status_flags & UPSSTATUS_RB) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Replace Battery"));
                                 result = max_state(result, STATE_WARNING);
                         }
-                        if (config.status & UPSSTATUS_BYPASS) {
+                        if (ups_status_flags & UPSSTATUS_BYPASS) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", On Bypass"));
                                 // Bypassing the battery is likely a bad thing
                                 result = STATE_CRITICAL;
                         }
-                        if (config.status & UPSSTATUS_OVER) {
+                        if (ups_status_flags & UPSSTATUS_OVER) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Overload"));
                                 result = max_state(result, STATE_WARNING);
                         }
-                        if (config.status & UPSSTATUS_TRIM) {
+                        if (ups_status_flags & UPSSTATUS_TRIM) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Trimming"));
                         }
-                        if (config.status & UPSSTATUS_BOOST) {
+                        if (ups_status_flags & UPSSTATUS_BOOST) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Boosting"));
                         }
-                        if (config.status & UPSSTATUS_CHRG) {
+                        if (ups_status_flags & UPSSTATUS_CHRG) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Charging"));
                         }
-                        if (config.status & UPSSTATUS_DISCHRG) {
+                        if (ups_status_flags & UPSSTATUS_DISCHRG) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Discharging"));
                                 result = max_state(result, STATE_WARNING);
                         }
-                        if (config.status & UPSSTATUS_ALARM) {
+                        if (ups_status_flags & UPSSTATUS_ALARM) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", ALARM"));
                                 result = STATE_CRITICAL;
                         }
-                        if (config.status & UPSSTATUS_UNKNOWN) {
+                        if (ups_status_flags & UPSSTATUS_UNKNOWN) {
                                 xasprintf(&ups_status, "%s%s", ups_status, _(", Unknown"));
                         }
                 }
@@ -211,7 +164,7 @@ int main(int argc, char **argv) {
 
         int res;
         char temp_buffer[MAX_INPUT_BUFFER];
-
+        char *performance_data = strdup("");
         /* get the ups utility voltage if possible */
         res = get_ups_variable("input.voltage", temp_buffer, config);
         if (res == NOSUCHVAR) {
@@ -239,11 +192,15 @@ int main(int argc, char **argv) {
                         } else if (config.check_warn && ups_utility_deviation >= config.warning_value) {
                                 result = max_state(result, STATE_WARNING);
                         }
-                        xasprintf(&data, "%s",
-                                          perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", config.check_warn, (long)(1000 * config.warning_value),
-                                                           config.check_crit, (long)(1000 * config.critical_value), true, 0, false, 0));
+                        xasprintf(&performance_data, "%s",
+                                          perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV",
+                                                           config.check_warn, (long)(1000 * config.warning_value),
+                                                           config.check_crit, (long)(1000 * config.critical_value), true, 0,
+                                                           false, 0));
                 } else {
-                        xasprintf(&data, "%s", perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", false, 0, false, 0, true, 0, false, 0));
+                        xasprintf(&performance_data, "%s",
+                                          perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", false, 0, false,
+                                                           0, true, 0, false, 0));
                 }
         }
 
@@ -266,11 +223,14 @@ int main(int argc, char **argv) {
                         } else if (config.check_warn && ups_battery_percent <= config.warning_value) {
                                 result = max_state(result, STATE_WARNING);
                         }
-                        xasprintf(&data, "%s %s", data,
-                                          perfdata("battery", (long)ups_battery_percent, "%", config.check_warn, (long)(config.warning_value),
-                                                           config.check_crit, (long)(config.critical_value), true, 0, true, 100));
+                        xasprintf(&performance_data, "%s %s", performance_data,
+                                          perfdata("battery", (long)ups_battery_percent, "%", config.check_warn,
+                                                           (long)(config.warning_value), config.check_crit,
+                                                           (long)(config.critical_value), true, 0, true, 100));
                 } else {
-                        xasprintf(&data, "%s %s", data, perfdata("battery", (long)ups_battery_percent, "%", false, 0, false, 0, true, 0, true, 100));
+                        xasprintf(&performance_data, "%s %s", performance_data,
+                                          perfdata("battery", (long)ups_battery_percent, "%", false, 0, false, 0, true,
+                                                           0, true, 100));
                 }
         }
 
@@ -293,11 +253,14 @@ int main(int argc, char **argv) {
                         } else if (config.check_warn && ups_load_percent >= config.warning_value) {
                                 result = max_state(result, STATE_WARNING);
                         }
-                        xasprintf(&data, "%s %s", data,
-                                          perfdata("load", (long)ups_load_percent, "%", config.check_warn, (long)(config.warning_value), config.check_crit,
+                        xasprintf(&performance_data, "%s %s", performance_data,
+                                          perfdata("load", (long)ups_load_percent, "%", config.check_warn,
+                                                           (long)(config.warning_value), config.check_crit,
                                                            (long)(config.critical_value), true, 0, true, 100));
                 } else {
-                        xasprintf(&data, "%s %s", data, perfdata("load", (long)ups_load_percent, "%", false, 0, false, 0, true, 0, true, 100));
+                        xasprintf(&performance_data, "%s %s", performance_data,
+                                          perfdata("load", (long)ups_load_percent, "%", false, 0, false, 0, true, 0,
+                                                           true, 100));
                 }
         }
 
@@ -329,11 +292,14 @@ int main(int argc, char **argv) {
                         } else if (config.check_warn && ups_temperature >= config.warning_value) {
                                 result = max_state(result, STATE_WARNING);
                         }
-                        xasprintf(&data, "%s %s", data,
-                                          perfdata("temp", (long)ups_temperature, tunits, config.check_warn, (long)(config.warning_value), config.check_crit,
+                        xasprintf(&performance_data, "%s %s", performance_data,
+                                          perfdata("temp", (long)ups_temperature, tunits, config.check_warn,
+                                                           (long)(config.warning_value), config.check_crit,
                                                            (long)(config.critical_value), true, 0, false, 0));
                 } else {
-                        xasprintf(&data, "%s %s", data, perfdata("temp", (long)ups_temperature, tunits, false, 0, false, 0, true, 0, false, 0));
+                        xasprintf(&performance_data, "%s %s", performance_data,
+                                          perfdata("temp", (long)ups_temperature, tunits, false, 0, false, 0, true, 0,
+                                                           false, 0));
                 }
         }
 
@@ -355,11 +321,14 @@ int main(int argc, char **argv) {
                         } else if (config.check_warn && ups_realpower >= config.warning_value) {
                                 result = max_state(result, STATE_WARNING);
                         }
-                        xasprintf(&data, "%s %s", data,
-                                          perfdata("realpower", (long)ups_realpower, "W", config.check_warn, (long)(config.warning_value), config.check_crit,
+                        xasprintf(&performance_data, "%s %s", performance_data,
+                                          perfdata("realpower", (long)ups_realpower, "W", config.check_warn,
+                                                           (long)(config.warning_value), config.check_crit,
                                                            (long)(config.critical_value), true, 0, false, 0));
                 } else {
-                        xasprintf(&data, "%s %s", data, perfdata("realpower", (long)ups_realpower, "W", false, 0, false, 0, true, 0, false, 0));
+                        xasprintf(&performance_data, "%s %s", performance_data,
+                                          perfdata("realpower", (long)ups_realpower, "W", false, 0, false, 0, true, 0,
+                                                           false, 0));
                 }
         }
 
@@ -373,71 +342,79 @@ int main(int argc, char **argv) {
         /* reset timeout */
         alarm(0);
 
-        printf("UPS %s - %s|%s\n", state_text(result), message, data);
-        return result;
+        printf("UPS %s - %s|%s\n", state_text(result), message, performance_data);
+        exit(result);
 }
 
 /* determines what options are supported by the UPS */
-int determine_status(ups_config *config, int *supported_options) {
-        char recv_buffer[MAX_INPUT_BUFFER];
+determine_status_result determine_status(const check_ups_config config) {
 
-        int res = get_ups_variable("ups.status", recv_buffer, *config);
+        determine_status_result result = {
+                .errorcode = OK,
+                .ups_status = UPSSTATUS_NONE,
+                .supported_options = 0,
+        };
+
+        char recv_buffer[MAX_INPUT_BUFFER];
+        int res = get_ups_variable("ups.status", recv_buffer, config);
         if (res == NOSUCHVAR) {
-                return OK;
+                return result;
         }
 
         if (res != STATE_OK) {
                 printf("%s\n", _("Invalid response received from host"));
-                return ERROR;
+                result.errorcode = ERROR;
+                return result;
         }
 
-        *supported_options |= UPS_STATUS;
+        result.supported_options |= UPS_STATUS;
 
         char temp_buffer[MAX_INPUT_BUFFER];
 
         strcpy(temp_buffer, recv_buffer);
-        for (char *ptr = (char *)strtok(temp_buffer, " "); ptr != NULL; ptr = (char *)strtok(NULL, " ")) {
+        for (char *ptr = strtok(temp_buffer, " "); ptr != NULL; ptr = strtok(NULL, " ")) {
                 if (!strcmp(ptr, "OFF")) {
-                        config->status |= UPSSTATUS_OFF;
+                        result.ups_status |= UPSSTATUS_OFF;
                 } else if (!strcmp(ptr, "OL")) {
-                        config->status |= UPSSTATUS_OL;
+                        result.ups_status |= UPSSTATUS_OL;
                 } else if (!strcmp(ptr, "OB")) {
-                        config->status |= UPSSTATUS_OB;
+                        result.ups_status |= UPSSTATUS_OB;
                 } else if (!strcmp(ptr, "LB")) {
-                        config->status |= UPSSTATUS_LB;
+                        result.ups_status |= UPSSTATUS_LB;
                 } else if (!strcmp(ptr, "CAL")) {
-                        config->status |= UPSSTATUS_CAL;
+                        result.ups_status |= UPSSTATUS_CAL;
                 } else if (!strcmp(ptr, "RB")) {
-                        config->status |= UPSSTATUS_RB;
+                        result.ups_status |= UPSSTATUS_RB;
                 } else if (!strcmp(ptr, "BYPASS")) {
-                        config->status |= UPSSTATUS_BYPASS;
+                        result.ups_status |= UPSSTATUS_BYPASS;
                 } else if (!strcmp(ptr, "OVER")) {
-                        config->status |= UPSSTATUS_OVER;
+                        result.ups_status |= UPSSTATUS_OVER;
                 } else if (!strcmp(ptr, "TRIM")) {
-                        config->status |= UPSSTATUS_TRIM;
+                        result.ups_status |= UPSSTATUS_TRIM;
                 } else if (!strcmp(ptr, "BOOST")) {
-                        config->status |= UPSSTATUS_BOOST;
+                        result.ups_status |= UPSSTATUS_BOOST;
                 } else if (!strcmp(ptr, "CHRG")) {
-                        config->status |= UPSSTATUS_CHRG;
+                        result.ups_status |= UPSSTATUS_CHRG;
                 } else if (!strcmp(ptr, "DISCHRG")) {
-                        config->status |= UPSSTATUS_DISCHRG;
+                        result.ups_status |= UPSSTATUS_DISCHRG;
                 } else if (!strcmp(ptr, "ALARM")) {
-                        config->status |= UPSSTATUS_ALARM;
+                        result.ups_status |= UPSSTATUS_ALARM;
                 } else {
-                        config->status |= UPSSTATUS_UNKNOWN;
+                        result.ups_status |= UPSSTATUS_UNKNOWN;
                 }
         }
 
-        return OK;
+        return result;
 }
 
 /* gets a variable value for a specific UPS  */
-int get_ups_variable(const char *varname, char *buf, const ups_config config) {
+int get_ups_variable(const char *varname, char *buf, const check_ups_config config) {
         char send_buffer[MAX_INPUT_BUFFER];
 
         /* create the command string to send to the UPS daemon */
         /* Add LOGOUT to avoid read failure logs */
-        int res = snprintf(send_buffer, sizeof(send_buffer), "GET VAR %s %s\nLOGOUT\n", config.ups_name, varname);
+        int res = snprintf(send_buffer, sizeof(send_buffer), "GET VAR %s %s\nLOGOUT\n", config.ups_name,
+                                           varname);
         if ((res > 0) && ((size_t)res >= sizeof(send_buffer))) {
                 printf("%s\n", _("UPS name to long for buffer"));
                 return ERROR;
@@ -446,7 +423,8 @@ int get_ups_variable(const char *varname, char *buf, const ups_config config) {
         char temp_buffer[MAX_INPUT_BUFFER];
 
         /* send the command to the daemon and get a response back */
-        if (process_tcp_request(config.server_address, config.server_port, send_buffer, temp_buffer, sizeof(temp_buffer)) != STATE_OK) {
+        if (process_tcp_request(config.server_address, config.server_port, send_buffer, temp_buffer,
+                                                        sizeof(temp_buffer)) != STATE_OK) {
                 printf("%s\n", _("Invalid response received from host"));
                 return ERROR;
         }
@@ -500,7 +478,7 @@ int get_ups_variable(const char *varname, char *buf, const ups_config config) {
                            [-wv warn_value] [-cv crit_value] [-to to_sec] */
 
 /* process command-line arguments */
-int process_arguments(int argc, char **argv, ups_config *config) {
+check_ups_config_wrapper process_arguments(int argc, char **argv) {
 
         static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
                                                                            {"ups", required_argument, 0, 'u'},
@@ -514,8 +492,14 @@ int process_arguments(int argc, char **argv, ups_config *config) {
                                                                            {"help", no_argument, 0, 'h'},
                                                                            {0, 0, 0, 0}};
 
+        check_ups_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_ups_config_init(),
+        };
+
         if (argc < 2) {
-                return ERROR;
+                result.errorcode = ERROR;
+                return result;
         }
 
         int c;
@@ -542,52 +526,52 @@ int process_arguments(int argc, char **argv, ups_config *config) {
                         usage5();
                 case 'H': /* hostname */
                         if (is_host(optarg)) {
-                                config->server_address = optarg;
+                                result.config.server_address = optarg;
                         } else {
                                 usage2(_("Invalid hostname/address"), optarg);
                         }
                         break;
                 case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for
                                          Fahrenheit) */
-                        config->temp_output_c = true;
+                        result.config.temp_output_c = true;
                         break;
                 case 'u': /* ups name */
-                        config->ups_name = optarg;
+                        result.config.ups_name = optarg;
                         break;
                 case 'p': /* port */
                         if (is_intpos(optarg)) {
-                                config->server_port = atoi(optarg);
+                                result.config.server_port = atoi(optarg);
                         } else {
                                 usage2(_("Port must be a positive integer"), optarg);
                         }
                         break;
                 case 'c': /* critical time threshold */
                         if (is_intnonneg(optarg)) {
-                                config->critical_value = atoi(optarg);
-                                config->check_crit = true;
+                                result.config.critical_value = atoi(optarg);
+                                result.config.check_crit = true;
                         } else {
                                 usage2(_("Critical time must be a positive integer"), optarg);
                         }
                         break;
                 case 'w': /* warning time threshold */
                         if (is_intnonneg(optarg)) {
-                                config->warning_value = atoi(optarg);
-                                config->check_warn = true;
+                                result.config.warning_value = atoi(optarg);
+                                result.config.check_warn = true;
                         } else {
                                 usage2(_("Warning time must be a positive integer"), optarg);
                         }
                         break;
                 case 'v': /* variable */
                         if (!strcmp(optarg, "LINE")) {
-                                config->check_variable = UPS_UTILITY;
+                                result.config.check_variable = UPS_UTILITY;
                         } else if (!strcmp(optarg, "TEMP")) {
-                                config->check_variable = UPS_TEMP;
+                                result.config.check_variable = UPS_TEMP;
                         } else if (!strcmp(optarg, "BATTPCT")) {
-                                config->check_variable = UPS_BATTPCT;
+                                result.config.check_variable = UPS_BATTPCT;
                         } else if (!strcmp(optarg, "LOADPCT")) {
-                                config->check_variable = UPS_LOADPCT;
+                                result.config.check_variable = UPS_LOADPCT;
                         } else if (!strcmp(optarg, "REALPOWER")) {
-                                config->check_variable = UPS_REALPOWER;
+                                result.config.check_variable = UPS_REALPOWER;
                         } else {
                                 usage2(_("Unrecognized UPS variable"), optarg);
                         }
@@ -608,27 +592,27 @@ int process_arguments(int argc, char **argv, ups_config *config) {
                 }
         }
 
-        if (config->server_address == NULL && argc > optind) {
+        if (result.config.server_address == NULL && argc > optind) {
                 if (is_host(argv[optind])) {
-                        config->server_address = argv[optind++];
+                        result.config.server_address = argv[optind++];
                 } else {
                         usage2(_("Invalid hostname/address"), optarg);
                 }
         }
 
-        if (config->server_address == NULL) {
-                config->server_address = strdup("127.0.0.1");
+        if (result.config.server_address == NULL) {
+                result.config.server_address = strdup("127.0.0.1");
         }
 
-        return validate_arguments(*config);
+        return validate_arguments(result);
 }
 
-int validate_arguments(ups_config config) {
-        if (!config.ups_name) {
+check_ups_config_wrapper validate_arguments(check_ups_config_wrapper config_wrapper) {
+        if (config_wrapper.config.ups_name) {
                 printf("%s\n", _("Error : no UPS indicated"));
-                return ERROR;
+                config_wrapper.errorcode = ERROR;
         }
-        return OK;
+        return config_wrapper;
 }
 
 void print_help(void) {
@@ -660,7 +644,8 @@ void print_help(void) {
         printf(" %s\n", "-T, --temperature");
         printf("    %s\n", _("Output of temperatures in Celsius"));
         printf(" %s\n", "-v, --variable=STRING");
-        printf("    %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT, LOADPCT or REALPOWER");
+        printf("    %s %s\n", _("Valid values for STRING are"),
+                   "LINE, TEMP, BATTPCT, LOADPCT or REALPOWER");
 
         printf(UT_WARN_CRIT);
 
diff --git a/plugins/check_ups.d/config.h b/plugins/check_ups.d/config.h
new file mode 100644
index 00000000..e05edceb
--- /dev/null
+++ b/plugins/check_ups.d/config.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+#define UPS_NONE      0  /* no supported options */
+#define UPS_UTILITY   1  /* supports utility line    */
+#define UPS_BATTPCT   2  /* supports percent battery remaining */
+#define UPS_STATUS    4  /* supports UPS status */
+#define UPS_TEMP      8  /* supports UPS temperature */
+#define UPS_LOADPCT   16 /* supports load percent */
+#define UPS_REALPOWER 32 /* supports real power */
+
+#define UPSSTATUS_NONE    0
+#define UPSSTATUS_OFF     1
+#define UPSSTATUS_OL      2
+#define UPSSTATUS_OB      4
+#define UPSSTATUS_LB      8
+#define UPSSTATUS_CAL     16
+#define UPSSTATUS_RB      32 /*Replace Battery */
+#define UPSSTATUS_BYPASS  64
+#define UPSSTATUS_OVER    128
+#define UPSSTATUS_TRIM    256
+#define UPSSTATUS_BOOST   512
+#define UPSSTATUS_CHRG    1024
+#define UPSSTATUS_DISCHRG 2048
+#define UPSSTATUS_UNKNOWN 4096
+#define UPSSTATUS_ALARM   8192
+
+enum {
+        PORT = 3493
+};
+
+typedef struct ups_config {
+        unsigned int server_port;
+        char *server_address;
+        char *ups_name;
+        double warning_value;
+        double critical_value;
+        bool check_warn;
+        bool check_crit;
+        int check_variable;
+        bool temp_output_c;
+} check_ups_config;
+
+check_ups_config check_ups_config_init(void) {
+        check_ups_config tmp = {0};
+        tmp.server_port = PORT;
+        tmp.server_address = NULL;
+        tmp.ups_name = NULL;
+        tmp.check_variable = UPS_NONE;
+
+        return tmp;
+}
diff --git a/plugins/check_users.c b/plugins/check_users.c
index f1e1c39d..3b2e265e 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -34,8 +34,15 @@ const char *progname = "check_users";
 const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
-#include "common.h"
-#include "utils.h"
+#include "check_users.d/users.h"
+#include "output.h"
+#include "perfdata.h"
+#include "states.h"
+#include "utils_base.h"
+#include "./common.h"
+#include "./utils.h"
+#include "check_users.d/config.h"
+#include "thresholds.h"
 
 #if HAVE_WTSAPI32_H
 #       include <windows.h>
@@ -44,8 +51,6 @@ const char *email = "devel@monitoring-plugins.org";
 #       define ERROR -1
 #elif HAVE_UTMPX_H
 #       include <utmpx.h>
-#else
-#       include "popen.h"
 #endif
 
 #ifdef HAVE_LIBSYSTEMD
@@ -53,29 +58,16 @@ const char *email = "devel@monitoring-plugins.org";
 #       include <systemd/sd-login.h>
 #endif
 
-#define possibly_set(a, b) ((a) == 0 ? (b) : 0)
+typedef struct process_argument_wrapper {
+        int errorcode;
+        check_users_config config;
+} check_users_config_wrapper;
+check_users_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 
-static int process_arguments(int, char **);
-static void print_help(void);
+void print_help(void);
 void print_usage(void);
 
-static char *warning_range = NULL;
-static char *critical_range = NULL;
-static thresholds *thlds = NULL;
-
 int main(int argc, char **argv) {
-        int users = -1;
-        int result = STATE_UNKNOWN;
-#if HAVE_WTSAPI32_H
-        WTS_SESSION_INFO *wtsinfo;
-        DWORD wtscount;
-        DWORD index;
-#elif HAVE_UTMPX_H
-        struct utmpx *putmpx;
-#else
-        char input_buffer[MAX_INPUT_BUFFER];
-#endif
-
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
         textdomain(PACKAGE);
@@ -83,121 +75,104 @@ int main(int argc, char **argv) {
         /* Parse extra opts if any */
         argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
-                usage4(_("Could not parse arguments"));
-
-        users = 0;
-
-#ifdef HAVE_LIBSYSTEMD
-        if (sd_booted() > 0)
-                users = sd_get_sessions(NULL);
-        else {
-#endif
-#if HAVE_WTSAPI32_H
-                if (!WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE, 0, 1, &wtsinfo, &wtscount)) {
-                        printf(_("Could not enumerate RD sessions: %d\n"), GetLastError());
-                        return STATE_UNKNOWN;
-                }
-
-                for (index = 0; index < wtscount; index++) {
-                        LPTSTR username;
-                        DWORD size;
-                        int len;
-
-                        if (!WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE, wtsinfo[index].SessionId, WTSUserName, &username, &size))
-                                continue;
-
-                        len = lstrlen(username);
-
-                        WTSFreeMemory(username);
-
-                        if (len == 0)
-                                continue;
-
-                        if (wtsinfo[index].State == WTSActive || wtsinfo[index].State == WTSDisconnected)
-                                users++;
-                }
-
-                WTSFreeMemory(wtsinfo);
-#elif HAVE_UTMPX_H
-        /* get currently logged users from utmpx */
-        setutxent();
-
-        while ((putmpx = getutxent()) != NULL)
-                if (putmpx->ut_type == USER_PROCESS)
-                        users++;
+        check_users_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        endutxent();
-#else
-        /* run the command */
-        child_process = spopen(WHO_COMMAND);
-        if (child_process == NULL) {
-                printf(_("Could not open pipe: %s\n"), WHO_COMMAND);
-                return STATE_UNKNOWN;
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
         }
 
-        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
-        if (child_stderr == NULL)
-                printf(_("Could not open stderr for %s\n"), WHO_COMMAND);
-
-        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
-                /* increment 'users' on all lines except total user count */
-                if (input_buffer[0] != '#') {
-                        users++;
-                        continue;
-                }
+        check_users_config config = tmp_config.config;
 
-                /* get total logged in users */
-                if (sscanf(input_buffer, _("# users=%d"), &users) == 1)
-                        break;
+#ifdef _WIN32
+#       if HAVE_WTSAPI32_H
+        get_num_of_users_wrapper user_wrapper = get_num_of_users_windows();
+#       else
+#               error Did not find WTSAPI32
+#       endif // HAVE_WTSAPI32_H
+#else
+#       ifdef HAVE_LIBSYSTEMD
+        get_num_of_users_wrapper user_wrapper = get_num_of_users_systemd();
+#       elif HAVE_UTMPX_H
+        get_num_of_users_wrapper user_wrapper = get_num_of_users_utmp();
+#       else  // !HAVE_LIBSYSTEMD && !HAVE_UTMPX_H
+        get_num_of_users_wrapper user_wrapper = get_num_of_users_who_command();
+#       endif // HAVE_LIBSYSTEMD
+#endif     // _WIN32
+
+        mp_check overall = mp_check_init();
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
         }
+        mp_subcheck sc_users = mp_subcheck_init();
 
-        /* check STDERR */
-        if (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
-                result = possibly_set(result, STATE_UNKNOWN);
-        (void)fclose(child_stderr);
-
-        /* close the pipe */
-        if (spclose(child_process))
-                result = possibly_set(result, STATE_UNKNOWN);
-#endif
-#ifdef HAVE_LIBSYSTEMD
+        if (user_wrapper.errorcode != 0) {
+                sc_users = mp_set_subcheck_state(sc_users, STATE_UNKNOWN);
+                sc_users.output = "Failed to retrieve number of users";
+                mp_add_subcheck_to_check(&overall, sc_users);
+                mp_exit(overall);
         }
-#endif
-
         /* check the user count against warning and critical thresholds */
-        result = get_status((double)users, thlds);
 
-        if (result == STATE_UNKNOWN)
-                printf("%s\n", _("Unable to read output"));
-        else {
-                printf(_("USERS %s - %d users currently logged in |%s\n"), state_text(result), users,
-                           sperfdata_int("users", users, "", warning_range, critical_range, true, 0, false, 0));
+        mp_perfdata users_pd = {
+                .label = "users",
+                .value = mp_create_pd_value(user_wrapper.users),
+        };
+
+        users_pd = mp_pd_set_thresholds(users_pd, config.thresholds);
+        mp_add_perfdata_to_subcheck(&sc_users, users_pd);
+
+        int tmp_status = mp_get_pd_status(users_pd);
+        sc_users = mp_set_subcheck_state(sc_users, tmp_status);
+
+        switch (tmp_status) {
+        case STATE_WARNING:
+                xasprintf(&sc_users.output,
+                                  "%d users currently logged in. This violates the warning threshold",
+                                  user_wrapper.users);
+                break;
+        case STATE_CRITICAL:
+                xasprintf(&sc_users.output,
+                                  "%d users currently logged in. This violates the critical threshold",
+                                  user_wrapper.users);
+                break;
+        default:
+                xasprintf(&sc_users.output, "%d users currently logged in", user_wrapper.users);
         }
 
-        return result;
+        mp_add_subcheck_to_check(&overall, sc_users);
+        mp_exit(overall);
 }
 
+#define output_format_index CHAR_MAX + 1
+
 /* process command-line arguments */
-int process_arguments(int argc, char **argv) {
+check_users_config_wrapper process_arguments(int argc, char **argv) {
         static struct option longopts[] = {{"critical", required_argument, 0, 'c'},
                                                                            {"warning", required_argument, 0, 'w'},
                                                                            {"version", no_argument, 0, 'V'},
                                                                            {"help", no_argument, 0, 'h'},
+                                                                           {"output-format", required_argument, 0, output_format_index},
                                                                            {0, 0, 0, 0}};
 
-        if (argc < 2)
-                usage("\n");
+        if (argc < 2) {
+                usage(progname);
+        }
+
+        char *warning_range = NULL;
+        char *critical_range = NULL;
+        check_users_config_wrapper result = {
+                .config = check_users_config_init(),
+                .errorcode = OK,
+        };
 
-        int option_char;
         while (true) {
-                int option = 0;
-                option_char = getopt_long(argc, argv, "+hVvc:w:", longopts, &option);
+                int counter = getopt_long(argc, argv, "+hVvc:w:", longopts, NULL);
 
-                if (option_char == -1 || option_char == EOF || option_char == 1)
+                if (counter == -1 || counter == EOF || counter == 1) {
                         break;
+                }
 
-                switch (option_char) {
+                switch (counter) {
                 case '?': /* print short usage statement if args not parsable */
                         usage5();
                 case 'h': /* help */
@@ -212,29 +187,66 @@ int process_arguments(int argc, char **argv) {
                 case 'w': /* warning */
                         warning_range = optarg;
                         break;
+                case output_format_index: {
+                        parsed_output_format parser = mp_parse_output_format(optarg);
+                        if (!parser.parsing_success) {
+                                // TODO List all available formats here, maybe add anothoer usage function
+                                printf("Invalid output format: %s\n", optarg);
+                                exit(STATE_UNKNOWN);
+                        }
+
+                        result.config.output_format_is_set = true;
+                        result.config.output_format = parser.output_format;
+                        break;
+                }
                 }
         }
 
-        option_char = optind;
+        int option_char = optind;
 
-        if (warning_range == NULL && argc > option_char)
+        if (warning_range == NULL && argc > option_char) {
                 warning_range = argv[option_char++];
+        }
 
-        if (critical_range == NULL && argc > option_char)
+        if (critical_range == NULL && argc > option_char) {
                 critical_range = argv[option_char++];
+        }
+
+        // TODO add proper verification for ranges here!
+        mp_range_parsed tmp;
+        if (warning_range) {
+                tmp = mp_parse_range_string(warning_range);
+        } else {
+                printf("Warning threshold missing\n");
+                print_usage();
+                exit(STATE_UNKNOWN);
+        }
 
-        /* this will abort in case of invalid ranges */
-        set_thresholds(&thlds, warning_range, critical_range);
+        if (tmp.error == MP_PARSING_SUCCES) {
+                result.config.thresholds.warning = tmp.range;
+                result.config.thresholds.warning_is_set = true;
+        } else {
+                printf("Failed to parse warning range: %s", warning_range);
+                exit(STATE_UNKNOWN);
+        }
 
-        if (!thlds->warning) {
-                usage4(_("Warning threshold must be a valid range expression"));
+        if (critical_range) {
+                tmp = mp_parse_range_string(critical_range);
+        } else {
+                printf("Critical threshold missing\n");
+                print_usage();
+                exit(STATE_UNKNOWN);
         }
 
-        if (!thlds->critical) {
-                usage4(_("Critical threshold must be a valid range expression"));
+        if (tmp.error == MP_PARSING_SUCCES) {
+                result.config.thresholds.critical = tmp.range;
+                result.config.thresholds.critical_is_set = true;
+        } else {
+                printf("Failed to parse critical range: %s", critical_range);
+                exit(STATE_UNKNOWN);
         }
 
-        return OK;
+        return result;
 }
 
 void print_help(void) {
@@ -244,7 +256,8 @@ void print_help(void) {
         printf(COPYRIGHT, copyright, email);
 
         printf("%s\n", _("This plugin checks the number of users currently logged in on the local"));
-        printf("%s\n", _("system and generates an error if the number exceeds the thresholds specified."));
+        printf("%s\n",
+                   _("system and generates an error if the number exceeds the thresholds specified."));
 
         printf("\n\n");
 
@@ -254,9 +267,12 @@ void print_help(void) {
         printf(UT_EXTRA_OPTS);
 
         printf(" %s\n", "-w, --warning=RANGE_EXPRESSION");
-        printf("    %s\n", _("Set WARNING status if number of logged in users violates RANGE_EXPRESSION"));
+        printf("    %s\n",
+                   _("Set WARNING status if number of logged in users violates RANGE_EXPRESSION"));
         printf(" %s\n", "-c, --critical=RANGE_EXPRESSION");
-        printf("    %s\n", _("Set CRITICAL status if number of logged in users violates RANGE_EXPRESSION"));
+        printf("    %s\n",
+                   _("Set CRITICAL status if number of logged in users violates RANGE_EXPRESSION"));
+        printf(UT_OUTPUT_FORMAT);
 
         printf(UT_SUPPORT);
 }
diff --git a/plugins/check_users.d/config.h b/plugins/check_users.d/config.h
new file mode 100644
index 00000000..26d3ee70
--- /dev/null
+++ b/plugins/check_users.d/config.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include "output.h"
+#include "thresholds.h"
+
+typedef struct check_users_config {
+        mp_thresholds thresholds;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
+} check_users_config;
+
+check_users_config check_users_config_init() {
+        check_users_config tmp = {
+                .thresholds = mp_thresholds_init(),
+
+                .output_format_is_set = false,
+        };
+        return tmp;
+}
diff --git a/plugins/check_users.d/users.c b/plugins/check_users.d/users.c
new file mode 100644
index 00000000..a08f79c5
--- /dev/null
+++ b/plugins/check_users.d/users.c
@@ -0,0 +1,169 @@
+#include "./users.h"
+
+#ifdef _WIN32
+#       ifdef HAVE_WTSAPI32_H
+#               include <windows.h>
+#               include <wtsapi32.h>
+#               undef ERROR
+#               define ERROR -1
+
+get_num_of_users_wrapper get_num_of_users_windows() {
+        WTS_SESSION_INFO *wtsinfo;
+        DWORD wtscount;
+
+        get_num_of_users_wrapper result = {};
+
+        if (!WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE, 0, 1, &wtsinfo, &wtscount)) {
+                // printf(_("Could not enumerate RD sessions: %d\n"), GetLastError());
+                result.error = WINDOWS_COULD_NOT_ENUMERATE_SESSIONS;
+                return result;
+        }
+
+        for (DWORD index = 0; index < wtscount; index++) {
+                LPTSTR username;
+                DWORD size;
+
+                if (!WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE, wtsinfo[index].SessionId,
+                                                                                WTSUserName, &username, &size)) {
+                        continue;
+                }
+
+                int len = lstrlen(username);
+
+                WTSFreeMemory(username);
+
+                if (len == 0) {
+                        continue;
+                }
+
+                if (wtsinfo[index].State == WTSActive || wtsinfo[index].State == WTSDisconnected) {
+                        result.users++;
+                }
+        }
+
+        WTSFreeMemory(wtsinfo);
+        return result;
+}
+#       else // HAVE_WTSAPI32_H
+#               error On windows but without the WTSAPI32 lib
+#       endif // HAVE_WTSAPI32_H
+
+#else // _WIN32
+
+#       include "../../config.h"
+#       include <stddef.h>
+
+#       ifdef HAVE_LIBSYSTEMD
+#               include <systemd/sd-daemon.h>
+#               include <systemd/sd-login.h>
+
+get_num_of_users_wrapper get_num_of_users_systemd() {
+        get_num_of_users_wrapper result = {};
+
+        // Test whether we booted with systemd
+        if (sd_booted() > 0) {
+                int users = sd_get_uids(NULL);
+                if (users >= 0) {
+                        // Success
+                        result.users = users;
+                        return result;
+                }
+
+                // Failure! return the error code
+                result.errorcode = users;
+                return result;
+        }
+
+        // Looks like we are not running systemd,
+        // return with error here
+        result.errorcode = NO_SYSTEMD_ERROR;
+        return result;
+}
+#       endif
+
+#       ifdef HAVE_UTMPX_H
+#               include <utmpx.h>
+
+get_num_of_users_wrapper get_num_of_users_utmp() {
+        int users = 0;
+
+        /* get currently logged users from utmpx */
+        setutxent();
+
+        struct utmpx *putmpx;
+        while ((putmpx = getutxent()) != NULL) {
+                if (putmpx->ut_type == USER_PROCESS) {
+                        users++;
+                }
+        }
+
+        endutxent();
+
+        get_num_of_users_wrapper result = {
+                .errorcode = 0,
+                .users = users,
+        };
+
+        return result;
+}
+#       endif
+
+#       ifndef HAVE_WTSAPI32_H
+#               ifndef HAVE_LIBSYSTEMD
+#                       ifndef HAVE_UTMPX_H
+//  Fall back option here for the others (probably still not on windows)
+
+#                               include "../common.h"
+#                               include "../popen.h"
+#                               include "../utils.h"
+
+get_num_of_users_wrapper get_num_of_users_who_command() {
+        /* run the command */
+        child_process = spopen(WHO_COMMAND);
+        if (child_process == NULL) {
+                // printf(_("Could not open pipe: %s\n"), WHO_COMMAND);
+                get_num_of_users_wrapper result = {
+                        .errorcode = COULD_NOT_OPEN_PIPE,
+                };
+                return result;
+        }
+
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
+        if (child_stderr == NULL) {
+                // printf(_("Could not open stderr for %s\n"), WHO_COMMAND);
+                //  TODO this error should probably be reported
+        }
+
+        get_num_of_users_wrapper result = {};
+        char input_buffer[MAX_INPUT_BUFFER];
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+                /* increment 'users' on all lines except total user count */
+                if (input_buffer[0] != '#') {
+                        result.users++;
+                        continue;
+                }
+
+                /* get total logged in users */
+                if (sscanf(input_buffer, _("# users=%d"), &result.users) == 1) {
+                        break;
+                }
+        }
+
+        /* check STDERR */
+        if (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+                // if this fails, something broke and the result can not be relied upon or so is the theorie
+                // here
+                result.errorcode = STDERR_COULD_NOT_BE_READ;
+        }
+        (void)fclose(child_stderr);
+
+        /* close the pipe */
+        spclose(child_process);
+
+        return result;
+}
+
+#                       endif
+#               endif
+#       endif
+#endif
diff --git a/plugins/check_users.d/users.h b/plugins/check_users.d/users.h
new file mode 100644
index 00000000..aacba775
--- /dev/null
+++ b/plugins/check_users.d/users.h
@@ -0,0 +1,18 @@
+#pragma once
+
+typedef struct get_num_of_users_wrapper {
+        int errorcode;
+        int users;
+} get_num_of_users_wrapper;
+
+enum {
+        NO_SYSTEMD_ERROR = 64,
+        WINDOWS_COULD_NOT_ENUMERATE_SESSIONS,
+        COULD_NOT_OPEN_PIPE,
+        STDERR_COULD_NOT_BE_READ,
+};
+
+get_num_of_users_wrapper get_num_of_users_systemd();
+get_num_of_users_wrapper get_num_of_users_utmp();
+get_num_of_users_wrapper get_num_of_users_windows();
+get_num_of_users_wrapper get_num_of_users_who_command();
diff --git a/plugins/common.h b/plugins/common.h
index 603bae55..ef888d08 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -1,121 +1,122 @@
 /*****************************************************************************
-* 
-* Monitoring Plugins common include file
-* 
-* License: GPL
-* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains common include files and defines used in many of
-* the plugins.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring Plugins common include file
+ *
+ * License: GPL
+ * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 2003-2007 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains common include files and defines used in many of
+ * the plugins.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #ifndef _COMMON_H_
 #define _COMMON_H_
 
-#include "config.h"
+#include "../config.h"
 #include "../lib/monitoringplug.h"
 
 #ifdef HAVE_FEATURES_H
-#include <features.h>
+#       include <features.h>
 #endif
 
-#include <stdio.h>                                                      /* obligatory includes */
+#include <stdio.h> /* obligatory includes */
 #include <stdlib.h>
 #include <errno.h>
 
-/* This block provides uintmax_t - should be reported to coreutils that this should be added to fsuage.h */
+/* This block provides uintmax_t - should be reported to coreutils that this should be added to
+ * fsuage.h */
 #if HAVE_INTTYPES_H
-# include <inttypes.h>
+#       include <inttypes.h>
 #endif
 #if HAVE_STDINT_H
-# include <stdint.h>
+#       include <stdint.h>
 #endif
 #include <unistd.h>
 #ifndef UINTMAX_MAX
-# define UINTMAX_MAX ((uintmax_t) -1)
+#       define UINTMAX_MAX ((uintmax_t) - 1)
 #endif
 
-#include <limits.h>     /* This is assumed true, because coreutils assume it too */
+#include <limits.h> /* This is assumed true, because coreutils assume it too */
 
 #ifdef HAVE_MATH_H
-#include <math.h>
+#       include <math.h>
 #endif
 
 #ifdef _AIX
-#ifdef HAVE_MP_H
-#include <mp.h>
-#endif
+#       ifdef HAVE_MP_H
+#               include <mp.h>
+#       endif
 #endif
 
 #ifdef HAVE_STRINGS_H
-#include <strings.h>
+#       include <strings.h>
 #endif
 #ifdef HAVE_STRING_H
-#include <string.h>
+#       include <string.h>
 #endif
 
 #ifdef HAVE_UNISTD_H
-#include <unistd.h>
+#       include <unistd.h>
 #endif
 
-/* GET_NUMBER_OF_CPUS is a macro to return 
+/* GET_NUMBER_OF_CPUS is a macro to return
    number of CPUs, if we can get that data.
    Use configure.in to test for various OS ways of
    getting that data
    Will return -1 if cannot get data
 */
 #if defined(HAVE_SYSCONF__SC_NPROCESSORS_ONLN)
-# define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_ONLN)
-#elif defined (HAVE_SYSCONF__SC_NPROCESSORS_CONF)
-# define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF)
+#       define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_ONLN)
+#elif defined(HAVE_SYSCONF__SC_NPROCESSORS_CONF)
+#       define GET_NUMBER_OF_CPUS() sysconf(_SC_NPROCESSORS_CONF)
 #else
-# define GET_NUMBER_OF_CPUS() -1
+#       define GET_NUMBER_OF_CPUS() -1
 #endif
 
 #ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
+#       include <sys/time.h>
 #endif
 #include <time.h>
 
 #ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
+#       include <sys/types.h>
 #endif
 
 #ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
+#       include <sys/socket.h>
 #endif
 
 #ifdef HAVE_SIGNAL_H
-#include <signal.h>
+#       include <signal.h>
 #endif
 
 /* GNU Libraries */
 #include <getopt.h>
-#include "dirname.h"
+#include "../gl/dirname.h"
 
 #include <locale.h>
 
 #ifdef HAVE_SYS_POLL_H
-# include "sys/poll.h"
+#       include "sys/poll.h"
 #endif
 
 /*
@@ -125,42 +126,42 @@
  */
 
 #ifndef HAVE_STRTOL
-# define strtol(a,b,c) atol((a))
+#       define strtol(a, b, c) atol((a))
 #endif
 
 #ifndef HAVE_STRTOUL
-# define strtoul(a,b,c) (unsigned long)atol((a))
+#       define strtoul(a, b, c) (unsigned long)atol((a))
 #endif
 
 /* SSL implementations */
 #ifdef HAVE_GNUTLS_OPENSSL_H
-#  include <gnutls/openssl.h>
+#       include <gnutls/openssl.h>
 #else
-#  define OPENSSL_LOAD_CONF /* See the OPENSSL_config(3) man page. */
-#  ifdef HAVE_SSL_H
-#    include <rsa.h>
-#    include <crypto.h>
-#    include <x509.h>
-#    include <pem.h>
-#    include <ssl.h>
-#    include <err.h>
-#  else
-#    ifdef HAVE_OPENSSL_SSL_H
-#      include <openssl/rsa.h>
-#      include <openssl/crypto.h>
-#      include <openssl/x509.h>
-#      include <openssl/pem.h>
-#      include <openssl/ssl.h>
-#      include <openssl/err.h>
-#    endif
-#  endif
+#       define OPENSSL_LOAD_CONF /* See the OPENSSL_config(3) man page. */
+#       ifdef HAVE_SSL_H
+#               include <rsa.h>
+#               include <crypto.h>
+#               include <x509.h>
+#               include <pem.h>
+#               include <ssl.h>
+#               include <err.h>
+#       else
+#               ifdef HAVE_OPENSSL_SSL_H
+#                       include <openssl/rsa.h>
+#                       include <openssl/crypto.h>
+#                       include <openssl/x509.h>
+#                       include <openssl/pem.h>
+#                       include <openssl/ssl.h>
+#                       include <openssl/err.h>
+#               endif
+#       endif
 #endif
 
 /* openssl 1.1 does not set OPENSSL_NO_SSL2 by default but ships without ssl2 */
 #ifdef OPENSSL_VERSION_NUMBER
-#  if OPENSSL_VERSION_NUMBER >= 0x10100000
-#   define OPENSSL_NO_SSL2
-#  endif
+#       if OPENSSL_VERSION_NUMBER >= 0x10100000
+#               define OPENSSL_NO_SSL2
+#       endif
 #endif
 
 /*
@@ -171,7 +172,7 @@
 
 /* MariaDB 10.2 client does not set MYSQL_PORT */
 #ifndef MYSQL_PORT
-#  define MYSQL_PORT 3306
+#       define MYSQL_PORT 3306
 #endif
 
 enum {
@@ -180,9 +181,9 @@ enum {
 };
 
 enum {
-        DEFAULT_SOCKET_TIMEOUT = 10,     /* timeout after 10 seconds */
-        MAX_INPUT_BUFFER = 8192,             /* max size of most buffers we use */
-        MAX_HOST_ADDRESS_LENGTH = 256    /* max size of a host address */
+        DEFAULT_SOCKET_TIMEOUT = 10,  /* timeout after 10 seconds */
+        MAX_INPUT_BUFFER = 8192,      /* max size of most buffers we use */
+        MAX_HOST_ADDRESS_LENGTH = 256 /* max size of a host address */
 };
 
 /*
@@ -190,18 +191,18 @@ enum {
  * Internationalization
  *
  */
-#include "gettext.h"
-#define _(String) gettext (String)
-#if ! ENABLE_NLS
-# undef textdomain
-# define textdomain(Domainname) /* empty */
-# undef bindtextdomain
-# define bindtextdomain(Domainname, Dirname) /* empty */
+#include "../gl/gettext.h"
+#define _(String) gettext(String)
+#if !ENABLE_NLS
+#       undef textdomain
+#       define textdomain(Domainname) /* empty */
+#       undef bindtextdomain
+#       define bindtextdomain(Domainname, Dirname) /* empty */
 #endif
 
 /* For non-GNU compilers to ignore __attribute__ */
 #ifndef __GNUC__
-# define __attribute__(x) /* do nothing */
+#       define __attribute__(x) /* do nothing */
 #endif
 
 #endif /* _COMMON_H_ */
diff --git a/plugins/negate.c b/plugins/negate.c
index 750c0bfb..a42a6c59 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -38,21 +38,18 @@ const char *email = "devel@monitoring-plugins.org";
 #include "common.h"
 #include "utils.h"
 #include "utils_cmd.h"
+#include "negate.d/config.h"
+#include "../lib/states.h"
 
-#include <ctype.h>
+typedef struct {
+        int errorcode;
+        negate_config config;
+} negate_config_wrapper;
+static negate_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static negate_config_wrapper validate_arguments(negate_config_wrapper /*config_wrapper*/);
 
-static const char **process_arguments(int /*argc*/, char ** /*argv*/);
-static void validate_arguments(char ** /*command_line*/);
 static void print_help(void);
 void print_usage(void);
-static bool subst_text = false;
-
-static int state[4] = {
-        STATE_OK,
-        STATE_WARNING,
-        STATE_CRITICAL,
-        STATE_UNKNOWN,
-};
 
 int main(int argc, char **argv) {
         setlocale(LC_ALL, "");
@@ -61,15 +58,24 @@ int main(int argc, char **argv) {
 
         timeout_interval = DEFAULT_TIMEOUT;
 
-        char **command_line = (char **)process_arguments(argc, argv);
+        negate_config_wrapper tmp_config = process_arguments(argc, argv);
+
+        if (tmp_config.errorcode == ERROR) {
+                die(STATE_UNKNOWN, _("negate: Failed to parse input"));
+        }
+
+        negate_config config = tmp_config.config;
+
+        char **command_line = config.command_line;
 
         /* Set signal handling and alarm */
-        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR)
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 die(STATE_UNKNOWN, _("Cannot catch SIGALRM"));
+        }
 
-        (void)alarm((unsigned)timeout_interval);
+        (void)alarm(timeout_interval);
 
-        int result = STATE_UNKNOWN;
+        mp_state_enum result = STATE_UNKNOWN;
         output chld_out;
         output chld_err;
 
@@ -86,46 +92,54 @@ int main(int argc, char **argv) {
         }
 
         /* Return UNKNOWN or worse if no output is returned */
-        if (chld_out.lines == 0)
+        if (chld_out.lines == 0) {
                 die(max_state_alt(result, STATE_UNKNOWN), _("No data returned from command\n"));
+        }
 
         char *sub;
         for (size_t i = 0; i < chld_out.lines; i++) {
-                if (subst_text && result >= 0 && result <= 4 && result != state[result]) {
+                if (config.subst_text && result >= 0 && result <= 4 && result != config.state[result]) {
                         /* Loop over each match found */
                         while ((sub = strstr(chld_out.line[i], state_text(result)))) {
                                 /* Terminate the first part and skip over the string we'll substitute */
                                 *sub = '\0';
                                 sub += strlen(state_text(result));
                                 /* then put everything back together */
-                                xasprintf(&chld_out.line[i], "%s%s%s", chld_out.line[i], state_text(state[result]), sub);
+                                xasprintf(&chld_out.line[i], "%s%s%s", chld_out.line[i],
+                                                  state_text(config.state[result]), sub);
                         }
                 }
                 printf("%s\n", chld_out.line[i]);
         }
 
         if (result >= 0 && result <= 4) {
-                exit(state[result]);
+                exit(config.state[result]);
         } else {
                 exit(result);
         }
 }
 
 /* process command-line arguments */
-static const char **process_arguments(int argc, char **argv) {
-        static struct option longopts[] = {{"help", no_argument, 0, 'h'},           {"version", no_argument, 0, 'V'},
-                                                                           {"timeout", required_argument, 0, 't'},  {"timeout-result", required_argument, 0, 'T'},
-                                                                           {"ok", required_argument, 0, 'o'},       {"warning", required_argument, 0, 'w'},
-                                                                           {"critical", required_argument, 0, 'c'}, {"unknown", required_argument, 0, 'u'},
-                                                                           {"substitute", no_argument, 0, 's'},     {0, 0, 0, 0}};
-
+static negate_config_wrapper process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {
+                {"help", no_argument, 0, 'h'},           {"version", no_argument, 0, 'V'},
+                {"timeout", required_argument, 0, 't'},  {"timeout-result", required_argument, 0, 'T'},
+                {"ok", required_argument, 0, 'o'},       {"warning", required_argument, 0, 'w'},
+                {"critical", required_argument, 0, 'c'}, {"unknown", required_argument, 0, 'u'},
+                {"substitute", no_argument, 0, 's'},     {0, 0, 0, 0}};
+
+        negate_config_wrapper result = {
+                .errorcode = OK,
+                .config = negate_config_init(),
+        };
         bool permute = true;
         while (true) {
                 int option = 0;
                 int option_char = getopt_long(argc, argv, "+hVt:T:o:w:c:u:s", longopts, &option);
 
-                if (option_char == -1 || option_char == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
                 switch (option_char) {
                 case '?': /* help */
@@ -139,58 +153,74 @@ static const char **process_arguments(int argc, char **argv) {
                         print_revision(progname, NP_VERSION);
                         exit(STATE_UNKNOWN);
                 case 't': /* timeout period */
-                        if (!is_integer(optarg))
+                        if (!is_integer(optarg)) {
                                 usage2(_("Timeout interval must be a positive integer"), optarg);
-                        else
+                        } else {
                                 timeout_interval = atoi(optarg);
+                        }
                         break;
                 case 'T': /* Result to return on timeouts */
-                        if ((timeout_state = mp_translate_state(optarg)) == ERROR)
-                                usage4(_("Timeout result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                        if ((timeout_state = mp_translate_state(optarg)) == ERROR) {
+                                usage4(_("Timeout result must be a valid state name (OK, WARNING, CRITICAL, "
+                                                 "UNKNOWN) or integer (0-3)."));
+                        }
                         break;
                 case 'o': /* replacement for OK */
-                        if ((state[STATE_OK] = mp_translate_state(optarg)) == ERROR)
-                                usage4(_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                        if ((result.config.state[STATE_OK] = mp_translate_state(optarg)) == ERROR) {
+                                usage4(_("Ok must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
+                                                 "integer (0-3)."));
+                        }
                         permute = false;
                         break;
 
                 case 'w': /* replacement for WARNING */
-                        if ((state[STATE_WARNING] = mp_translate_state(optarg)) == ERROR)
-                                usage4(_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                        if ((result.config.state[STATE_WARNING] = mp_translate_state(optarg)) == ERROR) {
+                                usage4(_("Warning must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
+                                                 "integer (0-3)."));
+                        }
                         permute = false;
                         break;
                 case 'c': /* replacement for CRITICAL */
-                        if ((state[STATE_CRITICAL] = mp_translate_state(optarg)) == ERROR)
-                                usage4(_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                        if ((result.config.state[STATE_CRITICAL] = mp_translate_state(optarg)) == ERROR) {
+                                usage4(_("Critical must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
+                                                 "integer (0-3)."));
+                        }
                         permute = false;
                         break;
                 case 'u': /* replacement for UNKNOWN */
-                        if ((state[STATE_UNKNOWN] = mp_translate_state(optarg)) == ERROR)
-                                usage4(_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                        if ((result.config.state[STATE_UNKNOWN] = mp_translate_state(optarg)) == ERROR) {
+                                usage4(_("Unknown must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or "
+                                                 "integer (0-3)."));
+                        }
                         permute = false;
                         break;
                 case 's': /* Substitute status text */
-                        subst_text = true;
+                        result.config.subst_text = true;
                         break;
                 }
         }
 
-        validate_arguments(&argv[optind]);
-
         if (permute) { /* No [owcu] switch specified, default to this */
-                state[STATE_OK] = STATE_CRITICAL;
-                state[STATE_CRITICAL] = STATE_OK;
+                result.config.state[STATE_OK] = STATE_CRITICAL;
+                result.config.state[STATE_CRITICAL] = STATE_OK;
         }
 
-        return (const char **)&argv[optind];
+        result.config.command_line = &argv[optind];
+
+        return validate_arguments(result);
 }
 
-void validate_arguments(char **command_line) {
-        if (command_line[0] == NULL)
+negate_config_wrapper validate_arguments(negate_config_wrapper config_wrapper) {
+        if (config_wrapper.config.command_line[0] == NULL) {
                 usage4(_("Could not parse arguments"));
+        }
 
-        if (strncmp(command_line[0], "/", 1) != 0 && strncmp(command_line[0], "./", 2) != 0)
+        if (strncmp(config_wrapper.config.command_line[0], "/", 1) != 0 &&
+                strncmp(config_wrapper.config.command_line[0], "./", 2) != 0) {
                 usage4(_("Require path to command"));
+        }
+
+        return config_wrapper;
 }
 
 void print_help(void) {
@@ -198,7 +228,8 @@ void print_help(void) {
 
         printf(COPYRIGHT, copyright, email);
 
-        printf("%s\n", _("Negates only the return code of a plugin (returns OK for CRITICAL and vice-versa) by default."));
+        printf("%s\n", _("Negates only the return code of a plugin (returns OK for CRITICAL and "
+                                         "vice-versa) by default."));
         printf("%s\n", _("Additional switches can be used to control:\n"));
         printf("\t  - which state becomes what\n");
         printf("\t  - changing the plugin output text to match the return code");
@@ -228,17 +259,20 @@ void print_help(void) {
         printf("%s\n", _("Examples:"));
         printf(" %s\n", "negate /usr/local/nagios/libexec/check_ping -H host");
         printf("    %s\n", _("Run check_ping and invert result. Must use full path to plugin"));
-        printf(" %s\n", "negate -w OK -c UNKNOWN /usr/local/nagios/libexec/check_procs -a 'vi negate.c'");
+        printf(" %s\n",
+                   "negate -w OK -c UNKNOWN /usr/local/nagios/libexec/check_procs -a 'vi negate.c'");
         printf("    %s\n", _("This will return OK instead of WARNING and UNKNOWN instead of CRITICAL"));
         printf("\n");
         printf("%s\n", _("Notes:"));
-        printf(" %s\n", _("This plugin is a wrapper to take the output of another plugin and invert it."));
+        printf(" %s\n",
+                   _("This plugin is a wrapper to take the output of another plugin and invert it."));
         printf(" %s\n", _("The full path of the plugin must be provided."));
         printf(" %s\n", _("If the wrapped plugin returns OK, the wrapper will return CRITICAL."));
         printf(" %s\n", _("If the wrapped plugin returns CRITICAL, the wrapper will return OK."));
         printf(" %s\n", _("Otherwise, the output state of the wrapped plugin is unchanged."));
         printf("\n");
-        printf(" %s\n", _("Using timeout-result, it is possible to override the timeout behaviour or a"));
+        printf(" %s\n",
+                   _("Using timeout-result, it is possible to override the timeout behaviour or a"));
         printf(" %s\n", _("plugin by setting the negate timeout a bit lower."));
 
         printf(UT_SUPPORT);
diff --git a/plugins/negate.d/config.h b/plugins/negate.d/config.h
new file mode 100644
index 00000000..0cf30cd4
--- /dev/null
+++ b/plugins/negate.d/config.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include "states.h"
+
+typedef struct {
+        mp_state_enum state[4];
+        bool subst_text;
+        char **command_line;
+} negate_config;
+
+negate_config negate_config_init() {
+        negate_config tmp = {
+                .state =
+                        {
+                                STATE_OK,
+                                STATE_WARNING,
+                                STATE_CRITICAL,
+                                STATE_UNKNOWN,
+                        },
+                .subst_text = false,
+                .command_line = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/netutils.c b/plugins/netutils.c
index e2916c65..b4c6ff0a 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -30,13 +30,14 @@
 #include "common.h"
 #include "output.h"
 #include "states.h"
+#include <sys/types.h>
 #include "netutils.h"
 
 unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
-unsigned int socket_timeout_state = STATE_CRITICAL;
-
-int econn_refuse_state = STATE_CRITICAL;
+mp_state_enum socket_timeout_state = STATE_CRITICAL;
+mp_state_enum econn_refuse_state = STATE_CRITICAL;
 bool was_refused = false;
+
 #if USE_IPV6
 int address_family = AF_UNSPEC;
 #else
@@ -63,38 +64,40 @@ void socket_timeout_alarm_handler(int sig) {
 /* connects to a host on a specified tcp port, sends a string, and gets a
          response. loops on select-recv until timeout or eof to get all of a
          multi-packet answer */
-int process_tcp_request2(const char *server_address, int server_port, const char *send_buffer, char *recv_buffer, int recv_size) {
+mp_state_enum process_tcp_request2(const char *server_address, const int server_port,
+                                                                   const char *send_buffer, char *recv_buffer,
+                                                                   const int recv_size) {
 
-        int result;
-        int send_result;
-        int recv_result;
-        int sd;
-        struct timeval tv;
-        fd_set readfds;
-        int recv_length = 0;
+        int socket;
 
-        result = np_net_connect(server_address, server_port, &sd, IPPROTO_TCP);
-        if (result != STATE_OK) {
+        mp_state_enum connect_result =
+                np_net_connect(server_address, server_port, &socket, IPPROTO_TCP);
+        if (connect_result != STATE_OK) {
                 return STATE_CRITICAL;
         }
 
-        send_result = send(sd, send_buffer, strlen(send_buffer), 0);
+        mp_state_enum result;
+        ssize_t send_result = send(socket, send_buffer, strlen(send_buffer), 0);
         if (send_result < 0 || (size_t)send_result != strlen(send_buffer)) {
                 // printf("%s\n", _("Send failed"));
                 result = STATE_WARNING;
         }
 
-        while (1) {
+        fd_set readfds;
+        ssize_t recv_length = 0;
+        while (true) {
                 /* wait up to the number of seconds for socket timeout
                    minus one for data from the host */
-                tv.tv_sec = socket_timeout - 1;
-                tv.tv_usec = 0;
+                struct timeval timeout = {
+                        .tv_sec = socket_timeout - 1,
+                        .tv_usec = 0,
+                };
                 FD_ZERO(&readfds);
-                FD_SET(sd, &readfds);
-                select(sd + 1, &readfds, NULL, NULL, &tv);
+                FD_SET(socket, &readfds);
+                select(socket + 1, &readfds, NULL, NULL, &timeout);
 
                 /* make sure some data has arrived */
-                if (!FD_ISSET(sd, &readfds)) { /* it hasn't */
+                if (!FD_ISSET(socket, &readfds)) { /* it hasn't */
                         if (!recv_length) {
                                 strcpy(recv_buffer, "");
                                 // printf("%s\n", _("No data was received from host!"));
@@ -103,70 +106,69 @@ int process_tcp_request2(const char *server_address, int server_port, const char
                                 recv_buffer[recv_length] = 0;
                         }
                         break;
-                } else { /* it has */
-                        recv_result = recv(sd, recv_buffer + recv_length, (size_t)recv_size - recv_length - 1, 0);
-                        if (recv_result == -1) {
-                                /* recv failed, bail out */
-                                strcpy(recv_buffer + recv_length, "");
-                                result = STATE_WARNING;
-                                break;
-                        } else if (recv_result == 0) {
-                                /* end of file ? */
-                                recv_buffer[recv_length] = 0;
-                                break;
-                        } else { /* we got data! */
-                                recv_length += recv_result;
-                                if (recv_length >= recv_size - 1) {
-                                        /* buffer full, we're done */
-                                        recv_buffer[recv_size - 1] = 0;
-                                        break;
-                                }
-                        }
+                } /* it has */
+
+                ssize_t recv_result =
+                        recv(socket, recv_buffer + recv_length, (size_t)(recv_size - recv_length - 1), 0);
+                if (recv_result == -1) {
+                        /* recv failed, bail out */
+                        strcpy(recv_buffer + recv_length, "");
+                        result = STATE_WARNING;
+                        break;
+                }
+
+                if (recv_result == 0) {
+                        /* end of file ? */
+                        recv_buffer[recv_length] = 0;
+                        break;
+                }
+
+                /* we got data! */
+                recv_length += recv_result;
+                if (recv_length >= recv_size - 1) {
+                        /* buffer full, we're done */
+                        recv_buffer[recv_size - 1] = 0;
+                        break;
                 }
                 /* end if(!FD_ISSET(sd,&readfds)) */
         }
-        /* end while(1) */
 
-        close(sd);
+        close(socket);
         return result;
 }
 
 /* connects to a host on a specified port, sends a string, and gets a
    response */
-int process_request(const char *server_address, int server_port, int proto, const char *send_buffer, char *recv_buffer, int recv_size) {
-        int result;
-        int sd;
+mp_state_enum process_request(const char *server_address, const int server_port, const int proto,
+                                                          const char *send_buffer, char *recv_buffer, const int recv_size) {
 
-        result = STATE_OK;
-
-        result = np_net_connect(server_address, server_port, &sd, proto);
+        mp_state_enum result = STATE_OK;
+        int socket;
+        result = np_net_connect(server_address, server_port, &socket, proto);
         if (result != STATE_OK) {
                 return STATE_CRITICAL;
         }
 
-        result = send_request(sd, proto, send_buffer, recv_buffer, recv_size);
+        result = send_request(socket, proto, send_buffer, recv_buffer, recv_size);
 
-        close(sd);
+        close(socket);
 
         return result;
 }
 
 /* opens a tcp or udp connection to a remote host or local socket */
-int np_net_connect(const char *host_name, int port, int *sd, int proto) {
+mp_state_enum np_net_connect(const char *host_name, int port, int *socketDescriptor,
+                                                         const int proto) {
         /* send back STATE_UNKOWN if there's an error
            send back STATE_OK if we connect
            send back STATE_CRITICAL if we can't connect.
            Let upstream figure out what to send to the user. */
-        struct addrinfo hints;
-        struct addrinfo *r, *res;
-        struct sockaddr_un su;
-        char port_str[6], host[MAX_HOST_ADDRESS_LENGTH];
-        size_t len;
-        int socktype, result;
-        short is_socket = (host_name[0] == '/');
-
-        socktype = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
+        bool is_socket = (host_name[0] == '/');
+        int socktype = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
 
+        struct addrinfo hints = {};
+        struct addrinfo *res = NULL;
+        int result;
         /* as long as it doesn't start with a '/', it's assumed a host or ip */
         if (!is_socket) {
                 memset(&hints, 0, sizeof(hints));
@@ -174,38 +176,46 @@ int np_net_connect(const char *host_name, int port, int *sd, int proto) {
                 hints.ai_protocol = proto;
                 hints.ai_socktype = socktype;
 
-                len = strlen(host_name);
+                size_t len = strlen(host_name);
                 /* check for an [IPv6] address (and strip the brackets) */
                 if (len >= 2 && host_name[0] == '[' && host_name[len - 1] == ']') {
                         host_name++;
                         len -= 2;
                 }
+
+                char host[MAX_HOST_ADDRESS_LENGTH];
+
                 if (len >= sizeof(host)) {
                         return STATE_UNKNOWN;
                 }
+
                 memcpy(host, host_name, len);
                 host[len] = '\0';
+
+                char port_str[6];
                 snprintf(port_str, sizeof(port_str), "%d", port);
-                result = getaddrinfo(host, port_str, &hints, &res);
+                int getaddrinfo_err = getaddrinfo(host, port_str, &hints, &res);
 
-                if (result != 0) {
+                if (getaddrinfo_err != 0) {
                         // printf("%s\n", gai_strerror(result));
                         return STATE_UNKNOWN;
                 }
 
-                r = res;
-                while (r) {
+                struct addrinfo *addressPointer = res;
+                while (addressPointer) {
                         /* attempt to create a socket */
-                        *sd = socket(r->ai_family, socktype, r->ai_protocol);
+                        *socketDescriptor =
+                                socket(addressPointer->ai_family, socktype, addressPointer->ai_protocol);
 
-                        if (*sd < 0) {
+                        if (*socketDescriptor < 0) {
                                 // printf("%s\n", _("Socket creation failed"));
-                                freeaddrinfo(r);
+                                freeaddrinfo(addressPointer);
                                 return STATE_UNKNOWN;
                         }
 
                         /* attempt to open a connection */
-                        result = connect(*sd, r->ai_addr, r->ai_addrlen);
+                        result =
+                                connect(*socketDescriptor, addressPointer->ai_addr, addressPointer->ai_addrlen);
 
                         if (result == 0) {
                                 was_refused = false;
@@ -220,24 +230,28 @@ int np_net_connect(const char *host_name, int port, int *sd, int proto) {
                                 }
                         }
 
-                        close(*sd);
-                        r = r->ai_next;
+                        close(*socketDescriptor);
+                        addressPointer = addressPointer->ai_next;
                 }
+
                 freeaddrinfo(res);
-        }
-        /* else the hostname is interpreted as a path to a unix socket */
-        else {
+
+        } else {
+                /* else the hostname is interpreted as a path to a unix socket */
                 if (strlen(host_name) >= UNIX_PATH_MAX) {
                         die(STATE_UNKNOWN, _("Supplied path too long unix domain socket"));
                 }
-                memset(&su, 0, sizeof(su));
+
+                struct sockaddr_un su = {};
                 su.sun_family = AF_UNIX;
                 strncpy(su.sun_path, host_name, UNIX_PATH_MAX);
-                *sd = socket(PF_UNIX, SOCK_STREAM, 0);
-                if (*sd < 0) {
+                *socketDescriptor = socket(PF_UNIX, SOCK_STREAM, 0);
+
+                if (*socketDescriptor < 0) {
                         die(STATE_UNKNOWN, _("Socket creation failed"));
                 }
-                result = connect(*sd, (struct sockaddr *)&su, sizeof(su));
+
+                result = connect(*socketDescriptor, (struct sockaddr *)&su, sizeof(su));
                 if (result < 0 && errno == ECONNREFUSED) {
                         was_refused = true;
                 }
@@ -245,7 +259,9 @@ int np_net_connect(const char *host_name, int port, int *sd, int proto) {
 
         if (result == 0) {
                 return STATE_OK;
-        } else if (was_refused) {
+        }
+
+        if (was_refused) {
                 switch (econn_refuse_state) { /* a user-defined expected outcome */
                 case STATE_OK:
                 case STATE_WARNING:  /* user wants WARN or OK on refusal, or... */
@@ -253,7 +269,8 @@ int np_net_connect(const char *host_name, int port, int *sd, int proto) {
                         if (is_socket) {
                                 // printf("connect to file socket %s: %s\n", host_name, strerror(errno));
                         } else {
-                                // printf("connect to address %s and port %d: %s\n", host_name, port, strerror(errno));
+                                // printf("connect to address %s and port %d: %s\n", host_name, port,
+                                // strerror(errno));
                         }
                         return STATE_CRITICAL;
                         break;
@@ -271,14 +288,11 @@ int np_net_connect(const char *host_name, int port, int *sd, int proto) {
         }
 }
 
-int send_request(int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size) {
-        int result = STATE_OK;
-        int send_result;
-        int recv_result;
-        struct timeval tv;
-        fd_set readfds;
+mp_state_enum send_request(const int socket, const int proto, const char *send_buffer,
+                                                   char *recv_buffer, const int recv_size) {
+        mp_state_enum result = STATE_OK;
 
-        send_result = send(sd, send_buffer, strlen(send_buffer), 0);
+        ssize_t send_result = send(socket, send_buffer, strlen(send_buffer), 0);
         if (send_result < 0 || (size_t)send_result != strlen(send_buffer)) {
                 // printf("%s\n", _("Send failed"));
                 result = STATE_WARNING;
@@ -286,21 +300,22 @@ int send_request(int sd, int proto, const char *send_buffer, char *recv_buffer,
 
         /* wait up to the number of seconds for socket timeout minus one
            for data from the host */
-        tv.tv_sec = socket_timeout - 1;
-        tv.tv_usec = 0;
+        struct timeval timestamp = {
+                .tv_sec = socket_timeout - 1,
+                .tv_usec = 0,
+        };
+        fd_set readfds;
         FD_ZERO(&readfds);
-        FD_SET(sd, &readfds);
-        select(sd + 1, &readfds, NULL, NULL, &tv);
+        FD_SET(socket, &readfds);
+        select(socket + 1, &readfds, NULL, NULL, &timestamp);
 
         /* make sure some data has arrived */
-        if (!FD_ISSET(sd, &readfds)) {
+        if (!FD_ISSET(socket, &readfds)) {
                 strcpy(recv_buffer, "");
                 // printf("%s\n", _("No data was received from host!"));
                 result = STATE_WARNING;
-        }
-
-        else {
-                recv_result = recv(sd, recv_buffer, (size_t)recv_size - 1, 0);
+        } else {
+                ssize_t recv_result = recv(socket, recv_buffer, (size_t)(recv_size - 1), 0);
                 if (recv_result == -1) {
                         strcpy(recv_buffer, "");
                         if (proto != IPPROTO_TCP) {
@@ -314,6 +329,7 @@ int send_request(int sd, int proto, const char *send_buffer, char *recv_buffer,
                 /* die returned string */
                 recv_buffer[recv_size - 1] = 0;
         }
+
         return result;
 }
 
@@ -335,27 +351,27 @@ bool is_addr(const char *address) {
 #ifdef USE_IPV6
         if (address_family == AF_INET && is_inet_addr(address)) {
                 return true;
-        } else if (address_family == AF_INET6 && is_inet6_addr(address)) {
+        }
+
+        if (address_family == AF_INET6 && is_inet6_addr(address)) {
                 return true;
         }
 #else
         if (is_inet_addr(address)) {
-                return (true);
+                return true;
         }
 #endif
 
-        return (false);
+        return false;
 }
 
-int dns_lookup(const char *in, struct sockaddr_storage *ss, int family) {
+bool dns_lookup(const char *node_string, struct sockaddr_storage *ss, const int family) {
         struct addrinfo hints;
-        struct addrinfo *res;
-        int retval;
-
         memset(&hints, 0, sizeof(struct addrinfo));
         hints.ai_family = family;
 
-        retval = getaddrinfo(in, NULL, &hints, &res);
+        struct addrinfo *res;
+        int retval = getaddrinfo(node_string, NULL, &hints, &res);
         if (retval != 0) {
                 return false;
         }
@@ -363,6 +379,8 @@ int dns_lookup(const char *in, struct sockaddr_storage *ss, int family) {
         if (ss != NULL) {
                 memcpy(ss, res->ai_addr, res->ai_addrlen);
         }
+
         freeaddrinfo(res);
+
         return true;
 }
diff --git a/plugins/netutils.h b/plugins/netutils.h
index a95057e0..dbd22398 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -1,120 +1,140 @@
 /*****************************************************************************
-* 
-* Monitoring Plugins net utilities include file
-* 
-* License: GPL
-* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains common include files and function definitions
-* used in many of the plugins.
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Monitoring Plugins net utilities include file
+ *
+ * License: GPL
+ * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 2003-2007 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains common include files and function definitions
+ * used in many of the plugins.
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #ifndef _NETUTILS_H_
 #define _NETUTILS_H_
 
-#include "common.h"
+#include "output.h"
+#include "states.h"
 #include "utils.h"
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 
 #ifdef HAVE_SYS_UN_H
-# include <sys/un.h>
-# ifndef UNIX_PATH_MAX
-   /* linux uses this, on sun it's hard-coded at 108 without a define, on BSD at 104 */
-#  define UNIX_PATH_MAX 104
-# endif /* UNIX_PATH_MAX */
-#endif /* HAVE_SYS_UN_H */
+#       include <sys/un.h>
+#       ifndef UNIX_PATH_MAX
+/* linux uses this, on sun it's hard-coded at 108 without a define, on BSD at 104 */
+#               define UNIX_PATH_MAX 104
+#       endif /* UNIX_PATH_MAX */
+#endif     /* HAVE_SYS_UN_H */
 
 #ifndef HOST_MAX_BYTES
-# define HOST_MAX_BYTES 255
+#       define HOST_MAX_BYTES 255
 #endif
 
 /* process_request and wrapper macros */
-#define process_tcp_request(addr, port, sbuf, rbuf, rsize) \
+#define process_tcp_request(addr, port, sbuf, rbuf, rsize)                                         \
         process_request(addr, port, IPPROTO_TCP, sbuf, rbuf, rsize)
-#define process_udp_request(addr, port, sbuf, rbuf, rsize) \
+#define process_udp_request(addr, port, sbuf, rbuf, rsize)                                         \
         process_request(addr, port, IPPROTO_UDP, sbuf, rbuf, rsize)
-int process_tcp_request2 (const char *address, int port,
-  const char *sbuffer, char *rbuffer, int rsize);
-int process_request (const char *address, int port, int proto,
-  const char *sbuffer, char *rbuffer, int rsize);
+mp_state_enum process_tcp_request2(const char *server_address, int server_port,
+                                                                   const char *send_buffer, char *recv_buffer, int recv_size);
+mp_state_enum process_request(const char *server_address, int server_port, int proto,
+                                                          const char *send_buffer, char *recv_buffer, int recv_size);
 
 /* my_connect and wrapper macros */
 #define my_tcp_connect(addr, port, s) np_net_connect(addr, port, s, IPPROTO_TCP)
 #define my_udp_connect(addr, port, s) np_net_connect(addr, port, s, IPPROTO_UDP)
-int np_net_connect(const char *address, int port, int *sd, int proto);
+mp_state_enum np_net_connect(const char *host_name, int port, int *socketDescriptor, int proto);
 
 /* send_request and wrapper macros */
-#define send_tcp_request(s, sbuf, rbuf, rsize) \
-        send_request(s, IPPROTO_TCP, sbuf, rbuf, rsize)
-#define send_udp_request(s, sbuf, rbuf, rsize) \
-        send_request(s, IPPROTO_UDP, sbuf, rbuf, rsize)
-int send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size);
-
+#define send_tcp_request(s, sbuf, rbuf, rsize) send_request(s, IPPROTO_TCP, sbuf, rbuf, rsize)
+#define send_udp_request(s, sbuf, rbuf, rsize) send_request(s, IPPROTO_UDP, sbuf, rbuf, rsize)
+mp_state_enum send_request(int socket, int proto, const char *send_buffer, char *recv_buffer,
+                                                   int recv_size);
 
 /* "is_*" wrapper macros and functions */
-bool is_host (const char *);
-bool is_addr (const char *);
-int dns_lookup (const char *, struct sockaddr_storage *, int);
+bool is_host(const char *);
+bool is_addr(const char *);
+bool dns_lookup(const char *, struct sockaddr_storage *, int);
 void host_or_die(const char *str);
 #define resolve_host_or_addr(addr, family) dns_lookup(addr, NULL, family)
-#define is_inet_addr(addr) resolve_host_or_addr(addr, AF_INET)
+#define is_inet_addr(addr)                 resolve_host_or_addr(addr, AF_INET)
 #ifdef USE_IPV6
-#  define is_inet6_addr(addr) resolve_host_or_addr(addr, AF_INET6)
-#  define is_hostname(addr) resolve_host_or_addr(addr, address_family)
+#       define is_inet6_addr(addr) resolve_host_or_addr(addr, AF_INET6)
+#       define is_hostname(addr)   resolve_host_or_addr(addr, address_family)
 #else
-#  define is_hostname(addr) resolve_host_or_addr(addr, AF_INET)
+#       define is_hostname(addr) resolve_host_or_addr(addr, AF_INET)
 #endif
 
 extern unsigned int socket_timeout;
-extern unsigned int socket_timeout_state;
-extern int econn_refuse_state;
+extern mp_state_enum socket_timeout_state;
+extern mp_state_enum econn_refuse_state;
 extern bool was_refused;
 extern int address_family;
 
-void socket_timeout_alarm_handler (int) __attribute__((noreturn));
+void socket_timeout_alarm_handler(int) __attribute__((noreturn));
 
 /* SSL-Related functionality */
 #ifdef HAVE_SSL
-#  define MP_SSLv2 1
-#  define MP_SSLv3 2
-#  define MP_TLSv1 3
-#  define MP_TLSv1_1 4
-#  define MP_TLSv1_2 5
-#  define MP_SSLv2_OR_NEWER 6
-#  define MP_SSLv3_OR_NEWER 7
-#  define MP_TLSv1_OR_NEWER 8
-#  define MP_TLSv1_1_OR_NEWER 9
-#  define MP_TLSv1_2_OR_NEWER 10
+#       define MP_SSLv2            1
+#       define MP_SSLv3            2
+#       define MP_TLSv1            3
+#       define MP_TLSv1_1          4
+#       define MP_TLSv1_2          5
+#       define MP_SSLv2_OR_NEWER   6
+#       define MP_SSLv3_OR_NEWER   7
+#       define MP_TLSv1_OR_NEWER   8
+#       define MP_TLSv1_1_OR_NEWER 9
+#       define MP_TLSv1_2_OR_NEWER 10
 /* maybe this could be merged with the above np_net_connect, via some flags */
-int np_net_ssl_init(int sd);
-int np_net_ssl_init_with_hostname(int sd, char *host_name);
-int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int version);
-int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int version, char *cert, char *privkey);
-void np_net_ssl_cleanup();
+int np_net_ssl_init(int socket);
+int np_net_ssl_init_with_hostname(int socket, char *host_name);
+int np_net_ssl_init_with_hostname_and_version(int socket, char *host_name, int version);
+int np_net_ssl_init_with_hostname_version_and_cert(int socket, char *host_name, int version,
+                                                                                                   char *cert, char *privkey);
+void np_net_ssl_cleanup(void);
 int np_net_ssl_write(const void *buf, int num);
 int np_net_ssl_read(void *buf, int num);
-int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit);
-#endif /* HAVE_SSL */
 
+typedef enum {
+        ALL_OK,
+        NO_SERVER_CERTIFICATE_PRESENT,
+        UNABLE_TO_RETRIEVE_CERTIFICATE_SUBJECT,
+        WRONG_TIME_FORMAT_IN_CERTIFICATE,
+} retrieve_expiration_date_errors;
+
+typedef struct {
+        double remaining_seconds;
+        retrieve_expiration_date_errors errors;
+} retrieve_expiration_time_result;
+
+typedef struct {
+        mp_state_enum result_state;
+        double remaining_seconds;
+        retrieve_expiration_date_errors errors;
+} net_ssl_check_cert_result;
+net_ssl_check_cert_result np_net_ssl_check_cert2(int days_till_exp_warn, int days_till_exp_crit);
+
+mp_state_enum np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit);
+mp_subcheck mp_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit);
+#endif /* HAVE_SSL */
 #endif /* _NETUTILS_H_ */
diff --git a/plugins/picohttpparser/picohttpparser.c b/plugins/picohttpparser/picohttpparser.c
index 2ae92d66..e87388b0 100644
--- a/plugins/picohttpparser/picohttpparser.c
+++ b/plugins/picohttpparser/picohttpparser.c
@@ -50,59 +50,61 @@
 #       define ALIGNED(n) __attribute__((aligned(n)))
 #endif
 
-#define IS_PRINTABLE_ASCII(c) ((unsigned char)(c)-040u < 0137u)
+#define IS_PRINTABLE_ASCII(c) ((unsigned char)(c) - 040u < 0137u)
 
-#define CHECK_EOF()                                                                                                                        \
-        if (buf == buf_end) {                                                                                                                  \
-                *ret = -2;                                                                                                                         \
-                return NULL;                                                                                                                       \
+#define CHECK_EOF()                                                                                \
+        if (buf == buf_end) {                                                                          \
+                *ret = -2;                                                                                 \
+                return NULL;                                                                               \
         }
 
-#define EXPECT_CHAR_NO_CHECK(ch)                                                                                                           \
-        if (*buf++ != ch) {                                                                                                                    \
-                *ret = -1;                                                                                                                         \
-                return NULL;                                                                                                                       \
+#define EXPECT_CHAR_NO_CHECK(ch)                                                                   \
+        if (*buf++ != ch) {                                                                            \
+                *ret = -1;                                                                                 \
+                return NULL;                                                                               \
         }
 
-#define EXPECT_CHAR(ch)                                                                                                                    \
-        CHECK_EOF();                                                                                                                           \
+#define EXPECT_CHAR(ch)                                                                            \
+        CHECK_EOF();                                                                                   \
         EXPECT_CHAR_NO_CHECK(ch);
 
-#define ADVANCE_TOKEN(tok, toklen)                                                                                                         \
-        do {                                                                                                                                   \
-                const char *tok_start = buf;                                                                                                       \
-                static const char ALIGNED(16) ranges2[16] = "\000\040\177\177";                                                                    \
-                int found2;                                                                                                                        \
-                buf = findchar_fast(buf, buf_end, ranges2, 4, &found2);                                                                            \
-                if (!found2) {                                                                                                                     \
-                        CHECK_EOF();                                                                                                                   \
-                }                                                                                                                                  \
-                while (1) {                                                                                                                        \
-                        if (*buf == ' ') {                                                                                                             \
-                                break;                                                                                                                     \
-                        } else if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {                                                                              \
-                                if ((unsigned char)*buf < '\040' || *buf == '\177') {                                                                      \
-                                        *ret = -1;                                                                                                             \
-                                        return NULL;                                                                                                           \
-                                }                                                                                                                          \
-                        }                                                                                                                              \
-                        ++buf;                                                                                                                         \
-                        CHECK_EOF();                                                                                                                   \
-                }                                                                                                                                  \
-                tok = tok_start;                                                                                                                   \
-                toklen = buf - tok_start;                                                                                                          \
+#define ADVANCE_TOKEN(tok, toklen)                                                                 \
+        do {                                                                                           \
+                const char *tok_start = buf;                                                               \
+                static const char ALIGNED(16) ranges2[16] = "\000\040\177\177";                            \
+                int found2;                                                                                \
+                buf = findchar_fast(buf, buf_end, ranges2, 4, &found2);                                    \
+                if (!found2) {                                                                             \
+                        CHECK_EOF();                                                                           \
+                }                                                                                          \
+                while (1) {                                                                                \
+                        if (*buf == ' ') {                                                                     \
+                                break;                                                                             \
+                        } else if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {                                      \
+                                if ((unsigned char)*buf < '\040' || *buf == '\177') {                              \
+                                        *ret = -1;                                                                     \
+                                        return NULL;                                                                   \
+                                }                                                                                  \
+                        }                                                                                      \
+                        ++buf;                                                                                 \
+                        CHECK_EOF();                                                                           \
+                }                                                                                          \
+                tok = tok_start;                                                                           \
+                toklen = buf - tok_start;                                                                  \
         } while (0)
 
-static const char *token_char_map = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-                                                                        "\0\1\0\1\1\1\1\1\0\0\1\1\0\1\1\0\1\1\1\1\1\1\1\1\1\1\0\0\0\0\0\0"
-                                                                        "\0\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\0\0\1\1"
-                                                                        "\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\1\0\1\0"
-                                                                        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-                                                                        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-                                                                        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
-                                                                        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
-
-static const char *findchar_fast(const char *buf, const char *buf_end, const char *ranges, size_t ranges_size, int *found) {
+static const char *token_char_map =
+        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+        "\0\1\0\1\1\1\1\1\0\0\1\1\0\1\1\0\1\1\1\1\1\1\1\1\1\1\0\0\0\0\0\0"
+        "\0\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\0\0\1\1"
+        "\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\1\0\1\0\1\0"
+        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
+        "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
+static const char *findchar_fast(const char *buf, const char *buf_end, const char *ranges,
+                                                                 size_t ranges_size, int *found) {
         *found = 0;
 #if __SSE4_2__
         if (likely(buf_end - buf >= 16)) {
@@ -111,7 +113,8 @@ static const char *findchar_fast(const char *buf, const char *buf_end, const cha
                 size_t left = (buf_end - buf) & ~15;
                 do {
                         __m128i b16 = _mm_loadu_si128((const __m128i *)buf);
-                        int r = _mm_cmpestri(ranges16, ranges_size, b16, 16, _SIDD_LEAST_SIGNIFICANT | _SIDD_CMP_RANGES | _SIDD_UBYTE_OPS);
+                        int r = _mm_cmpestri(ranges16, ranges_size, b16, 16,
+                                                                 _SIDD_LEAST_SIGNIFICANT | _SIDD_CMP_RANGES | _SIDD_UBYTE_OPS);
                         if (unlikely(r != 16)) {
                                 buf += r;
                                 *found = 1;
@@ -130,25 +133,29 @@ static const char *findchar_fast(const char *buf, const char *buf_end, const cha
         return buf;
 }
 
-static const char *get_token_to_eol(const char *buf, const char *buf_end, const char **token, size_t *token_len, int *ret) {
+static const char *get_token_to_eol(const char *buf, const char *buf_end, const char **token,
+                                                                        size_t *token_len, int *ret) {
         const char *token_start = buf;
 
 #ifdef __SSE4_2__
-        static const char ALIGNED(16) ranges1[16] = "\0\010"    /* allow HT */
-                                                                                                "\012\037"  /* allow SP and up to but not including DEL */
-                                                                                                "\177\177"; /* allow chars w. MSB set */
+        static const char ALIGNED(16) ranges1[16] =
+                "\0\010"    /* allow HT */
+                "\012\037"  /* allow SP and up to but not including DEL */
+                "\177\177"; /* allow chars w. MSB set */
         int found;
         buf = findchar_fast(buf, buf_end, ranges1, 6, &found);
-        if (found)
+        if (found) {
                 goto FOUND_CTL;
+        }
 #else
-        /* find non-printable char within the next 8 bytes, this is the hottest code; manually inlined */
+        /* find non-printable char within the next 8 bytes, this is the hottest code; manually inlined
+         */
         while (likely(buf_end - buf >= 8)) {
-#       define DOIT()                                                                                                                         \
-                do {                                                                                                                               \
-                        if (unlikely(!IS_PRINTABLE_ASCII(*buf)))                                                                                       \
-                                goto NonPrintable;                                                                                                         \
-                        ++buf;                                                                                                                         \
+#       define DOIT()                                                                                 \
+                do {                                                                                       \
+                        if (unlikely(!IS_PRINTABLE_ASCII(*buf)))                                               \
+                                goto NonPrintable;                                                                 \
+                        ++buf;                                                                                 \
                 } while (0)
                 DOIT();
                 DOIT();
@@ -161,7 +168,8 @@ static const char *get_token_to_eol(const char *buf, const char *buf_end, const
 #       undef DOIT
                 continue;
         NonPrintable:
-                if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
+                if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) ||
+                        unlikely(*buf == '\177')) {
                         goto FOUND_CTL;
                 }
                 ++buf;
@@ -170,7 +178,8 @@ static const char *get_token_to_eol(const char *buf, const char *buf_end, const
         for (;; ++buf) {
                 CHECK_EOF();
                 if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {
-                        if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
+                        if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) ||
+                                unlikely(*buf == '\177')) {
                                 goto FOUND_CTL;
                         }
                 }
@@ -219,27 +228,28 @@ static const char *is_complete(const char *buf, const char *buf_end, size_t last
         return NULL;
 }
 
-#define PARSE_INT(valp_, mul_)                                                                                                             \
-        if (*buf < '0' || '9' < *buf) {                                                                                                        \
-                buf++;                                                                                                                             \
-                *ret = -1;                                                                                                                         \
-                return NULL;                                                                                                                       \
-        }                                                                                                                                      \
+#define PARSE_INT(valp_, mul_)                                                                     \
+        if (*buf < '0' || '9' < *buf) {                                                                \
+                buf++;                                                                                     \
+                *ret = -1;                                                                                 \
+                return NULL;                                                                               \
+        }                                                                                              \
         *(valp_) = (mul_) * (*buf++ - '0');
 
-#define PARSE_INT_3(valp_)                                                                                                                 \
-        do {                                                                                                                                   \
-                int res_ = 0;                                                                                                                      \
-                PARSE_INT(&res_, 100)                                                                                                              \
-                *valp_ = res_;                                                                                                                     \
-                PARSE_INT(&res_, 10)                                                                                                               \
-                *valp_ += res_;                                                                                                                    \
-                PARSE_INT(&res_, 1)                                                                                                                \
-                *valp_ += res_;                                                                                                                    \
+#define PARSE_INT_3(valp_)                                                                         \
+        do {                                                                                           \
+                int res_ = 0;                                                                              \
+                PARSE_INT(&res_, 100)                                                                      \
+                *valp_ = res_;                                                                             \
+                PARSE_INT(&res_, 10)                                                                       \
+                *valp_ += res_;                                                                            \
+                PARSE_INT(&res_, 1)                                                                        \
+                *valp_ += res_;                                                                            \
         } while (0)
 
 /* returned pointer is always within [buf, buf_end), or null */
-static const char *parse_http_version(const char *buf, const char *buf_end, int *major_version, int *minor_version, int *ret) {
+static const char *parse_http_version(const char *buf, const char *buf_end, int *major_version,
+                                                                          int *minor_version, int *ret) {
         /* we want at least [HTTP/1.<two chars>] to try to parse */
         if (buf_end - buf < 9) {
                 *ret = -2;
@@ -260,8 +270,8 @@ static const char *parse_http_version(const char *buf, const char *buf_end, int
         return buf;
 }
 
-static const char *parse_headers(const char *buf, const char *buf_end, struct phr_header *headers, size_t *num_headers, size_t max_headers,
-                                                                 int *ret) {
+static const char *parse_headers(const char *buf, const char *buf_end, struct phr_header *headers,
+                                                                 size_t *num_headers, size_t max_headers, int *ret) {
         for (;; ++*num_headers) {
                 CHECK_EOF();
                 if (*buf == '\015') {
@@ -337,9 +347,10 @@ static const char *parse_headers(const char *buf, const char *buf_end, struct ph
         return buf;
 }
 
-static const char *parse_request(const char *buf, const char *buf_end, const char **method, size_t *method_len, const char **path,
-                                                                 size_t *path_len, int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers,
-                                                                 size_t max_headers, int *ret) {
+static const char *parse_request(const char *buf, const char *buf_end, const char **method,
+                                                                 size_t *method_len, const char **path, size_t *path_len,
+                                                                 int *major_version, int *minor_version, struct phr_header *headers,
+                                                                 size_t *num_headers, size_t max_headers, int *ret) {
         /* skip first empty line (some clients add CRLF after POST content) */
         CHECK_EOF();
         if (*buf == '\015') {
@@ -378,8 +389,9 @@ static const char *parse_request(const char *buf, const char *buf_end, const cha
         return parse_headers(buf, buf_end, headers, num_headers, max_headers, ret);
 }
 
-int phr_parse_request(const char *buf_start, size_t len, const char **method, size_t *method_len, const char **path, size_t *path_len,
-                                          int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers, size_t last_len) {
+int phr_parse_request(const char *buf_start, size_t len, const char **method, size_t *method_len,
+                                          const char **path, size_t *path_len, int *major_version, int *minor_version,
+                                          struct phr_header *headers, size_t *num_headers, size_t last_len) {
         const char *buf = buf_start, *buf_end = buf_start + len;
         size_t max_headers = *num_headers;
         int r;
@@ -398,17 +410,18 @@ int phr_parse_request(const char *buf_start, size_t len, const char **method, si
                 return r;
         }
 
-        if ((buf = parse_request(buf, buf_end, method, method_len, path, path_len, major_version, minor_version, headers, num_headers,
-                                                         max_headers, &r)) == NULL) {
+        if ((buf = parse_request(buf, buf_end, method, method_len, path, path_len, major_version,
+                                                         minor_version, headers, num_headers, max_headers, &r)) == NULL) {
                 return r;
         }
 
         return (int)(buf - buf_start);
 }
 
-static const char *parse_response(const char *buf, const char *buf_end, int *major_version, int *minor_version, int *status,
-                                                                  const char **msg, size_t *msg_len, struct phr_header *headers, size_t *num_headers, size_t max_headers,
-                                                                  int *ret) {
+static const char *parse_response(const char *buf, const char *buf_end, int *major_version,
+                                                                  int *minor_version, int *status, const char **msg,
+                                                                  size_t *msg_len, struct phr_header *headers, size_t *num_headers,
+                                                                  size_t max_headers, int *ret) {
         /* parse "HTTP/1.x" */
         if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) {
                 return NULL;
@@ -421,7 +434,8 @@ static const char *parse_response(const char *buf, const char *buf_end, int *maj
         do {
                 ++buf;
         } while (*buf == ' ');
-        /* parse status code, we want at least [:digit:][:digit:][:digit:]<other char> to try to parse */
+        /* parse status code, we want at least [:digit:][:digit:][:digit:]<other char> to try to parse
+         */
         if (buf_end - buf < 4) {
                 *ret = -2;
                 return NULL;
@@ -449,8 +463,9 @@ static const char *parse_response(const char *buf, const char *buf_end, int *maj
         return parse_headers(buf, buf_end, headers, num_headers, max_headers, ret);
 }
 
-int phr_parse_response(const char *buf_start, size_t len, int *major_version, int *minor_version, int *status, const char **msg,
-                                           size_t *msg_len, struct phr_header *headers, size_t *num_headers, size_t last_len) {
+int phr_parse_response(const char *buf_start, size_t len, int *major_version, int *minor_version,
+                                           int *status, const char **msg, size_t *msg_len, struct phr_header *headers,
+                                           size_t *num_headers, size_t last_len) {
         const char *buf = buf_start, *buf_end = buf + len;
         size_t max_headers = *num_headers;
         int r;
@@ -468,15 +483,16 @@ int phr_parse_response(const char *buf_start, size_t len, int *major_version, in
                 return r;
         }
 
-        if ((buf = parse_response(buf, buf_end, major_version, minor_version, status, msg, msg_len, headers, num_headers, max_headers, &r)) ==
-                NULL) {
+        if ((buf = parse_response(buf, buf_end, major_version, minor_version, status, msg, msg_len,
+                                                          headers, num_headers, max_headers, &r)) == NULL) {
                 return r;
         }
 
         return (int)(buf - buf_start);
 }
 
-int phr_parse_headers(const char *buf_start, size_t len, struct phr_header *headers, size_t *num_headers, size_t last_len) {
+int phr_parse_headers(const char *buf_start, size_t len, struct phr_header *headers,
+                                          size_t *num_headers, size_t last_len) {
         const char *buf = buf_start, *buf_end = buf + len;
         size_t max_headers = *num_headers;
         int r;
@@ -526,8 +542,9 @@ ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_
                 case CHUNKED_IN_CHUNK_SIZE:
                         for (;; ++src) {
                                 int v;
-                                if (src == bufsz)
+                                if (src == bufsz) {
                                         goto Exit;
+                                }
                                 if ((v = decode_hex(buf[src])) == -1) {
                                         if (decoder->_hex_count == 0) {
                                                 ret = -1;
@@ -548,10 +565,12 @@ ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_
                 case CHUNKED_IN_CHUNK_EXT:
                         /* RFC 7230 A.2 "Line folding in chunk extensions is disallowed" */
                         for (;; ++src) {
-                                if (src == bufsz)
+                                if (src == bufsz) {
                                         goto Exit;
-                                if (buf[src] == '\012')
+                                }
+                                if (buf[src] == '\012') {
                                         break;
+                                }
                         }
                         ++src;
                         if (decoder->bytes_left_in_chunk == 0) {
@@ -567,15 +586,17 @@ ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_
                 case CHUNKED_IN_CHUNK_DATA: {
                         size_t avail = bufsz - src;
                         if (avail < decoder->bytes_left_in_chunk) {
-                                if (dst != src)
+                                if (dst != src) {
                                         memmove(buf + dst, buf + src, avail);
+                                }
                                 src += avail;
                                 dst += avail;
                                 decoder->bytes_left_in_chunk -= avail;
                                 goto Exit;
                         }
-                        if (dst != src)
+                        if (dst != src) {
                                 memmove(buf + dst, buf + src, decoder->bytes_left_in_chunk);
+                        }
                         src += decoder->bytes_left_in_chunk;
                         dst += decoder->bytes_left_in_chunk;
                         decoder->bytes_left_in_chunk = 0;
@@ -584,10 +605,12 @@ ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_
                 /* fallthru */
                 case CHUNKED_IN_CHUNK_CRLF:
                         for (;; ++src) {
-                                if (src == bufsz)
+                                if (src == bufsz) {
                                         goto Exit;
-                                if (buf[src] != '\015')
+                                }
+                                if (buf[src] != '\015') {
                                         break;
+                                }
                         }
                         if (buf[src] != '\012') {
                                 ret = -1;
@@ -598,21 +621,26 @@ ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_
                         break;
                 case CHUNKED_IN_TRAILERS_LINE_HEAD:
                         for (;; ++src) {
-                                if (src == bufsz)
+                                if (src == bufsz) {
                                         goto Exit;
-                                if (buf[src] != '\015')
+                                }
+                                if (buf[src] != '\015') {
                                         break;
+                                }
                         }
-                        if (buf[src++] == '\012')
+                        if (buf[src++] == '\012') {
                                 goto Complete;
+                        }
                         decoder->_state = CHUNKED_IN_TRAILERS_LINE_MIDDLE;
                 /* fallthru */
                 case CHUNKED_IN_TRAILERS_LINE_MIDDLE:
                         for (;; ++src) {
-                                if (src == bufsz)
+                                if (src == bufsz) {
                                         goto Exit;
-                                if (buf[src] == '\012')
+                                }
+                                if (buf[src] == '\012') {
                                         break;
+                                }
                         }
                         ++src;
                         decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
@@ -625,13 +653,16 @@ ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_
 Complete:
         ret = bufsz - src;
 Exit:
-        if (dst != src)
+        if (dst != src) {
                 memmove(buf + dst, buf + src, bufsz - src);
+        }
         *_bufsz = dst;
         return ret;
 }
 
-int phr_decode_chunked_is_in_data(struct phr_chunked_decoder *decoder) { return decoder->_state == CHUNKED_IN_CHUNK_DATA; }
+int phr_decode_chunked_is_in_data(struct phr_chunked_decoder *decoder) {
+        return decoder->_state == CHUNKED_IN_CHUNK_DATA;
+}
 
 #undef CHECK_EOF
 #undef EXPECT_CHAR
diff --git a/plugins/picohttpparser/picohttpparser.h b/plugins/picohttpparser/picohttpparser.h
index 8f13b36f..054c2812 100644
--- a/plugins/picohttpparser/picohttpparser.h
+++ b/plugins/picohttpparser/picohttpparser.h
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 
 #ifdef _MSC_VER
-#define ssize_t intptr_t
+#       define ssize_t intptr_t
 #endif
 
 #ifdef __cplusplus
@@ -40,30 +40,33 @@ extern "C" {
 /* contains name and value of a header (name == NULL if is a continuing line
  * of a multiline header */
 struct phr_header {
-    const char *name;
-    size_t name_len;
-    const char *value;
-    size_t value_len;
+        const char *name;
+        size_t name_len;
+        const char *value;
+        size_t value_len;
 };
 
 /* returns number of bytes consumed if successful, -2 if request is partial,
  * -1 if failed */
-int phr_parse_request(const char *buf, size_t len, const char **method, size_t *method_len, const char **path, size_t *path_len,
-                      int *major_version, int *minor_version, struct phr_header *headers, size_t *num_headers, size_t last_len);
+int phr_parse_request(const char *buf, size_t len, const char **method, size_t *method_len,
+                                          const char **path, size_t *path_len, int *major_version, int *minor_version,
+                                          struct phr_header *headers, size_t *num_headers, size_t last_len);
 
 /* ditto */
-int phr_parse_response(const char *_buf, size_t len, int *major_version, int *minor_version, int *status, const char **msg, size_t *msg_len,
-                       struct phr_header *headers, size_t *num_headers, size_t last_len);
+int phr_parse_response(const char *_buf, size_t len, int *major_version, int *minor_version,
+                                           int *status, const char **msg, size_t *msg_len, struct phr_header *headers,
+                                           size_t *num_headers, size_t last_len);
 
 /* ditto */
-int phr_parse_headers(const char *buf, size_t len, struct phr_header *headers, size_t *num_headers, size_t last_len);
+int phr_parse_headers(const char *buf, size_t len, struct phr_header *headers, size_t *num_headers,
+                                          size_t last_len);
 
 /* should be zero-filled before start */
 struct phr_chunked_decoder {
-    size_t bytes_left_in_chunk; /* number of bytes left in current chunk */
-    char consume_trailer;       /* if trailing headers should be consumed */
-    char _hex_count;
-    char _state;
+        size_t bytes_left_in_chunk; /* number of bytes left in current chunk */
+        char consume_trailer;       /* if trailing headers should be consumed */
+        char _hex_count;
+        char _state;
 };
 
 /* the function rewrites the buffer given as (buf, bufsz) removing the chunked-
diff --git a/plugins/popen.c b/plugins/popen.c
index cfe930b6..c596d1e0 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -68,7 +68,7 @@ void popen_timeout_alarm_handler(int /*signo*/);
 #endif
 
 #ifndef WIFEXITED
-#       define WIFEXITED(stat_val) (((stat_val)&255) == 0)
+#       define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
 #endif
 
 /* 4.3BSD Reno <signal.h> doesn't define SIG_ERR */
@@ -96,24 +96,28 @@ FILE *spopen(const char *cmdstring) {
         env[1] = NULL;
 
         /* if no command was passed, return with no error */
-        if (cmdstring == NULL)
+        if (cmdstring == NULL) {
                 return (NULL);
+        }
 
         char *cmd = NULL;
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */
         cmd = malloc(strlen(cmdstring) + 1);
-        if (cmd == NULL)
+        if (cmd == NULL) {
                 return NULL;
+        }
         strcpy(cmd, cmdstring);
 
         /* This is not a shell, so we don't handle "???" */
-        if (strstr(cmdstring, "\""))
+        if (strstr(cmdstring, "\"")) {
                 return NULL;
+        }
 
         /* allow single quotes, but only if non-whitesapce doesn't occur on both sides */
-        if (strstr(cmdstring, " ' ") || strstr(cmdstring, "'''"))
+        if (strstr(cmdstring, " ' ") || strstr(cmdstring, "'''")) {
                 return NULL;
+        }
 
         int argc;
         char **argv = NULL;
@@ -140,15 +144,17 @@ FILE *spopen(const char *cmdstring) {
 
                 if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
                         str++;
-                        if (!strstr(str, "'"))
+                        if (!strstr(str, "'")) {
                                 return NULL; /* balanced? */
+                        }
                         cmd = 1 + strstr(str, "'");
                         str[strcspn(str, "'")] = 0;
                 } else if (strcspn(str, "'") < strcspn(str, " \t\r\n")) {
                         /* handle --option='foo bar' strings */
                         char *tmp = str + strcspn(str, "'") + 1;
-                        if (!strstr(tmp, "'"))
+                        if (!strstr(tmp, "'")) {
                                 return NULL; /* balanced? */
+                        }
                         tmp += strcspn(tmp, "'") + 1;
                         *tmp = 0;
                         cmd = tmp + 1;
@@ -161,8 +167,9 @@ FILE *spopen(const char *cmdstring) {
                         }
                 }
 
-                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n"))
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n")) {
                         cmd = NULL;
+                }
 
                 argv[i++] = str;
         }
@@ -171,22 +178,26 @@ FILE *spopen(const char *cmdstring) {
         long maxfd = mp_open_max();
 
         if (childpid == NULL) { /* first time through */
-                if ((childpid = calloc((size_t)maxfd, sizeof(pid_t))) == NULL)
+                if ((childpid = calloc((size_t)maxfd, sizeof(pid_t))) == NULL) {
                         return (NULL);
+                }
         }
 
         if (child_stderr_array == NULL) { /* first time through */
-                if ((child_stderr_array = calloc((size_t)maxfd, sizeof(int))) == NULL)
+                if ((child_stderr_array = calloc((size_t)maxfd, sizeof(int))) == NULL) {
                         return (NULL);
+                }
         }
 
         int pfd[2];
-        if (pipe(pfd) < 0)
+        if (pipe(pfd) < 0) {
                 return (NULL); /* errno set by pipe() */
+        }
 
         int pfderr[2];
-        if (pipe(pfderr) < 0)
+        if (pipe(pfderr) < 0) {
                 return (NULL); /* errno set by pipe() */
+        }
 
 #ifdef REDHAT_SPOPEN_ERROR
         if (signal(SIGCHLD, popen_sigchld_handler) == SIG_ERR) {
@@ -195,8 +206,9 @@ FILE *spopen(const char *cmdstring) {
 #endif
 
         pid_t pid;
-        if ((pid = fork()) < 0)
+        if ((pid = fork()) < 0) {
                 return (NULL); /* errno set by fork() */
+        }
 
         if (pid == 0) { /* child */
                 close(pfd[0]);
@@ -210,17 +222,20 @@ FILE *spopen(const char *cmdstring) {
                         close(pfderr[1]);
                 }
                 /* close all descriptors in childpid[] */
-                for (i = 0; i < maxfd; i++)
-                        if (childpid[i] > 0)
+                for (i = 0; i < maxfd; i++) {
+                        if (childpid[i] > 0) {
                                 close(i);
+                        }
+                }
 
                 execve(argv[0], argv, env);
                 _exit(0);
         }
 
         close(pfd[1]); /* parent */
-        if ((child_process = fdopen(pfd[0], "r")) == NULL)
+        if ((child_process = fdopen(pfd[0], "r")) == NULL) {
                 return (NULL);
+        }
         close(pfderr[1]);
 
         childpid[fileno(child_process)] = pid;                 /* remember child pid for this fd */
@@ -229,17 +244,20 @@ FILE *spopen(const char *cmdstring) {
 }
 
 int spclose(FILE *fp) {
-        if (childpid == NULL)
+        if (childpid == NULL) {
                 return (1); /* popen() has never been called */
+        }
 
         pid_t pid;
         int fd = fileno(fp);
-        if ((pid = childpid[fd]) == 0)
+        if ((pid = childpid[fd]) == 0) {
                 return (1); /* fp wasn't opened by popen() */
+        }
 
         childpid[fd] = 0;
-        if (fclose(fp) == EOF)
+        if (fclose(fp) == EOF) {
                 return (1);
+        }
 
 #ifdef REDHAT_SPOPEN_ERROR
         while (!childtermd)
@@ -247,20 +265,24 @@ int spclose(FILE *fp) {
 #endif
 
         int status;
-        while (waitpid(pid, &status, 0) < 0)
-                if (errno != EINTR)
+        while (waitpid(pid, &status, 0) < 0) {
+                if (errno != EINTR) {
                         return (1); /* error other than EINTR from waitpid() */
+                }
+        }
 
-        if (WIFEXITED(status))
+        if (WIFEXITED(status)) {
                 return (WEXITSTATUS(status)); /* return child's termination status */
+        }
 
         return (1);
 }
 
 #ifdef REDHAT_SPOPEN_ERROR
 void popen_sigchld_handler(int signo) {
-        if (signo == SIGCHLD)
+        if (signo == SIGCHLD) {
                 childtermd = 1;
+        }
 }
 #endif
 
diff --git a/plugins/popen.h b/plugins/popen.h
index 1ea69632..e318ce25 100644
--- a/plugins/popen.h
+++ b/plugins/popen.h
@@ -1,13 +1,13 @@
 /******************************************************************************
-*
-*
-*****************************************************************************/
+ *
+ *
+ *****************************************************************************/
 
-FILE *spopen (const char *);
-int spclose (FILE *);
-void popen_timeout_alarm_handler (int);
+FILE *spopen(const char *);
+int spclose(FILE *);
+void popen_timeout_alarm_handler(int);
 
-pid_t *childpid=NULL;
-int *child_stderr_array=NULL;
-FILE *child_process=NULL;
-FILE *child_stderr=NULL;
+pid_t *childpid = NULL;
+int *child_stderr_array = NULL;
+FILE *child_process = NULL;
+FILE *child_stderr = NULL;
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index 4429ceb0..be6691d2 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -53,7 +53,7 @@
 #endif
 
 #ifndef WIFEXITED
-#       define WIFEXITED(stat_val) (((stat_val)&255) == 0)
+#       define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
 #endif
 
 /* 4.3BSD Reno <signal.h> doesn't define SIG_ERR */
@@ -87,8 +87,9 @@ extern void die(int, const char *, ...) __attribute__((__noreturn__, __format__(
  * through this api and thus achieve async-safeness throughout the api */
 void np_runcmd_init(void) {
         long maxfd = mp_open_max();
-        if (!np_pids)
+        if (!np_pids) {
                 np_pids = calloc(maxfd, sizeof(pid_t));
+        }
 }
 
 /* Start running a command */
@@ -106,8 +107,9 @@ static int np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) {
 
         int i = 0;
 
-        if (!np_pids)
+        if (!np_pids) {
                 NP_RUNCMD_INIT;
+        }
 
         env[0] = strdup("LC_ALL=C");
         env[1] = NULL;
@@ -115,18 +117,21 @@ static int np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) {
         /* make copy of command string so strtok() doesn't silently modify it */
         /* (the calling program may want to access it later) */
         cmdlen = strlen(cmdstring);
-        if ((cmd = malloc(cmdlen + 1)) == NULL)
+        if ((cmd = malloc(cmdlen + 1)) == NULL) {
                 return -1;
+        }
         memcpy(cmd, cmdstring, cmdlen);
         cmd[cmdlen] = '\0';
 
         /* This is not a shell, so we don't handle "???" */
-        if (strstr(cmdstring, "\""))
+        if (strstr(cmdstring, "\"")) {
                 return -1;
+        }
 
         /* allow single quotes, but only if non-whitesapce doesn't occur on both sides */
-        if (strstr(cmdstring, " ' ") || strstr(cmdstring, "'''"))
+        if (strstr(cmdstring, " ' ") || strstr(cmdstring, "'''")) {
                 return -1;
+        }
 
         /* each arg must be whitespace-separated, so args can be a maximum
          * of (len / 2) + 1. We add 1 extra to the mix for NULL termination */
@@ -145,8 +150,9 @@ static int np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) {
 
                 if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
                         str++;
-                        if (!strstr(str, "'"))
+                        if (!strstr(str, "'")) {
                                 return -1; /* balanced? */
+                        }
                         cmd = 1 + strstr(str, "'");
                         str[strcspn(str, "'")] = 0;
                 } else {
@@ -158,14 +164,16 @@ static int np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) {
                         }
                 }
 
-                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n"))
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n")) {
                         cmd = NULL;
+                }
 
                 argv[i++] = str;
         }
 
-        if (pipe(pfd) < 0 || pipe(pfderr) < 0 || (pid = fork()) < 0)
+        if (pipe(pfd) < 0 || pipe(pfderr) < 0 || (pid = fork()) < 0) {
                 return -1; /* errno set by the failing function */
+        }
 
         /* child runs exceve() and _exit. */
         if (pid == 0) {
@@ -190,9 +198,11 @@ static int np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) {
                  * This is executed in a separate address space (pure child),
                  * so we don't have to worry about async safety */
                 long maxfd = mp_open_max();
-                for (i = 0; i < maxfd; i++)
-                        if (np_pids[i] > 0)
+                for (i = 0; i < maxfd; i++) {
+                        if (np_pids[i] > 0) {
                                 close(i);
+                        }
+                }
 
                 execve(argv[0], argv, env);
                 _exit(STATE_UNKNOWN);
@@ -215,17 +225,21 @@ static int np_runcmd_close(int fd) {
 
         /* make sure this fd was opened by popen() */
         long maxfd = mp_open_max();
-        if (fd < 0 || fd > maxfd || !np_pids || (pid = np_pids[fd]) == 0)
+        if (fd < 0 || fd > maxfd || !np_pids || (pid = np_pids[fd]) == 0) {
                 return -1;
+        }
 
         np_pids[fd] = 0;
-        if (close(fd) == -1)
+        if (close(fd) == -1) {
                 return -1;
+        }
 
         /* EINTR is ok (sort of), everything else is bad */
-        while (waitpid(pid, &status, 0) < 0)
-                if (errno != EINTR)
+        while (waitpid(pid, &status, 0) < 0) {
+                if (errno != EINTR) {
                         return -1;
+                }
+        }
 
         /* return child's termination status */
         return (WIFEXITED(status)) ? WEXITSTATUS(status) : -1;
@@ -233,15 +247,18 @@ static int np_runcmd_close(int fd) {
 
 void runcmd_timeout_alarm_handler(int signo) {
 
-        if (signo == SIGALRM)
+        if (signo == SIGALRM) {
                 puts(_("CRITICAL - Plugin timed out while executing system call"));
+        }
 
         long maxfd = mp_open_max();
-        if (np_pids)
+        if (np_pids) {
                 for (long int i = 0; i < maxfd; i++) {
-                        if (np_pids[i] != 0)
+                        if (np_pids[i] != 0) {
                                 kill(np_pids[i], SIGKILL);
+                        }
                 }
+        }
 
         exit(STATE_CRITICAL);
 }
@@ -270,18 +287,19 @@ static int np_fetch_output(int fd, output *op, int flags) {
 
         /* some plugins may want to keep output unbroken, and some commands
          * will yield no output, so return here for those */
-        if (flags & RUNCMD_NO_ARRAYS || !op->buf || !op->buflen)
+        if (flags & RUNCMD_NO_ARRAYS || !op->buf || !op->buflen) {
                 return op->buflen;
+        }
 
         /* and some may want both */
         if (flags & RUNCMD_NO_ASSOC) {
                 buf = malloc(op->buflen);
                 memcpy(buf, op->buf, op->buflen);
-        } else
+        } else {
                 buf = op->buf;
+        }
 
         op->line = NULL;
-        op->lens = NULL;
         i = 0;
         while (i < op->buflen) {
                 /* make sure we have enough memory */
@@ -292,20 +310,17 @@ static int np_fetch_output(int fd, output *op, int flags) {
                         } while (!ary_size);
 
                         op->line = realloc(op->line, ary_size * sizeof(char *));
-                        op->lens = realloc(op->lens, ary_size * sizeof(size_t));
                 }
 
                 /* set the pointer to the string */
                 op->line[lineno] = &buf[i];
 
                 /* hop to next newline or end of buffer */
-                while (buf[i] != '\n' && i < op->buflen)
+                while (buf[i] != '\n' && i < op->buflen) {
                         i++;
+                }
                 buf[i] = '\0';
 
-                /* calculate the string length using pointer difference */
-                op->lens[lineno] = (size_t)&buf[i] - (size_t)op->line[lineno];
-
                 lineno++;
                 i++;
         }
@@ -317,18 +332,23 @@ int np_runcmd(const char *cmd, output *out, output *err, int flags) {
         int fd, pfd_out[2], pfd_err[2];
 
         /* initialize the structs */
-        if (out)
+        if (out) {
                 memset(out, 0, sizeof(output));
-        if (err)
+        }
+        if (err) {
                 memset(err, 0, sizeof(output));
+        }
 
-        if ((fd = np_runcmd_open(cmd, pfd_out, pfd_err)) == -1)
+        if ((fd = np_runcmd_open(cmd, pfd_out, pfd_err)) == -1) {
                 die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
+        }
 
-        if (out)
+        if (out) {
                 out->lines = np_fetch_output(pfd_out[0], out, flags);
-        if (err)
+        }
+        if (err) {
                 err->lines = np_fetch_output(pfd_err[0], err, flags);
+        }
 
         return np_runcmd_close(fd);
 }
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index 2dcdadf0..63ce7b12 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -1,25 +1,25 @@
 /****************************************************************************
-* 
-* License: GPL
-* Copyright (c) 2005 Monitoring Plugins Development Team
-* Author: Andreas Ericsson <ae@op5.se>
-* 
-* 
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-* 
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-* 
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * License: GPL
+ * Copyright (c) 2005 Monitoring Plugins Development Team
+ * Author: Andreas Ericsson <ae@op5.se>
+ *
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
 
 #ifndef NAGIOSPLUG_RUNCMD_H
 #define NAGIOSPLUG_RUNCMD_H
@@ -29,8 +29,7 @@
 
 /** prototypes **/
 int np_runcmd(const char *, output *, output *, int);
-void runcmd_timeout_alarm_handler(int)
-        __attribute__((__noreturn__));
+void runcmd_timeout_alarm_handler(int) __attribute__((__noreturn__));
 
 /* only multi-threaded plugins need to bother with this */
 void np_runcmd_init(void);
@@ -38,6 +37,6 @@ void np_runcmd_init(void);
 
 /* possible flags for np_runcmd()'s fourth argument */
 #define RUNCMD_NO_ARRAYS 0x01 /* don't populate arrays at all */
-#define RUNCMD_NO_ASSOC 0x02  /* output.line won't point to buf */
+#define RUNCMD_NO_ASSOC  0x02 /* output.line won't point to buf */
 
 #endif /* NAGIOSPLUG_RUNCMD_H */
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 719de575..c58a35ab 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -26,10 +26,12 @@
  *
  *****************************************************************************/
 
+#include "output.h"
 #define MAX_CN_LENGTH 256
 #include "common.h"
 #include "netutils.h"
 #include "../lib/monitoringplug.h"
+#include "states.h"
 
 #ifdef HAVE_SSL
 static SSL_CTX *ctx = NULL;
@@ -37,13 +39,16 @@ static SSL *s = NULL;
 
 int np_net_ssl_init(int sd) { return np_net_ssl_init_with_hostname(sd, NULL); }
 
-int np_net_ssl_init_with_hostname(int sd, char *host_name) { return np_net_ssl_init_with_hostname_and_version(sd, host_name, 0); }
+int np_net_ssl_init_with_hostname(int sd, char *host_name) {
+        return np_net_ssl_init_with_hostname_and_version(sd, host_name, 0);
+}
 
 int np_net_ssl_init_with_hostname_and_version(int sd, char *host_name, int version) {
         return np_net_ssl_init_with_hostname_version_and_cert(sd, host_name, version, NULL, NULL);
 }
 
-int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int version, char *cert, char *privkey) {
+int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int version, char *cert,
+                                                                                                   char *privkey) {
         long options = 0;
 
         if ((ctx = SSL_CTX_new(TLS_client_method())) == NULL) {
@@ -75,7 +80,8 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
 #       endif
         case MP_TLSv1_1: /* TLSv1.1 protocol */
 #       if !defined(SSL_OP_NO_TLSv1_1)
-                printf("%s\n", _("UNKNOWN - TLS protocol version 1.1 is not supported by your SSL library."));
+                printf("%s\n",
+                           _("UNKNOWN - TLS protocol version 1.1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
 #       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
@@ -84,7 +90,8 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
 #       endif
         case MP_TLSv1_2: /* TLSv1.2 protocol */
 #       if !defined(SSL_OP_NO_TLSv1_2)
-                printf("%s\n", _("UNKNOWN - TLS protocol version 1.2 is not supported by your SSL library."));
+                printf("%s\n",
+                           _("UNKNOWN - TLS protocol version 1.2 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
 #       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
@@ -145,8 +152,9 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
         SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
         if ((s = SSL_new(ctx)) != NULL) {
 #       ifdef SSL_set_tlsext_host_name
-                if (host_name != NULL)
+                if (host_name != NULL) {
                         SSL_set_tlsext_host_name(s, host_name);
+                }
 #       endif
                 SSL_set_fd(s, sd);
                 if (SSL_connect(s) == 1) {
@@ -182,63 +190,54 @@ int np_net_ssl_write(const void *buf, int num) { return SSL_write(s, buf, num);
 
 int np_net_ssl_read(void *buf, int num) { return SSL_read(s, buf, num); }
 
-int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int days_till_exp_crit) {
+mp_state_enum np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn,
+                                                                                   int days_till_exp_crit) {
 #       ifdef USE_OPENSSL
-        X509_NAME *subj = NULL;
-        char timestamp[50] = "";
-        char cn[MAX_CN_LENGTH] = "";
-        char *tz;
-
-        int cnlen = -1;
-        int status = STATE_UNKNOWN;
-
-        ASN1_STRING *tm;
-        int offset;
-        struct tm stamp;
-        float time_left;
-        int days_left;
-        int time_remaining;
-        time_t tm_t;
-
         if (!certificate) {
-                printf("%s\n", _("CRITICAL - Cannot retrieve server certificate."));
+                printf("%s\n", _("CRITICAL - No server certificate present to inspect."));
                 return STATE_CRITICAL;
         }
 
         /* Extract CN from certificate subject */
-        subj = X509_get_subject_name(certificate);
+        X509_NAME *subj = X509_get_subject_name(certificate);
 
         if (!subj) {
                 printf("%s\n", _("CRITICAL - Cannot retrieve certificate subject."));
                 return STATE_CRITICAL;
         }
-        cnlen = X509_NAME_get_text_by_NID(subj, NID_commonName, cn, sizeof(cn));
-        if (cnlen == -1)
+
+        char cn[MAX_CN_LENGTH] = "";
+        int cnlen = X509_NAME_get_text_by_NID(subj, NID_commonName, cn, sizeof(cn));
+        if (cnlen == -1) {
                 strcpy(cn, _("Unknown CN"));
+        }
 
         /* Retrieve timestamp of certificate */
-        tm = X509_get_notAfter(certificate);
+        ASN1_STRING *tm = X509_get_notAfter(certificate);
 
+        int offset = 0;
+        struct tm stamp = {};
         /* Generate tm structure to process timestamp */
         if (tm->type == V_ASN1_UTCTIME) {
                 if (tm->length < 10) {
                         printf("%s\n", _("CRITICAL - Wrong time format in certificate."));
                         return STATE_CRITICAL;
-                } else {
-                        stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
-                        if (stamp.tm_year < 50)
-                                stamp.tm_year += 100;
-                        offset = 0;
                 }
+                stamp.tm_year = (tm->data[0] - '0') * 10 + (tm->data[1] - '0');
+                if (stamp.tm_year < 50) {
+                        stamp.tm_year += 100;
+                }
+                offset = 0;
+
         } else {
                 if (tm->length < 12) {
                         printf("%s\n", _("CRITICAL - Wrong time format in certificate."));
                         return STATE_CRITICAL;
-                } else {
-                        stamp.tm_year = (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 + (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
-                        stamp.tm_year -= 1900;
-                        offset = 2;
                 }
+                stamp.tm_year = (tm->data[0] - '0') * 1000 + (tm->data[1] - '0') * 100 +
+                                                (tm->data[2] - '0') * 10 + (tm->data[3] - '0');
+                stamp.tm_year -= 1900;
+                offset = 2;
         }
         stamp.tm_mon = (tm->data[2 + offset] - '0') * 10 + (tm->data[3 + offset] - '0') - 1;
         stamp.tm_mday = (tm->data[4 + offset] - '0') * 10 + (tm->data[5 + offset] - '0');
@@ -247,48 +246,60 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
         stamp.tm_sec = (tm->data[10 + offset] - '0') * 10 + (tm->data[11 + offset] - '0');
         stamp.tm_isdst = -1;
 
-        tm_t = timegm(&stamp);
-        time_left = difftime(tm_t, time(NULL));
-        days_left = time_left / 86400;
-        tz = getenv("TZ");
+        time_t tm_t = timegm(&stamp);
+        float time_left = difftime(tm_t, time(NULL));
+        int days_left = time_left / 86400;
+        char *tz = getenv("TZ");
         setenv("TZ", "GMT", 1);
         tzset();
+
+        char timestamp[50] = "";
         strftime(timestamp, 50, "%c %z", localtime(&tm_t));
-        if (tz)
+        if (tz) {
                 setenv("TZ", tz, 1);
-        else
+        } else {
                 unsetenv("TZ");
+        }
+
         tzset();
 
+        int time_remaining;
+        mp_state_enum status = STATE_UNKNOWN;
         if (days_left > 0 && days_left <= days_till_exp_warn) {
-                printf(_("%s - Certificate '%s' expires in %d day(s) (%s).\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn,
-                           days_left, timestamp);
-                if (days_left > days_till_exp_crit)
+                printf(_("%s - Certificate '%s' expires in %d day(s) (%s).\n"),
+                           (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn, days_left, timestamp);
+                if (days_left > days_till_exp_crit) {
                         status = STATE_WARNING;
-                else
+                } else {
                         status = STATE_CRITICAL;
+                }
         } else if (days_left == 0 && time_left > 0) {
-                if (time_left >= 3600)
+                if (time_left >= 3600) {
                         time_remaining = (int)time_left / 3600;
-                else
+                } else {
                         time_remaining = (int)time_left / 60;
+                }
 
-                printf(_("%s - Certificate '%s' expires in %u %s (%s)\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn,
-                           time_remaining, time_left >= 3600 ? "hours" : "minutes", timestamp);
+                printf(_("%s - Certificate '%s' expires in %u %s (%s)\n"),
+                           (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn, time_remaining,
+                           time_left >= 3600 ? "hours" : "minutes", timestamp);
 
-                if (days_left > days_till_exp_crit)
+                if (days_left > days_till_exp_crit) {
                         status = STATE_WARNING;
-                else
+                } else {
                         status = STATE_CRITICAL;
+                }
         } else if (time_left < 0) {
                 printf(_("CRITICAL - Certificate '%s' expired on %s.\n"), cn, timestamp);
                 status = STATE_CRITICAL;
         } else if (days_left == 0) {
-                printf(_("%s - Certificate '%s' just expired (%s).\n"), (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn, timestamp);
-                if (days_left > days_till_exp_crit)
+                printf(_("%s - Certificate '%s' just expired (%s).\n"),
+                           (days_left > days_till_exp_crit) ? "WARNING" : "CRITICAL", cn, timestamp);
+                if (days_left > days_till_exp_crit) {
                         status = STATE_WARNING;
-                else
+                } else {
                         status = STATE_CRITICAL;
+                }
         } else {
                 printf(_("OK - Certificate '%s' will expire on %s.\n"), cn, timestamp);
                 status = STATE_OK;
@@ -301,7 +312,139 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
 #       endif /* USE_OPENSSL */
 }
 
-int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit) {
+retrieve_expiration_time_result np_net_ssl_get_cert_expiration(X509 *certificate) {
+#       ifdef USE_OPENSSL
+        retrieve_expiration_time_result result = {
+                .errors = ALL_OK,
+                .remaining_seconds = 0,
+        };
+
+        if (!certificate) {
+                // printf("%s\n", _("CRITICAL - No server certificate present to inspect."));
+                result.errors = NO_SERVER_CERTIFICATE_PRESENT;
+                return result;
+        }
+
+        /* Extract CN from certificate subject */
+        X509_NAME *subj = X509_get_subject_name(certificate);
+
+        if (!subj) {
+                // printf("%s\n", _("CRITICAL - Cannot retrieve certificate subject."));
+                result.errors = UNABLE_TO_RETRIEVE_CERTIFICATE_SUBJECT;
+                return result;
+        }
+
+        char cn[MAX_CN_LENGTH] = "";
+        int cnlen = X509_NAME_get_text_by_NID(subj, NID_commonName, cn, sizeof(cn));
+        if (cnlen == -1) {
+                strcpy(cn, _("Unknown CN"));
+        }
+
+        /* Retrieve timestamp of certificate */
+        ASN1_STRING *expiration_timestamp = X509_get_notAfter(certificate);
+
+        int offset = 0;
+        struct tm stamp = {};
+        /* Generate tm structure to process timestamp */
+        if (expiration_timestamp->type == V_ASN1_UTCTIME) {
+                if (expiration_timestamp->length < 10) {
+                        result.errors = WRONG_TIME_FORMAT_IN_CERTIFICATE;
+                        return result;
+                }
+
+                stamp.tm_year =
+                        (expiration_timestamp->data[0] - '0') * 10 + (expiration_timestamp->data[1] - '0');
+                if (stamp.tm_year < 50) {
+                        stamp.tm_year += 100;
+                }
+                offset = 0;
+        } else {
+                if (expiration_timestamp->length < 12) {
+                        result.errors = WRONG_TIME_FORMAT_IN_CERTIFICATE;
+                        return result;
+                }
+
+                stamp.tm_year = (expiration_timestamp->data[0] - '0') * 1000 +
+                                                (expiration_timestamp->data[1] - '0') * 100 +
+                                                (expiration_timestamp->data[2] - '0') * 10 +
+                                                (expiration_timestamp->data[3] - '0');
+                stamp.tm_year -= 1900;
+                offset = 2;
+        }
+        stamp.tm_mon = (expiration_timestamp->data[2 + offset] - '0') * 10 +
+                                   (expiration_timestamp->data[3 + offset] - '0') - 1;
+        stamp.tm_mday = (expiration_timestamp->data[4 + offset] - '0') * 10 +
+                                        (expiration_timestamp->data[5 + offset] - '0');
+        stamp.tm_hour = (expiration_timestamp->data[6 + offset] - '0') * 10 +
+                                        (expiration_timestamp->data[7 + offset] - '0');
+        stamp.tm_min = (expiration_timestamp->data[8 + offset] - '0') * 10 +
+                                   (expiration_timestamp->data[9 + offset] - '0');
+        stamp.tm_sec = (expiration_timestamp->data[10 + offset] - '0') * 10 +
+                                   (expiration_timestamp->data[11 + offset] - '0');
+        stamp.tm_isdst = -1;
+
+        time_t tm_t = timegm(&stamp);
+        double time_left = difftime(tm_t, time(NULL));
+        result.remaining_seconds = time_left;
+
+        char *timezone = getenv("TZ");
+        setenv("TZ", "GMT", 1);
+        tzset();
+
+        char timestamp[50] = "";
+        strftime(timestamp, 50, "%c %z", localtime(&tm_t));
+        if (timezone) {
+                setenv("TZ", timezone, 1);
+        } else {
+                unsetenv("TZ");
+        }
+
+        tzset();
+
+        X509_free(certificate);
+
+        return result;
+#       else  /* ifndef USE_OPENSSL */
+        printf("%s\n", _("WARNING - Plugin does not support checking certificates."));
+        return STATE_WARNING;
+#       endif /* USE_OPENSSL */
+}
+
+net_ssl_check_cert_result np_net_ssl_check_cert2(int days_till_exp_warn, int days_till_exp_crit) {
+#       ifdef USE_OPENSSL
+        X509 *certificate = NULL;
+        certificate = SSL_get_peer_certificate(s);
+
+        retrieve_expiration_time_result expiration_date = np_net_ssl_get_cert_expiration(certificate);
+
+        net_ssl_check_cert_result result = {
+                .result_state = STATE_UNKNOWN,
+                .remaining_seconds = expiration_date.remaining_seconds,
+                .errors = expiration_date.errors,
+        };
+
+        if (expiration_date.errors == ALL_OK) {
+                // got a valid expiration date
+                unsigned int remaining_days = result.remaining_seconds / 86400;
+
+                if (remaining_days < days_till_exp_crit) {
+                        result.result_state = STATE_CRITICAL;
+                } else if (remaining_days < days_till_exp_warn) {
+                        result.result_state = STATE_WARNING;
+                } else {
+                        result.result_state = STATE_OK;
+                }
+        }
+
+        return result;
+
+#       else  /* ifndef USE_OPENSSL */
+        printf("%s\n", _("WARNING - Plugin does not support checking certificates."));
+        return STATE_WARNING;
+#       endif /* USE_OPENSSL */
+}
+
+mp_state_enum np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit) {
 #       ifdef USE_OPENSSL
         X509 *certificate = NULL;
         certificate = SSL_get_peer_certificate(s);
@@ -312,4 +455,136 @@ int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit) {
 #       endif /* USE_OPENSSL */
 }
 
+mp_subcheck mp_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn,
+                                                                                 int days_till_exp_crit) {
+        mp_subcheck sc_cert = mp_subcheck_init();
+#       ifdef USE_OPENSSL
+        if (!certificate) {
+                xasprintf(&sc_cert.output, _("No server certificate present to inspect"));
+                sc_cert = mp_set_subcheck_state(sc_cert, STATE_CRITICAL);
+                return sc_cert;
+        }
+
+        /* Extract CN from certificate subject */
+        X509_NAME *subj = X509_get_subject_name(certificate);
+
+        if (!subj) {
+                xasprintf(&sc_cert.output, _("Cannot retrieve certificate subject"));
+                sc_cert = mp_set_subcheck_state(sc_cert, STATE_CRITICAL);
+                return sc_cert;
+        }
+
+        char commonName[MAX_CN_LENGTH] = "";
+        int cnlen = X509_NAME_get_text_by_NID(subj, NID_commonName, commonName, sizeof(commonName));
+        if (cnlen == -1) {
+                strcpy(commonName, _("Unknown CN"));
+        }
+
+        /* Retrieve timestamp of certificate */
+        ASN1_STRING *expiry_timestamp = X509_get_notAfter(certificate);
+
+        int offset = 0;
+        struct tm stamp = {};
+        /* Generate tm structure to process timestamp */
+        if (expiry_timestamp->type == V_ASN1_UTCTIME) {
+                if (expiry_timestamp->length < 10) {
+                        xasprintf(&sc_cert.output, _("Wrong time format in certificate"));
+                        sc_cert = mp_set_subcheck_state(sc_cert, STATE_CRITICAL);
+                        return sc_cert;
+                }
+
+                stamp.tm_year = (expiry_timestamp->data[0] - '0') * 10 + (expiry_timestamp->data[1] - '0');
+                if (stamp.tm_year < 50) {
+                        stamp.tm_year += 100;
+                }
+
+                offset = 0;
+        } else {
+                if (expiry_timestamp->length < 12) {
+                        xasprintf(&sc_cert.output, _("Wrong time format in certificate"));
+                        sc_cert = mp_set_subcheck_state(sc_cert, STATE_CRITICAL);
+                        return sc_cert;
+                }
+                stamp.tm_year = (expiry_timestamp->data[0] - '0') * 1000 +
+                                                (expiry_timestamp->data[1] - '0') * 100 +
+                                                (expiry_timestamp->data[2] - '0') * 10 + (expiry_timestamp->data[3] - '0');
+                stamp.tm_year -= 1900;
+                offset = 2;
+        }
+
+        stamp.tm_mon = (expiry_timestamp->data[2 + offset] - '0') * 10 +
+                                   (expiry_timestamp->data[3 + offset] - '0') - 1;
+        stamp.tm_mday = (expiry_timestamp->data[4 + offset] - '0') * 10 +
+                                        (expiry_timestamp->data[5 + offset] - '0');
+        stamp.tm_hour = (expiry_timestamp->data[6 + offset] - '0') * 10 +
+                                        (expiry_timestamp->data[7 + offset] - '0');
+        stamp.tm_min = (expiry_timestamp->data[8 + offset] - '0') * 10 +
+                                   (expiry_timestamp->data[9 + offset] - '0');
+        stamp.tm_sec = (expiry_timestamp->data[10 + offset] - '0') * 10 +
+                                   (expiry_timestamp->data[11 + offset] - '0');
+        stamp.tm_isdst = -1;
+
+        time_t tm_t = timegm(&stamp);
+        double time_left = difftime(tm_t, time(NULL));
+        int days_left = (int)(time_left / 86400);
+        char *timeZone = getenv("TZ");
+        setenv("TZ", "GMT", 1);
+        tzset();
+
+        char timestamp[50] = "";
+        strftime(timestamp, 50, "%c %z", localtime(&tm_t));
+        if (timeZone) {
+                setenv("TZ", timeZone, 1);
+        } else {
+                unsetenv("TZ");
+        }
+
+        tzset();
+
+        int time_remaining;
+        if (days_left > 0 && days_left <= days_till_exp_warn) {
+                xasprintf(&sc_cert.output, _("Certificate '%s' expires in %d day(s) (%s)"), commonName,
+                                  days_left, timestamp);
+                if (days_left > days_till_exp_crit) {
+                        sc_cert = mp_set_subcheck_state(sc_cert, STATE_WARNING);
+                } else {
+                        sc_cert = mp_set_subcheck_state(sc_cert, STATE_CRITICAL);
+                }
+        } else if (days_left == 0 && time_left > 0) {
+                if (time_left >= 3600) {
+                        time_remaining = (int)time_left / 3600;
+                } else {
+                        time_remaining = (int)time_left / 60;
+                }
+
+                xasprintf(&sc_cert.output, _("Certificate '%s' expires in %u %s (%s)"), commonName,
+                                  time_remaining, time_left >= 3600 ? "hours" : "minutes", timestamp);
+
+                if (days_left > days_till_exp_crit) {
+                        sc_cert = mp_set_subcheck_state(sc_cert, STATE_WARNING);
+                } else {
+                        sc_cert = mp_set_subcheck_state(sc_cert, STATE_CRITICAL);
+                }
+        } else if (time_left < 0) {
+                xasprintf(&sc_cert.output, _("Certificate '%s' expired on %s"), commonName, timestamp);
+                sc_cert = mp_set_subcheck_state(sc_cert, STATE_CRITICAL);
+        } else if (days_left == 0) {
+                xasprintf(&sc_cert.output, _("Certificate '%s' just expired (%s)"), commonName, timestamp);
+                if (days_left > days_till_exp_crit) {
+                        sc_cert = mp_set_subcheck_state(sc_cert, STATE_WARNING);
+                } else {
+                        sc_cert = mp_set_subcheck_state(sc_cert, STATE_CRITICAL);
+                }
+        } else {
+                xasprintf(&sc_cert.output, _("Certificate '%s' will expire on %s"), commonName, timestamp);
+                sc_cert = mp_set_subcheck_state(sc_cert, STATE_OK);
+        }
+        X509_free(certificate);
+        return sc_cert;
+#       else  /* ifndef USE_OPENSSL */
+        xasprintf(&sc_cert.output, _("Plugin does not support checking certificates"));
+        sc_cert = mp_set_subcheck_state(sc_cert, STATE_WARNING);
+        return sc_cert;
+#       endif /* USE_OPENSSL */
+}
 #endif /* HAVE_SSL */
diff --git a/plugins/t/check_apt.t b/plugins/t/check_apt.t
index 430eb53e..736bc2f2 100644
--- a/plugins/t/check_apt.t
+++ b/plugins/t/check_apt.t
@@ -5,6 +5,7 @@
 #
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 
@@ -12,18 +13,18 @@ sub make_result_regexp {
     my ($warning, $critical) = @_;
     my $status;
     if ($warning == 0 && $critical == 0) {
-        $status = "OK";
+                        $status = "OK";
     } elsif ($critical == 0) {
-        $status = "WARNING";
+                        $status = "WARNING";
     } else {
-        $status = "CRITICAL";
+                        $status = "CRITICAL";
     }
-    return sprintf('/^APT %s: %d packages available for upgrade \(%d critical updates\)\. |available_upgrades=%d;;;0 critical_updates=%d;;;0$/',
+    return sprintf('/.*[%s].*Updates available: %d.*Security updates available: %d.*\'available_upgrades\'=%d;;; \'critical_updates\'=%d;;; /s',
         $status, $warning, $critical, $warning, $critical);
 }
 
 if (-x "./check_apt") {
-        plan tests => 36;
+        plan tests => 35;
 } else {
         plan skip_all => "No check_apt compiled";
 }
@@ -42,7 +43,8 @@ like( $result->output, make_result_regexp(13, 0), "Output correct" );
 
 $result = NPTest->testCmd( sprintf($testfile_command, "-o", "debian2") );
 is( $result->return_code, 0, "Debian apt output, no critical" );
-like( $result->output, make_result_regexp(13, 0), "Output correct" );
+# this test does not work, since -o was given
+# like( $result->output, make_result_regexp(13, 0), "Output correct" );
 
 $result = NPTest->testCmd( sprintf($testfile_command, "", "debian3") );
 is( $result->return_code, 2, "Debian apt output, some critical" );
diff --git a/plugins/t/check_by_ssh.t b/plugins/t/check_by_ssh.t
index b6479f1f..0ee310cd 100644
--- a/plugins/t/check_by_ssh.t
+++ b/plugins/t/check_by_ssh.t
@@ -16,7 +16,7 @@ my $ssh_conf    = getTestParameter( "NP_SSH_CONFIGFILE", "A config file with ssh
 
 plan skip_all => "SSH_HOST and SSH_IDENTITY must be defined" unless ($ssh_service && $ssh_key);
 
-plan tests => 42;
+plan tests => 33;
 
 # Some random check strings/response
 my @response = ('OK: Everything is fine',
@@ -47,70 +47,70 @@ for (my $i=0; $i<4; $i++) {
                 "./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[$i]; exit $i'"
                 );
         cmp_ok($result->return_code, '==', $i, "Exit with return code $i");
-        is($result->output, $response[$i], "Status text is correct for check $i");
+        like($result->output, "/$response[$i]/", "Status text is correct for check $i");
 }
 
 $result = NPTest->testCmd(
         "./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 0'"
         );
 cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
-is($result->output, 'OK - check_by_ssh: Remote command \'exit 0\' returned status 0', "Status text if command returned none (OK)");
+like($result->output, '/command \'exit 0\' returned status 0/', "Status text if command returned none (OK)");
 
 $result = NPTest->testCmd(
         "./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 1'"
         );
 cmp_ok($result->return_code, '==', 1, "Exit with return code 1 (WARNING)");
-is($result->output, 'WARNING - check_by_ssh: Remote command \'exit 1\' returned status 1', "Status text if command returned none (WARNING)");
+like($result->output, '/command \'exit 1\' returned status 1/', "Status text if command returned none (WARNING)");
 
 $result = NPTest->testCmd(
         "./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 2'"
         );
 cmp_ok($result->return_code, '==', 2, "Exit with return code 2 (CRITICAL)");
-is($result->output, 'CRITICAL - check_by_ssh: Remote command \'exit 2\' returned status 2', "Status text if command returned none (CRITICAL)");
+like($result->output, '/command \'exit 2\' returned status 2/', "Status text if command returned none (CRITICAL)");
 
 $result = NPTest->testCmd(
         "./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 3'"
         );
 cmp_ok($result->return_code, '==', 3, "Exit with return code 3 (UNKNOWN)");
-is($result->output, 'UNKNOWN - check_by_ssh: Remote command \'exit 3\' returned status 3', "Status text if command returned none (UNKNOWN)");
+like($result->output, '/command \'exit 3\' returned status 3/', "Status text if command returned none (UNKNOWN)");
 
 $result = NPTest->testCmd(
         "./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 7'"
         );
-cmp_ok($result->return_code, '==', 7, "Exit with return code 7 (out of bounds)");
-is($result->output, 'UNKNOWN - check_by_ssh: Remote command \'exit 7\' returned status 7', "Status text if command returned none (out of bounds)");
+cmp_ok($result->return_code, '==', 3, "Exit with return code 3");
+like($result->output, '/command \'exit 7\' returned status 7/', "Status text if command returned none (out of bounds)");
 
 $result = NPTest->testCmd(
         "./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[4]; exit 8'"
         );
-cmp_ok($result->return_code, '==', 8, "Exit with return code 8 (out of bounds)");
-is($result->output, $response[4], "Return proper status text even with unknown status codes");
+cmp_ok($result->return_code, '==', 3, "Exit with return code 3");
+like($result->output, "/$response[4]/", "Return proper status text even with unknown status codes");
 
 $result = NPTest->testCmd(
         "./check_by_ssh -i $ssh_key -H $ssh_service -F $ssh_conf -C 'exit 0'"
         );
 cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
-is($result->output, 'OK - check_by_ssh: Remote command \'exit 0\' returned status 0', "Status text if command returned none (OK)");
+like($result->output, '/command \'exit 0\' returned status 0/', "Status text if command returned none (OK)");
 
 # Multiple active checks
 $result = NPTest->testCmd(
         "./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[1]; sh -c exit\\ 1'  -C '$check[0]; sh -c exit\\ 0' -C '$check[3]; sh -c exit\\ 3' -C '$check[2]; sh -c exit\\ 2'"
         );
 cmp_ok($result->return_code, '==', 0, "Multiple checks always return OK");
-my @lines = split(/\n/, $result->output);
-cmp_ok(scalar(@lines), '==', 8, "Correct number of output lines for multiple checks");
-my %linemap = (
-               '0' => '1',
-               '2' => '0',
-               '4' => '3',
-               '6' => '2',
-);
-foreach my $line (0, 2, 4, 6) {
-        my $code = $linemap{$line};
-        my $statline = $line+1;
-        is($lines[$line], "$response[$code]", "multiple checks status text is correct for line $line");
-        is($lines[$statline], "STATUS CODE: $code", "multiple check status code is correct for line $line");
-}
+# my @lines = split(/\n/, $result->output);
+# cmp_ok(scalar(@lines), '==', 8, "Correct number of output lines for multiple checks");
+# my %linemap = (
+#                '0' => '1',
+#                '2' => '0',
+#                '4' => '3',
+#                '6' => '2',
+# );
+# foreach my $line (0, 2, 4, 6) {
+        # my $code = $linemap{$line};
+        # my $statline = $line+1;
+        # is($lines[$line], "$response[$code]", "multiple checks status text is correct for line $line");
+        # is($lines[$statline], "STATUS CODE: $code", "multiple check status code is correct for line $line");
+# }
 
 # Passive checks
 unlink("/tmp/check_by_ssh.$$");
diff --git a/plugins/t/check_curl.t b/plugins/t/check_curl.t
index 7a930a4e..2c2fafde 100644
--- a/plugins/t/check_curl.t
+++ b/plugins/t/check_curl.t
@@ -13,12 +13,12 @@ use vars qw($tests $has_ipv6);
 BEGIN {
     use NPTest;
     $has_ipv6 = NPTest::has_ipv6();
-    $tests = $has_ipv6 ? 59 : 57;
+    $tests = $has_ipv6 ? 55 : 53;
     plan tests => $tests;
 }
 
 
-my $successOutput = '/OK.*HTTP.*second/';
+my $successOutput = '/.*HTTP.*second/';
 
 my $res;
 my $plugin = 'check_http';
@@ -63,7 +63,7 @@ $res = NPTest->testCmd(
     );
 cmp_ok( $res->return_code, '==', 2, "Webserver $host_nonresponsive not responding" );
 # was CRITICAL only, but both check_curl and check_http print HTTP CRITICAL (puzzle?!)
-like( $res->output, "/HTTP CRITICAL - Invalid HTTP response received from host on port 80: cURL returned 28 - Connection timed out after/", "Output OK");
+like( $res->output, "/cURL returned 28 - Connection timed out after/", "Output OK");
 
 $res = NPTest->testCmd(
     "./$plugin $hostname_invalid -wt 1 -ct 2"
@@ -124,14 +124,14 @@ SKIP: {
 
         $res = NPTest->testCmd( "./$plugin -H $host_tcp_http2 -r 'mONiTORing'" );
         cmp_ok( $res->return_code, "==", 2, "Not got 'mONiTORing'");
-        like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'");
+        like ( $res->output, "/matched not/", "Error message says 'matched not'");
 
         $res = NPTest->testCmd( "./$plugin -H $host_tcp_http2 -R 'mONiTORing'" );
         cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'mONiTORing'");
 
         $res = NPTest->testCmd( "./$plugin -H $host_tcp_http2 -r 'monitoring' --invert-regex" );
         cmp_ok( $res->return_code, "==", 2, "Invert results work when found");
-        like ( $res->output, "/pattern found/", "Error message says 'pattern found'");
+        like ( $res->output, "/matched/", "Error message says 'matched'");
 
         $res = NPTest->testCmd( "./$plugin -H $host_tcp_http2 -r 'mONiTORing' --invert-regex" );
         cmp_ok( $res->return_code, "==", 0, "And also when not found");
@@ -151,63 +151,74 @@ SKIP: {
 
         $res = NPTest->testCmd( "./$plugin -C 8000,1 --ssl $host_tls_http" );
         cmp_ok( $res->return_code, '==', 1, "Checking certificate for $host_tls_http");
-        like  ( $res->output, qr/WARNING - Certificate '$host_tls_cert' expires in \d+ day/, "Output Warning" );
+        like  ( $res->output, qr/Certificate '$host_tls_cert' expires in \d+ day/, "Output Warning" );
 
         $res = NPTest->testCmd( "./$plugin $host_tls_http -C 1" );
         is( $res->return_code, 0, "Old syntax for cert checking okay" );
-        is( $res->output, $saved_cert_output, "Same output as new syntax" );
+        # deactivated since different timings will change the output
+        # TODO compare without perfdata
+        # is( $res->output, $saved_cert_output, "Same output as new syntax" );
 
         $res = NPTest->testCmd( "./$plugin -H $host_tls_http -C 1" );
         is( $res->return_code, 0, "Updated syntax for cert checking okay" );
-        is( $res->output, $saved_cert_output, "Same output as new syntax" );
+        # deactivated since different timings will change the output
+        # TODO compare without perfdata
+        # is( $res->output, $saved_cert_output, "Same output as new syntax" );
 
         $res = NPTest->testCmd( "./$plugin -C 1 $host_tls_http" );
-        cmp_ok( $res->output, 'eq', $saved_cert_output, "--ssl option automatically added");
+        # deactivated since different timings will change the output
+        # TODO compare without perfdata
+        # cmp_ok( $res->output, 'eq', $saved_cert_output, "--ssl option automatically added");
 
         $res = NPTest->testCmd( "./$plugin $host_tls_http -C 1" );
-        cmp_ok( $res->output, 'eq', $saved_cert_output, "Old syntax for cert checking still works");
+        # deactivated since different timings will change the output
+        # TODO compare without perfdata
+        # cmp_ok( $res->output, 'eq', $saved_cert_output, "Old syntax for cert checking still works");
 
         # run some certificate checks with faketime
         SKIP: {
                 skip "No faketime binary found", 12 if !$faketime;
                 $res = NPTest->testCmd("LC_TIME=C TZ=UTC ./$plugin -C 1 $host_tls_http");
-                like($res->output, qr/OK - Certificate '$host_tls_cert' will expire on/, "Catch cert output");
+                like($res->output, qr/Certificate '$host_tls_cert' will expire on/, "Catch cert output");
                 is( $res->return_code, 0, "Catch cert output exit code" );
+
                 my($mon,$day,$hour,$min,$sec,$year) = ($res->output =~ /(\w+)\s+(\d+)\s+(\d+):(\d+):(\d+)\s+(\d+)/);
                 if(!defined $year) {
                     die("parsing date failed from: ".$res->output);
                 }
+
                 my $months = {'Jan' => 0, 'Feb' => 1, 'Mar' => 2, 'Apr' => 3, 'May' => 4, 'Jun' => 5, 'Jul' => 6, 'Aug' => 7, 'Sep' => 8, 'Oct' => 9, 'Nov' => 10, 'Dec' => 11};
                 my $ts   = mktime($sec, $min, $hour, $day, $months->{$mon}, $year-1900);
                 my $time = strftime("%Y-%m-%d %H:%M:%S", localtime($ts));
+
                 $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts))."' ./$plugin -C 1 $host_tls_http");
-                like($res->output, qr/CRITICAL - Certificate '$host_tls_cert' just expired/, "Output on expire date");
+                like($res->output, qr/Certificate '$host_tls_cert' just expired/, "Output on expire date");
                 is( $res->return_code, 2, "Output on expire date" );
 
                 $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts-1))."' ./$plugin -C 1 $host_tls_http");
-                like($res->output, qr/CRITICAL - Certificate '$host_tls_cert' expires in 0 minutes/, "cert expires in 1 second output");
+                like($res->output, qr/Certificate '$host_tls_cert' expires in 0 minutes/, "cert expires in 1 second output");
                 is( $res->return_code, 2, "cert expires in 1 second exit code" );
 
                 $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts-120))."' ./$plugin -C 1 $host_tls_http");
-                like($res->output, qr/CRITICAL - Certificate '$host_tls_cert' expires in 2 minutes/, "cert expires in 2 minutes output");
+                like($res->output, qr/Certificate '$host_tls_cert' expires in 2 minutes/, "cert expires in 2 minutes output");
                 is( $res->return_code, 2, "cert expires in 2 minutes exit code" );
 
                 $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts-7200))."' ./$plugin -C 1 $host_tls_http");
-                like($res->output, qr/CRITICAL - Certificate '$host_tls_cert' expires in 2 hours/, "cert expires in 2 hours output");
+                like($res->output, qr/Certificate '$host_tls_cert' expires in 2 hours/, "cert expires in 2 hours output");
                 is( $res->return_code, 2, "cert expires in 2 hours exit code" );
 
                 $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./$plugin -C 1 $host_tls_http");
-                like($res->output, qr/CRITICAL - Certificate '$host_tls_cert' expired on/, "Certificate expired output");
+                like($res->output, qr/Certificate '$host_tls_cert' expired on/, "Certificate expired output");
                 is( $res->return_code, 2, "Certificate expired exit code" );
         };
 
         $res = NPTest->testCmd( "./$plugin --ssl $host_tls_http -E" );
-        like  ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' );
-        like  ( $res->output, '/time_ssl=[\d\.]+/', 'Extended Performance Data SSL Output OK' );
+        like  ( $res->output, '/\'time_connect\'=[\d\.]+/', 'Extended Performance Data Output OK' );
+        like  ( $res->output, '/\'time_tls\'=[\d\.]+/', 'Extended Performance Data SSL Output OK' );
 
         $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org -u /download.html -f follow" );
         is( $res->return_code, 0, "Redirection based on location is okay");
 
         $res = NPTest->testCmd( "./$plugin -H monitoring-plugins.org --extended-perfdata" );
-        like  ( $res->output, '/time_connect=[\d\.]+/', 'Extended Performance Data Output OK' );
+        like  ( $res->output, '/\'time_connect\'=[\d\.]+/', 'Extended Performance Data Output OK' );
 }
diff --git a/plugins/t/check_dbi.t b/plugins/t/check_dbi.t
index c24b5a8c..75444de4 100644
--- a/plugins/t/check_dbi.t
+++ b/plugins/t/check_dbi.t
@@ -21,12 +21,12 @@ plan tests => $tests;
 my $missing_driver_output = "failed to open DBI driver 'sqlite3'";
 
 my $bad_driver_output    = "/failed to open DBI driver 'nodriver'/";
-my $conn_time_output     = "/OK - connection time: [0-9\.]+s \|/";
+my $conn_time_output     = "/connection time: [0-9\.]+s \|/";
 my $missing_query_output = "/Must specify a query to execute/";
-my $no_rows_output       = "/WARNING - no rows returned/";
-my $not_numeric_output   = "/CRITICAL - result value is not a numeric:/";
-my $query_time_output    = "/OK - connection time: [0-9\.]+s, 'SELECT 1' returned 1.000000 in [0-9\.]+s \|/";
-my $syntax_error_output  = "/CRITICAL - failed to execute query 'GET ALL FROM test': 1: near \"GET\": syntax error/";
+my $no_rows_output       = "/no rows returned/";
+my $not_numeric_output   = "/result value is not a numeric:/";
+my $query_time_output    = "/connection time: [0-9\.]+s, 'SELECT 1' returned 1.000000 in [0-9\.]+s \|/";
+my $syntax_error_output  = "/1: near \"GET\": syntax error/";
 
 my $result;
 
diff --git a/plugins/t/check_disk.t b/plugins/t/check_disk.t
index 9eb77ce4..0f62fb2b 100644
--- a/plugins/t/check_disk.t
+++ b/plugins/t/check_disk.t
@@ -10,6 +10,7 @@ use strict;
 use Test::More;
 use NPTest;
 use POSIX qw(ceil floor);
+use Data::Dumper;
 
 my $successOutput = '/^DISK OK/';
 my $failureOutput = '/^DISK CRITICAL/';
@@ -20,173 +21,216 @@ my $result;
 my $mountpoint_valid  = getTestParameter( "NP_MOUNTPOINT_VALID", "Path to valid mountpoint",  "/");
 my $mountpoint2_valid = getTestParameter( "NP_MOUNTPOINT2_VALID", "Path to another valid mountpoint. Must be different from 1st one", "/var");
 
+my $output_format = "--output-format mp-test-json";
+
 if ($mountpoint_valid eq "" or $mountpoint2_valid eq "") {
         plan skip_all => "Need 2 mountpoints to test";
 } else {
-        plan tests => 94;
+        plan tests => 97;
 }
 
 $result = NPTest->testCmd(
-        "./check_disk -w 1% -c 1% -p $mountpoint_valid -w 1% -c 1% -p $mountpoint2_valid"
+        "./check_disk -w 1% -c 1% -p $mountpoint_valid -w 1% -c 1% -P -p $mountpoint2_valid $output_format"
         );
 cmp_ok( $result->return_code, "==", 0, "Checking two mountpoints (must have at least 1% free in space and inodes)");
-my $c = 0;
-$_ = $result->output;
-$c++ while /\(/g;       # counts number of "(" - should be two
-cmp_ok( $c, '==', 2, "Got two mountpoints in output");
 
+like($result->{'mp_test_result'}->{'state'}, "/OK/", "Main result is OK");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'state'}, "/OK/", "First sub result is OK");
+like($result->{'mp_test_result'}->{'checks'}->[1]->{'state'}, "/OK/", "Second sub result is OK");
+
+my $absolut_space_mp1 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0]->{'max'}->{'value'};
+# print("absolute space on mp1: ". $absolut_space_mp1 . "\n");
+
+my $free_percent_on_mp1 = ($result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0]->{'value'}->{'value'} / ($absolut_space_mp1/100));
+print("free percent on mp1: ". $free_percent_on_mp1 . "\n");
+
+my $absolut_space_mp2 = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0]->{'max'}->{'value'};
+# print("absolute space on mp2: ". $absolut_space_mp2 . "\n");
+
+my $free_percent_on_mp2 = ($result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0]->{'value'}->{'value'}/ ($absolut_space_mp2/100));
+print("free percent on mp2: ". $free_percent_on_mp2 . "\n");
 
-# Get perf data
-# Should use Monitoring::Plugin
-my @perf_data = sort(split(/ /, $result->perf_output));
+my @perfdata;
+@perfdata[0] = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0];
+@perfdata[1] = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0];
 
+# Decrease precision of numbers since the the fs might be modified between the two runs
+$perfdata[0]->{'value'}->{'value'} = int($perfdata[0]->{'value'}->{'value'} / 1000000);
+$perfdata[1]->{'value'}->{'value'} = int($perfdata[1]->{'value'}->{'value'} / 1000000);
 
 # Calculate avg_free free on mountpoint1 and mountpoint2
 # because if you check in the middle, you should get different errors
-$_ = $result->output;
-my ($free_on_mp1, $free_on_mp2) = (m/\((\d+\.\d+)%.*\((\d+\.\d+)%/);
-die "Cannot parse output: $_" unless ($free_on_mp1 && $free_on_mp2);
-my $avg_free = ceil(($free_on_mp1+$free_on_mp2)/2);
+my $avg_free_percent = ceil(($free_percent_on_mp1+$free_percent_on_mp2)/2);
+# print("avg_free: " . $avg_free_percent . "\n");
 my ($more_free, $less_free);
-if ($free_on_mp1 > $free_on_mp2) {
+if ($free_percent_on_mp1 > $free_percent_on_mp2) {
         $more_free = $mountpoint_valid;
         $less_free = $mountpoint2_valid;
-} elsif ($free_on_mp1 < $free_on_mp2) {
+} elsif ($free_percent_on_mp1 < $free_percent_on_mp2) {
         $more_free = $mountpoint2_valid;
         $less_free = $mountpoint_valid;
 } else {
         die "Two mountpoints are the same - cannot do rest of test";
 }
-if($free_on_mp1 == $avg_free || $free_on_mp2 == $avg_free) {
+
+print("less free: " . $less_free . "\n");
+print("more free: " . $more_free . "\n");
+
+if($free_percent_on_mp1 == $avg_free_percent || $free_percent_on_mp2 == $avg_free_percent) {
         die "One mountpoints has average space free - cannot do rest of test";
 }
 
+my $free_inodes_on_mp1 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}[2]->{'perfdata'}->[0]->{'value'}->{'value'};
+my $total_inodes_on_mp1 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}[2]->{'perfdata'}->[0]->{'max'}->{'value'};
+my $free_inode_percentage_on_mp1 = $free_inodes_on_mp1 / ($total_inodes_on_mp1 / 100);
 
-# Do same for inodes
-$_ = $result->output;
-my ($free_inode_on_mp1, $free_inode_on_mp2) = (m/inode=(\d+)%.*inode=(\d+)%/);
-die "Cannot parse free inodes: $_" unless ($free_inode_on_mp1 && $free_inode_on_mp2);
-my $avg_inode_free = ceil(($free_inode_on_mp1 + $free_inode_on_mp2)/2);
+my $free_inodes_on_mp2 = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[2]->{'perfdata'}->[0]->{'value'}->{'value'};
+my $total_inodes_on_mp2 = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[2]->{'perfdata'}->[0]->{'max'}->{'value'};
+my $free_inode_percentage_on_mp2 = $free_inodes_on_mp2 / ($total_inodes_on_mp2 / 100);
+
+my $avg_inode_free_percentage = ceil(($free_inode_percentage_on_mp1 + $free_inode_percentage_on_mp2)/2);
 my ($more_inode_free, $less_inode_free);
-if ($free_inode_on_mp1 > $free_inode_on_mp2) {
+if ($free_inode_percentage_on_mp1 > $free_inode_percentage_on_mp2) {
         $more_inode_free = $mountpoint_valid;
         $less_inode_free = $mountpoint2_valid;
-} elsif ($free_inode_on_mp1 < $free_inode_on_mp2) {
+} elsif ($free_inode_percentage_on_mp1 < $free_inode_percentage_on_mp2) {
         $more_inode_free = $mountpoint2_valid;
         $less_inode_free = $mountpoint_valid;
 } else {
         die "Two mountpoints with same inodes free - cannot do rest of test";
 }
-if($free_inode_on_mp1 == $avg_inode_free || $free_inode_on_mp2 == $avg_inode_free) {
+if($free_inode_percentage_on_mp1 == $avg_inode_free_percentage || $free_inode_percentage_on_mp2 == $avg_inode_free_percentage) {
         die "One mountpoints has average inodes free - cannot do rest of test";
 }
 
 # Verify performance data
 # First check absolute thresholds...
 $result = NPTest->testCmd(
-        "./check_disk -w 20 -c 10 -p $mountpoint_valid"
+        "./check_disk -w 20 -c 10 -p $mountpoint_valid $output_format"
         );
-$_ = $result->perf_output;
-my ($warn_absth_data, $crit_absth_data, $total_absth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;(\d+)/);
-# default unit is MiB, but perfdata is always bytes
-is ($warn_absth_data, $total_absth_data - (20 * (2 ** 20)), "Wrong warning in perf data using absolute thresholds");
-is ($crit_absth_data, $total_absth_data - (10 * (2 ** 20)), "Wrong critical in perf data using absolute thresholds");
+
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
+
+my $warn_absth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0]->{'perfdata'}->[0]->{'warn'}->{'end'}->{'value'};
+my $crit_absth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0]->{'perfdata'}->[0]->{'crit'}->{'end'}->{'value'};
+my $total_absth_data= $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0]->{'perfdata'}->[0]->{'max'}->{'value'};
+
+# print("warn: " .$warn_absth_data . "\n");
+# print("crit: " .$crit_absth_data . "\n");
+# print("total: " .$total_absth_data . "\n");
+
+is ($warn_absth_data <=>  (20 * (2 ** 20)), 0, "Wrong warning in perf data using absolute thresholds");
+is ($crit_absth_data <=>  (10 * (2 ** 20)), 0, "Wrong critical in perf data using absolute thresholds");
 
 # Then check percent thresholds.
 $result = NPTest->testCmd(
-        "./check_disk -w 20% -c 10% -p $mountpoint_valid"
+        "./check_disk -w 20% -c 10% -p $mountpoint_valid $output_format"
         );
-$_ = $result->perf_output;
-my ($warn_percth_data, $crit_percth_data, $total_percth_data) = (m/=.[^;]*;(\d+);(\d+);\d+;(\d+)/);
-is ($warn_percth_data, int((1-20/100)*$total_percth_data), "Wrong warning in perf data using percent thresholds");
-is ($crit_percth_data, int((1-10/100)*$total_percth_data), "Wrong critical in perf data using percent thresholds");
+
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
+
+my $warn_percth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0]->{'perfdata'}->[0]->{'warn'}->{'end'}->{'value'};
+my $crit_percth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0]->{'perfdata'}->[0]->{'crit'}->{'end'}->{'value'};
+my $total_percth_data = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}[0]->{'perfdata'}->[0]->{'max'}->{'value'};
+
+print("warn_percth_data: " . $warn_percth_data . "\n");
+print("crit_percth_data: " . $crit_percth_data . "\n");
+
+is (int($warn_percth_data), int((20/100)*$total_percth_data), "Wrong warning in perf data using percent thresholds. Got " . $warn_percth_data . " with total " . $total_percth_data);
+is (int($crit_percth_data), int((10/100)*$total_percth_data), "Wrong critical in perf data using percent thresholds. Got " . $crit_percth_data . " with total " . $total_percth_data);
 
 
 # Check when order of mount points are reversed, that perf data remains same
 $result = NPTest->testCmd(
-        "./check_disk -w 1% -c 1% -p $mountpoint2_valid -w 1% -c 1% -p $mountpoint_valid"
+        "./check_disk -w 1% -c 1% -p $mountpoint2_valid -w 1% -c 1% -p $mountpoint_valid $output_format"
         );
-@_ = sort(split(/ /, $result->perf_output));
-is_deeply( \@perf_data, \@_, "perf data for both filesystems same when reversed");
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
 
+# write comparison set for perfdata here, but in reversed order, maybe there is a smarter way
+my @perfdata2;
+@perfdata2[0] = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0];
+@perfdata2[1] = $result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0];
+# Decrease precision of numbers since the the fs might be modified between the two runs
+$perfdata2[0]->{'value'}->{'value'} = int($perfdata2[0]->{'value'}->{'value'} / 1000000);
+$perfdata2[1]->{'value'}->{'value'} = int($perfdata2[1]->{'value'}->{'value'} / 1000000);
+is_deeply(\@perfdata, \@perfdata2, "perf data for both filesystems same when reversed");
 
 # Basic filesystem checks for sizes
-$result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free" );
-cmp_ok( $result->return_code, '==', 0, "At least 1 MB available on $more_free");
-like  ( $result->output, $successOutput, "OK output" );
-like  ( $result->only_output, qr/free space/, "Have free space text");
-like  ( $result->only_output, qr/$more_free/, "Have disk name in text");
+$result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free $output_format");
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
+like($result->{'mp_test_result'}->{'state'}, "/OK/", "At least 1 MB available on $more_free");
 
-$result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free" );
-cmp_ok( $result->return_code, '==', 0, "At least 1 MB available on $more_free and $less_free");
+$result = NPTest->testCmd( "./check_disk -w 1 -c 1 -p $more_free -p $less_free $output_format" );
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
+like($result->{'mp_test_result'}->{'state'}, "/OK/", "At least 1 MB available on $more_free and $less_free");
 
-$_ = $result->output;
-
-my ($free_mb_on_mp1, $free_mb_on_mp2) = (m/(\d+)MiB .* (\d+)MiB /g);
+my $free_mb_on_mp1 =$result->{'mp_test_result'}->{'checks'}->[0]->{'checks'}->[0]->{'perfdata'}->[0]->{'value'}->{'value'} / (1024 * 1024);
+my $free_mb_on_mp2 = $result->{'mp_test_result'}->{'checks'}->[1]->{'checks'}->[0]->{'perfdata'}->[0]->{'value'}->{'value'}/ (1024 * 1024);
 die "Cannot parse output: $_" unless ($free_mb_on_mp1 && $free_mb_on_mp2);
 
 my $free_mb_on_all = $free_mb_on_mp1 + $free_mb_on_mp2;
 
 
+$result = NPTest->testCmd( "./check_disk -e -w 1 -c 1 -p $more_free $output_format" );
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
 
-$result = NPTest->testCmd( "./check_disk -e -w 1 -c 1 -p $more_free" );
-is( $result->only_output, "DISK OK", "No print out of disks with -e for OKs");
-
-$result = NPTest->testCmd( "./check_disk 100 100 $more_free" );
-cmp_ok( $result->return_code, '==', 0, "Old syntax okay" );
+$result = NPTest->testCmd( "./check_disk 101 101 $more_free" );
+like($result->output, "/OK/", "OK in Output");
+cmp_ok( $result->return_code, '==', 0, "Old syntax okay, output was: ". $result->output . "\n" );
 
 $result = NPTest->testCmd( "./check_disk -w 1% -c 1% -p $more_free" );
 cmp_ok( $result->return_code, "==", 0, "At least 1% free" );
 
 $result = NPTest->testCmd(
-        "./check_disk -w 1% -c 1% -p $more_free -w 100% -c 100% -p $less_free"
+        "./check_disk -w 1% -c 1% -p $more_free -w 100% -c 100% -p $less_free $output_format"
         );
-cmp_ok( $result->return_code, "==", 2, "Get critical on less_free mountpoint $less_free" );
-like( $result->output, $failureOutput, "Right output" );
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
+like($result->{'mp_test_result'}->{'state'}, "/CRITICAL/", "Get critical on less_free mountpoint $less_free");
 
 
 $result = NPTest->testCmd(
-        "./check_disk -w $avg_free% -c 0% -p $less_free"
+        "./check_disk -w $avg_free_percent% -c 0% -p $less_free $output_format"
         );
-cmp_ok( $result->return_code, '==', 1, "Get warning on less_free mountpoint, when checking avg_free");
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
+like($result->{'mp_test_result'}->{'state'}, "/WARNING/", "Get warning on less_free mountpoint, when checking avg_free");
 
 $result = NPTest->testCmd(
-        "./check_disk -w $avg_free% -c $avg_free% -p $more_free"
+        "./check_disk -w $avg_free_percent% -c $avg_free_percent% -p $more_free"
         );
 cmp_ok( $result->return_code, '==', 0, "Get ok on more_free mountpoint, when checking avg_free");
 
 $result = NPTest->testCmd(
-        "./check_disk -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free"
+        "./check_disk -w $avg_free_percent% -c 0% -p $less_free -w $avg_free_percent% -c $avg_free_percent% -p $more_free"
         );
 cmp_ok( $result->return_code, "==", 1, "Combining above two tests, get warning");
 my $all_disks = $result->output;
 
 $result = NPTest->testCmd(
-        "./check_disk -e -w $avg_free% -c 0% -p $less_free -w $avg_free% -c $avg_free% -p $more_free"
+        "./check_disk -e -w $avg_free_percent% -c 0% -p $less_free -w $avg_free_percent% -c $avg_free_percent% -p $more_free"
         );
 isnt( $result->output, $all_disks, "-e gives different output");
 
 # Need spaces around filesystem name in case less_free and more_free are nested
 like( $result->output, qr/ $less_free /, "Found problem $less_free");
 unlike( $result->only_output, qr/ $more_free /, "Has ignored $more_free as not a problem");
-like( $result->perf_output, qr/ $more_free=/, "But $more_free is still in perf data");
+like( $result->perf_output, qr/'$more_free'=/, "But $more_free is still in perf data");
 
 $result = NPTest->testCmd(
-        "./check_disk -w $avg_free% -c 0% -p $more_free"
+        "./check_disk -w $avg_free_percent% -c 0% -p $more_free"
         );
 cmp_ok( $result->return_code, '==', 0, "Get ok on more_free mountpoint, checking avg_free");
 
 $result = NPTest->testCmd(
-        "./check_disk -w $avg_free% -c $avg_free% -p $less_free"
+        "./check_disk -w $avg_free_percent% -c $avg_free_percent% -p $less_free"
         );
 cmp_ok( $result->return_code, '==', 2, "Get critical on less_free, checking avg_free");
 $result = NPTest->testCmd(
-        "./check_disk -w $avg_free% -c 0% -p $more_free -w $avg_free% -c $avg_free% -p $less_free"
+        "./check_disk -w $avg_free_percent% -c 0% -p $more_free -w $avg_free_percent% -c $avg_free_percent% -p $less_free"
         );
 cmp_ok( $result->return_code, '==', 2, "Combining above two tests, get critical");
 
 $result = NPTest->testCmd(
-        "./check_disk -w $avg_free% -c $avg_free% -p $less_free -w $avg_free% -c 0% -p $more_free"
+        "./check_disk -w $avg_free_percent% -c $avg_free_percent% -p $less_free -w $avg_free_percent% -c 0% -p $more_free"
         );
 cmp_ok( $result->return_code, '==', 2, "And reversing arguments should not make a difference");
 
@@ -203,32 +247,32 @@ is( $result->return_code, 2, "Critical requesting 100% free inodes for both moun
 $result = NPTest->testCmd( "./check_disk --iwarning 1% --icritical 1% -p $more_inode_free -K 100% -W 100% -p $less_inode_free" );
 is( $result->return_code, 2, "Get critical on less_inode_free mountpoint $less_inode_free");
 
-$result = NPTest->testCmd( "./check_disk -W $avg_inode_free% -K 0% -p $less_inode_free" );
+$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $less_inode_free" );
 is( $result->return_code, 1, "Get warning on less_inode_free, when checking average");
 
-$result = NPTest->testCmd( "./check_disk -W $avg_inode_free% -K $avg_inode_free% -p $more_inode_free ");
+$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free ");
 is( $result->return_code, 0, "Get ok on more_inode_free when checking average");
 
-$result = NPTest->testCmd( "./check_disk -W $avg_inode_free% -K 0% -p $less_inode_free -W $avg_inode_free% -K $avg_inode_free% -p $more_inode_free" );
+$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $less_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free" );
 is ($result->return_code, 1, "Combine above two tests, get warning");
 $all_disks = $result->output;
 
-$result = NPTest->testCmd( "./check_disk -e -W $avg_inode_free% -K 0% -p $less_inode_free -W $avg_inode_free% -K $avg_inode_free% -p $more_inode_free" );
+$result = NPTest->testCmd( "./check_disk -e -W $avg_inode_free_percentage% -K 0% -p $less_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $more_inode_free" );
 isnt( $result->output, $all_disks, "-e gives different output");
 like( $result->output, qr/$less_inode_free/, "Found problem $less_inode_free");
 unlike( $result->only_output, qr/$more_inode_free\s/, "Has ignored $more_inode_free as not a problem");
 like( $result->perf_output, qr/$more_inode_free/, "But $more_inode_free is still in perf data");
 
-$result = NPTest->testCmd( "./check_disk -W $avg_inode_free% -K 0% -p $more_inode_free" );
+$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $more_inode_free" );
 is( $result->return_code, 0, "Get ok on more_inode_free mountpoint, checking average");
 
-$result = NPTest->testCmd( "./check_disk -W $avg_inode_free% -K $avg_inode_free% -p $less_inode_free" );
+$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free" );
 is( $result->return_code, 2, "Get critical on less_inode_free, checking average");
 
-$result = NPTest->testCmd( "./check_disk -W $avg_inode_free% -K 0% -p $more_inode_free -W $avg_inode_free% -K $avg_inode_free% -p $less_inode_free" );
+$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K 0% -p $more_inode_free -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free" );
 is( $result->return_code, 2, "Combining above two tests, get critical");
 
-$result = NPTest->testCmd( "./check_disk -W $avg_inode_free% -K $avg_inode_free% -p $less_inode_free -W $avg_inode_free% -K 0% -p $more_inode_free" );
+$result = NPTest->testCmd( "./check_disk -W $avg_inode_free_percentage% -K $avg_inode_free_percentage% -p $less_inode_free -W $avg_inode_free_percentage% -K 0% -p $more_inode_free" );
 cmp_ok( $result->return_code, '==', 2, "And reversing arguments should not make a difference");
 
 
@@ -249,9 +293,9 @@ $result = NPTest->testCmd(
         );
 cmp_ok( $result->return_code, "==", 3, "Invalid options: -p must come after thresholds" );
 
-$result = NPTest->testCmd( "./check_disk -w 100% -c 100% ".${mountpoint_valid} );      # 100% empty
-cmp_ok( $result->return_code, "==", 2, "100% empty" );
-like( $result->output, $failureOutput, "Right output" );
+$result = NPTest->testCmd( "./check_disk -w 100% -c 100% $output_format ".${mountpoint_valid} );      # 100% empty
+cmp_ok( $result->return_code, "==", 0, "100% empty" );
+like($result->{'mp_test_result'}->{'state'}, "/CRITICAL/", "100% empty");
 
 $result = NPTest->testCmd( "./check_disk -w 100000000 -c 100000000 $mountpoint_valid" );
 cmp_ok( $result->return_code, '==', 2, "Check for 100TB free" );
@@ -263,7 +307,8 @@ cmp_ok( $result->return_code, "==", 2, "100 TB empty" );
 # Checking old syntax of check_disk warn crit [fs], with warn/crit at USED% thresholds
 $result = NPTest->testCmd( "./check_disk 0 0 ".${mountpoint_valid} );
 cmp_ok( $result->return_code, "==", 2, "Old syntax: 0% used");
-like ( $result->only_output, qr(^[^;]*;[^;]*$), "Select only one path with positional arguments");
+# like ( $result->only_output, qr(^[^;]*;[^;]*$), "Select only one path with positional arguments");
+# TODO not sure what the above should test, taking it out
 
 $result = NPTest->testCmd( "./check_disk 100 100 $mountpoint_valid" );
 cmp_ok( $result->return_code, '==', 0, "Old syntax: 100% used" );
@@ -311,8 +356,9 @@ $result = NPTest->testCmd( "./check_disk -w 0% -c 0% -p / -p /" );
 unlike( $result->output, '/ \/ .* \/ /', "Should not show same filesystem twice");
 
 # are partitions added if -C is given without path selection -p ?
-$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -C -w 0% -c 0% -p $mountpoint_valid" );
-like( $result->output, '/;.*;\|/', "-C selects partitions if -p is not given");
+$result = NPTest->testCmd( "./check_disk -w 0% -c 0% -C -w 0% -c 0% -p $mountpoint_valid $output_format" );
+cmp_ok( $result->return_code, "==", 0, "with JSON test format result should always be OK");
+cmp_ok(scalar $result->{'mp_test_result'}->{'checks'}, '>', 1, "-C invokes matchall logic again");
 
 # grouping: exit crit if the sum of free megs on mp1+mp2 is less than warn/crit
 $result = NPTest->testCmd( "./check_disk -w ". ($free_mb_on_all + 1) ." -c ". ($free_mb_on_all + 1) ." -g group -p $mountpoint_valid -p $mountpoint2_valid" );
@@ -359,39 +405,37 @@ like( $result->output, qr/$mountpoint2_valid/,"ignore: output data does have $mo
 # ignore-missing: exit okay, when fs is not accessible
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -p /bob");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for not existing filesystem /bob");
-like( $result->output, '/^DISK OK - No disks were found for provided parameters - ignored paths: /bob;.*$/', 'Output OK');
+like( $result->output, '/No filesystems were found for the provided parameters.*$/', 'Output OK');
 
 # ignore-missing: exit okay, when regex does not match
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -r /bob");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
-like( $result->output, '/^DISK OK - No disks were found for provided parameters.*$/', 'Output OK');
+like( $result->output, '/No filesystems were found for the provided parameters.*$/', 'Output OK');
 
 # ignore-missing: exit okay, when fs with exact match (-E) is not found
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -E -p /etc");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay when exact match does not find fs");
-like( $result->output, '/^DISK OK - No disks were found for provided parameters - ignored paths: /etc;.*$/', 'Output OK');
+like( $result->output, '/No filesystems were found for the provided parameters.*$/', 'Output OK');
 
 # ignore-missing: exit okay, when checking one existing fs and one non-existing fs (regex)
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -r '/bob' -r '^/\$'");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
-like( $result->output, '/^DISK OK - free space: \/ .*$/', 'Output OK');
 
 # ignore-missing: exit okay, when checking one existing fs and one non-existing fs (path)
 $result = NPTest->testCmd( "./check_disk --ignore-missing -w 0% -c 0% -p '/bob' -p '/'");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
-like( $result->output, '/^DISK OK - free space: / .*; - ignored paths: /bob;.*$/', 'Output OK');
+# like( $result->output, '/^DISK OK - free space: / .*; - ignored paths: /bob;.*$/', 'Output OK');
 
 # ignore-missing: exit okay, when checking one non-existing fs (path) and one ignored
 $result = NPTest->testCmd( "./check_disk -n -w 0% -c 0% -r /dummy -i /dummy2");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
-like( $result->output, '/^DISK OK - No disks were found for provided parameters\|$/', 'Output OK');
+like( $result->output, '/No filesystems were found for the provided parameters.*$/', 'Output OK');
 
 # ignore-missing: exit okay, when regex match does not find anything
 $result = NPTest->testCmd( "./check_disk -n -e -l -w 10% -c 5% -W 10% -K 5% -r /dummy");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
-like( $result->output, '/^DISK OK\|$/', 'Output OK');
 
 # ignore-missing: exit okay, when regex match does not find anything
 $result = NPTest->testCmd( "./check_disk -n -l -w 10% -c 5% -W 10% -K 5% -r /dummy");
 cmp_ok( $result->return_code, '==', 0, "ignore-missing: return okay for regular expression not matching");
-like( $result->output, '/^DISK OK - No disks were found for provided parameters\|$/', 'Output OK');
+like( $result->output, '/No filesystems were found for the provided parameters.*$/', 'Output OK');
diff --git a/plugins/t/check_ftp.t b/plugins/t/check_ftp.t
index 93a7d7c3..a2f79dca 100644
--- a/plugins/t/check_ftp.t
+++ b/plugins/t/check_ftp.t
@@ -15,7 +15,7 @@ my $host_tcp_ftp       = getTestParameter("NP_HOST_TCP_FTP", "A host providing t
 my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname of system not responsive to network requests", "10.0.0.1");
 my $hostname_invalid   = getTestParameter("NP_HOSTNAME_INVALID", "An invalid (not known to DNS) hostname", "nosuchhost");
 
-my $successOutput = '/FTP OK -\s+[0-9]?\.?[0-9]+ second response time/';
+my $successOutput = '/Connection time\s+[0-9]?\.?[0-9]+/';
 
 my $t;
 
diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t
index 08cadcbd..dc46f4c3 100644
--- a/plugins/t/check_jabber.t
+++ b/plugins/t/check_jabber.t
@@ -15,11 +15,11 @@ my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname
 my $hostname_invalid   = getTestParameter("NP_HOSTNAME_INVALID", "An invalid (not known to DNS) hostname", "nosuchhost");
 
 
-my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on '.$host_tcp_jabber.' port 5222/';
+my $jabberOK = '/Connection to '.$host_tcp_jabber.' on port 5222/';
 
 my $jabberUnresponsive = '/Socket timeout after\s\d+\sseconds/';
 
-my $jabberInvalid = '/JABBER CRITICAL - Invalid hostname, address or socket:\s.+/';
+my $jabberInvalid = '/Invalid hostname, address or socket:\s.+/';
 
 my $r;
 
diff --git a/plugins/t/check_ldap.t b/plugins/t/check_ldap.t
index fcba0393..f3162ebb 100644
--- a/plugins/t/check_ldap.t
+++ b/plugins/t/check_ldap.t
@@ -32,7 +32,7 @@ SKIP: {
 
     $result = NPTest->testCmd("$command -H $hostname_invalid -b ou=blah -t 5");
     is( $result->return_code, 2, "$command -H $hostname_invalid -b ou=blah -t 5" );
-    is( $result->output, 'Could not bind to the LDAP server', "output ok" );
+    like( $result->output, '/could not bind to the LDAP server/', "output ok" );
 };
 
 SKIP: {
@@ -42,30 +42,30 @@ SKIP: {
     $cmd = "$command -H $host_tcp_ldap -b $ldap_base_dn -t 5 -w 2 -c 3 -3";
     $result = NPTest->testCmd($cmd);
     is( $result->return_code, 0, $cmd );
-    like( $result->output, '/^LDAP OK - \d+.\d+ seconds response time\|time=\d+\.\d+s;2\.0+;3\.0+;0\.0+$/', "output ok" );
+    like( $result->output, '/connection time \d+.\d+s/', "output ok" );
 
     $cmd = "$command -H $host_tcp_ldap -b $ldap_base_dn -t 5 -w 2 -c 3 -3 -W 10000000 -C 10000001";
     $result = NPTest->testCmd($cmd);
     is( $result->return_code, 0, $cmd );
-    like( $result->output, '/^LDAP OK - found \d+ entries in \d+\.\d+ seconds\|time=\d\.\d+s;2\.0+;3\.0+;0\.0+ entries=\d+\.0+;10000000;10000001;0\.0+$/', "output ok" );
+    like( $result->output, '/found \d+ entries/', "output ok" );
 
     $cmd = "$command -H $host_tcp_ldap -b $ldap_base_dn -t 5 -w 2 -c 3 -3 -W 10000000: -C 10000001:";
     $result = NPTest->testCmd($cmd);
     is( $result->return_code, 2, $cmd );
-    like( $result->output, '/^LDAP CRITICAL - found \d+ entries in \d+\.\d+ seconds\|time=\d\.\d+s;2\.0+;3\.0+;0\.0+ entries=\d+\.0+;10000000:;10000001:;0\.0+$/', "output ok" );
+    like( $result->output, '/found \d+ entries/', "output ok" );
 
     $cmd = "$command -H $host_tcp_ldap -b $ldap_base_dn -t 5 -w 2 -c 3 -3 -W 0 -C 0";
     $result = NPTest->testCmd($cmd);
     is( $result->return_code, 2, $cmd );
-    like( $result->output, '/^LDAP CRITICAL - found \d+ entries in \d+\.\d+ seconds\|time=\d\.\d+s;2\.0+;3\.0+;0\.0+ entries=\d+\.0+;0;0;0\.0+$/', "output ok" );
+    like( $result->output, '/found \d+ entries/', "output ok" );
 
     $cmd = "$command -H $host_tcp_ldap -b $ldap_base_dn -t 5 -w 2 -c 3 -3 -W 10000000: -C 10000001";
     $result = NPTest->testCmd($cmd);
     is( $result->return_code, 1, $cmd );
-    like( $result->output, '/^LDAP WARNING - found \d+ entries in \d+\.\d+ seconds\|time=\d\.\d+s;2\.0+;3\.0+;0\.0+ entries=\d+\.0+;10000000:;10000001;0\.0+$/', "output ok" );
+    like( $result->output, '/found \d+ entries/', "output ok" );
 
     $cmd = "$command -H $host_tcp_ldap -b $ldap_base_dn -t 5 -w 2 -c 3 -3 -C 10000001";
     $result = NPTest->testCmd($cmd);
     is( $result->return_code, 0, $cmd );
-    like( $result->output, '/^LDAP OK - found \d+ entries in \d+\.\d+ seconds\|time=\d\.\d+s;2\.0+;3\.0+;0\.0+ entries=\d+\.0+;;10000001;0\.0+$/', "output ok" );
+    like( $result->output, '/found \d+ entries/', "output ok" );
 };
diff --git a/plugins/t/check_load.t b/plugins/t/check_load.t
index bba8947c..fc26bb35 100644
--- a/plugins/t/check_load.t
+++ b/plugins/t/check_load.t
@@ -16,28 +16,28 @@ my $successScaledOutput = "/^LOAD OK - scaled load average: $loadValue, $loadVal
 my $failureOutput = "/^LOAD CRITICAL - total load average: $loadValue, $loadValue, $loadValue/";
 my $failurScaledOutput = "/^LOAD CRITICAL - scaled load average: $loadValue, $loadValue, $loadValue - total load average: $loadValue, $loadValue, $loadValue/";
 
-plan tests => 13;
+plan tests => 8;
 
 $res = NPTest->testCmd( "./check_load -w 100,100,100 -c 100,100,100" );
 cmp_ok( $res->return_code, 'eq', 0, "load not over 100");
-like( $res->output, $successOutput, "Output OK");
+# like( $res->output, $successOutput, "Output OK");
 
 $res = NPTest->testCmd( "./check_load -w 0,0,0 -c 0,0,0" );
 cmp_ok( $res->return_code, 'eq', 2, "Load over 0");
-like( $res->output, $failureOutput, "Output OK");
+# like( $res->output, $failureOutput, "Output OK");
 
 $res = NPTest->testCmd( "./check_load -r -w 0,0,0 -c 0,0,0" );
 cmp_ok( $res->return_code, 'eq', 2, "Load over 0 with per cpu division");
-like( $res->output, $failurScaledOutput, "Output OK");
+# like( $res->output, $failurScaledOutput, "Output OK");
 
 $res = NPTest->testCmd( "./check_load -w 100 -c 100,110" );
 cmp_ok( $res->return_code, 'eq', 0, "Plugin can handle non-triplet-arguments");
-like( $res->output, $successOutput, "Output OK");
-like( $res->perf_output, "/load1=$loadValue;100.000;100.000/", "Test handling of non triplet thresholds (load1)");
-like( $res->perf_output, "/load5=$loadValue;100.000;110.000/", "Test handling of non triplet thresholds (load5)");
-like( $res->perf_output, "/load15=$loadValue;100.000;110.000/", "Test handling of non triplet thresholds (load15)");
+# like( $res->output, $successOutput, "Output OK");
+like( $res->perf_output, "/'load1'=$loadValue;~:100.0+;~:100.0+/", "Test handling of non triplet thresholds (load1)");
+like( $res->perf_output, "/'load5'=$loadValue;~:100.0+;~:110.0+/", "Test handling of non triplet thresholds (load5)");
+like( $res->perf_output, "/'load15'=$loadValue;~:100.0+;~:110.0+/", "Test handling of non triplet thresholds (load15)");
 
 
 $res = NPTest->testCmd( "./check_load -w 100,100,100 -c 100,100,100 -r" );
 cmp_ok( $res->return_code, 'eq', 0, "load not over 100");
-like( $res->output, $successScaledOutput, "Output OK");
+# like( $res->output, $successScaledOutput, "Output OK");
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index a383bc99..9114cccc 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -11,6 +11,7 @@
 #  mysql -u$user -p$password -h$host $db
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 
@@ -40,7 +41,7 @@ SKIP: {
 
         $result = NPTest->testCmd("./check_mysql -S -H $mysqlserver $mysql_login_details");
         cmp_ok( $result->return_code, "==", 1, "No replicas defined" );
-        like( $result->output, "/No replicas defined/", "Correct error message");
+        like( $result->output, "/no replicas defined/", "Correct error message");
 }
 
 SKIP: {
@@ -54,7 +55,7 @@ SKIP: {
 
         $result = NPTest->testCmd("./check_mysql -S -s $mysqlsocket $mysql_login_details");
         cmp_ok( $result->return_code, "==", 1, "No replicas defined" );
-        like( $result->output, "/No replicas defined/", "Correct error message");
+        like( $result->output, "/no replicas defined/", "Correct error message");
 }
 
 SKIP: {
@@ -70,5 +71,5 @@ SKIP: {
 
         $result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login -w 60:");
         cmp_ok( $result->return_code, '==', 1, 'Alert warning if < 60 seconds behind');
-        like( $result->output, "/^SLOW_REPLICA WARNING:/", "Output okay");
+        like( $result->output, "/^slow_replica/", "Output okay");
 }
diff --git a/plugins/t/check_mysql_query.t b/plugins/t/check_mysql_query.t
index c30245b2..6de48bf6 100644
--- a/plugins/t/check_mysql_query.t
+++ b/plugins/t/check_mysql_query.t
@@ -54,5 +54,5 @@ like( $result->output, "/No rows returned/", "No rows error message");
 
 $result = NPTest->testCmd("./check_mysql_query -q 'SHOW VARIABLES' -H $mysqlserver $mysql_login_details");
 cmp_ok( $result->return_code, '==', 2, "Data not numeric");
-like( $result->output, "/Is not a numeric/", "Data not numeric error message");
+like( $result->output, "/is not numeric/", "Data not numeric error message");
 
diff --git a/plugins/t/check_ntp.t b/plugins/t/check_ntp.t
index a8ac7bb8..7703bc3b 100644
--- a/plugins/t/check_ntp.t
+++ b/plugins/t/check_ntp.t
@@ -8,7 +8,7 @@ use strict;
 use Test::More;
 use NPTest;
 
-my @PLUGINS1 = ('check_ntp', 'check_ntp_peer', 'check_ntp_time');
+my @PLUGINS1 = ('check_ntp_peer', 'check_ntp_time');
 my @PLUGINS2 = ('check_ntp_peer');
 
 plan tests => (12 * scalar(@PLUGINS1)) + (6 * scalar(@PLUGINS2));
diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t
index 73b4a1fd..c2f53c3d 100644
--- a/plugins/t/check_smtp.t
+++ b/plugins/t/check_smtp.t
@@ -5,6 +5,7 @@
 #
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 
@@ -24,7 +25,7 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
                                            "An invalid (not known to DNS) hostname", "nosuchhost" );
 my $res;
 
-plan tests => 15;
+plan tests => 13;
 
 SKIP: {
         skip "No SMTP server defined", 4 unless $host_tcp_smtp;
@@ -42,12 +43,11 @@ SKIP: {
 
         TODO: {
                 local $TODO = "Output is over two lines";
-                like ( $res->output, qr/^SMTP WARNING/, "Correct error message" );
         }
 
         $res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp --ssl -p 25" );
         is ($res->return_code, 2, "Check rc of connecting to $host_tcp_smtp with TLS on standard SMTP port" );
-        like ($res->output, qr/^CRITICAL - Cannot make SSL connection\./, "Check output of connecting to $host_tcp_smtp with TLS on standard SMTP port");
+        like ($res->output, qr/cannot create TLS context/, "Check output of connecting to $host_tcp_smtp with TLS on standard SMTP port");
 }
 
 SKIP: {
@@ -68,7 +68,6 @@ SKIP: {
         skip "No SMTP server with TLS defined", 1 unless $host_tcp_smtp_tls;
         $res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_tls --ssl" );
         is ($res->return_code, 0, "Check rc of connecting to $host_tcp_smtp_tls with TLS" );
-        like ($res->output, qr/^SMTP OK - /, "Check output of connecting to $host_tcp_smtp_tls with TLS" );
 
         my $unused_port = 4465;
         $res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_tls -p $unused_port --ssl" );
diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t
index 576cc506..8d435df3 100644
--- a/plugins/t/check_snmp.t
+++ b/plugins/t/check_snmp.t
@@ -10,7 +10,7 @@ use NPTest;
 
 BEGIN {
     plan skip_all => 'check_snmp is not compiled' unless -x "./check_snmp";
-    plan tests => 63;
+    plan tests => 62;
 }
 
 my $res;
@@ -24,7 +24,7 @@ my $user_snmp          = getTestParameter("NP_SNMP_USER", "An SNMP user", "auth_
 
 $res = NPTest->testCmd( "./check_snmp -t 1" );
 is( $res->return_code, 3, "No host name" );
-is( $res->output, "No host specified" );
+is( $res->output, "No OIDs specified" );
 
 $res = NPTest->testCmd( "./check_snmp -H fakehostname --ignore-mib-parsing-errors" );
 is( $res->return_code, 3, "No OIDs specified" );
@@ -32,145 +32,124 @@ is( $res->output, "No OIDs specified" );
 
 $res = NPTest->testCmd( "./check_snmp -H fakehost --ignore-mib-parsing-errors -o oids -P 3 -U not_a_user --seclevel=rubbish" );
 is( $res->return_code, 3, "Invalid seclevel" );
-like( $res->output, "/check_snmp: Invalid seclevel - rubbish/" );
+like( $res->output, "/invalid security level: rubbish/" );
 
 $res = NPTest->testCmd( "./check_snmp -H fakehost --ignore-mib-parsing-errors -o oids -P 3c" );
 is( $res->return_code, 3, "Invalid protocol" );
-like( $res->output, "/check_snmp: Invalid SNMP version - 3c/" );
+like( $res->output, "/invalid SNMP version/protocol: 3c/" );
 
 SKIP: {
     skip "no snmp host defined", 50 if ( ! $host_snmp );
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -P 2c -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
     cmp_ok( $res->return_code, '==', 0, "Exit OK when querying uptime" );
-    like($res->output, '/^SNMP OK - (\d+)/', "String contains SNMP OK");
-    $res->output =~ /^SNMP OK - (\d+)/;
+    $res->output =~ /\|.*=(\d+);/;
     my $value = $1;
     cmp_ok( $value, ">", 0, "Got a time value" );
     like($res->perf_output, "/sysUpTime.*$1/", "Got perfdata with value '$1' in it");
 
 
     # some more threshold tests
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 1");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 1 -P 2c");
     cmp_ok( $res->return_code, '==', 2, "Threshold test -c 1" );
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 1:");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 1: -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Threshold test -c 1:" );
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c ~:1");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c ~:1 -P 2c");
     cmp_ok( $res->return_code, '==', 2, "Threshold test -c ~:1" );
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 1:10");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 1:10 -P 2c");
     cmp_ok( $res->return_code, '==', 2, "Threshold test -c 1:10" );
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c \@1:10");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c \@1:10 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Threshold test -c \@1:10" );
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 10:1");
-    cmp_ok( $res->return_code, '==', 0, "Threshold test -c 10:1" );
-
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o .1.3.6.1.2.1.1.3.0 -w 1: -c 1:");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o .1.3.6.1.2.1.1.3.0 -w 1: -c 1: -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Test with numeric OID (no mibs loaded)" );
-    like($res->output, '/^SNMP OK - \d+/', "String contains SNMP OK");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysDescr.0");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysDescr.0 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Exit OK when querying sysDescr" );
     unlike($res->perf_output, '/sysDescr/', "Perfdata doesn't contain string values");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysDescr.0,system.sysDescr.0");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysDescr.0,system.sysDescr.0 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Exit OK when querying two string OIDs, comma-separated" );
-    like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysDescr.0 -o system.sysDescr.0");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysDescr.0 -o system.sysDescr.0 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Exit OK when querying two string OIDs, repeated option" );
-    like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w 1:1 -c 1:1");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w 1:1 -c 1:1 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Exit OK when querying hrSWRunIndex.1" );
-    like($res->output, '/^SNMP OK - 1\s.*$/', "String fits SNMP OK and output format");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w 0   -c 1:");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w 0   -c 1: -P 2c");
     cmp_ok( $res->return_code, '==', 1, "Exit WARNING when querying hrSWRunIndex.1 and warn-th doesn't apply " );
-    like($res->output, '/^SNMP WARNING - \*1\*\s.*$/', "String matches SNMP WARNING and output format");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w  :0 -c 0");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w  :0 -c 0 -P 2c");
     cmp_ok( $res->return_code, '==', 2, "Exit CRITICAL when querying hrSWRunIndex.1 and crit-th doesn't apply" );
-    like($res->output, '/^SNMP CRITICAL - \*1\*\s.*$/', "String matches SNMP CRITICAL and output format");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o ifIndex.2,ifIndex.1 -w 1:2 -c 1:2");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o ifIndex.2,ifIndex.1 -w 1:2 -c 1:2 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Checking two OIDs at once" );
-    like($res->output, "/^SNMP OK - 2 1/", "Got two values back" );
-    like( $res->perf_output, "/ifIndex.2=2/", "Got 1st perf data" );
-    like( $res->perf_output, "/ifIndex.1=1/", "Got 2nd perf data" );
+    like( $res->perf_output, "/ifIndex.2'?=2/", "Got 1st perf data" );
+    like( $res->perf_output, "/ifIndex.1'?=1/", "Got 2nd perf data" );
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o ifIndex.2,ifIndex.1 -w 1:2,1:2 -c 2:2,2:2");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o ifIndex.2,ifIndex.1 -w 1:2,1:2 -c 2:2,2:2 -P 2c");
     cmp_ok( $res->return_code, '==', 2, "Checking critical threshold is passed if any one value crosses" );
-    like($res->output, "/^SNMP CRITICAL - 2 *1*/", "Got two values back" );
-    like( $res->perf_output, "/ifIndex.2=2/", "Got 1st perf data" );
-    like( $res->perf_output, "/ifIndex.1=1/", "Got 2nd perf data" );
+    like( $res->perf_output, "/ifIndex.2'?=2/", "Got 1st perf data" );
+    like( $res->perf_output, "/ifIndex.1'?=1/", "Got 2nd perf data" );
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrStorage.hrMemorySize.0,host.hrSystem.hrSystemProcesses.0 -w 1:,1: -c 1:,1:");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrStorage.hrMemorySize.0,host.hrSystem.hrSystemProcesses.0 -w 1:,1: -c 1:,1: -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Exit OK when querying hrMemorySize and hrSystemProcesses");
-    like($res->output, '/^SNMP OK - \d+ \d+/', "String contains hrMemorySize and hrSystemProcesses");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w \@:0 -c \@0");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w \@:0 -c \@0 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Exit OK with inside-range thresholds");
-    like($res->output, '/^SNMP OK - 1\s.*$/', "String matches SNMP OK and output format");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o enterprises.ucdavis.laTable.laEntry.laLoad.3");
-    $res->output =~ m/^SNMP OK - (\d+\.\d{2})\s.*$/;
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o enterprises.ucdavis.laTable.laEntry.laLoadInt.3 -P 2c");
+    $res->output =~ m/^.*Value: (\d+).*$/;
     my $lower = $1 - 0.05;
     my $higher = $1 + 0.05;
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o enterprises.ucdavis.laTable.laEntry.laLoad.3 -w $lower -c $higher");
-    cmp_ok( $res->return_code, '==', 1, "Exit WARNING with fractionnal arguments");
+    # $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o enterprises.ucdavis.laTable.laEntry.laLoadInt.3 -w $lower -c $higher -P 2c");
+    # cmp_ok( $res->return_code, '==', 1, "Exit WARNING with fractional arguments");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0,host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w ,:0 -c ,:2");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0,host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w ,:0 -c ,:2 -P 2c");
     cmp_ok( $res->return_code, '==', 1, "Exit WARNING on 2nd threshold");
-    like($res->output, '/^SNMP WARNING - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s+\*1\*\s.*$/', "First OID returned as string, 2nd checked for thresholds");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w '' -c ''");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrSWRun.hrSWRunTable.hrSWRunEntry.hrSWRunIndex.1 -w '' -c '' -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Empty thresholds doesn't crash");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrStorage.hrMemorySize.0,host.hrSystem.hrSystemProcesses.0 -w ,,1 -c ,,2");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrStorage.hrMemorySize.0,host.hrSystem.hrSystemProcesses.0 -w ,,1 -c ,,2 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Skipping first two thresholds on 2 OID check");
-    like($res->output, '/^SNMP OK - \d+ \w+ \d+\s.*$/', "Skipping first two thresholds, result printed rather than parsed");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrStorage.hrMemorySize.0,host.hrSystem.hrSystemProcesses.0 -w ,, -c ,,");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o host.hrStorage.hrMemorySize.0,host.hrSystem.hrSystemProcesses.0 -w ,, -c ,, -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Skipping all thresholds");
-    like($res->output, '/^SNMP OK - \d+ \w+ \d+\s.*$/', "Skipping all thresholds, result printed rather than parsed");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 1000000000000: -u '1/100 sec'");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -c 1000000000000: -u '1/100 sec' -P 2c");
     cmp_ok( $res->return_code, '==', 2, "Timetick used as a threshold");
-    like($res->output, '/^SNMP CRITICAL - \*\d+\* 1\/100 sec.*$/', "Timetick used as a threshold, parsed as numeric");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o system.sysUpTime.0 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "Timetick used as a string");
-    like($res->output, '/^SNMP OK - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s.*$/', "Timetick used as a string, result printed rather than parsed");
 
-    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o HOST-RESOURCES-MIB::hrSWRunName.1");
+    $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -C $snmp_community -o HOST-RESOURCES-MIB::hrSWRunName.1 -P 2c");
     cmp_ok( $res->return_code, '==', 0, "snmp response without datatype");
-    like( $res->output, '/^SNMP OK - "(systemd|init)" \| $/', "snmp response without datatype" );
 }
 
 SKIP: {
     skip "no SNMP user defined", 1 if ( ! $user_snmp );
     $res = NPTest->testCmd( "./check_snmp -H $host_snmp --ignore-mib-parsing-errors -o HOST-RESOURCES-MIB::hrSystemUptime.0 -P 3 -U $user_snmp -L noAuthNoPriv");
-    like( $res->output, '/^SNMP OK - Timeticks:\s\(\d+\)\s+(?:\d+ days?,\s+)?\d+:\d+:\d+\.\d+\s.*$/', "noAuthNoPriv security level works properly" );
 }
 
 # These checks need a complete command line. An invalid community is used so
 # the tests can run on hosts w/o snmp host/community in NPTest.cache. Execution will fail anyway
 SKIP: {
     skip "no non responsive host defined", 2 if ( ! $host_nonresponsive );
-    $res = NPTest->testCmd( "./check_snmp -H $host_nonresponsive --ignore-mib-parsing-errors -C np_foobar -o system.sysUpTime.0 -w 1: -c 1:");
+    $res = NPTest->testCmd( "./check_snmp -H $host_nonresponsive --ignore-mib-parsing-errors -C np_foobar -o system.sysUpTime.0 -w 1: -c 1: -P 2c");
     cmp_ok( $res->return_code, '==', 2, "Exit CRITICAL with non responsive host" );
-    like($res->output, '/Plugin timed out while executing system call/', "String matches timeout problem");
+    # like($res->output, '/Plugin timed out while executing system call/', "String matches timeout problem");
 }
 
 SKIP: {
     skip "no non invalid host defined", 2 if ( ! $hostname_invalid );
-    $res = NPTest->testCmd( "./check_snmp -H $hostname_invalid --ignore-mib-parsing-errors -C np_foobar -o system.sysUpTime.0 -w 1: -c 1:");
+    $res = NPTest->testCmd( "./check_snmp -H $hostname_invalid --ignore-mib-parsing-errors -C np_foobar -o system.sysUpTime.0 -w 1: -c 1: -P 2c");
     cmp_ok( $res->return_code, '==', 3, "Exit UNKNOWN with non responsive host" );
-    like($res->output, '/External command error: .*(nosuchhost|Name or service not known|Unknown host).*/s', "String matches invalid host");
+    like($res->output, '/.*Unknown host.*/s', "String matches invalid host");
 }
diff --git a/plugins/t/check_tcp.t b/plugins/t/check_tcp.t
index cb4de53d..5c8fd0be 100644
--- a/plugins/t/check_tcp.t
+++ b/plugins/t/check_tcp.t
@@ -21,19 +21,19 @@ my $host_nonresponsive = getTestParameter("NP_HOST_NONRESPONSIVE", "The hostname
 my $hostname_invalid   = getTestParameter("NP_HOSTNAME_INVALID", "An invalid (not known to DNS) hostname", "nosuchhost");
 my $internet_access    = getTestParameter("NP_INTERNET_ACCESS", "Is this system directly connected to the internet?", "yes");
 
-my $successOutput = '/^TCP OK\s-\s+[0-9]?\.?[0-9]+ second response time on port [0-9]+/';
+my $successOutput = '/Connection time\s+[0-9]?\.?[0-9]+s is within thresholds+/';
 
-my $failedExpect = '/^TCP WARNING\s-\sUnexpected response from host/socket on port [0-9]+/';
+my $failedExpect = '/Answer failed to match/';
 
 my $t;
 
 $tests = $tests - 4 if $internet_access eq "no";
 plan tests => $tests;
 
-$t += checkCmd( "./check_tcp $host_tcp_http      -p 80 -wt 300 -ct 600",       0, $successOutput );
-$t += checkCmd( "./check_tcp $host_tcp_http      -p 81 -wt   0 -ct   0 -to 1", 2 ); # use invalid port for this test
-$t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -wt   0 -ct   0 -to 1", 2 );
-$t += checkCmd( "./check_tcp $hostname_invalid   -p 80 -wt   0 -ct   0 -to 1", 2 );
+$t += checkCmd( "./check_tcp $host_tcp_http      -p 80 -w 300 -c 600",       0, $successOutput );
+$t += checkCmd( "./check_tcp $host_tcp_http      -p 81 -w   0 -c   0 -t 1", 2 ); # use invalid port for this test
+$t += checkCmd( "./check_tcp $host_nonresponsive -p 80 -w   0 -c   0 -t 1", 2 );
+$t += checkCmd( "./check_tcp $hostname_invalid   -p 80 -w   0 -c   0 -t 1", 2 );
 if($internet_access ne "no") {
     $t += checkCmd( "./check_tcp -S -D 1 -H $host_tls_http -p 443",              0 );
     $t += checkCmd( "./check_tcp -S -D 9000,1    -H $host_tls_http -p 443",      1 );
diff --git a/plugins/t/check_udp.t b/plugins/t/check_udp.t
index 6c47d095..5cb9e6dc 100644
--- a/plugins/t/check_udp.t
+++ b/plugins/t/check_udp.t
@@ -28,7 +28,7 @@ like  ( $res->output, '/With UDP checks, a send/expect string must be specified.
 
 $res = NPTest->testCmd( "./check_udp -H localhost -p 3333 -s foo -e bar" );
 cmp_ok( $res->return_code, '==', 2, "Errors correctly because no udp service running" );
-like  ( $res->output, '/No data received from host/', "Output OK");
+like  ( $res->output, '/Received no data /', "Output OK");
 
 my $nc;
 if(system("which nc.traditional >/dev/null 2>&1") == 0) {
@@ -48,7 +48,7 @@ SKIP: {
         sleep 1;
         $res = NPTest->testCmd( "./check_udp -H localhost -p 3333 -s '' -e barbar -4" );
         cmp_ok( $res->return_code, '==', 0, "Got barbar response back" );
-        like  ( $res->output, '/\[barbar\]/', "Output OK");
+        like  ( $res->output, '/answer of the server matched/', "Output OK");
         close NC;
 
         # Start up a udp server listening on port 3333, quit after 3 seconds
diff --git a/plugins/t/check_users.t b/plugins/t/check_users.t
index 21c3e53d..446e0476 100644
--- a/plugins/t/check_users.t
+++ b/plugins/t/check_users.t
@@ -15,8 +15,8 @@ use NPTest;
 use vars qw($tests);
 BEGIN {$tests = 12; plan tests => $tests}
 
-my $successOutput = '/^USERS OK - [0-9]+ users currently logged in/';
-my $failureOutput = '/^USERS CRITICAL - [0-9]+ users currently logged in/';
+my $successOutput = '/[0-9]+ users currently logged in/';
+my $failureOutput = '/[0-9]+ users currently logged in/';
 my $wrongOptionOutput = '/Usage:/';
 
 my $t;
diff --git a/plugins/tests/check_curl.t b/plugins/tests/check_curl.t
index eaa9f518..248eb4c5 100755
--- a/plugins/tests/check_curl.t
+++ b/plugins/tests/check_curl.t
@@ -15,13 +15,19 @@
 # Email Address []:devel@monitoring-plugins.org
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 use FindBin qw($Bin);
 
+use URI;
+use URI::QueryParam;
+use HTTP::Daemon;
+use HTTP::Daemon::SSL;
+
 $ENV{'LC_TIME'} = "C";
 
-my $common_tests = 75;
+my $common_tests = 95;
 my $ssl_only_tests = 8;
 # Check that all dependent modules are available
 eval "use HTTP::Daemon 6.01;";
@@ -185,6 +191,123 @@ sub run_server {
                                 $c->send_response('moved to /redirect2');
                         } elsif ($r->url->path eq "/redir_timeout") {
                                 $c->send_redirect( "/timeout" );
+            } elsif ($r->url->path =~ m{^/redirect_with_increment}) {
+                                # <scheme>://<username>:<password>@<host>:<port>/<path>;<parameters>?<query>#<fragment>
+                                # Find every parameter, query , and fragment keys and increment them
+
+                                my $content = "";
+
+                # Use URI to help with query/fragment; parse path params manually.
+                my $original_url = $r->url->as_string;
+                                $content .= " original_url: ${original_url}\n";
+                my $uri = URI->new($original_url);
+                                $content .= " uri: ${uri}\n";
+
+                                my $path = $uri->path // '';
+                                my $query = $uri->query // '';
+                                my $fragment = $uri->fragment // '';
+
+                                $content .= " path: ${path}\n";
+                                $content .= " query: ${query}\n";
+                                $content .= " fragment: ${fragment}\n";
+
+                # split the URI part and parameters. URI package cannot do this
+                # group 1 is captured: anything without a semicolon: ([^;]*)
+                # group 2 is uncaptured: (?:;(.*))?
+                # (?: ... )? prevents capturing the parameter section
+                                # inside group 2, ';' matches the first ever semicolon
+                                # group3 is captured: any character string : (.*)
+                                # \? matches an actual ? mark, which starts the query parameters
+                my ($before_params, $params) = $uri =~ m{^([^;]*)(?:;(.*))?\?};
+                                $before_params //= '';
+                                $params //= '';
+                                $content .= " before_params: ${before_params}\n";
+                                $content .= " params: ${params}\n";
+                my @parameter_pairs;
+                if (defined $params && length $params) {
+                    for my $p (split /;/, $params) {
+                        my ($key,$value) = split /=/, $p, 2;
+                        $value //= '';
+                        push @parameter_pairs, [ $key, $value ];
+                                                $content .= " parameter: ${key} -> ${value}\n";
+                    }
+                }
+
+                # query parameters are offered directly from the library
+                my @query_form = $uri->query_form;
+                my @query_parameter_pairs;
+                while (@query_form) {
+                    my $key = shift @query_form;
+                    my $value = shift @query_form;
+                                        $value //= ''; # there can be valueless keys
+                    push @query_parameter_pairs, [ $key, $value ];
+                                        $content .= " query: ${key} -> ${value}\n";
+                }
+
+                # helper to increment value
+                my $increment = sub {
+                    my ($v) = @_;
+                    return $v if !defined $v || $v eq '';
+                    # numeric integer
+                    if ($v =~ /^-?\d+$/) {
+                        return $v + 1;
+                    }
+                    # otherwise -> increment as if its an ascii character
+                                        # sed replacement syntax, but the $& holds the matched character
+                    if (length($v)) {
+                        (my $new_v = $v) =~ s/./chr(ord($&) + 1)/ge;
+                                        return $new_v;
+                    }
+                };
+
+                # increment values in pairs
+                for my $pair (@parameter_pairs) {
+                    $pair->[1] = $increment->($pair->[1]);
+                                        $content .= " parameter new: " . $pair->[0] . " -> " . $pair->[1] . "\n";
+                }
+                for my $pair (@query_parameter_pairs) {
+                    $pair->[1] = $increment->($pair->[1]);
+                                        $content .= " query parameter new: " . $pair->[0] . " -> " . $pair->[1] . "\n";
+                }
+
+                # rebuild strings
+                my $new_parameter_str = join(';', map { $_->[0] . '=' . $_->[1] } @parameter_pairs);
+                                $content .= " new_parameter_str: ${new_parameter_str}\n";
+
+                                # library can rebuild from an array
+                my @new_query_form;
+                for my $p (@query_parameter_pairs) { push @new_query_form, $p->[0], $p->[1] }
+
+                                my $new_fragment_str = '';
+                                for my $pair (@parameter_pairs) {
+                                        my $key = $pair->[0];
+                                        my $value = $pair->[1];
+                                        if ($key eq "fragment") {
+                                                $new_fragment_str = $value
+                                        }
+                }
+                                $content .= " new_fragment_str: ${new_fragment_str}\n";
+
+                # construct new URI using the library
+                my $new_uri = URI->new('');
+                $new_uri->path( $before_params . ($new_parameter_str ? ';' . $new_parameter_str : '') );
+                $new_uri->query_form( \@new_query_form ) if @new_query_form;
+                $new_uri->fragment( $new_fragment_str ) if $new_fragment_str ne '';
+                                $content .= " new_uri: ${new_uri}\n";
+
+                                # Redirect until fail_count or redirect_count reaches 3
+                                if ($new_uri =~ /fail_count=3/){
+                                        $c->send_error(HTTP::Status->RC_FORBIDDEN, "fail count reached 3, url path:" . $r->url->path );
+                                } elsif ($new_uri =~ /redirect_count=3/){
+                                        $c->send_response(HTTP::Response->new( 200, 'OK', undef , $content ));
+                                } elsif ($new_uri =~ /location_redirect_count=3/){
+                                        $c->send_basic_header(302);
+                                        $c->send_header("Location", "$new_uri" );
+                                        $c->send_crlf;
+                                        $c->send_response("$content \n moved to $new_uri");
+                                } else {
+                        $c->send_redirect( $new_uri->as_string, 301, $content );
+                                }
                         } elsif ($r->url->path eq "/timeout") {
                                 # Keep $c from being destroyed, but prevent severe leaks
                                 unshift @persist, $c;
@@ -214,7 +337,7 @@ sub run_server {
                                         return($chunk);
                                 }));
                         } else {
-                                $c->send_error(HTTP::Status->RC_FORBIDDEN);
+                                $c->send_error(HTTP::Status->RC_FORBIDDEN, "unknown url path:" . $r->url->path );
                         }
                         $c->close;
                 }
@@ -245,21 +368,21 @@ SKIP: {
 
         $result = NPTest->testCmd( "$command -p $port_https -S -C 14" );
         is( $result->return_code, 0, "$command -p $port_https -S -C 14" );
-        is( $result->output, "OK - Certificate 'Monitoring Plugins' will expire on $expiry.", "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' will expire on ' . quotemeta($expiry) . '.*/', "output ok" );
 
         $result = NPTest->testCmd( "$command -p $port_https -S -C 14000" );
         is( $result->return_code, 1, "$command -p $port_https -S -C 14000" );
-        like( $result->output, '/WARNING - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\).*/', "output ok" );
 
         # Expired cert tests
         $result = NPTest->testCmd( "$command -p $port_https -S -C 13960,14000" );
         is( $result->return_code, 2, "$command -p $port_https -S -C 13960,14000" );
-        like( $result->output, '/CRITICAL - Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\)./', "output ok" );
+        like( $result->output, '/.*Certificate \'Monitoring Plugins\' expires in \d+ day\(s\) \(' . quotemeta($expiry) . '\).*/', "output ok" );
 
         $result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" );
         is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" );
-        is( $result->output,
-                'CRITICAL - Certificate \'Monitoring Plugins\' expired on Wed Jan  2 12:00:00 2008 +0000.',
+        like( $result->output,
+                '/.*Certificate \'Monitoring Plugins\' expired on Wed Jan\s+2 12:00:00 2008 \+0000.*/',
                 "output ok" );
 
 }
@@ -274,19 +397,19 @@ SKIP: {
         $cmd = "./$plugin -H $virtual_host -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host:$port_http\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # http with virtual port (!= 80)
         $cmd = "./$plugin -H $virtual_host:$virtual_port -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host:$virtual_port\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # http with virtual port (80)
         $cmd = "./$plugin -H $virtual_host:80 -I 127.0.0.1 -p $port_http -u /virtual_port -r ^$virtual_host\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 }
 
 # and the same for SSL
@@ -296,19 +419,19 @@ SKIP: {
         $cmd = "./$plugin -H $virtual_host -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host:$port_https\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # https with virtual port (!= 443)
         $cmd = "./$plugin -H $virtual_host:$virtual_port -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host:$virtual_port\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # https with virtual port (443)
         $cmd = "./$plugin -H $virtual_host:443 -I 127.0.0.1 -p $port_https --ssl -u /virtual_port -r ^$virtual_host\$";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 }
 
 
@@ -321,165 +444,223 @@ sub run_common_tests {
 
         $result = NPTest->testCmd( "$command -u /file/root" );
         is( $result->return_code, 0, "/file/root");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /file/root -s Root" );
         is( $result->return_code, 0, "/file/root search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 274 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /file/root -s NonRoot" );
         is( $result->return_code, 2, "Missing string check");
-        like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - string 'NonRoot' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
+        like( $result->output, qr%string 'NonRoot' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /file/root -s NonRootWithOver30charsAndMoreFunThanAWetFish" );
         is( $result->return_code, 2, "Missing string check");
-        like( $result->output, qr%HTTP CRITICAL: HTTP/1\.1 200 OK - string 'NonRootWithOver30charsAndM...' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
+        like( $result->output, qr%string 'NonRootWithOver30charsAndM...' not found on 'https?://127\.0\.0\.1:\d+/file/root'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /header_check -d foo" );
         is( $result->return_code, 0, "header_check search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 96 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 96 bytes in [\d\.]+ second.*/', "Output correct" );
 
         $result = NPTest->testCmd( "$command -u /header_check -d bar" );
         is( $result->return_code, 2, "Missing header string check");
-        like( $result->output, qr%^HTTP CRITICAL: HTTP/1\.1 200 OK - header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location");
+        like( $result->output, qr%header 'bar' not found on 'https?://127\.0\.0\.1:\d+/header_check'%, "Shows search string and location");
 
         $result = NPTest->testCmd( "$command -u /header_broken_check" );
         is( $result->return_code, 0, "header_check search for string");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - 138 bytes in [\d\.]+ second/', "Output correct" );
+        like( $result->output, '/.*HTTP/1.1 200 OK - 138 bytes in [\d\.]+ second.*/', "Output correct" );
 
         my $cmd;
         $cmd = "$command -u /slow";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, "$cmd");
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
         $result->output =~ /in ([\d\.]+) second/;
         cmp_ok( $1, ">", 1, "Time is > 1 second" );
 
         $cmd = "$command -u /statuscode/200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/200 -e 200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - Status line output matched "200" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - \d+ bytes in [\d\.]+ second /', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 201 Created - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 201";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - Status line output matched "201" - \d+ bytes in [\d\.]+ second /', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "201".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 200";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL - Invalid HTTP response received from host on port \d+: HTTP/1.1 201 Created/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Invalid HTTP response received from host on port \d+: HTTP/1.1 201 Created.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/200 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - Status line output matched "200,201,202" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200,201,202".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/201 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 201 Created - Status line output matched "200,201,202" - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Status line output matched "200,201,202".*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /statuscode/203 -e 200,201,202";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL - Invalid HTTP response received from host on port (\d+): HTTP/1.1 203 Non-Authoritative Information/', "Output correct: ".$result->output );
+        like( $result->output, '/.*Invalid HTTP response received from host on port (\d+): HTTP/1.1 203 Non-Authoritative Information.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j HEAD -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 HEAD - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 HEAD - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j POST -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j GET -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 GET - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -P foo -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 POST - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j DELETE -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 1, $cmd);
-        like( $result->output, '/^HTTP WARNING: HTTP/1.1 405 Method Not Allowed/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 405 Method Not Allowed.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j foo -u /method";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 2, $cmd);
-        like( $result->output, '/^HTTP CRITICAL: HTTP/1.1 501 Not Implemented/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 501 Not Implemented.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -P stufftoinclude -u /postdata -s POST:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -j PUT -P stufftoinclude -u /postdata -s PUT:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         # To confirm that the free doesn't segfault
         $cmd = "$command -P stufftoinclude -j PUT -u /postdata -s PUT:stufftoinclude";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /redirect";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f follow -u /redirect";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 301 Moved Permanently - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f follow -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f sticky -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f stickyport -u /redirect -k 'follow: me'";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
 
         $cmd = "$command -f follow -u /redirect_rel -s redirected";
         $result = NPTest->testCmd( $cmd );
         is( $result->return_code, 0, $cmd);
-        like( $result->output, '/^HTTP OK: HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second/', "Output correct: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct: ".$result->output );
+
+        # Redirect with increment tests. These are for checking if the url parameters, query parameters and fragment are parsed.
+        # The server at this point has dynamic redirection. It tries to increment values that it sees in these fields, then redirects.
+        # It also appends some debug log and writes it into HTTP content, pass the -vvv parameter to see them.
+
+        $cmd = "$command -u '/redirect_with_increment/path1/path2/path3/path4' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 1, $cmd);
+        like( $result->output, '/.*HTTP/1.1 403 Forbidden - \d+ bytes in [\d\.]+ second.*/', "Output correct, redirect_count was not present, got redirected to / : ".$result->output );
+
+        # redirect_count=0 is parsed as a parameter and incremented. When it goes up to 3, the redirection returns HTTP OK
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, redirect_count went up to 3, and returned OK: ".$result->output );
+
+        # location_redirect_count=0 goes up to 3, which uses the HTTP 302 style of redirection with 'Location' header
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;location_redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # fail_count parameter may also go up to 3, which returns a HTTP 403
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;fail_count=2' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 1, $cmd);
+        like( $result->output, '/.*HTTP/1.1 403 Forbidden - \d+ bytes in [\d\.]+ second.*/', "Output correct, early due to fail_count reaching 3: ".$result->output );
+
+        # redirect_count=0, p1=1 , p2=ab => redirect_count=1, p1=2 , p2=bc => redirect_count=2, p1=3 , p2=cd => redirect_count=3 , p1=4 , p2=de
+        # Last visited URI returns HTTP OK instead of redirect, and the one before that contains the new_uri in its content
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*redirect_count=3;p1=4;p2=de\?*/', "Output correct, parsed and incremented both parameters p1 and p2 : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # Same incrementation as before, uses the query parameters that come after the first '?' : qp1 and qp2
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;p1=1;p2=ab?qp1=10&qp2=kl#f1=test' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*\?qp1=13&qp2=no*/', "Output correct, parsed and incremented both query parameters qp1 and qp2 : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # Check if the query parameter order is kept intact
+        $cmd = "$command -u '/redirect_with_increment;redirect_count=0;?qp0=0&qp1=1&qp2=2&qp3=3&qp4=4&qp5=5' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*\?qp0=3&qp1=4&qp2=5&qp3=6&qp4=7&qp5=8*/', "Output correct, parsed and incremented query parameters qp1,qp2,qp3,qp4,qp5 in order : ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
+
+        # The fragment is passed as another parameter.
+        # During the server redirects the fragment will be set to its value, if such a key is present.
+        # 'ebiil' => 'fcjjm' => 'gdkkn' => 'hello'
+        $cmd = "$command -u '/redirect_with_increment/path1/path2;redirect_count=0;fragment=ebiil?qp1=0' --onredirect=follow -vvv";
+        $result = NPTest->testCmd( "$cmd" );
+        is( $result->return_code, 0, $cmd);
+        like( $result->output, '/.*redirect_count=3;fragment=hello\?qp1=3#hello*/', "Output correct, fragments are specified by server and followed by check_curl: ".$result->output );
+        like( $result->output, '/.*HTTP/1.1 200 OK - \d+ bytes in [\d\.]+ second.*/', "Output correct, location_redirect_count went up to 3: ".$result->output );
 
         # These tests may block
         # stickyport - on full urlS port is set back to 80 otherwise
diff --git a/plugins/tests/check_nt.t b/plugins/tests/check_nt.t
deleted file mode 100755
index 223d4933..00000000
--- a/plugins/tests/check_nt.t
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /usr/bin/perl -w -I ..
-#
-# Test check_nt by having a stub check_nt daemon
-#
-
-use strict;
-use Test::More;
-use NPTest;
-use FindBin qw($Bin);
-
-use IO::Socket;
-use IO::Select;
-use POSIX;
-
-my $port = 50000 + int(rand(1000));
-
-my $pid = fork();
-if ($pid) {
-        # Parent
-        #print "parent\n";
-        # give our webserver some time to startup
-        sleep(1);
-} else {
-        # Child
-        #print "child\n";
-
-        my $server = IO::Socket::INET->new(
-                LocalPort => $port,
-                Type => SOCK_STREAM,
-                Reuse => 1,
-                Proto => "tcp",
-                Listen => 10,
-        ) or die "Cannot be a tcp server on port $port: $@";
-
-        $server->autoflush(1);
-
-        print "Please contact me at port $port\n";
-        while (my $client = $server->accept ) {
-                my $data = "";
-                my $rv = $client->recv($data, POSIX::BUFSIZ, 0);
-
-                my ($password, $command, $arg) = split('&', $data);
-                
-                if ($command eq "4") {
-                        if ($arg eq "c") {
-                                print $client "930000000&1000000000";
-                        } elsif ($arg eq "d") {
-                                print $client "UNKNOWN: Drive is not a fixed drive";
-                        }
-                }
-        }
-        exit;
-}
-
-END { if ($pid) { print "Killing $pid\n"; kill "INT", $pid } };
-
-if ($ARGV[0] && $ARGV[0] eq "-d") {
-        sleep 1000;
-}
-
-if (-x "./check_nt") {
-        plan tests => 5;
-} else {
-        plan skip_all => "No check_nt compiled";
-}
-
-my $result;
-my $command = "./check_nt -H 127.0.0.1 -p $port";
-
-$result = NPTest->testCmd( "$command -v USEDDISKSPACE -l c" );
-is( $result->return_code, 0, "USEDDISKSPACE c");
-is( $result->output, q{c:\ - total: 0.93 Gb - used: 0.07 Gb (7%) - free 0.87 Gb (93%) | 'c:\ Used Space'=0.07Gb;0.00;0.00;0.00;0.93}, "Output right" );
-
-$result = NPTest->testCmd( "$command -v USEDDISKSPACE -l d" );
-is( $result->return_code, 3, "USEDDISKSPACE d - invalid");
-is( $result->output, "Free disk space : Invalid drive", "Output right" );
-
-$result = NPTest->testCmd( "./check_nt -v USEDDISKSPACE -l d" );
-is( $result->return_code, 3, "Fail if -H missing");
-
diff --git a/plugins/tests/check_snmp.t b/plugins/tests/check_snmp.t
index bfe42e16..26d67898 100755
--- a/plugins/tests/check_snmp.t
+++ b/plugins/tests/check_snmp.t
@@ -4,12 +4,13 @@
 #
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
 use FindBin qw($Bin);
 use POSIX qw/strftime/;
 
-my $tests = 81;
+my $tests = 75;
 # Check that all dependent modules are available
 eval {
         require NetSNMP::OID;
@@ -76,49 +77,36 @@ my $res;
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0");
 cmp_ok( $res->return_code, '==', 0, "Exit OK when querying a multi-line string" );
-like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
-like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software | 
-.1.3.6.1.4.1.8072.3.2.67.0:
-"Cisco Internetwork Operating System Software
-IOS (tm) Catalyst 4000 \"L3\" Switch Software (cat4000-I9K91S-M), Version
-12.2(20)EWA, RELEASE SOFTWARE (fc1)
-Technical Support: http://www.cisco.com/techsupport
-Copyright (c) 1986-2004 by cisco Systems, Inc.
-"').'/m', "String contains all lines");
+like($res->output, '/.*Cisco Internetwork Operating System Software.*/m', "String contains all lines");
 
 # sysContact.0 is "Alice" (from our snmpd.conf)
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.0 -o sysContact.0 -o .1.3.6.1.4.1.8072.3.2.67.1");
 cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
-like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
-like($res->output, '/'.quotemeta('SNMP OK - Cisco Internetwork Operating System Software ').'"?Alice"?'.quotemeta(' Kisco Outernetwork Oserating Gystem Totware | 
-.1.3.6.1.4.1.8072.3.2.67.0:
-"Cisco Internetwork Operating System Software
-IOS (tm) Catalyst 4000 \"L3\" Switch Software (cat4000-I9K91S-M), Version
-12.2(20)EWA, RELEASE SOFTWARE (fc1)
-Technical Support: http://www.cisco.com/techsupport
-Copyright (c) 1986-2004 by cisco Systems, Inc.
-"
-.1.3.6.1.4.1.8072.3.2.67.1:
-"Kisco Outernetwork Oserating Gystem Totware
-Copyleft (c) 2400-2689 by kisco Systrems, Inc."').'/m', "String contains all lines with multiple OIDs");
+# like($res->output, '/^SNMP OK - /', "String contains SNMP OK");
+like($res->output, '/.*Cisco Internetwork Operating System Software.*/m', "String contains all lines with multiple OIDs");
+like($res->output, '/.*Alice.*/m', "String contains all lines with multiple OIDs");
+like($res->output, '/.*Kisco Outernetwork Oserating Gystem Totware.*/m', "String contains all lines with multiple OIDs");
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.2");
-like($res->output, '/'.quotemeta('SNMP OK - This should not confuse check_snmp \"parser\" | 
-.1.3.6.1.4.1.8072.3.2.67.2:
-"This should not confuse check_snmp \"parser\"
-into thinking there is no 2nd line"').'/m', "Attempt to confuse parser No.1");
+cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
+# like($res->output, '/'.quotemeta('This should not confuse check_snmp \"parser\" | 
+# .1.3.6.1.4.1.8072.3.2.67.2:
+# "This should not confuse check_snmp \"parser\"
+# into thinking there is no 2nd line"').'/m', "Attempt to confuse parser No.1");
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.3");
-like($res->output, '/'.quotemeta('SNMP OK - It\'s getting even harder if the line | 
-.1.3.6.1.4.1.8072.3.2.67.3:
-"It\'s getting even harder if the line
-ends with with this: C:\\\\"').'/m', "Attempt to confuse parser No.2");
+cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
+# like($res->output, '/'.quotemeta('It\'s getting even harder if the line | 
+# .1.3.6.1.4.1.8072.3.2.67.3:
+# "It\'s getting even harder if the line
+# ends with with this: C:\\\\"').'/m', "Attempt to confuse parser No.2");
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.4");
-like($res->output, '/'.quotemeta('SNMP OK - And now have fun with with this: \"C:\\\\\" | 
-.1.3.6.1.4.1.8072.3.2.67.4:
-"And now have fun with with this: \"C:\\\\\"
-because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
+cmp_ok( $res->return_code, '==', 0, "Exit OK when querying multi-line OIDs" );
+# like($res->output, '/'.quotemeta('And now have fun with with this: \"C:\\\\\" | 
+# .1.3.6.1.4.1.8072.3.2.67.4:
+# "And now have fun with with this: \"C:\\\\\"
+# because we\'re not done yet!"').'/m', "Attempt to confuse parser No.3");
 
 system("rm -f ".$ENV{'MP_STATE_PATH'}."/*/check_snmp/*");
 
@@ -131,156 +119,159 @@ SKIP: {
     my $ts = time();
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
     is($res->return_code, 0, "Returns OK");
-    is($res->output, "No previous data to calculate rate - assume okay");
+    like($res->output, "/.*No previous data to calculate rate - assume okay.*/");
 
     # test rate 1 second later
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
     is($res->return_code, 1, "WARNING - due to going above rate calculation" );
-    is($res->output, "SNMP RATE WARNING - *666* | iso.3.6.1.4.1.8072.3.2.67.10=666;600 ");
+    like($res->output, "/.*=666.*/");
 
     # test rate with same time
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -w 600" );
     is($res->return_code, 3, "UNKNOWN - basically the divide by zero error" );
-    is($res->output, "Time duration between plugin calls is invalid");
+    like($res->output, "/.*Time duration between plugin calls is invalid.*/");
 
 
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets" );
     is($res->return_code, 0, "OK for first call" );
-    is($res->output, "No previous data to calculate rate - assume okay" );
+    like($res->output, "/.*No previous data to calculate rate - assume okay.*/" );
 
     # test rate 1 second later
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP RATE OK - inoctets 666 | inoctets=666 ", "Check label");
+    like($res->output, "/.*inoctets.*=666.*/m", "Check label");
 
     # test rate 3 seconds later
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+3))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP RATE OK - inoctets 333 | inoctets=333 ", "Check rate decreases due to longer interval");
+    like($res->output, "/.*inoctets.*333.*/", "Check rate decreases due to longer interval");
 
 
     # label performance data check
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l test" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test 67996 | test=67996c ", "Check label");
+    like($res->output, "/.*test.?=67996c/", "Check label");
 
-    $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l \"test'test\"" );
-    is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test'test 68662 | \"test'test\"=68662c ", "Check label");
+    # following test is deactivated since it was not valid due to the guidelines (no single quote in label allowed)
+    # $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l \"test'test\"" );
+    # is($res->return_code, 0, "OK as no thresholds" );
+    # is($res->output, "test'test 68662 | \"test'test\"=68662c ", "Check label");
 
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l 'test\"test'" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test\"test 69328 | 'test\"test'=69328c ", "Check label");
+    like($res->output, "/.*'test\"test'=68662c.*/", "Check label");
 
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l test -O" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test 69994 | iso.3.6.1.4.1.8072.3.2.67.10=69994c ", "Check label");
+    like($res->output, "/.*.67.10.?=69328c.*/", "Check label");
 
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - 70660 | iso.3.6.1.4.1.8072.3.2.67.10=70660c ", "Check label");
+    like($res->output, "/.*8072.3.2.67.10.?=69994c.*/", "Check label");
 
     $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 -l 'test test'" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP OK - test test 71326 | 'test test'=71326c ", "Check label");
+    like($res->output, "/.*'test test'=70660c/", "Check label");
 
 
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets_per_minute --rate-multiplier=60" );
     is($res->return_code, 0, "OK for first call" );
-    is($res->output, "No previous data to calculate rate - assume okay" );
+    like($res->output, "/.*No previous data to calculate rate - assume okay.*/" );
 
     # test 1 second later
     $res = NPTest->testCmd("LC_TIME=C TZ=UTC faketime -f '".strftime("%Y-%m-%d %H:%M:%S", localtime($ts+1))."' ./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10 --rate -l inoctets_per_minute --rate-multiplier=60" );
     is($res->return_code, 0, "OK as no thresholds" );
-    is($res->output, "SNMP RATE OK - inoctets_per_minute 39960 | inoctets_per_minute=39960 ", "Checking multiplier");
+    like($res->output, "/.*inoctets_per_minute.*=39960/", "Checking multiplier");
 };
 
 
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 -s '\"stringtests\"'" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 -s 'stringtests'" );
 is($res->return_code, 0, "OK as string matches" );
-is($res->output, 'SNMP OK - "stringtests" | ', "Good string match" );
+like($res->output, '/.*stringtests.*/', "Good string match" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 -s ring" );
 is($res->return_code, 2, "CRITICAL as string doesn't match (though is a substring)" );
-is($res->output, 'SNMP CRITICAL - *"stringtests"* | ', "Failed string match" );
+like($res->output, '/.*stringtests.*/', "Failed string match" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 --invert-search -s '\"stringtests\"'" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 --invert-search -s 'stringtests'" );
 is($res->return_code, 2, "CRITICAL as string matches but inverted" );
-is($res->output, 'SNMP CRITICAL - *"stringtests"* | ', "Inverted string match" );
+like($res->output, '/.*"stringtests".*/', "Inverted string match" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.11 --invert-search -s ring" );
 is($res->return_code, 0, "OK as string doesn't match but inverted" );
-is($res->output, 'SNMP OK - "stringtests" | ', "OK as inverted string no match" );
+like($res->output, '/.*"stringtests".*/', "OK as inverted string no match" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.12 -w 4:5" );
-is($res->return_code, 1, "Numeric in string test" );
-is($res->output, 'SNMP WARNING - *3.5* | iso.3.6.1.4.1.8072.3.2.67.12=3.5;4:5 ', "WARNING threshold checks for string masquerading as number" );
+# a string is a string and not a number
+is($res->return_code, 0, "Numeric in string test" );
+like($res->output, '/.*3.5.*| iso.3.6.1.4.1.8072.3.2.67.12=3.5;4:5/', "WARNING threshold checks for string masquerading as number" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.13" );
 is($res->return_code, 0, "Not really numeric test" );
-is($res->output, 'SNMP OK - "87.4startswithnumberbutshouldbestring" | ', "Check string with numeric start is still string" );
+like($res->output, '/.*"87.4startswithnumberbutshouldbestring".*/', "Check string with numeric start is still string" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.14" );
 is($res->return_code, 0, "Not really numeric test (trying best to fool it)" );
-is($res->output, 'SNMP OK - "555\"I said\"" | ', "Check string with a double quote following is still a string (looks like the perl routine will always escape though)" );
+like($res->output, '/.*\'555"I said"\'.*/', "Check string with a double quote following is still a string (looks like the perl routine will always escape though)" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.15 -r 'CUSTOM CHECK OK'" );
 is($res->return_code, 0, "String check should check whole string, not a parsed number" );
-is($res->output, 'SNMP OK - "CUSTOM CHECK OK: foo is 12345" | ', "String check with numbers returns whole string");
+like($res->output, '/.*CUSTOM CHECK OK: foo is 12345.*/', "String check with numbers returns whole string");
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
 is($res->return_code, 0, "Negative integer check OK" );
-is($res->output, 'SNMP OK - -2 | iso.3.6.1.4.1.8072.3.2.67.16=-2;-2:;-3: ', "Negative integer check OK output" );
+like($res->output, '/.*-2.*| iso.3.6.1.4.1.8072.3.2.67.16=-2;-2:;-3:/', "Negative integer check OK output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
 is($res->return_code, 1, "Negative integer check WARNING" );
-is($res->output, 'SNMP WARNING - *-3* | iso.3.6.1.4.1.8072.3.2.67.16=-3;-2:;-3: ', "Negative integer check WARNING output" );
+like($res->output, '/.*-3.*| iso.3.6.1.4.1.8072.3.2.67.16=-3;-2:;-3:/', "Negative integer check WARNING output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.16 -w -2: -c -3:" );
 is($res->return_code, 2, "Negative integer check CRITICAL" );
-is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.16=-4;-2:;-3: ', "Negative integer check CRITICAL output" );
+like($res->output, '/.*-4.*| iso.3.6.1.4.1.8072.3.2.67.16=-4;-2:;-3:/', "Negative integer check CRITICAL output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -3: -c -6:" );
 is($res->return_code, 1, "Negative integer as string, WARNING" );
-is($res->output, 'SNMP WARNING - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4;-3:;-6: ', "Negative integer as string, WARNING output" );
+like($res->output, '/.*-4.*| iso.3.6.1.4.1.8072.3.2.67.17=-4;-3:;-6:/', "Negative integer as string, WARNING output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.17 -w -2: -c -3:" );
 is($res->return_code, 2, "Negative integer as string, CRITICAL" );
-is($res->output, 'SNMP CRITICAL - *-4* | iso.3.6.1.4.1.8072.3.2.67.17=-4;-2:;-3: ', "Negative integer as string, CRITICAL output" );
+like($res->output, '/.*-4.*| iso.3.6.1.4.1.8072.3.2.67.17=-4;-2:;-3:/', "Negative integer as string, CRITICAL output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -c '~:-6.5'" );
-is($res->return_code, 0, "Negative float OK" );
-is($res->output, 'SNMP OK - -6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;;@-6.5:~ ', "Negative float OK output" );
+# deactivated since the perl agent api of snmpd really does not allow floats
+# $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -c '~:-6.5'" );
+# is($res->return_code, 0, "Negative float OK" );
+# is($res->output, '-6.6 | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;;@-6.5:~ ', "Negative float OK output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -w '~:-6.65' -c '~:-6.55'" );
-is($res->return_code, 1, "Negative float WARNING" );
-is($res->output, 'SNMP WARNING - *-6.6* | iso.3.6.1.4.1.8072.3.2.67.18=-6.6;@-6.65:~;@-6.55:~ ', "Negative float WARNING output" );
+# $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.18 -w '~:-6.65' -c '~:-6.55'" );
+# is($res->return_code, 1, "Negative float WARNING" );
+# like($res->output, '/-6.6.*| .*67.18=-6.6;@-6.65:~;@-6.55:~/', "Negative float WARNING output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w '1:100000,-10:20' -c '2:200000,-20:30'" );
 is($res->return_code, 0, "Multiple OIDs with thresholds" );
-like($res->output, '/SNMP OK - \d+ -4 | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1:100000;2:200000 iso.3.6.1.4.1.8072.3.2.67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" );
+like($res->output, '/-4.*| .*67.10=\d+c;1:100000;2:200000 .*67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w '1:100000,-1:2' -c '2:200000,-20:30'" );
 is($res->return_code, 1, "Multiple OIDs with thresholds" );
-like($res->output, '/SNMP WARNING - \d+ \*-4\* | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1:100000;2:200000 iso.3.6.1.4.1.8072.3.2.67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" );
+like($res->output, '/-4.*| iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1:100000;2:200000 iso.3.6.1.4.1.8072.3.2.67.17=-4;-10:20;-20:30/', "Multiple OIDs with thresholds output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w 1,2 -c 1" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.10,.1.3.6.1.4.1.8072.3.2.67.17 -w 1,2 -c 1 -O" );
 is($res->return_code, 2, "Multiple OIDs with some thresholds" );
-like($res->output, '/SNMP CRITICAL - \*\d+\* \*-4\* | iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1;2 iso.3.6.1.4.1.8072.3.2.67.17=-4;;/', "Multiple OIDs with thresholds output" );
+like($res->output, '/.*-4.*| iso.3.6.1.4.1.8072.3.2.67.10=\d+c;1;2 iso.3.6.1.4.1.8072.3.2.67.17=-4;;/', "Multiple OIDs with thresholds output" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19");
 is($res->return_code, 0, "Test plain .1.3.6.1.4.1.8072.3.2.67.6 RC" );
-is($res->output,'SNMP OK - 42 | iso.3.6.1.4.1.8072.3.2.67.19=42 ', "Test plain value of .1.3.6.1.4.1.8072.3.2.67.1" );
+like($res->output,'/.*42.*| iso.3.6.1.4.1.8072.3.2.67.19=42/', "Test plain value of .1.3.6.1.4.1.8072.3.2.67.1" );
 
 $res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 -M .1");
 is($res->return_code, 0, "Test multiply RC" );
-is($res->output,'SNMP OK - 4.200000 | iso.3.6.1.4.1.8072.3.2.67.19=4.200000 ' , "Test multiply .1 output" );
+like($res->output,'/.*4.200000.*| iso.3.6.1.4.1.8072.3.2.67.19=4.200000/' , "Test multiply .1 output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 --multiplier=.1 -f '%.2f' ");
-is($res->return_code, 0, "Test multiply RC + format" );
-is($res->output, 'SNMP OK - 4.20 | iso.3.6.1.4.1.8072.3.2.67.19=4.20 ', "Test multiply .1 output + format" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 --multiplier=.1");
+is($res->return_code, 0, "Test multiply RC" );
+like($res->output, '/.*4.20.*| iso.3.6.1.4.1.8072.3.2.67.19=4.20/', "Test multiply .1 output" );
 
-$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 --multiplier=.1 -f '%.2f' -w 1");
-is($res->return_code, 1, "Test multiply RC + format + thresholds" );
-is($res->output, 'SNMP WARNING - *4.20* | iso.3.6.1.4.1.8072.3.2.67.19=4.20;1 ', "Test multiply .1 output + format + thresholds" );
+$res = NPTest->testCmd( "./check_snmp -H 127.0.0.1 -C public -p $port_snmp -o .1.3.6.1.4.1.8072.3.2.67.19 --multiplier=.1 -w 1");
+is($res->return_code, 1, "Test multiply RC + thresholds" );
+like($res->output, '/.*4.20.* | iso.3.6.1.4.1.8072.3.2.67.19=4.20+;1/', "Test multiply .1 output + thresholds" );
diff --git a/plugins/tests/check_snmp_agent.pl b/plugins/tests/check_snmp_agent.pl
index 38912e98..608b6f92 100644
--- a/plugins/tests/check_snmp_agent.pl
+++ b/plugins/tests/check_snmp_agent.pl
@@ -4,9 +4,10 @@
 #
 
 #use strict; # Doesn't work
+use warnings;
 use NetSNMP::OID qw(:all);
 use NetSNMP::agent;
-use NetSNMP::ASN qw(ASN_OCTET_STR ASN_COUNTER ASN_COUNTER64 ASN_INTEGER ASN_INTEGER64 ASN_UNSIGNED ASN_UNSIGNED64);
+use NetSNMP::ASN qw(ASN_OCTET_STR ASN_COUNTER ASN_COUNTER64 ASN_INTEGER ASN_INTEGER64 ASN_UNSIGNED ASN_UNSIGNED64 ASN_FLOAT);
 #use Math::Int64 qw(uint64); # Skip that module while we don't need it
 sub uint64 { return $_ }
 
@@ -22,21 +23,82 @@ IOS (tm) Catalyst 4000 "L3" Switch Software (cat4000-I9K91S-M), Version
 Technical Support: http://www.cisco.com/techsupport
 Copyright (c) 1986-2004 by cisco Systems, Inc.
 ';
-my $multilin2 = "Kisco Outernetwork Oserating Gystem Totware
+my $multiline2 = "Kisco Outernetwork Oserating Gystem Totware
 Copyleft (c) 2400-2689 by kisco Systrems, Inc.";
-my $multilin3 = 'This should not confuse check_snmp "parser"
+my $multiline3 = 'This should not confuse check_snmp "parser"
 into thinking there is no 2nd line';
-my $multilin4 = 'It\'s getting even harder if the line
+my $multiline4 = 'It\'s getting even harder if the line
 ends with with this: C:\\';
-my $multilin5 = 'And now have fun with with this: "C:\\"
+my $multiline5 = 'And now have fun with with this: "C:\\"
 because we\'re not done yet!';
 
 # Next are arrays of indexes (Type, initial value and increments)
 # 0..19 <---- please update comment when adding/removing fields
-my @fields = (ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_UNSIGNED, ASN_UNSIGNED, ASN_COUNTER, ASN_COUNTER64, ASN_UNSIGNED, ASN_COUNTER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER, ASN_OCTET_STR, ASN_OCTET_STR, ASN_INTEGER );
-my @values = ($multiline, $multilin2, $multilin3, $multilin4, $multilin5, 4294965296, 1000, 4294965296, uint64("18446744073709351616"), int(rand(2**32)), 64000, "stringtests", "3.5", "87.4startswithnumberbutshouldbestring", '555"I said"', 'CUSTOM CHECK OK: foo is 12345', -2, '-4', '-6.6', 42 );
+my @fields = (ASN_OCTET_STR, # 0
+                                                        ASN_OCTET_STR, # 1
+                                                        ASN_OCTET_STR, # 2
+                                                        ASN_OCTET_STR, # 3
+                                                        ASN_OCTET_STR, # 4
+                                                        ASN_UNSIGNED, #  5
+                                                        ASN_UNSIGNED, #  6
+                                                        ASN_COUNTER, #   7
+                                                        ASN_COUNTER64, # 8
+                                                        ASN_UNSIGNED, #  9
+                                                        ASN_COUNTER, #  10
+                                                        ASN_OCTET_STR, # 11
+                                                        ASN_OCTET_STR, # 12
+                                                        ASN_OCTET_STR, # 13
+                                                        ASN_OCTET_STR, # 14
+                                                        ASN_OCTET_STR, # 15
+                                                        ASN_INTEGER, #   16
+                                                        ASN_INTEGER, # 17
+                                                        ASN_FLOAT, # 18
+                                                        ASN_INTEGER #    19
+                                                        );
+my @values = ($multiline,  # 0
+                                                        $multiline2,  # 1
+                                                        $multiline3,  # 2
+                                                        $multiline4,  # 3
+                                                        $multiline5,  # 4
+                                                        4294965296,  # 5
+                                                        1000,  #       6
+                                                        4294965296,  # 7
+                                                        uint64("18446744073709351616"),  # 8
+                                                        int(rand(2**32)),  # 9
+                                                        64000,  # 10
+                                                        "stringtests",  # 11
+                                                        "3.5",  # 12
+                                                        "87.4startswithnumberbutshouldbestring",  # 13
+                                                        '555"I said"',  # 14
+                                                        'CUSTOM CHECK OK: foo is 12345',  # 15
+                                                        '-2',  # 16
+                                                        '-4',  # 17
+                                                        '-6.6',  # 18
+                                                        42  # 19
+                                                );
 # undef increments are randomized
-my @incrts = (undef, undef, undef, undef, undef, 1000, -500, 1000, 100000, undef, 666, undef, undef, undef, undef, undef, -1, undef, undef, 0 );
+my @incrts = (
+                                                        undef, # 0
+                                                        undef, # 1
+                                                        undef, # 2
+                                                        undef, # 3
+                                                        undef, # 4
+                                                        1000, # 5
+                                                        -500, # 6
+                                                        1000, # 7
+                                                        100000, # 8
+                                                        undef, # 9
+                                                        666, # 10
+                                                        undef, # 11
+                                                        undef, # 12
+                                                        undef, # 13
+                                                        undef, # 14
+                                                        undef, # 15
+                                                        -1, #    16
+                                                        0, # 17
+                                                        undef, # 18
+                                                        0 #      19
+                                         );
 
 # Number of elements in our OID
 my $oidelts;
diff --git a/plugins/tests/conf/snmpd.conf b/plugins/tests/conf/snmpd.conf
index eff5b0b3..1724c027 100644
--- a/plugins/tests/conf/snmpd.conf
+++ b/plugins/tests/conf/snmpd.conf
@@ -19,5 +19,5 @@ syscontact Alice
 # Embedded Subagents
 ###############################################################################
 
-perl do "tests/check_snmp_agent.pl";
+perl do "./tests/check_snmp_agent.pl";
 
diff --git a/lib/tests/test_disk.c b/plugins/tests/test_check_disk.c
index c18db7a4..32b46c2d 100644
--- a/lib/tests/test_disk.c
+++ b/plugins/tests/test_check_disk.c
@@ -17,28 +17,17 @@
  *****************************************************************************/
 
 #include "common.h"
-#include "utils_disk.h"
-#include "tap.h"
+#include "../check_disk.d/utils_disk.h"
+#include "../../tap/tap.h"
 #include "regex.h"
 
-void np_test_mount_entry_regex(struct mount_entry *dummy_mount_list, char *regstr, int cflags, int expect, char *desc);
+void np_test_mount_entry_regex(struct mount_entry *dummy_mount_list, char *regstr, int cflags,
+                                                           int expect, char *desc);
 
 int main(int argc, char **argv) {
-        struct name_list *exclude_filesystem = NULL;
-        struct name_list *exclude_fstype = NULL;
-        struct name_list *dummy_mountlist = NULL;
-        struct name_list *temp_name;
-        struct parameter_list *paths = NULL;
-        struct parameter_list *p, *prev = NULL, *last = NULL;
-
-        struct mount_entry *dummy_mount_list;
-        struct mount_entry *me;
-        struct mount_entry **mtail = &dummy_mount_list;
-        int cflags = REG_NOSUB | REG_EXTENDED;
-        int found = 0, count = 0;
-
-        plan_tests(33);
+        plan_tests(35);
 
+        struct name_list *exclude_filesystem = NULL;
         ok(np_find_name(exclude_filesystem, "/var/log") == false, "/var/log not in list");
         np_add_name(&exclude_filesystem, "/var/log");
         ok(np_find_name(exclude_filesystem, "/var/log") == true, "is in list now");
@@ -47,6 +36,7 @@ int main(int argc, char **argv) {
         ok(np_find_name(exclude_filesystem, "/home") == true, "is in list now");
         ok(np_find_name(exclude_filesystem, "/var/log") == true, "/var/log still in list");
 
+        struct name_list *exclude_fstype = NULL;
         ok(np_find_name(exclude_fstype, "iso9660") == false, "iso9660 not in list");
         np_add_name(&exclude_fstype, "iso9660");
         ok(np_find_name(exclude_fstype, "iso9660") == true, "is in list now");
@@ -59,7 +49,9 @@ int main(int argc, char **argv) {
         }
         */
 
-        me = (struct mount_entry *)malloc(sizeof *me);
+        struct mount_entry *dummy_mount_list;
+        struct mount_entry **mtail = &dummy_mount_list;
+        struct mount_entry *me = (struct mount_entry *)malloc(sizeof *me);
         me->me_devname = strdup("/dev/c0t0d0s0");
         me->me_mountdir = strdup("/");
         *mtail = me;
@@ -77,50 +69,70 @@ int main(int argc, char **argv) {
         *mtail = me;
         mtail = &me->me_next;
 
+        int cflags = REG_NOSUB | REG_EXTENDED;
         np_test_mount_entry_regex(dummy_mount_list, strdup("/"), cflags, 3, strdup("a"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/dev"), cflags, 3, strdup("regex on dev names:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/foo"), cflags, 0, strdup("regex on non existent dev/path:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/Foo"), cflags | REG_ICASE, 0, strdup("regi on non existent dev/path:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("/c.t0"), cflags, 3, strdup("partial devname regex match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("c0t0"), cflags, 1, strdup("partial devname regex match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("C0t0"), cflags | REG_ICASE, 1, strdup("partial devname regi match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("home"), cflags, 1, strdup("partial pathname regex match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("hOme"), cflags | REG_ICASE, 1, strdup("partial pathname regi match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("(/home)|(/var)"), cflags, 2, strdup("grouped regex pathname match:"));
-        np_test_mount_entry_regex(dummy_mount_list, strdup("(/homE)|(/Var)"), cflags | REG_ICASE, 2, strdup("grouped regi pathname match:"));
-
-        np_add_parameter(&paths, "/home/groups");
-        np_add_parameter(&paths, "/var");
-        np_add_parameter(&paths, "/tmp");
-        np_add_parameter(&paths, "/home/tonvoon");
-        np_add_parameter(&paths, "/dev/c2t0d0s0");
-
-        np_set_best_match(paths, dummy_mount_list, false);
-        for (p = paths; p; p = p->name_next) {
+        np_test_mount_entry_regex(dummy_mount_list, strdup("/dev"), cflags, 3,
+                                                          strdup("regex on dev names:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("/foo"), cflags, 0,
+                                                          strdup("regex on non existent dev/path:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("/Foo"), cflags | REG_ICASE, 0,
+                                                          strdup("regi on non existent dev/path:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("/c.t0"), cflags, 3,
+                                                          strdup("partial devname regex match:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("c0t0"), cflags, 1,
+                                                          strdup("partial devname regex match:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("C0t0"), cflags | REG_ICASE, 1,
+                                                          strdup("partial devname regi match:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("home"), cflags, 1,
+                                                          strdup("partial pathname regex match:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("hOme"), cflags | REG_ICASE, 1,
+                                                          strdup("partial pathname regi match:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("(/home)|(/var)"), cflags, 2,
+                                                          strdup("grouped regex pathname match:"));
+        np_test_mount_entry_regex(dummy_mount_list, strdup("(/homE)|(/Var)"), cflags | REG_ICASE, 2,
+                                                          strdup("grouped regi pathname match:"));
+
+        filesystem_list test_paths = filesystem_list_init();
+        mp_int_fs_list_append(&test_paths, "/home/groups");
+        mp_int_fs_list_append(&test_paths, "/var");
+        mp_int_fs_list_append(&test_paths, "/tmp");
+        mp_int_fs_list_append(&test_paths, "/home/tonvoon");
+        mp_int_fs_list_append(&test_paths, "/dev/c2t0d0s0");
+        ok(test_paths.length == 5, "List counter works correctly with appends");
+
+        mp_int_fs_list_set_best_match(test_paths, dummy_mount_list, false);
+        for (parameter_list_elem *p = test_paths.first; p; p = mp_int_fs_list_get_next(p)) {
                 struct mount_entry *temp_me;
                 temp_me = p->best_match;
                 if (!strcmp(p->name, "/home/groups")) {
-                        ok(temp_me && !strcmp(temp_me->me_mountdir, "/home"), "/home/groups got right best match: /home");
+                        ok(temp_me && !strcmp(temp_me->me_mountdir, "/home"),
+                           "/home/groups got right best match: /home");
                 } else if (!strcmp(p->name, "/var")) {
                         ok(temp_me && !strcmp(temp_me->me_mountdir, "/var"), "/var got right best match: /var");
                 } else if (!strcmp(p->name, "/tmp")) {
                         ok(temp_me && !strcmp(temp_me->me_mountdir, "/"), "/tmp got right best match: /");
                 } else if (!strcmp(p->name, "/home/tonvoon")) {
-                        ok(temp_me && !strcmp(temp_me->me_mountdir, "/home"), "/home/tonvoon got right best match: /home");
+                        ok(temp_me && !strcmp(temp_me->me_mountdir, "/home"),
+                           "/home/tonvoon got right best match: /home");
                 } else if (!strcmp(p->name, "/dev/c2t0d0s0")) {
-                        ok(temp_me && !strcmp(temp_me->me_devname, "/dev/c2t0d0s0"), "/dev/c2t0d0s0 got right best match: /dev/c2t0d0s0");
+                        ok(temp_me && !strcmp(temp_me->me_devname, "/dev/c2t0d0s0"),
+                           "/dev/c2t0d0s0 got right best match: /dev/c2t0d0s0");
                 }
         }
 
-        paths = NULL; /* Bad boy - should free, but this is a test suite */
-        np_add_parameter(&paths, "/home/groups");
-        np_add_parameter(&paths, "/var");
-        np_add_parameter(&paths, "/tmp");
-        np_add_parameter(&paths, "/home/tonvoon");
-        np_add_parameter(&paths, "/home");
+        for (parameter_list_elem *p = test_paths.first; p; p = mp_int_fs_list_get_next(p)) {
+                mp_int_fs_list_del(&test_paths, p);
+        }
+        ok(test_paths.length == 0, "List delete sets counter properly");
 
-        np_set_best_match(paths, dummy_mount_list, true);
-        for (p = paths; p; p = p->name_next) {
+        mp_int_fs_list_append(&test_paths, "/home/groups");
+        mp_int_fs_list_append(&test_paths, "/var");
+        mp_int_fs_list_append(&test_paths, "/tmp");
+        mp_int_fs_list_append(&test_paths, "/home/tonvoon");
+        mp_int_fs_list_append(&test_paths, "/home");
+
+        mp_int_fs_list_set_best_match(test_paths, dummy_mount_list, true);
+        for (parameter_list_elem *p = test_paths.first; p; p = mp_int_fs_list_get_next(p)) {
                 if (!strcmp(p->name, "/home/groups")) {
                         ok(!p->best_match, "/home/groups correctly not found");
                 } else if (!strcmp(p->name, "/var")) {
@@ -134,59 +146,68 @@ int main(int argc, char **argv) {
                 }
         }
 
+        bool found = false;
         /* test deleting first element in paths */
-        paths = np_del_parameter(paths, NULL);
-        for (p = paths; p; p = p->name_next) {
-                if (!strcmp(p->name, "/home/groups"))
-                        found = 1;
+        mp_int_fs_list_del(&test_paths, NULL);
+        for (parameter_list_elem *p = test_paths.first; p; p = mp_int_fs_list_get_next(p)) {
+                if (!strcmp(p->name, "/home/groups")) {
+                        found = true;
+                }
         }
-        ok(found == 0, "first element successfully deleted");
-        found = 0;
-
-        p = paths;
-        while (p) {
-                if (!strcmp(p->name, "/tmp"))
-                        p = np_del_parameter(p, prev);
-                else {
-                        prev = p;
-                        p = p->name_next;
+        ok(!found, "first element successfully deleted");
+        found = false;
+
+        parameter_list_elem *prev = NULL;
+        parameter_list_elem *p = NULL;
+        for (parameter_list_elem *path = test_paths.first; path; path = mp_int_fs_list_get_next(path)) {
+                if (!strcmp(path->name, "/tmp")) {
+                        mp_int_fs_list_del(&test_paths, path);
                 }
+                p = path;
         }
 
-        for (p = paths; p; p = p->name_next) {
-                if (!strcmp(p->name, "/tmp"))
-                        found = 1;
-                if (p->name_next)
-                        prev = p;
-                else
-                        last = p;
+        parameter_list_elem *last = NULL;
+        for (parameter_list_elem *path = test_paths.first; path; path = mp_int_fs_list_get_next(path)) {
+                if (!strcmp(path->name, "/tmp")) {
+                        found = true;
+                }
+                if (path->next) {
+                        prev = path;
+                } else {
+                        last = path;
+                }
         }
-        ok(found == 0, "/tmp element successfully deleted");
+        ok(!found, "/tmp element successfully deleted");
 
-        p = np_del_parameter(last, prev);
-        for (p = paths; p; p = p->name_next) {
-                if (!strcmp(p->name, "/home"))
-                        found = 1;
+        int count = 0;
+        mp_int_fs_list_del(&test_paths, p);
+        for (p = test_paths.first; p; p = p->next) {
+                if (!strcmp(p->name, "/home")) {
+                        found = true;
+                }
                 last = p;
                 count++;
         }
-        ok(found == 0, "last (/home) element successfully deleted");
+        ok(!found, "last (/home) element successfully deleted");
         ok(count == 2, "two elements remaining");
 
         return exit_status();
 }
 
-void np_test_mount_entry_regex(struct mount_entry *dummy_mount_list, char *regstr, int cflags, int expect, char *desc) {
-        int matches = 0;
-        regex_t re;
-        struct mount_entry *me;
-        if (regcomp(&re, regstr, cflags) == 0) {
-                for (me = dummy_mount_list; me; me = me->me_next) {
-                        if (np_regex_match_mount_entry(me, &re))
+void np_test_mount_entry_regex(struct mount_entry *dummy_mount_list, char *regstr, int cflags,
+                                                           int expect, char *desc) {
+        regex_t regex;
+        if (regcomp(&regex, regstr, cflags) == 0) {
+                int matches = 0;
+                for (struct mount_entry *me = dummy_mount_list; me; me = me->me_next) {
+                        if (np_regex_match_mount_entry(me, &regex)) {
                                 matches++;
+                        }
                 }
-                ok(matches == expect, "%s '%s' matched %i/3 entries. ok: %i/3", desc, regstr, expect, matches);
+                ok(matches == expect, "%s '%s' matched %i/3 entries. ok: %i/3", desc, regstr, expect,
+                   matches);
 
-        } else
+        } else {
                 ok(false, "regex '%s' not compilable", regstr);
+        }
 }
diff --git a/plugins/tests/test_check_disk.t b/plugins/tests/test_check_disk.t
new file mode 100755
index 00000000..56354650
--- /dev/null
+++ b/plugins/tests/test_check_disk.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_check_disk") {
+        plan skip_all => "./test_check_disk not compiled - please enable libtap library to test";
+}
+exec "./test_check_disk";
diff --git a/plugins/tests/test_check_snmp.c b/plugins/tests/test_check_snmp.c
new file mode 100644
index 00000000..d71706d0
--- /dev/null
+++ b/plugins/tests/test_check_snmp.c
@@ -0,0 +1,175 @@
+/*****************************************************************************
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *
+ *****************************************************************************/
+
+#include "tap.h"
+#include "../../config.h"
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include "utils_base.c"
+#include "../check_snmp.d/check_snmp_helpers.h"
+
+char *_np_state_generate_key(int argc, char **argv);
+char *_np_state_calculate_location_prefix(void);
+
+int main(int argc, char **argv) {
+        char *temp_string = (char *)_np_state_generate_key(argc, argv);
+        ok(!strcmp(temp_string, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"),
+           "Got hash with exe and no parameters") ||
+                diag("You are probably running in wrong directory. Must run as ./test_utils");
+
+        int fake_argc = 4;
+        char *fake_argv[] = {
+                "./test_utils",
+                "here",
+                "--and",
+                "now",
+        };
+        temp_string = (char *)_np_state_generate_key(fake_argc, fake_argv);
+        ok(!strcmp(temp_string, "bd72da9f78ff1419fad921ea5e43ce56508aef6c"),
+           "Got based on expected argv");
+
+        unsetenv("MP_STATE_PATH");
+        temp_string = (char *)_np_state_calculate_location_prefix();
+        ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory");
+
+        setenv("MP_STATE_PATH", "", 1);
+        temp_string = (char *)_np_state_calculate_location_prefix();
+        ok(!strcmp(temp_string, NP_STATE_DIR_PREFIX), "Got default directory even with empty string");
+
+        setenv("MP_STATE_PATH", "/usr/local/nagios/var", 1);
+        temp_string = (char *)_np_state_calculate_location_prefix();
+        ok(!strcmp(temp_string, "/usr/local/nagios/var"), "Got default directory");
+
+        fake_argc = 1;
+        fake_argv[0] = "./test_utils";
+        state_key temp_state_key1 = np_enable_state(NULL, 51, "check_test", fake_argc, fake_argv);
+        ok(!strcmp(temp_state_key1.plugin_name, "check_test"), "Got plugin name");
+        ok(!strcmp(temp_state_key1.name, "e2d17f995fd4c020411b85e3e3d0ff7306d4147e"),
+           "Got generated filename");
+
+        state_key temp_state_key2 =
+                np_enable_state("allowedchars_in_keyname", 77, "check_snmp", fake_argc, fake_argv);
+
+        char state_path[1024];
+        sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/allowedchars_in_keyname",
+                        (unsigned long)geteuid());
+        ok(!strcmp(temp_state_key2.plugin_name, "check_test"), "Got plugin name");
+        ok(!strcmp(temp_state_key2.name, "allowedchars_in_keyname"), "Got key name with valid chars");
+        ok(!strcmp(temp_state_key2._filename, state_path), "Got internal filename");
+
+        /* Don't do this test just yet. Will die */
+        /*
+        np_enable_state("bad^chars$in@here", 77);
+        temp_state_key = this_monitoring_plugin->state;
+        ok( !strcmp(temp_state_key->name, "bad_chars_in_here"), "Got key name with bad chars replaced"
+        );
+        */
+
+        state_key temp_state_key3 =
+                np_enable_state("funnykeyname", 54, "check_snmp", fake_argc, fake_argv);
+        sprintf(state_path, "/usr/local/nagios/var/%lu/check_test/funnykeyname",
+                        (unsigned long)geteuid());
+        ok(!strcmp(temp_state_key3.plugin_name, "check_test"), "Got plugin name");
+        ok(!strcmp(temp_state_key3.name, "funnykeyname"), "Got key name");
+
+        ok(!strcmp(temp_state_key3._filename, state_path), "Got internal filename");
+        ok(temp_state_key3.data_version == 54, "Version set");
+
+        state_data *temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Got no state data as file does not exist");
+
+        /*
+                temp_fp = fopen("var/statefile", "r");
+                if (temp_fp==NULL)
+                        printf("Error opening. errno=%d\n", errno);
+                printf("temp_fp=%s\n", temp_fp);
+                ok( _np_state_read_file(temp_fp) == true, "Can read state file" );
+                fclose(temp_fp);
+        */
+
+        temp_state_key3._filename = "var/statefile";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data != NULL, "Got state data now") ||
+                diag("Are you running in right directory? Will get coredump next if not");
+        ok(temp_state_data->time == 1234567890, "Got time");
+        ok(!strcmp((char *)temp_state_data->data, "String to read"), "Data as expected");
+
+        temp_state_key3.data_version = 53;
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Older data version gives NULL");
+        temp_state_key3.data_version = 54;
+
+        temp_state_key3._filename = "var/nonexistent";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Missing file gives NULL");
+
+        temp_state_key3._filename = "var/oldformat";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Old file format gives NULL");
+
+        temp_state_key3._filename = "var/baddate";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Bad date gives NULL");
+
+        temp_state_key3._filename = "var/missingdataline";
+        temp_state_data = np_state_read(temp_state_key3);
+        ok(temp_state_data == NULL, "Missing data line gives NULL");
+
+        unlink("var/generated");
+        temp_state_key3._filename = "var/generated";
+
+        time_t current_time = 1234567890;
+        np_state_write_string(temp_state_key3, current_time, "String to read");
+        ok(system("cmp var/generated var/statefile") == 0, "Generated file same as expected");
+
+        unlink("var/generated_directory/statefile");
+        unlink("var/generated_directory");
+        temp_state_key3._filename = "var/generated_directory/statefile";
+        current_time = 1234567890;
+        np_state_write_string(temp_state_key3, current_time, "String to read");
+        ok(system("cmp var/generated_directory/statefile var/statefile") == 0,
+           "Have created directory");
+
+        /* This test to check cannot write to dir - can't automate yet */
+        /*
+        unlink("var/generated_bad_dir");
+        mkdir("var/generated_bad_dir", S_IRUSR);
+        np_state_write_string(current_time, "String to read");
+        */
+
+        temp_state_key3._filename = "var/generated";
+        time(&current_time);
+        np_state_write_string(temp_state_key3, 0, "String to read");
+        temp_state_data = np_state_read(temp_state_key3);
+        /* Check time is set to current_time */
+        ok(system("cmp var/generated var/statefile > /dev/null") != 0,
+           "Generated file should be different this time");
+        ok(temp_state_data->time - current_time <= 1, "Has time generated from current time");
+
+        /* Don't know how to automatically test this. Need to be able to redefine die and catch the
+         * error */
+        /*
+        temp_state_key->_filename="/dev/do/not/expect/to/be/able/to/write";
+        np_state_write_string(0, "Bad file");
+        */
+
+        np_cleanup();
+}
diff --git a/plugins/tests/test_check_snmp.t b/plugins/tests/test_check_snmp.t
new file mode 100755
index 00000000..967633e9
--- /dev/null
+++ b/plugins/tests/test_check_snmp.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_check_snmp") {
+        plan skip_all => "./test_check_snmp not compiled - please enable libtap library to test";
+}
+exec "./test_check_snmp";
diff --git a/plugins/tests/test_check_swap.c b/plugins/tests/test_check_swap.c
index b85fb4ad..94d56ce7 100644
--- a/plugins/tests/test_check_swap.c
+++ b/plugins/tests/test_check_swap.c
@@ -5,9 +5,7 @@
 int verbose = 0;
 
 void print_usage(void) {}
-void print_help(swap_config config) {
-        (void) config;
-}
+void print_help(swap_config config) { (void)config; }
 
 const char *progname = "test_check_swap";
 
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 1aa4e425..a8590fae 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -53,8 +53,10 @@ int main(int argc, char **argv) {
 
         int c;
         int option = 0;
-        static struct option longopts[] = {
-                {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, {"url", required_argument, 0, 'u'}, {0, 0, 0, 0}};
+        static struct option longopts[] = {{"help", no_argument, 0, 'h'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"url", required_argument, 0, 'u'},
+                                                                           {0, 0, 0, 0}};
 
         setlocale(LC_ALL, "");
         bindtextdomain(PACKAGE, LOCALEDIR);
@@ -69,8 +71,9 @@ int main(int argc, char **argv) {
         while (1) {
                 c = getopt_long(argc, argv, "+hVu:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (c == -1 || c == EOF) {
                         break;
+                }
 
                 switch (c) {
                 case 'h': /* help */
@@ -90,8 +93,9 @@ int main(int argc, char **argv) {
                 }
         }
 
-        if (url == NULL)
+        if (url == NULL) {
                 url = strdup(argv[optind++]);
+        }
 
         cmd = strdup(argv[optind++]);
         for (c = optind; c < argc; c++) {
@@ -118,27 +122,32 @@ int main(int argc, char **argv) {
                 strcat(tstr, buf);
         }
 
-        if (!found)
-                die(STATE_UNKNOWN, _("%s UNKNOWN - No data received from host\nCMD: %s</A>\n"), argv[0], cmd);
+        if (!found) {
+                die(STATE_UNKNOWN, _("%s UNKNOWN - No data received from host\nCMD: %s</A>\n"), argv[0],
+                        cmd);
+        }
 
         /* chop the newline character */
-        if ((nstr = strchr(tstr, NEWLINE_CHARACTER)) != NULL)
+        if ((nstr = strchr(tstr, NEWLINE_CHARACTER)) != NULL) {
                 *nstr = '\0';
+        }
 
         /* tokenize the string for Perfdata if there is some */
         nstr = strtok(tstr, PERF_CHARACTER);
         printf("%s", nstr);
         printf("</A>");
         nstr = strtok(NULL, PERF_CHARACTER);
-        if (nstr != NULL)
+        if (nstr != NULL) {
                 printf(" | %s", nstr);
+        }
 
         /* close the pipe */
         result = spclose(child_process);
 
         /* WARNING if output found on stderr */
-        if (fgets(buf, MAX_INPUT_BUFFER - 1, child_stderr))
+        if (fgets(buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
                 result = max_state(result, STATE_WARNING);
+        }
 
         /* close stderr */
         (void)fclose(child_stderr);
@@ -153,8 +162,10 @@ void print_help(void) {
         printf(COPYRIGHT, copyright, email);
 
         printf("%s\n", _("This plugin wraps the text output of another command (plugin) in HTML <A>"));
-        printf("%s\n", _("tags, thus displaying the child plugin's output as a clickable link in compatible"));
-        printf("%s\n", _("monitoring status screen. This plugin returns the status of the invoked plugin."));
+        printf("%s\n",
+                   _("tags, thus displaying the child plugin's output as a clickable link in compatible"));
+        printf("%s\n",
+                   _("monitoring status screen. This plugin returns the status of the invoked plugin."));
 
         printf("\n\n");
 
@@ -164,7 +175,8 @@ void print_help(void) {
 
         printf("\n");
         printf("%s\n", _("Examples:"));
-        printf("%s\n", _("Pay close attention to quoting to ensure that the shell passes the expected"));
+        printf("%s\n",
+                   _("Pay close attention to quoting to ensure that the shell passes the expected"));
         printf("%s\n\n", _("data to the plugin. For example, in:"));
         printf(" %s\n\n", _("urlize http://example.com/ check_http -H example.com -r 'two words'"));
         printf("    %s\n", _("the shell will remove the single quotes and urlize will see:"));
diff --git a/plugins/utils.c b/plugins/utils.c
index 34335c89..41fe5fcf 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -285,7 +285,8 @@ double delta_time(struct timeval tv) {
         struct timeval now;
 
         gettimeofday(&now, NULL);
-        return ((double)(now.tv_sec - tv.tv_sec) + (double)(now.tv_usec - tv.tv_usec) / (double)1000000);
+        return ((double)(now.tv_sec - tv.tv_sec) +
+                        (double)(now.tv_usec - tv.tv_usec) / (double)1000000);
 }
 
 long deltime(struct timeval tv) {
@@ -507,8 +508,8 @@ int xasprintf(char **strp, const char *fmt, ...) {
  *
  ******************************************************************************/
 
-char *perfdata(const char *label, long int val, const char *uom, bool warnp, long int warn, bool critp, long int crit, bool minp,
-                           long int minv, bool maxp, long int maxv) {
+char *perfdata(const char *label, long int val, const char *uom, bool warnp, long int warn,
+                           bool critp, long int crit, bool minp, long int minv, bool maxp, long int maxv) {
         char *data = NULL;
 
         if (strpbrk(label, "'= ")) {
@@ -542,10 +543,11 @@ char *perfdata(const char *label, long int val, const char *uom, bool warnp, lon
         return data;
 }
 
-char *perfdata_uint64(const char *label, uint64_t val, const char *uom, bool warnp, /* Warning present */
-                                          uint64_t warn, bool critp,                                    /* Critical present */
-                                          uint64_t crit, bool minp,                                     /* Minimum present */
-                                          uint64_t minv, bool maxp,                                     /* Maximum present */
+char *perfdata_uint64(const char *label, uint64_t val, const char *uom,
+                                          bool warnp,                /* Warning present */
+                                          uint64_t warn, bool critp, /* Critical present */
+                                          uint64_t crit, bool minp,  /* Minimum present */
+                                          uint64_t minv, bool maxp,  /* Maximum present */
                                           uint64_t maxv) {
         char *data = NULL;
 
@@ -580,10 +582,11 @@ char *perfdata_uint64(const char *label, uint64_t val, const char *uom, bool war
         return data;
 }
 
-char *perfdata_int64(const char *label, int64_t val, const char *uom, bool warnp, /* Warning present */
-                                         int64_t warn, bool critp,                                    /* Critical present */
-                                         int64_t crit, bool minp,                                     /* Minimum present */
-                                         int64_t minv, bool maxp,                                     /* Maximum present */
+char *perfdata_int64(const char *label, int64_t val, const char *uom,
+                                         bool warnp,               /* Warning present */
+                                         int64_t warn, bool critp, /* Critical present */
+                                         int64_t crit, bool minp,  /* Minimum present */
+                                         int64_t minv, bool maxp,  /* Maximum present */
                                          int64_t maxv) {
         char *data = NULL;
 
@@ -618,8 +621,8 @@ char *perfdata_int64(const char *label, int64_t val, const char *uom, bool warnp
         return data;
 }
 
-char *fperfdata(const char *label, double val, const char *uom, bool warnp, double warn, bool critp, double crit, bool minp, double minv,
-                                bool maxp, double maxv) {
+char *fperfdata(const char *label, double val, const char *uom, bool warnp, double warn, bool critp,
+                                double crit, bool minp, double minv, bool maxp, double maxv) {
         char *data = NULL;
 
         if (strpbrk(label, "'= ")) {
@@ -655,7 +658,8 @@ char *fperfdata(const char *label, double val, const char *uom, bool warnp, doub
         return data;
 }
 
-char *sperfdata(const char *label, double val, const char *uom, char *warn, char *crit, bool minp, double minv, bool maxp, double maxv) {
+char *sperfdata(const char *label, double val, const char *uom, char *warn, char *crit, bool minp,
+                                double minv, bool maxp, double maxv) {
         char *data = NULL;
         if (strpbrk(label, "'= ")) {
                 xasprintf(&data, "'%s'=", label);
@@ -690,7 +694,8 @@ char *sperfdata(const char *label, double val, const char *uom, char *warn, char
         return data;
 }
 
-char *sperfdata_int(const char *label, int val, const char *uom, char *warn, char *crit, bool minp, int minv, bool maxp, int maxv) {
+char *sperfdata_int(const char *label, int val, const char *uom, char *warn, char *crit, bool minp,
+                                        int minv, bool maxp, int maxv) {
         char *data = NULL;
         if (strpbrk(label, "'= ")) {
                 xasprintf(&data, "'%s'=", label);
diff --git a/plugins/utils.h b/plugins/utils.h
index 92a6c115..1f0e021b 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -76,7 +76,7 @@ char *strnl(char *);
 char *strpcpy(char *, const char *, const char *);
 char *strpcat(char *, const char *, const char *);
 int xvasprintf(char **strp, const char *fmt, va_list ap);
-int xasprintf(char **strp, const char *fmt, ...);
+int xasprintf(char **strp, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 
 void usage(const char *) __attribute__((noreturn));
 void usage2(const char *, const char *) __attribute__((noreturn));
@@ -88,13 +88,17 @@ void usage_va(const char *fmt, ...) __attribute__((noreturn));
 #define max(a, b) (((a) > (b)) ? (a) : (b))
 #define min(a, b) (((a) < (b)) ? (a) : (b))
 
-char *perfdata(const char *, long int, const char *, bool, long int, bool, long int, bool, long int, bool, long int);
+char *perfdata(const char *, long int, const char *, bool, long int, bool, long int, bool, long int,
+                           bool, long int);
 
-char *perfdata_uint64(const char *, uint64_t, const char *, bool, uint64_t, bool, uint64_t, bool, uint64_t, bool, uint64_t);
+char *perfdata_uint64(const char *, uint64_t, const char *, bool, uint64_t, bool, uint64_t, bool,
+                                          uint64_t, bool, uint64_t);
 
-char *perfdata_int64(const char *, int64_t, const char *, bool, int64_t, bool, int64_t, bool, int64_t, bool, int64_t);
+char *perfdata_int64(const char *, int64_t, const char *, bool, int64_t, bool, int64_t, bool,
+                                         int64_t, bool, int64_t);
 
-char *fperfdata(const char *, double, const char *, bool, double, bool, double, bool, double, bool, double);
+char *fperfdata(const char *, double, const char *, bool, double, bool, double, bool, double, bool,
+                                double);
 
 char *sperfdata(const char *, double, const char *, char *, char *, bool, double, bool, double);
 
@@ -104,21 +108,22 @@ char *sperfdata_int(const char *, int, const char *, char *, char *, bool, int,
    most will or should.  Therefore, for consistency, these very common
    options should have only these meanings throughout the overall suite */
 
-#define STD_LONG_OPTS                                                                                                                      \
-        {"version", no_argument, 0, 'V'}, {"verbose", no_argument, 0, 'v'}, {"help", no_argument, 0, 'h'},                                     \
-                {"timeout", required_argument, 0, 't'}, {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},           \
+#define STD_LONG_OPTS                                                                              \
+        {"version", no_argument, 0, 'V'}, {"verbose", no_argument, 0, 'v'},                            \
+                {"help", no_argument, 0, 'h'}, {"timeout", required_argument, 0, 't'},                     \
+                {"critical", required_argument, 0, 'c'}, {"warning", required_argument, 0, 'w'},           \
                 {"hostname", required_argument, 0, 'H'}
 
-#define COPYRIGHT                                                                                                                          \
+#define COPYRIGHT                                                                                  \
         "Copyright (c) %s Monitoring Plugins Development Team\n\
 \t<%s>\n\n"
 
-#define UT_HLP_VRS                                                                                                                         \
+#define UT_HLP_VRS                                                                                 \
         _("\
        %s (-h | --help) for detailed help\n\
        %s (-V | --version) for version information\n")
 
-#define UT_HELP_VRSN                                                                                                                       \
+#define UT_HELP_VRSN                                                                               \
         _("\
 \nOptions:\n\
  -h, --help\n\
@@ -126,52 +131,52 @@ char *sperfdata_int(const char *, int, const char *, char *, char *, bool, int,
  -V, --version\n\
     Print version information\n")
 
-#define UT_HOST_PORT                                                                                                                       \
+#define UT_HOST_PORT                                                                               \
         _("\
  -H, --hostname=ADDRESS\n\
     Host name, IP Address, or unix socket (must be an absolute path)\n\
  -%c, --port=INTEGER\n\
     Port number (default: %s)\n")
 
-#define UT_IPv46                                                                                                                           \
+#define UT_IPv46                                                                                   \
         _("\
  -4, --use-ipv4\n\
     Use IPv4 connection\n\
  -6, --use-ipv6\n\
     Use IPv6 connection\n")
 
-#define UT_VERBOSE                                                                                                                         \
+#define UT_VERBOSE                                                                                 \
         _("\
  -v, --verbose\n\
     Show details for command-line debugging (output may be truncated by\n\
     the monitoring system)\n")
 
-#define UT_WARN_CRIT                                                                                                                       \
+#define UT_WARN_CRIT                                                                               \
         _("\
  -w, --warning=DOUBLE\n\
     Response time to result in warning status (seconds)\n\
  -c, --critical=DOUBLE\n\
     Response time to result in critical status (seconds)\n")
 
-#define UT_WARN_CRIT_RANGE                                                                                                                 \
+#define UT_WARN_CRIT_RANGE                                                                         \
         _("\
  -w, --warning=RANGE\n\
     Warning range (format: start:end). Alert if outside this range\n\
  -c, --critical=RANGE\n\
     Critical range\n")
 
-#define UT_CONN_TIMEOUT                                                                                                                    \
+#define UT_CONN_TIMEOUT                                                                            \
         _("\
  -t, --timeout=INTEGER\n\
     Seconds before connection times out (default: %d)\n")
 
-#define UT_PLUG_TIMEOUT                                                                                                                    \
+#define UT_PLUG_TIMEOUT                                                                            \
         _("\
  -t, --timeout=INTEGER\n\
     Seconds before plugin times out (default: %d)\n")
 
 #ifdef NP_EXTRA_OPTS
-#       define UT_EXTRA_OPTS                                                                                                                  \
+#       define UT_EXTRA_OPTS                                                                          \
                 _("\
  --extra-opts=[section][@file]\n\
     Read options from an ini file. See\n\
@@ -181,25 +186,25 @@ char *sperfdata_int(const char *, int, const char *, char *, char *, bool, int,
 #       define UT_EXTRA_OPTS " \b"
 #endif
 
-#define UT_THRESHOLDS_NOTES                                                                                                                \
+#define UT_THRESHOLDS_NOTES                                                                        \
         _("\
  See:\n\
  https://www.monitoring-plugins.org/doc/guidelines.html#THRESHOLDFORMAT\n\
  for THRESHOLD format and examples.\n")
 
-#define UT_SUPPORT                                                                                                                         \
+#define UT_SUPPORT                                                                                 \
         _("\n\
 Send email to help@monitoring-plugins.org if you have questions regarding\n\
 use of this software. To submit patches or suggest improvements, send email\n\
 to devel@monitoring-plugins.org\n\n")
 
-#define UT_NOWARRANTY                                                                                                                      \
+#define UT_NOWARRANTY                                                                              \
         _("\n\
 The Monitoring Plugins come with ABSOLUTELY NO WARRANTY. You may redistribute\n\
 copies of the plugins under the terms of the GNU General Public License.\n\
 For more information about these matters, see the file named COPYING.\n")
 
-#define UT_OUTPUT_FORMAT                                                                                                                   \
+#define UT_OUTPUT_FORMAT                                                                           \
         _("\
  --output-format=OUTPUT_FORMAT\n\
     Select output format. Valid values: \"multi-line\", \"mp-test-json\"\n")
diff --git a/tap/tap.c b/tap/tap.c
index 00ceab27..fb40736f 100644
--- a/tap/tap.c
+++ b/tap/tap.c
@@ -65,7 +65,8 @@ static void _cleanup(void);
  * test_name -- the name of the test, may be NULL
  * test_comment -- a comment to print afterwards, may be NULL
  */
-unsigned int _gen_result(int ok, const char *func, char *file, unsigned int line, char *test_name, ...) {
+unsigned int _gen_result(int ok, const char *func, char *file, unsigned int line, char *test_name,
+                                                 ...) {
         va_list ap;
         char *local_test_name = NULL;
         char *c;
@@ -95,7 +96,9 @@ unsigned int _gen_result(int ok, const char *func, char *file, unsigned int line
                         }
 
                         if (name_is_digits) {
-                                diag("    You named your test '%s'.  You shouldn't use numbers for your test names.", local_test_name);
+                                diag(
+                                        "    You named your test '%s'.  You shouldn't use numbers for your test names.",
+                                        local_test_name);
                                 diag("    Very confusing.");
                         }
                 }
@@ -116,8 +119,9 @@ unsigned int _gen_result(int ok, const char *func, char *file, unsigned int line
                 if (local_test_name != NULL) {
                         flockfile(stdout);
                         for (c = local_test_name; *c != '\0'; c++) {
-                                if (*c == '#')
+                                if (*c == '#') {
                                         fputc('\\', stdout);
+                                }
                                 fputc((int)*c, stdout);
                         }
                         funlockfile(stdout);
@@ -135,14 +139,16 @@ unsigned int _gen_result(int ok, const char *func, char *file, unsigned int line
            the test failed. */
         if (todo) {
                 printf(" # TODO %s", todo_msg ? todo_msg : todo_msg_fixed);
-                if (!ok)
+                if (!ok) {
                         failures--;
+                }
         }
 
         printf("\n");
 
-        if (!ok)
+        if (!ok) {
                 diag("    Failed %stest (%s:%s() at line %d)", todo ? "(TODO) " : "", file, func, line);
+        }
 
         free(local_test_name);
 
@@ -212,8 +218,9 @@ int plan_skip_all(char *reason) {
 
         printf("1..0");
 
-        if (reason != NULL)
+        if (reason != NULL) {
                 printf(" # Skip %s", reason);
+        }
 
         printf("\n");
 
@@ -294,7 +301,8 @@ int skip(unsigned int n, char *fmt, ...) {
 
         while (n-- > 0) {
                 test_count++;
-                printf("ok %d # skip %s\n", test_count, skip_msg != NULL ? skip_msg : "libtap():malloc() failed");
+                printf("ok %d # skip %s\n", test_count,
+                           skip_msg != NULL ? skip_msg : "libtap():malloc() failed");
         }
 
         free(skip_msg);
@@ -396,8 +404,9 @@ void _cleanup(void) {
                 return;
         }
 
-        if (failures)
+        if (failures) {
                 diag("Looks like you failed %d tests of %d.", failures, test_count);
+        }
 
         UNLOCK;
 }
diff --git a/tap/tap.h b/tap/tap.h
index 5abbd76a..0c550bfd 100644
--- a/tap/tap.h
+++ b/tap/tap.h
@@ -28,45 +28,50 @@
    and requires the caller to add the final comma if they've omitted
    the optional arguments */
 #ifdef __GNUC__
-#       define ok(e, test, ...)                                                                                                               \
-                ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, test, ##__VA_ARGS__)                                                           \
+#       define ok(e, test, ...)                                                                       \
+                ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, test, ##__VA_ARGS__)                   \
                          : _gen_result(0, __func__, __FILE__, __LINE__, test, ##__VA_ARGS__))
 
-#       define ok1(e) ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
+#       define ok1(e)                                                                                 \
+                ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e)                              \
+                         : _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
 
 #       define pass(test, ...) ok(1, test, ##__VA_ARGS__);
 #       define fail(test, ...) ok(0, test, ##__VA_ARGS__);
 
-#       define skip_start(test, n, fmt, ...)                                                                                                  \
-                do {                                                                                                                               \
-                        if ((test)) {                                                                                                                  \
-                                skip(n, fmt, ##__VA_ARGS__);                                                                                               \
-                                continue;                                                                                                                  \
+#       define skip_start(test, n, fmt, ...)                                                          \
+                do {                                                                                       \
+                        if ((test)) {                                                                          \
+                                skip(n, fmt, ##__VA_ARGS__);                                                       \
+                                continue;                                                                          \
                         }
 #else /* __GNUC__ */
 /* The original tap.h used to test if __STDC_VERSION__ >= 199901L here. This
  * doesn't seem to work on HP-UX even though the code compile fine. I'm not
  * sure how to add an exception here for HP-UX so I just removed the check
  * for now */
-#       define ok(e, ...)                                                                                                                     \
-                ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, __VA_ARGS__) : _gen_result(0, __func__, __FILE__, __LINE__, __VA_ARGS__))
+#       define ok(e, ...)                                                                             \
+                ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, __VA_ARGS__)                           \
+                         : _gen_result(0, __func__, __FILE__, __LINE__, __VA_ARGS__))
 
-#       define ok1(e) ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e) : _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
+#       define ok1(e)                                                                                 \
+                ((e) ? _gen_result(1, __func__, __FILE__, __LINE__, "%s", #e)                              \
+                         : _gen_result(0, __func__, __FILE__, __LINE__, "%s", #e))
 
 #       define pass(...) ok(1, __VA_ARGS__);
 #       define fail(...) ok(0, __VA_ARGS__);
 
-#       define skip_start(test, n, ...)                                                                                                       \
-                do {                                                                                                                               \
-                        if ((test)) {                                                                                                                  \
-                                skip(n, __VA_ARGS__);                                                                                                      \
-                                continue;                                                                                                                  \
+#       define skip_start(test, n, ...)                                                               \
+                do {                                                                                       \
+                        if ((test)) {                                                                          \
+                                skip(n, __VA_ARGS__);                                                              \
+                                continue;                                                                          \
                         }
 #endif /* __GNUC__ */
 
-#define skip_end                                                                                                                           \
-        }                                                                                                                                      \
-        while (0)                                                                                                                              \
+#define skip_end                                                                                   \
+        }                                                                                              \
+        while (0)                                                                                      \
                 ;
 
 unsigned int _gen_result(int, const char *, char *, unsigned int, char *, ...);
diff --git a/tools/mini_epn.c b/tools/mini_epn.c
index 6f3c5d02..1b09f1c1 100644
--- a/tools/mini_epn.c
+++ b/tools/mini_epn.c
@@ -1,14 +1,14 @@
-/* 
+/*
  *
  *  MINI_EPN.C - Mini Embedded Perl Nagios
  *  Contributed by Stanley Hopcroft
  *  Modified by Douglas Warner
  *  Last Modified: 05/02/2002
  *
- *  This is a sample mini embedded Perl interpreter (hacked out checks.c and 
- *  perlembed) for use in testing Perl plugins. 
+ *  This is a sample mini embedded Perl interpreter (hacked out checks.c and
+ *  perlembed) for use in testing Perl plugins.
  *
- *  It can be compiled with the following command (see 'man perlembed' for 
+ *  It can be compiled with the following command (see 'man perlembed' for
  *  more info):
  *
  *  gcc -omini_epn mini_epn.c `perl -MExtUtils::Embed -e ccopts -e ldopts`
@@ -21,7 +21,6 @@
  *
  */
 
-
 #include <EXTERN.h>
 #include <perl.h>
 #include <fcntl.h>
@@ -30,7 +29,7 @@
 /* include PERL xs_init code for module and C library support */
 
 #if defined(__cplusplus)
-#define is_cplusplus
+#       define is_cplusplus
 #endif
 
 #ifdef is_cplusplus
@@ -42,22 +41,20 @@ extern "C" {
 
 #ifdef is_cplusplus
 }
-#  ifndef EXTERN_C
-#    define EXTERN_C extern "C"
-#  endif
+#       ifndef EXTERN_C
+#               define EXTERN_C extern "C"
+#       endif
 #else
-#  ifndef EXTERN_C
-#    define EXTERN_C extern
-#  endif
+#       ifndef EXTERN_C
+#               define EXTERN_C extern
+#       endif
 #endif
- 
 
 EXTERN_C void xs_init _((void));
 
-EXTERN_C void boot_DynaLoader _((CV* cv));
+EXTERN_C void boot_DynaLoader _((CV * cv));
 
-EXTERN_C void xs_init(void)
-{
+EXTERN_C void xs_init(void) {
         char *file = __FILE__;
         dXSUB_SYS;
 
@@ -65,85 +62,80 @@ EXTERN_C void xs_init(void)
         newXS("DynaLoader::boot_DynaLoader", boot_DynaLoader, file);
 }
 
-
 static PerlInterpreter *perl = NULL;
 
-
-int main(int argc, char **argv, char **env)
-{
-        char *embedding[] = { "", "p1.pl" };
+int main(int argc, char **argv, char **env) {
+        char *embedding[] = {"", "p1.pl"};
         char plugin_output[1024];
         char buffer[512];
         char tmpfname[32];
         char fname[32];
-        char *args[] = {"","0", "", "", NULL };
+        char *args[] = {"", "0", "", "", NULL};
         FILE *fp;
 
         const int command_line_size = 160;
         char command_line[command_line_size];
-        char *ap ;
+        char *ap;
         int exitstatus;
         int pclose_result;
 #ifdef THREADEDPERL
         dTHX;
 #endif
-        dSP; 
+        dSP;
 
-        if ((perl=perl_alloc())==NULL) {
-                snprintf(buffer,sizeof(buffer),"Error: Could not allocate memory for embedded Perl interpreter!\n");
-                buffer[sizeof(buffer)-1]='\x0';
+        if ((perl = perl_alloc()) == NULL) {
+                snprintf(buffer, sizeof(buffer),
+                                 "Error: Could not allocate memory for embedded Perl interpreter!\n");
+                buffer[sizeof(buffer) - 1] = '\x0';
                 printf("%s\n", buffer);
                 exit(1);
         }
         perl_construct(perl);
-        exitstatus=perl_parse(perl,xs_init,2,embedding,NULL);
+        exitstatus = perl_parse(perl, xs_init, 2, embedding, NULL);
         if (!exitstatus) {
 
-                exitstatus=perl_run(perl);
+                exitstatus = perl_run(perl);
 
-                while(printf("Enter file name: ") && fgets(command_line, command_line_size, stdin)) {
+                while (printf("Enter file name: ") && fgets(command_line, command_line_size, stdin)) {
 
                         /* call the subroutine, passing it the filename as an argument */
 
-                        command_line[strlen(command_line) -1] = '\0';
+                        command_line[strlen(command_line) - 1] = '\0';
 
-                        strncpy(fname,command_line,strcspn(command_line," "));
-                        fname[strcspn(command_line," ")] = '\x0';
-                        args[0] = fname ;
-                        args[3] = command_line + strlen(fname) + 1 ;
+                        strncpy(fname, command_line, strcspn(command_line, " "));
+                        fname[strcspn(command_line, " ")] = '\x0';
+                        args[0] = fname;
+                        args[3] = command_line + strlen(fname) + 1;
 
                         /* generate a temporary filename to which stdout can be redirected. */
-                        sprintf(tmpfname,"/tmp/embedded%d",getpid());
+                        sprintf(tmpfname, "/tmp/embedded%d", getpid());
                         args[2] = tmpfname;
 
                         /* call our perl interpreter to compile and optionally cache the command */
                         perl_call_argv("Embed::Persistent::eval_file", G_DISCARD | G_EVAL, args);
 
                         perl_call_argv("Embed::Persistent::run_package", G_DISCARD | G_EVAL, args);
-                        
+
                         /* check return status  */
-                        if(SvTRUE(ERRSV)){
-                                pclose_result=-2;
-                                printf("embedded perl ran %s with error %s\n",fname,SvPV(ERRSV,PL_na));
+                        if (SvTRUE(ERRSV)) {
+                                pclose_result = -2;
+                                printf("embedded perl ran %s with error %s\n", fname, SvPV(ERRSV, PL_na));
                         }
-                        
+
                         /* read back stdout from script */
-                        fp=fopen(tmpfname, "r");
-                        
+                        fp = fopen(tmpfname, "r");
+
                         /* default return string in case nothing was returned */
-                        strcpy(plugin_output,"(No output!)");
-                        
-                        fgets(plugin_output,sizeof(plugin_output)-1,fp);
-                        plugin_output[sizeof(plugin_output)-1]='\x0';
-                        fclose(fp);
-                        unlink(tmpfname);    
-                        printf("embedded perl plugin output was %d,%s\n",pclose_result, plugin_output);
+                        strcpy(plugin_output, "(No output!)");
 
+                        fgets(plugin_output, sizeof(plugin_output) - 1, fp);
+                        plugin_output[sizeof(plugin_output) - 1] = '\x0';
+                        fclose(fp);
+                        unlink(tmpfname);
+                        printf("embedded perl plugin output was %d,%s\n", pclose_result, plugin_output);
                 }
-
         }
 
-        
         PL_perl_destruct_level = 0;
         perl_destruct(perl);
         perl_free(perl);