595 files changed, 40421 insertions, 28185 deletions

diff --git a/.clang-format b/.clang-format
new file mode 100644
index 00000000..0ff68114
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,12 @@
+UseTab: ForContinuationAndIndentation
+IndentWidth: 4
+TabWidth: 4
+AllowShortIfStatementsOnASingleLine: false
+BreakBeforeBraces: Attach
+AlignConsecutiveMacros: true
+ColumnLimit: 100
+IndentPPDirectives: AfterHash
+SortIncludes: Never
+AllowShortEnumsOnASingleLine: false
+BinPackArguments: true
+InsertBraces: true
diff --git a/.github/NPTest.cache b/.github/NPTest.cache
index d488d1b9..6b463e74 100644
--- a/.github/NPTest.cache
+++ b/.github/NPTest.cache
@@ -38,8 +38,8 @@
   'NP_MYSQL_LOGIN_DETAILS' => '-u root -d test',
   'NP_MYSQL_SERVER' => 'localhost',
   'NP_MYSQL_SOCKET' => '/var/run/mysqld/mysqld.sock',
-  'NP_MYSQL_WITH_SLAVE' => '',
-  'NP_MYSQL_WITH_SLAVE_LOGIN' => '',
+  'NP_MYSQL_WITH_REPLICA' => '',
+  'NP_MYSQL_WITH_REPLICA_LOGIN' => '',
   'NP_NO_NTP_SERVICE' => 'localhost',
   'NP_PORT_TCP_PROXY' => '3128',
   'NP_SMB_SHARE' => '',
diff --git a/.github/mock.sh b/.github/mock.sh
index 7fbe6903..8f84756c 100755
--- a/.github/mock.sh
+++ b/.github/mock.sh
@@ -2,6 +2,8 @@
 
 set -x
 
+set -euo pipefail
+
 export DEBIAN_FRONTEND=noninteractive
 
 BASE_PATH="/src"
@@ -18,7 +20,11 @@ SPEC_FILE="${SPEC_DIR}monitoring-plugins.spec"
 cd ${BASE_PATH}
 
 dnf -y --setopt="tsflags=nodocs" update && \
-  if [ ${distro_id} != "fedora" ]; then dnf -y --setopt="tsflags=nodocs" install epel-release; else platform_id="$(echo ${platform_id} | sed s/^f/fc/)"; fi && \
+  if [ "${distro_id}" != "fedora" ]; then
+     dnf -y --setopt="tsflags=nodocs" install epel-release;
+  else
+    platform_id="$(echo "${platform_id}" | sed s/^f/fc/)";
+  fi && \
   case ${distro_id} in
     ol)
       case ${platform_id} in
@@ -32,19 +38,30 @@ dnf -y --setopt="tsflags=nodocs" update && \
       ;;
   esac
   dnf -y --setopt="tsflags=nodocs" install mock rpm-build git-core && \
-  usermod -a -G mock $(whoami)
+  usermod -a -G mock "$(whoami)"
+
 SRC_RPM="monitoring-plugins-*-1.${platform_id}.src.rpm"
+
 if command -v git > /dev/null 2>&1; then
   git config --global --add safe.directory ${BASE_PATH}
   SHA="$(git rev-parse HEAD)"
   sed "s/^%global commit.*/%global commit ${SHA}/" ${SPEC_FILE} > ${SPEC_DIR}monitoring-plugins-git.spec
   sed -i "s/^%global fromgit.*/%global fromgit 1/" ${SPEC_DIR}monitoring-plugins-git.spec
   SPEC_FILE="${SPEC_DIR}monitoring-plugins-git.spec"
-  SRC_RPM="monitoring-plugins-*git.$(echo ${SHA:0:7})*.${platform_id}.src.rpm"
+  SRC_RPM="monitoring-plugins-*git.${SHA:0:7}*.${platform_id}.src.rpm"
 fi
+
 mkdir -p "${SRCRPM_DIR}" "${RPM_DIR}"
-#rpmbuild --undefine=_disable_source_fetch --define "_sourcedir ${SOURCE_DIR}" -ba ${SPEC_FILE}
-dnf -y --setopt="tsflags=nodocs" install rpmdevtools && spectool -g -C ${SOURCE_DIR} ${SPEC_FILE} && \
-mock --dnf --clean --spec ${SPEC_FILE} --sources=${SOURCE_DIR} --result=${SRCRPM_DIR} --build || { cat ${SRCRPM_DIR}/{root,build}.log; exit 1; }
-mock --dnf --clean --sources=${SOURCE_DIR} --result=${RPM_DIR} --rebuild ${SRCRPM_DIR}/${SRC_RPM} || { cat ${RPM_DIR}/{root,build}.log; exit 1; }
+
+# Run mock below
+# No idea what happens here to be honest
+# mock seems to run more containers to build the package
+dnf -y --setopt="tsflags=nodocs" install rpmdevtools && \
+  spectool -g -C ${SOURCE_DIR} ${SPEC_FILE} && \
+  mock --init && \
+  { mock --no-clean --spec ${SPEC_FILE} --sources=${SOURCE_DIR} --result=${SRCRPM_DIR} --buildsrpm || \
+  { cat ${SRCRPM_DIR}/{root,build}.log; exit 1; } } && \
+  { mock --no-clean --sources=${SOURCE_DIR} --result=${RPM_DIR} --rebuild "${SRCRPM_DIR}"/${SRC_RPM} || \
+  { cat ${RPM_DIR}/{root,build}.log; exit 1; } }
+
 ls -la ${SOURCE_DIR} ${SRCRPM_DIR} ${RPM_DIR}
diff --git a/.github/monitoring-plugins.spec b/.github/monitoring-plugins.spec
index 5cae3e59..10799128 100644
--- a/.github/monitoring-plugins.spec
+++ b/.github/monitoring-plugins.spec
@@ -191,9 +191,7 @@ Requires: %{name}-nt
 Requires: %{name}-ntp
 Requires: %{name}-ntp_peer
 Requires: %{name}-ntp_time
-Requires: %{name}-nwstat
 Requires: %{name}-oracle
-Requires: %{name}-overcr
 Requires: %{name}-pgsql
 Requires: %{name}-ping
 Requires: %{name}-procs
@@ -703,19 +701,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
@@ -729,19 +714,6 @@ Provides check_oracle of the Monitoring Plugins.
 
 
 
-# check_overcr
-%package overcr
-Summary:  Monitoring Plugins - check_overcr
-Requires: %{name} = %{version}-%{release}
-
-%description overcr
-Provides check_overcr of the Monitoring Plugins.
-
-%files overcr
-%{plugindir}/check_overcr
-
-
-
 # check_pgsql
 %package pgsql
 Summary:  Monitoring Plugins - check_pgsql
diff --git a/.github/os_detect.sh b/.github/os_detect.sh
index ee9c145d..47c762d3 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"
diff --git a/.github/prepare_debian.sh b/.github/prepare_debian.sh
index 3f4674a2..f7b6cf9f 100755
--- a/.github/prepare_debian.sh
+++ b/.github/prepare_debian.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -x
-set -e
+set -euo pipefail
 
 export DEBIAN_FRONTEND=noninteractive
 
@@ -59,9 +59,11 @@ apt-get -y install perl \
         mariadb-server \
         mariadb-client \
         libmariadb-dev \
+        libmariadb-dev-compat \
         cron \
         iputils-ping \
-        iproute2
+        iproute2 \
+        libjson-perl
 
 # remove ipv6 interface from hosts
 sed '/^::1/d' /etc/hosts > /tmp/hosts
@@ -127,5 +129,5 @@ sed "/NP_HOST_TLS_CERT/s/.*/'NP_HOST_TLS_CERT' => '$(hostname)',/" -i /src/.gith
 
 # create some test files to lower inodes
 for i in $(seq 10); do
-    touch /media/ramdisk2/test.$1
+    touch /media/ramdisk2/test.$i
 done
diff --git a/.github/workflows/test-next.yml b/.github/workflows/test-next.yml
new file mode 100644
index 00000000..fd59e85d
--- /dev/null
+++ b/.github/workflows/test-next.yml
@@ -0,0 +1,78 @@
+---
+name: Tests Debian:Testing and Fedora:Rawhide
+
+on:
+  workflow_dispatch: {}
+  push:
+    branches-ignore:
+      - '*'
+  schedule:
+    # Run every week on Monday at 9:00 AM (UTC)
+    - cron: '0 9 * * 1'
+
+jobs:
+  full-test:
+    name: Running unit and integrationt tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        distro:
+          - 'debian:testing'
+        include:
+          - distro: 'debian:testing'
+            prepare: .github/prepare_debian.sh
+    steps:
+      - name: Git clone repository
+        uses: actions/checkout@v4
+      - 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
+          docker run \
+              -e NPTEST_ACCEPTDEFAULT=1 \
+              -e NPTEST_CACHE="/src/.github/NPTest.cache" \
+              -w /src -v ${PWD}:/src \
+              --tmpfs /media/ramdisk1 \
+              -v /var/run/utmp:/var/run/utmp \
+              --mount source=tmp-vol,destination=/src,target=/media/ramdisk2 \
+              ${{ matrix.distro }} \
+              /bin/sh -c '${{ matrix.prepare }} && \
+                tools/setup && \
+                ./configure --enable-libtap && \
+                make && \
+                make test && \
+                make dist && \
+                tar zxf monitoring-plugins-*.tar.gz && \
+                cd monitoring-plugins-*/ && \
+                ./configure && \
+                make'
+          docker container prune -f
+          docker volume prune -f
+
+  build-test:
+    name: Running rpm build test on ${{ matrix.distro }}
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - {"distro": "fedora:rawhide", "build": ".github/mock.sh"}
+    steps:
+      - name: Git clone repository
+        uses: actions/checkout@v4
+      - 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
+          docker run \
+              --privileged=true \
+              -e NPTEST_ACCEPTDEFAULT=1 \
+              -e NPTEST_CACHE="/src/.github/NPTest.cache" \
+              -w /src -v ${PWD}:/src \
+              --tmpfs /media/ramdisk1 \
+              -v /var/run/utmp:/var/run/utmp \
+              --mount source=tmp-vol,destination=/src,target=/media/ramdisk2 \
+              ${{ matrix.distro }} \
+              /bin/sh -c '${{ matrix.build }} && \
+                ls -la'
+          docker container prune -f
+          docker volume prune -f
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 33220d6d..ce0ec547 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -35,7 +35,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 && \
@@ -54,7 +54,6 @@ jobs:
       matrix:
         include:
           - {"distro": "fedora:latest", "build": ".github/mock.sh"}
-          - {"distro": "fedora:rawhide", "build": ".github/mock.sh"}
           - {"distro": "rockylinux:8", "build": ".github/mock.sh"}
           - {"distro": "almalinux:9", "build": ".github/mock.sh"}
 #          - {"distro": "oraclelinux:9", "build": ".github/mock.sh"}
diff --git a/.gitignore b/.gitignore
index 6f903d61..8b14f429 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,7 @@ NP-VERSION-FILE
 /gl/charset.alias
 /gl/configmake.h
 /gl/errno.h
+/gl/error.h
 /gl/fcntl.h
 /gl/float.h
 /gl/getopt.h
@@ -102,6 +103,8 @@ NP-VERSION-FILE
 /lib/libmonitoringplug.a
 /lib/Makefile
 /lib/Makefile.in
+/lib/vendor/cJSON/.deps
+/lib/vendor/cJSON/.dirstamp
 
 # /lib/tests/
 /lib/tests/base64.Po
@@ -111,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
@@ -150,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
@@ -174,8 +178,6 @@ NP-VERSION-FILE
 /plugins/check_ntp
 /plugins/check_ntp_peer
 /plugins/check_ntp_time
-/plugins/check_nwstat
-/plugins/check_overcr
 /plugins/check_pgsql
 /plugins/check_ping
 /plugins/check_pop
@@ -220,8 +222,14 @@ 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
+
+# /plugins/check_swap.d
+/plugins/check_swap.d/.deps
+/plugins/check_swap.d/.dirstamp
 
 # /plugins-root/
 /plugins-root/.deps
diff --git a/CODING b/CODING
index 74438e7c..d0673e7e 100644
--- a/CODING
+++ b/CODING
@@ -7,33 +7,20 @@ readability in a wide range of environments.
 
 1. C Language Programming
 
-All code should comply with the requirements of the Free Software
+All code should comply with most of the requirements of the Free Software
 Foundation Coding standards (which are currently available at
-http://www.gnu.org/prep/standards_toc.html). We also follow most of
-the FSF guidelines. Developers may suggest deviations from the FSF
+https://www.gnu.org/prep/standards/standards.html ).
+We also follow most of the FSF guidelines, with the huge and explicit
+exception of the style guidelines.
+Developers may suggest deviations from the FSF
 style recommendations, which will be considered by open discussion on
-the Monitoring Plugins devel mailing list. Any such deviations will
-apply to the entire code base to ensure consistency.
-
-Currently, the exceptions to FSF recommendations are roughly equivalent
-to GNU indent with invoked as 'indent -ts 2 -br'. Specifically, the
-exceptions are as follows:
-
-a) leading white space for a statement should be formatted as tabs,
-with one tab for each code indentation level.
-
-b) in statement continuation lines, format whitespace up to the column
-starting the statement as tabs, format the rest as spaces (this
-results in code that is legible regardless of tab-width setting).
-
-c) with the exception of the above, tabs should generally be avoided
-
-d) when tab width is 2 spaces, line-length should not exceed 80
-characters
-
-e) The opening brace of an if or while block is on the same line as
-the end of the conditional expression (the '-br' option).
+the Monitoring Plugins devel mailing list or the Github Pull Request.
+Any such deviations should be
+applied to the entire code base to ensure consistency.
 
+The style guideline is the following:
+Whatever clang-format does with the configuration file available (.clang-format)
+Apart from that, code should naturally be readable and easy to understand.
 
 2. Perl Language Programming
 
diff --git a/Makefile.am b/Makefile.am
index 5959f70f..f8e3de45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,8 +7,7 @@ EXTRA_DIST = config.rpath \
         NP-VERSION-GEN REQUIREMENTS SUPPORT THANKS \
         NPTest.pm pkg \
         config_test/Makefile config_test/run_tests config_test/child_test.c \
-        perlmods tools/build_perl_modules \
-        tools/tinderbox_build
+        perlmods tools/build_perl_modules
 
 ACLOCAL_AMFLAGS = -I gl/m4 -I m4
 
diff --git a/NPTest.pm b/NPTest.pm
index 9b25ac3e..1c008589 100644
--- a/NPTest.pm
+++ b/NPTest.pm
@@ -15,6 +15,8 @@ use warnings;
 use Cwd;
 use File::Basename;
 
+use JSON;
+
 use IO::File;
 use Data::Dumper;
 
@@ -617,6 +619,8 @@ sub testCmd {
     chomp $output;
     $object->output($output);
 
+    eval { $object->{'mp_test_result'} = decode_json($output) };
+
     alarm(0);
 
     my ($pkg, $file, $line) = caller(0);
diff --git a/REQUIREMENTS b/REQUIREMENTS
index f3b1c01d..551fdb1a 100644
--- a/REQUIREMENTS
+++ b/REQUIREMENTS
@@ -87,10 +87,6 @@ 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/
diff --git a/ROADMAP b/ROADMAP
deleted file mode 100644
index 6378ec74..00000000
--- a/ROADMAP
+++ /dev/null
@@ -1,117 +0,0 @@
-
-Releases in the 1.3 series will be for development. Version 1.4.0 will
-be the next full production release. I am not planning on dates right now, 
-but you can expect maintennence releases for 1.2.9 as well.
-
-With that done, it's time to figure out what we are doing for release 
-1.3 development. I have a few ideas. Maybe others do as well.
-
-DOCUMENTATION:
-  We pretty much have decided that we will doing something along 
-  the lines of a literate programming model. So far, we have site 
-  documentation in DocBook. I have some ideas here, which I will
-  discuss in a separate thread.
-
-
-
-OPTION PROCESSING:
-  I believe we can remove reverse compatibility for non-Getopt
-  option specifications. For example, 'check_ping 1 2 3 4 -p 2'
-  would not be supported anymore. Support for this is a hack, 
-  and making it portable is bug-prone. We should also review
-  standardization of our options -- the current list is a little
-  ad hoc, it should be nailed down. Details in a separate thread.
-
-Also, 
-
-  check_http -p 443 --ssl www.infoplease.com
-
-should be fine, but if the getopt in use does not natively support it,
-things like
-
-  check_http www.infoplease.com -p 443 --ssl
-
-should be trapped and result in a call to one of the usage macros
-(which print a message and then exit STATE_UNKNOWN).
-
-This means that the call_getopt() function can go away. It's an
-inconsistent mess and I'd love to ditch it. I only created it to
-satisfy people that wanted reverse compatibility and did not have
-GNU getopt.
-
-But I would like to urge that all standard plugins contain
-validate_arguments(). I think this will help convey the idea that
-validations should be done, even if we don't insist on the specific
-extent that each plugin must do that validation.
-
-This is the set of standard options I envision:
-
-Reserved:
-
--h, --help (REQUIRED!!!!!)
--V, --version (REQUIRED!!!!!)
--v, --verbose
--q, --quiet
--t, --timeout = INTEGER (senonds)
--c, --critical = (INT|FLOAT|RANGE|LIST) 
--w, --warning = (INT|FLOAT|RANGE|LIST)
--H, --hostname = STRING
--F, --file = STRING (usually input) 
--O, --output = STRING (output file) 
-
-Recommended, but not reserved: 
-
--I, --ipaddress = STRING
--C, --community = STRING
--a, --auth(info) = STRING (authentication or password) 
--l, --logname = STRING
--p, --password = STRING
--P, --port = INT
--u, --url = STRING (also --username if --url is not needed)
-
-I am suggesting that port always be '-P' (uppercase) -- we are
-currently inconsistent in that regard.
-
-I am also adding '-q' for silent running. This is totally self
-centered--I am planning to use a plugin in a cron script, and I
-don't want nightly emails.
-
-As has been the case, ranges are specified with colons, like 'i:j'
-and list are specified with commas like 'i,k' and may contain ranges
-if it makes sense to do so. Perhaps it would be good to build a
-standard list/range processing function for this task.
-
-
-Programming:
-  I would like to follow the GNU guidelines and remove all fixed
-  length character assignments, at least to the extent possible,
-  from the C-based plugins. To that end, I have made strscpy and
-  friends in utils.c -- I'd like to deploy them. I have comments 
-  that there is a lot of duplicated code, and techniques used that
-  should be cleaned up. Details in a separate thread.
-
-Remote checks:
-  I have a proposal in hand to incorporate ssh check into spopen()
-  so that remote machine checks can be seamless. A nice idea, but 
-  complex enough to require discussion. Another thread.
-
-I also have a wish list, and I'm sure I've forgot some items. I'll 
-list mine, please respond with other items that can be put into the 
-sourceforge task manager:
-
-  Indent all code in a GNU-compatible manner (indent -ts 2 -br)
-  Add RAND_seed to check_http for --ssl on systems without /dev/random
-  Add regex filtering to check_procs --args option
-  Add working procs syntax for AIX check_procs
-  Allow check_disk to exclude non-local disks
-  Add md5 checksumming to check_http
-  Complete unification of check_tcp and friends
-  Add SSL in a general way to check_tcp and friends
-  Patches to check_log from Joonas
-  Add calculator engine and snmpwalk to check_snmp
-  Is there a bug in check_oracle
-  Are there outstanding bugs in check_snmp
-  Change check_http --onredirect to default as STATE_UNKNOWN
-  Create plugin to check tftp servers
-  Create plugin wrapper to invert error status
-
diff --git a/SUPPORT b/SUPPORT
index d2a2b7de..d98c6c16 100644
--- a/SUPPORT
+++ b/SUPPORT
@@ -8,7 +8,7 @@ support offerings.
 
 There are two mailing lists associated with Monitoring Plugins development:
 'help' (mailto:help@monitoring-plugins.org), and 'devel'
-(mailto:help@monitoring-plugins.org). Unless you are fairly
+(mailto:devel@monitoring-plugins.org). Unless you are fairly
 certain you have found a bug or that you are requesting a new feature,
 please direct support requests to 'help'.
 
diff --git a/configure.ac b/configure.ac
index 8594238f..ce140218 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.64)
-AC_INIT(monitoring-plugins,2.4git)
+AC_PREREQ([2.64])
+AC_INIT([monitoring-plugins],[2.4git])
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile])
 AC_CONFIG_AUX_DIR(build-aux)
-AM_INIT_AUTOMAKE([1.8.3])
+AM_INIT_AUTOMAKE([1.8.3 subdir-objects])
 AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_HEADERS([config.h])
@@ -43,14 +43,14 @@ AC_SUBST(INSTALL)
 AC_PROG_CC
 gl_EARLY
 AC_PROG_GCC_TRADITIONAL
-AC_PROG_LIBTOOL
+LT_INIT
 
 AM_PROG_CC_C_O
 
 AC_FUNC_ERROR_AT_LINE
 AC_SYS_LARGEFILE
 
-ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AM_FUNC_STRTOD])
+ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AC_FUNC_STRTOD])
 
 PLUGIN_TEST=`echo $srcdir/plugins/t/*.t|sed -e 's,\.*/plugins/,,g'`
 AC_SUBST(PLUGIN_TEST)dnl
@@ -125,8 +125,7 @@ AC_SUBST(PERL, $with_perl)
 
 dnl openssl/gnutls
 AC_ARG_WITH(openssl,
-            AC_HELP_STRING([--with-openssl=DIR],
-                           [path to openssl installation]),)
+            AS_HELP_STRING([--with-openssl=DIR],[path to openssl installation]),)
 
 AC_ARG_WITH(gnutls,
             ACX_HELP_STRING([--with-gnutls=PATH],
@@ -167,8 +166,7 @@ AC_SUBST(MATHLIBS)
 
 dnl Check if we buils local libtap
 AC_ARG_ENABLE(libtap,
-  AC_HELP_STRING([--enable-libtap],
-                [Enable built-in libtap for unit-testing (default: autodetect system library).]),
+  AS_HELP_STRING([--enable-libtap],[Enable built-in libtap for unit-testing (default: autodetect system library).]),
         [enable_libtap=$enableval],
         [enable_libtap=no])
 AM_CONDITIONAL([USE_LIBTAP_LOCAL],[test "$enable_libtap" = "yes"])
@@ -183,14 +181,16 @@ 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 tests/test_check_disk"
+        AC_SUBST(EXTRA_PLUGIN_TESTS)
 fi
 
 dnl INI Parsing
 AC_ARG_ENABLE(extra-opts,
-  AC_HELP_STRING([--enable-extra-opts],
-                [Enables parsing of plugins ini config files for extra options (default: no)]),
+  AS_HELP_STRING([--enable-extra-opts],[Enables parsing of plugins ini config files for extra options (default: no)]),
         [enable_extra_opts=$enableval],
         [enable_extra_opts=yes])
 AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
@@ -464,20 +464,16 @@ AC_ARG_WITH([ipv6],
 dnl Check for AF_INET6 support - unistd.h required for Darwin
 if test "$with_ipv6" != "no"; then
         AC_CACHE_CHECK([for IPv6 support], np_cv_sys_ipv6, [
-                AC_TRY_COMPILE(
-                        [#ifdef HAVE_UNISTD_H
+                AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#ifdef HAVE_UNISTD_H
                         #include <unistd.h>
                         #endif
                         #include <netinet/in.h>
-                        #include <sys/socket.h>],
-                        [struct sockaddr_in6 sin6;
+                        #include <sys/socket.h>]], [[struct sockaddr_in6 sin6;
                         void *p;
 
                         sin6.sin6_family = AF_INET6;
                         sin6.sin6_port = 587;
-                        p = &sin6.sin6_addr;],
-                        [np_cv_sys_ipv6=yes],
-                        [np_cv_sys_ipv6=no])
+                        p = &sin6.sin6_addr;]])],[np_cv_sys_ipv6=yes],[np_cv_sys_ipv6=no])
                 ])
         if test "$np_cv_sys_ipv6" = "no" -a "$with_ipv6" != "check"; then
                 AC_MSG_FAILURE([--with-ipv6 was given, but test for IPv6 support failed])
@@ -611,10 +607,10 @@ dnl
 dnl Checks for header files.
 dnl
 
-AC_HEADER_TIME
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(signal.h syslog.h uio.h errno.h sys/time.h sys/socket.h sys/un.h sys/poll.h)
 AC_CHECK_HEADERS(features.h stdarg.h sys/unistd.h ctype.h)
+AC_CHECK_HEADERS_ONCE([sys/time.h])
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -623,36 +619,27 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 
 AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[
-AC_TRY_LINK([#include <stdarg.h>
-va_list ap1,ap2;], [va_copy(ap1,ap2);],
-ac_cv_HAVE_VA_COPY=yes,
-ac_cv_HAVE_VA_COPY=no)])
+AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+va_list ap1,ap2;]], [[va_copy(ap1,ap2);]])],[ac_cv_HAVE_VA_COPY=yes],[ac_cv_HAVE_VA_COPY=no])])
 if test x"$ac_cv_HAVE_VA_COPY" = x"yes"; then
     AC_DEFINE(HAVE_VA_COPY,1,[Whether va_copy() is available])
 else
     AC_CACHE_CHECK([for __va_copy],ac_cv_HAVE___VA_COPY,[
-    AC_TRY_LINK([#include <stdarg.h>
-    va_list ap1,ap2;], [__va_copy(ap1,ap2);],
-    ac_cv_HAVE___VA_COPY=yes,
-    ac_cv_HAVE___VA_COPY=no)])
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+    va_list ap1,ap2;]], [[__va_copy(ap1,ap2);]])],[ac_cv_HAVE___VA_COPY=yes],[ac_cv_HAVE___VA_COPY=no])])
     if test x"$ac_cv_HAVE___VA_COPY" = x"yes"; then
         AC_DEFINE(HAVE___VA_COPY,1,[Whether __va_copy() is available])
     fi
 fi
 
-AC_TRY_COMPILE([#include <sys/time.h>],
-               [struct timeval *tv;
-                struct timezone *tz;],
-               AC_DEFINE(HAVE_STRUCT_TIMEVAL,1,[Define if we have a timeval structure])
-                           FOUND_STRUCT_TIMEVAL="yes")
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]], [[struct timeval *tv;
+                struct timezone *tz;]])],[AC_DEFINE(HAVE_STRUCT_TIMEVAL,1,Define if we have a timeval structure)
+                           FOUND_STRUCT_TIMEVAL="yes"],[])
 
 if test x"$FOUND_STRUCT_TIMEVAL" = x"yes"; then
-        AC_TRY_COMPILE([#include <sys/time.h>],
-                          [struct timeval *tv;
+        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/time.h>]], [[struct timeval *tv;
                            struct timezone *tz;
-                           gettimeofday(tv, tz);],
-                          AC_DEFINE(HAVE_GETTIMEOFDAY,1,[Define if gettimeofday is found]),
-                          AC_DEFINE(NEED_GETTIMEOFDAY,1,[Define if gettimeofday is needed]))
+                           gettimeofday(tv, tz);]])],[AC_DEFINE(HAVE_GETTIMEOFDAY,1,Define if gettimeofday is found)],[AC_DEFINE(NEED_GETTIMEOFDAY,1,Define if gettimeofday is needed)])
 fi
 
 dnl Checks for library functions.
@@ -660,14 +647,11 @@ AC_CHECK_FUNCS(memmove select socket strdup strstr strtol strtoul floor)
 AC_CHECK_FUNCS(poll)
 
 AC_MSG_CHECKING(return type of socket size)
-AC_TRY_COMPILE([#include <stdlib.h>
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
                 #include <sys/types.h>
-                #include <sys/socket.h>],
-               [int a = send(1, (const void *) buffer, (size_t *) 0, (int *) 0);],
-               ac_cv_socket_size_type=["size_t"]
-                AC_MSG_RESULT(size_t),
-               ac_cv_socket_size_type=["int"]
-                AC_MSG_RESULT(int))
+                #include <sys/socket.h>]], [[int a = send(1, (const void *) buffer, (size_t *) 0, (int *) 0);]])],[ac_cv_socket_size_type="size_t"
+                AC_MSG_RESULT(size_t)],[ac_cv_socket_size_type="int"
+                AC_MSG_RESULT(int)])
 
 AC_DEFINE_UNQUOTED(SOCKET_SIZE_TYPE, $ac_cv_socket_size_type ,
         [Define type of socket size])
@@ -812,7 +796,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])
 
@@ -1430,20 +1414,14 @@ if test -n "$ac_cv_nslookup_command"; then
 fi
 
 AC_MSG_CHECKING([for number of online cpus])
-AC_TRY_COMPILE([#include <unistd.h>],
-        [sysconf(_SC_NPROCESSORS_ONLN) > 0;],
-        AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_ONLN,1,[Define if sysconf returns number of online cpus])
-        AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_ONLN)]),
-        AC_MSG_RESULT([cannot calculate])
-        )
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[sysconf(_SC_NPROCESSORS_ONLN) > 0;]])],[AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_ONLN,1,Define if sysconf returns number of online cpus)
+        AC_MSG_RESULT(sysconf(_SC_NPROCESSORS_ONLN))],[AC_MSG_RESULT(cannot calculate)
+        ])
 
 AC_MSG_CHECKING([for number of available cpus])
-AC_TRY_COMPILE([#include <unistd.h>],
-        [sysconf(_SC_NPROCESSORS_CONF) > 0;],
-        AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,[Define if sysconf returns number of available cpus])
-        AC_MSG_RESULT([sysconf(_SC_NPROCESSORS_CONF)]),
-        AC_MSG_RESULT([cannot calculate])
-        )
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]], [[sysconf(_SC_NPROCESSORS_CONF) > 0;]])],[AC_DEFINE(HAVE_SYSCONF__SC_NPROCESSORS_CONF,1,Define if sysconf returns number of available cpus)
+        AC_MSG_RESULT(sysconf(_SC_NPROCESSORS_CONF))],[AC_MSG_RESULT(cannot calculate)
+        ])
 
 AC_PATH_PROG(PATH_TO_UPTIME,uptime)
 AC_ARG_WITH(uptime_command,
@@ -1482,23 +1460,30 @@ AC_ARG_WITH(snmpget_command,
             ACX_HELP_STRING([--with-snmpget-command=PATH],
                             [Path to snmpget command]),
             PATH_TO_SNMPGET=$withval)
-if test -n "$PATH_TO_SNMPGET"
-then
-        AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
-        EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
-else
-        AC_MSG_WARN([Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins])
-fi
 
 AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext)
 AC_ARG_WITH(snmpgetnext_command,
             ACX_HELP_STRING([--with-snmpgetnext-command=PATH],
                             [Path to snmpgetnext command]),
             PATH_TO_SNMPGETNEXT=$withval)
-if test -n "$PATH_TO_SNMPGETNEXT"
-then
-        AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
-fi
+
+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])
+])
 
 if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
 then
@@ -1534,21 +1519,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])
@@ -1850,8 +1861,8 @@ AC_SUBST(EXTRAS_ROOT)
 AC_SUBST(EXTRA_NETOBJS)
 AC_SUBST(DEPLIBS)
 
-AM_GNU_GETTEXT([external], [need-ngettext])
-AM_GNU_GETTEXT_VERSION(0.15)
+dnl AM_GNU_GETTEXT([external], [need-ngettext])
+dnl AM_GNU_GETTEXT_VERSION(0.15)
 
 dnl Check for Redhat spopen problem
 dnl Weird problem where ECHILD is returned from a wait call in error
@@ -1861,8 +1872,7 @@ dnl We patch plugins/popen.c
 dnl Need to add smp because uname different on those
 dnl Can force patch to be applied with --enable-redhat-pthread-workaround
 AC_ARG_ENABLE(redhat-pthread-workaround,
-        AC_HELP_STRING([--enable-redhat-pthread-workaround],
-                [force Redhat patch to be applied (default: test system)]),
+        AS_HELP_STRING([--enable-redhat-pthread-workaround],[force Redhat patch to be applied (default: test system)]),
         [ac_cv_enable_redhat_pthread_workaround=$enableval],
         [ac_cv_enable_redhat_pthread_workaround=test])
 if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then
@@ -1883,8 +1893,7 @@ fi
 
 dnl Perl modules
 AC_ARG_ENABLE(perl-modules,
-        AC_HELP_STRING([--enable-perl-modules],
-                [Enables installation of Monitoring::Plugin and its dependencies (default: no)]),
+        AS_HELP_STRING([--enable-perl-modules],[Enables installation of Monitoring::Plugin and its dependencies (default: no)]),
         [enable_perl_modules=$enableval],
         [enable_perl_modules=no])
 if test "$enable_perl_modules" = "yes" ; then
@@ -1911,8 +1920,7 @@ if test "$ac_cv_uname_s" = 'SunOS' -a \( "x$ac_cv_prog_ac_ct_AR" = "x" -o "$ac_c
         AC_MSG_ERROR(No ar found for Solaris - is /usr/ccs/bin in PATH?)
 fi
 
-AC_OUTPUT(
-  Makefile
+AC_CONFIG_FILES([Makefile
   tap/Makefile
   lib/Makefile
   plugins/Makefile
@@ -1924,7 +1932,8 @@ AC_OUTPUT(
   perlmods/Makefile
   test.pl
   pkg/solaris/pkginfo
-)
+])
+AC_OUTPUT
 
 
 dnl the ones below that are commented out need to be cleaned up
diff --git a/doc/developer-guidelines.sgml b/doc/developer-guidelines.sgml
index 37c963ed..0afa733b 100644
--- a/doc/developer-guidelines.sgml
+++ b/doc/developer-guidelines.sgml
@@ -14,15 +14,8 @@
     <pubdate>2013</pubdate>
     <title>Monitoring Plugins Development Guidelines</title>
 
-    <revhistory>
-       <revision>
-          <revnumber>1796</revnumber>
-          <date>2007-09-24 14:51:07 -0400 (Mon, 24 Sep 2007)</date>
-       </revision>
-    </revhistory>
-
         <copyright>
-                <year>2000 - 2013</year>
+                <year>2000 - 2024</year>
                 <holder>Monitoring Plugins Development Team</holder>
         </copyright>
 
@@ -34,7 +27,7 @@
     the plugin developers and encourage the standardization of the
     different kind of plugins: C, shell, perl, python, etc.</para>
 
-        <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2013
+        <para>Monitoring Plugins Development Guidelines Copyright (C) 2000-2024
         (Monitoring Plugins Team)</para>
 
         <para>Permission is granted to make and distribute verbatim
@@ -383,13 +376,6 @@
                 <para>It is up to third party programs to convert the Monitoring Plugins
                 performance data into graphs.</para>
                 </section>
-
-        <section><title>Translations</title>
-        <para>If possible, use translation tools for all output to respect the user's language
-                settings. See <xref linkend="translationsdevelopers"> for guidelines
-                for the core plugins.
-        </para>
-        </section>
 </section>
 
 <section id="SysCmdAuxFiles"><title>System Commands and Auxiliary Files</title>
@@ -727,19 +713,18 @@ setup the tests. Run "make test" to run all the tests.
 </section>
 <section id="CodingGuidelines"><title>Coding guidelines</title>
         <para>See <ulink url="http://www.gnu.org/prep/standards_toc.html">GNU
-        Coding standards</ulink> for general guidelines.</para>
+        Coding standards</ulink> for general guidelines.
+        Some parts of the guidelines (namely and explicitly the coding style)
+        are not seen as best practice by us.</para>
         <section><title>C coding</title>
 
-        <para>Variables should be declared at the beginning of code blocks and
-        not inline because of portability with older compilers.</para>
-
         <para>You should use the type "bool" and its values
         "true" and "false" instead of the "int" type for booleans.
         </para>
         </section>
 
         <section><title>Crediting sources</title>
-        <para>If you have copied a routine from another source, make sure the licence
+        <para>If you have copied a routine from another source, make sure the license
         from your source allows this. Add a comment referencing the ACKNOWLEDGEMENTS
         file, where you can put more detail about the source.</para>
         <para>For contributed code, do not add any named credits in the source code
@@ -756,32 +741,6 @@ setup the tests. Run "make test" to run all the tests.
         <para>All commits will be written to a ChangeLog at release time.
         </para>
         </section>
-
-        <section id="translationsdevelopers"><title>Translations for developers</title>
-        <para>To make the job easier for translators, please follow these guidelines:</para>
-        <orderedlist>
-          <listitem><para>
-            Before creating new strings, check the po/monitoring-plugins.pot file to
-            see if a similar string
-            already exists
-          </para></listitem>
-          <listitem><para>
-            For help texts, break into individual options so that these can be reused
-            between plugins
-          </para></listitem>
-          <listitem><para>Try to avoid linefeeds unless you are working on a block of text</para></listitem>
-          <listitem><para>Short help is not translated</para></listitem>
-          <listitem><para>Long help has options in English language, but text translated</para></listitem>
-          <listitem><para>"Copyright" kept in English</para></listitem>
-          <listitem><para>Copyright holder names kept in original text</para></listitem>
-          <listitem><para>Debugging output does not need to be translated</para></listitem>
-        </orderedlist>
-        </section>
-
-        <section><title>Translations for translators</title>
-        <para>To create an up to date list of translatable strings, run: tools/gen_locale.sh</para>
-        </section>
-
 </section>
 
 <section id="SubmittingChanges"><title>Submission of new plugins and patches</title>
diff --git a/gl/Makefile.am b/gl/Makefile.am
index dcebd4aa..df988b37 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-2023 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 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
@@ -62,6 +62,7 @@ SUBDIRS =
 noinst_HEADERS =
 noinst_LIBRARIES =
 noinst_LTLIBRARIES =
+pkgdata_DATA =
 EXTRA_DIST =
 BUILT_SOURCES =
 SUFFIXES =
@@ -350,10 +351,32 @@ if GL_COND_OBJ_ERROR
 libgnu_a_SOURCES += error.c
 endif
 
-EXTRA_DIST += error.h
-
 ## end   gnulib module error
 
+## begin gnulib module error-h
+
+BUILT_SOURCES += error.h
+
+# We need the following in order to override <error.h>.
+error.h: error.in.h $(top_builddir)/config.status $(CXXDEFS_H)
+        $(gl_V_at)$(SED_HEADER_STDOUT) \
+              -e 's|@''GUARD_PREFIX''@|GL|g' \
+              -e 's|@''HAVE_ERROR_H''@|$(HAVE_ERROR_H)|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''NEXT_ERROR_H''@|$(NEXT_ERROR_H)|g' \
+              -e 's|@''HAVE_ERROR''@|$(HAVE_ERROR)|g' \
+              -e 's|@''HAVE_ERROR_AT_LINE''@|$(HAVE_ERROR_AT_LINE)|g' \
+              -e 's|@''REPLACE_ERROR''@|$(REPLACE_ERROR)|g' \
+              -e 's|@''REPLACE_ERROR_AT_LINE''@|$(REPLACE_ERROR_AT_LINE)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              $(srcdir)/error.in.h > $@-t
+        $(AM_V_at)mv $@-t $@
+MOSTLYCLEANFILES += error.h error.h-t
+
+EXTRA_DIST += error.in.h
+
+## end   gnulib module error-h
+
 ## begin gnulib module exitfail
 
 libgnu_a_SOURCES += exitfail.c
@@ -595,6 +618,7 @@ SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G
 SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t'
 
 # Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that
+# is its recipe's first line if and only if @NMD@ lines are absent.
 gl_V_at = $(AM_V_GEN)
 
 ## end   gnulib module gen-header
@@ -698,7 +722,11 @@ EXTRA_DIST += getopt-cdefs.in.h getopt-core.h getopt-ext.h getopt-pfx-core.h get
 
 ## begin gnulib module getprogname
 
-libgnu_a_SOURCES += getprogname.h getprogname.c
+if GL_COND_OBJ_GETPROGNAME
+libgnu_a_SOURCES += getprogname.c
+endif
+
+EXTRA_DIST += getprogname.h
 
 ## end   gnulib module getprogname
 
@@ -810,6 +838,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
               -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \
               -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \
               -e 's/@''HAVE_IMAXDIV_T''@/$(HAVE_IMAXDIV_T)/g' \
+              -e 's/@''REPLACE_IMAXABS''@/$(REPLACE_IMAXABS)/g' \
+              -e 's/@''REPLACE_IMAXDIV''@/$(REPLACE_IMAXDIV)/g' \
               -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \
               -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \
               -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \
@@ -827,6 +857,48 @@ EXTRA_DIST += inttypes.in.h
 
 ## end   gnulib module inttypes-incomplete
 
+## begin gnulib module iswblank
+
+if GL_COND_OBJ_ISWBLANK
+libgnu_a_SOURCES += iswblank.c
+endif
+
+## end   gnulib module iswblank
+
+## begin gnulib module iswctype
+
+if GL_COND_OBJ_ISWCTYPE
+libgnu_a_SOURCES += iswctype.c
+endif
+
+EXTRA_DIST += iswctype-impl.h
+
+## end   gnulib module iswctype
+
+## begin gnulib module iswdigit
+
+if GL_COND_OBJ_ISWDIGIT
+libgnu_a_SOURCES += iswdigit.c
+endif
+
+## end   gnulib module iswdigit
+
+## begin gnulib module iswpunct
+
+if GL_COND_OBJ_ISWPUNCT
+libgnu_a_SOURCES += iswpunct.c
+endif
+
+## end   gnulib module iswpunct
+
+## begin gnulib module iswxdigit
+
+if GL_COND_OBJ_ISWXDIGIT
+libgnu_a_SOURCES += iswxdigit.c
+endif
+
+## end   gnulib module iswxdigit
+
 ## begin gnulib module langinfo
 
 BUILT_SOURCES += langinfo.h
@@ -917,7 +989,7 @@ locale.h: locale.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_SETLOCALE''@/$(GL_GNULIB_SETLOCALE)/g' \
               -e 's/@''GNULIB_SETLOCALE_NULL''@/$(GL_GNULIB_SETLOCALE_NULL)/g' \
               -e 's/@''GNULIB_DUPLOCALE''@/$(GL_GNULIB_DUPLOCALE)/g' \
-              -e 's/@''GNULIB_LOCALENAME''@/$(GL_GNULIB_LOCALENAME)/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' \
@@ -1043,11 +1115,15 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_FREXPF''@/$(GL_GNULIB_FREXPF)/g' \
               -e 's/@''GNULIB_FREXP''@/$(GL_GNULIB_FREXP)/g' \
               -e 's/@''GNULIB_FREXPL''@/$(GL_GNULIB_FREXPL)/g' \
+              -e 's/@''GNULIB_GETPAYLOAD''@/$(GL_GNULIB_GETPAYLOAD)/g' \
+              -e 's/@''GNULIB_GETPAYLOADF''@/$(GL_GNULIB_GETPAYLOADF)/g' \
+              -e 's/@''GNULIB_GETPAYLOADL''@/$(GL_GNULIB_GETPAYLOADL)/g' \
               -e 's/@''GNULIB_HYPOT''@/$(GL_GNULIB_HYPOT)/g' \
               -e 's/@''GNULIB_HYPOTF''@/$(GL_GNULIB_HYPOTF)/g' \
               -e 's/@''GNULIB_HYPOTL''@/$(GL_GNULIB_HYPOTL)/g' \
-              < $(srcdir)/math.in.h | \
-          sed -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \
+              < $(srcdir)/math.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's/@''GNULIB_ILOGB''@/$(GL_GNULIB_ILOGB)/g' \
               -e 's/@''GNULIB_ILOGBF''@/$(GL_GNULIB_ILOGBF)/g' \
               -e 's/@''GNULIB_ILOGBL''@/$(GL_GNULIB_ILOGBL)/g' \
               -e 's/@''GNULIB_ISFINITE''@/$(GL_GNULIB_ISFINITE)/g' \
@@ -1056,6 +1132,7 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_ISNANF''@/$(GL_GNULIB_ISNANF)/g' \
               -e 's/@''GNULIB_ISNAND''@/$(GL_GNULIB_ISNAND)/g' \
               -e 's/@''GNULIB_ISNANL''@/$(GL_GNULIB_ISNANL)/g' \
+              -e 's/@''GNULIB_LDEXP''@/$(GL_GNULIB_LDEXP)/g' \
               -e 's/@''GNULIB_LDEXPF''@/$(GL_GNULIB_LDEXPF)/g' \
               -e 's/@''GNULIB_LDEXPL''@/$(GL_GNULIB_LDEXPL)/g' \
               -e 's/@''GNULIB_LOG''@/$(GL_GNULIB_LOG)/g' \
@@ -1086,6 +1163,12 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_ROUND''@/$(GL_GNULIB_ROUND)/g' \
               -e 's/@''GNULIB_ROUNDF''@/$(GL_GNULIB_ROUNDF)/g' \
               -e 's/@''GNULIB_ROUNDL''@/$(GL_GNULIB_ROUNDL)/g' \
+              -e 's/@''GNULIB_SETPAYLOAD''@/$(GL_GNULIB_SETPAYLOAD)/g' \
+              -e 's/@''GNULIB_SETPAYLOADF''@/$(GL_GNULIB_SETPAYLOADF)/g' \
+              -e 's/@''GNULIB_SETPAYLOADL''@/$(GL_GNULIB_SETPAYLOADL)/g' \
+              -e 's/@''GNULIB_SETPAYLOADSIG''@/$(GL_GNULIB_SETPAYLOADSIG)/g' \
+              -e 's/@''GNULIB_SETPAYLOADSIGF''@/$(GL_GNULIB_SETPAYLOADSIGF)/g' \
+              -e 's/@''GNULIB_SETPAYLOADSIGL''@/$(GL_GNULIB_SETPAYLOADSIGL)/g' \
               -e 's/@''GNULIB_SIGNBIT''@/$(GL_GNULIB_SIGNBIT)/g' \
               -e 's/@''GNULIB_SINF''@/$(GL_GNULIB_SINF)/g' \
               -e 's/@''GNULIB_SINL''@/$(GL_GNULIB_SINL)/g' \
@@ -1098,14 +1181,21 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_TRUNC''@/$(GL_GNULIB_TRUNC)/g' \
               -e 's/@''GNULIB_TRUNCF''@/$(GL_GNULIB_TRUNCF)/g' \
               -e 's/@''GNULIB_TRUNCL''@/$(GL_GNULIB_TRUNCL)/g' \
+              -e 's/@''GNULIB_TOTALORDER''@/$(GL_GNULIB_TOTALORDER)/g' \
+              -e 's/@''GNULIB_TOTALORDERF''@/$(GL_GNULIB_TOTALORDERF)/g' \
+              -e 's/@''GNULIB_TOTALORDERL''@/$(GL_GNULIB_TOTALORDERL)/g' \
+              -e 's/@''GNULIB_TOTALORDERMAG''@/$(GL_GNULIB_TOTALORDERMAG)/g' \
+              -e 's/@''GNULIB_TOTALORDERMAGF''@/$(GL_GNULIB_TOTALORDERMAGF)/g' \
+              -e 's/@''GNULIB_TOTALORDERMAGL''@/$(GL_GNULIB_TOTALORDERMAGL)/g' \
               -e 's/@''GNULIB_MDA_J0''@/$(GL_GNULIB_MDA_J0)/g' \
               -e 's/@''GNULIB_MDA_J1''@/$(GL_GNULIB_MDA_J1)/g' \
               -e 's/@''GNULIB_MDA_JN''@/$(GL_GNULIB_MDA_JN)/g' \
               -e 's/@''GNULIB_MDA_Y0''@/$(GL_GNULIB_MDA_Y0)/g' \
               -e 's/@''GNULIB_MDA_Y1''@/$(GL_GNULIB_MDA_Y1)/g' \
               -e 's/@''GNULIB_MDA_YN''@/$(GL_GNULIB_MDA_YN)/g' \
-          | \
-          sed -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_ACOSF''@|$(HAVE_ACOSF)|g' \
               -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \
               -e 's|@''HAVE_ASINF''@|$(HAVE_ASINF)|g' \
               -e 's|@''HAVE_ASINL''@|$(HAVE_ASINL)|g' \
@@ -1132,6 +1222,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_FMODF''@|$(HAVE_FMODF)|g' \
               -e 's|@''HAVE_FMODL''@|$(HAVE_FMODL)|g' \
               -e 's|@''HAVE_FREXPF''@|$(HAVE_FREXPF)|g' \
+              -e 's|@''HAVE_GETPAYLOAD''@|$(HAVE_GETPAYLOAD)|g' \
+              -e 's|@''HAVE_GETPAYLOADF''@|$(HAVE_GETPAYLOADF)|g' \
+              -e 's|@''HAVE_GETPAYLOADL''@|$(HAVE_GETPAYLOADL)|g' \
               -e 's|@''HAVE_HYPOTF''@|$(HAVE_HYPOTF)|g' \
               -e 's|@''HAVE_HYPOTL''@|$(HAVE_HYPOTL)|g' \
               -e 's|@''HAVE_ILOGB''@|$(HAVE_ILOGB)|g' \
@@ -1157,6 +1250,12 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_REMAINDERF''@|$(HAVE_REMAINDERF)|g' \
               -e 's|@''HAVE_RINT''@|$(HAVE_RINT)|g' \
               -e 's|@''HAVE_RINTL''@|$(HAVE_RINTL)|g' \
+              -e 's|@''HAVE_SETPAYLOAD''@|$(HAVE_SETPAYLOAD)|g' \
+              -e 's|@''HAVE_SETPAYLOADF''@|$(HAVE_SETPAYLOADF)|g' \
+              -e 's|@''HAVE_SETPAYLOADL''@|$(HAVE_SETPAYLOADL)|g' \
+              -e 's|@''HAVE_SETPAYLOADSIG''@|$(HAVE_SETPAYLOADSIG)|g' \
+              -e 's|@''HAVE_SETPAYLOADSIGF''@|$(HAVE_SETPAYLOADSIGF)|g' \
+              -e 's|@''HAVE_SETPAYLOADSIGL''@|$(HAVE_SETPAYLOADSIGL)|g' \
               -e 's|@''HAVE_SINF''@|$(HAVE_SINF)|g' \
               -e 's|@''HAVE_SINL''@|$(HAVE_SINL)|g' \
               -e 's|@''HAVE_SINHF''@|$(HAVE_SINHF)|g' \
@@ -1165,6 +1264,14 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_TANF''@|$(HAVE_TANF)|g' \
               -e 's|@''HAVE_TANL''@|$(HAVE_TANL)|g' \
               -e 's|@''HAVE_TANHF''@|$(HAVE_TANHF)|g' \
+              -e 's|@''HAVE_TOTALORDER''@|$(HAVE_TOTALORDER)|g' \
+              -e 's|@''HAVE_TOTALORDERF''@|$(HAVE_TOTALORDERF)|g' \
+              -e 's|@''HAVE_TOTALORDERL''@|$(HAVE_TOTALORDERL)|g' \
+              -e 's|@''HAVE_TOTALORDERMAG''@|$(HAVE_TOTALORDERMAG)|g' \
+              -e 's|@''HAVE_TOTALORDERMAGF''@|$(HAVE_TOTALORDERMAGF)|g' \
+              -e 's|@''HAVE_TOTALORDERMAGL''@|$(HAVE_TOTALORDERMAGL)|g' \
+              < $@-t2 > $@-t3
+        $(AM_V_at)sed \
               -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
               -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
               -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
@@ -1201,8 +1308,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \
               -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \
               -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \
-          | \
-          sed -e 's|@''REPLACE_ACOSF''@|$(REPLACE_ACOSF)|g' \
+              < $@-t3 > $@-t4
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_ACOSF''@|$(REPLACE_ACOSF)|g' \
               -e 's|@''REPLACE_ASINF''@|$(REPLACE_ASINF)|g' \
               -e 's|@''REPLACE_ATANF''@|$(REPLACE_ATANF)|g' \
               -e 's|@''REPLACE_ATAN2F''@|$(REPLACE_ATAN2F)|g' \
@@ -1233,6 +1341,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_FREXPF''@|$(REPLACE_FREXPF)|g' \
               -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
               -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
+              -e 's|@''REPLACE_GETPAYLOAD''@|$(REPLACE_GETPAYLOAD)|g' \
+              -e 's|@''REPLACE_GETPAYLOADF''@|$(REPLACE_GETPAYLOADF)|g' \
+              -e 's|@''REPLACE_GETPAYLOADL''@|$(REPLACE_GETPAYLOADL)|g' \
               -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \
               -e 's|@''REPLACE_HYPOT''@|$(REPLACE_HYPOT)|g' \
               -e 's|@''REPLACE_HYPOTF''@|$(REPLACE_HYPOTF)|g' \
@@ -1244,6 +1355,9 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_ISINF''@|$(REPLACE_ISINF)|g' \
               -e 's|@''REPLACE_ISNAN''@|$(REPLACE_ISNAN)|g' \
               -e 's|@''REPLACE_ITOLD''@|$(REPLACE_ITOLD)|g' \
+              < $@-t4 > $@-t5
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_LDEXP''@|$(REPLACE_LDEXP)|g' \
               -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
               -e 's|@''REPLACE_LOG''@|$(REPLACE_LOG)|g' \
               -e 's|@''REPLACE_LOGF''@|$(REPLACE_LOGF)|g' \
@@ -1279,15 +1393,22 @@ math.h: math.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_SQRTL''@|$(REPLACE_SQRTL)|g' \
               -e 's|@''REPLACE_TANF''@|$(REPLACE_TANF)|g' \
               -e 's|@''REPLACE_TANHF''@|$(REPLACE_TANHF)|g' \
+              -e 's|@''REPLACE_TOTALORDER''@|$(REPLACE_TOTALORDER)|g' \
+              -e 's|@''REPLACE_TOTALORDERF''@|$(REPLACE_TOTALORDERF)|g' \
+              -e 's|@''REPLACE_TOTALORDERL''@|$(REPLACE_TOTALORDERL)|g' \
+              -e 's|@''REPLACE_TOTALORDERMAG''@|$(REPLACE_TOTALORDERMAG)|g' \
+              -e 's|@''REPLACE_TOTALORDERMAGF''@|$(REPLACE_TOTALORDERMAGF)|g' \
+              -e 's|@''REPLACE_TOTALORDERMAGL''@|$(REPLACE_TOTALORDERMAGL)|g' \
               -e 's|@''REPLACE_TRUNC''@|$(REPLACE_TRUNC)|g' \
               -e 's|@''REPLACE_TRUNCF''@|$(REPLACE_TRUNCF)|g' \
               -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|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)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += math.h math.h-t
+              < $@-t5 > $@-t6
+        $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3 $@-t4 $@-t5
+        $(AM_V_at)mv $@-t6 $@
+MOSTLYCLEANFILES += math.h math.h-t1 math.h-t2 math.h-t3 math.h-t4 math.h-t5 math.h-t6
 
 EXTRA_DIST += math.in.h
 
@@ -1313,6 +1434,12 @@ endif
 
 ## end   gnulib module mbsinit
 
+## begin gnulib module mbszero
+
+libgnu_a_SOURCES += mbszero.c
+
+## end   gnulib module mbszero
+
 ## begin gnulib module mbtowc
 
 if GL_COND_OBJ_MBTOWC
@@ -1534,6 +1661,14 @@ EXTRA_DIST += setlocale_null.h windows-initguard.h
 
 ## end   gnulib module setlocale-null
 
+## begin gnulib module setlocale-null-unlocked
+
+libgnu_a_SOURCES += setlocale_null-unlocked.c
+
+EXTRA_DIST += setlocale_null.h
+
+## end   gnulib module setlocale-null-unlocked
+
 ## begin gnulib module size_max
 
 libgnu_a_SOURCES += size_max.h
@@ -1625,26 +1760,6 @@ EXTRA_DIST += stat-time.h
 
 ## end   gnulib module stat-time
 
-## begin gnulib module stdalign
-
-BUILT_SOURCES += $(STDALIGN_H)
-
-# We need the following in order to create <stdalign.h> when the system
-# doesn't have one that works.
-if GL_GENERATE_STDALIGN_H
-stdalign.h: stdalign.in.h $(top_builddir)/config.status
-        $(gl_V_at)$(SED_HEADER_TO_AT_t) $(srcdir)/stdalign.in.h
-        $(AM_V_at)mv $@-t $@
-else
-stdalign.h: $(top_builddir)/config.status
-        rm -f $@
-endif
-MOSTLYCLEANFILES += stdalign.h stdalign.h-t
-
-EXTRA_DIST += stdalign.in.h
-
-## end   gnulib module stdalign
-
 ## begin gnulib module stdckdint
 
 BUILT_SOURCES += $(STDCKDINT_H)
@@ -1816,14 +1931,17 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_MDA_GETW''@/$(GL_GNULIB_MDA_GETW)/g' \
               -e 's/@''GNULIB_MDA_PUTW''@/$(GL_GNULIB_MDA_PUTW)/g' \
               -e 's/@''GNULIB_MDA_TEMPNAM''@/$(GL_GNULIB_MDA_TEMPNAM)/g' \
-              < $(srcdir)/stdio.in.h | \
-          sed -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \
+              < $(srcdir)/stdio.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_DECL_FCLOSEALL''@|$(HAVE_DECL_FCLOSEALL)|g' \
               -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
               -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \
               -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \
               -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
               -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+              -e 's|@''HAVE_DECL_GETW''@|$(HAVE_DECL_GETW)|g' \
               -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
+              -e 's|@''HAVE_DECL_PUTW''@|$(HAVE_DECL_PUTW)|g' \
               -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
               -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
               -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
@@ -1834,6 +1952,8 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
               -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
               -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
               -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
               -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
               -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \
@@ -1871,9 +1991,10 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -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)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += stdio.h stdio.h-t
+              < $@-t2 > $@-t3
+        $(AM_V_at)rm -f $@-t1 $@-t2
+        $(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += stdio.h stdio.h-t1 stdio.h-t2 stdio.h-t3
 
 if GL_COND_OBJ_STDIO_READ
 libgnu_a_SOURCES += stdio-read.c
@@ -1908,10 +2029,12 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GL_GNULIB_CANONICALIZE_FILE_NAME)/g' \
               -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \
               -e 's/@''GNULIB_GETLOADAVG''@/$(GL_GNULIB_GETLOADAVG)/g' \
+              -e 's/@''GNULIB_GETPROGNAME''@/$(GL_GNULIB_GETPROGNAME)/g' \
               -e 's/@''GNULIB_GETSUBOPT''@/$(GL_GNULIB_GETSUBOPT)/g' \
               -e 's/@''GNULIB_GRANTPT''@/$(GL_GNULIB_GRANTPT)/g' \
               -e 's/@''GNULIB_MALLOC_GNU''@/$(GL_GNULIB_MALLOC_GNU)/g' \
               -e 's/@''GNULIB_MALLOC_POSIX''@/$(GL_GNULIB_MALLOC_POSIX)/g' \
+              -e 's/@''GNULIB_MBSTOWCS''@/$(GL_GNULIB_MBSTOWCS)/g' \
               -e 's/@''GNULIB_MBTOWC''@/$(GL_GNULIB_MBTOWC)/g' \
               -e 's/@''GNULIB_MKDTEMP''@/$(GL_GNULIB_MKDTEMP)/g' \
               -e 's/@''GNULIB_MKOSTEMP''@/$(GL_GNULIB_MKOSTEMP)/g' \
@@ -1924,6 +2047,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_PTSNAME_R''@/$(GL_GNULIB_PTSNAME_R)/g' \
               -e 's/@''GNULIB_PUTENV''@/$(GL_GNULIB_PUTENV)/g' \
               -e 's/@''GNULIB_QSORT_R''@/$(GL_GNULIB_QSORT_R)/g' \
+              -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' \
@@ -1934,6 +2058,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \
               -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/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' \
               -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \
               -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \
@@ -1948,8 +2073,9 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's/@''GNULIB_MDA_GCVT''@/$(GL_GNULIB_MDA_GCVT)/g' \
               -e 's/@''GNULIB_MDA_MKTEMP''@/$(GL_GNULIB_MDA_MKTEMP)/g' \
               -e 's/@''GNULIB_MDA_PUTENV''@/$(GL_GNULIB_MDA_PUTENV)/g' \
-              < $(srcdir)/stdlib.in.h | \
-          sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
+              < $(srcdir)/stdlib.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \
               -e 's|@''HAVE_ALIGNED_ALLOC''@|$(HAVE_ALIGNED_ALLOC)|g' \
               -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
               -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
@@ -1957,6 +2083,8 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''HAVE_DECL_FCVT''@|$(HAVE_DECL_FCVT)|g' \
               -e 's|@''HAVE_DECL_GCVT''@|$(HAVE_DECL_GCVT)|g' \
               -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+              -e 's|@''HAVE_DECL_PROGRAM_INVOCATION_NAME''@|$(HAVE_DECL_PROGRAM_INVOCATION_NAME)|g' \
+              -e 's|@''HAVE_GETPROGNAME''@|$(HAVE_GETPROGNAME)|g' \
               -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
               -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
               -e 's|@''HAVE_INITSTATE''@|$(HAVE_INITSTATE)|g' \
@@ -1983,6 +2111,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \
               -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \
               -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+              -e 's|@''HAVE_STRTOF''@|$(HAVE_STRTOF)|g' \
               -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \
               -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \
               -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
@@ -1992,21 +2121,33 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
               -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
               -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE__EXIT''@|$(REPLACE__EXIT)|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' \
               -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+              -e 's|@''REPLACE_GETLOADAVG''@|$(REPLACE_GETLOADAVG)|g' \
+              -e 's|@''REPLACE_GETPROGNAME''@|$(REPLACE_GETPROGNAME)|g' \
+              -e 's|@''REPLACE_GETSUBOPT''@|$(REPLACE_GETSUBOPT)|g' \
               -e 's|@''REPLACE_INITSTATE''@|$(REPLACE_INITSTATE)|g' \
               -e 's|@''REPLACE_MALLOC_FOR_MALLOC_GNU''@|$(REPLACE_MALLOC_FOR_MALLOC_GNU)|g' \
               -e 's|@''REPLACE_MALLOC_FOR_MALLOC_POSIX''@|$(REPLACE_MALLOC_FOR_MALLOC_POSIX)|g' \
+              -e 's|@''REPLACE_MB_CUR_MAX''@|$(REPLACE_MB_CUR_MAX)|g' \
+              -e 's|@''REPLACE_MBSTOWCS''@|$(REPLACE_MBSTOWCS)|g' \
               -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \
+              -e 's|@''REPLACE_MKOSTEMP''@|$(REPLACE_MKOSTEMP)|g' \
+              -e 's|@''REPLACE_MKOSTEMPS''@|$(REPLACE_MKOSTEMPS)|g' \
               -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
               -e 's|@''REPLACE_POSIX_MEMALIGN''@|$(REPLACE_POSIX_MEMALIGN)|g' \
+              -e 's|@''REPLACE_POSIX_OPENPT''@|$(REPLACE_POSIX_OPENPT)|g' \
               -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \
               -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \
               -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
               -e 's|@''REPLACE_QSORT_R''@|$(REPLACE_QSORT_R)|g' \
+              -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' \
@@ -2016,6 +2157,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
               -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
               -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \
               -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
+              -e 's|@''REPLACE_STRTOF''@|$(REPLACE_STRTOF)|g' \
               -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \
               -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \
               -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \
@@ -2027,9 +2169,10 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(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)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += stdlib.h stdlib.h-t
+              < $@-t2 > $@-t3
+        $(AM_V_at)rm -f $@-t1 $@-t2
+        $(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += stdlib.h stdlib.h-t1 stdlib.h-t2 stdlib.h-t3
 
 EXTRA_DIST += stdlib.in.h
 
@@ -2147,8 +2290,9 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_MDA_MEMCCPY''@/$(GL_GNULIB_MDA_MEMCCPY)/g' \
               -e 's/@''GNULIB_MDA_STRDUP''@/$(GL_GNULIB_MDA_STRDUP)/g' \
               -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \
-              < $(srcdir)/string.in.h | \
-          sed -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
+              < $(srcdir)/string.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_EXPLICIT_BZERO''@|$(HAVE_EXPLICIT_BZERO)|g' \
               -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \
               -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \
               -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
@@ -2176,7 +2320,10 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_FFSLL''@|$(REPLACE_FFSLL)|g' \
               -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
               -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+              -e 's|@''REPLACE_MEMPCPY''@|$(REPLACE_MEMPCPY)|g' \
+              -e 's|@''REPLACE_MEMSET_EXPLICIT''@|$(REPLACE_MEMSET_EXPLICIT)|g' \
               -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
+              -e 's|@''REPLACE_STPCPY''@|$(REPLACE_STPCPY)|g' \
               -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
               -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \
               -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
@@ -2190,13 +2337,15 @@ string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \
               -e 's|@''REPLACE_STRERRORNAME_NP''@|$(REPLACE_STRERRORNAME_NP)|g' \
               -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+              -e 's|@''REPLACE_STRVERSCMP''@|$(REPLACE_STRVERSCMP)|g' \
               -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|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)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += string.h string.h-t
+              < $@-t1 > $@-t2
+        $(AM_V_at)rm -f $@-t1
+        $(AM_V_at)mv $@-t2 $@
+MOSTLYCLEANFILES += string.h string.h-t1 string.h-t2
 
 EXTRA_DIST += string.in.h
 
@@ -2425,7 +2574,7 @@ libgnu_a_SOURCES += glthread/threadlib.c
 
 ## end   gnulib module threadlib
 
-## begin gnulib module time
+## begin gnulib module time-h
 
 BUILT_SOURCES += time.h
 
@@ -2444,6 +2593,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's/@''GNULIB_NANOSLEEP''@/$(GL_GNULIB_NANOSLEEP)/g' \
               -e 's/@''GNULIB_STRFTIME''@/$(GL_GNULIB_STRFTIME)/g' \
               -e 's/@''GNULIB_STRPTIME''@/$(GL_GNULIB_STRPTIME)/g' \
+              -e 's/@''GNULIB_TIME''@/$(GL_GNULIB_TIME)/g' \
               -e 's/@''GNULIB_TIMEGM''@/$(GL_GNULIB_TIMEGM)/g' \
               -e 's/@''GNULIB_TIMESPEC_GET''@/$(GL_GNULIB_TIMESPEC_GET)/g' \
               -e 's/@''GNULIB_TIMESPEC_GETRES''@/$(GL_GNULIB_TIMESPEC_GETRES)/g' \
@@ -2465,7 +2615,10 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
               -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
               -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
               -e 's|@''REPLACE_STRFTIME''@|$(REPLACE_STRFTIME)|g' \
+              -e 's|@''REPLACE_TIME''@|$(REPLACE_TIME)|g' \
               -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+              -e 's|@''REPLACE_TIMESPEC_GET''@|$(REPLACE_TIMESPEC_GET)|g' \
+              -e 's|@''REPLACE_TIMESPEC_GETRES''@|$(REPLACE_TIMESPEC_GETRES)|g' \
               -e 's|@''REPLACE_TZSET''@|$(REPLACE_TZSET)|g' \
               -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \
               -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
@@ -2481,7 +2634,7 @@ MOSTLYCLEANFILES += time.h time.h-t
 
 EXTRA_DIST += time.in.h
 
-## end   gnulib module time
+## end   gnulib module time-h
 
 ## begin gnulib module time_r
 
@@ -2540,6 +2693,8 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_FDATASYNC''@/$(GL_GNULIB_FDATASYNC)/g' \
               -e 's/@''GNULIB_FSYNC''@/$(GL_GNULIB_FSYNC)/g' \
               -e 's/@''GNULIB_FTRUNCATE''@/$(GL_GNULIB_FTRUNCATE)/g' \
+              < $(srcdir)/unistd.in.h > $@-t1
+        $(AM_V_at)sed \
               -e 's/@''GNULIB_GETCWD''@/$(GL_GNULIB_GETCWD)/g' \
               -e 's/@''GNULIB_GETDOMAINNAME''@/$(GL_GNULIB_GETDOMAINNAME)/g' \
               -e 's/@''GNULIB_GETDTABLESIZE''@/$(GL_GNULIB_GETDTABLESIZE)/g' \
@@ -2601,8 +2756,9 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's/@''GNULIB_MDA_SWAB''@/$(GL_GNULIB_MDA_SWAB)/g' \
               -e 's/@''GNULIB_MDA_UNLINK''@/$(GL_GNULIB_MDA_UNLINK)/g' \
               -e 's/@''GNULIB_MDA_WRITE''@/$(GL_GNULIB_MDA_WRITE)/g' \
-              < $(srcdir)/unistd.in.h | \
-          sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
               -e 's|@''HAVE_COPY_FILE_RANGE''@|$(HAVE_COPY_FILE_RANGE)|g' \
               -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
               -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
@@ -2649,13 +2805,15 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
               -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
               -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
-          | \
-          sed -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
+              < $@-t2 > $@-t3
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_ACCESS''@|$(REPLACE_ACCESS)|g' \
               -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
               -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
               -e 's|@''REPLACE_COPY_FILE_RANGE''@|$(REPLACE_COPY_FILE_RANGE)|g' \
               -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
               -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
+              -e 's|@''REPLACE_DUP3''@|$(REPLACE_DUP3)|g' \
               -e 's|@''REPLACE_EXECL''@|$(REPLACE_EXECL)|g' \
               -e 's|@''REPLACE_EXECLE''@|$(REPLACE_EXECLE)|g' \
               -e 's|@''REPLACE_EXECLP''@|$(REPLACE_EXECLP)|g' \
@@ -2664,11 +2822,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_EXECVP''@|$(REPLACE_EXECVP)|g' \
               -e 's|@''REPLACE_EXECVPE''@|$(REPLACE_EXECVPE)|g' \
               -e 's|@''REPLACE_FACCESSAT''@|$(REPLACE_FACCESSAT)|g' \
+              -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
               -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
+              -e 's|@''REPLACE_FDATASYNC''@|$(REPLACE_FDATASYNC)|g' \
               -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \
               -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
               -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_R''@|$(REPLACE_GETLOGIN_R)|g' \
               -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
               -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
@@ -2679,12 +2840,14 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
               -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
               -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+              -e 's|@''REPLACE_PIPE2''@|$(REPLACE_PIPE2)|g' \
               -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
               -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \
               -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \
               -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
               -e 's|@''REPLACE_READLINKAT''@|$(REPLACE_READLINKAT)|g' \
               -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
+              -e 's|@''REPLACE_SETHOSTNAME''@|$(REPLACE_SETHOSTNAME)|g' \
               -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
               -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
               -e 's|@''REPLACE_SYMLINKAT''@|$(REPLACE_SYMLINKAT)|g' \
@@ -2700,9 +2863,10 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
               -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)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += unistd.h unistd.h-t
+              < $@-t3 > $@-t4
+        $(AM_V_at)rm -f $@-t1 $@-t2 $@-t3
+        $(AM_V_at)mv $@-t4 $@
+MOSTLYCLEANFILES += unistd.h unistd.h-t1 unistd.h-t2 unistd.h-t3 unistd.h-t4
 
 EXTRA_DIST += unistd.in.h
 
@@ -2777,6 +2941,7 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_BTOWC''@/$(GL_GNULIB_BTOWC)/g' \
               -e 's/@''GNULIB_WCTOB''@/$(GL_GNULIB_WCTOB)/g' \
               -e 's/@''GNULIB_MBSINIT''@/$(GL_GNULIB_MBSINIT)/g' \
+              -e 's/@''GNULIB_MBSZERO''@/$(GL_GNULIB_MBSZERO)/g' \
               -e 's/@''GNULIB_MBRTOWC''@/$(GL_GNULIB_MBRTOWC)/g' \
               -e 's/@''GNULIB_MBRLEN''@/$(GL_GNULIB_MBRLEN)/g' \
               -e 's/@''GNULIB_MBSRTOWCS''@/$(GL_GNULIB_MBSRTOWCS)/g' \
@@ -2815,10 +2980,12 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's/@''GNULIB_WCSTOK''@/$(GL_GNULIB_WCSTOK)/g' \
               -e 's/@''GNULIB_WCSWIDTH''@/$(GL_GNULIB_WCSWIDTH)/g' \
               -e 's/@''GNULIB_WCSFTIME''@/$(GL_GNULIB_WCSFTIME)/g' \
+              -e 's/@''GNULIB_WGETCWD''@/$(GL_GNULIB_WGETCWD)/g' \
               -e 's/@''GNULIB_MDA_WCSDUP''@/$(GL_GNULIB_MDA_WCSDUP)/g' \
               -e 's/@''GNULIB_FREE_POSIX''@/$(GL_GNULIB_FREE_POSIX)/g' \
-              < $(srcdir)/wchar.in.h | \
-          sed -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+              < $(srcdir)/wchar.in.h > $@-t1
+        $(AM_V_at)sed \
+              -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
               -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
               -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
               -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
@@ -2861,8 +3028,9 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
               -e 's|@''HAVE_DECL_WCSDUP''@|$(HAVE_DECL_WCSDUP)|g' \
               -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
-          | \
-          sed -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+              < $@-t1 > $@-t2
+        $(AM_V_at)sed \
+              -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
               -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
               -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
               -e 's|@''REPLACE_FREE''@|$(REPLACE_FREE)|g' \
@@ -2877,13 +3045,19 @@ wchar.h: wchar.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
               -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
               -e 's|@''REPLACE_WCSWIDTH''@|$(REPLACE_WCSWIDTH)|g' \
               -e 's|@''REPLACE_WCSFTIME''@|$(REPLACE_WCSFTIME)|g' \
+              -e 's|@''REPLACE_WCSCMP''@|$(REPLACE_WCSCMP)|g' \
+              -e 's|@''REPLACE_WCSNCMP''@|$(REPLACE_WCSNCMP)|g' \
+              -e 's|@''REPLACE_WCSSTR''@|$(REPLACE_WCSSTR)|g' \
               -e 's|@''REPLACE_WCSTOK''@|$(REPLACE_WCSTOK)|g' \
+              -e 's|@''REPLACE_WMEMCMP''@|$(REPLACE_WMEMCMP)|g' \
+              -e 's|@''REPLACE_WMEMPCPY''@|$(REPLACE_WMEMPCPY)|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)' \
-              > $@-t
-        $(AM_V_at)mv $@-t $@
-MOSTLYCLEANFILES += wchar.h wchar.h-t
+              < $@-t2 > $@-t3
+        $(AM_V_at)rm -f $@-t1 $@-t2
+        $(AM_V_at)mv $@-t3 $@
+MOSTLYCLEANFILES += wchar.h wchar.h-t1 wchar.h-t2 wchar.h-t3
 
 EXTRA_DIST += wchar.in.h
 
@@ -2897,6 +3071,16 @@ endif
 
 ## end   gnulib module wcrtomb
 
+## begin gnulib module wctype
+
+if GL_COND_OBJ_WCTYPE
+libgnu_a_SOURCES += wctype.c
+endif
+
+EXTRA_DIST += wctype-impl.h
+
+## end   gnulib module wctype
+
 ## begin gnulib module wctype-h
 
 BUILT_SOURCES += wctype.h
@@ -2904,7 +3088,7 @@ libgnu_a_SOURCES += wctype-h.c
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H)
+wctype.h: wctype.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_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
@@ -2916,6 +3100,7 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
               -e 's/@''GNULIBHEADERS_OVERRIDE_WINT_T''@/$(GNULIBHEADERS_OVERRIDE_WINT_T)/g' \
               -e 's/@''GNULIB_ISWBLANK''@/$(GL_GNULIB_ISWBLANK)/g' \
               -e 's/@''GNULIB_ISWDIGIT''@/$(GL_GNULIB_ISWDIGIT)/g' \
+              -e 's/@''GNULIB_ISWPUNCT''@/$(GL_GNULIB_ISWPUNCT)/g' \
               -e 's/@''GNULIB_ISWXDIGIT''@/$(GL_GNULIB_ISWXDIGIT)/g' \
               -e 's/@''GNULIB_WCTYPE''@/$(GL_GNULIB_WCTYPE)/g' \
               -e 's/@''GNULIB_ISWCTYPE''@/$(GL_GNULIB_ISWCTYPE)/g' \
@@ -2928,10 +3113,14 @@ wctype.h: wctype.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H
               -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
               -e 's/@''REPLACE_ISWBLANK''@/$(REPLACE_ISWBLANK)/g' \
               -e 's/@''REPLACE_ISWDIGIT''@/$(REPLACE_ISWDIGIT)/g' \
+              -e 's/@''REPLACE_ISWPUNCT''@/$(REPLACE_ISWPUNCT)/g' \
               -e 's/@''REPLACE_ISWXDIGIT''@/$(REPLACE_ISWXDIGIT)/g' \
               -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
               -e 's/@''REPLACE_TOWLOWER''@/$(REPLACE_TOWLOWER)/g' \
+              -e 's/@''REPLACE_WCTRANS''@/$(REPLACE_WCTRANS)/g' \
+              -e 's/@''REPLACE_WCTYPE''@/$(REPLACE_WCTYPE)/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)/wctype.in.h > $@-t
         $(AM_V_at)mv $@-t $@
diff --git a/gl/_Noreturn.h b/gl/_Noreturn.h
index 6ecea98b..7326bd47 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-2024 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/af_alg.c b/gl/af_alg.c
index 9f022ce5..6fd08c28 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2018-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
diff --git a/gl/af_alg.h b/gl/af_alg.h
index e8ffb3f7..ed933e12 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2018-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
diff --git a/gl/alloca.in.h b/gl/alloca.in.h
index a1bb3d75..6aa47df8 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-2023 Free Software Foundation,
+   Copyright (C) 1995, 1999, 2001-2004, 2006-2024 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 9498ae1f..46c711ca 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-2024 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.in.h b/gl/arpa_inet.in.h
index 80e6713f..523a448c 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-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
@@ -49,6 +49,11 @@
 #ifndef _@GUARD_PREFIX@_ARPA_INET_H
 #define _@GUARD_PREFIX@_ARPA_INET_H
 
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Get all possible declarations of inet_ntop() and inet_pton().  */
 #if (@GNULIB_INET_NTOP@ || @GNULIB_INET_PTON@ || defined GNULIB_POSIXCHECK) \
     && @HAVE_WS2TCPIP_H@
diff --git a/gl/asnprintf.c b/gl/asnprintf.c
index f4861bf8..a6c09bc2 100644
--- a/gl/asnprintf.c
+++ b/gl/asnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006, 2009-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
diff --git a/gl/asprintf.c b/gl/asprintf.c
index ba58e064..b0c33478 100644
--- a/gl/asprintf.c
+++ b/gl/asprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007, 2009-2023 Free Software Foundation,
+   Copyright (C) 1999, 2002, 2006-2007, 2009-2024 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 b0ab99c7..6e4995e1 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
diff --git a/gl/attribute.h b/gl/attribute.h
index 130644d8..710341ba 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-2023 Free Software Foundation, Inc.
+   Copyright 2020-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
@@ -41,6 +41,21 @@
      These names begin with 'ATTRIBUTE_' to avoid name clashes.  */
 
 
+/* This file uses _GL_ATTRIBUTE_ALLOC_SIZE, _GL_ATTRIBUTE_ALWAYS_INLINE,
+   _GL_ATTRIBUTE_ARTIFICIAL, _GL_ATTRIBUTE_COLD, _GL_ATTRIBUTE_CONST,
+   _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_DEPRECATED, _GL_ATTRIBUTE_ERROR,
+   _GL_ATTRIBUTE_WARNING, _GL_ATTRIBUTE_EXTERNALLY_VISIBLE,
+   _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.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+
 /* =============== Attributes for specific kinds of functions =============== */
 
 /* Attributes for functions that should not be used.  */
@@ -167,6 +182,8 @@
 
 /* The function does not throw exceptions.  */
 /* Applies to: functions.  */
+/* After a function's parameter list, this attribute must come first, before
+   other attributes.  */
 #define ATTRIBUTE_NOTHROW _GL_ATTRIBUTE_NOTHROW
 
 /* Do not inline the function.  */
diff --git a/gl/base64.c b/gl/base64.c
index 95b669aa..c8b3b76b 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999-2001, 2004-2006, 2009-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
@@ -42,6 +42,7 @@
 #include <config.h>
 
 /* Get prototype. */
+#define BASE64_INLINE _GL_EXTERN_INLINE
 #include "base64.h"
 
 /* Get imalloc. */
@@ -49,9 +50,6 @@
 
 #include <intprops.h>
 
-/* Get UCHAR_MAX. */
-#include <limits.h>
-
 #include <string.h>
 
 /* Convert 'char' to 'unsigned char' without casting.  */
@@ -242,7 +240,7 @@ base64_encode_alloc (const char *in, idx_t inlen, char **out)
    : (_) == '/' ? 63                            \
    : -1)
 
-static const signed char b64[0x100] = {
+signed char const base64_to_int[256] = {
   B64 (0), B64 (1), B64 (2), B64 (3),
   B64 (4), B64 (5), B64 (6), B64 (7),
   B64 (8), B64 (9), B64 (10), B64 (11),
@@ -309,28 +307,6 @@ static const signed char b64[0x100] = {
   B64 (252), B64 (253), B64 (254), B64 (255)
 };
 
-#if UCHAR_MAX == 255
-# define uchar_in_range(c) true
-#else
-# define uchar_in_range(c) ((c) <= 255)
-#endif
-
-/* Return true if CH is a character from the Base64 alphabet, and
-   false otherwise.  Note that '=' is padding and not considered to be
-   part of the alphabet.  */
-bool
-isbase64 (char ch)
-{
-  return uchar_in_range (to_uchar (ch)) && 0 <= b64[to_uchar (ch)];
-}
-
-/* Initialize decode-context buffer, CTX.  */
-void
-base64_decode_ctx_init (struct base64_decode_context *ctx)
-{
-  ctx->i = 0;
-}
-
 /* If CTX->i is 0 or 4, there are four or more bytes in [*IN..IN_END), and
    none of those four is a newline, then return *IN.  Otherwise, copy up to
    4 - CTX->i non-newline bytes from that range into CTX->buf, starting at
@@ -405,8 +381,8 @@ decode_4 (char const *restrict in, idx_t inlen,
 
   if (*outleft)
     {
-      *out++ = ((b64[to_uchar (in[0])] << 2)
-                | (b64[to_uchar (in[1])] >> 4));
+      *out++ = ((base64_to_int[to_uchar (in[0])] << 2)
+                | (base64_to_int[to_uchar (in[1])] >> 4));
       --*outleft;
     }
 
@@ -420,6 +396,10 @@ decode_4 (char const *restrict in, idx_t inlen,
 
       if (in[3] != '=')
         return_false;
+
+      /* Reject non-canonical encodings.  */
+      if (base64_to_int[to_uchar (in[1])] & 0x0f)
+        return_false;
     }
   else
     {
@@ -428,8 +408,8 @@ decode_4 (char const *restrict in, idx_t inlen,
 
       if (*outleft)
         {
-          *out++ = (((b64[to_uchar (in[1])] << 4) & 0xf0)
-                    | (b64[to_uchar (in[2])] >> 2));
+          *out++ = (((base64_to_int[to_uchar (in[1])] << 4) & 0xf0)
+                    | (base64_to_int[to_uchar (in[2])] >> 2));
           --*outleft;
         }
 
@@ -440,6 +420,10 @@ decode_4 (char const *restrict in, idx_t inlen,
         {
           if (inlen != 4)
             return_false;
+
+          /* Reject non-canonical encodings.  */
+          if (base64_to_int[to_uchar (in[2])] & 0x03)
+            return_false;
         }
       else
         {
@@ -448,8 +432,8 @@ decode_4 (char const *restrict in, idx_t inlen,
 
           if (*outleft)
             {
-              *out++ = (((b64[to_uchar (in[2])] << 6) & 0xc0)
-                        | b64[to_uchar (in[3])]);
+              *out++ = (((base64_to_int[to_uchar (in[2])] << 6) & 0xc0)
+                        | base64_to_int[to_uchar (in[3])]);
               --*outleft;
             }
         }
diff --git a/gl/base64.h b/gl/base64.h
index 99137652..7691f6c4 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2004-2006, 2009-2024 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This file is free software: you can redistribute it and/or modify
@@ -16,18 +16,33 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef BASE64_H
-# define BASE64_H
+#define BASE64_H
+
+/* This file uses _GL_INLINE_HEADER_BEGIN.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
 
 /* Get idx_t.  */
-# include <idx.h>
+#include <idx.h>
+
+/* Pacify GCC in isubase64.  */
+#if defined __GNUC__ && 4 < __GNUC__ + (3 <= __GNUC_MINOR__)
+# pragma GCC diagnostic ignored "-Wtype-limits"
+#endif
+
+_GL_INLINE_HEADER_BEGIN
+#ifndef BASE64_INLINE
+# define BASE64_INLINE _GL_INLINE
+#endif
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 extern "C" {
-# endif
+#endif
 
 /* This uses that the expression (n+(k-1))/k means the smallest
    integer >= n/k, i.e., the ceiling of n/k.  */
-# define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
+#define BASE64_LENGTH(inlen) ((((inlen) + 2) / 3) * 4)
 
 struct base64_decode_context
 {
@@ -35,14 +50,31 @@ struct base64_decode_context
   char buf[4];
 };
 
-extern bool isbase64 (char ch) _GL_ATTRIBUTE_CONST;
+extern signed char const base64_to_int[256];
+
+BASE64_INLINE bool
+isubase64 (unsigned char ch)
+{
+  return ch < sizeof base64_to_int && 0 <= base64_to_int[ch];
+}
+
+BASE64_INLINE bool
+isbase64 (char ch)
+{
+  return isubase64 (ch);
+}
 
 extern void base64_encode (const char *restrict in, idx_t inlen,
                            char *restrict out, idx_t outlen);
 
 extern idx_t base64_encode_alloc (const char *in, idx_t inlen, char **out);
 
-extern void base64_decode_ctx_init (struct base64_decode_context *ctx);
+/* Initialize decode-context buffer, CTX.  */
+BASE64_INLINE void
+base64_decode_ctx_init (struct base64_decode_context *ctx)
+{
+  ctx->i = 0;
+}
 
 extern bool base64_decode_ctx (struct base64_decode_context *ctx,
                                const char *restrict in, idx_t inlen,
@@ -58,8 +90,10 @@ extern bool base64_decode_alloc_ctx (struct base64_decode_context *ctx,
 #define base64_decode_alloc(in, inlen, out, outlen) \
         base64_decode_alloc_ctx (NULL, in, inlen, out, outlen)
 
-# ifdef __cplusplus
+#ifdef __cplusplus
 }
-# endif
+#endif
+
+_GL_INLINE_HEADER_END
 
 #endif /* BASE64_H */
diff --git a/gl/basename-lgpl.c b/gl/basename-lgpl.c
index 6de60aa6..256f8460 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-2023 Free Software
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2024 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 5d996c1d..2a56be98 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-2023 Free Software Foundation,
+   Copyright (C) 1998, 2001, 2003-2006, 2009-2024 Free Software Foundation,
    Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -19,6 +19,11 @@
 #ifndef _BASENAME_LGPL_H
 #define _BASENAME_LGPL_H
 
+/* This file uses _GL_ATTRIBUTE_PURE.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include <stddef.h>
 
 #ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
diff --git a/gl/basename.c b/gl/basename.c
index 21fab1ef..c5a6bdc9 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-2023 Free Software
+   Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2024 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 caadbd76..8bf21aa6 100644
--- a/gl/btowc.c
+++ b/gl/btowc.c
@@ -1,5 +1,5 @@
 /* Convert unibyte character to wide character.
-   Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
@@ -22,6 +22,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 wint_t
 btowc (int c)
@@ -32,7 +33,14 @@ btowc (int c)
       wchar_t wc;
 
       buf[0] = c;
+#if HAVE_MBRTOWC
+      mbstate_t state;
+      mbszero (&state);
+      size_t ret = mbrtowc (&wc, buf, 1, &state);
+      if (!(ret == (size_t)(-1) || ret == (size_t)(-2)))
+#else
       if (mbtowc (&wc, buf, 1) >= 0)
+#endif
         return wc;
     }
   return WEOF;
diff --git a/gl/byteswap.in.h b/gl/byteswap.in.h
index e61be27e..8e49efad 100644
--- a/gl/byteswap.in.h
+++ b/gl/byteswap.in.h
@@ -1,5 +1,5 @@
 /* byteswap.h - Byte swapping
-   Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-2024 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
diff --git a/gl/c++defs.h b/gl/c++defs.h
index 8ad46951..eb66967b 100644
--- a/gl/c++defs.h
+++ b/gl/c++defs.h
@@ -1,5 +1,5 @@
 /* C++ compatible function declaration macros.
-   Copyright (C) 2010-2023 Free Software Foundation, Inc.
+   Copyright (C) 2010-2024 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
@@ -99,6 +99,12 @@
    Example:
      _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_and_attributes) \
   _GL_FUNCDECL_RPL_1 (rpl_##func, rettype, parameters_and_attributes)
diff --git a/gl/calloc.c b/gl/calloc.c
index 08843acd..81dfd3ef 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2004-2007, 2009-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
diff --git a/gl/cdefs.h b/gl/cdefs.h
index 09a3d19b..d38382ad 100644
--- a/gl/cdefs.h
+++ b/gl/cdefs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992-2023 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2024 Free Software Foundation, Inc.
    Copyright The GNU Toolchain Authors.
    This file is part of the GNU C Library.
 
@@ -42,8 +42,8 @@
 #if (defined __has_attribute \
      && (!defined __clang_minor__ \
          || (defined __apple_build_version__ \
-             ? 6000000 <= __apple_build_version__ \
-             : 3 < __clang_major__ + (5 <= __clang_minor__))))
+             ? 7000000 <= __apple_build_version__ \
+             : 5 <= __clang_major__)))
 # define __glibc_has_attribute(attr) __has_attribute (attr)
 #else
 # define __glibc_has_attribute(attr) 0
@@ -140,32 +140,37 @@
 #endif
 
 
+/* Gnulib avoids these definitions, as they don't work on non-glibc platforms.
+   In particular, __bos and __bos0 are defined differently in the Android libc.
+ */
+#ifndef __GNULIB_CDEFS
+
 /* Fortify support.  */
-#define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
-#define __bos0(ptr) __builtin_object_size (ptr, 0)
+# define __bos(ptr) __builtin_object_size (ptr, __USE_FORTIFY_LEVEL > 1)
+# define __bos0(ptr) __builtin_object_size (ptr, 0)
 
 /* Use __builtin_dynamic_object_size at _FORTIFY_SOURCE=3 when available.  */
-#if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0)                  \
-                                 || __GNUC_PREREQ (12, 0))
-# define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0)
-# define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1)
-#else
-# define __glibc_objsize0(__o) __bos0 (__o)
-# define __glibc_objsize(__o) __bos (__o)
-#endif
+# if __USE_FORTIFY_LEVEL == 3 && (__glibc_clang_prereq (9, 0)                 \
+                                  || __GNUC_PREREQ (12, 0))
+#  define __glibc_objsize0(__o) __builtin_dynamic_object_size (__o, 0)
+#  define __glibc_objsize(__o) __builtin_dynamic_object_size (__o, 1)
+# else
+#  define __glibc_objsize0(__o) __bos0 (__o)
+#  define __glibc_objsize(__o) __bos (__o)
+# endif
 
 /* Compile time conditions to choose between the regular, _chk and _chk_warn
    variants.  These conditions should get evaluated to constant and optimized
    away.  */
 
-#define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / (__s))
-#define __glibc_unsigned_or_positive(__l) \
+# define __glibc_safe_len_cond(__l, __s, __osz) ((__l) <= (__osz) / (__s))
+# define __glibc_unsigned_or_positive(__l) \
   ((__typeof (__l)) 0 < (__typeof (__l)) -1                                   \
    || (__builtin_constant_p (__l) && (__l) > 0))
 
 /* Length is known to be safe at compile time if the __L * __S <= __OBJSZ
    condition can be folded to a constant and if it is true, or unknown (-1) */
-#define __glibc_safe_or_unknown_len(__l, __s, __osz) \
+# define __glibc_safe_or_unknown_len(__l, __s, __osz) \
   ((__osz) == (__SIZE_TYPE__) -1                                              \
    || (__glibc_unsigned_or_positive (__l)                                     \
        && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \
@@ -175,7 +180,7 @@
 /* Conversely, we know at compile time that the length is unsafe if the
    __L * __S <= __OBJSZ condition can be folded to a constant and if it is
    false.  */
-#define __glibc_unsafe_len(__l, __s, __osz) \
+# define __glibc_unsafe_len(__l, __s, __osz) \
   (__glibc_unsigned_or_positive (__l)                                         \
    && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l),     \
                                                    __s, __osz))               \
@@ -184,7 +189,7 @@
 /* Fortify function f.  __f_alias, __f_chk and __f_chk_warn must be
    declared.  */
 
-#define __glibc_fortify(f, __l, __s, __osz, ...) \
+# define __glibc_fortify(f, __l, __s, __osz, ...) \
   (__glibc_safe_or_unknown_len (__l, __s, __osz)                              \
    ? __ ## f ## _alias (__VA_ARGS__)                                          \
    : (__glibc_unsafe_len (__l, __s, __osz)                                    \
@@ -194,13 +199,16 @@
 /* Fortify function f, where object size argument passed to f is the number of
    elements and not total size.  */
 
-#define __glibc_fortify_n(f, __l, __s, __osz, ...) \
+# define __glibc_fortify_n(f, __l, __s, __osz, ...) \
   (__glibc_safe_or_unknown_len (__l, __s, __osz)                              \
    ? __ ## f ## _alias (__VA_ARGS__)                                          \
    : (__glibc_unsafe_len (__l, __s, __osz)                                    \
       ? __ ## f ## _chk_warn (__VA_ARGS__, (__osz) / (__s))                   \
       : __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s))))                      \
 
+#endif
+
+
 #if __GNUC_PREREQ (4,3)
 # define __warnattr(msg) __attribute__((__warning__ (msg)))
 # define __errordecl(name, msg) \
diff --git a/gl/cloexec.c b/gl/cloexec.c
index e4cecbd2..cdb0d740 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2004-2006, 2009-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
diff --git a/gl/cloexec.h b/gl/cloexec.h
index 057fd668..a7944d6d 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009-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
@@ -15,6 +15,11 @@
    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 __cplusplus
+extern "C" {
+#endif
+
+
 /* Set the 'FD_CLOEXEC' flag of DESC if VALUE is true,
    or clear the flag if VALUE is false.
    Return 0 on success, or -1 on error with 'errno' set.
@@ -32,3 +37,8 @@ int set_cloexec_flag (int desc, bool value);
    be duplicated.  */
 
 int dup_cloexec (int fd);
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/gl/close.c b/gl/close.c
index 3c1b09ea..830fd820 100644
--- a/gl/close.c
+++ b/gl/close.c
@@ -1,5 +1,5 @@
 /* close replacement.
-   Copyright (C) 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-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
diff --git a/gl/dirname-lgpl.c b/gl/dirname-lgpl.c
index e9454af3..8333c0eb 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-2023 Free Software
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2024 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 e72f7130..393ec1b4 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-2023 Free Software
+   Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2024 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 f98e83bd..33935ba9 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-2023 Free Software Foundation,
+   Copyright (C) 1998, 2001, 2003-2006, 2009-2024 Free Software Foundation,
    Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -19,6 +19,12 @@
 #ifndef DIRNAME_H_
 # define DIRNAME_H_ 1
 
+/* This file uses _GL_ATTRIBUTE_MALLOC, _GL_ATTRIBUTE_PURE,
+   _GL_ATTRIBUTE_RETURNS_NONNULL.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 # include <stdlib.h>
 # include "filename.h"
 # include "basename-lgpl.h"
diff --git a/gl/dup2.c b/gl/dup2.c
index 7d197ca3..916e113d 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2004-2007, 2009-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
diff --git a/gl/dynarray.h b/gl/dynarray.h
index 91559109..8940e81b 100644
--- a/gl/dynarray.h
+++ b/gl/dynarray.h
@@ -1,5 +1,5 @@
 /* Type-safe arrays which grow dynamically.
-   Copyright 2021-2023 Free Software Foundation, Inc.
+   Copyright 2021-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
diff --git a/gl/errno.in.h b/gl/errno.in.h
index 3dda9c26..aa658e62 100644
--- a/gl/errno.in.h
+++ b/gl/errno.in.h
@@ -1,6 +1,6 @@
 /* A POSIX-like <errno.h>.
 
-   Copyright (C) 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-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
diff --git a/gl/error.c b/gl/error.c
index 6875f134..c53dfeb6 100644
--- a/gl/error.c
+++ b/gl/error.c
@@ -1,5 +1,5 @@
 /* Error handler for noninteractive utilities
-   Copyright (C) 1990-1998, 2000-2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 1990-1998, 2000-2007, 2009-2024 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
@@ -19,9 +19,10 @@
 
 #if !_LIBC
 # include <config.h>
+# define _GL_NO_INLINE_ERROR
 #endif
 
-#include "error.h"
+#include <error.h>
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -42,8 +43,6 @@
 # define USE_UNLOCKED_IO 0
 # define _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD(a, b)
 # define _GL_ARG_NONNULL(a)
-#else
-# include "getprogname.h"
 #endif
 
 #if USE_UNLOCKED_IO
diff --git a/gl/error.h b/gl/error.h
deleted file mode 100644
index a240526a..00000000
--- a/gl/error.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Declaration for error-reporting function
-   Copyright (C) 1995-1997, 2003, 2006, 2008-2023 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.
-
-   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 _ERROR_H
-#define _ERROR_H 1
-
-/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM.  */
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Print a message with 'fprintf (stderr, FORMAT, ...)';
-   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
-   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.  */
-
-extern void error (int __status, int __errnum, const char *__format, ...)
-#if GNULIB_VFPRINTF_POSIX
-     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 3, 4))
-#else
-     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, 3, 4))
-#endif
-     ;
-
-extern void error_at_line (int __status, int __errnum, const char *__fname,
-                           unsigned int __lineno, const char *__format, ...)
-#if GNULIB_VFPRINTF_POSIX
-     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, 5, 6))
-#else
-     _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM, 5, 6))
-#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.  */
-extern void (*error_print_progname) (void);
-
-/* This variable is incremented each time 'error' is called.  */
-extern unsigned int error_message_count;
-
-/* Sometimes we want to have at most one error per line.  This
-   variable controls whether this mode is selected or not.  */
-extern int error_one_per_line;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* error.h */
diff --git a/gl/error.in.h b/gl/error.in.h
new file mode 100644
index 00000000..51f8cafd
--- /dev/null
+++ b/gl/error.in.h
@@ -0,0 +1,216 @@
+/* Declarations for error-reporting functions.
+   Copyright (C) 1995-1997, 2003, 2006, 2008-2024 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.
+
+   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@_ERROR_H
+
+/* No @PRAGMA_SYSTEM_HEADER@ here, because it would prevent
+   -Wimplicit-fallthrough warnings for missing FALLTHROUGH after error(...)
+   or error_at_line(...) invocations.  */
+
+/* The include_next requires a split double-inclusion guard.  */
+#if @HAVE_ERROR_H@
+# @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.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+/* Get 'unreachable'.  */
+#include <stddef.h>
+
+/* Get _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD, _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM.  */
+#include <stdio.h>
+
+/* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
+
+#if GNULIB_VFPRINTF_POSIX
+# define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_STANDARD
+#else
+# define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM
+#endif
+
+/* Helper macro for supporting the compiler's control flow analysis better.
+   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
+   return.  */
+# define __gl_error_call1(function, status, ...) \
+    ((function) (status, __VA_ARGS__), \
+     (status) != 0 ? 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.
+   If STATUS is a constant, we don't use a compound statement, because that
+   would trigger a -Wimplicit-fallthrough warning even when STATUS is != 0,
+   when not optimizing.  This causes STATUS to be evaluated twice, but
+   that's OK since it does not have side effects.  */
+# define __gl_error_call(function, status, ...)                 \
+    (__builtin_constant_p (status)                              \
+     ? __gl_error_call1 (function, status, __VA_ARGS__)         \
+     : __extension__                                            \
+       ({                                                       \
+         int const __errstatus = status;                        \
+         __gl_error_call1 (function, __errstatus, __VA_ARGS__); \
+       }))
+#else
+# define __gl_error_call(function, status, ...) \
+    (function) (status, __VA_ARGS__)
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Print a message with 'fprintf (stderr, FORMAT, ...)';
+   if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM).
+   If STATUS is nonzero, terminate the program with 'exit (STATUS)'.  */
+#if @REPLACE_ERROR@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef error
+#  define error rpl_error
+# endif
+_GL_FUNCDECL_RPL (error, void,
+                  (int __status, int __errnum, const char *__format, ...)
+                  _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4)));
+_GL_CXXALIAS_RPL (error, void,
+                  (int __status, int __errnum, const char *__format, ...));
+# ifndef _GL_NO_INLINE_ERROR
+#  undef error
+#  define error(status, ...) \
+     __gl_error_call (rpl_error, status, __VA_ARGS__)
+# endif
+#else
+# if ! @HAVE_ERROR@
+_GL_FUNCDECL_SYS (error, void,
+                  (int __status, int __errnum, const char *__format, ...)
+                  _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4)));
+# endif
+_GL_CXXALIAS_SYS (error, void,
+                  (int __status, int __errnum, const char *__format, ...));
+# ifndef _GL_NO_INLINE_ERROR
+#  ifdef error
+/* Only gcc ≥ 4.7 has __builtin_va_arg_pack.  */
+#   if _GL_GNUC_PREREQ (4, 7)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wattributes"
+_GL_ATTRIBUTE_MAYBE_UNUSED
+static void
+_GL_ATTRIBUTE_ALWAYS_INLINE
+_GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 3, 4))
+_gl_inline_error (int __status, int __errnum, const char *__format, ...)
+{
+  return error (__status, __errnum, __format, __builtin_va_arg_pack ());
+}
+#    pragma GCC diagnostic pop
+#    undef error
+#    define error(status, ...) \
+       __gl_error_call (_gl_inline_error, status, __VA_ARGS__)
+#   endif
+#  else
+#   define error(status, ...) \
+      __gl_error_call (error, status, __VA_ARGS__)
+#  endif
+# endif
+#endif
+#if __GLIBC__ >= 2
+_GL_CXXALIASWARN (error);
+#endif
+
+/* Likewise.  If FILENAME is non-NULL, include FILENAME:LINENO: in the
+   message.  */
+#if @REPLACE_ERROR_AT_LINE@
+# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#  undef error_at_line
+#  define error_at_line rpl_error_at_line
+# endif
+_GL_FUNCDECL_RPL (error_at_line, void,
+                  (int __status, int __errnum, const char *__filename,
+                   unsigned int __lineno, const char *__format, ...)
+                  _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6)));
+_GL_CXXALIAS_RPL (error_at_line, void,
+                  (int __status, int __errnum, const char *__filename,
+                   unsigned int __lineno, const char *__format, ...));
+# ifndef _GL_NO_INLINE_ERROR
+#  undef error_at_line
+#  define error_at_line(status, ...) \
+     __gl_error_call (rpl_error_at_line, status, __VA_ARGS__)
+# endif
+#else
+# 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, ...)
+                  _GL_ATTRIBUTE_FORMAT ((_GL_ATTRIBUTE_SPEC_PRINTF_ERROR, 5, 6)));
+# endif
+_GL_CXXALIAS_SYS (error_at_line, void,
+                  (int __status, int __errnum, const char *__filename,
+                   unsigned int __lineno, const char *__format, ...));
+# ifndef _GL_NO_INLINE_ERROR
+#  ifdef error_at_line
+/* Only gcc ≥ 4.7 has __builtin_va_arg_pack.  */
+#   if _GL_GNUC_PREREQ (4, 7)
+#    pragma GCC diagnostic push
+#    pragma GCC diagnostic ignored "-Wattributes"
+_GL_ATTRIBUTE_MAYBE_UNUSED
+static void
+_GL_ATTRIBUTE_ALWAYS_INLINE
+_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, ...)
+{
+  return error_at_line (__status, __errnum, __filename, __lineno, __format,
+                        __builtin_va_arg_pack ());
+}
+#    pragma GCC diagnostic pop
+#    undef error_at_line
+#    define error_at_line(status, ...) \
+       __gl_error_call (_gl_inline_error_at_line, status, __VA_ARGS__)
+#   endif
+#  else
+#   define error_at_line(status, ...) \
+      __gl_error_call (error_at_line, status, __VA_ARGS__)
+#  endif
+# endif
+#endif
+_GL_CXXALIASWARN (error_at_line);
+
+/* 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.  */
+extern void (*error_print_progname) (void);
+
+/* This variable is incremented each time 'error' is called.  */
+extern unsigned int error_message_count;
+
+/* Sometimes we want to have at most one error per line.  This
+   variable controls whether this mode is selected or not.  */
+extern int error_one_per_line;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _@GUARD_PREFIX@_ERROR_H */
+#endif /* _@GUARD_PREFIX@_ERROR_H */
diff --git a/gl/exitfail.c b/gl/exitfail.c
index d67a130c..8a5962e8 100644
--- a/gl/exitfail.c
+++ b/gl/exitfail.c
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2005-2007, 2009-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
diff --git a/gl/exitfail.h b/gl/exitfail.h
index 85a6af64..fa264b5c 100644
--- a/gl/exitfail.h
+++ b/gl/exitfail.h
@@ -1,6 +1,6 @@
 /* Failure exit status
 
-   Copyright (C) 2002, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2009-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
@@ -15,4 +15,14 @@
    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 __cplusplus
+extern "C" {
+#endif
+
+
 extern int volatile exit_failure;
+
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/gl/fcntl.c b/gl/fcntl.c
index e2208008..7cd3a0f9 100644
--- a/gl/fcntl.c
+++ b/gl/fcntl.c
@@ -1,6 +1,6 @@
 /* Provide file descriptor control.
 
-   Copyright (C) 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-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
diff --git a/gl/fcntl.in.h b/gl/fcntl.in.h
index e034eaf9..eea3b954 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2006-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
@@ -74,6 +74,11 @@
 #ifndef _@GUARD_PREFIX@_FCNTL_H
 #define _@GUARD_PREFIX@_FCNTL_H
 
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #ifndef __GLIBC__ /* Avoid namespace pollution on glibc systems.  */
 # include <unistd.h>
 #endif
diff --git a/gl/fd-hook.c b/gl/fd-hook.c
index 36261150..75bbe49c 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-2024 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 6bf3c24d..2150460b 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-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
diff --git a/gl/fflush.c b/gl/fflush.c
index f3689b3e..36cc14d1 100644
--- a/gl/fflush.c
+++ b/gl/fflush.c
@@ -1,5 +1,5 @@
 /* fflush.c -- allow flushing input streams
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
diff --git a/gl/filename.h b/gl/filename.h
index a2400a9d..4f0f0fbc 100644
--- a/gl/filename.h
+++ b/gl/filename.h
@@ -1,5 +1,5 @@
 /* Basic filename support macros.
-   Copyright (C) 2001-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 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 e7531e46..104f477f 100644
--- a/gl/float+.h
+++ b/gl/float+.h
@@ -1,5 +1,5 @@
 /* Supplemental information about the floating-point formats.
-   Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-2024 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 f81ff33d..a9ea40b0 100644
--- a/gl/float.c
+++ b/gl/float.c
@@ -1,5 +1,5 @@
 /* Auxiliary definitions for <float.h>.
-   Copyright (C) 2011-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-2024 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/float.in.h b/gl/float.in.h
index bf2c502c..73e8d406 100644
--- a/gl/float.in.h
+++ b/gl/float.in.h
@@ -1,6 +1,6 @@
 /* A correct <float.h>.
 
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
diff --git a/gl/floor.c b/gl/floor.c
index 238f4879..392f2044 100644
--- a/gl/floor.c
+++ b/gl/floor.c
@@ -1,5 +1,5 @@
 /* Round towards negative infinity.
-   Copyright (C) 2007, 2010-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010-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
diff --git a/gl/floorf.c b/gl/floorf.c
index e465c180..f9785d0c 100644
--- a/gl/floorf.c
+++ b/gl/floorf.c
@@ -1,5 +1,5 @@
 /* Round towards negative infinity.
-   Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-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
diff --git a/gl/fopen.c b/gl/fopen.c
index f8469a0b..d3b57a98 100644
--- a/gl/fopen.c
+++ b/gl/fopen.c
@@ -1,5 +1,5 @@
 /* Open a stream to a file.
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -33,9 +33,13 @@ orig_fopen (const char *filename, const char *mode)
 }
 
 /* Specification.  */
+#ifdef __osf__
 /* Write "stdio.h" here, not <stdio.h>, otherwise OSF/1 5.1 DTK cc eliminates
    this include because of the preliminary #include <stdio.h> above.  */
-#include "stdio.h"
+# include "stdio.h"
+#else
+# include <stdio.h>
+#endif
 
 #include <errno.h>
 #include <fcntl.h>
@@ -225,5 +229,9 @@ rpl_fopen (const char *filename, const char *mode)
     }
 #endif
 
+  /* open_direction is sometimes used, sometimes unused.
+     Silence gcc's warning about this situation.  */
+  (void) open_direction;
+
   return orig_fopen (filename, mode);
 }
diff --git a/gl/fpurge.c b/gl/fpurge.c
index 0dcb2b79..52a3dcef 100644
--- a/gl/fpurge.c
+++ b/gl/fpurge.c
@@ -1,5 +1,5 @@
 /* Flushing buffers of a FILE stream.
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
diff --git a/gl/freading.c b/gl/freading.c
index b9377cb0..c80d9aa8 100644
--- a/gl/freading.c
+++ b/gl/freading.c
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
diff --git a/gl/freading.h b/gl/freading.h
index 27b3abbc..943354f5 100644
--- a/gl/freading.h
+++ b/gl/freading.h
@@ -1,5 +1,5 @@
 /* Retrieve information about a FILE stream.
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -14,6 +14,11 @@
    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/>.  */
 
+/* This file uses _GL_ATTRIBUTE_PURE, HAVE___FREADING, HAVE_STDIO_EXT_H.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include <stdio.h>
 
 /* Return true if the stream STREAM is opened read-only, or if the
diff --git a/gl/free.c b/gl/free.c
index 372a6b0f..2f0c40ba 100644
--- a/gl/free.c
+++ b/gl/free.c
@@ -1,6 +1,6 @@
 /* Make free() preserve errno.
 
-   Copyright (C) 2003, 2006, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2009-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
diff --git a/gl/fseek.c b/gl/fseek.c
index 9764375a..cebc1749 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-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
diff --git a/gl/fseeko.c b/gl/fseeko.c
index 89a70874..2c3b053a 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
diff --git a/gl/fstat.c b/gl/fstat.c
index 6a235002..205d5aab 100644
--- a/gl/fstat.c
+++ b/gl/fstat.c
@@ -1,5 +1,5 @@
 /* fstat() replacement.
-   Copyright (C) 2011-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
diff --git a/gl/fsusage.c b/gl/fsusage.c
index f6f4b1c3..97d0eef7 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-2023 Free Software
+   Copyright (C) 1991-1992, 1996, 1998-1999, 2002-2006, 2009-2024 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 9630b04e..da878590 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-2023 Free Software
+   Copyright (C) 1991-1992, 1997, 2003-2006, 2009-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -19,9 +19,14 @@
 /* Space usage statistics for a file system.  Blocks are 512-byte. */
 
 #if !defined FSUSAGE_H_
-# define FSUSAGE_H_
+#define FSUSAGE_H_
+
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-# include <stdint.h>
 
 struct fs_usage
 {
@@ -36,4 +41,9 @@ struct fs_usage
 
 int get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp);
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/gl/ftell.c b/gl/ftell.c
index ce2bd542..21cab439 100644
--- a/gl/ftell.c
+++ b/gl/ftell.c
@@ -1,5 +1,5 @@
 /* An ftell() function that works around platform bugs.
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
diff --git a/gl/ftello.c b/gl/ftello.c
index 14184e5e..64119aab 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-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
diff --git a/gl/gai_strerror.c b/gl/gai_strerror.c
index 3436c07a..37092e29 100644
--- a/gl/gai_strerror.c
+++ b/gl/gai_strerror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2023 Free Software
+/* Copyright (C) 1997, 2001-2002, 2004-2006, 2008-2024 Free Software
    Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Philip Blundell <pjb27@cam.ac.uk>, 1997.
diff --git a/gl/getaddrinfo.c b/gl/getaddrinfo.c
index 6586ee58..bf5d61f3 100644
--- a/gl/getaddrinfo.c
+++ b/gl/getaddrinfo.c
@@ -1,5 +1,5 @@
 /* Get address information (partial implementation).
-   Copyright (C) 1997, 2001-2002, 2004-2023 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001-2002, 2004-2024 Free Software Foundation, Inc.
    Contributed by Simon Josefsson <simon@josefsson.org>.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/getdelim.c b/gl/getdelim.c
index 79ec3dd1..58063b15 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-2023 Free Software
+   Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -30,10 +30,6 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#ifndef SSIZE_MAX
-# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
-#endif
-
 #if USE_UNLOCKED_IO
 # include "unlocked-io.h"
 # define getc_maybe_unlocked(fp)        getc(fp)
diff --git a/gl/getdtablesize.c b/gl/getdtablesize.c
index ac2d1753..762c100b 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-2024 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 0c616c34..c075b6df 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2003, 2006, 2008-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
diff --git a/gl/getline.c b/gl/getline.c
index 85f16ab8..2d03b646 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2009-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
diff --git a/gl/getloadavg.c b/gl/getloadavg.c
index 59b53e79..c940e4c7 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-2023 Free Software
+   Copyright (C) 1985-1989, 1991-1995, 1997, 1999-2000, 2003-2024 Free Software
    Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
diff --git a/gl/getopt-cdefs.in.h b/gl/getopt-cdefs.in.h
index e76c78cb..a1d304d4 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1989-2024 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.
@@ -57,7 +57,11 @@
 
 #ifndef __THROW
 # if defined __cplusplus && (__GNUC_PREREQ (2,8) || __clang_major__ >= 4)
-#  define __THROW       throw ()
+#  if __cplusplus >= 201103L
+#   define __THROW      noexcept (true)
+#  else
+#   define __THROW      throw ()
+#  endif
 # else
 #  define __THROW
 # endif
diff --git a/gl/getopt-core.h b/gl/getopt-core.h
index c5dd4936..12d09a25 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1989-2024 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 d37c2932..e4b499d4 100644
--- a/gl/getopt-ext.h
+++ b/gl/getopt-ext.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt (GNU extensions).
-   Copyright (C) 1989-2023 Free Software Foundation, Inc.
+   Copyright (C) 1989-2024 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 3a2fde5a..78b7816a 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1989-2024 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.
@@ -47,7 +47,7 @@
 # define optind __GETOPT_ID (optind)
 # define optopt __GETOPT_ID (optopt)
 
-/* Work around a a problem on macOS, which declares getopt with a
+/* Work around a problem on macOS, which declares getopt with a
    trailing __DARWIN_ALIAS(getopt) that would expand to something like
    __asm("_" "rpl_getopt" "$UNIX2003") were it not for the following
    hack to suppress the macOS declaration <https://bugs.gnu.org/40205>.  */
diff --git a/gl/getopt-pfx-ext.h b/gl/getopt-pfx-ext.h
index 8578d725..f001c11e 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1989-2024 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.
diff --git a/gl/getopt.c b/gl/getopt.c
index 1e2441c4..f66f119e 100644
--- a/gl/getopt.c
+++ b/gl/getopt.c
@@ -1,5 +1,5 @@
 /* Getopt for GNU.
-   Copyright (C) 1987-2023 Free Software Foundation, Inc.
+   Copyright (C) 1987-2024 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.
 
@@ -21,7 +21,7 @@
 # include <config.h>
 #endif
 
-#include "getopt.h"
+#include <getopt.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -223,8 +223,9 @@ process_long_option (int argc, char **argv, const char *optstring,
     {
       /* Didn't find an exact match, so look for abbreviations.  */
       unsigned char *ambig_set = NULL;
-      int ambig_malloced = 0;
-      int ambig_fallback = 0;
+      /* Use simpler fallback diagnostic if ambig_set == &ambig_fallback.  */
+      unsigned char ambig_fallback;
+      void *ambig_malloced = NULL;
       int indfound = -1;
 
       for (p = longopts, option_index = 0; p->name; p++, option_index++)
@@ -242,39 +243,42 @@ process_long_option (int argc, char **argv, const char *optstring,
                      || pfound->val != p->val)
               {
                 /* Second or later nonexact match found.  */
-                if (!ambig_fallback)
+                if (ambig_set != &ambig_fallback)
                   {
                     if (!print_errors)
                       /* Don't waste effort tracking the ambig set if
                          we're not going to print it anyway.  */
-                      ambig_fallback = 1;
+                      ambig_set = &ambig_fallback;
                     else if (!ambig_set)
                       {
                         if (__libc_use_alloca (n_options))
                           ambig_set = alloca (n_options);
-                        else if ((ambig_set = malloc (n_options)) == NULL)
-                          /* Fall back to simpler error message.  */
-                          ambig_fallback = 1;
                         else
-                          ambig_malloced = 1;
+                          {
+                            ambig_malloced = malloc (n_options);
+                            /* Fall back to simpler diagnostic if
+                               memory allocation fails.  */
+                            ambig_set = (ambig_malloced ? ambig_malloced
+                                         : &ambig_fallback);
+                          }
 
-                        if (ambig_set)
+                        if (ambig_set != &ambig_fallback)
                           {
                             memset (ambig_set, 0, n_options);
                             ambig_set[indfound] = 1;
                           }
                       }
-                    if (ambig_set)
+                    if (ambig_set && ambig_set != &ambig_fallback)
                       ambig_set[option_index] = 1;
                   }
               }
           }
 
-      if (ambig_set || ambig_fallback)
+      if (ambig_set)
         {
           if (print_errors)
             {
-              if (ambig_fallback)
+              if (ambig_set == &ambig_fallback)
                 fprintf (stderr, _("%s: option '%s%s' is ambiguous\n"),
                          argv[0], prefix, d->__nextchar);
               else
@@ -296,8 +300,7 @@ process_long_option (int argc, char **argv, const char *optstring,
                   funlockfile (stderr);
                 }
             }
-          if (ambig_malloced)
-            free (ambig_set);
+          free (ambig_malloced);
           d->__nextchar += strlen (d->__nextchar);
           d->optind++;
           d->optopt = 0;
diff --git a/gl/getopt.in.h b/gl/getopt.in.h
index 0867d365..c2411a75 100644
--- a/gl/getopt.in.h
+++ b/gl/getopt.in.h
@@ -1,5 +1,5 @@
 /* Declarations for getopt.
-   Copyright (C) 1989-2023 Free Software Foundation, Inc.
+   Copyright (C) 1989-2024 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
diff --git a/gl/getopt1.c b/gl/getopt1.c
index 49323aa8..c42d29f8 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1987-2024 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.
 
@@ -21,7 +21,7 @@
 # include <config.h>
 #endif
 
-#include "getopt.h"
+#include <getopt.h>
 #include "getopt_int.h"
 
 int
diff --git a/gl/getopt_int.h b/gl/getopt_int.h
index 4d9e24be..c00c0b69 100644
--- a/gl/getopt_int.h
+++ b/gl/getopt_int.h
@@ -1,5 +1,5 @@
 /* Internal declarations for getopt.
-   Copyright (C) 1989-2023 Free Software Foundation, Inc.
+   Copyright (C) 1989-2024 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 32c96043..392a9a2f 100644
--- a/gl/getprogname.c
+++ b/gl/getprogname.c
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2016-2023 Free Software Foundation, Inc.
+   Copyright (C) 2016-2024 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
@@ -16,11 +16,10 @@
 
 #include <config.h>
 
-/* Specification.  */
-#include "getprogname.h"
+/* Specification.  Also get __argv declaration.  */
+#include <stdlib.h>
 
 #include <errno.h> /* get program_invocation_name declaration */
-#include <stdlib.h> /* get __argv declaration */
 
 #ifdef _AIX
 # include <unistd.h>
@@ -53,13 +52,12 @@
 
 #if defined __SCO_VERSION__ || defined __sysv5__
 # include <fcntl.h>
-# include <stdlib.h>
 # include <string.h>
 #endif
 
 #include "basename-lgpl.h"
 
-#ifndef HAVE_GETPROGNAME             /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Cygwin */
+#ifndef HAVE_GETPROGNAME  /* not Mac OS X, FreeBSD, NetBSD, OpenBSD >= 5.4, Solaris >= 11, Cygwin, Android API level >= 21 */
 char const *
 getprogname (void)
 {
@@ -214,7 +212,19 @@ getprogname (void)
                 {
                   char *s = strdup (last_component (buf.ps_pathptr));
                   if (s)
-                    p = s;
+                    {
+#  if defined __XPLINK__ && __CHARSET_LIB == 1
+                      /* The compiler option -qascii is in use.
+                         https://makingdeveloperslivesbetter.wordpress.com/2022/01/07/is-z-os-ascii-or-ebcdic-yes/
+                         https://www.ibm.com/docs/en/zos/2.5.0?topic=features-macros-related-compiler-option-settings
+                         So, convert the result from EBCDIC to ASCII.
+                         https://www.ibm.com/docs/en/zos/2.5.0?topic=functions-e2a-s-convert-string-from-ebcdic-ascii */
+                      if (__e2a_s (s) == (size_t)-1)
+                        free (s);
+                      else
+#  endif
+                        p = s;
+                    }
                   break;
                 }
             }
diff --git a/gl/getprogname.h b/gl/getprogname.h
index 4b9126f9..bee1c1a2 100644
--- a/gl/getprogname.h
+++ b/gl/getprogname.h
@@ -1,5 +1,5 @@
 /* Program name management.
-   Copyright (C) 2016-2023 Free Software Foundation, Inc.
+   Copyright (C) 2016-2024 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
@@ -19,22 +19,8 @@
 
 #include <stdlib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Return the base name of the executing program.
-   On native Windows this will usually end in ".exe" or ".EXE". */
-#ifndef HAVE_GETPROGNAME
-extern char const *getprogname (void)
-# ifdef HAVE_DECL_PROGRAM_INVOCATION_NAME
-  _GL_ATTRIBUTE_PURE
-# endif
-  ;
-#endif
-
-#ifdef __cplusplus
-}
+#if __GNUC__ || (__clang_major__ >= 4)
+# warning "The include file getprogname.h is deprecated. Use <stdlib.h> instead."
 #endif
 
 #endif
diff --git a/gl/gettext.h b/gl/gettext.h
index d0462c47..39d5ae4d 100644
--- a/gl/gettext.h
+++ b/gl/gettext.h
@@ -1,5 +1,5 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
-   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2023 Free Software
+   Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/gl_openssl.h b/gl/gl_openssl.h
index f63c386e..06864732 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2013-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
@@ -17,13 +17,15 @@
 
 /* Written by Pádraig Brady */
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #ifndef GL_OPENSSL_NAME
 # error "Please define GL_OPENSSL_NAME to 1,5,256 etc."
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
-# error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef GL_OPENSSL_INLINE
 # define GL_OPENSSL_INLINE _GL_INLINE
diff --git a/gl/glthread/lock.c b/gl/glthread/lock.c
index 82fb7553..6661ad6a 100644
--- a/gl/glthread/lock.c
+++ b/gl/glthread/lock.c
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/glthread/lock.h b/gl/glthread/lock.h
index ae3ee2d6..2d5cb320 100644
--- a/gl/glthread/lock.h
+++ b/gl/glthread/lock.h
@@ -1,5 +1,5 @@
 /* Locking in multithreaded situations.
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
@@ -77,6 +77,14 @@
 #ifndef _LOCK_H
 #define _LOCK_H
 
+/* This file uses HAVE_THREADS_H, HAVE_PTHREAD_RWLOCK,
+   HAVE_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER,
+   PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP,
+   HAVE_PTHREAD_MUTEX_RECURSIVE.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include <errno.h>
 #include <stdlib.h>
 
diff --git a/gl/glthread/threadlib.c b/gl/glthread/threadlib.c
index 5ecf827f..7a776768 100644
--- a/gl/glthread/threadlib.c
+++ b/gl/glthread/threadlib.c
@@ -1,5 +1,5 @@
 /* Multithreading primitives.
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/hard-locale.c b/gl/hard-locale.c
index 0a28552e..653c5809 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-2023 Free Software
+   Copyright (C) 1997-1999, 2002-2004, 2006-2007, 2009-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -21,6 +21,7 @@
 #include "hard-locale.h"
 
 #include <locale.h>
+#include <stdlib.h>
 #include <string.h>
 
 bool
@@ -31,5 +32,16 @@ hard_locale (int category)
   if (setlocale_null_r (category, locale, sizeof (locale)))
     return false;
 
-  return !(strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0);
+  if (!(strcmp (locale, "C") == 0 || strcmp (locale, "POSIX") == 0))
+    return true;
+
+#if defined __ANDROID__
+  /* On Android 5.0 or newer, it is possible to set a locale that has the same
+     name as the "C" locale but in fact uses UTF-8 encoding.  Cf. test case 2 in
+     <https://lists.gnu.org/archive/html/bug-gnulib/2023-01/msg00141.html>.  */
+  if (MB_CUR_MAX > 1)
+    return true;
+#endif
+
+  return false;
 }
diff --git a/gl/hard-locale.h b/gl/hard-locale.h
index 880c9e85..5d40e522 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2003-2004, 2009-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
@@ -16,11 +16,23 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef HARD_LOCALE_H_
-# define HARD_LOCALE_H_ 1
+#define HARD_LOCALE_H_ 1
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 /* Return true if the specified CATEGORY of the current locale is hard, i.e.
    different from the C or POSIX locale that has a fixed behavior.
-   CATEGORY must be one of the LC_* values, but not LC_ALL.  */
+   CATEGORY must be one of the LC_* values, but not LC_ALL.
+   Note: This function uses the current global locale; it ignores the
+   per-thread locale.  */
 extern bool hard_locale (int category);
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* HARD_LOCALE_H_ */
diff --git a/gl/ialloc.c b/gl/ialloc.c
index cd44d8ca..8564a15b 100644
--- a/gl/ialloc.c
+++ b/gl/ialloc.c
@@ -1,6 +1,6 @@
 /* malloc with idx_t rather than size_t
 
-   Copyright 2021-2023 Free Software Foundation, Inc.
+   Copyright 2021-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
diff --git a/gl/ialloc.h b/gl/ialloc.h
index 1d43faf3..2aa94ae7 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-2023 Free Software Foundation, Inc.
+   Copyright 2021-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
@@ -18,15 +18,21 @@
 #ifndef IALLOC_H_
 #define IALLOC_H_
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_ATTRIBUTE_COLD,
+   _GL_ATTRIBUTE_MALLOC.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include "idx.h"
 
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
-
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
+#if defined __CHERI_PURE_CAPABILITY__
+# include <cheri.h>
 #endif
+
 _GL_INLINE_HEADER_BEGIN
 #ifndef IALLOC_INLINE
 # define IALLOC_INLINE _GL_INLINE
@@ -43,6 +49,9 @@ _gl_alloc_nomem (void)
   return NULL;
 }
 
+/* imalloc (size) is like malloc (size).
+   It returns a non-NULL pointer to size bytes of memory.
+   Upon failure, it returns NULL with errno set.  */
 IALLOC_INLINE
 _GL_ATTRIBUTE_MALLOC /*_GL_ATTRIBUTE_DEALLOC_FREE*/
 void *
@@ -51,16 +60,32 @@ imalloc (idx_t s)
   return s <= SIZE_MAX ? malloc (s) : _gl_alloc_nomem ();
 }
 
+/* irealloc (ptr, size) is like realloc (ptr, size).
+   It returns a non-NULL pointer to size bytes of memory.
+   Upon failure, it returns NULL with errno set.  */
 IALLOC_INLINE
 /*_GL_ATTRIBUTE_DEALLOC_FREE*/
 void *
 irealloc (void *p, idx_t s)
 {
-  /* Work around GNU realloc glitch by treating a zero size as if it
-     were 1, so that returning NULL is equivalent to failing.  */
-  return s <= SIZE_MAX ? realloc (p, s | !s) : _gl_alloc_nomem ();
+  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 ();
 }
 
+/* icalloc (num, size) is like calloc (num, size).
+   It returns a non-NULL pointer to num * size bytes of memory.
+   Upon failure, it returns NULL with errno set.  */
 IALLOC_INLINE
 _GL_ATTRIBUTE_MALLOC /*_GL_ATTRIBUTE_DEALLOC_FREE*/
 void *
@@ -81,20 +106,35 @@ icalloc (idx_t n, idx_t s)
   return calloc (n, s);
 }
 
+/* ireallocarray (ptr, num, size) is like reallocarray (ptr, num, size).
+   It returns a non-NULL pointer to num * size bytes of memory.
+   Upon failure, it returns NULL with errno set.  */
 IALLOC_INLINE void *
 ireallocarray (void *p, idx_t n, idx_t s)
 {
-  /* Work around GNU reallocarray glitch by treating a zero size as if
-     it were 1, so that returning NULL is equivalent to failing.  */
-  if (n == 0 || s == 0)
-    n = s = 1;
-  return (n <= SIZE_MAX && s <= SIZE_MAX
-          ? reallocarray (p, n, s)
-          : _gl_alloc_nomem ());
+  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 ();
 }
 
 #ifdef __cplusplus
 }
 #endif
 
+_GL_INLINE_HEADER_END
+
 #endif
diff --git a/gl/idpriv-droptemp.c b/gl/idpriv-droptemp.c
index 2a85431a..eb882dea 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-2024 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/idpriv.h b/gl/idpriv.h
index 99f87c08..a3ae5926 100644
--- a/gl/idpriv.h
+++ b/gl/idpriv.h
@@ -1,5 +1,5 @@
 /* Dropping uid/gid privileges of the current process.
-   Copyright (C) 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-2024 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 23020b7e..43793f2d 100644
--- a/gl/idx.h
+++ b/gl/idx.h
@@ -1,5 +1,5 @@
 /* A type for indices and sizes.
-   Copyright (C) 2020-2023 Free Software Foundation, Inc.
+   Copyright (C) 2020-2024 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
@@ -111,6 +111,11 @@
        help producing good code and good warnings.  The type 'idx_t' could
        then be typedef'ed to a range type that is signed after promotion.  */
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* In the future, idx_t could be typedef'ed to a signed range type.
    The clang "extended integer types", supported in Clang 11 or newer
    <https://clang.llvm.org/docs/LanguageExtensions.html#extended-integer-types>,
@@ -131,4 +136,9 @@ typedef ptrdiff_t idx_t;
    Perhaps there should be another macro IDX_VALUE_BITS that does not
    count the sign bit and is therefore one less than PTRDIFF_WIDTH.  */
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _IDX_H */
diff --git a/gl/inet_ntop.c b/gl/inet_ntop.c
index 9e2d412e..0a4ba20e 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-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
diff --git a/gl/intprops-internal.h b/gl/intprops-internal.h
index 0467a9ca..b5ba8d7c 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 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
@@ -20,6 +20,11 @@
 
 #include <limits.h>
 
+/* Pacify GCC 13.2 in some calls to _GL_EXPR_SIGNED.  */
+#if defined __GNUC__ && 4 < __GNUC__ + (3 <= __GNUC_MINOR__)
+# pragma GCC diagnostic ignored "-Wtype-limits"
+#endif
+
 /* Return a value with the common real type of E and V and the value of V.
    Do not evaluate E.  */
 #define _GL_INT_CONVERT(e, v) ((1 ? 0 : (e)) + (v))
@@ -164,7 +169,9 @@
    /* Work around GCC bug 91450.  */
 #  define _GL_INT_MULTIPLY_WRAPV(a, b, r) \
     ((!_GL_SIGNED_TYPE_OR_EXPR (*(r)) && _GL_EXPR_SIGNED (a) && _GL_EXPR_SIGNED (b) \
-      && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, 0, (__typeof__ (*(r))) -1)) \
+      && _GL_INT_MULTIPLY_RANGE_OVERFLOW (a, b, \
+                                          (__typeof__ (*(r))) 0, \
+                                          (__typeof__ (*(r))) -1)) \
      ? ((void) __builtin_mul_overflow (a, b, r), 1) \
      : __builtin_mul_overflow (a, b, r))
 # endif
diff --git a/gl/intprops.h b/gl/intprops.h
index 44b5e60f..43734f34 100644
--- a/gl/intprops.h
+++ b/gl/intprops.h
@@ -1,6 +1,6 @@
 /* intprops.h -- properties of integer types
 
-   Copyright (C) 2001-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2024 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/inttypes.in.h b/gl/inttypes.in.h
index 50a2bbfc..b9ab8a4b 100644
--- a/gl/inttypes.in.h
+++ b/gl/inttypes.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2023 Free Software Foundation, Inc.
+/* Copyright (C) 2006-2024 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Derek Price.
    This file is part of gnulib.
 
@@ -46,6 +46,11 @@
 #if ! defined INTTYPES_H && ! defined _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 #define INTTYPES_H
 
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Include <stdint.h> or the gnulib replacement.
    But avoid namespace pollution on glibc systems.  */
 #ifndef __GLIBC__
@@ -903,8 +908,21 @@ extern "C" {
 #endif
 
 #if @GNULIB_IMAXABS@
-# if !@HAVE_DECL_IMAXABS@
-extern intmax_t imaxabs (intmax_t);
+# if @REPLACE_IMAXABS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef imaxabs
+#   define imaxabs rpl_imaxabs
+#  endif
+_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));
+#  endif
+_GL_CXXALIAS_SYS (imaxabs, intmax_t, (intmax_t x));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (imaxabs);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef imaxabs
@@ -921,8 +939,21 @@ typedef struct { intmax_t quot; intmax_t rem; } imaxdiv_t;
 #   define GNULIB_defined_imaxdiv_t 1
 #  endif
 # endif
-# if !@HAVE_DECL_IMAXDIV@
-extern imaxdiv_t imaxdiv (intmax_t, intmax_t);
+# if @REPLACE_IMAXDIV@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef imaxdiv
+#   define imaxdiv rpl_imaxdiv
+#  endif
+_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));
+#  endif
+_GL_CXXALIAS_SYS (imaxdiv, imaxdiv_t, (intmax_t numer, intmax_t denom));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (imaxdiv);
 # endif
 #elif defined GNULIB_POSIXCHECK
 # undef imaxdiv
diff --git a/gl/iswblank.c b/gl/iswblank.c
new file mode 100644
index 00000000..f699850a
--- /dev/null
+++ b/gl/iswblank.c
@@ -0,0 +1,26 @@
+/* Test wide character for being blank.
+   Copyright (C) 2008-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/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wctype.h>
+
+int
+iswblank (wint_t wc)
+{
+  return wc == ' ' || wc == '\t';
+}
diff --git a/gl/iswctype-impl.h b/gl/iswctype-impl.h
new file mode 100644
index 00000000..999f220c
--- /dev/null
+++ b/gl/iswctype-impl.h
@@ -0,0 +1,22 @@
+/* Test whether a wide character has a given property.
+   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   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/>.  */
+
+int
+iswctype (wint_t wc, wctype_t desc)
+{
+  return ((int (*) (wint_t)) desc) (wc);
+}
diff --git a/gl/iswctype.c b/gl/iswctype.c
new file mode 100644
index 00000000..f4e6f015
--- /dev/null
+++ b/gl/iswctype.c
@@ -0,0 +1,36 @@
+/* Test whether a wide character has a given property.
+   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   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 <wctype.h>
+
+#if GNULIB_defined_wint_t && !GNULIB_defined_wctype_t
+
+int
+iswctype (wint_t wc, wctype_t desc)
+# undef iswctype
+{
+  return ((wchar_t) wc == wc ? iswctype ((wchar_t) wc, desc) : 0);
+}
+
+#else
+
+# include "iswctype-impl.h"
+
+#endif
diff --git a/gl/iswdigit.c b/gl/iswdigit.c
new file mode 100644
index 00000000..57363ab8
--- /dev/null
+++ b/gl/iswdigit.c
@@ -0,0 +1,26 @@
+/* Test wide character for being a digit.
+   Copyright (C) 2020-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/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wctype.h>
+
+int
+iswdigit (wint_t wc)
+{
+  return wc >= '0' && wc <= '9';
+}
diff --git a/gl/iswpunct.c b/gl/iswpunct.c
new file mode 100644
index 00000000..c7cb28b5
--- /dev/null
+++ b/gl/iswpunct.c
@@ -0,0 +1,33 @@
+/* Test wide character for being a punctuation or symbol character.
+   Copyright (C) 2023-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/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wctype.h>
+
+#include <ctype.h>
+
+int
+iswpunct (wint_t wc)
+#undef iswpunct
+{
+#if defined __ANDROID__
+  if ((unsigned int) wc < 128)
+    return ispunct ((unsigned int) wc);
+#endif
+  return iswpunct (wc);
+}
diff --git a/gl/iswxdigit.c b/gl/iswxdigit.c
new file mode 100644
index 00000000..d32e3b0f
--- /dev/null
+++ b/gl/iswxdigit.c
@@ -0,0 +1,33 @@
+/* Test wide character for being a hexadecimal digit.
+   Copyright (C) 2020-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/>.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include <wctype.h>
+
+int
+iswxdigit (wint_t wc)
+{
+  return ((wc >= '0' && wc <= '9')
+#if 'A' == 0x41 && 'a' == 0x61
+          /* Optimization, assuming ASCII */
+          || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F')
+#else
+          || (wc >= 'A' && wc <= 'F') || (wc >= 'a' && wc <= 'f')
+#endif
+         );
+}
diff --git a/gl/itold.c b/gl/itold.c
index 0ef4464e..e6fbcff4 100644
--- a/gl/itold.c
+++ b/gl/itold.c
@@ -1,5 +1,5 @@
 /* Replacement for 'int' to 'long double' conversion routine.
-   Copyright (C) 2011-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-2024 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 c7555a6a..febbd25f 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-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
@@ -34,6 +34,11 @@
 #ifndef _@GUARD_PREFIX@_LANGINFO_H
 #define _@GUARD_PREFIX@_LANGINFO_H
 
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 
 #if !@HAVE_LANGINFO_H@
 
@@ -208,7 +213,9 @@ _GL_FUNCDECL_SYS (nl_langinfo, char *, (nl_item item));
 #  endif
 _GL_CXXALIAS_SYS (nl_langinfo, char *, (nl_item item));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (nl_langinfo);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef nl_langinfo
 # if HAVE_RAW_DECL_NL_LANGINFO
diff --git a/gl/lc-charset-dispatch.c b/gl/lc-charset-dispatch.c
index cd74466b..e2f8b2f5 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2018-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
diff --git a/gl/lc-charset-dispatch.h b/gl/lc-charset-dispatch.h
index c82b6a60..4c1cf5f1 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2018-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
diff --git a/gl/libc-config.h b/gl/libc-config.h
index 1d28e58c..70114608 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-2023 Free Software Foundation, Inc.
+   Copyright 2017-2024 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
@@ -137,8 +137,6 @@
 # undef __attribute_returns_twice__
 # undef __attribute_used__
 # undef __attribute_warn_unused_result__
-# undef __bos
-# undef __bos0
 # undef __errordecl
 # undef __extension__
 # undef __extern_always_inline
@@ -147,21 +145,13 @@
 # undef __fortified_attr_access
 # undef __fortify_function
 # undef __glibc_c99_flexarr_available
-# undef __glibc_fortify
-# undef __glibc_fortify_n
 # undef __glibc_has_attribute
 # undef __glibc_has_builtin
 # undef __glibc_has_extension
 # undef __glibc_likely
 # undef __glibc_macro_warning
 # undef __glibc_macro_warning1
-# undef __glibc_objsize
-# undef __glibc_objsize0
-# undef __glibc_safe_len_cond
-# undef __glibc_safe_or_unknown_len
 # undef __glibc_unlikely
-# undef __glibc_unsafe_len
-# undef __glibc_unsigned_or_positive
 # undef __inline
 # undef __ptr_t
 # undef __restrict
@@ -170,6 +160,18 @@
 # undef __va_arg_pack_len
 # undef __warnattr
 # undef __wur
+# ifndef __GNULIB_CDEFS
+#  undef __bos
+#  undef __bos0
+#  undef __glibc_fortify
+#  undef __glibc_fortify_n
+#  undef __glibc_objsize
+#  undef __glibc_objsize0
+#  undef __glibc_safe_len_cond
+#  undef __glibc_safe_or_unknown_len
+#  undef __glibc_unsafe_len
+#  undef __glibc_unsigned_or_positive
+# endif
 
 /* Include our copy of glibc <sys/cdefs.h>.  */
 # include <cdefs.h>
diff --git a/gl/limits.in.h b/gl/limits.in.h
index eaeac472..c65eb4c1 100644
--- a/gl/limits.in.h
+++ b/gl/limits.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <limits.h>.
 
-   Copyright 2016-2023 Free Software Foundation, Inc.
+   Copyright 2016-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
@@ -99,6 +99,11 @@
 # endif
 #endif
 
+/* Assume no multibyte character is longer than 16 bytes.  */
+#ifndef MB_LEN_MAX
+# define MB_LEN_MAX 16
+#endif
+
 /* Macros specified by C23 and by ISO/IEC TS 18661-1:2014.  */
 
 #if (! defined ULLONG_WIDTH                                             \
@@ -119,11 +124,26 @@
 
 /* Macros specified by C23.  */
 
-#if (! defined BOOL_WIDTH \
-     && (defined _GNU_SOURCE \
-         || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__)))
-# define BOOL_MAX 1
-# define BOOL_WIDTH 1
+#if (defined _GNU_SOURCE \
+     || (defined __STDC_VERSION__ && 201710 < __STDC_VERSION__))
+# if ! defined BOOL_WIDTH
+#  define BOOL_WIDTH 1
+#  define BOOL_MAX 1
+# elif ! defined BOOL_MAX
+#  define BOOL_MAX 1
+# endif
+#endif
+
+/* Macro specified by POSIX.  */
+
+/* The maximum ssize_t value.  Although it might not be of ssize_t type
+   as it should be, it's too much trouble to fix this minor detail.  */
+#ifndef SSIZE_MAX
+# ifdef _WIN64
+#  define SSIZE_MAX LLONG_MAX
+# else
+#  define SSIZE_MAX LONG_MAX
+# endif
 #endif
 
 #endif /* _@GUARD_PREFIX@_LIMITS_H */
diff --git a/gl/localcharset.c b/gl/localcharset.c
index 7ed9c957..93c4baa4 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2000-2006, 2008-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
@@ -1054,7 +1054,7 @@ locale_charset (void)
           }
       }
     if (0)
-      done_table_lookup: ;
+      done_table_lookup: {}
     else
 # endif
       {
diff --git a/gl/localcharset.h b/gl/localcharset.h
index 29ee8dc0..47214024 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003, 2009-2024 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
@@ -104,10 +104,8 @@ extern const char * locale_charset (void);
    GBK                         glibc aix osf solaris freebsd darwin cygwin windows dos
    GB18030                     glibc hpux solaris freebsd netbsd darwin
    SHIFT_JIS               Y   hpux osf solaris freebsd netbsd darwin
-   JOHAB                       glibc solaris windows
+   JOHAB                       solaris windows
    TIS-620                     glibc aix hpux osf solaris cygwin zos
-   VISCII                  Y   glibc
-   TCVN5712-1                  glibc
    ARMSCII-8                   glibc freebsd netbsd darwin
    GEORGIAN-PS                 glibc cygwin
    PT154                       glibc netbsd cygwin
diff --git a/gl/locale.in.h b/gl/locale.in.h
index 538b8341..1b11a41c 100644
--- a/gl/locale.in.h
+++ b/gl/locale.in.h
@@ -1,5 +1,5 @@
 /* A POSIX <locale.h>.
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -44,6 +44,11 @@
 #ifndef _@GUARD_PREFIX@_LOCALE_H
 #define _@GUARD_PREFIX@_LOCALE_H
 
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
@@ -211,7 +216,7 @@ _GL_WARN_ON_USE (setlocale, "setlocale works differently on native Windows - "
 # include "setlocale_null.h"
 #endif
 
-#if /*@GNULIB_NEWLOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_NEWLOCALE@)
+#if /*@GNULIB_NEWLOCALE@ ||*/ (@GNULIB_LOCALENAME_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_NEWLOCALE@)
 # if @REPLACE_NEWLOCALE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef newlocale
@@ -229,7 +234,7 @@ _GL_CXXALIAS_SYS (newlocale, locale_t,
                   (int category_mask, const char *name, locale_t base));
 #  endif
 # endif
-# if @HAVE_NEWLOCALE@
+# if __GLIBC__ >= 2 && @HAVE_NEWLOCALE@
 _GL_CXXALIASWARN (newlocale);
 # endif
 # if @HAVE_NEWLOCALE@ || @REPLACE_NEWLOCALE@
@@ -244,24 +249,24 @@ _GL_WARN_ON_USE (newlocale, "newlocale is not portable");
 # endif
 #endif
 
-#if @GNULIB_DUPLOCALE@ || (@GNULIB_LOCALENAME@ && @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
+#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)));
 _GL_CXXALIAS_RPL (duplocale, locale_t, (locale_t locale));
-# else
-#  if @HAVE_DUPLOCALE@
+#  else
 _GL_CXXALIAS_SYS (duplocale, locale_t, (locale_t locale));
 #  endif
 # endif
-# if @HAVE_DUPLOCALE@
+# if __GLIBC__ >= 2 && @HAVE_DUPLOCALE@
 _GL_CXXALIASWARN (duplocale);
 # endif
-# if @HAVE_DUPLOCALE@ || @REPLACE_DUPLOCALE@
+# if @HAVE_DUPLOCALE@
 #  ifndef HAVE_WORKING_DUPLOCALE
 #   define HAVE_WORKING_DUPLOCALE 1
 #  endif
@@ -274,7 +279,7 @@ _GL_WARN_ON_USE (duplocale, "duplocale is buggy on some glibc systems - "
 # endif
 #endif
 
-#if /*@GNULIB_FREELOCALE@ ||*/ (@GNULIB_LOCALENAME@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_FREELOCALE@)
+#if /*@GNULIB_FREELOCALE@ ||*/ (@GNULIB_LOCALENAME_UNSAFE@ && @LOCALENAME_ENHANCE_LOCALE_FUNCS@ && @HAVE_FREELOCALE@)
 # if @REPLACE_FREELOCALE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef freelocale
@@ -290,7 +295,7 @@ _GL_CXXALIAS_RPL (freelocale, void, (locale_t locale));
 _GL_CXXALIAS_SYS_CAST (freelocale, void, (locale_t locale));
 #  endif
 # endif
-# if @HAVE_FREELOCALE@
+# if __GLIBC__ >= 2 && @HAVE_FREELOCALE@
 _GL_CXXALIASWARN (freelocale);
 # endif
 #elif defined GNULIB_POSIXCHECK
diff --git a/gl/localeconv.c b/gl/localeconv.c
index 60c050f4..10fc7b74 100644
--- a/gl/localeconv.c
+++ b/gl/localeconv.c
@@ -1,5 +1,5 @@
 /* Query locale dependent information for formatting numbers.
-   Copyright (C) 2012-2023 Free Software Foundation, Inc.
+   Copyright (C) 2012-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
@@ -19,10 +19,14 @@
 /* Specification.  */
 #include <locale.h>
 
+#include <limits.h>
+
 #if HAVE_STRUCT_LCONV_DECIMAL_POINT
 
+# define FIX_CHAR_VALUE(x) ((x) >= 0 ? (x) : CHAR_MAX)
+
 /* Override for platforms where 'struct lconv' lacks the int_p_*, int_n_*
-   members.  */
+   members or where fields of type 'char' are set to -1 instead of CHAR_MAX.  */
 
 struct lconv *
 localeconv (void)
@@ -41,21 +45,30 @@ localeconv (void)
   result.positive_sign = sys_result->positive_sign;
   result.negative_sign = sys_result->negative_sign;
   result.currency_symbol = sys_result->currency_symbol;
-  result.frac_digits = sys_result->frac_digits;
-  result.p_cs_precedes = sys_result->p_cs_precedes;
-  result.p_sign_posn = sys_result->p_sign_posn;
-  result.p_sep_by_space = sys_result->p_sep_by_space;
-  result.n_cs_precedes = sys_result->n_cs_precedes;
-  result.n_sign_posn = sys_result->n_sign_posn;
-  result.n_sep_by_space = sys_result->n_sep_by_space;
+  result.frac_digits = FIX_CHAR_VALUE (sys_result->frac_digits);
+  result.p_cs_precedes = FIX_CHAR_VALUE (sys_result->p_cs_precedes);
+  result.p_sign_posn = FIX_CHAR_VALUE (sys_result->p_sign_posn);
+  result.p_sep_by_space = FIX_CHAR_VALUE (sys_result->p_sep_by_space);
+  result.n_cs_precedes = FIX_CHAR_VALUE (sys_result->n_cs_precedes);
+  result.n_sign_posn = FIX_CHAR_VALUE (sys_result->n_sign_posn);
+  result.n_sep_by_space = FIX_CHAR_VALUE (sys_result->n_sep_by_space);
   result.int_curr_symbol = sys_result->int_curr_symbol;
-  result.int_frac_digits = sys_result->int_frac_digits;
-  result.int_p_cs_precedes = sys_result->p_cs_precedes;
-  result.int_p_sign_posn = sys_result->p_sign_posn;
-  result.int_p_sep_by_space = sys_result->p_sep_by_space;
-  result.int_n_cs_precedes = sys_result->n_cs_precedes;
-  result.int_n_sign_posn = sys_result->n_sign_posn;
-  result.int_n_sep_by_space = sys_result->n_sep_by_space;
+  result.int_frac_digits = FIX_CHAR_VALUE (sys_result->int_frac_digits);
+# if HAVE_STRUCT_LCONV_INT_P_CS_PRECEDES
+  result.int_p_cs_precedes = FIX_CHAR_VALUE (sys_result->int_p_cs_precedes);
+  result.int_p_sign_posn = FIX_CHAR_VALUE (sys_result->int_p_sign_posn);
+  result.int_p_sep_by_space = FIX_CHAR_VALUE (sys_result->int_p_sep_by_space);
+  result.int_n_cs_precedes = FIX_CHAR_VALUE (sys_result->int_n_cs_precedes);
+  result.int_n_sign_posn = FIX_CHAR_VALUE (sys_result->int_n_sign_posn);
+  result.int_n_sep_by_space = FIX_CHAR_VALUE (sys_result->int_n_sep_by_space);
+# else
+  result.int_p_cs_precedes = FIX_CHAR_VALUE (sys_result->p_cs_precedes);
+  result.int_p_sign_posn = FIX_CHAR_VALUE (sys_result->p_sign_posn);
+  result.int_p_sep_by_space = FIX_CHAR_VALUE (sys_result->p_sep_by_space);
+  result.int_n_cs_precedes = FIX_CHAR_VALUE (sys_result->n_cs_precedes);
+  result.int_n_sign_posn = FIX_CHAR_VALUE (sys_result->n_sign_posn);
+  result.int_n_sep_by_space = FIX_CHAR_VALUE (sys_result->n_sep_by_space);
+# endif
 
   return &result;
 }
@@ -64,8 +77,6 @@ localeconv (void)
 
 /* Override for platforms where 'struct lconv' is a dummy.  */
 
-# include <limits.h>
-
 struct lconv *
 localeconv (void)
 {
diff --git a/gl/lseek.c b/gl/lseek.c
index 7919b03c..61bd9fcb 100644
--- a/gl/lseek.c
+++ b/gl/lseek.c
@@ -1,5 +1,5 @@
 /* An lseek() function that detects pipes.
-   Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009-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
diff --git a/gl/m4/00gnulib.m4 b/gl/m4/00gnulib.m4
index 7fe03e0b..cd167718 100644
--- a/gl/m4/00gnulib.m4
+++ b/gl/m4/00gnulib.m4
@@ -1,5 +1,6 @@
-# 00gnulib.m4 serial 8
-dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
+# 00gnulib.m4
+# serial 9
+dnl Copyright (C) 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.
@@ -49,14 +50,14 @@ dnl AC_REQUIRE([gl_COMPILER_CLANG])
     [if test $gl_cv_compiler_clang = yes; then
        dnl Test whether the compiler supports the option
        dnl '-Werror=implicit-function-declaration'.
-       save_ac_compile="$ac_compile"
+       saved_ac_compile="$ac_compile"
        ac_compile="$ac_compile -Werror=implicit-function-declaration"
        dnl Use _AC_COMPILE_IFELSE instead of AC_COMPILE_IFELSE, to avoid a
        dnl warning "AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS".
        _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])],
          [gl_cv_compiler_check_decl_option='-Werror=implicit-function-declaration'],
          [gl_cv_compiler_check_decl_option=none])
-       ac_compile="$save_ac_compile"
+       ac_compile="$saved_ac_compile"
      else
        gl_cv_compiler_check_decl_option=none
      fi
@@ -71,11 +72,11 @@ dnl Redefine _AC_CHECK_DECL_BODY so that it references ac_compile_for_check_decl
 dnl instead of ac_compile.  If, for whatever reason, the override of AC_PROG_CC
 dnl in zzgnulib.m4 is inactive, use the original ac_compile.
 m4_define([_AC_CHECK_DECL_BODY],
-[  ac_save_ac_compile="$ac_compile"
+[  ac_saved_ac_compile="$ac_compile"
   if test -n "$ac_compile_for_check_decl"; then
     ac_compile="$ac_compile_for_check_decl"
   fi]
-m4_defn([_AC_CHECK_DECL_BODY])[  ac_compile="$ac_save_ac_compile"
+m4_defn([_AC_CHECK_DECL_BODY])[  ac_compile="$ac_saved_ac_compile"
 ])
 
 # gl_00GNULIB
diff --git a/gl/m4/__inline.m4 b/gl/m4/__inline.m4
index acf8668b..20baf164 100644
--- a/gl/m4/__inline.m4
+++ b/gl/m4/__inline.m4
@@ -1,9 +1,12 @@
-# Test for __inline keyword
-dnl Copyright 2017-2023 Free Software Foundation, Inc.
+# __inline.m4
+# serial 1
+dnl Copyright 2017-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.
 
+# Test for __inline keyword
+
 AC_DEFUN([gl___INLINE],
 [
   AC_CACHE_CHECK([whether the compiler supports the __inline keyword],
diff --git a/gl/m4/absolute-header.m4 b/gl/m4/absolute-header.m4
index e7947648..0abd6d90 100644
--- a/gl/m4/absolute-header.m4
+++ b/gl/m4/absolute-header.m4
@@ -1,5 +1,6 @@
-# absolute-header.m4 serial 17
-dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
+# absolute-header.m4
+# serial 18
+dnl Copyright (C) 2006-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.
@@ -66,7 +67,7 @@ AC_DEFUN([gl_ABSOLUTE_HEADER_ONE],
   esac
 changequote(,)
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl For the sake of native Windows compilers (excluding gcc),
       dnl treat backslash as a directory separator, like /.
       dnl Actually, these compilers use a double-backslash as
diff --git a/gl/m4/af_alg.m4 b/gl/m4/af_alg.m4
index f4c0d624..33b74945 100644
--- a/gl/m4/af_alg.m4
+++ b/gl/m4/af_alg.m4
@@ -1,5 +1,6 @@
-# af_alg.m4 serial 6
-dnl Copyright 2018-2023 Free Software Foundation, Inc.
+# af_alg.m4
+# serial 6
+dnl Copyright 2018-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.
diff --git a/gl/m4/alloca.m4 b/gl/m4/alloca.m4
index c685fac9..dc78dc19 100644
--- a/gl/m4/alloca.m4
+++ b/gl/m4/alloca.m4
@@ -1,5 +1,6 @@
-# alloca.m4 serial 21
-dnl Copyright (C) 2002-2004, 2006-2007, 2009-2023 Free Software Foundation,
+# alloca.m4
+# serial 21
+dnl Copyright (C) 2002-2004, 2006-2007, 2009-2024 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,
diff --git a/gl/m4/arpa_inet_h.m4 b/gl/m4/arpa_inet_h.m4
index fa5fe831..9eac86d7 100644
--- a/gl/m4/arpa_inet_h.m4
+++ b/gl/m4/arpa_inet_h.m4
@@ -1,5 +1,6 @@
-# arpa_inet_h.m4 serial 17
-dnl Copyright (C) 2006, 2008-2023 Free Software Foundation, Inc.
+# arpa_inet_h.m4
+# serial 17
+dnl Copyright (C) 2006, 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.
diff --git a/gl/m4/assert_h.m4 b/gl/m4/assert_h.m4
index abba4fa3..b90d0f19 100644
--- a/gl/m4/assert_h.m4
+++ b/gl/m4/assert_h.m4
@@ -1,5 +1,6 @@
-# assert-h.m4
-dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
+# assert_h.m4
+# serial 1
+dnl Copyright (C) 2011-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.
@@ -9,16 +10,16 @@ dnl From Paul Eggert.
 AC_DEFUN([gl_ASSERT_H],
 [
   AC_CACHE_CHECK([for static_assert], [gl_cv_static_assert],
-    [gl_save_CFLAGS=$CFLAGS
+    [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_save_CFLAGS -DINCLUDE_ASSERT_H"])
+        [*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++17-extensions"
+             #pragma clang diagnostic error "-Wc++1z-extensions"
             #endif
             #ifdef INCLUDE_ASSERT_H
              #include <assert.h>
@@ -32,7 +33,7 @@ AC_DEFUN([gl_ASSERT_H],
           ]])],
        [gl_cv_static_assert=$gl_working],
        [gl_cv_static_assert=no])
-      CFLAGS=$gl_save_CFLAGS
+      CFLAGS=$gl_saved_CFLAGS
       test "$gl_cv_static_assert" != no && break
      done])
 
@@ -46,10 +47,13 @@ AC_DEFUN([gl_ASSERT_H],
        gl_NEXT_HEADERS([assert.h])])
 
   dnl The "zz" puts this toward config.h's end, to avoid potential
-  dnl collisions with other definitions.  #undef assert so that
-  dnl programs are not tempted to use it without specifically
-  dnl including assert.h.  Break the #undef apart with a comment
-  dnl so that 'configure' does not comment it out.
+  dnl collisions with other definitions.
+  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
+  dnl <assert.h>, this include actually defines assert.
+  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 \
      && (!defined __cplusplus \
@@ -57,6 +61,9 @@ AC_DEFUN([gl_ASSERT_H],
              && __GNUG__ < 6 && __clang_major__ < 6)))
  #include <assert.h>
  #undef/**/assert
+ #ifdef __sgi
+  #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
diff --git a/gl/m4/base64.m4 b/gl/m4/base64.m4
index 987930ab..26f2af41 100644
--- a/gl/m4/base64.m4
+++ b/gl/m4/base64.m4
@@ -1,5 +1,6 @@
-# base64.m4 serial 4
-dnl Copyright (C) 2004, 2006, 2009-2023 Free Software Foundation, Inc.
+# base64.m4
+# serial 4
+dnl Copyright (C) 2004, 2006, 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.
diff --git a/gl/m4/btowc.m4 b/gl/m4/btowc.m4
index 77218a7d..d9dd7036 100644
--- a/gl/m4/btowc.m4
+++ b/gl/m4/btowc.m4
@@ -1,5 +1,6 @@
-# btowc.m4 serial 12
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# btowc.m4
+# serial 14
+dnl Copyright (C) 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.
@@ -40,12 +41,12 @@ int main ()
           [
 changequote(,)dnl
            case "$host_os" in
-                      # Guess no on Cygwin.
-             cygwin*) gl_cv_func_btowc_nul="guessing no" ;;
-                      # Guess yes on native Windows.
-             mingw*)  gl_cv_func_btowc_nul="guessing yes" ;;
-                      # Guess yes otherwise.
-             *)       gl_cv_func_btowc_nul="guessing yes" ;;
+                                # Guess no on Cygwin.
+             cygwin*)           gl_cv_func_btowc_nul="guessing no" ;;
+                                # Guess yes on native Windows.
+             mingw* | windows*) gl_cv_func_btowc_nul="guessing yes" ;;
+                                # Guess yes otherwise.
+             *)                 gl_cv_func_btowc_nul="guessing yes" ;;
            esac
 changequote([,])dnl
           ])
@@ -59,12 +60,12 @@ changequote([,])dnl
         dnl is present.
 changequote(,)dnl
         case "$host_os" in
-                  # Guess no on IRIX.
-          irix*)  gl_cv_func_btowc_eof="guessing no" ;;
-                  # Guess yes on native Windows.
-          mingw*) gl_cv_func_btowc_eof="guessing yes" ;;
-                  # Guess yes otherwise.
-          *)      gl_cv_func_btowc_eof="guessing yes" ;;
+                             # Guess no on IRIX.
+          irix*)             gl_cv_func_btowc_eof="guessing no" ;;
+                             # Guess yes on native Windows.
+          mingw* | windows*) gl_cv_func_btowc_eof="guessing yes" ;;
+                             # Guess yes otherwise.
+          *)                 gl_cv_func_btowc_eof="guessing yes" ;;
         esac
 changequote([,])dnl
         if test $LOCALE_FR != none; then
@@ -88,6 +89,50 @@ int main ()
         fi
       ])
 
+    dnl On mingw, in the C locale, btowc is inconsistent with mbrtowc:
+    dnl mbrtowc avoids calling MultiByteToWideChar when MB_CUR_MAX is 1 and
+    dnl ___lc_codepage_func() is 0, but btowc is lacking this special case.
+    AC_CHECK_FUNCS_ONCE([mbrtowc])
+    AC_CACHE_CHECK([whether btowc is consistent with mbrtowc in the C locale],
+      [gl_cv_func_btowc_consistent],
+      [
+        AC_RUN_IFELSE(
+          [AC_LANG_SOURCE([[
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+int main ()
+{
+#if HAVE_MBRTOWC
+  wint_t wc1 = btowc (0x80);
+  wchar_t wc2 = (wchar_t) 0xbadface;
+  char buf[1] = { 0x80 };
+  mbstate_t state;
+  memset (&state, 0, sizeof (mbstate_t));
+  if (mbrtowc (&wc2, buf, 1, &state) != 1 || wc1 != wc2)
+    return 1;
+#endif
+  return 0;
+}]])],
+          [gl_cv_func_btowc_consistent=yes],
+          [gl_cv_func_btowc_consistent=no],
+          [case "$host_os" in
+               # Guess no on mingw.
+             mingw* | windows*)
+               AC_EGREP_CPP([Problem], [
+#ifdef __MINGW32__
+ Problem
+#endif
+                 ],
+                 [gl_cv_func_btowc_consistent="guessing no"],
+                 [gl_cv_func_btowc_consistent="guessing yes"])
+               ;;
+               # Guess yes otherwise.
+             *) gl_cv_func_btowc_consistent="guessing yes" ;;
+           esac
+          ])
+      ])
+
     case "$gl_cv_func_btowc_nul" in
       *yes) ;;
       *) REPLACE_BTOWC=1 ;;
@@ -96,10 +141,22 @@ int main ()
       *yes) ;;
       *) REPLACE_BTOWC=1 ;;
     esac
+    case "$gl_cv_func_btowc_consistent" in
+      *yes) ;;
+      *) REPLACE_BTOWC=1 ;;
+    esac
+    if test $REPLACE_BTOWC = 0; then
+      gl_MBRTOWC_C_LOCALE
+      case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in
+        *yes) ;;
+        *) REPLACE_BTOWC=1 ;;
+      esac
+    fi
   fi
 ])
 
 # Prerequisites of lib/btowc.c.
 AC_DEFUN([gl_PREREQ_BTOWC], [
   :
+  AC_CHECK_FUNCS_ONCE([mbrtowc])
 ])
diff --git a/gl/m4/builtin-expect.m4 b/gl/m4/builtin-expect.m4
index 531ed48a..c7af926b 100644
--- a/gl/m4/builtin-expect.m4
+++ b/gl/m4/builtin-expect.m4
@@ -1,10 +1,12 @@
-dnl Check for __builtin_expect.
-
-dnl Copyright 2016-2023 Free Software Foundation, Inc.
+# builtin-expect.m4
+# serial 1
+dnl Copyright 2016-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 Check for __builtin_expect.
+
 dnl Written by Paul Eggert.
 
 AC_DEFUN([gl___BUILTIN_EXPECT],
diff --git a/gl/m4/byteswap.m4 b/gl/m4/byteswap.m4
index 8058d178..0c76fe93 100644
--- a/gl/m4/byteswap.m4
+++ b/gl/m4/byteswap.m4
@@ -1,5 +1,6 @@
-# byteswap.m4 serial 5
-dnl Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc.
+# byteswap.m4
+# serial 5
+dnl Copyright (C) 2005, 2007, 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.
diff --git a/gl/m4/c-bool.m4 b/gl/m4/c-bool.m4
index f614371b..0fb0de3b 100644
--- a/gl/m4/c-bool.m4
+++ b/gl/m4/c-bool.m4
@@ -1,10 +1,12 @@
-# Check for bool that conforms to C2023.
-
-dnl Copyright 2022-2023 Free Software Foundation, Inc.
+# c-bool.m4
+# serial 1
+dnl Copyright 2022-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.
 
+# Check for bool that conforms to C2023.
+
 AC_DEFUN([gl_C_BOOL],
 [
   AC_CACHE_CHECK([for bool, true, false], [gl_cv_c_bool],
diff --git a/gl/m4/calloc.m4 b/gl/m4/calloc.m4
index 23c0dd9f..550cf5cc 100644
--- a/gl/m4/calloc.m4
+++ b/gl/m4/calloc.m4
@@ -1,9 +1,9 @@
-# calloc.m4 serial 29
-
-# Copyright (C) 2004-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# calloc.m4
+# serial 31
+dnl Copyright (C) 2004-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.
 
 # Written by Jim Meyering.
 
@@ -36,14 +36,14 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF],
          [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*)       ac_cv_func_calloc_0_nonnull="guessing yes" ;;
-                        # Guess yes on native Windows.
-         mingw*)        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" ;;
+                             # 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
     ])
diff --git a/gl/m4/close.m4 b/gl/m4/close.m4
index 9f95c670..88c37fab 100644
--- a/gl/m4/close.m4
+++ b/gl/m4/close.m4
@@ -1,10 +1,11 @@
-# close.m4 serial 9
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# close.m4
+# serial 10
+dnl Copyright (C) 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.
 
-AC_DEFUN([gl_FUNC_CLOSE],
+AC_DEFUN_ONCE([gl_FUNC_CLOSE],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
   m4_ifdef([gl_MSVC_INVAL], [
diff --git a/gl/m4/codeset.m4 b/gl/m4/codeset.m4
index 5804f472..e69b7402 100644
--- a/gl/m4/codeset.m4
+++ b/gl/m4/codeset.m4
@@ -1,5 +1,6 @@
-# codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2023 Free Software
+# codeset.m4
+# serial 5 (gettext-0.18.2)
+dnl Copyright (C) 2000-2002, 2006, 2008-2014, 2016, 2019-2024 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,
diff --git a/gl/m4/double-slash-root.m4 b/gl/m4/double-slash-root.m4
index 1776e5eb..3437c699 100644
--- a/gl/m4/double-slash-root.m4
+++ b/gl/m4/double-slash-root.m4
@@ -1,5 +1,6 @@
-# double-slash-root.m4 serial 4   -*- Autoconf -*-
-dnl Copyright (C) 2006, 2008-2023 Free Software Foundation, Inc.
+# double-slash-root.m4
+# serial 4   -*- Autoconf -*-
+dnl Copyright (C) 2006, 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.
diff --git a/gl/m4/dup2.m4 b/gl/m4/dup2.m4
index e1cc73e1..786121fd 100644
--- a/gl/m4/dup2.m4
+++ b/gl/m4/dup2.m4
@@ -1,5 +1,6 @@
-#serial 27
-dnl Copyright (C) 2002, 2005, 2007, 2009-2023 Free Software Foundation, Inc.
+# dup2.m4
+# serial 28
+dnl Copyright (C) 2002, 2005, 2007, 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.
@@ -67,7 +68,7 @@ AC_DEFUN([gl_FUNC_DUP2],
       ],
       [gl_cv_func_dup2_works=yes], [gl_cv_func_dup2_works=no],
       [case "$host_os" in
-         mingw*) # on this platform, dup2 always returns 0 for success
+         mingw* | windows*) # on this platform, dup2 always returns 0 for success
            gl_cv_func_dup2_works="guessing no" ;;
          cygwin*) # on cygwin 1.5.x, dup2(1,1) returns 0
            gl_cv_func_dup2_works="guessing no" ;;
diff --git a/gl/m4/eealloc.m4 b/gl/m4/eealloc.m4
index cb3e08fe..8a15e705 100644
--- a/gl/m4/eealloc.m4
+++ b/gl/m4/eealloc.m4
@@ -1,5 +1,6 @@
-# eealloc.m4 serial 3
-dnl Copyright (C) 2003, 2009-2023 Free Software Foundation, Inc.
+# 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.
diff --git a/gl/m4/environ.m4 b/gl/m4/environ.m4
index 741dfc56..107960b2 100644
--- a/gl/m4/environ.m4
+++ b/gl/m4/environ.m4
@@ -1,5 +1,6 @@
-# environ.m4 serial 8
-dnl Copyright (C) 2001-2004, 2006-2023 Free Software Foundation, Inc.
+# environ.m4
+# serial 8
+dnl Copyright (C) 2001-2004, 2006-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.
diff --git a/gl/m4/errno_h.m4 b/gl/m4/errno_h.m4
index 4c70d225..b6050e5d 100644
--- a/gl/m4/errno_h.m4
+++ b/gl/m4/errno_h.m4
@@ -1,5 +1,6 @@
-# errno_h.m4 serial 14
-dnl Copyright (C) 2004, 2006, 2008-2023 Free Software Foundation, Inc.
+# errno_h.m4
+# serial 14
+dnl Copyright (C) 2004, 2006, 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.
diff --git a/gl/m4/error.m4 b/gl/m4/error.m4
index 8cc75dff..273b636b 100644
--- a/gl/m4/error.m4
+++ b/gl/m4/error.m4
@@ -1,22 +1,12 @@
-#serial 15
-
-# Copyright (C) 1996-1998, 2001-2004, 2009-2023 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# error.m4
+# serial 16
+dnl Copyright (C) 1996-1998, 2001-2004, 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_ERROR],
 [
-  dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
-  dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
-  AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line],
-    [AC_LINK_IFELSE(
-       [AC_LANG_PROGRAM(
-          [[#include <error.h>]],
-          [[error_at_line (0, 0, "", 0, "an error occurred");]])],
-       [ac_cv_lib_error_at_line=yes],
-       [ac_cv_lib_error_at_line=no])])
 ])
 
 # Prerequisites of lib/error.c.
diff --git a/gl/m4/error_h.m4 b/gl/m4/error_h.m4
new file mode 100644
index 00000000..050a410c
--- /dev/null
+++ b/gl/m4/error_h.m4
@@ -0,0 +1,125 @@
+# error_h.m4
+# serial 4
+dnl Copyright (C) 1996-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 Provide a working <error.h>.
+
+AC_DEFUN_ONCE([gl_ERROR_H],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  gl_CHECK_NEXT_HEADERS([error.h])
+  if test $ac_cv_header_error_h = yes; then
+    HAVE_ERROR_H=1
+  else
+    HAVE_ERROR_H=0
+  fi
+  AC_SUBST([HAVE_ERROR_H])
+
+  REPLACE_ERROR=0
+
+  gl_CHECK_FUNCS_ANDROID([error], [[#include <error.h>]])
+  if test $ac_cv_func_error = yes; then
+    HAVE_ERROR=1
+  else
+    HAVE_ERROR=0
+    case "$gl_cv_onwards_func_error" in
+      future*) REPLACE_ERROR=1 ;;
+    esac
+  fi
+
+  dnl We don't use AC_FUNC_ERROR_AT_LINE any more, because it is no longer
+  dnl maintained in Autoconf and because it invokes AC_LIBOBJ.
+  dnl We need to notice a missing declaration, like gl_CHECK_FUNCS_ANDROID does.
+  AC_CHECK_DECL([error_at_line], , , [[#include <error.h>]])
+  if test $ac_cv_have_decl_error_at_line = yes; then
+    AC_CACHE_CHECK([for error_at_line], [ac_cv_lib_error_at_line],
+      [AC_LINK_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <error.h>]],
+            [[error_at_line (0, 0, "", 0, "an error occurred");]])],
+         [ac_cv_lib_error_at_line=yes],
+         [ac_cv_lib_error_at_line=no])])
+  else
+    ac_cv_lib_error_at_line=no
+  fi
+  if test $ac_cv_lib_error_at_line = yes; then
+    HAVE_ERROR_AT_LINE=1
+  else
+    HAVE_ERROR_AT_LINE=0
+  fi
+  REPLACE_ERROR_AT_LINE=0
+
+  if test $ac_cv_func_error = yes && test $ac_cv_lib_error_at_line = yes; then
+    dnl On Android 11, when error_print_progname is set, the output of the
+    dnl error() function contains an extra space.
+    AC_CACHE_CHECK([for working error function],
+      [gl_cv_func_working_error],
+      [if test $cross_compiling != yes; then
+         AC_LINK_IFELSE(
+           [AC_LANG_PROGRAM([[
+              #include <error.h>
+              static void print_no_progname (void) {}
+            ]], [[
+              error_print_progname = print_no_progname;
+              error (0, 0, "foo");
+            ]])
+           ],
+           [rm -f conftest.out
+            if test -s conftest$ac_exeext \
+               && ./conftest$ac_exeext 2> conftest.out; then
+              if grep ' ' conftest.out >/dev/null; then
+                gl_cv_func_working_error=no
+              else
+                gl_cv_func_working_error=yes
+              fi
+            else
+              gl_cv_func_working_error=no
+            fi
+            rm -f conftest.out
+           ],
+           [gl_cv_func_working_error=no])
+       else
+         AC_COMPILE_IFELSE(
+           [AC_LANG_PROGRAM([[
+              #include <error.h>
+            ]], [[
+              error (0, 0, "foo");
+            ]])
+           ],
+           [case "$host_os" in
+                               # Guess yes on glibc systems.
+              *-gnu* | gnu*)   gl_cv_func_working_error="guessing yes" ;;
+                               # Guess no on Android.
+              linux*-android*) gl_cv_func_working_error="guessing no" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+              *)               gl_cv_func_working_error="$gl_cross_guess_normal" ;;
+            esac
+           ],
+           [gl_cv_func_working_error=no])
+       fi
+      ])
+    case "$gl_cv_func_working_error" in
+      *no)
+        REPLACE_ERROR=1
+        REPLACE_ERROR_AT_LINE=1
+        ;;
+    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
+
+  AC_SUBST([HAVE_ERROR])
+  AC_SUBST([HAVE_ERROR_AT_LINE])
+  AC_SUBST([REPLACE_ERROR])
+  AC_SUBST([REPLACE_ERROR_AT_LINE])
+])
diff --git a/gl/m4/exponentd.m4 b/gl/m4/exponentd.m4
index 2ef46437..db597afc 100644
--- a/gl/m4/exponentd.m4
+++ b/gl/m4/exponentd.m4
@@ -1,9 +1,10 @@
-# exponentd.m4 serial 3
-dnl Copyright (C) 2007-2008, 2010-2023 Free Software Foundation, Inc.
+# exponentd.m4
+# serial 4
+dnl Copyright (C) 2007-2008, 2010-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_DOUBLE_EXPONENT_LOCATION],
+AC_DEFUN_ONCE([gl_DOUBLE_EXPONENT_LOCATION],
 [
   AC_CACHE_CHECK([where to find the exponent in a 'double'],
     [gl_cv_cc_double_expbit0],
diff --git a/gl/m4/extensions.m4 b/gl/m4/extensions.m4
index 5336b8da..1fb68956 100644
--- a/gl/m4/extensions.m4
+++ b/gl/m4/extensions.m4
@@ -1,10 +1,11 @@
-# serial 23  -*- Autoconf -*-
-# Enable extensions on systems that normally disable them.
+# extensions.m4
+# serial 25  -*- Autoconf -*-
+dnl Copyright (C) 2003, 2006-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.
 
-# Copyright (C) 2003, 2006-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Enable extensions on systems that normally disable them.
 
 dnl Define to empty for the benefit of Autoconf 2.69 and earlier, so that
 dnl AC_USE_SYSTEM_EXTENSIONS (below) can be used unchanged from Autoconf 2.70+.
@@ -229,4 +230,15 @@ AC_DEFUN_ONCE([gl_USE_SYSTEM_EXTENSIONS],
         [Define to enable the declarations of ISO C 11 types and functions.])
       ;;
   esac
+
+  dnl On OpenSolaris derivatives, the include files contains a couple of
+  dnl declarations that are only activated with an explicit
+  dnl -D__STDC_WANT_LIB_EXT1__.
+  AH_VERBATIM([USE_ISO_C_23_ANNEX_K_EXTENSIONS],
+[/* Define to enable the declarations of ISO C 23 Annex K types and functions.  */
+#if !(defined __STDC_WANT_LIB_EXT1__ && __STDC_WANT_LIB_EXT1__)
+#undef/**/__STDC_WANT_LIB_EXT1__
+#define __STDC_WANT_LIB_EXT1__ 1
+#endif
+])
 ])
diff --git a/gl/m4/extern-inline.m4 b/gl/m4/extern-inline.m4
index c001b1cf..547da82a 100644
--- a/gl/m4/extern-inline.m4
+++ b/gl/m4/extern-inline.m4
@@ -1,10 +1,12 @@
-dnl 'extern inline' a la ISO C99.
-
-dnl Copyright 2012-2023 Free Software Foundation, Inc.
+# extern-inline.m4
+# serial 1
+dnl Copyright 2012-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 'extern inline' a la ISO C99.
+
 AC_DEFUN([gl_EXTERN_INLINE],
 [
   AC_CACHE_CHECK([whether ctype.h defines __header_inline],
@@ -79,7 +81,8 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # define _GL_EXTERN_INLINE_STDHEADER_BUG
 #endif
 #if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+      ? (defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
+         && !defined __PCC__) \
       : (199901L <= __STDC_VERSION__ \
          && !defined __HP_cc \
          && !defined __PGI \
@@ -89,6 +92,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # define _GL_EXTERN_INLINE extern inline
 # define _GL_EXTERN_INLINE_IN_USE
 #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+       && !defined __PCC__ \
        && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
 # if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
diff --git a/gl/m4/fclose.m4 b/gl/m4/fclose.m4
new file mode 100644
index 00000000..0c1358ed
--- /dev/null
+++ b/gl/m4/fclose.m4
@@ -0,0 +1,99 @@
+# fclose.m4
+# serial 12
+dnl Copyright (C) 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.
+
+AC_DEFUN_ONCE([gl_FUNC_FCLOSE],
+[
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  gl_FUNC_FFLUSH_STDIN
+  case "$gl_cv_func_fflush_stdin" in
+    *yes) ;;
+    *) REPLACE_FCLOSE=1 ;;
+  esac
+
+  AC_REQUIRE([gl_FUNC_CLOSE])
+  if test $REPLACE_CLOSE = 1; then
+    REPLACE_FCLOSE=1
+  fi
+
+  case "$host_os" in
+    openedition) REPLACE_FCLOSE=1 ;;
+  esac
+
+  if test $REPLACE_FCLOSE = 0; then
+    gl_FUNC_FCLOSE_STDIN
+    case "$gl_cv_func_fclose_stdin" in
+      *yes) ;;
+      *) REPLACE_FCLOSE=1 ;;
+    esac
+  fi
+])
+
+dnl Determine whether fclose works on input streams.
+dnl Sets gl_cv_func_fclose_stdin.
+
+AC_DEFUN([gl_FUNC_FCLOSE_STDIN],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CHECK_HEADERS_ONCE([unistd.h])
+  AC_CACHE_CHECK([whether fclose works on input streams],
+    [gl_cv_func_fclose_stdin],
+    [echo hello world > conftest.txt
+     AC_RUN_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <fcntl.h>
+            #include <stdio.h>
+            #if HAVE_UNISTD_H
+            # include <unistd.h>
+            #else /* on Windows with MSVC */
+            # include <io.h>
+            #endif
+           ]GL_MDA_DEFINES],
+          [[int fd;
+            int fd2;
+            FILE *fp;
+            fd = open ("conftest.txt", O_RDONLY);
+            if (fd < 0)
+              return 1;
+            if (lseek (fd, 1, SEEK_SET) != 1)
+              return 2;
+            fd2 = dup (fd);
+            if (fd2 < 0)
+              return 3;
+            fp = fdopen (fd2, "r");
+            if (fp == NULL)
+              return 4;
+            if (fgetc (fp) != 'e')
+              { fclose (fp); return 5; }
+            /* This fclose() call should reposition the underlying file
+               descriptor.  */
+            if (fclose (fp) != 0)
+              return 6;
+            if (lseek (fd2, 0, SEEK_CUR) != -1) /* should fail with EBADF */
+              return 7;
+            /* Verify the file position.  */
+            if (lseek (fd, 0, SEEK_CUR) != 2)
+              return 8;
+            return 0;
+          ]])],
+       [gl_cv_func_fclose_stdin=yes],
+       [gl_cv_func_fclose_stdin=no],
+       [case "$host_os" in
+                              # Guess no on glibc systems.
+          *-gnu* | gnu*)      gl_cv_func_fclose_stdin="guessing no" ;;
+                              # Guess yes on musl systems.
+          *-musl* | midipix*) gl_cv_func_fclose_stdin="guessing yes" ;;
+                              # Guess no on native Windows.
+          mingw* | windows*)  gl_cv_func_fclose_stdin="guessing no" ;;
+                              # If we don't know, obey --enable-cross-guesses.
+          *)                  gl_cv_func_fclose_stdin="$gl_cross_guess_normal" ;;
+        esac
+       ])
+     rm conftest.txt
+    ])
+])
diff --git a/gl/m4/fcntl-o.m4 b/gl/m4/fcntl-o.m4
index 59d558bd..43aa1325 100644
--- a/gl/m4/fcntl-o.m4
+++ b/gl/m4/fcntl-o.m4
@@ -1,5 +1,6 @@
-# fcntl-o.m4 serial 7
-dnl Copyright (C) 2006, 2009-2023 Free Software Foundation, Inc.
+# fcntl-o.m4
+# serial 8
+dnl Copyright (C) 2006, 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.
@@ -117,9 +118,9 @@ AC_DEFUN([gl_FCNTL_O_FLAGS],
          *) gl_cv_header_working_fcntl_h='no';;
         esac],
        [case "$host_os" in
-                  # Guess 'no' on native Windows.
-          mingw*) gl_cv_header_working_fcntl_h='no' ;;
-          *)      gl_cv_header_working_fcntl_h=cross-compiling ;;
+                             # Guess 'no' on native Windows.
+          mingw* | windows*) gl_cv_header_working_fcntl_h='no' ;;
+          *)                 gl_cv_header_working_fcntl_h=cross-compiling ;;
         esac
        ])
     ])
diff --git a/gl/m4/fcntl.m4 b/gl/m4/fcntl.m4
index 524a99af..f6d0f377 100644
--- a/gl/m4/fcntl.m4
+++ b/gl/m4/fcntl.m4
@@ -1,5 +1,6 @@
-# fcntl.m4 serial 11
-dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
+# fcntl.m4
+# serial 12
+dnl Copyright (C) 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.
@@ -82,7 +83,7 @@ AC_DEFUN([gl_FUNC_FCNTL],
     esac
 
     dnl Many systems lack F_DUPFD_CLOEXEC.
-    dnl NetBSD 9.0 declares F_DUPFD_CLOEXEC but it works only like F_DUPFD.
+    dnl NetBSD 10.0 declares F_DUPFD_CLOEXEC but it works only like F_DUPFD.
     AC_CACHE_CHECK([whether fcntl understands F_DUPFD_CLOEXEC],
       [gl_cv_func_fcntl_f_dupfd_cloexec],
       [AC_RUN_IFELSE(
diff --git a/gl/m4/fcntl_h.m4 b/gl/m4/fcntl_h.m4
index 68f4e648..b69f7a0c 100644
--- a/gl/m4/fcntl_h.m4
+++ b/gl/m4/fcntl_h.m4
@@ -1,10 +1,12 @@
+# fcntl_h.m4
 # serial 20
-# Configure fcntl.h.
-dnl Copyright (C) 2006-2007, 2009-2023 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-2007, 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.
 
+# Configure fcntl.h.
+
 dnl Written by Paul Eggert.
 
 AC_DEFUN_ONCE([gl_FCNTL_H],
diff --git a/gl/m4/fflush.m4 b/gl/m4/fflush.m4
index 3e3c8903..43fc3bf3 100644
--- a/gl/m4/fflush.m4
+++ b/gl/m4/fflush.m4
@@ -1,9 +1,9 @@
-# fflush.m4 serial 18
-
-# Copyright (C) 2007-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# fflush.m4
+# serial 19
+dnl Copyright (C) 2007-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 Eric Blake
 
@@ -79,9 +79,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*) gl_cv_func_fflush_stdin="guessing no" ;;
-          *)      gl_cv_func_fflush_stdin=cross ;;
+                             # Guess no on native Windows.
+          mingw* | windows*) gl_cv_func_fflush_stdin="guessing no" ;;
+          *)                 gl_cv_func_fflush_stdin=cross ;;
         esac
        ])
      rm conftest.txt
diff --git a/gl/m4/float_h.m4 b/gl/m4/float_h.m4
index 2f0c9c4e..c95d4171 100644
--- a/gl/m4/float_h.m4
+++ b/gl/m4/float_h.m4
@@ -1,5 +1,6 @@
-# float_h.m4 serial 13
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# float_h.m4
+# serial 14
+dnl Copyright (C) 2007, 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.
@@ -84,9 +85,11 @@ int main ()
                [gl_cv_func_itold_works="guessing no"],
                [gl_cv_func_itold_works="guessing yes"])
              ;;
-                   # Guess yes on native Windows.
-           mingw*) gl_cv_func_itold_works="guessing yes" ;;
-           *)      gl_cv_func_itold_works="guessing yes" ;;
+             # Guess yes on native Windows.
+           mingw* | windows*)
+             gl_cv_func_itold_works="guessing yes" ;;
+           *)
+             gl_cv_func_itold_works="guessing yes" ;;
          esac
         ])
     ])
diff --git a/gl/m4/floorf.m4 b/gl/m4/floorf.m4
index c49ffa6b..2572c848 100644
--- a/gl/m4/floorf.m4
+++ b/gl/m4/floorf.m4
@@ -1,5 +1,6 @@
-# floorf.m4 serial 18
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# floorf.m4
+# serial 21
+dnl Copyright (C) 2007, 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.
@@ -26,7 +27,7 @@ AC_DEFUN([gl_FUNC_FLOORF],
         AC_CACHE_CHECK([whether floorf works according to ISO C 99 with IEC 60559],
           [gl_cv_func_floorf_ieee],
           [
-            save_LIBS="$LIBS"
+            saved_LIBS="$LIBS"
             LIBS="$LIBS $FLOORF_LIBM"
             AC_RUN_IFELSE(
               [AC_LANG_SOURCE([[
@@ -49,17 +50,17 @@ int main (int argc, char *argv[])
               [gl_cv_func_floorf_ieee=yes],
               [gl_cv_func_floorf_ieee=no],
               [case "$host_os" in
-                                # Guess yes on glibc systems.
-                 *-gnu* | gnu*) gl_cv_func_floorf_ieee="guessing yes" ;;
-                                # Guess yes on musl systems.
-                 *-musl*)       gl_cv_func_floorf_ieee="guessing yes" ;;
-                                # Guess yes on native Windows.
-                 mingw*)        gl_cv_func_floorf_ieee="guessing yes" ;;
-                                # If we don't know, obey --enable-cross-guesses.
-                 *)             gl_cv_func_floorf_ieee="$gl_cross_guess_normal" ;;
+                                     # Guess yes on glibc systems.
+                 *-gnu* | gnu*)      gl_cv_func_floorf_ieee="guessing yes" ;;
+                                     # Guess yes on musl systems.
+                 *-musl* | midipix*) gl_cv_func_floorf_ieee="guessing yes" ;;
+                                     # Guess yes on native Windows.
+                 mingw* | windows*)  gl_cv_func_floorf_ieee="guessing yes" ;;
+                                     # If we don't know, obey --enable-cross-guesses.
+                 *)                  gl_cv_func_floorf_ieee="$gl_cross_guess_normal" ;;
                esac
               ])
-            LIBS="$save_LIBS"
+            LIBS="$saved_LIBS"
           ])
         case "$gl_cv_func_floorf_ieee" in
           *yes) ;;
@@ -94,7 +95,7 @@ AC_DEFUN([gl_FUNC_FLOORF_LIBS],
          [[x = funcptr(x) + floorf(x);]])],
       [gl_cv_func_floorf_libm=])
     if test "$gl_cv_func_floorf_libm" = "?"; then
-      save_LIBS="$LIBS"
+      saved_LIBS="$LIBS"
       LIBS="$LIBS -lm"
       AC_LINK_IFELSE(
         [AC_LANG_PROGRAM(
@@ -106,7 +107,7 @@ AC_DEFUN([gl_FUNC_FLOORF_LIBS],
              float x;]],
            [[x = funcptr(x) + floorf(x);]])],
         [gl_cv_func_floorf_libm="-lm"])
-      LIBS="$save_LIBS"
+      LIBS="$saved_LIBS"
     fi
   ])
   FLOORF_LIBM="$gl_cv_func_floorf_libm"
diff --git a/gl/m4/fopen.m4 b/gl/m4/fopen.m4
index 9c39ff72..f3b7aadd 100644
--- a/gl/m4/fopen.m4
+++ b/gl/m4/fopen.m4
@@ -1,15 +1,16 @@
-# fopen.m4 serial 13
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# fopen.m4
+# serial 16
+dnl Copyright (C) 2007-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_FUNC_FOPEN],
+AC_DEFUN([gl_FUNC_FOPEN_ITSELF],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw* | pw*)
+    mingw* | windows* | pw*)
       dnl Replace fopen, for handling of "/dev/null".
       REPLACE_FOPEN=1
       dnl fopen on mingw also has the trailing slash bug.
@@ -58,6 +59,15 @@ changequote([,])dnl
   esac
 ])
 
+AC_DEFUN([gl_FUNC_FOPEN],
+[
+  AC_REQUIRE([gl_FUNC_FOPEN_ITSELF])
+  AC_REQUIRE([gl_FUNC_FCLOSE])
+  if test $REPLACE_FCLOSE = 1; then
+    REPLACE_FOPEN=1
+  fi
+])
+
 AC_DEFUN([gl_FUNC_FOPEN_GNU],
 [
   AC_REQUIRE([gl_FUNC_FOPEN])
@@ -87,7 +97,7 @@ int main ()
        [gl_cv_func_fopen_mode_x=no],
        [case "$host_os" in
           # Guess yes on glibc and musl systems.
-          linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl*)
+          linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl* | midipix*)
             gl_cv_func_fopen_mode_x="guessing yes" ;;
           # If we don't know, obey --enable-cross-guesses.
           *)
@@ -124,10 +134,10 @@ int main ()
        [gl_cv_func_fopen_mode_e=no],
        [case "$host_os" in
           # Guess yes on glibc and musl systems.
-          linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl*)
+          linux*-gnu* | gnu* | kfreebsd*-gnu | *-musl* | midipix*)
             gl_cv_func_fopen_mode_e="guessing yes" ;;
           # Guess no on native Windows.
-          mingw*)
+          mingw* | windows*)
             gl_cv_func_fopen_mode_e="guessing no" ;;
           # If we don't know, obey --enable-cross-guesses.
           *)
diff --git a/gl/m4/fpurge.m4 b/gl/m4/fpurge.m4
index b365409d..a77f5b96 100644
--- a/gl/m4/fpurge.m4
+++ b/gl/m4/fpurge.m4
@@ -1,5 +1,6 @@
-# fpurge.m4 serial 12
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# fpurge.m4
+# serial 14
+dnl Copyright (C) 2007, 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.
@@ -10,7 +11,7 @@ AC_DEFUN([gl_FUNC_FPURGE],
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CHECK_HEADERS_ONCE([stdio_ext.h])
   AC_CHECK_FUNCS_ONCE([fpurge])
-  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
     HAVE_FPURGE=1
@@ -53,10 +54,10 @@ AC_DEFUN([gl_FUNC_FPURGE],
          [gl_cv_func_fpurge_works=yes],
          [gl_cv_func_fpurge_works=no],
          [case "$host_os" in
-                     # Guess yes on musl systems.
-            *-musl*) gl_cv_func_fpurge_works="guessing yes" ;;
-                     # Otherwise obey --enable-cross-guesses.
-            *)       gl_cv_func_fpurge_works="$gl_cross_guess_normal" ;;
+                                # 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
          ])
       ])
diff --git a/gl/m4/freading.m4 b/gl/m4/freading.m4
index 35333369..be899456 100644
--- a/gl/m4/freading.m4
+++ b/gl/m4/freading.m4
@@ -1,5 +1,6 @@
-# freading.m4 serial 2
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# freading.m4
+# serial 3
+dnl Copyright (C) 2007, 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.
@@ -7,5 +8,8 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_FREADING],
 [
   AC_CHECK_HEADERS_ONCE([stdio_ext.h])
-  AC_CHECK_FUNCS_ONCE([__freading])
+  gl_CHECK_FUNCS_ANDROID([__freading],
+    [[#include <stdio.h>
+      #include <stdio_ext.h>
+    ]])
 ])
diff --git a/gl/m4/free.m4 b/gl/m4/free.m4
index 0389dea3..a2b596d6 100644
--- a/gl/m4/free.m4
+++ b/gl/m4/free.m4
@@ -1,8 +1,9 @@
-# free.m4 serial 6
-# Copyright (C) 2003-2005, 2009-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# free.m4
+# serial 6
+dnl Copyright (C) 2003-2005, 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.
 
 # Written by Paul Eggert and Bruno Haible.
 
diff --git a/gl/m4/fseek.m4 b/gl/m4/fseek.m4
index c5fe688c..fb220a1f 100644
--- a/gl/m4/fseek.m4
+++ b/gl/m4/fseek.m4
@@ -1,5 +1,6 @@
-# fseek.m4 serial 4
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# fseek.m4
+# serial 4
+dnl Copyright (C) 2007, 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.
diff --git a/gl/m4/fseeko.m4 b/gl/m4/fseeko.m4
index 05ee06bc..5682a1f2 100644
--- a/gl/m4/fseeko.m4
+++ b/gl/m4/fseeko.m4
@@ -1,5 +1,6 @@
-# fseeko.m4 serial 20
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# fseeko.m4
+# serial 20
+dnl Copyright (C) 2007-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.
diff --git a/gl/m4/fstat.m4 b/gl/m4/fstat.m4
index 7cb2edb0..47777b0c 100644
--- a/gl/m4/fstat.m4
+++ b/gl/m4/fstat.m4
@@ -1,5 +1,6 @@
-# fstat.m4 serial 8
-dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
+# fstat.m4
+# serial 10
+dnl Copyright (C) 2011-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.
@@ -10,10 +11,10 @@ AC_DEFUN([gl_FUNC_FSTAT],
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
 
   case "$host_os" in
-    mingw* | solaris*)
+    darwin* | mingw* | windows* | solaris*)
+      dnl macOS and Solaris stat can return a negative tv_nsec.
       dnl On MinGW, the original stat() returns st_atime, st_mtime,
       dnl st_ctime values that are affected by the time zone.
-      dnl Solaris stat can return a negative tv_nsec.
       REPLACE_FSTAT=1
       ;;
   esac
diff --git a/gl/m4/fstypename.m4 b/gl/m4/fstypename.m4
index f65c459f..05a68805 100644
--- a/gl/m4/fstypename.m4
+++ b/gl/m4/fstypename.m4
@@ -1,4 +1,10 @@
-#serial 6
+# fstypename.m4
+# serial 6
+dnl Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2024 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 From Jim Meyering.
 dnl
@@ -6,12 +12,6 @@ dnl See if struct statfs has the f_fstypename member.
 dnl If so, define HAVE_STRUCT_STATFS_F_FSTYPENAME.
 dnl
 
-# Copyright (C) 1998-1999, 2001, 2004, 2006, 2009-2023 Free Software
-# Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 AC_DEFUN([gl_FSTYPENAME],
 [
   AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,
diff --git a/gl/m4/fsusage.m4 b/gl/m4/fsusage.m4
index 88f3ca81..1ce90660 100644
--- a/gl/m4/fsusage.m4
+++ b/gl/m4/fsusage.m4
@@ -1,11 +1,11 @@
+# fsusage.m4
 # serial 35
-# Obtaining file system usage information.
+dnl Copyright (C) 1997-1998, 2000-2001, 2003-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.
 
-# Copyright (C) 1997-1998, 2000-2001, 2003-2023 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Obtaining file system usage information.
 
 # Written by Jim Meyering.
 
@@ -269,7 +269,7 @@ int check_f_blocks_size[sizeof fsd.f_blocks * CHAR_BIT <= 32 ? -1 : 1];
 
 # Check for SunOS statfs brokenness wrt partitions 2GB and larger.
 # If <sys/vfs.h> exists and struct statfs has a member named f_spare,
-# enable the work-around code in fsusage.c.
+# enable the workaround code in fsusage.c.
 AC_DEFUN([gl_STATFS_TRUNCATES],
 [
   AC_CACHE_CHECK([for statfs that truncates block counts],
diff --git a/gl/m4/ftell.m4 b/gl/m4/ftell.m4
index 79f1aaf2..ab10736b 100644
--- a/gl/m4/ftell.m4
+++ b/gl/m4/ftell.m4
@@ -1,5 +1,6 @@
-# ftell.m4 serial 3
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# ftell.m4
+# serial 3
+dnl Copyright (C) 2007, 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.
diff --git a/gl/m4/ftello.m4 b/gl/m4/ftello.m4
index 4901b168..0eb8fa0d 100644
--- a/gl/m4/ftello.m4
+++ b/gl/m4/ftello.m4
@@ -1,5 +1,6 @@
-# ftello.m4 serial 14
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# ftello.m4
+# serial 16
+dnl Copyright (C) 2007-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.
@@ -37,13 +38,24 @@ AC_DEFUN([gl_FUNC_FTELLO],
     if test $gl_cv_var_stdin_large_offset = no; then
       REPLACE_FTELLO=1
     fi
+    AC_REQUIRE([AC_CANONICAL_HOST])
+    if test $REPLACE_FTELLO = 0; then
+      dnl On native Windows, in some circumstances, ftell(), ftello(),
+      dnl fgetpos(), lseek(), _lseeki64() all succeed on devices of type
+      dnl FILE_TYPE_PIPE. However, to match POSIX behaviour, we want
+      dnl ftell(), ftello(), fgetpos(), lseek() to fail when the argument fd
+      dnl designates a pipe. See also
+      dnl https://github.com/python/cpython/issues/78961#issuecomment-1093800325
+      case "$host_os" in
+        mingw* | windows*) REPLACE_FTELLO=1 ;;
+      esac
+    fi
     if test $REPLACE_FTELLO = 0; then
       dnl Detect bug on Solaris.
       dnl ftell and ftello produce incorrect results after putc that followed a
       dnl getc call that reached EOF on Solaris. This is because the _IOREAD
       dnl flag does not get cleared in this case, even though _IOWRT gets set,
       dnl and ftell and ftello look whether the _IOREAD flag is set.
-      AC_REQUIRE([AC_CANONICAL_HOST])
       AC_CACHE_CHECK([whether ftello works],
         [gl_cv_func_ftello_works],
         [
@@ -51,12 +63,12 @@ AC_DEFUN([gl_FUNC_FTELLO],
           dnl be opened.
 changequote(,)dnl
           case "$host_os" in
-                      # Guess no on Solaris.
-            solaris*) gl_cv_func_ftello_works="guessing no" ;;
-                      # Guess yes on native Windows.
-            mingw*)   gl_cv_func_ftello_works="guessing yes" ;;
-                      # Guess yes otherwise.
-            *)        gl_cv_func_ftello_works="guessing yes" ;;
+                               # Guess no on Solaris.
+            solaris*)          gl_cv_func_ftello_works="guessing no" ;;
+                               # Guess yes on native Windows.
+            mingw* | windows*) gl_cv_func_ftello_works="guessing yes" ;;
+                               # Guess yes otherwise.
+            *)                 gl_cv_func_ftello_works="guessing yes" ;;
           esac
 changequote([,])dnl
           AC_RUN_IFELSE(
diff --git a/gl/m4/getaddrinfo.m4 b/gl/m4/getaddrinfo.m4
index 15f09ffb..8e209177 100644
--- a/gl/m4/getaddrinfo.m4
+++ b/gl/m4/getaddrinfo.m4
@@ -1,5 +1,6 @@
-# getaddrinfo.m4 serial 34
-dnl Copyright (C) 2004-2023 Free Software Foundation, Inc.
+# getaddrinfo.m4
+# serial 35
+dnl Copyright (C) 2004-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.
@@ -41,7 +42,7 @@ AC_DEFUN([gl_GETADDRINFO],
     AC_CACHE_CHECK([for getaddrinfo in ws2tcpip.h and -lws2_32],
                    gl_cv_w32_getaddrinfo, [
       gl_cv_w32_getaddrinfo=no
-      am_save_LIBS="$LIBS"
+      gl_saved_LIBS="$LIBS"
       LIBS="$LIBS -lws2_32"
       AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_WS2TCPIP_H
@@ -49,7 +50,7 @@ AC_DEFUN([gl_GETADDRINFO],
 #endif
 #include <stddef.h>
 ]], [[getaddrinfo(NULL, NULL, NULL, NULL);]])], [gl_cv_w32_getaddrinfo=yes])
-      LIBS="$am_save_LIBS"
+      LIBS="$gl_saved_LIBS"
     ])
     if test "$gl_cv_w32_getaddrinfo" = "yes"; then
       GETADDRINFO_LIB="-lws2_32"
diff --git a/gl/m4/getdelim.m4 b/gl/m4/getdelim.m4
index 9aaed202..61139039 100644
--- a/gl/m4/getdelim.m4
+++ b/gl/m4/getdelim.m4
@@ -1,6 +1,7 @@
-# getdelim.m4 serial 16
+# getdelim.m4
+# serial 19
 
-dnl Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc.
+dnl Copyright (C) 2005-2007, 2009-2024 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,
@@ -18,7 +19,7 @@ AC_DEFUN([gl_FUNC_GETDELIM],
 
   AC_CHECK_DECLS_ONCE([getdelim])
 
-  AC_CHECK_FUNCS_ONCE([getdelim])
+  gl_CHECK_FUNCS_ANDROID([getdelim], [[#include <stdio.h>]])
   if test $ac_cv_func_getdelim = yes; then
     HAVE_GETDELIM=1
     dnl Found it in some library.  Verify that it works.
@@ -82,8 +83,8 @@ AC_DEFUN([gl_FUNC_GETDELIM],
                 ],
                 [gl_cv_func_working_getdelim="guessing yes"],
                 [case "$host_os" in
-                   *-musl*) gl_cv_func_working_getdelim="guessing yes" ;;
-                   *)       gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;;
+                   *-musl* | midipix*) gl_cv_func_working_getdelim="guessing yes" ;;
+                   *)                  gl_cv_func_working_getdelim="$gl_cross_guess_normal" ;;
                  esac
                 ])
              ])
@@ -96,6 +97,9 @@ AC_DEFUN([gl_FUNC_GETDELIM],
     esac
   else
     HAVE_GETDELIM=0
+    case "$gl_cv_onwards_func_getdelim" in
+      future*) REPLACE_GETDELIM=1 ;;
+    esac
   fi
 
   if test $ac_cv_have_decl_getdelim = no; then
diff --git a/gl/m4/getdtablesize.m4 b/gl/m4/getdtablesize.m4
index 8bcda905..aaefe9b2 100644
--- a/gl/m4/getdtablesize.m4
+++ b/gl/m4/getdtablesize.m4
@@ -1,5 +1,6 @@
-# getdtablesize.m4 serial 8
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# getdtablesize.m4
+# serial 8
+dnl Copyright (C) 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.
diff --git a/gl/m4/gethostname.m4 b/gl/m4/gethostname.m4
index 63f5f636..2f743b7d 100644
--- a/gl/m4/gethostname.m4
+++ b/gl/m4/gethostname.m4
@@ -1,5 +1,6 @@
-# gethostname.m4 serial 15
-dnl Copyright (C) 2002, 2008-2023 Free Software Foundation, Inc.
+# gethostname.m4
+# serial 16
+dnl Copyright (C) 2002, 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.
@@ -20,7 +21,7 @@ AC_DEFUN([gl_FUNC_GETHOSTNAME],
     AC_CACHE_CHECK([for gethostname in winsock2.h and -lws2_32],
       [gl_cv_w32_gethostname],
       [gl_cv_w32_gethostname=no
-       gl_save_LIBS="$LIBS"
+       gl_saved_LIBS="$LIBS"
        LIBS="$LIBS -lws2_32"
        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #ifdef HAVE_WINSOCK2_H
@@ -28,7 +29,7 @@ AC_DEFUN([gl_FUNC_GETHOSTNAME],
 #endif
 #include <stddef.h>
 ]], [[gethostname(NULL, 0);]])], [gl_cv_w32_gethostname=yes])
-       LIBS="$gl_save_LIBS"
+       LIBS="$gl_saved_LIBS"
       ])
     if test "$gl_cv_w32_gethostname" = "yes"; then
       GETHOSTNAME_LIB="-lws2_32"
diff --git a/gl/m4/getline.m4 b/gl/m4/getline.m4
index 03569f06..36513cd4 100644
--- a/gl/m4/getline.m4
+++ b/gl/m4/getline.m4
@@ -1,6 +1,7 @@
-# getline.m4 serial 30
+# getline.m4
+# serial 33
 
-dnl Copyright (C) 1998-2003, 2005-2007, 2009-2023 Free Software Foundation,
+dnl Copyright (C) 1998-2003, 2005-2007, 2009-2024 Free Software Foundation,
 dnl Inc.
 dnl
 dnl This file is free software; the Free Software Foundation
@@ -23,12 +24,9 @@ AC_DEFUN([gl_FUNC_GETLINE],
 
   AC_CHECK_DECLS_ONCE([getline])
 
-  gl_getline_needs_run_time_check=no
-  AC_CHECK_FUNC([getline],
-                [dnl Found it in some library.  Verify that it works.
-                 gl_getline_needs_run_time_check=yes],
-                [am_cv_func_working_getline=no])
-  if test $gl_getline_needs_run_time_check = yes; then
+  gl_CHECK_FUNCS_ANDROID([getline], [[#include <stdio.h>]])
+  if test $ac_cv_func_getline = yes; then
+    dnl Found it in some library.  Verify that it works.
     AC_CACHE_CHECK([for working getline function],
       [am_cv_func_working_getline],
       [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data
@@ -79,12 +77,17 @@ AC_DEFUN([gl_FUNC_GETLINE],
             ],
             [am_cv_func_working_getline="guessing yes"],
             [case "$host_os" in
-               *-musl*) am_cv_func_working_getline="guessing yes" ;;
-               *)       am_cv_func_working_getline="$gl_cross_guess_normal" ;;
+               *-musl* | midipix*) am_cv_func_working_getline="guessing yes" ;;
+               *)                  am_cv_func_working_getline="$gl_cross_guess_normal" ;;
              esac
             ])
          ])
       ])
+  else
+    am_cv_func_working_getline=no
+    case "$gl_cv_onwards_func_getline" in
+      future*) REPLACE_GETLINE=1 ;;
+    esac
   fi
 
   if test $ac_cv_have_decl_getline = no; then
diff --git a/gl/m4/getloadavg.m4 b/gl/m4/getloadavg.m4
index 79e420ba..0918bcd2 100644
--- a/gl/m4/getloadavg.m4
+++ b/gl/m4/getloadavg.m4
@@ -1,13 +1,12 @@
-# Check for getloadavg.
-
-# Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2023 Free Software
-# Foundation, Inc.
+# getloadavg.m4
+# serial 13
+dnl Copyright (C) 1992-1996, 1999-2000, 2002-2003, 2006, 2008-2024 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.
 
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 10
+# Check for getloadavg.
 
 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
 # New applications should use gl_GETLOADAVG instead.
@@ -20,13 +19,18 @@ AC_DEFUN([gl_GETLOADAVG],
 # Persuade glibc <stdlib.h> to declare getloadavg().
 AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
 
-gl_save_LIBS=$LIBS
+gl_saved_LIBS=$LIBS
 
 # getloadavg is present in libc on glibc >= 2.2, Mac OS X, FreeBSD >= 2.0,
 # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
 HAVE_GETLOADAVG=1
-AC_CHECK_FUNC([getloadavg], [],
-  [gl_func_getloadavg_done=no
+gl_CHECK_FUNCS_ANDROID([getloadavg], [[#include <stdlib.h>]])
+if test $ac_cv_func_getloadavg != yes; then
+   case "$gl_cv_onwards_func_getloadavg" in
+     future*) REPLACE_GETLOADAVG=1 ;;
+   esac
+
+   gl_func_getloadavg_done=no
 
    # Some systems with -lutil have (and need) -lkvm as well, some do not.
    # On Solaris, -lkvm requires nlist from -lelf, so check that first
@@ -73,14 +77,15 @@ AC_CHECK_FUNC([getloadavg], [],
           AC_DEFINE([DGUX], [1], [Define to 1 for DGUX with <sys/dg_sys_info.h>.])
           AC_CHECK_LIB([dgc], [dg_sys_info])])
      fi
-   fi])
+   fi
+fi
 
-if test "x$gl_save_LIBS" = x; then
+if test "x$gl_saved_LIBS" = x; then
   GETLOADAVG_LIBS=$LIBS
 else
-  GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$gl_save_LIBS!!"`
+  GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$gl_saved_LIBS!!"`
 fi
-LIBS=$gl_save_LIBS
+LIBS=$gl_saved_LIBS
 
 AC_SUBST([GETLOADAVG_LIBS])dnl
 
diff --git a/gl/m4/getopt.m4 b/gl/m4/getopt.m4
index 7981a095..297722ea 100644
--- a/gl/m4/getopt.m4
+++ b/gl/m4/getopt.m4
@@ -1,5 +1,6 @@
-# getopt.m4 serial 48
-dnl Copyright (C) 2002-2006, 2008-2023 Free Software Foundation, Inc.
+# getopt.m4
+# serial 49
+dnl Copyright (C) 2002-2006, 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.
@@ -197,8 +198,8 @@ main ()
           fi
         else
           case "$host_os" in
-            darwin* | aix* | mingw*) gl_cv_func_getopt_posix="guessing no";;
-            *)                       gl_cv_func_getopt_posix="guessing yes";;
+            darwin* | aix* | mingw* | windows*) gl_cv_func_getopt_posix="guessing no";;
+            *)                                  gl_cv_func_getopt_posix="guessing yes";;
           esac
         fi
       ])
diff --git a/gl/m4/getprogname.m4 b/gl/m4/getprogname.m4
index b67c527c..b24f4480 100644
--- a/gl/m4/getprogname.m4
+++ b/gl/m4/getprogname.m4
@@ -1,16 +1,33 @@
-# getprogname.m4 - check for getprogname or replacements for it
+# getprogname.m4
+# serial 8
+dnl Copyright (C) 2016-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.
 
-# Copyright (C) 2016-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
+# Check for getprogname or replacements for it
 
 AC_DEFUN([gl_FUNC_GETPROGNAME],
 [
-  AC_CHECK_FUNCS_ONCE([getprogname getexecname])
+  AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  gl_CHECK_FUNCS_ANDROID([getprogname], [[#include <stdlib.h>]])
+  if test $ac_cv_func_getprogname = no; then
+    HAVE_GETPROGNAME=0
+    case "$gl_cv_onwards_func_getprogname" in
+      future*) REPLACE_GETPROGNAME=1 ;;
+    esac
+  fi
+  AC_CHECK_DECLS([program_invocation_name],
+    [],
+    [HAVE_DECL_PROGRAM_INVOCATION_NAME=0],
+    [[#include <errno.h>]])
+])
+
+AC_DEFUN([gl_PREREQ_GETPROGNAME],
+[
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_CHECK_FUNCS_ONCE([getexecname])
   ac_found=0
   AC_CHECK_DECLS([program_invocation_name], [ac_found=1], [],
     [#include <errno.h>])
diff --git a/gl/m4/gl-openssl.m4 b/gl/m4/gl-openssl.m4
index 7eab4e10..c5e1f7ba 100644
--- a/gl/m4/gl-openssl.m4
+++ b/gl/m4/gl-openssl.m4
@@ -1,5 +1,6 @@
-# gl-openssl.m4 serial 6
-dnl Copyright (C) 2013-2023 Free Software Foundation, Inc.
+# gl-openssl.m4
+# serial 7
+dnl Copyright (C) 2013-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.
@@ -39,6 +40,9 @@ AC_DEFUN([gl_CRYPTO_CHECK],
   AC_SUBST([LIB_CRYPTO])
   if test "x$with_openssl" != xno; then
     if test "x$with_openssl" = xauto-gpl-compat; then
+      dnl OpenSSL versions < 3 are under the OpenSSL license, which is not
+      dnl GPL compatible.
+      dnl See <https://www.gnu.org/licenses/license-list.en.html#OpenSSL>.
       AC_CACHE_CHECK([whether openssl is GPL compatible],
                      [gl_cv_openssl_gpl_compat],
         [AC_COMPILE_IFELSE(
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index 267f0692..fcf84226 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2023 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 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 facc3404..cb730449 100644
--- a/gl/m4/gnulib-common.m4
+++ b/gl/m4/gnulib-common.m4
@@ -1,5 +1,6 @@
-# gnulib-common.m4 serial 75a
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# gnulib-common.m4
+# serial 93
+dnl Copyright (C) 2007-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.
@@ -15,6 +16,10 @@ AC_DEFUN([gl_COMMON], [
   AC_REQUIRE([gl_ZZGNULIB])
 ])
 AC_DEFUN([gl_COMMON_BODY], [
+  AH_VERBATIM([0witness],
+[/* Witness that <config.h> has been included.  */
+#define _GL_CONFIG_H_INCLUDED 1
+])
   AH_VERBATIM([_GL_GNUC_PREREQ],
 [/* True if the compiler says it groks GNU C version MAJOR.MINOR.  */
 #if defined __GNUC__ && defined __GNUC_MINOR__
@@ -72,50 +77,74 @@ AC_DEFUN([gl_COMMON_BODY], [
 #endif])
   AH_VERBATIM([attribute],
 [/* Attributes.  */
-#if (defined __has_attribute \
-     && (!defined __clang_minor__ \
-         || (defined __apple_build_version__ \
-             ? 6000000 <= __apple_build_version__ \
-             : 3 < __clang_major__ + (5 <= __clang_minor__))))
-# define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
-#else
-# define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
-# 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)
-# define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3)
-# define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95)
-# define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1)
-# define _GL_ATTR_diagnose_if 0
-# define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3)
-# define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1)
-# define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0)
-# define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7)
-# define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6)
-# define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0)
-# ifdef _ICC
-#  define _GL_ATTR_may_alias 0
+/* Define _GL_HAS_ATTRIBUTE only once, because on FreeBSD, with gcc < 5, if
+   <config.h> gets included once again after <sys/cdefs.h>, __has_attribute(x)
+   expands to 0 always, and redefining _GL_HAS_ATTRIBUTE would turn off all
+   attributes.  */
+#ifndef _GL_HAS_ATTRIBUTE
+# if (defined __has_attribute \
+      && (!defined __clang_minor__ \
+          || (defined __apple_build_version__ \
+              ? 7000000 <= __apple_build_version__ \
+              : 5 <= __clang_major__)))
+#  define _GL_HAS_ATTRIBUTE(attr) __has_attribute (__##attr##__)
 # else
-#  define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3)
+#  define _GL_HAS_ATTRIBUTE(attr) _GL_ATTR_##attr
+#  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)
+#  define _GL_ATTR_cold _GL_GNUC_PREREQ (4, 3)
+#  define _GL_ATTR_const _GL_GNUC_PREREQ (2, 95)
+#  define _GL_ATTR_deprecated _GL_GNUC_PREREQ (3, 1)
+#  define _GL_ATTR_diagnose_if 0
+#  define _GL_ATTR_error _GL_GNUC_PREREQ (4, 3)
+#  define _GL_ATTR_externally_visible _GL_GNUC_PREREQ (4, 1)
+#  define _GL_ATTR_fallthrough _GL_GNUC_PREREQ (7, 0)
+#  define _GL_ATTR_format _GL_GNUC_PREREQ (2, 7)
+#  define _GL_ATTR_leaf _GL_GNUC_PREREQ (4, 6)
+#  define _GL_ATTR_malloc _GL_GNUC_PREREQ (3, 0)
+#  ifdef _ICC
+#   define _GL_ATTR_may_alias 0
+#  else
+#   define _GL_ATTR_may_alias _GL_GNUC_PREREQ (3, 3)
+#  endif
+#  define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1)
+#  define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3)
+#  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_returns_nonnull _GL_GNUC_PREREQ (4, 9)
+#  define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0)
+#  define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7)
+#  define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4)
 # endif
-# define _GL_ATTR_noinline _GL_GNUC_PREREQ (3, 1)
-# define _GL_ATTR_nonnull _GL_GNUC_PREREQ (3, 3)
-# 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_returns_nonnull _GL_GNUC_PREREQ (4, 9)
-# define _GL_ATTR_sentinel _GL_GNUC_PREREQ (4, 0)
-# define _GL_ATTR_unused _GL_GNUC_PREREQ (2, 7)
-# define _GL_ATTR_warn_unused_result _GL_GNUC_PREREQ (3, 4)
 #endif
 
-/* Disable GCC -Wpedantic if using __has_c_attribute and this is not C23+.  */
-#if (defined __has_c_attribute && _GL_GNUC_PREREQ (4, 6) \
-     && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710)
-# pragma GCC diagnostic ignored "-Wpedantic"
+/* Use __has_c_attribute if available.  However, do not use with
+   pre-C23 GCC, which can issue false positives if -Wpedantic.  */
+#if (defined __has_c_attribute \
+     && ! (_GL_GNUC_PREREQ (4, 6) \
+           && (defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710))
+# define _GL_HAVE___HAS_C_ATTRIBUTE 1
+#else
+# define _GL_HAVE___HAS_C_ATTRIBUTE 0
 #endif
 
+/* 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
+   various _GL_ATTRIBUTE_* can be cumulated on the same declaration in any
+   order.  */
+#ifdef __cplusplus
+# if defined __clang__
+#  define _GL_BRACKET_BEFORE_ATTRIBUTE 1
+# endif
+#else
+# if defined __GNUC__ && !defined __clang__
+#  define _GL_BRACKET_BEFORE_ATTRIBUTE 1
+# endif
+#endif
 ]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
@@ -223,9 +252,11 @@ AC_DEFUN([gl_COMMON_BODY], [
      - typedef,
    in C++ also: namespace, class, template specialization.  */
 #ifndef _GL_ATTRIBUTE_DEPRECATED
-# ifdef __has_c_attribute
-#  if __has_c_attribute (__deprecated__)
-#   define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]]
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__deprecated__)
+#    define _GL_ATTRIBUTE_DEPRECATED [[__deprecated__]]
+#   endif
 #  endif
 # endif
 # if !defined _GL_ATTRIBUTE_DEPRECATED && _GL_HAS_ATTRIBUTE (deprecated)
@@ -271,7 +302,7 @@ AC_DEFUN([gl_COMMON_BODY], [
 /* Applies to: Empty statement (;), inside a 'switch' statement.  */
 /* Always expands to something.  */
 #ifndef _GL_ATTRIBUTE_FALLTHROUGH
-# ifdef __has_c_attribute
+# if _GL_HAVE___HAS_C_ATTRIBUTE
 #  if __has_c_attribute (__fallthrough__)
 #   define _GL_ATTRIBUTE_FALLTHROUGH [[__fallthrough__]]
 #  endif
@@ -351,11 +382,19 @@ AC_DEFUN([gl_COMMON_BODY], [
    in C++ also: class.  */
 /* In C++ and C23, this is spelled [[__maybe_unused__]].
    GCC's syntax is __attribute__ ((__unused__)).
-   clang supports both syntaxes.  */
+   clang supports both syntaxes.  Except that with clang ≥ 6, < 10, in C++ mode,
+   __has_c_attribute (__maybe_unused__) yields true but the use of
+   [[__maybe_unused__]] nevertheless produces a warning.  */
 #ifndef _GL_ATTRIBUTE_MAYBE_UNUSED
-# ifdef __has_c_attribute
-#  if __has_c_attribute (__maybe_unused__)
-#   define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]]
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if defined __clang__ && defined __cplusplus
+#   if !defined __apple_build_version__ && __clang_major__ >= 10
+#    define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]]
+#   endif
+#  elif _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__maybe_unused__)
+#    define _GL_ATTRIBUTE_MAYBE_UNUSED [[__maybe_unused__]]
+#   endif
 #  endif
 # endif
 # ifndef _GL_ATTRIBUTE_MAYBE_UNUSED
@@ -373,9 +412,20 @@ AC_DEFUN([gl_COMMON_BODY], [
    the return value, unless the caller uses something like ignore_value.  */
 /* Applies to: function, enumeration, class.  */
 #ifndef _GL_ATTRIBUTE_NODISCARD
-# ifdef __has_c_attribute
-#  if __has_c_attribute (__nodiscard__)
-#   define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]]
+# ifndef _GL_BRACKET_BEFORE_ATTRIBUTE
+#  if defined __clang__ && defined __cplusplus
+  /* With clang up to 15.0.6 (at least), in C++ mode, [[__nodiscard__]] produces
+     a warning.
+     The 1000 below means a yet unknown threshold.  When clang++ version X
+     starts supporting [[__nodiscard__]] without warning about it, you can
+     replace the 1000 with X.  */
+#   if __clang_major__ >= 1000
+#    define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]]
+#   endif
+#  elif _GL_HAVE___HAS_C_ATTRIBUTE
+#   if __has_c_attribute (__nodiscard__)
+#    define _GL_ATTRIBUTE_NODISCARD [[__nodiscard__]]
+#   endif
 #  endif
 # endif
 # if !defined _GL_ATTRIBUTE_NODISCARD && _GL_HAS_ATTRIBUTE (warn_unused_result)
@@ -427,11 +477,25 @@ AC_DEFUN([gl_COMMON_BODY], [
 /* _GL_ATTRIBUTE_NOTHROW declares that the function does not throw exceptions.
  */
 /* Applies to: functions.  */
+/* After a function's parameter list, this attribute must come first, before
+   other attributes.  */
 #ifndef _GL_ATTRIBUTE_NOTHROW
-# if _GL_HAS_ATTRIBUTE (nothrow) && !defined __cplusplus
-#  define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+# if defined __cplusplus
+#  if _GL_GNUC_PREREQ (2, 8) || __clang_major >= 4
+#   if __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
 # else
-#  define _GL_ATTRIBUTE_NOTHROW
+#  if _GL_HAS_ATTRIBUTE (nothrow)
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
 # endif
 #endif
 
@@ -441,8 +505,10 @@ AC_DEFUN([gl_COMMON_BODY], [
    minimizing the memory required.  */
 /* Applies to: struct members, struct, union,
    in C++ also: class.  */
+/* Oracle Studio 12.6 miscompiles code with __attribute__ ((__packed__)) despite
+   __has_attribute OK.  */
 #ifndef _GL_ATTRIBUTE_PACKED
-# if _GL_HAS_ATTRIBUTE (packed)
+# if _GL_HAS_ATTRIBUTE (packed) && !defined __SUNPRO_C
 #  define _GL_ATTRIBUTE_PACKED __attribute__ ((__packed__))
 # else
 #  define _GL_ATTRIBUTE_PACKED
@@ -513,6 +579,18 @@ AC_DEFUN([gl_COMMON_BODY], [
 # endif
 #endif
 ])
+  AH_VERBATIM([c_linkage],
+[/* In C++, there is the concept of "language linkage", that encompasses
+    name mangling and function calling conventions.
+    The following macros start and end a block of "C" linkage.  */
+#ifdef __cplusplus
+# define _GL_BEGIN_C_LINKAGE extern "C" {
+# define _GL_END_C_LINKAGE }
+#else
+# define _GL_BEGIN_C_LINKAGE
+# define _GL_END_C_LINKAGE
+#endif
+])
   AH_VERBATIM([async_safe],
 [/* The _GL_ASYNC_SAFE marker should be attached to functions that are
    signal handlers (for signals other than SIGABRT, SIGPIPE) or can be
@@ -568,7 +646,7 @@ AC_DEFUN([gl_COMMON_BODY], [
   dnl gl_cross_guess_normal    (to be used when 'yes' is good and 'no' is bad),
   dnl gl_cross_guess_inverted  (to be used when 'no' is good and 'yes' is bad).
   AC_ARG_ENABLE([cross-guesses],
-    [AS_HELP_STRING([--enable-cross-guesses={conservative|risky}],
+    [AS_HELP_STRING([[--enable-cross-guesses={conservative|risky}]],
        [specify policy for cross-compilation guesses])],
     [if test "x$enableval" != xconservative && test "x$enableval" != xrisky; then
        AC_MSG_WARN([invalid argument supplied to --enable-cross-guesses])
@@ -1005,6 +1083,7 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS],
     dnl -Wno-pedantic                         >= 4.8          >= 3.9
     dnl -Wno-sign-compare                     >= 3            >= 3.9
     dnl -Wno-sign-conversion                  >= 4.3          >= 3.9
+    dnl -Wno-tautological-out-of-range-compare  -             >= 3.9
     dnl -Wno-type-limits                      >= 4.3          >= 3.9
     dnl -Wno-undef                            >= 3            >= 3.9
     dnl -Wno-unsuffixed-float-constants       >= 4.5
@@ -1030,6 +1109,9 @@ AC_DEFUN([gl_CC_GNULIB_WARNINGS],
       #if __GNUC__ + (__GNUC_MINOR__ >= 8) > 4 || (__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)
       -Wno-sign-conversion
       -Wno-type-limits
@@ -1080,6 +1162,238 @@ AC_DEFUN([gl_CONDITIONAL_HEADER],
   m4_popdef([gl_header_name])
 ])
 
+dnl Preparations for gl_CHECK_FUNCS_MACOS.
+AC_DEFUN([gl_PREPARE_CHECK_FUNCS_MACOS],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_COMPILER_CLANG])
+  AC_CACHE_CHECK([for compiler option needed when checking for future declarations],
+    [gl_cv_compiler_check_future_option],
+    [case "$host_os" in
+       dnl This is only needed on macOS.
+       darwin*)
+         if test $gl_cv_compiler_clang = yes; then
+           dnl Test whether the compiler supports the option
+           dnl '-Werror=unguarded-availability-new'.
+           saved_ac_compile="$ac_compile"
+           ac_compile="$ac_compile -Werror=unguarded-availability-new"
+           AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],[[]])],
+             [gl_cv_compiler_check_future_option='-Werror=unguarded-availability-new'],
+             [gl_cv_compiler_check_future_option=none])
+           ac_compile="$saved_ac_compile"
+         else
+           gl_cv_compiler_check_future_option=none
+         fi
+         ;;
+       *) gl_cv_compiler_check_future_option=none ;;
+     esac
+    ])
+])
+
+dnl Pieces of the expansion of
+dnl gl_CHECK_FUNCS_ANDROID
+dnl gl_CHECK_FUNCS_MACOS
+dnl gl_CHECK_FUNCS_ANDROID_MACOS
+
+AC_DEFUN([gl_CHECK_FUNCS_DEFAULT_CASE],
+[
+         *)
+           AC_CHECK_FUNC([$1])
+           [gl_cv_onwards_func_][$1]=$[ac_cv_func_][$1]
+           ;;
+])
+
+AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_ANDROID],
+[
+         linux*-android*)
+           AC_CHECK_DECL([$1], , , [$2])
+           if test $[ac_cv_have_decl_][$1] = yes; then
+             AC_CHECK_FUNC([[$1]])
+             if test $[ac_cv_func_][$1] = yes; then
+               [gl_cv_onwards_func_][$1]=yes
+             else
+               dnl The function is declared but does not exist. This should not
+               dnl happen normally. But anyway, we know that a future version
+               dnl of Android will have the function.
+               [gl_cv_onwards_func_][$1]='future OS version'
+             fi
+           else
+             [gl_cv_onwards_func_][$1]='future OS version'
+           fi
+           ;;
+])
+
+AC_DEFUN([gl_CHECK_FUNCS_CASE_FOR_MACOS],
+[
+         darwin*)
+           if test "x$gl_cv_compiler_check_future_option" != "xnone"; then
+             dnl Use a compile test, not a link test.
+             saved_ac_compile="$ac_compile"
+             ac_compile="$ac_compile $gl_cv_compiler_check_future_option"
+             saved_ac_compile_for_check_decl="$ac_compile_for_check_decl"
+             ac_compile_for_check_decl="$ac_compile_for_check_decl $gl_cv_compiler_check_future_option"
+             unset [ac_cv_have_decl_][$1]
+             AC_CHECK_DECL([$1], , , [$2])
+             ac_compile="$saved_ac_compile"
+             ac_compile_for_check_decl="$saved_ac_compile_for_check_decl"
+             [ac_cv_func_][$1]="$[ac_cv_have_decl_][$1]"
+             if test $[ac_cv_func_][$1] = yes; then
+               [gl_cv_onwards_func_][$1]=yes
+             else
+               unset [ac_cv_have_decl_][$1]
+               AC_CHECK_DECL([$1], , , [$2])
+               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
+             fi
+           else
+             AC_CHECK_FUNC([$1])
+             [gl_cv_onwards_func_][$1]=$[ac_cv_func_][$1]
+           fi
+           ;;
+])
+
+AC_DEFUN([gl_CHECK_FUNCS_SET_RESULTS],
+[
+  case "$[gl_cv_onwards_func_][$1]" in
+    future*) [ac_cv_func_][$1]=no ;;
+    *)       [ac_cv_func_][$1]=$[gl_cv_onwards_func_][$1] ;;
+  esac
+  if test $[ac_cv_func_][$1] = yes; then
+    AC_DEFINE([HAVE_]m4_translit([[$1]],
+                                 [abcdefghijklmnopqrstuvwxyz],
+                                 [ABCDEFGHIJKLMNOPQRSTUVWXYZ]),
+              [1], [Define to 1 if you have the `$1' function.])
+  fi
+])
+
+dnl gl_CHECK_FUNCS_ANDROID([func], [[#include <foo.h>]])
+dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem
+dnl on Android.
+dnl
+dnl When code is compiled on Android, it is in the context of a certain
+dnl "Android API level", which indicates the minimum version of Android on
+dnl which the app can be installed. In other words, you don't compile for a
+dnl specific version of Android. You compile for all versions of Android,
+dnl onwards from the given API level.
+dnl Thus, the question "does the OS have the function func" has three possible
+dnl answers:
+dnl   - yes, in all versions starting from the given API level,
+dnl   - no, in no version,
+dnl   - not in the given API level, but in a later version of Android.
+dnl
+dnl In detail, this works as follows:
+dnl If func was added to Android API level, say, 28, then the libc.so has the
+dnl symbol func always, whereas the header file <foo.h> declares func
+dnl conditionally:
+dnl   #if __ANDROID_API__ >= 28
+dnl   ... func (...) __INTRODUCED_IN(28);
+dnl   #endif
+dnl Thus, when compiling with "clang -target armv7a-unknown-linux-android28",
+dnl the function func is declared and exists in libc.
+dnl Whereas when compiling with "clang -target armv7a-unknown-linux-android27",
+dnl the function func is not declared but exists in libc.
+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 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
+dnl   AC_CHECK_FUNCS([func]).
+AC_DEFUN([gl_CHECK_FUNCS_ANDROID],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_CACHE_CHECK([for [$1]],
+    [[gl_cv_onwards_func_][$1]],
+    [gl_SILENT([
+       case "$host_os" in
+         gl_CHECK_FUNCS_CASE_FOR_ANDROID([$1], [$2])
+         gl_CHECK_FUNCS_DEFAULT_CASE([$1])
+       esac
+      ])
+    ])
+  gl_CHECK_FUNCS_SET_RESULTS([$1])
+])
+
+dnl gl_CHECK_FUNCS_MACOS([func], [[#include <foo.h>]])
+dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem
+dnl on macOS.
+dnl
+dnl When code is compiled on macOS, it is in the context of a certain minimum
+dnl macOS version, that can be set through the option '-mmacosx-version-min='.
+dnl In other words, you don't compile for a specific version of macOS. You
+dnl compile for all versions of macOS, onwards from the given version.
+dnl Thus, the question "does the OS have the function func" has three possible
+dnl answers:
+dnl   - yes, in all versions starting from the given version,
+dnl   - no, in no version,
+dnl   - not in the given version, but in a later version of macOS.
+dnl
+dnl In detail, this works as follows:
+dnl If func was added to, say, macOS version 13, then the libc has the
+dnl symbol func always, whereas the header file <foo.h> declares func
+dnl conditionally with a special availability attribute:
+dnl   ... func (...) __attribute__((availability(macos,introduced=13.0)));
+dnl Thus, when compiling with "clang mmacosx-version-min=13", there is no
+dnl warning about the use of func, and the resulting binary
+dnl   - runs fine on macOS 13,
+dnl   - aborts with a dyld "Symbol not found" message on macOS 12.
+dnl Whereas, when compiling with "clang mmacosx-version-min=12", there is a
+dnl   warning: 'func' is only available on macOS 13.0 or newer
+dnl   [-Wunguarded-availability-new],
+dnl and the resulting binary
+dnl   - runs fine on macOS 13,
+dnl   - crashes with a SIGSEGV (signal 11) on macOS 12.
+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 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
+dnl   AC_CHECK_FUNCS([func]).
+AC_DEFUN([gl_CHECK_FUNCS_MACOS],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_PREPARE_CHECK_FUNCS_MACOS])
+  AC_CACHE_CHECK([for [$1]],
+    [[gl_cv_onwards_func_][$1]],
+    [gl_SILENT([
+       case "$host_os" in
+         gl_CHECK_FUNCS_CASE_FOR_MACOS([$1], [$2])
+         gl_CHECK_FUNCS_DEFAULT_CASE([$1])
+       esac
+      ])
+    ])
+  gl_CHECK_FUNCS_SET_RESULTS([$1])
+])
+
+dnl gl_CHECK_FUNCS_ANDROID_MACOS([func], [[#include <foo.h>]])
+dnl is like AC_CHECK_FUNCS([func]), taking into account a portability problem
+dnl on Android and on macOS.
+dnl It is the combination of gl_CHECK_FUNCS_ANDROID and gl_CHECK_FUNCS_MACOS.
+AC_DEFUN([gl_CHECK_FUNCS_ANDROID_MACOS],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([gl_PREPARE_CHECK_FUNCS_MACOS])
+  AC_CACHE_CHECK([for [$1]],
+    [[gl_cv_onwards_func_][$1]],
+    [gl_SILENT([
+       case "$host_os" in
+         gl_CHECK_FUNCS_CASE_FOR_ANDROID([$1], [$2])
+         gl_CHECK_FUNCS_CASE_FOR_MACOS([$1], [$2])
+         gl_CHECK_FUNCS_DEFAULT_CASE([$1])
+       esac
+      ])
+    ])
+  gl_CHECK_FUNCS_SET_RESULTS([$1])
+])
+
 dnl Expands to some code for use in .c programs that, on native Windows, defines
 dnl the Microsoft deprecated alias function names to the underscore-prefixed
 dnl actual function names. With this macro, these function names are available
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index 4764622e..83a0f727 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-2023 Free Software Foundation, Inc.
+# Copyright (C) 2002-2024 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
@@ -43,6 +43,7 @@ AC_DEFUN([gl_EARLY],
   AC_REQUIRE([gl_PROG_AR_RANLIB])
 
   # Code from module absolute-header:
+  # Code from module alignasof:
   # Code from module alloca-opt:
   # Code from module arpa_inet:
   # Code from module assert-h:
@@ -67,6 +68,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module environ:
   # Code from module errno:
   # Code from module error:
+  # Code from module error-h:
   # Code from module exitfail:
   # Code from module extensions:
   # Code from module extern-inline:
@@ -112,6 +114,11 @@ AC_DEFUN([gl_EARLY],
   # Code from module inet_ntop:
   # Code from module intprops:
   # Code from module inttypes-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 largefile:
   AC_REQUIRE([AC_SYS_LARGEFILE])
@@ -128,6 +135,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module math:
   # Code from module mbrtowc:
   # Code from module mbsinit:
+  # Code from module mbszero:
   # Code from module mbtowc:
   # Code from module memchr:
   # Code from module minmax:
@@ -150,6 +158,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module servent:
   # Code from module setenv:
   # Code from module setlocale-null:
+  # Code from module setlocale-null-unlocked:
   # Code from module size_max:
   # Code from module snippet/_Noreturn:
   # Code from module snippet/arg-nonnull:
@@ -163,12 +172,12 @@ AC_DEFUN([gl_EARLY],
   # Code from module stat:
   # Code from module stat-time:
   # Code from module std-gnu11:
-  # Code from module stdalign:
   # Code from module stdbool:
   # Code from module stdckdint:
   # Code from module stddef:
   # Code from module stdint:
   # Code from module stdio:
+  gl_STDIO_H_EARLY
   # Code from module stdlib:
   # Code from module strcase:
   # Code from module strcasestr:
@@ -186,7 +195,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module sys_uio:
   # Code from module threadlib:
   gl_THREADLIB_EARLY
-  # Code from module time:
+  # Code from module time-h:
   # Code from module time_r:
   # Code from module timegm:
   # Code from module unistd:
@@ -199,6 +208,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module vsnprintf:
   # Code from module wchar:
   # Code from module wcrtomb:
+  # Code from module wctype:
   # Code from module wctype-h:
   # Code from module windows-mutex:
   # Code from module windows-once:
@@ -229,6 +239,7 @@ AC_DEFUN([gl_INIT],
   gl_COMMON
   gl_source_base='gl'
   gl_source_base_prefix=
+  gl_ALIGNASOF
   gl_FUNC_ALLOCA
   gl_CONDITIONAL_HEADER([alloca.h])
   AC_PROG_MKDIR_P
@@ -280,14 +291,17 @@ AC_DEFUN([gl_INIT],
   gl_HEADER_ERRNO_H
   gl_CONDITIONAL_HEADER([errno.h])
   AC_PROG_MKDIR_P
+  AC_REQUIRE([gl_ERROR_H])
   gl_ERROR
-  gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test "$ac_cv_lib_error_at_line" = no])
+  gl_CONDITIONAL([GL_COND_OBJ_ERROR], [test $COMPILE_ERROR_C = 1])
   AM_COND_IF([GL_COND_OBJ_ERROR], [
     gl_PREREQ_ERROR
   ])
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
+  gl_ERROR_H
+  AC_PROG_MKDIR_P
   AC_REQUIRE([gl_EXTERN_INLINE])
   gl_FUNC_FCNTL
   gl_CONDITIONAL([GL_COND_OBJ_FCNTL],
@@ -350,7 +364,7 @@ AC_DEFUN([gl_INIT],
   gl_CONDITIONAL([GL_COND_OBJ_FSTAT], [test $REPLACE_FSTAT = 1])
   AM_COND_IF([GL_COND_OBJ_FSTAT], [
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
         AC_LIBOBJ([stat-w32])
         ;;
     esac
@@ -406,7 +420,8 @@ AC_DEFUN([gl_INIT],
   gl_STDIO_MODULE_INDICATOR([getline])
   AC_REQUIRE([AC_CANONICAL_HOST])
   gl_GETLOADAVG
-  gl_CONDITIONAL([GL_COND_OBJ_GETLOADAVG], [test $HAVE_GETLOADAVG = 0])
+  gl_CONDITIONAL([GL_COND_OBJ_GETLOADAVG],
+                 [test $HAVE_GETLOADAVG = 0 || test $REPLACE_GETLOADAVG = 1])
   AM_COND_IF([GL_COND_OBJ_GETLOADAVG], [
     gl_PREREQ_GETLOADAVG
   ])
@@ -427,11 +442,20 @@ AC_DEFUN([gl_INIT],
   ])
   gl_UNISTD_MODULE_INDICATOR([getopt-posix])
   gl_FUNC_GETPROGNAME
+  gl_CONDITIONAL([GL_COND_OBJ_GETPROGNAME],
+                 [test $HAVE_GETPROGNAME = 0 || test $REPLACE_GETPROGNAME = 1])
+  AM_COND_IF([GL_COND_OBJ_GETPROGNAME], [
+    gl_PREREQ_GETPROGNAME
+  ])
+  gl_STDLIB_MODULE_INDICATOR([getprogname])
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
   AC_PROG_MKDIR_P
   AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
-  LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL"
+  HARD_LOCALE_LIB="$SETLOCALE_NULL_LIB"
+  AC_SUBST([HARD_LOCALE_LIB])
+  dnl For backward compatibility.
+  LIB_HARD_LOCALE="$HARD_LOCALE_LIB"
   AC_SUBST([LIB_HARD_LOCALE])
   gl_HOSTENT
   gl_IDPRIV
@@ -445,6 +469,26 @@ AC_DEFUN([gl_INIT],
   gl_INTTYPES_INCOMPLETE
   gl_INTTYPES_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
+  gl_FUNC_ISWBLANK
+  gl_CONDITIONAL([GL_COND_OBJ_ISWBLANK],
+                 [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && { test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; }])
+  gl_WCTYPE_MODULE_INDICATOR([iswblank])
+  gl_FUNC_ISWCTYPE
+  gl_CONDITIONAL([GL_COND_OBJ_ISWCTYPE],
+                 [test $HAVE_WCTYPE_T = 0 || test $GNULIBHEADERS_OVERRIDE_WINT_T = 1 || test $REPLACE_WCTYPE = 1])
+  gl_WCTYPE_MODULE_INDICATOR([iswctype])
+  gl_FUNC_ISWDIGIT
+  gl_CONDITIONAL([GL_COND_OBJ_ISWDIGIT],
+                 [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWDIGIT = 1])
+  gl_WCTYPE_MODULE_INDICATOR([iswdigit])
+  gl_FUNC_ISWPUNCT
+  gl_CONDITIONAL([GL_COND_OBJ_ISWPUNCT],
+                 [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWPUNCT = 1])
+  gl_WCTYPE_MODULE_INDICATOR([iswpunct])
+  gl_FUNC_ISWXDIGIT
+  gl_CONDITIONAL([GL_COND_OBJ_ISWXDIGIT],
+                 [! { test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; } && test $REPLACE_ISWXDIGIT = 1])
+  gl_WCTYPE_MODULE_INDICATOR([iswxdigit])
   gl_LANGINFO_H
   gl_LANGINFO_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
@@ -504,6 +548,10 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_MBSINIT
   ])
   gl_WCHAR_MODULE_INDICATOR([mbsinit])
+  AC_REQUIRE([AC_TYPE_MBSTATE_T])
+  gl_MBSTATE_T_BROKEN
+  gl_MUSL_LIBC
+  gl_WCHAR_MODULE_INDICATOR([mbszero])
   gl_FUNC_MBTOWC
   gl_CONDITIONAL([GL_COND_OBJ_MBTOWC],
                  [test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1])
@@ -611,7 +659,7 @@ AC_DEFUN([gl_INIT],
   gl_CONDITIONAL([GL_COND_OBJ_STAT], [test $REPLACE_STAT = 1])
   AM_COND_IF([GL_COND_OBJ_STAT], [
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
         AC_LIBOBJ([stat-w32])
         ;;
     esac
@@ -620,9 +668,6 @@ AC_DEFUN([gl_INIT],
   gl_SYS_STAT_MODULE_INDICATOR([stat])
   gl_STAT_TIME
   gl_STAT_BIRTHTIME
-  gl_STDALIGN_H
-  gl_CONDITIONAL_HEADER([stdalign.h])
-  AC_PROG_MKDIR_P
   gl_C_BOOL
   AC_CHECK_HEADERS_ONCE([stdckdint.h])
   if test $ac_cv_header_stdckdint_h = yes; then
@@ -781,21 +826,24 @@ AC_DEFUN([gl_INIT],
     gl_PREREQ_WCRTOMB
   ])
   gl_WCHAR_MODULE_INDICATOR([wcrtomb])
+  gl_FUNC_WCTYPE
+  gl_CONDITIONAL([GL_COND_OBJ_WCTYPE], [test $HAVE_WCTYPE = 0 || test $REPLACE_WCTYPE = 1])
+  gl_WCTYPE_MODULE_INDICATOR([wctype])
   gl_WCTYPE_H
   gl_WCTYPE_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
   AC_REQUIRE([AC_CANONICAL_HOST])
   gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_MUTEX],
-                 [case "$host_os" in mingw*) true;; *) false;; esac])
+                 [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
   AC_REQUIRE([AC_CANONICAL_HOST])
   gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_ONCE],
-                 [case "$host_os" in mingw*) true;; *) false;; esac])
+                 [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
   AC_REQUIRE([AC_CANONICAL_HOST])
   gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RECMUTEX],
-                 [case "$host_os" in mingw*) true;; *) false;; esac])
+                 [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
   AC_REQUIRE([AC_CANONICAL_HOST])
   gl_CONDITIONAL([GL_COND_OBJ_WINDOWS_RWLOCK],
-                 [case "$host_os" in mingw*) true;; *) false;; esac])
+                 [case "$host_os" in mingw* | windows*) true;; *) false;; esac])
   gl_XALLOC
   gl_MODULE_INDICATOR([xalloc])
   gl_MODULE_INDICATOR([xalloc-die])
@@ -1002,7 +1050,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/dynarray.h
   lib/errno.in.h
   lib/error.c
-  lib/error.h
+  lib/error.in.h
   lib/exitfail.c
   lib/exitfail.h
   lib/fcntl.c
@@ -1062,6 +1110,12 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/intprops-internal.h
   lib/intprops.h
   lib/inttypes.in.h
+  lib/iswblank.c
+  lib/iswctype-impl.h
+  lib/iswctype.c
+  lib/iswdigit.c
+  lib/iswpunct.c
+  lib/iswxdigit.c
   lib/itold.c
   lib/langinfo.in.h
   lib/lc-charset-dispatch.c
@@ -1089,6 +1143,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/mbrtowc-impl.h
   lib/mbrtowc.c
   lib/mbsinit.c
+  lib/mbszero.c
   lib/mbtowc-impl.h
   lib/mbtowc-lock.c
   lib/mbtowc-lock.h
@@ -1124,6 +1179,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/regexec.c
   lib/setenv.c
   lib/setlocale-lock.c
+  lib/setlocale_null-unlocked.c
   lib/setlocale_null.c
   lib/setlocale_null.h
   lib/sha256-stream.c
@@ -1138,7 +1194,6 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/stat-w32.c
   lib/stat-w32.h
   lib/stat.c
-  lib/stdalign.in.h
   lib/stdckdint.in.h
   lib/stddef.in.h
   lib/stdint.in.h
@@ -1183,6 +1238,8 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/wchar.in.h
   lib/wcrtomb.c
   lib/wctype-h.c
+  lib/wctype-impl.h
+  lib/wctype.c
   lib/wctype.in.h
   lib/windows-initguard.h
   lib/windows-mutex.c
@@ -1220,9 +1277,11 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/environ.m4
   m4/errno_h.m4
   m4/error.m4
+  m4/error_h.m4
   m4/exponentd.m4
   m4/extensions.m4
   m4/extern-inline.m4
+  m4/fclose.m4
   m4/fcntl-o.m4
   m4/fcntl.m4
   m4/fcntl_h.m4
@@ -1257,6 +1316,11 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/intmax_t.m4
   m4/inttypes.m4
   m4/inttypes_h.m4
+  m4/iswblank.m4
+  m4/iswctype.m4
+  m4/iswdigit.m4
+  m4/iswpunct.m4
+  m4/iswxdigit.m4
   m4/langinfo_h.m4
   m4/largefile.m4
   m4/limits-h.m4
@@ -1284,6 +1348,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/msvc-inval.m4
   m4/msvc-nothrow.m4
   m4/multiarch.m4
+  m4/musl.m4
   m4/netdb_h.m4
   m4/netinet_in_h.m4
   m4/nl_langinfo.m4
@@ -1346,6 +1411,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/wchar_h.m4
   m4/wchar_t.m4
   m4/wcrtomb.m4
+  m4/wctype.m4
   m4/wctype_h.m4
   m4/wint_t.m4
   m4/xalloc.m4
diff --git a/gl/m4/gnulib-tool.m4 b/gl/m4/gnulib-tool.m4
index a9dd569b..ef45f51f 100644
--- a/gl/m4/gnulib-tool.m4
+++ b/gl/m4/gnulib-tool.m4
@@ -1,5 +1,6 @@
-# gnulib-tool.m4 serial 4
-dnl Copyright (C) 2004-2005, 2009-2023 Free Software Foundation, Inc.
+# gnulib-tool.m4
+# serial 4
+dnl Copyright (C) 2004-2005, 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.
diff --git a/gl/m4/hostent.m4 b/gl/m4/hostent.m4
index 3b2cc2b2..36dc636e 100644
--- a/gl/m4/hostent.m4
+++ b/gl/m4/hostent.m4
@@ -1,5 +1,6 @@
-# hostent.m4 serial 4
-dnl Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc.
+# hostent.m4
+# serial 5
+dnl Copyright (C) 2008, 2010-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.
@@ -26,7 +27,7 @@ AC_DEFUN([gl_HOSTENT],
       AC_CACHE_CHECK([for gethostbyname in winsock2.h and -lws2_32],
         [gl_cv_w32_gethostbyname],
         [gl_cv_w32_gethostbyname=no
-         gl_save_LIBS="$LIBS"
+         gl_saved_LIBS="$LIBS"
          LIBS="$LIBS -lws2_32"
          AC_LINK_IFELSE(
            [AC_LANG_PROGRAM(
@@ -38,7 +39,7 @@ AC_DEFUN([gl_HOSTENT],
               ]],
               [[gethostbyname(NULL);]])],
            [gl_cv_w32_gethostbyname=yes])
-         LIBS="$gl_save_LIBS"
+         LIBS="$gl_saved_LIBS"
         ])
       if test "$gl_cv_w32_gethostbyname" = "yes"; then
         HOSTENT_LIB="-lws2_32"
diff --git a/gl/m4/idpriv.m4 b/gl/m4/idpriv.m4
index fc3dd17d..53693527 100644
--- a/gl/m4/idpriv.m4
+++ b/gl/m4/idpriv.m4
@@ -1,5 +1,6 @@
-# idpriv.m4 serial 1
-dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
+# idpriv.m4
+# serial 1
+dnl Copyright (C) 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.
diff --git a/gl/m4/include_next.m4 b/gl/m4/include_next.m4
index 9f19215e..03e85251 100644
--- a/gl/m4/include_next.m4
+++ b/gl/m4/include_next.m4
@@ -1,5 +1,6 @@
-# include_next.m4 serial 26
-dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
+# include_next.m4
+# serial 27
+dnl Copyright (C) 2006-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.
@@ -74,17 +75,17 @@ EOF
 #endif
 #define DEFINED_IN_CONFTESTD2
 EOF
-     gl_save_CPPFLAGS="$CPPFLAGS"
-     CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1b -Iconftestd2"
+     gl_saved_CPPFLAGS="$CPPFLAGS"
+     CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1b -Iconftestd2"
 dnl We intentionally avoid using AC_LANG_SOURCE here.
      AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
        [gl_cv_have_include_next=yes],
-       [CPPFLAGS="$gl_save_CPPFLAGS -Iconftestd1a -Iconftestd2"
+       [CPPFLAGS="$gl_saved_CPPFLAGS -Iconftestd1a -Iconftestd2"
         AC_COMPILE_IFELSE([AC_LANG_DEFINES_PROVIDED[#include <conftest.h>]],
           [gl_cv_have_include_next=buggy],
           [gl_cv_have_include_next=no])
        ])
-     CPPFLAGS="$gl_save_CPPFLAGS"
+     CPPFLAGS="$gl_saved_CPPFLAGS"
      rm -rf conftestd1a conftestd1b conftestd2
     ])
   PRAGMA_SYSTEM_HEADER=
diff --git a/gl/m4/inet_ntop.m4 b/gl/m4/inet_ntop.m4
index 48822d69..168e17e0 100644
--- a/gl/m4/inet_ntop.m4
+++ b/gl/m4/inet_ntop.m4
@@ -1,5 +1,6 @@
-# inet_ntop.m4 serial 21
-dnl Copyright (C) 2005-2006, 2008-2023 Free Software Foundation, Inc.
+# inet_ntop.m4
+# serial 22
+dnl Copyright (C) 2005-2006, 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.
@@ -36,14 +37,14 @@ AC_DEFUN([gl_FUNC_INET_NTOP],
       HAVE_DECL_INET_NTOP=0
     fi
   else
-    gl_save_LIBS=$LIBS
+    gl_saved_LIBS=$LIBS
     AC_SEARCH_LIBS([inet_ntop], [nsl resolv network], [],
       [AC_CHECK_FUNCS([inet_ntop])
        if test $ac_cv_func_inet_ntop = no; then
          HAVE_INET_NTOP=0
        fi
       ])
-    LIBS=$gl_save_LIBS
+    LIBS=$gl_saved_LIBS
 
     if test "$ac_cv_search_inet_ntop" != "no" \
        && test "$ac_cv_search_inet_ntop" != "none required"; then
diff --git a/gl/m4/intmax_t.m4 b/gl/m4/intmax_t.m4
index ef32e1b9..72858ea8 100644
--- a/gl/m4/intmax_t.m4
+++ b/gl/m4/intmax_t.m4
@@ -1,5 +1,6 @@
-# intmax_t.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006-2007, 2009-2023 Free Software Foundation,
+# intmax_t.m4
+# serial 9
+dnl Copyright (C) 1997-2004, 2006-2007, 2009-2024 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,
diff --git a/gl/m4/inttypes.m4 b/gl/m4/inttypes.m4
index bf2eab2b..c43cd162 100644
--- a/gl/m4/inttypes.m4
+++ b/gl/m4/inttypes.m4
@@ -1,5 +1,6 @@
-# inttypes.m4 serial 36
-dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
+# inttypes.m4
+# serial 37
+dnl Copyright (C) 2006-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.
@@ -170,6 +171,10 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
   HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX])
   HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX])
   HAVE_IMAXDIV_T=1;      AC_SUBST([HAVE_IMAXDIV_T])
+  HAVE_IMAXABS=1;        AC_SUBST([HAVE_IMAXABS])
+  HAVE_IMAXDIV=1;        AC_SUBST([HAVE_IMAXDIV])
+  REPLACE_IMAXABS=0;     AC_SUBST([REPLACE_IMAXABS])
+  REPLACE_IMAXDIV=0;     AC_SUBST([REPLACE_IMAXDIV])
   REPLACE_STRTOIMAX=0;   AC_SUBST([REPLACE_STRTOIMAX])
   REPLACE_STRTOUMAX=0;   AC_SUBST([REPLACE_STRTOUMAX])
   INT32_MAX_LT_INTMAX_MAX=1;  AC_SUBST([INT32_MAX_LT_INTMAX_MAX])
diff --git a/gl/m4/inttypes_h.m4 b/gl/m4/inttypes_h.m4
index 68c60e9d..3b9da5b0 100644
--- a/gl/m4/inttypes_h.m4
+++ b/gl/m4/inttypes_h.m4
@@ -1,5 +1,6 @@
-# inttypes_h.m4 serial 10
-dnl Copyright (C) 1997-2004, 2006, 2008-2023 Free Software Foundation, Inc.
+# inttypes_h.m4
+# serial 10
+dnl Copyright (C) 1997-2004, 2006, 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.
diff --git a/gl/m4/iswblank.m4 b/gl/m4/iswblank.m4
new file mode 100644
index 00000000..4dc12d9a
--- /dev/null
+++ b/gl/m4/iswblank.m4
@@ -0,0 +1,39 @@
+# iswblank.m4
+# serial 7
+dnl Copyright (C) 2011-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_FUNC_ISWBLANK],
+[
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  AC_REQUIRE([gl_WCTYPE_H])
+  dnl Persuade glibc <wctype.h> to declare iswblank().
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  gl_CHECK_FUNCS_ANDROID([iswblank], [[#include <wctype.h>]])
+  AC_CHECK_DECLS([iswblank], , , [[
+    #include <wchar.h>
+    #include <wctype.h>
+  ]])
+  if test $ac_cv_func_iswblank = no; then
+    HAVE_ISWBLANK=0
+    if test $ac_cv_have_decl_iswblank = yes \
+       || case "$gl_cv_onwards_func_iswblank" in \
+            future*) true ;; \
+            *) false ;; \
+          esac; then
+      REPLACE_ISWBLANK=1
+    fi
+  fi
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    dnl Redefine all of iswcntrl, ..., towupper in <wctype.h>.
+    :
+  else
+    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
+      dnl Redefine only iswblank.
+      :
+    fi
+  fi
+
+])
diff --git a/gl/m4/iswctype.m4 b/gl/m4/iswctype.m4
new file mode 100644
index 00000000..16031be4
--- /dev/null
+++ b/gl/m4/iswctype.m4
@@ -0,0 +1,14 @@
+# iswctype.m4
+# serial 3
+dnl Copyright (C) 2011-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_FUNC_ISWCTYPE],
+[
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  AC_REQUIRE([gl_WCTYPE_H])
+  dnl Determine REPLACE_WCTYPE.
+  AC_REQUIRE([gl_FUNC_WCTYPE])
+])
diff --git a/gl/m4/iswdigit.m4 b/gl/m4/iswdigit.m4
new file mode 100644
index 00000000..999acd28
--- /dev/null
+++ b/gl/m4/iswdigit.m4
@@ -0,0 +1,121 @@
+# iswdigit.m4
+# serial 7
+dnl Copyright (C) 2020-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_FUNC_ISWDIGIT],
+[
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  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_ZH_CN])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    dnl <wctype.h> redefines iswdigit already.
+    REPLACE_ISWDIGIT="$REPLACE_ISWCNTRL"
+  else
+    AC_CACHE_CHECK([whether iswdigit is ISO C compliant],
+      [gl_cv_func_iswdigit_works],
+      [
+       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, NetBSD, Solaris, native Windows.
+         freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*)
+           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
+         AC_RUN_IFELSE(
+           [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <wctype.h>
+
+/* Returns the value of iswdigit for the multibyte character s[0..n-1].  */
+static int
+for_character (const char *s, size_t n)
+{
+  mbstate_t state;
+  wchar_t wc;
+  size_t ret;
+
+  memset (&state, '\0', sizeof (mbstate_t));
+  wc = (wchar_t) 0xBADFACE;
+  ret = mbrtowc (&wc, s, n, &state);
+  if (ret != n)
+    abort ();
+
+  return iswdigit (wc);
+}
+
+int
+main (int argc, char *argv[])
+{
+  int is;
+  int result = 0;
+
+  if (strcmp ("$LOCALE_FR", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+    {
+      /* This fails on mingw, MSVC 14.  */
+      /* U+00B2 SUPERSCRIPT TWO */
+      is = for_character ("\262", 1);
+      if (!(is == 0))
+        result |= 1;
+    }
+  if (strcmp ("$LOCALE_JA", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      /* This fails on NetBSD 10.0.  */
+      /* U+FF11 FULLWIDTH DIGIT ONE */
+      is = for_character ("\243\261", 2);
+      if (!(is == 0))
+        result |= 2;
+    }
+  if (strcmp ("$LOCALE_FR_UTF8", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      /* This fails on FreeBSD 13.0, NetBSD 10.0, MSVC 14.  */
+      /* 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.  */
+      /* U+FF11 FULLWIDTH DIGIT ONE */
+      is = for_character ("\357\274\221", 3);
+      if (!(is == 0))
+        result |= 8;
+    }
+  if (strcmp ("$LOCALE_ZH_CN", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      /* This fails on NetBSD 10.0, Solaris 10, Solaris 11.4.  */
+      /* U+FF11 FULLWIDTH DIGIT ONE */
+      is = for_character ("\243\261", 2);
+      if (!(is == 0))
+        result |= 16;
+    }
+  return result;
+}]])],
+           [gl_cv_func_iswdigit_works=yes],
+           [gl_cv_func_iswdigit_works=no],
+           [:])
+       fi
+      ])
+    case "$gl_cv_func_iswdigit_works" in
+      *yes) ;;
+      *) REPLACE_ISWDIGIT=1 ;;
+    esac
+  fi
+])
diff --git a/gl/m4/iswpunct.m4 b/gl/m4/iswpunct.m4
new file mode 100644
index 00000000..1edf58aa
--- /dev/null
+++ b/gl/m4/iswpunct.m4
@@ -0,0 +1,49 @@
+# iswpunct.m4
+# serial 2
+dnl Copyright (C) 2023-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_FUNC_ISWPUNCT],
+[
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  AC_REQUIRE([gl_WCTYPE_H])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    dnl <wctype.h> redefines iswpunct already.
+    REPLACE_ISWPUNCT="$REPLACE_ISWCNTRL"
+  else
+    AC_CACHE_CHECK([whether iswpunct is consistent with ispunct],
+      [gl_cv_func_iswpunct_works],
+      [AC_RUN_IFELSE(
+         [AC_LANG_SOURCE([[
+#include <ctype.h>
+#include <wchar.h>
+#include <wctype.h>
+int
+main (int argc, char *argv[])
+{
+  int result = 0;
+  /* This fails on Android 11.  */
+  if ((! iswpunct ('\`')) != (! ispunct ('\`')))
+    result |= 1;
+  return result;
+}]])],
+         [gl_cv_func_iswpunct_works=yes],
+         [gl_cv_func_iswpunct_works=no],
+         [case "$host_os" in
+            # Guess no on Android.
+            android*) gl_cv_func_iswpunct_works="guessing no" ;;
+            # Guess yes otherwise.
+            *)        gl_cv_func_iswpunct_works="guessing yes" ;;
+          esac
+         ])
+      ])
+    case "$gl_cv_func_iswpunct_works" in
+      *yes) ;;
+      *) REPLACE_ISWPUNCT=1 ;;
+    esac
+  fi
+])
diff --git a/gl/m4/iswxdigit.m4 b/gl/m4/iswxdigit.m4
new file mode 100644
index 00000000..6085bf6b
--- /dev/null
+++ b/gl/m4/iswxdigit.m4
@@ -0,0 +1,111 @@
+# iswxdigit.m4
+# serial 7
+dnl Copyright (C) 2020-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_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_ZH_CN])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    dnl <wctype.h> redefines iswxdigit already.
+    REPLACE_ISWXDIGIT="$REPLACE_ISWCNTRL"
+  else
+    AC_CACHE_CHECK([whether iswxdigit is ISO C compliant],
+      [gl_cv_func_iswxdigit_works],
+      [
+       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, NetBSD, Solaris, native Windows.
+         freebsd* | dragonfly* | netbsd* | solaris* | mingw* | windows*)
+           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
+         AC_RUN_IFELSE(
+           [AC_LANG_SOURCE([[
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+#include <wctype.h>
+
+/* Returns the value of iswxdigit for the multibyte character s[0..n-1].  */
+static int
+for_character (const char *s, size_t n)
+{
+  mbstate_t state;
+  wchar_t wc;
+  size_t ret;
+
+  memset (&state, '\0', sizeof (mbstate_t));
+  wc = (wchar_t) 0xBADFACE;
+  ret = mbrtowc (&wc, s, n, &state);
+  if (ret != n)
+    abort ();
+
+  return iswxdigit (wc);
+}
+
+int
+main (int argc, char *argv[])
+{
+  int is;
+  int result = 0;
+
+  if (strcmp ("$LOCALE_JA", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+    {
+      /* This fails on NetBSD 10.0.  */
+      /* U+FF21 FULLWIDTH LATIN CAPITAL LETTER A */
+      is = for_character ("\243\301", 2);
+      if (!(is == 0))
+        result |= 1;
+    }
+  if (strcmp ("$LOCALE_FR_UTF8", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+    {
+      /* This fails on FreeBSD 13.0.  */
+      /* 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.  */
+      /* U+FF21 FULLWIDTH LATIN CAPITAL LETTER A */
+      is = for_character ("\357\274\241", 3);
+      if (!(is == 0))
+        result |= 4;
+    }
+  if (strcmp ("$LOCALE_ZH_CN", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+    {
+      /* This fails on Solaris 10, Solaris 11.4.  */
+      /* U+FF11 FULLWIDTH DIGIT ONE */
+      is = for_character ("\243\261", 2);
+      if (!(is == 0))
+        result |= 8;
+    }
+  return result;
+}]])],
+           [gl_cv_func_iswxdigit_works=yes],
+           [gl_cv_func_iswxdigit_works=no],
+           [:])
+       fi
+      ])
+    case "$gl_cv_func_iswxdigit_works" in
+      *yes) ;;
+      *) REPLACE_ISWXDIGIT=1 ;;
+    esac
+  fi
+])
diff --git a/gl/m4/langinfo_h.m4 b/gl/m4/langinfo_h.m4
index b17a526a..5eee8a71 100644
--- a/gl/m4/langinfo_h.m4
+++ b/gl/m4/langinfo_h.m4
@@ -1,5 +1,6 @@
-# langinfo_h.m4 serial 12
-dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
+# langinfo_h.m4
+# serial 12
+dnl Copyright (C) 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.
diff --git a/gl/m4/largefile.m4 b/gl/m4/largefile.m4
index 7fb81b86..2f824089 100644
--- a/gl/m4/largefile.m4
+++ b/gl/m4/largefile.m4
@@ -1,16 +1,18 @@
+# largefile.m4
+# serial 1
+dnl Copyright 1992-1996, 1998-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.
+
 # Enable large files on systems where this is not the default.
 # Enable support for files on Linux file systems with 64-bit inode numbers.
 
-# Copyright 1992-1996, 1998-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
 # The following macro works around a problem in Autoconf's AC_FUNC_FSEEKO:
 # It does not set _LARGEFILE_SOURCE=1 on HP-UX/ia64 32-bit, although this
 # setting of _LARGEFILE_SOURCE is needed so that <stdio.h> declares fseeko
 # and ftello in C++ mode as well.
-# Fixed in Autoconf 2.72, which has AC_SYS_YEAR2038.
+# This problem occurs in Autoconf 2.71 and earlier, which lack AC_SYS_YEAR2038.
 AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
  m4_ifndef([AC_SYS_YEAR2038], [[
   AC_REQUIRE([AC_CANONICAL_HOST])
@@ -24,29 +26,20 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE],
  ]])
 )
 
-# Work around a problem in autoconf <= 2.69:
-# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
-# or configures them incorrectly in some cases.
-m4_version_prereq([2.70], [], [
-
-# _AC_SYS_LARGEFILE_TEST_INCLUDES
-# -------------------------------
-m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
-[#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-    since some C++ compilers masquerading as C compilers
-    incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
-                      ? 1 : -1]];[]dnl
-])
-])# m4_version_prereq 2.70
+dnl Remove AC_SYS_YEAR2038_RECOMMENDED if unpatched Autoconf 2.72 or earlier.
+dnl Autoconf 2.72 still uses -n32, which is not a C preprocessor option,
+dnl and which was useful only on IRIX which is no longer supported.
+dnl This should be fixed in Autoconf 2.73.
+m4_ifdef([AC_SYS_YEAR2038_RECOMMENDED],
+  [m4_bmatch(m4_ifdef([_AC_SYS_LARGEFILE_OPTIONS],
+               [m4_defn([_AC_SYS_LARGEFILE_OPTIONS])],
+               ["-n32"]),
+     ["-n32"],
+       [m4_undefine([AC_SYS_YEAR2038_RECOMMENDED])])])
 
-# Support AC_SYS_YEAR2038, even if Autoconf 2.71 or earlier.
-# This code is taken from Autoconf master.
-m4_ifndef([AC_SYS_YEAR2038], [
+m4_ifndef([AC_SYS_YEAR2038_RECOMMENDED], [
+# Fix up AC_SYS_YEAR2038_RECOMMENDED and related macros, even if
+# unpatched Autoconf 2.72 or earlier.  This code is taken from Autoconf master.
 
 # _AC_SYS_YEAR2038_TEST_CODE
 # --------------------------
@@ -78,8 +71,8 @@ m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize(
                                       dnl 32-bit MinGW (misconfiguration)
 ))
 
-# _AC_SYS_YEAR2038_PROBE([IF-NOT-DETECTED])
-# -----------------------------------------
+# _AC_SYS_YEAR2038_PROBE
+# ----------------------
 # Subroutine of AC_SYS_YEAR2038.  Probe for time_t that can represent
 # time points more than 2**31 - 1 seconds after the epoch (dates after
 # 2038-01-18, see above) and set the cache variable ac_cv_sys_year2038_opts
@@ -92,13 +85,10 @@ m4_define([_AC_SYS_YEAR2038_OPTIONS], m4_normalize(
 # AC_TRY_RUN.  Note also that some systems only support large time_t
 # together with large off_t.
 #
-# If support is not detected, the behavior depends on which of the
-# top-level AC_SYS_YEAR2038 macros was used (see below).
-#
 # 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 $CC option to enable timestamps after Jan 2038],
+[AC_CACHE_CHECK([for $CPPFLAGS option for timestamps after 2038],
   [ac_cv_sys_year2038_opts],
   [ac_save_CPPFLAGS="$CPPFLAGS"
   ac_opt_found=no
@@ -117,40 +107,20 @@ ac_have_year2038=yes
 AS_CASE([$ac_cv_sys_year2038_opts],
   ["none needed"], [],
   ["support not detected"],
-    [ac_have_year2038=no
-     AS_CASE([$enable_year2038],
-      [yes],
-        [# If we're not cross compiling and 'touch' works with a large
-        # timestamp, then we can presume the system supports wider time_t
-        # *somehow* and we just weren't able to detect it.  One common
-        # case that we deliberately *don't* probe for is a system that
-        # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers
-        # wide time_t.  (It would be inappropriate for us to override an
-        # intentional use of -m32.)  Error out, demanding use of
-        # --disable-year2038 if this is intentional.
-        AS_IF([test $cross_compiling = no],
-          [AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null],
-            [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`],
-              [*'Feb  7  2106'* | *'Feb  7 17:10'*],
-              [AC_MSG_FAILURE(m4_text_wrap(
-      [this system appears to support timestamps after January 2038,
-       but no mechanism for enabling wide 'time_t' was detected.
-       Did you mean to build a 64-bit binary? (e.g. 'CC="${CC} -m64"'.)
-       To proceed with 32-bit time_t, configure with '--disable-year2038'.],
-      [], [], [55]))])])])])],
+    [ac_have_year2038=no],
 
   ["-D_TIME_BITS=64"],
     [AC_DEFINE([_TIME_BITS], [64],
       [Number of bits in time_t, on hosts where this is settable.])],
 
-  ["-D__MINGW_USE_VC2005_COMPAT=1"],
+  ["-D__MINGW_USE_VC2005_COMPAT"],
     [AC_DEFINE([__MINGW_USE_VC2005_COMPAT], [1],
       [Define to 1 on platforms where this makes time_t a 64-bit type.])],
 
   ["-U_USE_32_BIT_TIME_T"*],
     [AC_MSG_FAILURE(m4_text_wrap(
       [the 'time_t' type is currently forced to be 32-bit.
-       It will stop working after January 2038.
+       It will stop working after mid-January 2038.
        Remove _USE_32BIT_TIME_T from the compiler flags.],
       [], [], [55]))],
 
@@ -160,12 +130,11 @@ AS_CASE([$ac_cv_sys_year2038_opts],
 
 # _AC_SYS_YEAR2038_ENABLE
 # -----------------------
-# Subroutine of AC_SYS_YEAR2038 and _AC_SYS_YEAR2038_OPT_IN.
 # Depending on which of the YEAR2038 macros was used, add either an
-# --enable-year2038, or a --disable-year2038, or no option at all to
-# the configure script.  Note that this is expanded very late and
+# --enable-year2038 or a --disable-year2038 to
+# the configure script.  This is expanded very late and
 # therefore there cannot be any code in the AC_ARG_ENABLE.  The
-# default value for enable_year2038 is emitted unconditionally
+# default value for 'enable_year2038' is emitted unconditionally
 # because the generated code always looks at this variable.
 m4_define([_AC_SYS_YEAR2038_ENABLE],
 [m4_divert_text([DEFAULTS],
@@ -175,50 +144,70 @@ m4_define([_AC_SYS_YEAR2038_ENABLE],
 [AC_ARG_ENABLE([year2038],
   m4_provide_if([AC_SYS_YEAR2038],
     [AS_HELP_STRING([--disable-year2038],
-      [do not support timestamps after 2038])],
+      [don't support timestamps after 2038])],
     [AS_HELP_STRING([--enable-year2038],
       [support timestamps after 2038])]))])
 
-# _AC_SYS_YEAR2038_OPT_IN
-# -----------------------
-# If the --enable-year2038 option is given to configure, attempt to
-# detect and activate support for large time_t on 32-bit systems.
-# This macro is automatically invoked by AC_SYS_LARGEFILE when large
-# *file* support is detected.  It does not AC_REQUIRE AC_SYS_LARGEFILE
-# to avoid a dependency loop, and is therefore unsafe to expose as a
-# documented macro.
-AC_DEFUN([_AC_SYS_YEAR2038_OPT_IN],
-[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl
-  AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE])
-  AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])
-])])
-
 # AC_SYS_YEAR2038
 # ---------------
 # Attempt to detect and activate support for large time_t.
 # On systems where time_t is not always 64 bits, this probe can be
 # skipped by passing the --disable-year2038 option to configure.
 AC_DEFUN([AC_SYS_YEAR2038],
-[AC_REQUIRE([AC_SYS_LARGEFILE])]dnl
-[m4_provide_if([_AC_SYS_YEAR2038_PROBE], [], [dnl
-  AS_IF([test "$enable_year2038" != no], [_AC_SYS_YEAR2038_PROBE])
-  AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])
-])])
+[AC_REQUIRE([AC_SYS_LARGEFILE])dnl
+AS_IF([test "$enable_year2038,$ac_have_year2038,$cross_compiling" = yes,no,no],
+ [# If we're not cross compiling and 'touch' works with a large
+  # timestamp, then we can presume the system supports wider time_t
+  # *somehow* and we just weren't able to detect it.  One common
+  # case that we deliberately *don't* probe for is a system that
+  # supports both 32- and 64-bit ABIs but only the 64-bit ABI offers
+  # wide time_t.  (It would be inappropriate for us to override an
+  # intentional use of -m32.)  Error out, demanding use of
+  # --disable-year2038 if this is intentional.
+  AS_IF([TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null],
+    [AS_CASE([`TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null`],
+       [*'Feb  7  2106'* | *'Feb  7 17:10'*],
+       [AC_MSG_FAILURE(m4_text_wrap(
+          [this system appears to support timestamps after mid-January 2038,
+           but no mechanism for enabling wide 'time_t' was detected.
+           Did you mean to build a 64-bit binary? (E.g., 'CC="${CC} -m64"'.)
+           To proceed with 32-bit time_t, configure with '--disable-year2038'.],
+          [], [], [55]))])])])])
+
+# AC_SYS_YEAR2038_RECOMMENDED
+# ---------------------------
+# Same as AC_SYS_YEAR2038, but recommend support for large time_t.
+# If we cannot find any way to make time_t capable of representing
+# values larger than 2**31 - 1, error out unless --disable-year2038 is given.
+AC_DEFUN([AC_SYS_YEAR2038_RECOMMENDED],
+[AC_REQUIRE([AC_SYS_YEAR2038])dnl
+AS_IF([test "$enable_year2038,$ac_have_year2038" = yes,no],
+   [AC_MSG_FAILURE(m4_text_wrap(
+      [could not enable timestamps after mid-January 2038.
+       This package recommends support for these later timestamps.
+       However, to proceed with signed 32-bit time_t even though it
+       will fail then, configure with '--disable-year2038'.],
+      [], [], [55]))])])
 
 # _AC_SYS_LARGEFILE_TEST_CODE
 # ---------------------------
 # C code used to probe for large file support.
 m4_define([_AC_SYS_LARGEFILE_TEST_CODE],
 [@%:@include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
-    We can't simply define LARGE_OFF_T to be 9223372036854775807,
+@%:@ifndef FTYPE
+@%:@ define FTYPE off_t
+@%:@endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+    We can't simply define LARGE_FTYPE to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-@%:@define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31))
-  int off_t_is_large[[(LARGE_OFF_T % 2147483629 == 721
-                       && LARGE_OFF_T % 2147483647 == 1)
+@%:@define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+  int FTYPE_is_large[[(LARGE_FTYPE % 2147483629 == 721
+                       && LARGE_FTYPE % 2147483647 == 1)
                       ? 1 : -1]];[]dnl
 ])
+# Defined by Autoconf 2.71 and circa 2022 Gnulib unwisely depended on it.
+m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES], [_AC_SYS_LARGEFILE_TEST_CODE])
 
 # _AC_SYS_LARGEFILE_OPTIONS
 # -------------------------
@@ -228,8 +217,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_CODE],
 m4_define([_AC_SYS_LARGEFILE_OPTIONS], m4_normalize(
     ["none needed"]                   dnl Most current systems
     ["-D_FILE_OFFSET_BITS=64"]        dnl X/Open LFS spec
-    ["-D_LARGE_FILES=1"]              dnl AIX (which versions?)
-    ["-n32"]                          dnl Irix 6.2 w/ SGI compiler
+    ["-D_LARGE_FILES=1"]              dnl 32-bit AIX 4.2.1+, 32-bit z/OS
 ))
 
 # _AC_SYS_LARGEFILE_PROBE
@@ -246,24 +234,43 @@ 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 $CC option to enable large file support],
+[AC_CACHE_CHECK([for $CPPFLAGS option for large files],
   [ac_cv_sys_largefile_opts],
-  [ac_save_CC="$CC"
+  [ac_save_CPPFLAGS=$CPPFLAGS
   ac_opt_found=no
   for ac_opt in _AC_SYS_LARGEFILE_OPTIONS; do
     AS_IF([test x"$ac_opt" != x"none needed"],
-      [CC="$ac_save_CC $ac_opt"])
+      [CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"])
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([_AC_SYS_LARGEFILE_TEST_CODE])],
-      [ac_cv_sys_largefile_opts="$ac_opt"
+     [AS_IF([test x"$ac_opt" = x"none needed"],
+        [# GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
+         CPPFLAGS="$CPPFLAGS -DFTYPE=ino_t"
+         AC_COMPILE_IFELSE([], [],
+           [CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=64"
+            AC_COMPILE_IFELSE([], [ac_opt='-D_FILE_OFFSET_BITS=64'])])])
+      ac_cv_sys_largefile_opts=$ac_opt
       ac_opt_found=yes])
     test $ac_opt_found = no || break
   done
-  CC="$ac_save_CC"
+  CPPFLAGS=$ac_save_CPPFLAGS
+  dnl Gnulib implements large file support for native Windows, based on the
+  dnl variables WINDOWS_64_BIT_OFF_T, WINDOWS_64_BIT_ST_SIZE.
+  m4_ifdef([gl_LARGEFILE], [
+    AC_REQUIRE([AC_CANONICAL_HOST])
+    if test $ac_opt_found != yes; then
+      AS_CASE([$host_os],
+        [mingw* | windows*],
+          [ac_cv_sys_largefile_opts="supported through gnulib"
+           ac_opt_found=yes]
+      )
+    fi
+  ])
   test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected"])
 
 ac_have_largefile=yes
 AS_CASE([$ac_cv_sys_largefile_opts],
   ["none needed"], [],
+  ["supported through gnulib"], [],
   ["support not detected"],
     [ac_have_largefile=no],
 
@@ -275,27 +282,12 @@ AS_CASE([$ac_cv_sys_largefile_opts],
     [AC_DEFINE([_LARGE_FILES], [1],
       [Define to 1 on platforms where this makes off_t a 64-bit type.])],
 
-  ["-n32"],
-    [CC="$CC -n32"],
-
   [AC_MSG_ERROR(
     [internal error: bad value for \$ac_cv_sys_largefile_opts])])
 
-_AC_SYS_YEAR2038_OPT_IN
-])
-
-# _AC_SYS_LARGEFILE_ENABLE
-# ------------------------
-# Subroutine of AC_SYS_LARGEFILE.  Note that this
-# is expanded very late and therefore there cannot be any code in the
-# AC_ARG_ENABLE.  The default value for enable_largefile is emitted
-# unconditionally because the generated shell code always looks at
-# this variable.
-m4_define([_AC_SYS_LARGEFILE_ENABLE],
-[m4_divert_text([DEFAULTS],
-  enable_largefile=yes)]dnl
-[AC_ARG_ENABLE([largefile],
-  [AS_HELP_STRING([--disable-largefile], [omit support for large files])])])
+AS_IF([test "$enable_year2038" != no],
+  [_AC_SYS_YEAR2038_PROBE])
+AC_CONFIG_COMMANDS_PRE([_AC_SYS_YEAR2038_ENABLE])])
 
 # AC_SYS_LARGEFILE
 # ----------------
@@ -306,14 +298,13 @@ m4_define([_AC_SYS_LARGEFILE_ENABLE],
 # 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.
-# This macro allows configuration to continue if the system doesn't support
-# large files.
 AC_DEFUN([AC_SYS_LARGEFILE],
-[m4_provide_if([_AC_SYS_LARGEFILE_PROBE], [], [dnl
-  AS_IF([test "$enable_largefile" != no], [_AC_SYS_LARGEFILE_PROBE])
-  AC_CONFIG_COMMANDS_PRE([_AC_SYS_LARGEFILE_ENABLE])
-])])
-])# m4_ifndef AC_SYS_YEAR2038
+[AC_ARG_ENABLE([largefile],
+   [AS_HELP_STRING([--disable-largefile],
+      [omit support for large files])])dnl
+AS_IF([test "$enable_largefile,$enable_year2038" != no,no],
+  [_AC_SYS_LARGEFILE_PROBE])])
+])# m4_ifndef AC_SYS_YEAR2038_RECOMMENDED
 
 # Enable large files on systems where this is implemented by Gnulib, not by the
 # system headers.
@@ -323,7 +314,7 @@ AC_DEFUN([gl_LARGEFILE],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl Native Windows.
       dnl mingw64 defines off_t to a 64-bit type already, if
       dnl _FILE_OFFSET_BITS=64, which is ensured by AC_SYS_LARGEFILE.
diff --git a/gl/m4/limits-h.m4 b/gl/m4/limits-h.m4
index 5088fa16..1b619e1e 100644
--- a/gl/m4/limits-h.m4
+++ b/gl/m4/limits-h.m4
@@ -1,10 +1,12 @@
-dnl Check whether limits.h has needed features.
-
-dnl Copyright 2016-2023 Free Software Foundation, Inc.
+# limits-h.m4
+# serial 1
+dnl Copyright 2016-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 Check whether limits.h has needed features.
+
 dnl From Paul Eggert.
 
 AC_DEFUN_ONCE([gl_LIMITS_H],
@@ -23,14 +25,27 @@ AC_DEFUN_ONCE([gl_LIMITS_H],
             int wb = WORD_BIT;
             int ullw = ULLONG_WIDTH;
             int bw = BOOL_WIDTH;
+            int bm = BOOL_MAX;
+            int mblm = MB_LEN_MAX;
           ]])],
        [gl_cv_header_limits_width=yes],
        [gl_cv_header_limits_width=no])])
-  if test "$gl_cv_header_limits_width" = yes; then
-    GL_GENERATE_LIMITS_H=false
-  else
-    GL_GENERATE_LIMITS_H=true
-  fi
+  GL_GENERATE_LIMITS_H=true
+  AS_IF([test "$gl_cv_header_limits_width" = yes],
+    [AC_CACHE_CHECK([whether limits.h has SSIZE_MAX],
+       [gl_cv_header_limits_ssize_max],
+       [AC_COMPILE_IFELSE(
+          [AC_LANG_SOURCE(
+             [[#include <limits.h>
+               #ifndef SSIZE_MAX
+                 #error "SSIZE_MAX is not defined"
+               #endif
+             ]])],
+          [gl_cv_header_limits_ssize_max=yes],
+          [gl_cv_header_limits_ssize_max=no])])
+     if test "$gl_cv_header_limits_ssize_max" = yes; then
+       GL_GENERATE_LIMITS_H=false
+     fi])
 ])
 
 dnl Unconditionally enables the replacement of <limits.h>.
diff --git a/gl/m4/localcharset.m4 b/gl/m4/localcharset.m4
index 15b6b2a5..807a5eed 100644
--- a/gl/m4/localcharset.m4
+++ b/gl/m4/localcharset.m4
@@ -1,5 +1,6 @@
-# localcharset.m4 serial 8
-dnl Copyright (C) 2002, 2004, 2006, 2009-2023 Free Software Foundation, Inc.
+# localcharset.m4
+# serial 8
+dnl Copyright (C) 2002, 2004, 2006, 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.
diff --git a/gl/m4/locale-fr.m4 b/gl/m4/locale-fr.m4
index 8c41fadf..f8d7c543 100644
--- a/gl/m4/locale-fr.m4
+++ b/gl/m4/locale-fr.m4
@@ -1,5 +1,6 @@
-# locale-fr.m4 serial 20
-dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc.
+# locale-fr.m4
+# serial 23
+dnl Copyright (C) 2003, 2005-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.
@@ -7,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Bruno Haible.
 
 dnl Determine the name of a french locale with traditional encoding.
-AC_DEFUN([gt_LOCALE_FR],
+AC_DEFUN_ONCE([gt_LOCALE_FR],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([AM_LANGINFO_CODESET])
@@ -86,7 +87,7 @@ int main () {
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
-        mingw*)
+        mingw* | windows*)
           # Test for the native Windows locale name.
           if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
             gt_cv_locale_fr=French_France.1252
@@ -116,7 +117,7 @@ int main () {
                 if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
                   gt_cv_locale_fr=fr_FR.iso88591
                 else
-                  # Test for the Solaris 7 locale name.
+                  # Test for the Solaris 10 locale name.
                   if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
                     gt_cv_locale_fr=fr
                   else
@@ -133,15 +134,31 @@ int main () {
     rm -fr conftest*
   ])
   LOCALE_FR=$gt_cv_locale_fr
+  case $LOCALE_FR in #(
+    '' | *[[[:space:]\"\$\'*@<:@]]*)
+      dnl This locale name might cause trouble with sh or make.
+      AC_MSG_WARN([invalid locale "$LOCALE_FR"; assuming "none"])
+      LOCALE_FR=none;;
+  esac
   AC_SUBST([LOCALE_FR])
 ])
 
 dnl Determine the name of a french locale with UTF-8 encoding.
-AC_DEFUN([gt_LOCALE_FR_UTF8],
+AC_DEFUN_ONCE([gt_LOCALE_FR_UTF8],
 [
+  AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([AM_LANGINFO_CODESET])
   AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [
-    AC_LANG_CONFTEST([AC_LANG_SOURCE([[
+    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_fr_utf8=fr_FR.UTF-8
+        ;;
+      *)
+        AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 #include <locale.h>
 #include <time.h>
 #if HAVE_LANGINFO_CODESET
@@ -203,51 +220,82 @@ int main () {
 #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" as "Arabic" or "Arabic_Saudi Arabia.1256",
-        # "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",
-        # and similar.
-        mingw*)
-          # Test for the hypothetical native Windows locale name.
-          if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=French_France.65001
-          else
-            # None found.
-            gt_cv_locale_fr_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 usual locale name.
-          if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-            gt_cv_locale_fr_utf8=fr_FR
-          else
-            # Test for the locale name with explicit encoding suffix.
-            if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-              gt_cv_locale_fr_utf8=fr_FR.UTF-8
-            else
-              # Test for the Solaris 7 locale name.
-              if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
-                gt_cv_locale_fr_utf8=fr.UTF-8
+          ]])])
+        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",
+            # "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",
+            # and similar.
+            mingw* | windows*)
+              # Test for the hypothetical native Windows locale name.
+              if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr_utf8=French_France.65001
               else
                 # None found.
                 gt_cv_locale_fr_utf8=none
               fi
-            fi
-          fi
-          ;;
-      esac
-    fi
-    rm -fr conftest*
+              ;;
+            *)
+              # 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 usual locale name.
+              if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr_utf8=fr_FR
+              else
+                # Test for the locale name with explicit encoding suffix.
+                if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                  gt_cv_locale_fr_utf8=fr_FR.UTF-8
+                else
+                  # Test for the Solaris 10 locale name.
+                  if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+                    gt_cv_locale_fr_utf8=fr.UTF-8
+                  else
+                    # None found.
+                    gt_cv_locale_fr_utf8=none
+                  fi
+                fi
+              fi
+              ;;
+          esac
+        fi
+        rm -fr conftest*
+        ;;
+    esac
   ])
   LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
+  case $LOCALE_FR_UTF8 in #(
+    '' | *[[[:space:]\"\$\'*@<:@]]*)
+      dnl This locale name might cause trouble with sh or make.
+      AC_MSG_WARN([invalid locale "$LOCALE_FR_UTF8"; assuming "none"])
+      LOCALE_FR_UTF8=none;;
+  esac
   AC_SUBST([LOCALE_FR_UTF8])
+
+  dnl Users of $LOCALE_FR_UTF8 need to know which of the locale categories they
+  dnl can rely on.
+  case "$host_os" in
+    *-musl* | midipix*)
+      dnl On musl libc, locale categories other than LC_CTYPE and LC_MESSAGES
+      dnl are effectively unimplemented.
+      LC_COLLATE_IMPLEMENTED=false
+      LC_NUMERIC_IMPLEMENTED=false
+      LC_TIME_IMPLEMENTED=false
+      LC_MONETARY_IMPLEMENTED=false
+      ;;
+    *)
+      LC_COLLATE_IMPLEMENTED=true
+      LC_NUMERIC_IMPLEMENTED=true
+      LC_TIME_IMPLEMENTED=true
+      LC_MONETARY_IMPLEMENTED=true
+      ;;
+  esac
+  AC_SUBST([LC_COLLATE_IMPLEMENTED])
+  AC_SUBST([LC_NUMERIC_IMPLEMENTED])
+  AC_SUBST([LC_TIME_IMPLEMENTED])
+  AC_SUBST([LC_MONETARY_IMPLEMENTED])
 ])
diff --git a/gl/m4/locale-ja.m4 b/gl/m4/locale-ja.m4
index 25901730..8423bcb9 100644
--- a/gl/m4/locale-ja.m4
+++ b/gl/m4/locale-ja.m4
@@ -1,5 +1,6 @@
-# locale-ja.m4 serial 15
-dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc.
+# locale-ja.m4
+# serial 18
+dnl Copyright (C) 2003, 2005-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.
@@ -7,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Bruno Haible.
 
 dnl Determine the name of a japanese locale with EUC-JP encoding.
-AC_DEFUN([gt_LOCALE_JA],
+AC_DEFUN_ONCE([gt_LOCALE_JA],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([AM_LANGINFO_CODESET])
@@ -90,7 +91,7 @@ int main ()
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
-        mingw*)
+        mingw* | windows*)
           # Note that on native Windows, the Japanese locale is
           # Japanese_Japan.932, and CP932 is very different from EUC-JP, so we
           # cannot use it here.
@@ -117,7 +118,7 @@ int main ()
                 if (LC_ALL=ja_JP.EUC LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
                   gt_cv_locale_ja=ja_JP.EUC
                 else
-                  # Test for the Solaris 7 locale name.
+                  # Test for the Solaris 10 locale name.
                   if (LC_ALL=ja LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
                     gt_cv_locale_ja=ja
                   else
@@ -139,5 +140,11 @@ int main ()
     rm -fr conftest*
   ])
   LOCALE_JA=$gt_cv_locale_ja
+  case $LOCALE_JA in #(
+    '' | *[[[:space:]\"\$\'*@<:@]]*)
+      dnl This locale name might cause trouble with sh or make.
+      AC_MSG_WARN([invalid locale "$LOCALE_JA"; assuming "none"])
+      LOCALE_JA=none;;
+  esac
   AC_SUBST([LOCALE_JA])
 ])
diff --git a/gl/m4/locale-zh.m4 b/gl/m4/locale-zh.m4
index b9f9eef7..7f1a10be 100644
--- a/gl/m4/locale-zh.m4
+++ b/gl/m4/locale-zh.m4
@@ -1,5 +1,6 @@
-# locale-zh.m4 serial 15
-dnl Copyright (C) 2003, 2005-2023 Free Software Foundation, Inc.
+# locale-zh.m4
+# serial 18
+dnl Copyright (C) 2003, 2005-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.
@@ -7,7 +8,7 @@ dnl with or without modifications, as long as this notice is preserved.
 dnl From Bruno Haible.
 
 dnl Determine the name of a chinese locale with GB18030 encoding.
-AC_DEFUN([gt_LOCALE_ZH_CN],
+AC_DEFUN_ONCE([gt_LOCALE_ZH_CN],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([AM_LANGINFO_CODESET])
@@ -91,7 +92,7 @@ int main ()
         # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
         # "ja" as "Japanese" or "Japanese_Japan.932",
         # and similar.
-        mingw*)
+        mingw* | windows*)
           # Test for the hypothetical native Windows locale name.
           if (LC_ALL=Chinese_China.54936 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
             gt_cv_locale_zh_CN=Chinese_China.54936
@@ -133,5 +134,11 @@ int main ()
     rm -fr conftest*
   ])
   LOCALE_ZH_CN=$gt_cv_locale_zh_CN
+  case $LOCALE_ZH_CN in #(
+    '' | *[[[:space:]\"\$\'*@<:@]]*)
+      dnl This locale name might cause trouble with sh or make.
+      AC_MSG_WARN([invalid locale "$LOCALE_ZH_CN"; assuming "none"])
+      LOCALE_ZH_CN=none;;
+  esac
   AC_SUBST([LOCALE_ZH_CN])
 ])
diff --git a/gl/m4/locale_h.m4 b/gl/m4/locale_h.m4
index a33a0a46..cd1c81ec 100644
--- a/gl/m4/locale_h.m4
+++ b/gl/m4/locale_h.m4
@@ -1,5 +1,6 @@
-# locale_h.m4 serial 28
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# locale_h.m4
+# serial 31
+dnl Copyright (C) 2007, 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.
@@ -59,7 +60,9 @@ AC_DEFUN_ONCE([gl_LOCALE_H],
     dnl On native Windows with MSVC, merely define these member names as macros.
     dnl This avoids trouble in C++ mode.
     case "$host_os" in
-      mingw*)
+      windows*-msvc*)
+        ;;
+      mingw* | windows*)
         AC_EGREP_CPP([Special], [
 #ifdef _MSC_VER
  Special
@@ -152,7 +155,7 @@ AC_DEFUN([gl_LOCALE_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETLOCALE_NULL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_DUPLOCALE])
-    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOCALENAME_UNSAFE])
   ])
   m4_require(GL_MODULE_INDICATOR_PREFIX[_LOCALE_H_MODULE_INDICATOR_DEFAULTS])
   AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
diff --git a/gl/m4/localeconv.m4 b/gl/m4/localeconv.m4
index ae225fed..77d5684f 100644
--- a/gl/m4/localeconv.m4
+++ b/gl/m4/localeconv.m4
@@ -1,5 +1,6 @@
-# localeconv.m4 serial 1
-dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
+# localeconv.m4
+# serial 3
+dnl Copyright (C) 2012-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.
@@ -8,10 +9,45 @@ AC_DEFUN([gl_FUNC_LOCALECONV],
 [
   AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
   AC_REQUIRE([gl_LOCALE_H])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
 
   if test $REPLACE_STRUCT_LCONV = 1; then
     REPLACE_LOCALECONV=1
   fi
+  if test $REPLACE_LOCALECONV = 0; then
+    dnl Test whether fields of type 'char' are filled correctly.
+    dnl This test fails on mingw 5.0.3.
+    AC_CACHE_CHECK([whether localeconv works],
+      [gl_cv_func_localeconv_works],
+      [AC_RUN_IFELSE(
+         [AC_LANG_SOURCE([[
+            #include <locale.h>
+            #include <limits.h>
+            int main ()
+            {
+              struct lconv *l = localeconv ();
+              return l->frac_digits != CHAR_MAX && l->frac_digits < 0;
+            }
+         ]])],
+         [gl_cv_func_localeconv_works=yes],
+         [gl_cv_func_localeconv_works=no],
+         [case "$host_os" in
+                                # Guess yes on glibc systems.
+            *-gnu* | gnu*)      gl_cv_func_localeconv_works="guessing yes" ;;
+                                # Guess yes on musl systems.
+            *-musl* | midipix*) gl_cv_func_localeconv_works="guessing yes" ;;
+                                # Guess no on native Windows.
+            mingw* | windows*)  gl_cv_func_localeconv_works="guessing no" ;;
+                                # If we don't know, obey --enable-cross-guesses.
+            *)                  gl_cv_func_localeconv_works="$gl_cross_guess_normal" ;;
+          esac
+         ])
+      ])
+    case "$gl_cv_func_localeconv_works" in
+      *yes) ;;
+      *) REPLACE_LOCALECONV=1 ;;
+    esac
+  fi
 ])
 
 # Prerequisites of lib/localeconv.c.
@@ -19,4 +55,6 @@ AC_DEFUN([gl_PREREQ_LOCALECONV],
 [
   AC_CHECK_MEMBERS([struct lconv.decimal_point], [], [],
     [[#include <locale.h>]])
+  AC_CHECK_MEMBERS([struct lconv.int_p_cs_precedes], [], [],
+    [[#include <locale.h>]])
 ])
diff --git a/gl/m4/lock.m4 b/gl/m4/lock.m4
index 88cf5575..eb0fc6a1 100644
--- a/gl/m4/lock.m4
+++ b/gl/m4/lock.m4
@@ -1,5 +1,6 @@
-# lock.m4 serial 14
-dnl Copyright (C) 2005-2023 Free Software Foundation, Inc.
+# lock.m4
+# serial 14
+dnl Copyright (C) 2005-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.
diff --git a/gl/m4/lseek.m4 b/gl/m4/lseek.m4
index fd4f1f27..0bc3d65e 100644
--- a/gl/m4/lseek.m4
+++ b/gl/m4/lseek.m4
@@ -1,5 +1,6 @@
-# lseek.m4 serial 12
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# lseek.m4
+# serial 15
+dnl Copyright (C) 2007, 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.
@@ -13,13 +14,15 @@ AC_DEFUN([gl_FUNC_LSEEK],
   AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CACHE_CHECK([whether lseek detects pipes], [gl_cv_func_lseek_pipe],
     [case "$host_os" in
-       mingw*)
+       mingw* | windows*)
          dnl Native Windows.
          dnl The result of lseek (fd, (off_t)0, SEEK_CUR) or
          dnl SetFilePointer(handle, 0, NULL, FILE_CURRENT)
-         dnl for a pipe depends on the environment: In a Cygwin 1.5
-         dnl environment it succeeds (wrong); in a Cygwin 1.7 environment
-         dnl it fails with a wrong errno value.
+         dnl for a pipe depends on the environment:
+         dnl In a Cygwin 1.5 environment it succeeds (wrong);
+         dnl in a Cygwin 1.7 environment it fails with a wrong errno value;
+         dnl in a Cygwin 2.9.0 environment it fails correctly;
+         dnl in a Cygwin 3.4.6 environment it succeeds again (wrong).
          gl_cv_func_lseek_pipe=no
          ;;
        *)
@@ -70,9 +73,29 @@ AC_DEFUN([gl_FUNC_LSEEK],
     REPLACE_LSEEK=1
   fi
 
-  dnl macOS SEEK_DATA is incompatible with other platforms.
-  case $host_os in
-    darwin*)
-      REPLACE_LSEEK=1;;
-  esac
+  AS_IF([test $REPLACE_LSEEK = 0],
+    [AC_CACHE_CHECK([whether SEEK_DATA works but is incompatible with GNU],
+       [gl_cv_func_lseek_works_but_incompatible],
+       [AC_PREPROC_IFELSE(
+          [AC_LANG_SOURCE(
+             dnl Use macOS "9999" to stand for a future fixed macOS version.
+             dnl See ../lib/unistd.in.h and <https://bugs.gnu.org/61386>.
+             [[#include <unistd.h>
+               #if defined __APPLE__ && defined __MACH__ && defined SEEK_DATA
+               # ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+               #  include <AvailabilityMacros.h>
+               # endif
+               # if 99990000 <= MAC_OS_X_VERSION_MIN_REQUIRED
+               #  define LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU
+               # endif
+               #endif
+               #ifndef LSEEK_WORKS_BUT_IS_INCOMPATIBLE_WITH_GNU
+                #error "No need to work around the bug"
+               #endif
+             ]])],
+          [gl_cv_func_lseek_works_but_incompatible=yes],
+          [gl_cv_func_lseek_works_but_incompatible=no])])
+     if test "$gl_cv_func_lseek_works_but_incompatible" = yes; then
+       REPLACE_LSEEK=1
+     fi])
 ])
diff --git a/gl/m4/malloc.m4 b/gl/m4/malloc.m4
index 55402924..41a46937 100644
--- a/gl/m4/malloc.m4
+++ b/gl/m4/malloc.m4
@@ -1,5 +1,6 @@
-# malloc.m4 serial 28
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# malloc.m4
+# serial 31
+dnl Copyright (C) 2007, 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.
@@ -16,7 +17,8 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
           [[#include <stdlib.h>
           ]],
           [[void *p = malloc (0);
-            int result = !p;
+            void * volatile vp = p;
+            int result = !vp;
             free (p);
             return result;]])
        ],
@@ -25,8 +27,8 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF],
        [case "$host_os" in
           # Guess yes on platforms where we know the result.
           *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-          | gnu* | *-musl* | midnightbsd* \
-          | hpux* | solaris* | cygwin* | mingw* | msys* )
+          | 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" ;;
@@ -128,7 +130,7 @@ AC_DEFUN([gl_CHECK_MALLOC_POSIX],
       dnl except on those platforms where we have seen 'test-malloc-gnu',
       dnl 'test-realloc-gnu', 'test-calloc-gnu' fail.
       case "$host_os" in
-        mingw*)
+        mingw* | windows*)
           gl_cv_func_malloc_posix=no ;;
         irix* | solaris*)
           dnl On IRIX 6.5, the three functions return NULL with errno unset
diff --git a/gl/m4/malloca.m4 b/gl/m4/malloca.m4
index 1d777ebe..9e09d22c 100644
--- a/gl/m4/malloca.m4
+++ b/gl/m4/malloca.m4
@@ -1,5 +1,6 @@
-# malloca.m4 serial 2
-dnl Copyright (C) 2003-2004, 2006-2007, 2009-2023 Free Software Foundation,
+# malloca.m4
+# serial 2
+dnl Copyright (C) 2003-2004, 2006-2007, 2009-2024 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,
diff --git a/gl/m4/math_h.m4 b/gl/m4/math_h.m4
index d2e90ff1..4b26c9e9 100644
--- a/gl/m4/math_h.m4
+++ b/gl/m4/math_h.m4
@@ -1,5 +1,6 @@
-# math_h.m4 serial 125
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# math_h.m4
+# serial 138
+dnl Copyright (C) 2007-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.
@@ -42,15 +43,21 @@ AC_DEFUN_ONCE([gl_MATH_H],
      cbrt cbrtf cbrtl ceilf ceill copysign copysignf copysignl cosf cosl coshf
      expf expl exp2 exp2f exp2l expm1 expm1f expm1l
      fabsf fabsl floorf floorl fma fmaf fmal
-     fmod fmodf fmodl frexpf frexpl hypotf hypotl
+     fmod fmodf fmodl frexpf frexpl
+     getpayload getpayloadf getpayloadl
+     hypotf hypotl
      ilogb ilogbf ilogbl
      ldexpf ldexpl
      log logf logl log10 log10f log10l log1p log1pf log1pl log2 log2f log2l
      logb logbf logbl
      modf modff modfl powf
      remainder remainderf remainderl
-     rint rintf rintl round roundf roundl sinf sinl sinhf sqrtf sqrtl
-     tanf tanl tanhf trunc truncf truncl])
+     rint rintf rintl round roundf roundl
+     setpayload setpayloadf setpayloadl
+     setpayloadsig setpayloadsigf setpayloadsigl
+     sinf sinl sinhf sqrtf sqrtl
+     tanf tanl tanhf totalorder totalorderf totalorderl totalordermag
+     totalordermagf totalordermagl trunc truncf truncl])
 ])
 
 # gl_MATH_MODULE_INDICATOR([modulename])
@@ -113,6 +120,9 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREXPL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAYLOAD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAYLOADF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPAYLOADL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOT])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_HYPOTL])
@@ -125,6 +135,7 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNAND])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISNANL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LDEXPL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_LOG])
@@ -155,6 +166,12 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUND])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ROUNDL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOAD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADSIG])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADSIGF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETPAYLOADSIGL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNBIT])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SINL])
@@ -164,6 +181,12 @@ AC_DEFUN([gl_MATH_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TANHF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOTALORDER])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOTALORDERF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOTALORDERL])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOTALORDERMAG])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOTALORDERMAGF])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TOTALORDERMAGL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNC])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TRUNCL])
@@ -209,6 +232,9 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   HAVE_FMODF=1;                     AC_SUBST([HAVE_FMODF])
   HAVE_FMODL=1;                     AC_SUBST([HAVE_FMODL])
   HAVE_FREXPF=1;                    AC_SUBST([HAVE_FREXPF])
+  HAVE_GETPAYLOAD=1;                AC_SUBST([HAVE_GETPAYLOAD])
+  HAVE_GETPAYLOADF=1;               AC_SUBST([HAVE_GETPAYLOADF])
+  HAVE_GETPAYLOADL=1;               AC_SUBST([HAVE_GETPAYLOADL])
   HAVE_HYPOTF=1;                    AC_SUBST([HAVE_HYPOTF])
   HAVE_HYPOTL=1;                    AC_SUBST([HAVE_HYPOTL])
   HAVE_ILOGB=1;                     AC_SUBST([HAVE_ILOGB])
@@ -234,6 +260,12 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   HAVE_REMAINDERF=1;                AC_SUBST([HAVE_REMAINDERF])
   HAVE_RINT=1;                      AC_SUBST([HAVE_RINT])
   HAVE_RINTL=1;                     AC_SUBST([HAVE_RINTL])
+  HAVE_SETPAYLOAD=1;                AC_SUBST([HAVE_SETPAYLOAD])
+  HAVE_SETPAYLOADF=1;               AC_SUBST([HAVE_SETPAYLOADF])
+  HAVE_SETPAYLOADL=1;               AC_SUBST([HAVE_SETPAYLOADL])
+  HAVE_SETPAYLOADSIG=1;             AC_SUBST([HAVE_SETPAYLOADSIG])
+  HAVE_SETPAYLOADSIGF=1;            AC_SUBST([HAVE_SETPAYLOADSIGF])
+  HAVE_SETPAYLOADSIGL=1;            AC_SUBST([HAVE_SETPAYLOADSIGL])
   HAVE_SINF=1;                      AC_SUBST([HAVE_SINF])
   HAVE_SINL=1;                      AC_SUBST([HAVE_SINL])
   HAVE_SINHF=1;                     AC_SUBST([HAVE_SINHF])
@@ -242,6 +274,12 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   HAVE_TANF=1;                      AC_SUBST([HAVE_TANF])
   HAVE_TANL=1;                      AC_SUBST([HAVE_TANL])
   HAVE_TANHF=1;                     AC_SUBST([HAVE_TANHF])
+  HAVE_TOTALORDER=1;                AC_SUBST([HAVE_TOTALORDER])
+  HAVE_TOTALORDERF=1;               AC_SUBST([HAVE_TOTALORDERF])
+  HAVE_TOTALORDERL=1;               AC_SUBST([HAVE_TOTALORDERL])
+  HAVE_TOTALORDERMAG=1;             AC_SUBST([HAVE_TOTALORDERMAG])
+  HAVE_TOTALORDERMAGF=1;            AC_SUBST([HAVE_TOTALORDERMAGF])
+  HAVE_TOTALORDERMAGL=1;            AC_SUBST([HAVE_TOTALORDERMAGL])
   HAVE_DECL_ACOSL=1;                AC_SUBST([HAVE_DECL_ACOSL])
   HAVE_DECL_ASINL=1;                AC_SUBST([HAVE_DECL_ASINL])
   HAVE_DECL_ATANL=1;                AC_SUBST([HAVE_DECL_ATANL])
@@ -309,6 +347,9 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   REPLACE_FREXPF=0;                 AC_SUBST([REPLACE_FREXPF])
   REPLACE_FREXP=0;                  AC_SUBST([REPLACE_FREXP])
   REPLACE_FREXPL=0;                 AC_SUBST([REPLACE_FREXPL])
+  REPLACE_GETPAYLOAD=0;             AC_SUBST([REPLACE_GETPAYLOAD])
+  REPLACE_GETPAYLOADF=0;            AC_SUBST([REPLACE_GETPAYLOADF])
+  REPLACE_GETPAYLOADL=0;            AC_SUBST([REPLACE_GETPAYLOADL])
   REPLACE_HUGE_VAL=0;               AC_SUBST([REPLACE_HUGE_VAL])
   REPLACE_HYPOT=0;                  AC_SUBST([REPLACE_HYPOT])
   REPLACE_HYPOTF=0;                 AC_SUBST([REPLACE_HYPOTF])
@@ -319,6 +360,7 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   REPLACE_ISFINITE=0;               AC_SUBST([REPLACE_ISFINITE])
   REPLACE_ISINF=0;                  AC_SUBST([REPLACE_ISINF])
   REPLACE_ISNAN=0;                  AC_SUBST([REPLACE_ISNAN])
+  REPLACE_LDEXP=0;                  AC_SUBST([REPLACE_LDEXP])
   REPLACE_LDEXPL=0;                 AC_SUBST([REPLACE_LDEXPL])
   REPLACE_LOG=0;                    AC_SUBST([REPLACE_LOG])
   REPLACE_LOGF=0;                   AC_SUBST([REPLACE_LOGF])
@@ -354,6 +396,12 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
   REPLACE_SQRTL=0;                  AC_SUBST([REPLACE_SQRTL])
   REPLACE_TANF=0;                   AC_SUBST([REPLACE_TANF])
   REPLACE_TANHF=0;                  AC_SUBST([REPLACE_TANHF])
+  REPLACE_TOTALORDER=0;             AC_SUBST([REPLACE_TOTALORDER])
+  REPLACE_TOTALORDERF=0;            AC_SUBST([REPLACE_TOTALORDERF])
+  REPLACE_TOTALORDERL=0;            AC_SUBST([REPLACE_TOTALORDERL])
+  REPLACE_TOTALORDERMAG=0;          AC_SUBST([REPLACE_TOTALORDERMAG])
+  REPLACE_TOTALORDERMAGF=0;         AC_SUBST([REPLACE_TOTALORDERMAGF])
+  REPLACE_TOTALORDERMAGL=0;         AC_SUBST([REPLACE_TOTALORDERMAGL])
   REPLACE_TRUNC=0;                  AC_SUBST([REPLACE_TRUNC])
   REPLACE_TRUNCF=0;                 AC_SUBST([REPLACE_TRUNCF])
   REPLACE_TRUNCL=0;                 AC_SUBST([REPLACE_TRUNCL])
@@ -364,7 +412,7 @@ AC_DEFUN([gl_MATH_H_DEFAULTS],
 # Sets variable HAVE_SAME_LONG_DOUBLE_AS_DOUBLE to 0 or 1, and defines
 # HAVE_SAME_LONG_DOUBLE_AS_DOUBLE accordingly.
 # The currently known platforms where this is the case are:
-# Linux/HPPA, Minix 3.1.8, AIX 5, AIX 6 and 7 with xlc, MSVC 9.
+# Linux/HPPA, NetBSD/sparc32, Minix 3.1.8, AIX 5, AIX 6 and 7 with xlc, MSVC 9.
 AC_DEFUN([gl_LONG_DOUBLE_VS_DOUBLE],
 [
   AC_CACHE_CHECK([whether long double and double are the same],
diff --git a/gl/m4/mbrtowc.m4 b/gl/m4/mbrtowc.m4
index bb393041..62c4fdb3 100644
--- a/gl/m4/mbrtowc.m4
+++ b/gl/m4/mbrtowc.m4
@@ -1,5 +1,6 @@
-# mbrtowc.m4 serial 38  -*- coding: utf-8 -*-
-dnl Copyright (C) 2001-2002, 2004-2005, 2008-2023 Free Software Foundation,
+# mbrtowc.m4
+# serial 44  -*- coding: utf-8 -*-
+dnl Copyright (C) 2001-2002, 2004-2005, 2008-2024 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,
@@ -91,20 +92,25 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
   fi
   if test $REPLACE_MBSTATE_T = 1; then
     case "$host_os" in
-      mingw*) LIB_MBRTOWC= ;;
+      mingw* | windows*)
+        MBRTOWC_LIB=
+        ;;
       *)
         gl_WEAK_SYMBOLS
         case "$gl_cv_have_weak" in
-          *yes) LIB_MBRTOWC= ;;
-          *)    LIB_MBRTOWC="$LIBPTHREAD" ;;
+          *yes) MBRTOWC_LIB= ;;
+          *)    MBRTOWC_LIB="$LIBPTHREAD" ;;
         esac
         ;;
     esac
   else
-    LIB_MBRTOWC=
+    MBRTOWC_LIB=
   fi
-  dnl LIB_MBRTOWC is expected to be '-pthread' or '-lpthread' on AIX
+  dnl MBRTOWC_LIB is expected to be '-pthread' or '-lpthread' on AIX
   dnl with gcc or xlc, and empty otherwise.
+  AC_SUBST([MBRTOWC_LIB])
+  dnl For backward compatibility.
+  LIB_MBRTOWC="$MBRTOWC_LIB"
   AC_SUBST([LIB_MBRTOWC])
 ])
 
@@ -114,7 +120,7 @@ dnl Result is REPLACE_MBSTATE_T.
 dnl When this is set to 1, we replace both mbsinit() and mbrtowc(), in order to
 dnl avoid inconsistencies.
 
-AC_DEFUN([gl_MBSTATE_T_BROKEN],
+AC_DEFUN_ONCE([gl_MBSTATE_T_BROKEN],
 [
   AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
   AC_REQUIRE([AC_CANONICAL_HOST])
@@ -126,7 +132,7 @@ AC_DEFUN([gl_MBSTATE_T_BROKEN],
   dnl to override it, even if - like on MSVC - mbsinit() is only defined as
   dnl an inline function, not as a global function.
   if case "$host_os" in
-       mingw*) true ;;
+       mingw* | windows*) true ;;
        *) test $ac_cv_func_mbsinit = yes ;;
      esac \
     && test $ac_cv_func_mbrtowc = yes; then
@@ -408,14 +414,16 @@ AC_DEFUN([gl_MBRTOWC_RETVAL],
       dnl is present.
 changequote(,)dnl
       case "$host_os" in
-                                   # Guess no on HP-UX, Solaris, native Windows.
-        hpux* | solaris* | mingw*) gl_cv_func_mbrtowc_retval="guessing no" ;;
-                                   # Guess yes otherwise.
-        *)                         gl_cv_func_mbrtowc_retval="guessing yes" ;;
+          # Guess no on HP-UX, Solaris, native Windows.
+        hpux* | solaris* | mingw* | windows*)
+          gl_cv_func_mbrtowc_retval="guessing no" ;;
+          # Guess yes otherwise.
+        *)
+          gl_cv_func_mbrtowc_retval="guessing yes" ;;
       esac
 changequote([,])dnl
       if test $LOCALE_FR_UTF8 != none || test $LOCALE_JA != none \
-         || { case "$host_os" in mingw*) true;; *) false;; esac; }; then
+         || { case "$host_os" in mingw* | windows*) true;; *) false;; esac; }; then
         AC_RUN_IFELSE(
           [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -426,7 +434,8 @@ int main ()
   int result = 0;
   int found_some_locale = 0;
   /* This fails on Solaris.  */
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (strcmp ("$LOCALE_FR_UTF8", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
       char input[] = "B\303\274\303\237er"; /* "Büßer" */
       mbstate_t state;
@@ -442,7 +451,8 @@ int main ()
       found_some_locale = 1;
     }
   /* This fails on HP-UX 11.11.  */
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+  if (strcmp ("$LOCALE_JA", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_JA") != NULL)
     {
       char input[] = "B\217\253\344\217\251\316er"; /* "Büßer" */
       mbstate_t state;
@@ -577,13 +587,13 @@ AC_DEFUN([gl_MBRTOWC_STORES_INCOMPLETE],
      dnl is present.
 changequote(,)dnl
      case "$host_os" in
-               # Guess yes on native Windows.
-       mingw*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;;
-       *)      gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;;
+                          # Guess yes on native Windows.
+       mingw* | windows*) gl_cv_func_mbrtowc_stores_incomplete="guessing yes" ;;
+       *)                 gl_cv_func_mbrtowc_stores_incomplete="guessing no" ;;
      esac
 changequote([,])dnl
      case "$host_os" in
-       mingw*)
+       mingw* | windows*)
          AC_RUN_IFELSE(
            [AC_LANG_SOURCE([[
 #include <locale.h>
@@ -677,31 +687,28 @@ AC_DEFUN([gl_MBRTOWC_EMPTY_INPUT],
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether mbrtowc works on empty input],
     [gl_cv_func_mbrtowc_empty_input],
-    [
-      dnl Initial guess, used when cross-compiling or when no suitable locale
-      dnl is present.
-changequote(,)dnl
-      case "$host_os" in
-                              # Guess no on AIX and glibc systems.
-        aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;;
-                              # Guess yes on native Windows.
-        mingw*)               gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
-        *)                    gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
-      esac
-changequote([,])dnl
-      AC_RUN_IFELSE(
-        [AC_LANG_SOURCE([[
-           #include <wchar.h>
-           static wchar_t wc;
-           static mbstate_t mbs;
-           int
-           main (void)
-           {
-             return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2;
-           }]])],
-        [gl_cv_func_mbrtowc_empty_input=yes],
-        [gl_cv_func_mbrtowc_empty_input=no],
-        [:])
+    [AC_RUN_IFELSE(
+       [AC_LANG_SOURCE([[
+          #include <wchar.h>
+          static wchar_t wc;
+          static mbstate_t mbs;
+          int
+          main (void)
+          {
+            return mbrtowc (&wc, "", 0, &mbs) != (size_t) -2;
+          }]])],
+       [gl_cv_func_mbrtowc_empty_input=yes],
+       [gl_cv_func_mbrtowc_empty_input=no],
+       [case "$host_os" in
+                                # Guess no on AIX and glibc systems.
+          aix* | *-gnu* | gnu*) gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+                                # Guess no on Android.
+          linux*-android*)      gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+                                # Guess no on native Windows.
+          mingw* | windows*)    gl_cv_func_mbrtowc_empty_input="guessing no" ;;
+          *)                    gl_cv_func_mbrtowc_empty_input="guessing yes" ;;
+        esac
+       ])
     ])
 ])
 
@@ -709,18 +716,17 @@ dnl Test whether mbrtowc reports encoding errors in the C locale.
 dnl Although POSIX was never intended to allow this, the GNU C Library
 dnl and other implementations do it.  See:
 dnl https://sourceware.org/bugzilla/show_bug.cgi?id=19932
+dnl POSIX has now clarified it:
+dnl <https://pubs.opengroup.org/onlinepubs/9699919799/functions/mbrtowc.html>
+dnl says: "In the POSIX locale an [EILSEQ] error cannot occur since all byte
+dnl values are valid characters."
 
 AC_DEFUN([gl_MBRTOWC_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_mbrtowc_C_locale_sans_EILSEQ],
-    [
-     dnl Initial guess, used when cross-compiling or when no suitable locale
-     dnl is present.
-     gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal"
-
-     AC_RUN_IFELSE(
+    [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <limits.h>
             #include <locale.h>
@@ -741,13 +747,14 @@ AC_DEFUN([gl_MBRTOWC_C_LOCALE],
               }
             return 0;
           ]])],
-      [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes],
-      [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no],
-      [case "$host_os" in
-                 # Guess yes on native Windows.
-         mingw*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;;
-       esac
-      ])
+       [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=yes],
+       [gl_cv_func_mbrtowc_C_locale_sans_EILSEQ=no],
+       [case "$host_os" in
+                             # Guess yes on native Windows.
+          mingw* | windows*) gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="guessing yes" ;;
+          *)                 gl_cv_func_mbrtowc_C_locale_sans_EILSEQ="$gl_cross_guess_normal" ;;
+        esac
+       ])
     ])
 ])
 
diff --git a/gl/m4/mbsinit.m4 b/gl/m4/mbsinit.m4
index c388a8b9..10c86ba9 100644
--- a/gl/m4/mbsinit.m4
+++ b/gl/m4/mbsinit.m4
@@ -1,5 +1,6 @@
-# mbsinit.m4 serial 9
-dnl Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc.
+# mbsinit.m4
+# serial 10
+dnl Copyright (C) 2008, 2010-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.
@@ -32,7 +33,7 @@ AC_DEFUN([gl_FUNC_MBSINIT],
       dnl states produced by mbrtowc() for an incomplete multibyte character
       dnl in multibyte locales.
       case "$host_os" in
-        mingw*) REPLACE_MBSINIT=1 ;;
+        mingw* | windows*) REPLACE_MBSINIT=1 ;;
       esac
     fi
   fi
diff --git a/gl/m4/mbstate_t.m4 b/gl/m4/mbstate_t.m4
index dcd66b96..66d65cd7 100644
--- a/gl/m4/mbstate_t.m4
+++ b/gl/m4/mbstate_t.m4
@@ -1,5 +1,6 @@
-# mbstate_t.m4 serial 14
-dnl Copyright (C) 2000-2002, 2008-2023 Free Software Foundation, Inc.
+# mbstate_t.m4
+# serial 14
+dnl Copyright (C) 2000-2002, 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.
diff --git a/gl/m4/mbtowc.m4 b/gl/m4/mbtowc.m4
index 7823be0e..603b0c1a 100644
--- a/gl/m4/mbtowc.m4
+++ b/gl/m4/mbtowc.m4
@@ -1,5 +1,6 @@
-# mbtowc.m4 serial 3
-dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
+# mbtowc.m4
+# serial 5
+dnl Copyright (C) 2011-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.
@@ -8,9 +9,12 @@ AC_DEFUN([gl_FUNC_MBTOWC],
 [
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
 
-  AC_CHECK_FUNCS([mbtowc])
+  gl_CHECK_FUNCS_ANDROID([mbtowc], [[#include <stdlib.h>]])
   if test $ac_cv_func_mbtowc = no; then
     HAVE_MBTOWC=0
+    case "$gl_cv_onwards_func_mbtowc" in
+      future*) REPLACE_MBTOWC=1 ;;
+    esac
   else
     if false; then
       REPLACE_MBTOWC=1
diff --git a/gl/m4/memchr.m4 b/gl/m4/memchr.m4
index 4f1aed01..346a2882 100644
--- a/gl/m4/memchr.m4
+++ b/gl/m4/memchr.m4
@@ -1,5 +1,6 @@
-# memchr.m4 serial 18
-dnl Copyright (C) 2002-2004, 2009-2023 Free Software Foundation, Inc.
+# memchr.m4
+# serial 19
+dnl Copyright (C) 2002-2004, 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.
@@ -85,12 +86,12 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR],
        [gl_cv_func_memchr_works=yes],
        [gl_cv_func_memchr_works=no],
        [case "$host_os" in
-                           # Guess no on Android.
-          linux*-android*) gl_cv_func_memchr_works="guessing no" ;;
-                           # Guess yes on native Windows.
-          mingw*)          gl_cv_func_memchr_works="guessing yes" ;;
-                           # If we don't know, obey --enable-cross-guesses.
-          *)               gl_cv_func_memchr_works="$gl_cross_guess_normal" ;;
+                             # Guess no on Android.
+          linux*-android*)   gl_cv_func_memchr_works="guessing no" ;;
+                             # Guess yes on native Windows.
+          mingw* | windows*) gl_cv_func_memchr_works="guessing yes" ;;
+                             # If we don't know, obey --enable-cross-guesses.
+          *)                 gl_cv_func_memchr_works="$gl_cross_guess_normal" ;;
         esac
        ])
     ])
diff --git a/gl/m4/minmax.m4 b/gl/m4/minmax.m4
index fd09846f..bc7d0c34 100644
--- a/gl/m4/minmax.m4
+++ b/gl/m4/minmax.m4
@@ -1,5 +1,6 @@
-# minmax.m4 serial 4
-dnl Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc.
+# minmax.m4
+# serial 4
+dnl Copyright (C) 2005, 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.
diff --git a/gl/m4/mktime.m4 b/gl/m4/mktime.m4
index e9d31f35..85c52454 100644
--- a/gl/m4/mktime.m4
+++ b/gl/m4/mktime.m4
@@ -1,6 +1,6 @@
-# serial 37
-dnl Copyright (C) 2002-2003, 2005-2007, 2009-2023 Free Software Foundation,
-dnl Inc.
+# mktime.m4
+# serial 39
+dnl Copyright (C) 2002-2003, 2005-2007, 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.
@@ -264,9 +264,9 @@ main ()
          [gl_cv_func_working_mktime=yes],
          [gl_cv_func_working_mktime=no],
          [case "$host_os" in
-                    # Guess no on native Windows.
-            mingw*) gl_cv_func_working_mktime="guessing no" ;;
-            *)      gl_cv_func_working_mktime="$gl_cross_guess_normal" ;;
+                               # Guess no on native Windows.
+            mingw* | windows*) gl_cv_func_working_mktime="guessing no" ;;
+            *)                 gl_cv_func_working_mktime="$gl_cross_guess_normal" ;;
           esac
          ])
      fi
@@ -280,7 +280,6 @@ AC_DEFUN([gl_FUNC_MKTIME],
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_FUNC_MKTIME_WORKS])
 
-  REPLACE_MKTIME=0
   if test "$gl_cv_func_working_mktime" != yes; then
     REPLACE_MKTIME=1
     AC_DEFINE([NEED_MKTIME_WORKING], [1],
@@ -288,7 +287,7 @@ AC_DEFUN([gl_FUNC_MKTIME],
        with the algorithmic workarounds.])
   fi
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       REPLACE_MKTIME=1
       AC_DEFINE([NEED_MKTIME_WINDOWS], [1],
         [Define if the compilation of mktime.c should define 'mktime'
diff --git a/gl/m4/mmap-anon.m4 b/gl/m4/mmap-anon.m4
index d07d26e4..61ca0120 100644
--- a/gl/m4/mmap-anon.m4
+++ b/gl/m4/mmap-anon.m4
@@ -1,5 +1,6 @@
-# mmap-anon.m4 serial 12
-dnl Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc.
+# mmap-anon.m4
+# serial 12
+dnl Copyright (C) 2005, 2007, 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.
diff --git a/gl/m4/mode_t.m4 b/gl/m4/mode_t.m4
index 82197c02..0d5c2808 100644
--- a/gl/m4/mode_t.m4
+++ b/gl/m4/mode_t.m4
@@ -1,5 +1,6 @@
-# mode_t.m4 serial 2
-dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
+# mode_t.m4
+# serial 2
+dnl Copyright (C) 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.
diff --git a/gl/m4/mountlist.m4 b/gl/m4/mountlist.m4
index a9b4edb9..ff414e66 100644
--- a/gl/m4/mountlist.m4
+++ b/gl/m4/mountlist.m4
@@ -1,5 +1,6 @@
-# serial 15
-dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc.
+# mountlist.m4
+# serial 17
+dnl Copyright (C) 2002-2006, 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.
@@ -106,7 +107,18 @@ $ac_includes_default
           [Define if there is a function named getmntent for reading the list
            of mounted file systems, and that function takes a single argument.
            (4.3BSD, SunOS, HP-UX, Irix)])
-        AC_CHECK_FUNCS([setmntent endmntent hasmntopt])
+        gl_CHECK_FUNCS_ANDROID([setmntent],
+          [[#include <stdio.h>
+            #include <mntent.h>
+          ]])
+        gl_CHECK_FUNCS_ANDROID([endmntent],
+          [[#include <stdio.h>
+            #include <mntent.h>
+          ]])
+        gl_CHECK_FUNCS_ANDROID([hasmntopt],
+          [[#include <stdio.h>
+            #include <mntent.h>
+          ]])
       fi
     fi
 
diff --git a/gl/m4/msvc-inval.m4 b/gl/m4/msvc-inval.m4
index 8d9d21b5..7919ff12 100644
--- a/gl/m4/msvc-inval.m4
+++ b/gl/m4/msvc-inval.m4
@@ -1,5 +1,6 @@
-# msvc-inval.m4 serial 1
-dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
+# msvc-inval.m4
+# serial 1
+dnl Copyright (C) 2011-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.
diff --git a/gl/m4/msvc-nothrow.m4 b/gl/m4/msvc-nothrow.m4
index 0263e490..007c7620 100644
--- a/gl/m4/msvc-nothrow.m4
+++ b/gl/m4/msvc-nothrow.m4
@@ -1,5 +1,6 @@
-# msvc-nothrow.m4 serial 1
-dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
+# msvc-nothrow.m4
+# serial 1
+dnl Copyright (C) 2011-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.
diff --git a/gl/m4/multiarch.m4 b/gl/m4/multiarch.m4
index 3ba5b0f7..3af29d39 100644
--- a/gl/m4/multiarch.m4
+++ b/gl/m4/multiarch.m4
@@ -1,5 +1,6 @@
-# multiarch.m4 serial 9
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# multiarch.m4
+# serial 9
+dnl Copyright (C) 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.
diff --git a/gl/m4/musl.m4 b/gl/m4/musl.m4
new file mode 100644
index 00000000..0d4de892
--- /dev/null
+++ b/gl/m4/musl.m4
@@ -0,0 +1,21 @@
+# musl.m4
+# serial 4
+dnl Copyright (C) 2019-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.
+
+# Test for musl libc, despite the musl libc authors don't like it
+# <https://wiki.musl-libc.org/faq.html>
+# <https://lists.gnu.org/archive/html/bug-gnulib/2018-02/msg00079.html>.
+# From Bruno Haible.
+
+AC_DEFUN_ONCE([gl_MUSL_LIBC],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    *-musl* | midipix*)
+      AC_DEFINE([MUSL_LIBC], [1], [Define to 1 on musl libc.])
+      ;;
+  esac
+])
diff --git a/gl/m4/netdb_h.m4 b/gl/m4/netdb_h.m4
index e6aa8925..d8c00217 100644
--- a/gl/m4/netdb_h.m4
+++ b/gl/m4/netdb_h.m4
@@ -1,5 +1,6 @@
-# netdb_h.m4 serial 15
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# netdb_h.m4
+# serial 15
+dnl Copyright (C) 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.
diff --git a/gl/m4/netinet_in_h.m4 b/gl/m4/netinet_in_h.m4
index 71154191..926f7f95 100644
--- a/gl/m4/netinet_in_h.m4
+++ b/gl/m4/netinet_in_h.m4
@@ -1,5 +1,6 @@
-# netinet_in_h.m4 serial 6
-dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
+# netinet_in_h.m4
+# serial 6
+dnl Copyright (C) 2006-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.
diff --git a/gl/m4/nl_langinfo.m4 b/gl/m4/nl_langinfo.m4
index 51e783ce..f38f11bb 100644
--- a/gl/m4/nl_langinfo.m4
+++ b/gl/m4/nl_langinfo.m4
@@ -1,5 +1,6 @@
-# nl_langinfo.m4 serial 8
-dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
+# nl_langinfo.m4
+# serial 11
+dnl Copyright (C) 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.
@@ -8,7 +9,7 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
 [
   AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
   AC_REQUIRE([gl_LANGINFO_H])
-  AC_CHECK_FUNCS_ONCE([nl_langinfo])
+  gl_CHECK_FUNCS_ANDROID([nl_langinfo], [[#include <langinfo.h>]])
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
   AC_REQUIRE([gl_PTHREADLIB])
@@ -60,9 +61,12 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
     fi
   else
     HAVE_NL_LANGINFO=0
+    case "$gl_cv_onwards_func_nl_langinfo" in
+      future*) REPLACE_NL_LANGINFO=1 ;;
+    esac
   fi
   if test $HAVE_NL_LANGINFO = 0 || test $HAVE_LANGINFO_CODESET = 0; then
-    LIB_NL_LANGINFO="$LIB_SETLOCALE_NULL"
+    LIB_NL_LANGINFO="$SETLOCALE_NULL_LIB"
   else
     LIB_NL_LANGINFO=
   fi
diff --git a/gl/m4/nocrash.m4 b/gl/m4/nocrash.m4
index 6a766387..cbe8fe82 100644
--- a/gl/m4/nocrash.m4
+++ b/gl/m4/nocrash.m4
@@ -1,5 +1,6 @@
-# nocrash.m4 serial 5
-dnl Copyright (C) 2005, 2009-2023 Free Software Foundation, Inc.
+# nocrash.m4
+# serial 5
+dnl Copyright (C) 2005, 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.
diff --git a/gl/m4/off_t.m4 b/gl/m4/off_t.m4
index 880f3472..db6035db 100644
--- a/gl/m4/off_t.m4
+++ b/gl/m4/off_t.m4
@@ -1,5 +1,6 @@
-# off_t.m4 serial 1
-dnl Copyright (C) 2012-2023 Free Software Foundation, Inc.
+# off_t.m4
+# serial 1
+dnl Copyright (C) 2012-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.
diff --git a/gl/m4/open-cloexec.m4 b/gl/m4/open-cloexec.m4
index fd572fcd..6defdfb4 100644
--- a/gl/m4/open-cloexec.m4
+++ b/gl/m4/open-cloexec.m4
@@ -1,10 +1,12 @@
-# Test whether O_CLOEXEC is defined.
-
-dnl Copyright 2017-2023 Free Software Foundation, Inc.
+# open-cloexec.m4
+# serial 1
+dnl Copyright 2017-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.
 
+# Test whether O_CLOEXEC is defined.
+
 AC_DEFUN([gl_PREPROC_O_CLOEXEC],
 [
   AC_CACHE_CHECK([for O_CLOEXEC],
diff --git a/gl/m4/open-slash.m4 b/gl/m4/open-slash.m4
index 1f731f8a..03460e42 100644
--- a/gl/m4/open-slash.m4
+++ b/gl/m4/open-slash.m4
@@ -1,5 +1,6 @@
-# open-slash.m4 serial 2
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# open-slash.m4
+# serial 2
+dnl Copyright (C) 2007-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.
diff --git a/gl/m4/open.m4 b/gl/m4/open.m4
index 94fa2bb7..62a11a11 100644
--- a/gl/m4/open.m4
+++ b/gl/m4/open.m4
@@ -1,5 +1,6 @@
-# open.m4 serial 15
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# open.m4
+# serial 16
+dnl Copyright (C) 2007-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.
@@ -9,7 +10,7 @@ AC_DEFUN([gl_FUNC_OPEN],
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([gl_PREPROC_O_CLOEXEC])
   case "$host_os" in
-    mingw* | pw*)
+    mingw* | windows* | pw*)
       REPLACE_OPEN=1
       ;;
     *)
diff --git a/gl/m4/pathmax.m4 b/gl/m4/pathmax.m4
index 6d47d2c0..4280837f 100644
--- a/gl/m4/pathmax.m4
+++ b/gl/m4/pathmax.m4
@@ -1,5 +1,6 @@
-# pathmax.m4 serial 11
-dnl Copyright (C) 2002-2003, 2005-2006, 2009-2023 Free Software Foundation,
+# pathmax.m4
+# serial 11
+dnl Copyright (C) 2002-2003, 2005-2006, 2009-2024 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,
diff --git a/gl/m4/pid_t.m4 b/gl/m4/pid_t.m4
index 0fd7d0a1..8bedcc6b 100644
--- a/gl/m4/pid_t.m4
+++ b/gl/m4/pid_t.m4
@@ -1,5 +1,6 @@
-# pid_t.m4 serial 4
-dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
+# pid_t.m4
+# serial 4
+dnl Copyright (C) 2020-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.
diff --git a/gl/m4/printf.m4 b/gl/m4/printf.m4
index 4e65abc6..0cb14d6f 100644
--- a/gl/m4/printf.m4
+++ b/gl/m4/printf.m4
@@ -1,5 +1,6 @@
-# printf.m4 serial 73
-dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
+# printf.m4
+# serial 91
+dnl Copyright (C) 2003, 2007-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.
@@ -63,7 +64,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu* | gnu*)        gl_cv_func_printf_sizes_c99="guessing yes";;
                                  # Guess yes on musl systems.
-           *-musl*)              gl_cv_func_printf_sizes_c99="guessing yes";;
+           *-musl* | midipix*)   gl_cv_func_printf_sizes_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
            freebsd[1-4].*)       gl_cv_func_printf_sizes_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";;
@@ -86,7 +87,8 @@ changequote(,)dnl
            linux*-android*)      gl_cv_func_printf_sizes_c99="guessing yes";;
 changequote([,])dnl
                                  # Guess yes on MSVC, no on mingw.
-           mingw*)               AC_EGREP_CPP([Known], [
+           windows*-msvc*)       gl_cv_func_printf_sizes_c99="guessing yes" ;;
+           mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -101,6 +103,92 @@ changequote([,])dnl
     ])
 ])
 
+dnl Test whether the *printf family of functions supports the 'w8', 'w16',
+dnl 'w32', 'w64', 'wf8', 'wf16', 'wf32', 'wf64' size specifiers. (ISO C23)
+dnl Result is gl_cv_func_printf_sizes_c23.
+
+AC_DEFUN([gl_PRINTF_SIZES_C23],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+  AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether printf supports size specifiers as in C23],
+    [gl_cv_func_printf_sizes_c23],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <stddef.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#if HAVE_STDINT_H_WITH_UINTMAX
+# include <stdint.h>
+#endif
+#if HAVE_INTTYPES_H_WITH_UINTMAX
+# include <inttypes.h>
+#endif
+static char buf[100];
+int main ()
+{
+  int result = 0;
+  buf[0] = '\0';
+  if (sprintf (buf, "%w8u %d", (uint8_t) 123, 33, 44, 55) < 0
+      || strcmp (buf, "123 33") != 0)
+    result |= 1;
+  buf[0] = '\0';
+  if (sprintf (buf, "%wf8u %d", (uint_fast8_t) 123, 33, 44, 55) < 0
+      || strcmp (buf, "123 33") != 0)
+    result |= 1;
+  buf[0] = '\0';
+  if (sprintf (buf, "%w16u %d", (uint16_t) 12345, 33, 44, 55) < 0
+      || strcmp (buf, "12345 33") != 0)
+    result |= 2;
+  buf[0] = '\0';
+  if (sprintf (buf, "%wf16u %d", (uint_fast16_t) 12345, 33, 44, 55) < 0
+      || strcmp (buf, "12345 33") != 0)
+    result |= 2;
+  buf[0] = '\0';
+  if (sprintf (buf, "%w32u %d", (uint32_t) 12345671, 33, 44, 55) < 0
+      || strcmp (buf, "12345671 33") != 0)
+    result |= 4;
+  buf[0] = '\0';
+  if (sprintf (buf, "%wf32u %d", (uint_fast32_t) 12345671, 33, 44, 55) < 0
+      || strcmp (buf, "12345671 33") != 0)
+    result |= 4;
+#if HAVE_STDINT_H_WITH_UINTMAX || HAVE_INTTYPES_H_WITH_UINTMAX
+  buf[0] = '\0';
+  if (sprintf (buf, "%w64u %d", (uint64_t) 12345671, 33, 44, 55) < 0
+      || strcmp (buf, "12345671 33") != 0)
+    result |= 8;
+  buf[0] = '\0';
+  if (sprintf (buf, "%wf64u %d", (uint_fast64_t) 12345671, 33, 44, 55) < 0
+      || strcmp (buf, "12345671 33") != 0)
+    result |= 8;
+#else
+  result |= 8;
+#endif
+  return result;
+}]])],
+        [gl_cv_func_printf_sizes_c23=yes],
+        [gl_cv_func_printf_sizes_c23=no],
+        [
+         case "$host_os" in
+                               # Guess no on glibc systems.
+           *-gnu* | gnu*)      gl_cv_func_printf_sizes_c23="guessing no";;
+                               # Guess no on musl systems.
+           *-musl* | midipix*) gl_cv_func_printf_sizes_c23="guessing no";;
+                               # Guess no on Android.
+           linux*-android*)    gl_cv_func_printf_sizes_c23="guessing no";;
+                               # Guess no on native Windows.
+           mingw* | windows*)  gl_cv_func_printf_sizes_c23="guessing no";;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_printf_sizes_c23="$gl_cross_guess_normal";;
+         esac
+        ])
+    ])
+])
+
 dnl Test whether the *printf family of functions supports 'long double'
 dnl arguments together with the 'L' size specifier. (ISO C99, POSIX:2001)
 dnl Result is gl_cv_func_printf_long_double.
@@ -137,20 +225,21 @@ int main ()
         [gl_cv_func_printf_long_double=yes],
         [gl_cv_func_printf_long_double=no],
         [case "$host_os" in
-                            # Guess no on BeOS.
-           beos*)           gl_cv_func_printf_long_double="guessing no";;
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_printf_long_double="guessing yes";;
-                            # Guess yes on MSVC, no on mingw.
-           mingw*)          AC_EGREP_CPP([Known], [
+                              # Guess no on BeOS.
+           beos*)             gl_cv_func_printf_long_double="guessing no";;
+                              # Guess yes on Android.
+           linux*-android*)   gl_cv_func_printf_long_double="guessing yes";;
+                              # Guess yes on MSVC, no on mingw.
+           windows*-msvc*)    gl_cv_func_printf_long_double="guessing yes" ;;
+           mingw* | windows*) AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
-                              ],
-                              [gl_cv_func_printf_long_double="guessing yes"],
-                              [gl_cv_func_printf_long_double="guessing no"])
-                            ;;
-           *)               gl_cv_func_printf_long_double="guessing yes";;
+                                ],
+                                [gl_cv_func_printf_long_double="guessing yes"],
+                                [gl_cv_func_printf_long_double="guessing no"])
+                              ;;
+           *)                 gl_cv_func_printf_long_double="guessing yes";;
          esac
         ])
     ])
@@ -244,7 +333,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu* | gnu*)        gl_cv_func_printf_infinite="guessing yes";;
                                  # Guess yes on musl systems.
-           *-musl*)              gl_cv_func_printf_infinite="guessing yes";;
+           *-musl* | midipix*)   gl_cv_func_printf_infinite="guessing yes";;
                                  # Guess yes on FreeBSD >= 6.
            freebsd[1-5].*)       gl_cv_func_printf_infinite="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";;
@@ -268,7 +357,8 @@ changequote(,)dnl
            linux*-android*)      gl_cv_func_printf_infinite="guessing no";;
 changequote([,])dnl
                                  # Guess yes on MSVC, no on mingw.
-           mingw*)               AC_EGREP_CPP([Known], [
+           windows*-msvc*)       gl_cv_func_printf_infinite="guessing yes" ;;
+           mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -467,7 +557,7 @@ changequote(,)dnl
                                          # Guess yes on glibc systems.
                    *-gnu* | gnu*)        gl_cv_func_printf_infinite_long_double="guessing yes";;
                                          # Guess yes on musl systems.
-                   *-musl*)              gl_cv_func_printf_infinite_long_double="guessing yes";;
+                   *-musl* | midipix*)   gl_cv_func_printf_infinite_long_double="guessing yes";;
                                          # Guess yes on FreeBSD >= 6.
                    freebsd[1-5].*)       gl_cv_func_printf_infinite_long_double="guessing no";;
                    freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";;
@@ -482,7 +572,8 @@ changequote(,)dnl
                    linux*-android*)      gl_cv_func_printf_infinite_long_double="guessing no";;
 changequote([,])dnl
                                          # Guess yes on MSVC, no on mingw.
-                   mingw*)               AC_EGREP_CPP([Known], [
+                   windows*-msvc*)       gl_cv_func_printf_infinite_long_double="guessing yes" ;;
+                   mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -591,11 +682,11 @@ int main ()
                [gl_cv_func_printf_directive_a="guessing no"])
              ;;
                                  # Guess yes on musl systems.
-           *-musl*)              gl_cv_func_printf_directive_a="guessing yes";;
+           *-musl* | midipix*)   gl_cv_func_printf_directive_a="guessing yes";;
                                  # Guess no on Android.
            linux*-android*)      gl_cv_func_printf_directive_a="guessing no";;
                                  # Guess no on native Windows.
-           mingw*)               gl_cv_func_printf_directive_a="guessing no";;
+           mingw* | windows*)    gl_cv_func_printf_directive_a="guessing no";;
                                  # If we don't know, obey --enable-cross-guesses.
            *)                    gl_cv_func_printf_directive_a="$gl_cross_guess_normal";;
          esac
@@ -603,6 +694,116 @@ int main ()
     ])
 ])
 
+dnl Test whether the *printf family of functions supports the 'b' conversion
+dnl specifier for binary output of integers.
+dnl (ISO C23)
+dnl Result is gl_cv_func_printf_directive_b.
+
+AC_DEFUN([gl_PRINTF_DIRECTIVE_B],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether printf supports the 'b' directive],
+    [gl_cv_func_printf_directive_b],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <string.h>
+static char buf[100];
+int main ()
+{
+  int result = 0;
+  if (sprintf (buf, "%b %d", 12345, 33, 44, 55) < 0
+      || strcmp (buf, "11000000111001 33") != 0)
+    result |= 1;
+  return result;
+}]])],
+        [gl_cv_func_printf_directive_b=yes],
+        [gl_cv_func_printf_directive_b=no],
+        [
+         case "$host_os" in
+                               # Guess yes on glibc >= 2.35 systems.
+           *-gnu* | gnu*)
+             AC_EGREP_CPP([Lucky], [
+               #include <features.h>
+               #ifdef __GNU_LIBRARY__
+                #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 35) || (__GLIBC__ > 2)
+                 Lucky user
+                #endif
+               #endif
+               ],
+               [gl_cv_func_printf_directive_uppercase_b="guessing yes"],
+               [gl_cv_func_printf_directive_uppercase_b="guessing no"])
+             ;;
+                               # Guess no on musl systems.
+           *-musl* | midipix*) gl_cv_func_printf_directive_b="guessing no";;
+                               # Guess no on Android.
+           linux*-android*)    gl_cv_func_printf_directive_b="guessing no";;
+                               # Guess no on native Windows.
+           mingw* | windows*)  gl_cv_func_printf_directive_b="guessing no";;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_printf_directive_b="$gl_cross_guess_normal";;
+         esac
+        ])
+    ])
+])
+
+dnl Test whether the *printf family of functions supports the 'B' conversion
+dnl specifier for binary output of integers.
+dnl (GNU, encouraged by ISO C23 § 7.23.6.1)
+dnl Result is gl_cv_func_printf_directive_uppercase_b.
+
+AC_DEFUN([gl_PRINTF_DIRECTIVE_UPPERCASE_B],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether printf supports the 'B' directive],
+    [gl_cv_func_printf_directive_uppercase_b],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <string.h>
+static char buf[100];
+int main ()
+{
+  int result = 0;
+  if (sprintf (buf, "%#B %d", 12345, 33, 44, 55) < 0
+      || strcmp (buf, "0B11000000111001 33") != 0)
+    result |= 1;
+  return result;
+}]])],
+        [gl_cv_func_printf_directive_uppercase_b=yes],
+        [gl_cv_func_printf_directive_uppercase_b=no],
+        [
+         case "$host_os" in
+                               # Guess yes on glibc >= 2.35 systems.
+           *-gnu* | gnu*)
+             AC_EGREP_CPP([Lucky], [
+               #include <features.h>
+               #ifdef __GNU_LIBRARY__
+                #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 35) || (__GLIBC__ > 2)
+                 Lucky user
+                #endif
+               #endif
+               ],
+               [gl_cv_func_printf_directive_uppercase_b="guessing yes"],
+               [gl_cv_func_printf_directive_uppercase_b="guessing no"])
+             ;;
+                               # Guess no on musl systems.
+           *-musl* | midipix*) gl_cv_func_printf_directive_uppercase_b="guessing no";;
+                               # Guess no on Android.
+           linux*-android*)    gl_cv_func_printf_directive_uppercase_b="guessing no";;
+                               # Guess no on native Windows.
+           mingw* | windows*)  gl_cv_func_printf_directive_uppercase_b="guessing no";;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_printf_directive_uppercase_b="$gl_cross_guess_normal";;
+         esac
+        ])
+    ])
+])
+
 dnl Test whether the *printf family of functions supports the %F format
 dnl directive. (ISO C99, POSIX:2001)
 dnl Result is gl_cv_func_printf_directive_f.
@@ -643,7 +844,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu* | gnu*)        gl_cv_func_printf_directive_f="guessing yes";;
                                  # Guess yes on musl systems.
-           *-musl*)              gl_cv_func_printf_directive_f="guessing yes";;
+           *-musl* | midipix*)   gl_cv_func_printf_directive_f="guessing yes";;
                                  # Guess yes on FreeBSD >= 6.
            freebsd[1-5].*)       gl_cv_func_printf_directive_f="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";;
@@ -661,7 +862,8 @@ changequote(,)dnl
            linux*-android*)      gl_cv_func_printf_directive_f="guessing no";;
 changequote([,])dnl
                                  # Guess yes on MSVC, no on mingw.
-           mingw*)               AC_EGREP_CPP([Known], [
+           windows*-msvc*)       gl_cv_func_printf_directive_f="guessing yes" ;;
+           mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -689,6 +891,7 @@ AC_DEFUN([gl_PRINTF_DIRECTIVE_N],
     [
       AC_RUN_IFELSE(
         [AC_LANG_SOURCE([[
+#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -706,6 +909,12 @@ invalid_parameter_handler (const wchar_t *expression,
   exit (1);
 }
 #endif
+static void
+abort_handler (int sig)
+{
+  (void) sig;
+  _exit (1);
+}
 static char fmtstring[10];
 static char buf[100];
 int main ()
@@ -714,6 +923,7 @@ int main ()
 #ifdef _MSC_VER
   _set_invalid_parameter_handler (invalid_parameter_handler);
 #endif
+  signal (SIGABRT, abort_handler);
   /* Copy the format string.  Some systems (glibc with _FORTIFY_SOURCE=2)
      support %n in format strings in read-only memory but not in writable
      memory.  */
@@ -727,21 +937,21 @@ int main ()
         [gl_cv_func_printf_directive_n=yes],
         [gl_cv_func_printf_directive_n=no],
         [case "$host_os" in
-                            # Guess no on glibc when _FORTIFY_SOURCE >= 2.
-           *-gnu* | gnu*)   AC_COMPILE_IFELSE(
-                              [AC_LANG_SOURCE(
-                                 [[#if _FORTIFY_SOURCE >= 2
-                                    error fail
-                                   #endif
-                                 ]])],
-                              [gl_cv_func_printf_directive_n="guessing yes"],
-                              [gl_cv_func_printf_directive_n="guessing no"])
-                            ;;
-                            # Guess no on Android.
-           linux*-android*) gl_cv_func_printf_directive_n="guessing no";;
-                            # Guess no on native Windows.
-           mingw*)          gl_cv_func_printf_directive_n="guessing no";;
-           *)               gl_cv_func_printf_directive_n="guessing yes";;
+                              # Guess no on glibc when _FORTIFY_SOURCE >= 2.
+           *-gnu* | gnu*)     AC_COMPILE_IFELSE(
+                                [AC_LANG_SOURCE(
+                                   [[#if _FORTIFY_SOURCE >= 2
+                                      error fail
+                                     #endif
+                                   ]])],
+                                [gl_cv_func_printf_directive_n="guessing yes"],
+                                [gl_cv_func_printf_directive_n="guessing no"])
+                              ;;
+                              # Guess no on Android.
+           linux*-android*)   gl_cv_func_printf_directive_n="guessing no";;
+                              # Guess no on native Windows.
+           mingw* | windows*) gl_cv_func_printf_directive_n="guessing no";;
+           *)                 gl_cv_func_printf_directive_n="guessing yes";;
          esac
         ])
     ])
@@ -811,18 +1021,64 @@ int main ()
         [
 changequote(,)dnl
          case "$host_os" in
-                            # Guess yes on OpenBSD >= 6.0.
-           openbsd[1-5].*)  gl_cv_func_printf_directive_ls="guessing no";;
-           openbsd*)        gl_cv_func_printf_directive_ls="guessing yes";;
-           irix*)           gl_cv_func_printf_directive_ls="guessing no";;
-           solaris*)        gl_cv_func_printf_directive_ls="guessing no";;
-           cygwin*)         gl_cv_func_printf_directive_ls="guessing no";;
-           beos* | haiku*)  gl_cv_func_printf_directive_ls="guessing no";;
-                            # Guess no on Android.
-           linux*-android*) gl_cv_func_printf_directive_ls="guessing no";;
-                            # Guess yes on native Windows.
-           mingw*)          gl_cv_func_printf_directive_ls="guessing yes";;
-           *)               gl_cv_func_printf_directive_ls="guessing yes";;
+                              # Guess yes on OpenBSD >= 6.0.
+           openbsd[1-5].*)    gl_cv_func_printf_directive_ls="guessing no";;
+           openbsd*)          gl_cv_func_printf_directive_ls="guessing yes";;
+           irix*)             gl_cv_func_printf_directive_ls="guessing no";;
+           solaris*)          gl_cv_func_printf_directive_ls="guessing no";;
+           cygwin*)           gl_cv_func_printf_directive_ls="guessing no";;
+           beos* | haiku*)    gl_cv_func_printf_directive_ls="guessing no";;
+                              # Guess no on Android.
+           linux*-android*)   gl_cv_func_printf_directive_ls="guessing no";;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_printf_directive_ls="guessing yes";;
+           *)                 gl_cv_func_printf_directive_ls="guessing yes";;
+         esac
+changequote([,])dnl
+        ])
+    ])
+])
+
+dnl Test whether the *printf family of functions supports the %lc format
+dnl directive and in particular, when the argument is a null wide character,
+dnl whether the functions produce a NUL byte, as specified in ISO C 23
+dnl after the issue GB-141 was fixed.
+dnl Result is gl_cv_func_printf_directive_lc.
+
+AC_DEFUN([gl_PRINTF_DIRECTIVE_LC],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether printf supports the 'lc' directive correctly],
+    [gl_cv_func_printf_directive_lc],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <wchar.h>
+#include <string.h>
+int main ()
+{
+  int result = 0;
+  char buf[100];
+  /* This test fails on musl libc 1.2.4.  */
+  {
+    buf[0] = '\0';
+    if (sprintf (buf, "%lc%lc%lc", (wint_t) 'a', (wint_t) 0, (wint_t) 'z') < 0
+        || memcmp (buf, "a\0z", 4) != 0)
+      result |= 1;
+  }
+  return result;
+}]])],
+        [gl_cv_func_printf_directive_lc=yes],
+        [gl_cv_func_printf_directive_lc=no],
+        [
+changequote(,)dnl
+         case "$host_os" in
+                               # Guess no on musl libc.
+           *-musl* | midipix*) gl_cv_func_printf_directive_lc="guessing no";;
+                               # Guess yes otherwise.
+           *)                  gl_cv_func_printf_directive_lc="guessing yes";;
          esac
 changequote([,])dnl
         ])
@@ -833,7 +1089,7 @@ dnl Test whether the *printf family of functions supports POSIX/XSI format
 dnl strings with positions. (POSIX:2001)
 dnl Result is gl_cv_func_printf_positions.
 
-AC_DEFUN([gl_PRINTF_POSITIONS],
+AC_DEFUN_ONCE([gl_PRINTF_POSITIONS],
 [
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
@@ -859,13 +1115,17 @@ int main ()
 changequote(,)dnl
          case "$host_os" in
            netbsd[1-3]* | netbsdelf[1-3]* | netbsdaout[1-3]* | netbsdcoff[1-3]*)
-                            gl_cv_func_printf_positions="guessing no";;
-           beos*)           gl_cv_func_printf_positions="guessing no";;
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_printf_positions="guessing yes";;
-                            # Guess no on native Windows.
-           mingw* | pw*)    gl_cv_func_printf_positions="guessing no";;
-           *)               gl_cv_func_printf_positions="guessing yes";;
+             gl_cv_func_printf_positions="guessing no";;
+           beos*)
+             gl_cv_func_printf_positions="guessing no";;
+             # Guess yes on Android.
+           linux*-android*)
+             gl_cv_func_printf_positions="guessing yes";;
+             # Guess no on native Windows.
+           mingw* | windows* | pw*)
+             gl_cv_func_printf_positions="guessing no";;
+           *)
+             gl_cv_func_printf_positions="guessing yes";;
          esac
 changequote([,])dnl
         ])
@@ -900,13 +1160,13 @@ int main ()
         [
 changequote(,)dnl
          case "$host_os" in
-           cygwin*)         gl_cv_func_printf_flag_grouping="guessing no";;
-           netbsd*)         gl_cv_func_printf_flag_grouping="guessing no";;
-                            # Guess no on Android.
-           linux*-android*) gl_cv_func_printf_flag_grouping="guessing no";;
-                            # Guess no on native Windows.
-           mingw* | pw*)    gl_cv_func_printf_flag_grouping="guessing no";;
-           *)               gl_cv_func_printf_flag_grouping="guessing yes";;
+           cygwin*)                 gl_cv_func_printf_flag_grouping="guessing no";;
+           netbsd*)                 gl_cv_func_printf_flag_grouping="guessing no";;
+                                    # Guess no on Android.
+           linux*-android*)         gl_cv_func_printf_flag_grouping="guessing no";;
+                                    # Guess no on native Windows.
+           mingw* | windows* | pw*) gl_cv_func_printf_flag_grouping="guessing no";;
+           *)                       gl_cv_func_printf_flag_grouping="guessing yes";;
          esac
 changequote([,])dnl
         ])
@@ -943,16 +1203,16 @@ int main ()
         [
 changequote(,)dnl
          case "$host_os" in
-                            # Guess yes on HP-UX 11.
-           hpux11*)         gl_cv_func_printf_flag_leftadjust="guessing yes";;
-                            # Guess no on HP-UX 10 and older.
-           hpux*)           gl_cv_func_printf_flag_leftadjust="guessing no";;
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
-                            # Guess yes on native Windows.
-           mingw*)          gl_cv_func_printf_flag_leftadjust="guessing yes";;
-                            # Guess yes otherwise.
-           *)               gl_cv_func_printf_flag_leftadjust="guessing yes";;
+                              # Guess yes on HP-UX 11.
+           hpux11*)           gl_cv_func_printf_flag_leftadjust="guessing yes";;
+                              # Guess no on HP-UX 10 and older.
+           hpux*)             gl_cv_func_printf_flag_leftadjust="guessing no";;
+                              # Guess yes on Android.
+           linux*-android*)   gl_cv_func_printf_flag_leftadjust="guessing yes";;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_printf_flag_leftadjust="guessing yes";;
+                              # Guess yes otherwise.
+           *)                 gl_cv_func_printf_flag_leftadjust="guessing yes";;
          esac
 changequote([,])dnl
         ])
@@ -990,18 +1250,62 @@ int main ()
         [
 changequote(,)dnl
          case "$host_os" in
-                            # Guess yes on glibc systems.
-           *-gnu* | gnu*)   gl_cv_func_printf_flag_zero="guessing yes";;
-                            # Guess yes on musl systems.
-           *-musl*)         gl_cv_func_printf_flag_zero="guessing yes";;
-                            # Guess yes on BeOS.
-           beos*)           gl_cv_func_printf_flag_zero="guessing yes";;
-                            # Guess no on Android.
-           linux*-android*) gl_cv_func_printf_flag_zero="guessing no";;
-                            # Guess no on native Windows.
-           mingw*)          gl_cv_func_printf_flag_zero="guessing no";;
-                            # If we don't know, obey --enable-cross-guesses.
-           *)               gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";;
+                               # Guess yes on glibc systems.
+           *-gnu* | gnu*)      gl_cv_func_printf_flag_zero="guessing yes";;
+                               # Guess yes on musl systems.
+           *-musl* | midipix*) gl_cv_func_printf_flag_zero="guessing yes";;
+                               # Guess yes on BeOS.
+           beos*)              gl_cv_func_printf_flag_zero="guessing yes";;
+                               # Guess no on Android.
+           linux*-android*)    gl_cv_func_printf_flag_zero="guessing no";;
+                               # Guess no on native Windows.
+           mingw* | windows*)  gl_cv_func_printf_flag_zero="guessing no";;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_printf_flag_zero="$gl_cross_guess_normal";;
+         esac
+changequote([,])dnl
+        ])
+    ])
+])
+
+dnl Test whether the *printf family of functions supports the # flag with a
+dnl zero precision and a zero value in the 'x' and 'X' directives correctly.
+dnl ISO C and POSIX specify that for the 'd', 'i', 'b', 'o', 'u', 'x', 'X'
+dnl directives: "The result of converting a zero value with a precision of
+dnl zero is no characters."  But on Mac OS X 10.5, for the 'x', 'X' directives,
+dnl when a # flag is present, the output is "0" instead of "".
+dnl Result is gl_cv_func_printf_flag_alt_precision_zero.
+
+AC_DEFUN([gl_PRINTF_FLAG_ALT_PRECISION_ZERO],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether printf supports the alternative flag with a zero precision],
+    [gl_cv_func_printf_flag_alt_precision_zero],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <stdio.h>
+static char buf[10];
+int main ()
+{
+  int result = 0;
+  if (sprintf (buf, "%#.0x %d", 0, 33, 44) > 0 + 3)
+    result |= 1;
+  return result;
+}]])],
+        [gl_cv_func_printf_flag_alt_precision_zero=yes],
+        [gl_cv_func_printf_flag_alt_precision_zero=no],
+        [
+changequote(,)dnl
+         case "$host_os" in
+           # Guess no only on macOS 10..12 systems.
+           darwin[0-9] | darwin[0-9].* | \
+           darwin1[0-9] | darwin1[0-9].* | \
+           darwin2[0-1] | darwin2[0-1].*)
+                    gl_cv_func_printf_flag_alt_precision_zero="guessing no" ;;
+           darwin*) gl_cv_func_printf_flag_alt_precision_zero="guessing yes" ;;
+           *)       gl_cv_func_printf_flag_alt_precision_zero="guessing yes" ;;
          esac
 changequote([,])dnl
         ])
@@ -1054,12 +1358,12 @@ int main ()
 changequote(,)dnl
          case "$host_os" in
            # Guess no only on Solaris, native Windows, and BeOS systems.
-           solaris*)        gl_cv_func_printf_precision="guessing no" ;;
-           mingw* | pw*)    gl_cv_func_printf_precision="guessing no" ;;
-           beos*)           gl_cv_func_printf_precision="guessing no" ;;
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_printf_precision="guessing yes" ;;
-           *)               gl_cv_func_printf_precision="guessing yes" ;;
+           solaris*)                gl_cv_func_printf_precision="guessing no" ;;
+           mingw* | windows* | pw*) gl_cv_func_printf_precision="guessing no" ;;
+           beos*)                   gl_cv_func_printf_precision="guessing no" ;;
+                                    # Guess yes on Android.
+           linux*-android*)         gl_cv_func_printf_precision="guessing yes" ;;
+           *)                       gl_cv_func_printf_precision="guessing yes" ;;
          esac
 changequote([,])dnl
         ])
@@ -1239,7 +1543,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu* | gnu*)        gl_cv_func_snprintf_truncation_c99="guessing yes";;
                                  # Guess yes on musl systems.
-           *-musl*)              gl_cv_func_snprintf_truncation_c99="guessing yes";;
+           *-musl* | midipix*)   gl_cv_func_snprintf_truncation_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
            freebsd[1-4].*)       gl_cv_func_snprintf_truncation_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";;
@@ -1275,7 +1579,7 @@ changequote(,)dnl
                                  # Guess yes on Android.
            linux*-android*)      gl_cv_func_snprintf_truncation_c99="guessing yes";;
                                  # Guess no on native Windows.
-           mingw*)               gl_cv_func_snprintf_truncation_c99="guessing no";;
+           mingw* | windows*)    gl_cv_func_snprintf_truncation_c99="guessing no";;
                                  # If we don't know, obey --enable-cross-guesses.
            *)                    gl_cv_func_snprintf_truncation_c99="$gl_cross_guess_normal";;
          esac
@@ -1344,7 +1648,7 @@ changequote(,)dnl
                                  # Guess yes on glibc systems.
            *-gnu* | gnu*)        gl_cv_func_snprintf_retval_c99="guessing yes";;
                                  # Guess yes on musl systems.
-           *-musl*)              gl_cv_func_snprintf_retval_c99="guessing yes";;
+           *-musl* | midipix*)   gl_cv_func_snprintf_retval_c99="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
            freebsd[1-4].*)       gl_cv_func_snprintf_retval_c99="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";;
@@ -1372,7 +1676,8 @@ changequote(,)dnl
            linux*-android*)      gl_cv_func_snprintf_retval_c99="guessing yes";;
 changequote([,])dnl
                                  # Guess yes on MSVC, no on mingw.
-           mingw*)               AC_EGREP_CPP([Known], [
+           windows*-msvc*)       gl_cv_func_snprintf_retval_c99="guessing yes" ;;
+           mingw* | windows*)    AC_EGREP_CPP([Known], [
 #ifdef _MSC_VER
  Known
 #endif
@@ -1401,6 +1706,7 @@ AC_DEFUN([gl_SNPRINTF_DIRECTIVE_N],
     [
       AC_RUN_IFELSE(
         [AC_LANG_SOURCE([[
+#include <signal.h>
 #include <stdio.h>
 #include <string.h>
 #if HAVE_SNPRINTF
@@ -1417,11 +1723,18 @@ static int my_snprintf (char *buf, int size, const char *format, ...)
   return ret;
 }
 #endif
+static void
+abort_handler (int sig)
+{
+  (void) sig;
+  _exit (1);
+}
 static char fmtstring[10];
 static char buf[100];
 int main ()
 {
   int count = -1;
+  signal (SIGABRT, abort_handler);
   /* Copy the format string.  Some systems (glibc with _FORTIFY_SOURCE=2)
      support %n in format strings in read-only memory but not in writable
      memory.  */
@@ -1447,7 +1760,7 @@ int main ()
                                  ;;
 changequote(,)dnl
                                  # Guess yes on musl systems.
-           *-musl*)              gl_cv_func_snprintf_directive_n="guessing yes";;
+           *-musl* | midipix*)   gl_cv_func_snprintf_directive_n="guessing yes";;
                                  # Guess yes on FreeBSD >= 5.
            freebsd[1-4].*)       gl_cv_func_snprintf_directive_n="guessing no";;
            freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";;
@@ -1476,7 +1789,7 @@ changequote(,)dnl
                                  # Guess no on Android.
            linux*-android*)      gl_cv_func_snprintf_directive_n="guessing no";;
                                  # Guess no on native Windows.
-           mingw*)               gl_cv_func_snprintf_directive_n="guessing no";;
+           mingw* | windows*)    gl_cv_func_snprintf_directive_n="guessing no";;
                                  # If we don't know, obey --enable-cross-guesses.
            *)                    gl_cv_func_snprintf_directive_n="$gl_cross_guess_normal";;
 changequote([,])dnl
@@ -1524,11 +1837,11 @@ int main()
         [gl_cv_func_snprintf_size1=yes],
         [gl_cv_func_snprintf_size1=no],
         [case "$host_os" in
-                            # Guess yes on Android.
-           linux*-android*) gl_cv_func_snprintf_size1="guessing yes" ;;
-                            # Guess yes on native Windows.
-           mingw*)          gl_cv_func_snprintf_size1="guessing yes" ;;
-           *)               gl_cv_func_snprintf_size1="guessing yes" ;;
+                              # Guess yes on Android.
+           linux*-android*)   gl_cv_func_snprintf_size1="guessing yes" ;;
+                              # Guess yes on native Windows.
+           mingw* | windows*) gl_cv_func_snprintf_size1="guessing yes" ;;
+           *)                 gl_cv_func_snprintf_size1="guessing yes" ;;
          esac
         ])
     ])
@@ -1601,128 +1914,320 @@ int main()
         [
 changequote(,)dnl
          case "$host_os" in
-                                 # Guess yes on glibc systems.
-           *-gnu* | gnu*)        gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on musl systems.
-           *-musl*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on FreeBSD >= 5.
-           freebsd[1-4].*)       gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-           midnightbsd*)         gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on Mac OS X >= 10.3.
-           darwin[1-6].*)        gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           darwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on Cygwin.
-           cygwin*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on Solaris >= 2.6.
+                                    # Guess yes on glibc systems.
+           *-gnu* | gnu*)           gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on musl systems.
+           *-musl* | midipix*)      gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on FreeBSD >= 5.
+           freebsd[1-4].*)          gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           freebsd* | kfreebsd*)    gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+           midnightbsd*)            gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on Mac OS X >= 10.3.
+           darwin[1-6].*)           gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           darwin*)                 gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on Cygwin.
+           cygwin*)                 gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on Solaris >= 2.6.
            solaris2.[0-5] | solaris2.[0-5].*)
-                                 gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           solaris*)             gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on AIX >= 4.
-           aix[1-3]*)            gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           aix*)                 gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on IRIX >= 6.5.
-           irix6.5)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on NetBSD >= 3.
+                                    gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           solaris*)                gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on AIX >= 4.
+           aix[1-3]*)               gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           aix*)                    gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on IRIX >= 6.5.
+           irix6.5)                 gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on NetBSD >= 3.
            netbsd[1-2]* | netbsdelf[1-2]* | netbsdaout[1-2]* | netbsdcoff[1-2]*)
-                                 gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
-           netbsd*)              gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on BeOS.
-           beos*)                gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on Android.
-           linux*-android*)      gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # Guess yes on native Windows.
-           mingw* | pw*)         gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
-                                 # If we don't know, obey --enable-cross-guesses.
-           *)                    gl_cv_func_vsnprintf_zerosize_c99="$gl_cross_guess_normal";;
+                                    gl_cv_func_vsnprintf_zerosize_c99="guessing no";;
+           netbsd*)                 gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on BeOS.
+           beos*)                   gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on Android.
+           linux*-android*)         gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # Guess yes on native Windows.
+           mingw* | windows* | pw*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";;
+                                    # If we don't know, obey --enable-cross-guesses.
+           *)                       gl_cv_func_vsnprintf_zerosize_c99="$gl_cross_guess_normal";;
          esac
 changequote([,])dnl
         ])
     ])
 ])
 
+dnl Test whether the swprintf function works correctly when it produces output
+dnl that contains null wide characters.
+dnl Result is gl_cv_func_swprintf_works.
+
+AC_DEFUN([gl_SWPRINTF_WORKS],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CHECK_FUNCS_ONCE([swprintf])
+  AC_CACHE_CHECK([whether swprintf works],
+    [gl_cv_func_swprintf_works],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#ifndef __USE_MINGW_ANSI_STDIO
+# define __USE_MINGW_ANSI_STDIO 1
+#endif
+#include <stdio.h>
+#include <wchar.h>
+int main()
+{
+  int result = 0;
+  { /* This test fails on musl libc 1.2.3, FreeBSD, NetBSD, OpenBSD, macOS, AIX.  */
+    wchar_t buf[5] = { 0xBEEF, 0xBEEF, 0xBEEF, 0xBEEF, 0xBEEF };
+    int ret = swprintf (buf, 4, L"%cz", '\0');
+    /* Expected result:
+         ret = 2, buf[0] = 0x0, buf[1] = 0x7a, buf[2] = 0x0, buf[3] = 0xbeef
+       musl libc 1.2.3:
+         ret = 2, buf[0] = 0x0, buf[1] = 0x0, buf[2] = 0x0, buf[3] = 0x0
+         Reported at <https://www.openwall.com/lists/musl/2023/03/22/9>.
+       FreeBSD 13.1, NetBSD 9.0, OpenBSD 7.2, macOS 12.5, AIX 7.2:
+         ret = 2, buf[0] = 0x0, buf[1] = 0xbeef, buf[2] = 0xbeef, buf[3] = 0xbeef
+     */
+    if (ret < 0 || buf[1] != 'z')
+      result |= 1;
+  }
+  { /* This test fails on mingw.  */
+    wchar_t buf[2];
+    int ret = swprintf (buf, 2, L"%lc", (wint_t)0);
+    /* Expected: ret = 1
+       mingw:    ret = 0
+     */
+    if (ret != 1)
+      result |= 2;
+  }
+  return result;
+}]])],
+        [gl_cv_func_swprintf_works=yes],
+        [gl_cv_func_swprintf_works=no],
+        [case "$host_os" in
+                                    # Guess yes on glibc systems.
+           *-gnu* | gnu*)           gl_cv_func_swprintf_works="guessing yes";;
+                                    # Guess no on musl systems.
+           *-musl* | midipix*)      gl_cv_func_swprintf_works="guessing no";;
+                                    # Guess no on FreeBSD, NetBSD, OpenBSD, macOS, AIX.
+           freebsd* | midnightbsd* | netbsd* | openbsd* | darwin* | aix*)
+                                    gl_cv_func_swprintf_works="guessing no";;
+                                    # Guess no on native Windows.
+           mingw* | windows* | pw*) gl_cv_func_swprintf_works="guessing no";;
+                                    # If we don't know, obey --enable-cross-guesses.
+           *)                       gl_cv_func_swprintf_works="$gl_cross_guess_normal";;
+         esac
+        ])
+    ])
+])
+
+dnl Test whether the *wprintf family of functions supports the 'a' and 'A'
+dnl conversion specifier for hexadecimal output of 'long double' numbers.
+dnl (ISO C99, POSIX:2001)
+dnl Result is gl_cv_func_swprintf_directive_la.
+
+AC_DEFUN([gl_SWPRINTF_DIRECTIVE_LA],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether swprintf supports the 'La' and 'LA' directives],
+    [gl_cv_func_swprintf_directive_la],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <wchar.h>
+static wchar_t buf[100];
+int main ()
+{
+  int result = 0;
+  /* This catches a glibc 2.15, Haiku 2022, NetBSD 10.0 bug.  */
+  if (swprintf (buf, sizeof (buf) / sizeof (wchar_t),
+                L"%La %d", 3.1416015625L, 33, 44, 55) < 0
+      || (wcscmp (buf, L"0x1.922p+1 33") != 0
+          && wcscmp (buf, L"0x3.244p+0 33") != 0
+          && wcscmp (buf, L"0x6.488p-1 33") != 0
+          && wcscmp (buf, L"0xc.91p-2 33") != 0))
+    result |= 1;
+  return result;
+}]])],
+        [gl_cv_func_swprintf_directive_la=yes],
+        [gl_cv_func_swprintf_directive_la=no],
+        [case "$host_os" in
+                               # Guess yes on glibc >= 2.17 systems.
+           *-gnu* | gnu*)
+             AC_EGREP_CPP([Unlucky], [
+               #include <features.h>
+               #ifdef __GNU_LIBRARY__
+                #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 16) || (__GLIBC__ > 2)) && !defined __UCLIBC__
+                 Unlucky
+                #endif
+               #endif
+               ],
+               [gl_cv_func_swprintf_directive_la="guessing yes"],
+               [gl_cv_func_swprintf_directive_la="guessing no"])
+             ;;
+                               # Guess yes on musl systems.
+           *-musl* | midipix*) gl_cv_func_swprintf_directive_la="guessing yes";;
+                               # Guess yes on Android.
+           linux*-android*)    gl_cv_func_swprintf_directive_la="guessing yes";;
+                               # Guess no on NetBSD.
+           netbsd*)            gl_cv_func_swprintf_directive_la="guessing no";;
+                               # Guess no on native Windows.
+           mingw* | windows*)  gl_cv_func_swprintf_directive_la="guessing no";;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_swprintf_directive_la="$gl_cross_guess_normal";;
+         esac
+        ])
+    ])
+])
+
+dnl Test whether the *wprintf family of functions supports the 'lc' conversion
+dnl specifier for all wide characters.
+dnl (ISO C11, POSIX:2001)
+dnl Result is gl_cv_func_swprintf_directive_lc.
+
+AC_DEFUN([gl_SWPRINTF_DIRECTIVE_LC],
+[
+  AC_REQUIRE([AC_PROG_CC])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CACHE_CHECK([whether swprintf supports the 'lc' directive],
+    [gl_cv_func_swprintf_directive_lc],
+    [
+      AC_RUN_IFELSE(
+        [AC_LANG_SOURCE([[
+#include <stdio.h>
+#include <wchar.h>
+static wchar_t buf[100];
+static wint_t L_invalid = (wchar_t) 0x76543210;
+int main ()
+{
+  int result = 0;
+  /* This catches a musl libc 1.2.4, Android bug.
+     Reported at <https://www.openwall.com/lists/musl/2023/06/12/3>. */
+  if (swprintf (buf, sizeof (buf) / sizeof (wchar_t),
+                L"%lc %d", L_invalid, 33, 44, 55) < 0)
+    result |= 1;
+  return result;
+}]])],
+        [gl_cv_func_swprintf_directive_lc=yes],
+        [gl_cv_func_swprintf_directive_lc=no],
+        [case "$host_os" in
+                               # Guess yes on glibc systems.
+           *-gnu* | gnu*)      gl_cv_func_swprintf_directive_lc="guessing yes";;
+                               # Guess no on musl systems.
+           *-musl* | midipix*) gl_cv_func_swprintf_directive_lc="guessing no";;
+                               # Guess no on Android.
+           linux*-android*)    gl_cv_func_swprintf_directive_lc="guessing no";;
+                               # Guess yes on native Windows.
+           mingw* | windows*)  gl_cv_func_swprintf_directive_lc="guessing yes";;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_swprintf_directive_lc="$gl_cross_guess_normal";;
+         esac
+        ])
+    ])
+])
+
 dnl The results of these tests on various platforms are:
 dnl
 dnl 1 = gl_PRINTF_SIZES_C99
-dnl 2 = gl_PRINTF_LONG_DOUBLE
-dnl 3 = gl_PRINTF_INFINITE
-dnl 4 = gl_PRINTF_INFINITE_LONG_DOUBLE
-dnl 5 = gl_PRINTF_DIRECTIVE_A
-dnl 6 = gl_PRINTF_DIRECTIVE_F
-dnl 7 = gl_PRINTF_DIRECTIVE_N
-dnl 8 = gl_PRINTF_DIRECTIVE_LS
-dnl 9 = gl_PRINTF_POSITIONS
-dnl 10 = gl_PRINTF_FLAG_GROUPING
-dnl 11 = gl_PRINTF_FLAG_LEFTADJUST
-dnl 12 = gl_PRINTF_FLAG_ZERO
-dnl 13 = gl_PRINTF_PRECISION
-dnl 14 = gl_PRINTF_ENOMEM
-dnl 15 = gl_SNPRINTF_PRESENCE
-dnl 16 = gl_SNPRINTF_TRUNCATION_C99
-dnl 17 = gl_SNPRINTF_RETVAL_C99
-dnl 18 = gl_SNPRINTF_DIRECTIVE_N
-dnl 19 = gl_SNPRINTF_SIZE1
-dnl 20 = gl_VSNPRINTF_ZEROSIZE_C99
+dnl 2 = gl_PRINTF_SIZES_C23
+dnl 3 = gl_PRINTF_LONG_DOUBLE
+dnl 4 = gl_PRINTF_INFINITE
+dnl 5 = gl_PRINTF_INFINITE_LONG_DOUBLE
+dnl 6 = gl_PRINTF_DIRECTIVE_A
+dnl 7 = gl_PRINTF_DIRECTIVE_B
+dnl 8 = gl_PRINTF_DIRECTIVE_UPPERCASE_B
+dnl 9 = gl_PRINTF_DIRECTIVE_F
+dnl 10 = gl_PRINTF_DIRECTIVE_N
+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
 dnl 1 = checking whether printf supports size specifiers as in C99...
-dnl 2 = checking whether printf supports 'long double' arguments...
-dnl 3 = checking whether printf supports infinite 'double' arguments...
-dnl 4 = checking whether printf supports infinite 'long double' arguments...
-dnl 5 = checking whether printf supports the 'a' and 'A' directives...
-dnl 6 = checking whether printf supports the 'F' directive...
-dnl 7 = checking whether printf supports the 'n' directive...
-dnl 8 = checking whether printf supports the 'ls' directive...
-dnl 9 = checking whether printf supports POSIX/XSI format strings with positions...
-dnl 10 = checking whether printf supports the grouping flag...
-dnl 11 = checking whether printf supports the left-adjust flag correctly...
-dnl 12 = checking whether printf supports the zero flag correctly...
-dnl 13 = checking whether printf supports large precisions...
-dnl 14 = checking whether printf survives out-of-memory conditions...
-dnl 15 = checking for snprintf...
-dnl 16 = checking whether snprintf truncates the result as in C99...
-dnl 17 = checking whether snprintf returns a byte count as in C99...
-dnl 18 = checking whether snprintf fully supports the 'n' directive...
-dnl 19 = checking whether snprintf respects a size of 1...
-dnl 20 = checking whether vsnprintf respects a zero size as in C99...
+dnl 2 = checking whether printf supports size specifiers as in C23...
+dnl 3 = checking whether printf supports 'long double' arguments...
+dnl 4 = checking whether printf supports infinite 'double' arguments...
+dnl 5 = checking whether printf supports infinite 'long double' arguments...
+dnl 6 = checking whether printf supports the 'a' and 'A' directives...
+dnl 7 = checking whether printf supports the 'b' directive...
+dnl 8 = checking whether printf supports the 'B' directive...
+dnl 9 = checking whether printf supports the 'F' directive...
+dnl 10 = checking whether printf supports the 'n' directive...
+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
 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
-dnl   glibc 2.5                      .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
-dnl   glibc 2.3.6                    .  .  .  .  #  .  .  .  .  .  .  .  .  .  .  .  .  .  .  .
-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
+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_rwlock_rdlock.m4 b/gl/m4/pthread_rwlock_rdlock.m4
index ae6a8853..b8b5b117 100644
--- a/gl/m4/pthread_rwlock_rdlock.m4
+++ b/gl/m4/pthread_rwlock_rdlock.m4
@@ -1,5 +1,6 @@
-# pthread_rwlock_rdlock.m4 serial 4
-dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
+# pthread_rwlock_rdlock.m4
+# serial 8
+dnl Copyright (C) 2017-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.
@@ -34,11 +35,11 @@ dnl https://sourceware.org/bugzilla/show_bug.cgi?id=13701
 dnl https://bugzilla.redhat.com/show_bug.cgi?id=1410052
 AC_DEFUN([gl_PTHREAD_RWLOCK_RDLOCK_PREFER_WRITER],
 [
-  AC_REQUIRE([gl_THREADLIB_EARLY])
+  AC_REQUIRE([gl_THREADLIB])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_CACHE_CHECK([whether pthread_rwlock_rdlock prefers a writer to a reader],
     [gl_cv_pthread_rwlock_rdlock_prefer_writer],
-    [save_LIBS="$LIBS"
+    [saved_LIBS="$LIBS"
      LIBS="$LIBS $LIBMULTITHREAD"
      AC_RUN_IFELSE(
        [AC_LANG_SOURCE([[
@@ -156,25 +157,25 @@ main ()
        [gl_cv_pthread_rwlock_rdlock_prefer_writer=yes],
        [gl_cv_pthread_rwlock_rdlock_prefer_writer=no],
        [case "$host_os" in
-                         # Guess no on glibc systems.
-          *-gnu* | gnu*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;;
-                         # Guess no on musl systems.
-          *-musl*)       gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;;
-                         # Guess no on bionic systems.
-          *-android*)    gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;;
-                         # Guess yes on native Windows with the mingw-w64 winpthreads library.
-                         # Guess no on native Windows with the gnulib windows-rwlock module.
-          mingw*)        if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
-                           gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes"
-                         else
-                           gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no"
-                         fi
-                         ;;
-                         # If we don't know, obey --enable-cross-guesses.
-          *)             gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;;
+                              # Guess no on glibc systems.
+          *-gnu* | gnu*)      gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;;
+                              # Guess no on musl systems.
+          *-musl* | midipix*) gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;;
+                              # Guess no on bionic systems.
+          *-android*)         gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no" ;;
+                              # Guess yes on native Windows with the mingw-w64 winpthreads library.
+                              # Guess no on native Windows with the gnulib windows-rwlock module.
+          mingw* | windows*)  if test "$gl_use_threads" = yes || test "$gl_use_threads" = posix; then
+                                gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing yes"
+                              else
+                                gl_cv_pthread_rwlock_rdlock_prefer_writer="guessing no"
+                              fi
+                              ;;
+                              # If we don't know, obey --enable-cross-guesses.
+          *)                  gl_cv_pthread_rwlock_rdlock_prefer_writer="$gl_cross_guess_normal" ;;
          esac
        ])
-     LIBS="$save_LIBS"
+     LIBS="$saved_LIBS"
     ])
   case "$gl_cv_pthread_rwlock_rdlock_prefer_writer" in
     *yes)
diff --git a/gl/m4/realloc.m4 b/gl/m4/realloc.m4
index d22138fc..eb90d588 100644
--- a/gl/m4/realloc.m4
+++ b/gl/m4/realloc.m4
@@ -1,5 +1,6 @@
-# realloc.m4 serial 26
-dnl Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
+# realloc.m4
+# serial 29
+dnl Copyright (C) 2007, 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.
@@ -16,7 +17,8 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF],
           [[#include <stdlib.h>
           ]],
           [[void *p = realloc (0, 0);
-            int result = !p;
+            void * volatile vp = p;
+            int result = !vp;
             free (p);
             return result;]])
        ],
@@ -25,8 +27,8 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF],
        [case "$host_os" in
           # Guess yes on platforms where we know the result.
           *-gnu* | freebsd* | netbsd* | openbsd* | bitrig* \
-          | gnu* | *-musl* | midnightbsd* \
-          | hpux* | solaris* | cygwin* | mingw* | msys* )
+          | 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" ;;
diff --git a/gl/m4/reallocarray.m4 b/gl/m4/reallocarray.m4
index 1607b7a9..958095e1 100644
--- a/gl/m4/reallocarray.m4
+++ b/gl/m4/reallocarray.m4
@@ -1,5 +1,6 @@
-# reallocarray.m4 serial 3
-dnl Copyright (C) 2017-2023 Free Software Foundation, Inc.
+# reallocarray.m4
+# serial 5
+dnl Copyright (C) 2017-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.
@@ -11,9 +12,12 @@ AC_DEFUN([gl_FUNC_REALLOCARRAY],
 
   AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
   AC_REQUIRE([gl_CHECK_MALLOC_PTRDIFF])
-  AC_CHECK_FUNCS([reallocarray])
+  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
   fi
diff --git a/gl/m4/regex.m4 b/gl/m4/regex.m4
index c89a1432..f0101fe6 100644
--- a/gl/m4/regex.m4
+++ b/gl/m4/regex.m4
@@ -1,10 +1,9 @@
-# serial 73
-
-# Copyright (C) 1996-2001, 2003-2023 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# regex.m4
+# serial 75
+dnl Copyright (C) 1996-2001, 2003-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 Initially derived from code in GNU grep.
 dnl Mostly written by Jim Meyering.
@@ -15,7 +14,7 @@ AC_DEFUN([gl_REGEX],
 [
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_ARG_WITH([included-regex],
-    [AS_HELP_STRING([--without-included-regex],
+    [AS_HELP_STRING([[--without-included-regex]],
                     [don't compile regex; this is the default on systems
                      with recent-enough versions of the GNU C Library
                      (use with caution on other systems).])])
@@ -327,10 +326,10 @@ AC_DEFUN([gl_REGEX],
         [gl_cv_func_re_compile_pattern_working=yes],
         [gl_cv_func_re_compile_pattern_working=no],
         [case "$host_os" in
-                   # Guess no on native Windows.
-           mingw*) gl_cv_func_re_compile_pattern_working="guessing no" ;;
-                   # Otherwise obey --enable-cross-guesses.
-           *)      gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;;
+                              # Guess no on native Windows.
+           mingw* | windows*) gl_cv_func_re_compile_pattern_working="guessing no" ;;
+                              # Otherwise obey --enable-cross-guesses.
+           *)                 gl_cv_func_re_compile_pattern_working="$gl_cross_guess_normal" ;;
          esac
         ])
       ])
diff --git a/gl/m4/servent.m4 b/gl/m4/servent.m4
index 0f35b8b8..422003b4 100644
--- a/gl/m4/servent.m4
+++ b/gl/m4/servent.m4
@@ -1,5 +1,6 @@
-# servent.m4 serial 4
-dnl Copyright (C) 2008, 2010-2023 Free Software Foundation, Inc.
+# servent.m4
+# serial 5
+dnl Copyright (C) 2008, 2010-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.
@@ -28,7 +29,7 @@ AC_DEFUN([gl_SERVENT],
       AC_CACHE_CHECK([for getservbyname in winsock2.h and -lws2_32],
         [gl_cv_w32_getservbyname],
         [gl_cv_w32_getservbyname=no
-         gl_save_LIBS="$LIBS"
+         gl_saved_LIBS="$LIBS"
          LIBS="$LIBS -lws2_32"
          AC_LINK_IFELSE(
            [AC_LANG_PROGRAM(
@@ -40,7 +41,7 @@ AC_DEFUN([gl_SERVENT],
               ]],
               [[getservbyname(NULL,NULL);]])],
            [gl_cv_w32_getservbyname=yes])
-         LIBS="$gl_save_LIBS"
+         LIBS="$gl_saved_LIBS"
         ])
       if test "$gl_cv_w32_getservbyname" = "yes"; then
         SERVENT_LIB="-lws2_32"
diff --git a/gl/m4/setenv.m4 b/gl/m4/setenv.m4
index 16f9eb55..e7f00f39 100644
--- a/gl/m4/setenv.m4
+++ b/gl/m4/setenv.m4
@@ -1,5 +1,6 @@
-# setenv.m4 serial 30
-dnl Copyright (C) 2001-2004, 2006-2023 Free Software Foundation, Inc.
+# setenv.m4
+# serial 33
+dnl Copyright (C) 2001-2004, 2006-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.
@@ -35,12 +36,12 @@ AC_DEFUN([gl_FUNC_SETENV],
       ]])],
       [gl_cv_func_setenv_works=yes], [gl_cv_func_setenv_works=no],
       [case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;;
-                        # Guess yes on musl systems.
-         *-musl*)       gl_cv_func_setenv_works="guessing yes" ;;
-                        # If we don't know, obey --enable-cross-guesses.
-         *)             gl_cv_func_setenv_works="$gl_cross_guess_normal" ;;
+                             # Guess yes on glibc systems.
+         *-gnu* | gnu*)      gl_cv_func_setenv_works="guessing yes" ;;
+                             # Guess yes on musl systems.
+         *-musl* | midipix*) gl_cv_func_setenv_works="guessing yes" ;;
+                             # If we don't know, obey --enable-cross-guesses.
+         *)                  gl_cv_func_setenv_works="$gl_cross_guess_normal" ;;
        esac
       ])])
     case "$gl_cv_func_setenv_works" in
@@ -151,11 +152,10 @@ int unsetenv (const char *name);
 # Prerequisites of lib/setenv.c.
 AC_DEFUN([gl_PREREQ_SETENV],
 [
-  AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_REQUIRE([gl_ENVIRON])
   AC_CHECK_HEADERS_ONCE([unistd.h])
   AC_CHECK_HEADERS([search.h])
-  AC_CHECK_FUNCS([tsearch])
+  gl_CHECK_FUNCS_ANDROID([tsearch], [[#include <search.h>]])
 ])
 
 # Prerequisites of lib/unsetenv.c.
diff --git a/gl/m4/setlocale_null.m4 b/gl/m4/setlocale_null.m4
index 032119d0..e5b7d28b 100644
--- a/gl/m4/setlocale_null.m4
+++ b/gl/m4/setlocale_null.m4
@@ -1,5 +1,6 @@
-# setlocale_null.m4 serial 5
-dnl Copyright (C) 2019-2023 Free Software Foundation, Inc.
+# setlocale_null.m4
+# serial 9
+dnl Copyright (C) 2019-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.
@@ -13,11 +14,25 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL],
   AC_CACHE_CHECK([whether setlocale (LC_ALL, NULL) is multithread-safe],
     [gl_cv_func_setlocale_null_all_mtsafe],
     [case "$host_os" in
-       # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin.
-       *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku* | cygwin*)
+       # Guess no on musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku.
+       *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | openbsd* | aix* | haiku*)
          gl_cv_func_setlocale_null_all_mtsafe=no ;;
+       # Guess no on Cygwin < 3.4.6.
+       cygwin*)
+         AC_EGREP_CPP([Lucky user],
+           [
+#if defined __CYGWIN__
+ #include <cygwin/version.h>
+ #if CYGWIN_VERSION_DLL_COMBINED >= CYGWIN_VERSION_DLL_MAKE_COMBINED (3004, 6)
+  Lucky user
+ #endif
+#endif
+          ],
+          [gl_cv_func_setlocale_null_all_mtsafe=yes],
+          [gl_cv_func_setlocale_null_all_mtsafe=no])
+        ;;
        # Guess yes on glibc, HP-UX, IRIX, Solaris, native Windows.
-       *-gnu* | gnu* | hpux* | irix* | solaris* | mingw*)
+       *-gnu* | gnu* | hpux* | irix* | solaris* | mingw* | windows*)
          gl_cv_func_setlocale_null_all_mtsafe=yes ;;
        # If we don't know, obey --enable-cross-guesses.
        *)
@@ -26,7 +41,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL],
     ])
   dnl On platforms without multithreading, there is no issue.
   case "$host_os" in
-    mingw*) ;;
+    mingw* | windows*) ;;
     *)
       if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then
         gl_cv_func_setlocale_null_all_mtsafe="trivially yes"
@@ -48,7 +63,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL],
        openbsd* | aix*)
          gl_cv_func_setlocale_null_one_mtsafe=no ;;
        # Guess yes on glibc, musl libc, macOS, FreeBSD, NetBSD, HP-UX, IRIX, Solaris, Haiku, Cygwin, native Windows.
-       *-gnu* | gnu* | *-musl* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw*)
+       *-gnu* | gnu* | *-musl* | midipix* | darwin* | freebsd* | midnightbsd* | netbsd* | hpux* | irix* | solaris* | haiku* | cygwin* | mingw* | windows*)
          gl_cv_func_setlocale_null_one_mtsafe=yes ;;
        # If we don't know, obey --enable-cross-guesses.
        *)
@@ -57,7 +72,7 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL],
     ])
   dnl On platforms without multithreading, there is no issue.
   case "$host_os" in
-    mingw*) ;;
+    mingw* | windows*) ;;
     *)
       if test $gl_pthread_api = no && test $ac_cv_header_threads_h = no; then
         gl_cv_func_setlocale_null_one_mtsafe="trivially yes"
@@ -74,20 +89,25 @@ AC_DEFUN([gl_FUNC_SETLOCALE_NULL],
   dnl Determine link dependencies of lib/setlocale_null.c and lib/setlocale-lock.c.
   if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then
     case "$host_os" in
-      mingw*) LIB_SETLOCALE_NULL= ;;
+      mingw* | windows*)
+        SETLOCALE_NULL_LIB=
+        ;;
       *)
         gl_WEAK_SYMBOLS
         case "$gl_cv_have_weak" in
-          *yes) LIB_SETLOCALE_NULL= ;;
-          *)    LIB_SETLOCALE_NULL="$LIBPTHREAD" ;;
+          *yes) SETLOCALE_NULL_LIB= ;;
+          *)    SETLOCALE_NULL_LIB="$LIBPTHREAD" ;;
         esac
         ;;
     esac
   else
-    LIB_SETLOCALE_NULL=
+    SETLOCALE_NULL_LIB=
   fi
-  dnl LIB_SETLOCALE_NULL is expected to be '-pthread' or '-lpthread' on AIX
+  dnl SETLOCALE_NULL_LIB is expected to be '-pthread' or '-lpthread' on AIX
   dnl with gcc or xlc, and empty otherwise.
+  AC_SUBST([SETLOCALE_NULL_LIB])
+  dnl For backward compatibility.
+  LIB_SETLOCALE_NULL="$SETLOCALE_NULL_LIB"
   AC_SUBST([LIB_SETLOCALE_NULL])
 ])
 
diff --git a/gl/m4/sha256.m4 b/gl/m4/sha256.m4
index 4d1d1dda..ad5596a4 100644
--- a/gl/m4/sha256.m4
+++ b/gl/m4/sha256.m4
@@ -1,5 +1,6 @@
-# sha256.m4 serial 8
-dnl Copyright (C) 2005, 2008-2023 Free Software Foundation, Inc.
+# sha256.m4
+# serial 8
+dnl Copyright (C) 2005, 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.
diff --git a/gl/m4/size_max.m4 b/gl/m4/size_max.m4
index 0763366d..df91cf06 100644
--- a/gl/m4/size_max.m4
+++ b/gl/m4/size_max.m4
@@ -1,5 +1,6 @@
-# size_max.m4 serial 12
-dnl Copyright (C) 2003, 2005-2006, 2008-2023 Free Software Foundation, Inc.
+# size_max.m4
+# serial 12
+dnl Copyright (C) 2003, 2005-2006, 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.
diff --git a/gl/m4/snprintf.m4 b/gl/m4/snprintf.m4
index 4b5fbdbf..6dbe146f 100644
--- a/gl/m4/snprintf.m4
+++ b/gl/m4/snprintf.m4
@@ -1,5 +1,6 @@
-# snprintf.m4 serial 7
-dnl Copyright (C) 2002-2004, 2007-2023 Free Software Foundation, Inc.
+# snprintf.m4
+# serial 7
+dnl Copyright (C) 2002-2004, 2007-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.
diff --git a/gl/m4/socketlib.m4 b/gl/m4/socketlib.m4
index a556af1e..09f01161 100644
--- a/gl/m4/socketlib.m4
+++ b/gl/m4/socketlib.m4
@@ -1,5 +1,6 @@
-# socketlib.m4 serial 3
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# socketlib.m4
+# serial 4
+dnl Copyright (C) 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.
@@ -18,7 +19,7 @@ AC_DEFUN([gl_SOCKETLIB],
     dnl defined through -lws2_32), we need to call it.
     AC_CACHE_CHECK([for WSAStartup],
       [gl_cv_func_wsastartup], [
-       gl_save_LIBS="$LIBS"
+       gl_saved_LIBS="$LIBS"
        LIBS="$LIBS -lws2_32"
        AC_LINK_IFELSE(
          [AC_LANG_PROGRAM([[
@@ -33,7 +34,7 @@ AC_DEFUN([gl_SOCKETLIB],
          ],
          [gl_cv_func_wsastartup=yes],
          [gl_cv_func_wsastartup=no])
-       LIBS="$gl_save_LIBS"
+       LIBS="$gl_saved_LIBS"
       ])
     if test "$gl_cv_func_wsastartup" = "yes"; then
       AC_DEFINE([WINDOWS_SOCKETS], [1], [Define if WSAStartup is needed.])
@@ -56,8 +57,8 @@ AC_DEFUN([gl_SOCKETLIB],
 #endif
 char setsockopt();]], [[setsockopt();]])],
         [],
-        [gl_save_LIBS="$LIBS"
-         LIBS="$gl_save_LIBS -lsocket"
+        [gl_saved_LIBS="$LIBS"
+         LIBS="$gl_saved_LIBS -lsocket"
          AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern
 #ifdef __cplusplus
 "C"
@@ -65,7 +66,7 @@ char setsockopt();]], [[setsockopt();]])],
 char setsockopt();]], [[setsockopt();]])],
            [gl_cv_lib_socket="-lsocket"])
          if test -z "$gl_cv_lib_socket"; then
-           LIBS="$gl_save_LIBS -lnetwork"
+           LIBS="$gl_saved_LIBS -lnetwork"
            AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern
 #ifdef __cplusplus
 "C"
@@ -73,7 +74,7 @@ char setsockopt();]], [[setsockopt();]])],
 char setsockopt();]], [[setsockopt();]])],
              [gl_cv_lib_socket="-lnetwork"])
            if test -z "$gl_cv_lib_socket"; then
-             LIBS="$gl_save_LIBS -lnet"
+             LIBS="$gl_saved_LIBS -lnet"
              AC_LINK_IFELSE([AC_LANG_PROGRAM([[extern
 #ifdef __cplusplus
 "C"
@@ -82,7 +83,7 @@ char setsockopt();]], [[setsockopt();]])],
                [gl_cv_lib_socket="-lnet"])
            fi
          fi
-         LIBS="$gl_save_LIBS"
+         LIBS="$gl_saved_LIBS"
         ])
       if test -z "$gl_cv_lib_socket"; then
         gl_cv_lib_socket="none needed"
diff --git a/gl/m4/sockets.m4 b/gl/m4/sockets.m4
index ed9cb873..a3dfe92f 100644
--- a/gl/m4/sockets.m4
+++ b/gl/m4/sockets.m4
@@ -1,5 +1,6 @@
-# sockets.m4 serial 7
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# sockets.m4
+# serial 7
+dnl Copyright (C) 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.
diff --git a/gl/m4/socklen.m4 b/gl/m4/socklen.m4
index 1c63a853..9ece0abb 100644
--- a/gl/m4/socklen.m4
+++ b/gl/m4/socklen.m4
@@ -1,5 +1,6 @@
-# socklen.m4 serial 11
-dnl Copyright (C) 2005-2007, 2009-2023 Free Software Foundation, Inc.
+# socklen.m4
+# serial 11
+dnl Copyright (C) 2005-2007, 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.
diff --git a/gl/m4/sockpfaf.m4 b/gl/m4/sockpfaf.m4
index 6c6dc2f7..c68b3abb 100644
--- a/gl/m4/sockpfaf.m4
+++ b/gl/m4/sockpfaf.m4
@@ -1,5 +1,6 @@
-# sockpfaf.m4 serial 10
-dnl Copyright (C) 2004, 2006, 2009-2023 Free Software Foundation, Inc.
+# sockpfaf.m4
+# serial 10
+dnl Copyright (C) 2004, 2006, 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.
diff --git a/gl/m4/ssize_t.m4 b/gl/m4/ssize_t.m4
index 1c12c33e..c15f948a 100644
--- a/gl/m4/ssize_t.m4
+++ b/gl/m4/ssize_t.m4
@@ -1,23 +1,38 @@
-# ssize_t.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2001-2003, 2006, 2010-2023 Free Software Foundation, Inc.
+# ssize_t.m4
+# serial 6
+dnl Copyright (C) 2001-2003, 2006, 2010-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 ssize_t is defined.
+dnl Define ssize_t if it does not already exist.
 
 AC_DEFUN([gt_TYPE_SSIZE_T],
 [
-  AC_CACHE_CHECK([for ssize_t], [gt_cv_ssize_t],
+  AC_CACHE_CHECK([for ssize_t], [gl_cv_ssize_t],
     [AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <sys/types.h>]],
           [[int x = sizeof (ssize_t *) + sizeof (ssize_t);
             return !x;]])],
-       [gt_cv_ssize_t=yes], [gt_cv_ssize_t=no])])
-  if test $gt_cv_ssize_t = no; then
-    AC_DEFINE([ssize_t], [int],
-              [Define as a signed type of the same size as size_t.])
+       [gl_cv_ssize_t=yes], [gl_cv_ssize_t=no])])
+  if test $gl_cv_ssize_t = no; then
+    dnl On 64-bit native Windows, ssize_t needs to be defined as 'long long',
+    dnl for consistency with the 64-bit size_t.
+    AC_CACHE_CHECK([whether size_t is wider than 'long'], [gl_cv_size_t_large],
+      [AC_COMPILE_IFELSE(
+         [AC_LANG_PROGRAM(
+            [[#include <sys/types.h>
+              typedef int array [2 * (sizeof (size_t) > sizeof (long)) - 1];
+            ]])],
+         [gl_cv_size_t_large=yes], [gl_cv_size_t_large=no])])
+    if test $gl_cv_size_t_large = yes; then
+      gl_def_ssize_t='long long'
+    else
+      gl_def_ssize_t='long'
+    fi
+    AC_DEFINE_UNQUOTED([ssize_t], [$gl_def_ssize_t],
+                       [Define as a signed type of the same size as size_t.])
   fi
 ])
diff --git a/gl/m4/stat-time.m4 b/gl/m4/stat-time.m4
index 40993d57..e8ee7d51 100644
--- a/gl/m4/stat-time.m4
+++ b/gl/m4/stat-time.m4
@@ -1,11 +1,11 @@
-# Checks for stat-related time functions.
-
-# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2023 Free Software
-# Foundation, Inc.
+# stat-time.m4
+# serial 1
+dnl Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 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.
 
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Checks for stat-related time functions.
 
 dnl From Paul Eggert.
 
diff --git a/gl/m4/stat.m4 b/gl/m4/stat.m4
index 4d241e27..fabd360c 100644
--- a/gl/m4/stat.m4
+++ b/gl/m4/stat.m4
@@ -1,10 +1,9 @@
-# serial 18
-
-# Copyright (C) 2009-2023 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# stat.m4
+# serial 21
+dnl Copyright (C) 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_FUNC_STAT],
 [
@@ -12,7 +11,7 @@ AC_DEFUN([gl_FUNC_STAT],
   AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
   AC_CHECK_FUNCS_ONCE([lstat])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       dnl On this platform, the original stat() returns st_atime, st_mtime,
       dnl st_ctime values that are affected by the time zone.
       REPLACE_STAT=1
@@ -45,6 +44,8 @@ AC_DEFUN([gl_FUNC_STAT],
            [case "$host_os" in
                                # Guess yes on Linux systems.
               linux-* | linux) gl_cv_func_stat_file_slash="guessing yes" ;;
+                               # Guess yes on systems that emulate the Linux system calls.
+              midipix*)        gl_cv_func_stat_file_slash="guessing yes" ;;
                                # Guess yes on glibc systems.
               *-gnu* | gnu*)   gl_cv_func_stat_file_slash="guessing yes" ;;
                                # If we don't know, obey --enable-cross-guesses.
@@ -59,8 +60,8 @@ AC_DEFUN([gl_FUNC_STAT],
             help when passed a file name with a trailing slash]);;
       esac
       case $host_os in
-        dnl Solaris stat can return a negative tv_nsec.
-        solaris*)
+        dnl macOS and Solaris stat can return a negative tv_nsec.
+        darwin* | solaris*)
           REPLACE_FSTAT=1 ;;
       esac
       ;;
@@ -78,7 +79,7 @@ AC_DEFUN([gl_PREREQ_STAT], [
 AC_DEFUN([gl_PREREQ_STAT_W32], [
   AC_REQUIRE([AC_CANONICAL_HOST])
   case "$host_os" in
-    mingw*)
+    mingw* | windows*)
       AC_CHECK_HEADERS([sdkddkver.h])
       ;;
   esac
diff --git a/gl/m4/std-gnu11.m4 b/gl/m4/std-gnu11.m4
index 4179470e..37324c15 100644
--- a/gl/m4/std-gnu11.m4
+++ b/gl/m4/std-gnu11.m4
@@ -1,3 +1,6 @@
+# std-gnu11.m4
+# serial 1
+
 # Prefer GNU C11 and C++11 to earlier versions.  -*- coding: utf-8 -*-
 
 # This implementation is taken from GNU Autoconf lib/autoconf/c.m4
@@ -9,7 +12,7 @@
 m4_version_prereq([2.70], [], [
 
 
-# Copyright (C) 2001-2023 Free Software Foundation, Inc.
+# Copyright (C) 2001-2024 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/m4/stdalign.m4 b/gl/m4/stdalign.m4
index dc297175..2b4762f3 100644
--- a/gl/m4/stdalign.m4
+++ b/gl/m4/stdalign.m4
@@ -1,20 +1,24 @@
-# Check for alignas and alignof that conform to C23.
-
-dnl Copyright 2011-2023 Free Software Foundation, Inc.
+# stdalign.m4
+# serial 1
+dnl Copyright 2011-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.
 
+# Check for alignas and alignof that conform to C23.
+
+dnl Written by Paul Eggert and Bruno Haible.
+
 # Prepare for substituting <stdalign.h> if it is not supported.
 
-AC_DEFUN([gl_STDALIGN_H],
+AC_DEFUN([gl_ALIGNASOF],
 [
   AC_CACHE_CHECK([for alignas and alignof],
     [gl_cv_header_working_stdalign_h],
-    [gl_save_CFLAGS=$CFLAGS
+    [gl_saved_CFLAGS=$CFLAGS
      for gl_working in "yes, keywords" "yes, <stdalign.h> macros"; do
       AS_CASE([$gl_working],
-        [*stdalign.h*], [CFLAGS="$gl_save_CFLAGS -DINCLUDE_STDALIGN_H"])
+        [*stdalign.h*], [CFLAGS="$gl_saved_CFLAGS -DINCLUDE_STDALIGN_H"])
       AC_COMPILE_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <stdint.h>
@@ -54,85 +58,151 @@ AC_DEFUN([gl_STDALIGN_H],
        [gl_cv_header_working_stdalign_h=$gl_working],
        [gl_cv_header_working_stdalign_h=no])
 
-      CFLAGS=$gl_save_CFLAGS
+      CFLAGS=$gl_saved_CFLAGS
       test "$gl_cv_header_working_stdalign_h" != no && break
      done])
 
-  GL_GENERATE_STDALIGN_H=false
   AS_CASE([$gl_cv_header_working_stdalign_h],
-    [no],
-      [GL_GENERATE_STDALIGN_H=true],
     [yes*keyword*],
       [AC_DEFINE([HAVE_C_ALIGNASOF], [1],
          [Define to 1 if the alignas and alignof keywords work.])])
 
-  AC_CHECK_HEADERS_ONCE([stdalign.h])
-
   dnl The "zz" puts this toward config.h's end, to avoid potential
   dnl collisions with other definitions.
   AH_VERBATIM([zzalignas],
-[#if !defined HAVE_C_ALIGNASOF && __cplusplus < 201103 && !defined alignof
-# if HAVE_STDALIGN_H
+[#if !defined HAVE_C_ALIGNASOF \
+    && !(defined __cplusplus && 201103 <= __cplusplus) \
+    && !defined alignof
+# if defined HAVE_STDALIGN_H
 #  include <stdalign.h>
-# else
-   /* Substitute.  Keep consistent with gnulib/lib/stdalign.in.h.  */
-#  ifndef _GL_STDALIGN_H
-#   define _GL_STDALIGN_H
-#   undef _Alignas
-#   undef _Alignof
-#   if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
-        || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
-            && !defined __clang__) \
-        || (defined __clang__ && __clang_major__ < 8))
-#    ifdef __cplusplus
-#     if (201103 <= __cplusplus || defined _MSC_VER)
-#      define _Alignof(type) alignof (type)
-#     else
-       template <class __t> struct __alignof_helper { char __a; __t __b; };
-#      define _Alignof(type) offsetof (__alignof_helper<type>, __b)
-#      define _GL_STDALIGN_NEEDS_STDDEF 1
-#     endif
+# endif
+
+/* ISO C23 alignas and alignof for platforms that lack it.
+
+   References:
+   ISO C23 (latest free draft
+   <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n3047.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>)
+   section 18.10. */
+
+/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment
+   requirement of a structure member (i.e., slot or field) that is of
+   type TYPE, as an integer constant expression.
+
+   This differs from GCC's and clang's __alignof__ operator, which can
+   yield a better-performing alignment for an object of that type.  For
+   example, on x86 with GCC and on Linux/x86 with clang,
+   __alignof__ (double) and __alignof__ (long long) are 8, whereas
+   alignof (double) and alignof (long long) are 4 unless the option
+   '-malign-double' is used.
+
+   The result cannot be used as a value for an 'enum' constant, if you
+   want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.  */
+
+/* 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.  */
+#  if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
+       || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
+           && !defined __clang__) \
+       || (defined __clang__ && __clang_major__ < 8))
+#   undef/**/_Alignof
+#   ifdef __cplusplus
+#    if (201103 <= __cplusplus || defined _MSC_VER)
+#     define _Alignof(type) alignof (type)
 #    else
+      template <class __t> struct __alignof_helper { char __a; __t __b; };
 #     if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__
-#      define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b)
+#      define _Alignof(type) __builtin_offsetof (__alignof_helper<type>, __b)
 #     else
-#      define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
-#      define _GL_STDALIGN_NEEDS_STDDEF 1
+#      define _Alignof(type) offsetof (__alignof_helper<type>, __b)
 #     endif
+#     define _GL_STDALIGN_NEEDS_STDDEF 1
 #    endif
-#   endif
-#   if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))
-#    define alignof _Alignof
-#   endif
-#   define __alignof_is_defined 1
-#   if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
-#    if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)
-#     define _Alignas(a) alignas (a)
-#    elif (!defined __attribute__ \
-           && ((defined __APPLE__ && defined __MACH__ \
-                ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
-                : __GNUC__ && !defined __ibmxl__) \
-               || (4 <= __clang_major__) \
-               || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
-               || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__))
-#     define _Alignas(a) __attribute__ ((__aligned__ (a)))
-#    elif 1300 <= _MSC_VER
-#     define _Alignas(a) __declspec (align (a))
+#   else
+#    if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__
+#     define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b)
+#    else
+#     define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
+#     define _GL_STDALIGN_NEEDS_STDDEF 1
 #    endif
 #   endif
-#   if ((defined _Alignas \
-         && !(defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) \
-        || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-#    define alignas _Alignas
-#   endif
-#   if (defined alignas \
-        || (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)))
-#    define __alignas_is_defined 1
-#   endif
-#   if _GL_STDALIGN_NEEDS_STDDEF
-#    include <stddef.h>
-#   endif
-#  endif /* _GL_STDALIGN_H */
+#  endif
+#  if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))
+#   undef/**/alignof
+#   define alignof _Alignof
+#  endif
+
+/* alignas (A), also known as _Alignas (A), aligns a variable or type
+   to the alignment A, where A is an integer constant expression.  For
+   example:
+
+      int alignas (8) foo;
+      struct s { int a; int alignas (8) bar; };
+
+   aligns the address of FOO and the offset of BAR to be multiples of 8.
+
+   A should be a power of two that is at least the type's alignment
+   and at most the implementation's alignment limit.  This limit is
+   2**28 on typical GNUish hosts, and 2**13 on MSVC.  To be portable
+   to MSVC through at least version 10.0, A should be an integer
+   constant, as MSVC does not support expressions such as 1 << 3.
+   To be portable to Sun C 5.11, do not align auto variables to
+   anything stricter than their default alignment.
+
+   The following C23 requirements are not supported here:
+
+     - If A is zero, alignas has no effect.
+     - alignas can be used multiple times; the strictest one wins.
+     - alignas (TYPE) is equivalent to alignas (alignof (TYPE)).
+
+   */
+# if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
+#  if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)
+#   define _Alignas(a) alignas (a)
+#  elif (!defined __attribute__ \
+         && ((defined __APPLE__ && defined __MACH__ \
+              ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
+              : __GNUC__ && !defined __ibmxl__) \
+             || (4 <= __clang_major__) \
+             || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
+             || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__))
+#   define _Alignas(a) __attribute__ ((__aligned__ (a)))
+#  elif 1300 <= _MSC_VER
+#   define _Alignas(a) __declspec (align (a))
+#  endif
+# endif
+# if !defined HAVE_STDALIGN_H
+#  if ((defined _Alignas \
+        && !(defined __cplusplus \
+             && (201103 <= __cplusplus || defined _MSC_VER))) \
+       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
+#   define alignas _Alignas
+#  endif
+# endif
+
+# if defined _GL_STDALIGN_NEEDS_STDDEF
+#  include <stddef.h>
 # endif
 #endif])
 ])
+
+AC_DEFUN([gl_STDALIGN_H],
+[
+  AC_REQUIRE([gl_ALIGNASOF])
+  if test "$gl_cv_header_working_stdalign_h" = no; then
+    GL_GENERATE_STDALIGN_H=true
+  else
+    GL_GENERATE_STDALIGN_H=false
+  fi
+
+  gl_CHECK_NEXT_HEADERS([stdalign.h])
+  if test $ac_cv_header_stdalign_h = yes; then
+    HAVE_STDALIGN_H=1
+  else
+    HAVE_STDALIGN_H=0
+  fi
+  AC_SUBST([HAVE_STDALIGN_H])
+])
diff --git a/gl/m4/stddef_h.m4 b/gl/m4/stddef_h.m4
index a2322ebb..84d3bae8 100644
--- a/gl/m4/stddef_h.m4
+++ b/gl/m4/stddef_h.m4
@@ -1,5 +1,6 @@
-# stddef_h.m4 serial 13
-dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
+# stddef_h.m4
+# serial 14
+dnl Copyright (C) 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.
@@ -68,6 +69,21 @@ AC_DEFUN_ONCE([gl_STDDEF_H],
     GL_GENERATE_STDDEF_H=true
   fi
 
+  AC_CACHE_CHECK([for unreachable],
+    [gl_cv_func_unreachable],
+    [AC_LINK_IFELSE(
+       [AC_LANG_PROGRAM(
+          [[#include <stddef.h>
+          ]],
+          [[unreachable ();
+          ]])],
+       [gl_cv_func_unreachable=yes],
+       [gl_cv_func_unreachable=no])
+    ])
+  if test $gl_cv_func_unreachable = no; then
+    GL_GENERATE_STDDEF_H=true
+  fi
+
   if $GL_GENERATE_STDDEF_H; then
     gl_NEXT_HEADERS([stddef.h])
   fi
diff --git a/gl/m4/stdint.m4 b/gl/m4/stdint.m4
index d6961b09..2dea8469 100644
--- a/gl/m4/stdint.m4
+++ b/gl/m4/stdint.m4
@@ -1,5 +1,6 @@
-# stdint.m4 serial 61
-dnl Copyright (C) 2001-2023 Free Software Foundation, Inc.
+# stdint.m4
+# serial 63
+dnl Copyright (C) 2001-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.
@@ -150,7 +151,10 @@ intmax_t i = INTMAX_MAX;
 uintmax_t j = UINTMAX_MAX;
 
 /* Check that SIZE_MAX has the correct type, if possible.  */
-#if 201112 <= __STDC_VERSION__
+/* ISO C 11 mandates _Generic, but GCC versions < 4.9 lack it.  */
+#if 201112 <= __STDC_VERSION__ \
+    && (!defined __GNUC__ || 4 < __GNUC__ + (9 <= __GNUC_MINOR__) \
+        || defined __clang__)
 int k = _Generic (SIZE_MAX, size_t: 0);
 #elif (2 <= __GNUC__ || 4 <= __clang_major__ || defined __IBM__TYPEOF__ \
        || (0x5110 <= __SUNPRO_C && !__STDC__))
@@ -283,10 +287,10 @@ static const char *macro_values[] =
               [gl_cv_header_working_stdint_h=yes],
               [],
               [case "$host_os" in
-                         # Guess yes on native Windows.
-                 mingw*) gl_cv_header_working_stdint_h="guessing yes" ;;
-                         # In general, assume it works.
-                 *)      gl_cv_header_working_stdint_h="guessing yes" ;;
+                                    # Guess yes on native Windows.
+                 mingw* | windows*) gl_cv_header_working_stdint_h="guessing yes" ;;
+                                    # In general, assume it works.
+                 *)                 gl_cv_header_working_stdint_h="guessing yes" ;;
                esac
               ])
          ])
diff --git a/gl/m4/stdint_h.m4 b/gl/m4/stdint_h.m4
index 70349f6c..29f42160 100644
--- a/gl/m4/stdint_h.m4
+++ b/gl/m4/stdint_h.m4
@@ -1,5 +1,6 @@
-# stdint_h.m4 serial 9
-dnl Copyright (C) 1997-2004, 2006, 2008-2023 Free Software Foundation, Inc.
+# stdint_h.m4
+# serial 9
+dnl Copyright (C) 1997-2004, 2006, 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.
diff --git a/gl/m4/stdio_h.m4 b/gl/m4/stdio_h.m4
index 94271e11..8eb5816a 100644
--- a/gl/m4/stdio_h.m4
+++ b/gl/m4/stdio_h.m4
@@ -1,12 +1,23 @@
-# stdio_h.m4 serial 59
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# stdio_h.m4
+# serial 63
+dnl Copyright (C) 2007-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_ONCE([gl_STDIO_H],
+AC_DEFUN([gl_STDIO_H_EARLY],
 [
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+  dnl Defining __USE_MINGW_ANSI_STDIO to 1 must be done early, because
+  dnl the results of several configure tests depend on it: The tests
+  dnl   - checking whether snprintf returns a byte count as in C99...
+  dnl   - checking whether snprintf truncates the result as in C99...
+  dnl   - checking whether printf supports the 'F' directive...
+  dnl   - checking whether printf supports the grouping flag...
+  dnl   - checking whether printf supports the zero flag correctly...
+  dnl   - checking whether printf supports infinite 'double' arguments...
+  dnl   - checking whether printf supports large precisions...
+  dnl report 'yes' if __USE_MINGW_ANSI_STDIO is 1 but 'no' if
+  dnl __USE_MINGW_ANSI_STDIO is not set.
   AH_VERBATIM([MINGW_ANSI_STDIO],
 [/* Use GNU style printf and scanf.  */
 #ifndef __USE_MINGW_ANSI_STDIO
@@ -14,6 +25,11 @@ AC_DEFUN_ONCE([gl_STDIO_H],
 #endif
 ])
   AC_DEFINE([__USE_MINGW_ANSI_STDIO])
+])
+
+AC_DEFUN_ONCE([gl_STDIO_H],
+[
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   gl_NEXT_HEADERS([stdio.h])
 
   dnl Determine whether __USE_MINGW_ANSI_STDIO makes printf and
@@ -40,6 +56,9 @@ AC_DEFUN_ONCE([gl_STDIO_H],
        attribute "__gnu_printf__" instead of "__printf__"])
   fi
 
+  dnl For defining _PRINTF_NAN_LEN_MAX.
+  gl_MUSL_LIBC
+
   dnl This ifdef is an optimization, to avoid performing a configure check whose
   dnl result is not used. But it does not make the test of
   dnl GNULIB_STDIO_H_NONBLOCKING or GNULIB_NONBLOCKING redundant.
@@ -82,6 +101,16 @@ AC_DEFUN_ONCE([gl_STDIO_H],
   if test $ac_cv_have_decl_fcloseall = no; then
     HAVE_DECL_FCLOSEALL=0
   fi
+
+  AC_CHECK_DECLS_ONCE([getw])
+  if test $ac_cv_have_decl_getw = no; then
+    HAVE_DECL_GETW=0
+  fi
+
+  AC_CHECK_DECLS_ONCE([putw])
+  if test $ac_cv_have_decl_putw = no; then
+    HAVE_DECL_PUTW=0
+  fi
 ])
 
 # gl_STDIO_MODULE_INDICATOR([modulename])
@@ -178,7 +207,9 @@ AC_DEFUN([gl_STDIO_H_DEFAULTS],
   HAVE_DECL_FTELLO=1;            AC_SUBST([HAVE_DECL_FTELLO])
   HAVE_DECL_GETDELIM=1;          AC_SUBST([HAVE_DECL_GETDELIM])
   HAVE_DECL_GETLINE=1;           AC_SUBST([HAVE_DECL_GETLINE])
+  HAVE_DECL_GETW=1;              AC_SUBST([HAVE_DECL_GETW])
   HAVE_DECL_OBSTACK_PRINTF=1;    AC_SUBST([HAVE_DECL_OBSTACK_PRINTF])
+  HAVE_DECL_PUTW=1;              AC_SUBST([HAVE_DECL_PUTW])
   HAVE_DECL_SNPRINTF=1;          AC_SUBST([HAVE_DECL_SNPRINTF])
   HAVE_DECL_VSNPRINTF=1;         AC_SUBST([HAVE_DECL_VSNPRINTF])
   HAVE_DPRINTF=1;                AC_SUBST([HAVE_DPRINTF])
diff --git a/gl/m4/stdlib_h.m4 b/gl/m4/stdlib_h.m4
index e96be22f..a4662f29 100644
--- a/gl/m4/stdlib_h.m4
+++ b/gl/m4/stdlib_h.m4
@@ -1,5 +1,6 @@
-# stdlib_h.m4 serial 66
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# stdlib_h.m4
+# serial 77
+dnl Copyright (C) 2007-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.
@@ -23,15 +24,58 @@ AC_DEFUN_ONCE([gl_STDLIB_H],
 # include <random.h>
 #endif
     ]], [_Exit aligned_alloc atoll canonicalize_file_name free
-    getloadavg getsubopt grantpt
-    initstate initstate_r mbtowc mkdtemp mkostemp mkostemps mkstemp mkstemps
-    posix_memalign posix_openpt ptsname ptsname_r qsort_r
+    getloadavg getprogname getsubopt grantpt
+    initstate initstate_r mbstowcs mbtowc mkdtemp mkostemp mkostemps mkstemp
+    mkstemps posix_memalign posix_openpt ptsname ptsname_r qsort_r
     random random_r reallocarray realpath rpmatch secure_getenv setenv
     setstate setstate_r srandom srandom_r
     strtod strtol strtold strtoll strtoul strtoull unlockpt unsetenv])
 
   AC_REQUIRE([AC_C_RESTRICT])
 
+  dnl Test whether MB_CUR_MAX needs to be overridden.
+  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_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([[
+#include <locale.h>
+#include <stdlib.h>
+int main ()
+{
+  int result = 0;
+  if (setlocale (LC_ALL, "$LOCALE_FR_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
+    ])
+  case "$gl_cv_macro_MB_CUR_MAX_good" in
+    *yes) ;;
+    *) REPLACE_MB_CUR_MAX=1 ;;
+  esac
+
   AC_CHECK_DECLS_ONCE([ecvt])
   if test $ac_cv_have_decl_ecvt = no; then
     HAVE_DECL_ECVT=0
@@ -73,10 +117,12 @@ AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CANONICALIZE_FILE_NAME])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FREE_POSIX])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETLOADAVG])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETPROGNAME])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETSUBOPT])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GRANTPT])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_GNU])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MALLOC_POSIX])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSTOWCS])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBTOWC])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKDTEMP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MKOSTEMP])
@@ -89,6 +135,7 @@ AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PTSNAME_R])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_PUTENV])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_QSORT_R])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RAND])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_RANDOM_R])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_REALLOCARRAY])
@@ -99,6 +146,7 @@ AC_DEFUN([gl_STDLIB_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SECURE_GETENV])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SETENV])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOD])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOF])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOL])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLD])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRTOLL])
@@ -130,6 +178,8 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_DECL_FCVT=1;          AC_SUBST([HAVE_DECL_FCVT])
   HAVE_DECL_GCVT=1;          AC_SUBST([HAVE_DECL_GCVT])
   HAVE_DECL_GETLOADAVG=1;    AC_SUBST([HAVE_DECL_GETLOADAVG])
+  HAVE_DECL_PROGRAM_INVOCATION_NAME=1; AC_SUBST([HAVE_DECL_PROGRAM_INVOCATION_NAME])
+  HAVE_GETPROGNAME=1;        AC_SUBST([HAVE_GETPROGNAME])
   HAVE_GETSUBOPT=1;          AC_SUBST([HAVE_GETSUBOPT])
   HAVE_GRANTPT=1;            AC_SUBST([HAVE_GRANTPT])
   HAVE_INITSTATE=1;          AC_SUBST([HAVE_INITSTATE])
@@ -157,6 +207,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_SETSTATE=1;           AC_SUBST([HAVE_SETSTATE])
   HAVE_DECL_SETSTATE=1;      AC_SUBST([HAVE_DECL_SETSTATE])
   HAVE_STRTOD=1;             AC_SUBST([HAVE_STRTOD])
+  HAVE_STRTOF=1;             AC_SUBST([HAVE_STRTOF])
   HAVE_STRTOL=1;             AC_SUBST([HAVE_STRTOL])
   HAVE_STRTOLD=1;            AC_SUBST([HAVE_STRTOLD])
   HAVE_STRTOLL=1;            AC_SUBST([HAVE_STRTOLL])
@@ -166,21 +217,31 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   HAVE_SYS_LOADAVG_H=0;      AC_SUBST([HAVE_SYS_LOADAVG_H])
   HAVE_UNLOCKPT=1;           AC_SUBST([HAVE_UNLOCKPT])
   HAVE_DECL_UNSETENV=1;      AC_SUBST([HAVE_DECL_UNSETENV])
+  REPLACE__EXIT=0;           AC_SUBST([REPLACE__EXIT])
   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])
   REPLACE_CANONICALIZE_FILE_NAME=0;  AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME])
   REPLACE_FREE=0;            AC_SUBST([REPLACE_FREE])
+  REPLACE_GETLOADAVG=0;      AC_SUBST([REPLACE_GETLOADAVG])
+  REPLACE_GETPROGNAME=0;     AC_SUBST([REPLACE_GETPROGNAME])
+  REPLACE_GETSUBOPT=0;       AC_SUBST([REPLACE_GETSUBOPT])
   REPLACE_INITSTATE=0;       AC_SUBST([REPLACE_INITSTATE])
   REPLACE_MALLOC_FOR_MALLOC_GNU=0;    AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_GNU])
   REPLACE_MALLOC_FOR_MALLOC_POSIX=0;  AC_SUBST([REPLACE_MALLOC_FOR_MALLOC_POSIX])
+  REPLACE_MB_CUR_MAX=0;      AC_SUBST([REPLACE_MB_CUR_MAX])
+  REPLACE_MBSTOWCS=0;        AC_SUBST([REPLACE_MBSTOWCS])
   REPLACE_MBTOWC=0;          AC_SUBST([REPLACE_MBTOWC])
+  REPLACE_MKOSTEMP=0;        AC_SUBST([REPLACE_MKOSTEMP])
+  REPLACE_MKOSTEMPS=0;       AC_SUBST([REPLACE_MKOSTEMPS])
   REPLACE_MKSTEMP=0;         AC_SUBST([REPLACE_MKSTEMP])
   REPLACE_POSIX_MEMALIGN=0;  AC_SUBST([REPLACE_POSIX_MEMALIGN])
+  REPLACE_POSIX_OPENPT=0;    AC_SUBST([REPLACE_POSIX_OPENPT])
   REPLACE_PTSNAME=0;         AC_SUBST([REPLACE_PTSNAME])
   REPLACE_PTSNAME_R=0;       AC_SUBST([REPLACE_PTSNAME_R])
   REPLACE_PUTENV=0;          AC_SUBST([REPLACE_PUTENV])
   REPLACE_QSORT_R=0;         AC_SUBST([REPLACE_QSORT_R])
+  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])
@@ -190,6 +251,7 @@ AC_DEFUN([gl_STDLIB_H_DEFAULTS],
   REPLACE_SETENV=0;          AC_SUBST([REPLACE_SETENV])
   REPLACE_SETSTATE=0;        AC_SUBST([REPLACE_SETSTATE])
   REPLACE_STRTOD=0;          AC_SUBST([REPLACE_STRTOD])
+  REPLACE_STRTOF=0;          AC_SUBST([REPLACE_STRTOF])
   REPLACE_STRTOL=0;          AC_SUBST([REPLACE_STRTOL])
   REPLACE_STRTOLD=0;         AC_SUBST([REPLACE_STRTOLD])
   REPLACE_STRTOLL=0;         AC_SUBST([REPLACE_STRTOLL])
diff --git a/gl/m4/strcase.m4 b/gl/m4/strcase.m4
index 3cf740d2..63021733 100644
--- a/gl/m4/strcase.m4
+++ b/gl/m4/strcase.m4
@@ -1,5 +1,6 @@
-# strcase.m4 serial 12
-dnl Copyright (C) 2002, 2005-2023 Free Software Foundation, Inc.
+# strcase.m4
+# serial 12
+dnl Copyright (C) 2002, 2005-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.
diff --git a/gl/m4/strcasestr.m4 b/gl/m4/strcasestr.m4
index 971e0b23..d2548716 100644
--- a/gl/m4/strcasestr.m4
+++ b/gl/m4/strcasestr.m4
@@ -1,5 +1,6 @@
-# strcasestr.m4 serial 28
-dnl Copyright (C) 2005, 2007-2023 Free Software Foundation, Inc.
+# strcasestr.m4
+# serial 28
+dnl Copyright (C) 2005, 2007-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.
diff --git a/gl/m4/strerror.m4 b/gl/m4/strerror.m4
index 8879eb08..0272c6f4 100644
--- a/gl/m4/strerror.m4
+++ b/gl/m4/strerror.m4
@@ -1,5 +1,6 @@
-# strerror.m4 serial 23
-dnl Copyright (C) 2002, 2007-2023 Free Software Foundation, Inc.
+# strerror.m4
+# serial 25
+dnl Copyright (C) 2002, 2007-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.
@@ -24,12 +25,12 @@ AC_DEFUN([gl_FUNC_STRERROR],
         [gl_cv_func_working_strerror=yes],
         [gl_cv_func_working_strerror=no],
         [case "$host_os" in
-                          # Guess yes on glibc systems.
-           *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;;
-                          # Guess yes on musl systems.
-           *-musl*)       gl_cv_func_working_strerror="guessing yes" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-           *)             gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
+                               # Guess yes on glibc systems.
+           *-gnu* | gnu*)      gl_cv_func_working_strerror="guessing yes" ;;
+                               # Guess yes on musl systems.
+           *-musl* | midipix*) gl_cv_func_working_strerror="guessing yes" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_working_strerror="$gl_cross_guess_normal" ;;
          esac
         ])
     ])
@@ -80,14 +81,14 @@ AC_DEFUN([gl_FUNC_STRERROR_0],
       [gl_cv_func_strerror_0_works=yes],
       [gl_cv_func_strerror_0_works=no],
       [case "$host_os" in
-                        # Guess yes on glibc systems.
-         *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # Guess yes on musl systems.
-         *-musl*)       gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # Guess yes on native Windows.
-         mingw*)        gl_cv_func_strerror_0_works="guessing yes" ;;
-                        # If we don't know, obey --enable-cross-guesses.
-         *)             gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
+                             # Guess yes on glibc systems.
+         *-gnu* | gnu*)      gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # Guess yes on musl systems.
+         *-musl* | midipix*) gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # Guess yes on native Windows.
+         mingw* | windows*)  gl_cv_func_strerror_0_works="guessing yes" ;;
+                             # If we don't know, obey --enable-cross-guesses.
+         *)                  gl_cv_func_strerror_0_works="$gl_cross_guess_normal" ;;
        esac
       ])
   ])
diff --git a/gl/m4/string_h.m4 b/gl/m4/string_h.m4
index 5da3cc25..f31264ae 100644
--- a/gl/m4/string_h.m4
+++ b/gl/m4/string_h.m4
@@ -1,11 +1,11 @@
-# Configure a GNU-like replacement for <string.h>.
-
-# Copyright (C) 2007-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# string_h.m4
+# serial 39
+dnl Copyright (C) 2007-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.
 
-# serial 35
+# Configure a GNU-like replacement for <string.h>.
 
 # Written by Paul Eggert.
 
@@ -131,6 +131,9 @@ AC_DEFUN([gl_STRING_H_DEFAULTS],
   REPLACE_FFSLL=0;              AC_SUBST([REPLACE_FFSLL])
   REPLACE_MEMCHR=0;             AC_SUBST([REPLACE_MEMCHR])
   REPLACE_MEMMEM=0;             AC_SUBST([REPLACE_MEMMEM])
+  REPLACE_MEMPCPY=0;            AC_SUBST([REPLACE_MEMPCPY])
+  REPLACE_MEMSET_EXPLICIT=0;    AC_SUBST([REPLACE_MEMSET_EXPLICIT])
+  REPLACE_STPCPY=0;             AC_SUBST([REPLACE_STPCPY])
   REPLACE_STPNCPY=0;            AC_SUBST([REPLACE_STPNCPY])
   REPLACE_STRCHRNUL=0;          AC_SUBST([REPLACE_STRCHRNUL])
   REPLACE_STRDUP=0;             AC_SUBST([REPLACE_STRDUP])
@@ -144,5 +147,6 @@ AC_DEFUN([gl_STRING_H_DEFAULTS],
   REPLACE_STRERROR_R=0;         AC_SUBST([REPLACE_STRERROR_R])
   REPLACE_STRERRORNAME_NP=0;    AC_SUBST([REPLACE_STRERRORNAME_NP])
   REPLACE_STRSIGNAL=0;          AC_SUBST([REPLACE_STRSIGNAL])
+  REPLACE_STRVERSCMP=0;         AC_SUBST([REPLACE_STRVERSCMP])
   UNDEFINE_STRTOK_R=0;          AC_SUBST([UNDEFINE_STRTOK_R])
 ])
diff --git a/gl/m4/strings_h.m4 b/gl/m4/strings_h.m4
index 4c41221b..aaafb559 100644
--- a/gl/m4/strings_h.m4
+++ b/gl/m4/strings_h.m4
@@ -1,10 +1,11 @@
-# Configure a replacement for <strings.h>.
+# strings_h.m4
 # serial 9
+dnl Copyright (C) 2007, 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.
 
-# Copyright (C) 2007, 2009-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Configure a replacement for <strings.h>.
 
 AC_DEFUN_ONCE([gl_STRINGS_H],
 [
diff --git a/gl/m4/strsep.m4 b/gl/m4/strsep.m4
index e0da09a3..cfde87a5 100644
--- a/gl/m4/strsep.m4
+++ b/gl/m4/strsep.m4
@@ -1,5 +1,6 @@
-# strsep.m4 serial 11
-dnl Copyright (C) 2002-2004, 2007, 2009-2023 Free Software Foundation, Inc.
+# strsep.m4
+# serial 11
+dnl Copyright (C) 2002-2004, 2007, 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.
diff --git a/gl/m4/strstr.m4 b/gl/m4/strstr.m4
index 7de203a7..957ed2e3 100644
--- a/gl/m4/strstr.m4
+++ b/gl/m4/strstr.m4
@@ -1,5 +1,6 @@
-# strstr.m4 serial 24
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# strstr.m4
+# serial 24
+dnl Copyright (C) 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.
diff --git a/gl/m4/sys_socket_h.m4 b/gl/m4/sys_socket_h.m4
index 98a10416..3bf3cb47 100644
--- a/gl/m4/sys_socket_h.m4
+++ b/gl/m4/sys_socket_h.m4
@@ -1,5 +1,6 @@
-# sys_socket_h.m4 serial 29
-dnl Copyright (C) 2005-2023 Free Software Foundation, Inc.
+# sys_socket_h.m4
+# serial 29
+dnl Copyright (C) 2005-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.
diff --git a/gl/m4/sys_stat_h.m4 b/gl/m4/sys_stat_h.m4
index ca57398a..3cc50ce6 100644
--- a/gl/m4/sys_stat_h.m4
+++ b/gl/m4/sys_stat_h.m4
@@ -1,5 +1,6 @@
-# sys_stat_h.m4 serial 42   -*- Autoconf -*-
-dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
+# sys_stat_h.m4
+# serial 42   -*- Autoconf -*-
+dnl Copyright (C) 2006-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.
diff --git a/gl/m4/sys_types_h.m4 b/gl/m4/sys_types_h.m4
index 627671fb..00d2437b 100644
--- a/gl/m4/sys_types_h.m4
+++ b/gl/m4/sys_types_h.m4
@@ -1,5 +1,6 @@
-# sys_types_h.m4 serial 13
-dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
+# sys_types_h.m4
+# serial 13
+dnl Copyright (C) 2011-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.
diff --git a/gl/m4/sys_uio_h.m4 b/gl/m4/sys_uio_h.m4
index 93a65d26..a471c720 100644
--- a/gl/m4/sys_uio_h.m4
+++ b/gl/m4/sys_uio_h.m4
@@ -1,5 +1,6 @@
-# sys_uio_h.m4 serial 3
-dnl Copyright (C) 2011-2023 Free Software Foundation, Inc.
+# sys_uio_h.m4
+# serial 3
+dnl Copyright (C) 2011-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.
diff --git a/gl/m4/threadlib.m4 b/gl/m4/threadlib.m4
index b536b047..f5e81479 100644
--- a/gl/m4/threadlib.m4
+++ b/gl/m4/threadlib.m4
@@ -1,5 +1,6 @@
-# threadlib.m4 serial 32a
-dnl Copyright (C) 2005-2023 Free Software Foundation, Inc.
+# threadlib.m4
+# serial 42
+dnl Copyright (C) 2005-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.
@@ -85,10 +86,11 @@ AC_DEFUN([gl_WEAK_SYMBOLS],
   AC_CACHE_CHECK([whether imported symbols can be declared weak],
     [gl_cv_have_weak],
     [case "$host_os" in
-       cygwin*)
-         dnl On Cygwin 3.2.0 with gcc 10.2, the test below would succeed, but
-         dnl programs that use pthread_in_use() with weak symbol references
-         dnl crash miserably at runtime.
+       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"
          ;;
        *)
@@ -174,7 +176,7 @@ dnl Sets the variable LIBPMULTITHREAD, for programs that really need
 dnl multithread functionality. The difference between LIBPTHREAD and
 dnl LIBPMULTITHREAD is that on platforms supporting weak symbols, typically
 dnl LIBPTHREAD is empty whereas LIBPMULTITHREAD is not.
-dnl Sets the variable LIB_SCHED_YIELD to the linker options needed to use the
+dnl Sets the variable SCHED_YIELD_LIB to the linker options needed to use the
 dnl sched_yield() function.
 dnl Adds to CPPFLAGS the flag -D_REENTRANT or -D_THREAD_SAFE if needed for
 dnl multithread-safe programs.
@@ -205,7 +207,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
       # If -pthread works, prefer it to -lpthread, since Ubuntu 14.04
       # needs -pthread for some reason.  See:
       # https://lists.gnu.org/r/bug-gnulib/2014-09/msg00023.html
-      save_LIBS=$LIBS
+      saved_LIBS="$LIBS"
       for gl_pthread in '' '-pthread'; do
         LIBS="$LIBS $gl_pthread"
         AC_LINK_IFELSE(
@@ -219,7 +221,7 @@ AC_DEFUN([gl_PTHREADLIB_BODY],
           [gl_pthread_api=yes
            LIBPTHREAD=$gl_pthread
            LIBPMULTITHREAD=$gl_pthread])
-        LIBS=$save_LIBS
+        LIBS="$saved_LIBS"
         test $gl_pthread_api = yes && break
       done
       echo "$as_me:__oline__: gl_pthread_api=$gl_pthread_api" >&AS_MESSAGE_LOG_FD
@@ -268,6 +270,15 @@ changequote([,])dnl
                    [Define if the pthread_in_use() detection is hard.])
              esac
            fi
+          ],
+          [dnl This is needed on FreeBSD 5.2.1.
+           AC_CHECK_LIB([thr], [pthread_kill],
+             [if test $gl_pthread_in_glibc = yes; then
+                LIBPMULTITHREAD=
+              else
+                LIBPMULTITHREAD=-lthr
+              fi
+             ])
           ])
       elif test $gl_pthread_api != yes; then
         # Some library is needed. Try libpthread and libc_r.
@@ -299,13 +310,16 @@ changequote([,])dnl
       [AC_LANG_PROGRAM(
          [[#include <sched.h>]],
          [[sched_yield ();]])],
-      [LIB_SCHED_YIELD=
+      [SCHED_YIELD_LIB=
       ],
       [dnl Solaris 7...10 has sched_yield in librt, not in libpthread or libc.
-       AC_CHECK_LIB([rt], [sched_yield], [LIB_SCHED_YIELD=-lrt],
+       AC_CHECK_LIB([rt], [sched_yield], [SCHED_YIELD_LIB=-lrt],
          [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt.
-          AC_CHECK_LIB([posix4], [sched_yield], [LIB_SCHED_YIELD=-lposix4])])
+          AC_CHECK_LIB([posix4], [sched_yield], [SCHED_YIELD_LIB=-lposix4])])
       ])
+    AC_SUBST([SCHED_YIELD_LIB])
+    dnl For backward compatibility.
+    LIB_SCHED_YIELD="$SCHED_YIELD_LIB"
     AC_SUBST([LIB_SCHED_YIELD])
 
     gl_pthreadlib_body_done=done
@@ -340,7 +354,7 @@ AC_DEFUN([gl_STDTHREADLIB_BODY],
     AC_CHECK_HEADERS_ONCE([threads.h])
 
     case "$host_os" in
-      mingw*)
+      mingw* | windows*)
         LIBSTDTHREAD=
         ;;
       *)
@@ -351,7 +365,7 @@ AC_DEFUN([gl_STDTHREADLIB_BODY],
           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.
-          AC_CHECK_FUNCS([thrd_create])
+          gl_CHECK_FUNCS_ANDROID([thrd_create], [[#include <threads.h>]])
           if test $ac_cv_func_thrd_create = yes; then
             LIBSTDTHREAD=
           else
@@ -364,7 +378,7 @@ AC_DEFUN([gl_STDTHREADLIB_BODY],
           fi
         else
           dnl Libraries needed by thrd.c, mtx.c, cnd.c, tss.c.
-          LIBSTDTHREAD="$LIBPMULTITHREAD $LIB_SCHED_YIELD"
+          LIBSTDTHREAD="$LIBPMULTITHREAD $SCHED_YIELD_LIB"
         fi
         ;;
     esac
@@ -435,10 +449,12 @@ 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=])])
-  m4_divert_text([DEFAULTS], [gl_use_winpthreads_default=])
+  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],
-AS_HELP_STRING([--enable-threads={isoc|posix|isoc+posix|windows}], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
-AS_HELP_STRING([--disable-threads], [build without multithread safety])]),
+AS_HELP_STRING([[--enable-threads={isoc|posix|isoc+posix|windows}]], [specify multithreading API])m4_ifdef([gl_THREADLIB_DEFAULT_NO], [], [
+AS_HELP_STRING([[--disable-threads]], [build without multithread safety])]),
     [gl_use_threads=$enableval],
     [if test -n "$gl_use_threads_default"; then
        gl_use_threads="$gl_use_threads_default"
@@ -459,7 +475,7 @@ changequote(,)dnl
                esac
                ;;
          dnl Obey gl_AVOID_WINPTHREAD on mingw.
-         mingw*)
+         mingw* | windows*)
                case "$gl_use_winpthreads_default" in
                  yes) gl_use_threads=posix ;;
                  no)  gl_use_threads=windows ;;
@@ -558,7 +574,7 @@ AC_DEFUN([gl_THREADLIB_BODY],
       case "$gl_use_threads" in
         yes | windows | win32) # The 'win32' is for backward compatibility.
           if { case "$host_os" in
-                 mingw*) true;;
+                 mingw* | windows*) true;;
                  *) false;;
                esac
              }; then
@@ -569,6 +585,10 @@ AC_DEFUN([gl_THREADLIB_BODY],
           ;;
       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
   AC_MSG_CHECKING([for multithread API to use])
   AC_MSG_RESULT([$gl_threads_api])
@@ -601,7 +621,8 @@ 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'.
+dnl configure option '--enable-threads=posix'.
+dnl As of 2023, this is now the default.
 
 AC_DEFUN([gl_AVOID_WINPTHREAD], [
   m4_divert_text([INIT_PREPARE], [gl_use_winpthreads_default=no])
diff --git a/gl/m4/time_h.m4 b/gl/m4/time_h.m4
index f6bf3a4f..d2f3c970 100644
--- a/gl/m4/time_h.m4
+++ b/gl/m4/time_h.m4
@@ -1,12 +1,11 @@
-# Configure a more-standard replacement for <time.h>.
-
-# Copyright (C) 2000-2001, 2003-2007, 2009-2023 Free Software Foundation, Inc.
-
-# serial 20
+# time_h.m4
+# serial 25
+dnl Copyright (C) 2000-2001, 2003-2007, 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.
 
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# Configure a more-standard replacement for <time.h>.
 
 # Written by Paul Eggert and Jim Meyering.
 
@@ -23,7 +22,10 @@ AC_DEFUN_ONCE([gl_TIME_H],
   dnl corresponding gnulib module is not in use.
   gl_WARN_ON_USE_PREPARE([[
 #include <time.h>
-    ]], [asctime_r ctime_r])
+    ]], [
+      asctime asctime_r ctime ctime_r gmtime_r localtime localtime_r mktime
+      nanosleep strftime strptime time timegm timespec_get timespec_getres tzset
+    ])
 
   AC_REQUIRE([AC_C_RESTRICT])
 
@@ -137,6 +139,7 @@ AC_DEFUN([gl_TIME_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NANOSLEEP])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRFTIME])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STRPTIME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIME])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMEGM])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GET])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TIMESPEC_GETRES])
@@ -161,23 +164,16 @@ AC_DEFUN([gl_TIME_H_DEFAULTS],
   HAVE_TIMESPEC_GETRES=1;                AC_SUBST([HAVE_TIMESPEC_GETRES])
   dnl Even GNU libc does not have timezone_t yet.
   HAVE_TIMEZONE_T=0;                     AC_SUBST([HAVE_TIMEZONE_T])
-  dnl If another module says to replace or to not replace, do that.
-  dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
-  dnl this lets maintainers check for portability.
-  REPLACE_CTIME=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_CTIME])
-  REPLACE_LOCALTIME_R=GNULIB_PORTCHECK;  AC_SUBST([REPLACE_LOCALTIME_R])
-  REPLACE_MKTIME=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_MKTIME])
-  REPLACE_NANOSLEEP=GNULIB_PORTCHECK;    AC_SUBST([REPLACE_NANOSLEEP])
-  REPLACE_STRFTIME=GNULIB_PORTCHECK;     AC_SUBST([REPLACE_STRFTIME])
-  REPLACE_TIMEGM=GNULIB_PORTCHECK;       AC_SUBST([REPLACE_TIMEGM])
-  REPLACE_TZSET=GNULIB_PORTCHECK;        AC_SUBST([REPLACE_TZSET])
-
-  dnl Hack so that the time module doesn't depend on the sys_time module.
-  dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent.
-  : ${GNULIB_GETTIMEOFDAY=0};            AC_SUBST([GNULIB_GETTIMEOFDAY])
-  dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME
-  dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier
-  dnl is no longer a big deal.
+  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_MKTIME=0;                      AC_SUBST([REPLACE_MKTIME])
+  REPLACE_NANOSLEEP=0;                   AC_SUBST([REPLACE_NANOSLEEP])
+  REPLACE_STRFTIME=0;                    AC_SUBST([REPLACE_STRFTIME])
+  REPLACE_TIME=0;                        AC_SUBST([REPLACE_TIME])
+  REPLACE_TIMEGM=0;                      AC_SUBST([REPLACE_TIMEGM])
+  REPLACE_TIMESPEC_GET=0;                AC_SUBST([REPLACE_TIMESPEC_GET])
+  REPLACE_TIMESPEC_GETRES=0;             AC_SUBST([REPLACE_TIMESPEC_GETRES])
+  REPLACE_TZSET=0;                       AC_SUBST([REPLACE_TZSET])
 ])
diff --git a/gl/m4/time_r.m4 b/gl/m4/time_r.m4
index adce438a..3675390e 100644
--- a/gl/m4/time_r.m4
+++ b/gl/m4/time_r.m4
@@ -1,10 +1,12 @@
-dnl Reentrant time functions: localtime_r, gmtime_r.
-
-dnl Copyright (C) 2003, 2006-2023 Free Software Foundation, Inc.
+# time_r.m4
+# serial 1
+dnl Copyright (C) 2003, 2006-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 Reentrant time functions: localtime_r, gmtime_r.
+
 dnl Written by Paul Eggert.
 
 AC_DEFUN([gl_TIME_R],
@@ -57,9 +59,7 @@ AC_DEFUN([gl_TIME_R],
          [gl_cv_time_r_posix=yes],
          [gl_cv_time_r_posix=no])
       ])
-    if test $gl_cv_time_r_posix = yes; then
-      REPLACE_LOCALTIME_R=0
-    else
+    if test $gl_cv_time_r_posix != yes; then
       REPLACE_LOCALTIME_R=1
     fi
   else
diff --git a/gl/m4/timegm.m4 b/gl/m4/timegm.m4
index 6079f1a3..c1ff2677 100644
--- a/gl/m4/timegm.m4
+++ b/gl/m4/timegm.m4
@@ -1,5 +1,6 @@
-# timegm.m4 serial 13
-dnl Copyright (C) 2003, 2007, 2009-2023 Free Software Foundation, Inc.
+# timegm.m4
+# serial 16
+dnl Copyright (C) 2003, 2007, 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.
@@ -8,8 +9,7 @@ AC_DEFUN([gl_FUNC_TIMEGM],
 [
   AC_REQUIRE([gl_TIME_H_DEFAULTS])
   AC_REQUIRE([gl_FUNC_MKTIME_WORKS])
-  REPLACE_TIMEGM=0
-  AC_CHECK_FUNCS_ONCE([timegm])
+  gl_CHECK_FUNCS_ANDROID([timegm], [[#include <time.h>]])
   if test $ac_cv_func_timegm = yes; then
     if test "$gl_cv_func_working_mktime" != yes; then
       # Assume that timegm is buggy if mktime is.
@@ -17,6 +17,9 @@ AC_DEFUN([gl_FUNC_TIMEGM],
     fi
   else
     HAVE_TIMEGM=0
+    case "$gl_cv_onwards_func_timegm" in
+      future*) REPLACE_TIMEGM=1 ;;
+    esac
   fi
 ])
 
diff --git a/gl/m4/ungetc.m4 b/gl/m4/ungetc.m4
index 8977a346..42f7ec32 100644
--- a/gl/m4/ungetc.m4
+++ b/gl/m4/ungetc.m4
@@ -1,5 +1,6 @@
-# ungetc.m4 serial 10
-dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
+# ungetc.m4
+# serial 12
+dnl Copyright (C) 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.
@@ -42,16 +43,16 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS],
           ]])],
         [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no],
         [case "$host_os" in
-                          # Guess yes on glibc systems.
-           *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;;
-                          # Guess yes on musl systems.
-           *-musl*)       gl_cv_func_ungetc_works="guessing yes" ;;
-                          # Guess yes on bionic systems.
-           *-android*)    gl_cv_func_ungetc_works="guessing yes" ;;
-                          # Guess yes on native Windows.
-           mingw*)        gl_cv_func_ungetc_works="guessing yes" ;;
-                          # If we don't know, obey --enable-cross-guesses.
-           *)             gl_cv_func_ungetc_works="$gl_cross_guess_normal" ;;
+                               # Guess yes on glibc systems.
+           *-gnu* | gnu*)      gl_cv_func_ungetc_works="guessing yes" ;;
+                               # Guess yes on musl systems.
+           *-musl* | midipix*) gl_cv_func_ungetc_works="guessing yes" ;;
+                               # Guess yes on bionic systems.
+           *-android*)         gl_cv_func_ungetc_works="guessing yes" ;;
+                               # Guess yes on native Windows.
+           mingw* | windows*)  gl_cv_func_ungetc_works="guessing yes" ;;
+                               # If we don't know, obey --enable-cross-guesses.
+           *)                  gl_cv_func_ungetc_works="$gl_cross_guess_normal" ;;
          esac
         ])
     ])
diff --git a/gl/m4/unistd_h.m4 b/gl/m4/unistd_h.m4
index f4384027..81d1b9f6 100644
--- a/gl/m4/unistd_h.m4
+++ b/gl/m4/unistd_h.m4
@@ -1,5 +1,6 @@
-# unistd_h.m4 serial 90
-dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
+# unistd_h.m4
+# serial 95
+dnl Copyright (C) 2006-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.
@@ -225,6 +226,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_COPY_FILE_RANGE=0;         AC_SUBST([REPLACE_COPY_FILE_RANGE])
   REPLACE_DUP=0;                     AC_SUBST([REPLACE_DUP])
   REPLACE_DUP2=0;                    AC_SUBST([REPLACE_DUP2])
+  REPLACE_DUP3=0;                    AC_SUBST([REPLACE_DUP3])
   REPLACE_EXECL=0;                   AC_SUBST([REPLACE_EXECL])
   REPLACE_EXECLE=0;                  AC_SUBST([REPLACE_EXECLE])
   REPLACE_EXECLP=0;                  AC_SUBST([REPLACE_EXECLP])
@@ -233,11 +235,14 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_EXECVP=0;                  AC_SUBST([REPLACE_EXECVP])
   REPLACE_EXECVPE=0;                 AC_SUBST([REPLACE_EXECVPE])
   REPLACE_FACCESSAT=0;               AC_SUBST([REPLACE_FACCESSAT])
+  REPLACE_FCHDIR=0;                  AC_SUBST([REPLACE_FCHDIR])
   REPLACE_FCHOWNAT=0;                AC_SUBST([REPLACE_FCHOWNAT])
+  REPLACE_FDATASYNC=0;               AC_SUBST([REPLACE_FDATASYNC])
   REPLACE_FTRUNCATE=0;               AC_SUBST([REPLACE_FTRUNCATE])
   REPLACE_GETCWD=0;                  AC_SUBST([REPLACE_GETCWD])
   REPLACE_GETDOMAINNAME=0;           AC_SUBST([REPLACE_GETDOMAINNAME])
   REPLACE_GETDTABLESIZE=0;           AC_SUBST([REPLACE_GETDTABLESIZE])
+  REPLACE_GETENTROPY=0;              AC_SUBST([REPLACE_GETENTROPY])
   REPLACE_GETLOGIN_R=0;              AC_SUBST([REPLACE_GETLOGIN_R])
   REPLACE_GETGROUPS=0;               AC_SUBST([REPLACE_GETGROUPS])
   REPLACE_GETPAGESIZE=0;             AC_SUBST([REPLACE_GETPAGESIZE])
@@ -248,12 +253,14 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS],
   REPLACE_LINK=0;                    AC_SUBST([REPLACE_LINK])
   REPLACE_LINKAT=0;                  AC_SUBST([REPLACE_LINKAT])
   REPLACE_LSEEK=0;                   AC_SUBST([REPLACE_LSEEK])
+  REPLACE_PIPE2=0;                   AC_SUBST([REPLACE_PIPE2])
   REPLACE_PREAD=0;                   AC_SUBST([REPLACE_PREAD])
   REPLACE_PWRITE=0;                  AC_SUBST([REPLACE_PWRITE])
   REPLACE_READ=0;                    AC_SUBST([REPLACE_READ])
   REPLACE_READLINK=0;                AC_SUBST([REPLACE_READLINK])
   REPLACE_READLINKAT=0;              AC_SUBST([REPLACE_READLINKAT])
   REPLACE_RMDIR=0;                   AC_SUBST([REPLACE_RMDIR])
+  REPLACE_SETHOSTNAME=0;             AC_SUBST([REPLACE_SETHOSTNAME])
   REPLACE_SLEEP=0;                   AC_SUBST([REPLACE_SLEEP])
   REPLACE_SYMLINK=0;                 AC_SUBST([REPLACE_SYMLINK])
   REPLACE_SYMLINKAT=0;               AC_SUBST([REPLACE_SYMLINKAT])
diff --git a/gl/m4/unlocked-io.m4 b/gl/m4/unlocked-io.m4
index 407c0bac..e96cf5f8 100644
--- a/gl/m4/unlocked-io.m4
+++ b/gl/m4/unlocked-io.m4
@@ -1,10 +1,9 @@
-# unlocked-io.m4 serial 16
-
-# Copyright (C) 1998-2006, 2009-2023 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# unlocked-io.m4
+# serial 16
+dnl Copyright (C) 1998-2006, 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.
 
 dnl From Jim Meyering.
 dnl
diff --git a/gl/m4/vararrays.m4 b/gl/m4/vararrays.m4
index fd6230c2..9211f69d 100644
--- a/gl/m4/vararrays.m4
+++ b/gl/m4/vararrays.m4
@@ -1,13 +1,13 @@
-# Check for variable-length arrays.
-
+# vararrays.m4
 # serial 6
+dnl Copyright (C) 2001, 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.
 
-# From Paul Eggert
+# Check for variable-length arrays.
 
-# Copyright (C) 2001, 2009-2023 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+# From Paul Eggert
 
 m4_version_prereq([2.70], [], [
 
diff --git a/gl/m4/vasnprintf.m4 b/gl/m4/vasnprintf.m4
index 6361c843..1ea2055e 100644
--- a/gl/m4/vasnprintf.m4
+++ b/gl/m4/vasnprintf.m4
@@ -1,5 +1,6 @@
-# vasnprintf.m4 serial 38
-dnl Copyright (C) 2002-2004, 2006-2023 Free Software Foundation, Inc.
+# vasnprintf.m4
+# serial 52
+dnl Copyright (C) 2002-2004, 2006-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.
@@ -29,6 +30,15 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF],
   gl_PREREQ_ASNPRINTF
 ])
 
+AC_DEFUN([gl_FUNC_VASNWPRINTF],
+[
+  AC_LIBOBJ([printf-args])
+  gl_PREREQ_PRINTF_ARGS
+  gl_PREREQ_PRINTF_PARSE
+  gl_PREREQ_VASNWPRINTF
+  gl_PREREQ_ASNPRINTF
+])
+
 # Prerequisites of lib/printf-args.h, lib/printf-args.c.
 AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 [
@@ -37,6 +47,7 @@ AC_DEFUN([gl_PREREQ_PRINTF_ARGS],
 ])
 
 # Prerequisites of lib/printf-parse.h, lib/printf-parse.c.
+# Prerequisites of lib/wprintf-parse.h, lib/wprintf-parse.c.
 AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
 [
   AC_REQUIRE([gl_FEATURES_H])
@@ -50,19 +61,13 @@ AC_DEFUN([gl_PREREQ_PRINTF_PARSE],
   AC_REQUIRE([gt_AC_TYPE_INTMAX_T])
 ])
 
-# Prerequisites of lib/vasnprintf.c.
+# Prerequisites of lib/vasnprintf.c if !WIDE_CHAR_VERSION.
 AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
 [
-  AC_REQUIRE([AC_FUNC_ALLOCA])
-  AC_REQUIRE([gt_TYPE_WCHAR_T])
-  AC_REQUIRE([gt_TYPE_WINT_T])
-  AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
+  AC_CHECK_FUNCS([snprintf strnlen wcrtomb])
   dnl Use the _snprintf function only if it is declared (because on NetBSD it
   dnl is defined as a weak alias of snprintf; we prefer to use the latter).
   AC_CHECK_DECLS([_snprintf], , , [[#include <stdio.h>]])
-  dnl Knowing DBL_EXPBIT0_WORD and DBL_EXPBIT0_BIT enables an optimization
-  dnl in the code for NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE.
-  AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION])
   dnl We can avoid a lot of code by assuming that snprintf's return value
   dnl conforms to ISO C99. So check that.
   AC_REQUIRE([gl_SNPRINTF_RETVAL_C99])
@@ -84,6 +89,108 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF],
          terminated.])
       ;;
   esac
+  gl_PREREQ_VASNXPRINTF
+])
+
+# Prerequisites of lib/vasnwprintf.c.
+AC_DEFUN_ONCE([gl_PREREQ_VASNWPRINTF],
+[
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_CHECK_FUNCS_ONCE([swprintf wcsnlen mbrtowc])
+  AC_CHECK_DECLS([_snwprintf], , , [[#include <stdio.h>]])
+  AC_CHECK_DECLS([wcsnlen], , , [[#include <wchar.h>]])
+  gl_SWPRINTF_WORKS
+  case "$gl_cv_func_swprintf_works" in
+    *yes)
+      AC_DEFINE([HAVE_WORKING_SWPRINTF], [1],
+        [Define if the swprintf function works correctly when it produces output
+         that contains null wide characters.])
+      ;;
+  esac
+  gl_MBRTOWC_C_LOCALE
+  case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in
+    *yes)
+      AC_CACHE_CHECK([whether swprintf in the C locale is free of encoding errors],
+        [gl_cv_func_swprintf_C_locale_sans_EILSEQ],
+        [
+          AC_RUN_IFELSE(
+            [AC_LANG_SOURCE([[
+#ifndef __USE_MINGW_ANSI_STDIO
+# define __USE_MINGW_ANSI_STDIO 1
+#endif
+#include <stdio.h>
+#include <wchar.h>
+int main()
+{
+  int result = 0;
+  { /* This test fails on glibc 2.35, musl libc 1.2.4, FreeBSD 13.2, NetBSD 9.3,
+       OpenBSD 7.2, Cygwin 2.9.0.
+       Reported at <https://www.openwall.com/lists/musl/2023/06/12/2>.  */
+    wchar_t buf[12];
+    int ret = swprintf (buf, 12, L"%c", '\377');
+    if (ret < 0)
+      result |= 1;
+  }
+  return result;
+}]])],
+            [gl_cv_func_swprintf_C_locale_sans_EILSEQ=yes],
+            [gl_cv_func_swprintf_C_locale_sans_EILSEQ=no],
+            [case "$host_os" in
+                                   # Guess no on glibc systems.
+               *-gnu* | gnu*)      gl_cv_func_swprintf_C_locale_sans_EILSEQ="guessing yes";;
+                                   # Guess no on musl systems.
+               *-musl* | midipix*) gl_cv_func_swprintf_C_locale_sans_EILSEQ="guessing no";;
+                                   # If we don't know, obey --enable-cross-guesses.
+               *)                  gl_cv_func_swprintf_C_locale_sans_EILSEQ="$gl_cross_guess_normal";;
+             esac
+            ])
+        ])
+      ;;
+  esac
+  if case "$gl_cv_func_mbrtowc_C_locale_sans_EILSEQ" in
+       *yes) false ;;
+       *) true ;;
+     esac \
+     || case "$gl_cv_func_swprintf_C_locale_sans_EILSEQ" in
+          *yes) false ;;
+          *) true ;;
+        esac; then
+    AC_DEFINE([NEED_WPRINTF_DIRECTIVE_C], [1],
+      [Define if the vasnwprintf implementation needs special code for
+       the 'c' directive.])
+  fi
+  gl_SWPRINTF_DIRECTIVE_LA
+  case "$gl_cv_func_swprintf_directive_la" in
+    *yes) ;;
+    *)
+      AC_DEFINE([NEED_WPRINTF_DIRECTIVE_LA], [1],
+        [Define if the vasnwprintf implementation needs special code for
+         the 'a' directive with 'long double' arguments.])
+      ;;
+  esac
+  gl_SWPRINTF_DIRECTIVE_LC
+  case "$gl_cv_func_swprintf_directive_lc" in
+    *yes) ;;
+    *)
+      AC_DEFINE([NEED_WPRINTF_DIRECTIVE_LC], [1],
+        [Define if the vasnwprintf implementation needs special code for
+         the 'lc' directive.])
+      ;;
+  esac
+  gl_MUSL_LIBC
+  gl_PREREQ_VASNXPRINTF
+])
+
+# Common prerequisites of lib/vasnprintf.c and lib/vasnwprintf.c.
+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
+  dnl in the code for NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE.
+  AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION])
 ])
 
 # Extra prerequisites of lib/vasnprintf.c for supporting 'long double'
@@ -152,7 +259,22 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_A],
       AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], [1],
         [Define if the vasnprintf implementation needs special code for
          the 'a' and 'A' directives.])
-      AC_CHECK_FUNCS([nl_langinfo])
+      gl_CHECK_FUNCS_ANDROID([nl_langinfo], [[#include <langinfo.h>]])
+      ;;
+  esac
+])
+
+# Extra prerequisites of lib/vasnprintf.c for supporting the 'b' directive.
+AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_B],
+[
+  AC_REQUIRE([gl_PRINTF_DIRECTIVE_B])
+  case "$gl_cv_func_printf_directive_b" in
+    *yes)
+      ;;
+    *)
+      AC_DEFINE([NEED_PRINTF_DIRECTIVE_B], [1],
+        [Define if the vasnprintf implementation needs special code for
+         the 'b' directive.])
       ;;
   esac
 ])
@@ -187,6 +309,21 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_LS],
   esac
 ])
 
+# Extra prerequisites of lib/vasnprintf.c for supporting the 'lc' directive.
+AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_LC],
+[
+  AC_REQUIRE([gl_PRINTF_DIRECTIVE_LC])
+  case "$gl_cv_func_printf_directive_lc" in
+    *yes)
+      ;;
+    *)
+      AC_DEFINE([NEED_PRINTF_DIRECTIVE_LC], [1],
+        [Define if the vasnprintf implementation needs special code for
+         the 'lc' directive.])
+      ;;
+  esac
+])
+
 # Extra prerequisites of lib/vasnprintf.c for supporting the ' flag.
 AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_GROUPING],
 [
@@ -232,6 +369,22 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_ZERO],
   esac
 ])
 
+# Extra prerequisites of lib/vasnprintf.c for supporting the # flag with a
+# zero precision and a zero value in the 'x' and 'X' directives.
+AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_ALT_PRECISION_ZERO],
+[
+  AC_REQUIRE([gl_PRINTF_FLAG_ALT_PRECISION_ZERO])
+  case "$gl_cv_func_printf_flag_alt_precision_zero" in
+    *yes)
+      ;;
+    *)
+      AC_DEFINE([NEED_PRINTF_FLAG_ALT_PRECISION_ZERO], [1],
+        [Define if the vasnprintf implementation needs special code for the
+         # flag with a zero precision and a zero value in the 'x' and 'X' directives.])
+      ;;
+  esac
+])
+
 # Extra prerequisites of lib/vasnprintf.c for supporting large precisions.
 AC_DEFUN([gl_PREREQ_VASNPRINTF_PRECISION],
 [
@@ -276,23 +429,53 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_ENOMEM],
 ])
 
 # Prerequisites of lib/vasnprintf.c including all extras for POSIX compliance.
-AC_DEFUN([gl_PREREQ_VASNPRINTF_WITH_EXTRAS],
+AC_DEFUN([gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS],
 [
   AC_REQUIRE([gl_PREREQ_VASNPRINTF])
   gl_PREREQ_VASNPRINTF_LONG_DOUBLE
   gl_PREREQ_VASNPRINTF_INFINITE_DOUBLE
   gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE
   gl_PREREQ_VASNPRINTF_DIRECTIVE_A
+  gl_PREREQ_VASNPRINTF_DIRECTIVE_B
   gl_PREREQ_VASNPRINTF_DIRECTIVE_F
   gl_PREREQ_VASNPRINTF_DIRECTIVE_LS
+  gl_PREREQ_VASNPRINTF_DIRECTIVE_LC
   gl_PREREQ_VASNPRINTF_FLAG_GROUPING
   gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST
   gl_PREREQ_VASNPRINTF_FLAG_ZERO
+  gl_PREREQ_VASNPRINTF_FLAG_ALT_PRECISION_ZERO
   gl_PREREQ_VASNPRINTF_PRECISION
   gl_PREREQ_VASNPRINTF_ENOMEM
 ])
 
+# Extra prerequisites of lib/vasnprintf.c for supporting the 'B' directive.
+AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_UPPERCASE_B],
+[
+  AC_REQUIRE([gl_PRINTF_DIRECTIVE_UPPERCASE_B])
+  case "$gl_cv_func_printf_directive_uppercase_b" in
+    *yes)
+      ;;
+    *)
+      AC_DEFINE([NEED_PRINTF_DIRECTIVE_UPPERCASE_B], [1],
+        [Define if the vasnprintf implementation needs special code for
+         the 'B' directive.])
+      ;;
+  esac
+])
+
+# Prerequisites of lib/vasnprintf.c including all extras for POSIX compliance
+# and GNU compatibility.
+AC_DEFUN([gl_PREREQ_VASNPRINTF_WITH_GNU_EXTRAS],
+[
+  gl_PREREQ_VASNPRINTF_WITH_POSIX_EXTRAS
+  AC_DEFINE([SUPPORT_GNU_PRINTF_DIRECTIVES], [1],
+    [Define if the vasnprintf implementation should support GNU compatible
+     printf directives.])
+  gl_PREREQ_VASNPRINTF_DIRECTIVE_UPPERCASE_B
+])
+
 # Prerequisites of lib/asnprintf.c.
+# Prerequisites of lib/asnwprintf.c.
 AC_DEFUN([gl_PREREQ_ASNPRINTF],
 [
 ])
diff --git a/gl/m4/vasprintf.m4 b/gl/m4/vasprintf.m4
index 6e6156a7..73f7b807 100644
--- a/gl/m4/vasprintf.m4
+++ b/gl/m4/vasprintf.m4
@@ -1,5 +1,6 @@
-# vasprintf.m4 serial 6
-dnl Copyright (C) 2002-2003, 2006-2007, 2009-2023 Free Software Foundation,
+# vasprintf.m4
+# serial 6
+dnl Copyright (C) 2002-2003, 2006-2007, 2009-2024 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,
diff --git a/gl/m4/visibility.m4 b/gl/m4/visibility.m4
index f0468e89..ecf09686 100644
--- a/gl/m4/visibility.m4
+++ b/gl/m4/visibility.m4
@@ -1,5 +1,6 @@
-# visibility.m4 serial 8
-dnl Copyright (C) 2005, 2008, 2010-2023 Free Software Foundation, Inc.
+# visibility.m4
+# serial 9
+dnl Copyright (C) 2005, 2008, 2010-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.
@@ -31,18 +32,18 @@ AC_DEFUN([gl_VISIBILITY],
     dnl user has put into $CC $CFLAGS $CPPFLAGS.
     AC_CACHE_CHECK([whether the -Werror option is usable],
       [gl_cv_cc_vis_werror],
-      [gl_save_CFLAGS="$CFLAGS"
+      [gl_saved_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -Werror"
        AC_COMPILE_IFELSE(
          [AC_LANG_PROGRAM([[]], [[]])],
          [gl_cv_cc_vis_werror=yes],
          [gl_cv_cc_vis_werror=no])
-       CFLAGS="$gl_save_CFLAGS"
+       CFLAGS="$gl_saved_CFLAGS"
       ])
     dnl Now check whether visibility declarations are supported.
     AC_CACHE_CHECK([for simple visibility declarations],
       [gl_cv_cc_visibility],
-      [gl_save_CFLAGS="$CFLAGS"
+      [gl_saved_CFLAGS="$CFLAGS"
        CFLAGS="$CFLAGS -fvisibility=hidden"
        dnl We use the option -Werror and a function dummyfunc, because on some
        dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
@@ -68,7 +69,7 @@ AC_DEFUN([gl_VISIBILITY],
             [[]])],
          [gl_cv_cc_visibility=yes],
          [gl_cv_cc_visibility=no])
-       CFLAGS="$gl_save_CFLAGS"
+       CFLAGS="$gl_saved_CFLAGS"
       ])
     if test $gl_cv_cc_visibility = yes; then
       CFLAG_VISIBILITY="-fvisibility=hidden"
diff --git a/gl/m4/vsnprintf.m4 b/gl/m4/vsnprintf.m4
index 7fbb11c4..9f321f3f 100644
--- a/gl/m4/vsnprintf.m4
+++ b/gl/m4/vsnprintf.m4
@@ -1,5 +1,6 @@
-# vsnprintf.m4 serial 7
-dnl Copyright (C) 2002-2004, 2007-2023 Free Software Foundation, Inc.
+# vsnprintf.m4
+# serial 7
+dnl Copyright (C) 2002-2004, 2007-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.
diff --git a/gl/m4/warn-on-use.m4 b/gl/m4/warn-on-use.m4
index 10649c5c..6c8c76b8 100644
--- a/gl/m4/warn-on-use.m4
+++ b/gl/m4/warn-on-use.m4
@@ -1,5 +1,6 @@
-# warn-on-use.m4 serial 10
-dnl Copyright (C) 2010-2023 Free Software Foundation, Inc.
+# warn-on-use.m4
+# serial 11
+dnl Copyright (C) 2010-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.
@@ -36,7 +37,7 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE],
        dnl clang (e.g. strndup), reference ac_compile_for_check_decl instead
        dnl of ac_compile.  If, for whatever reason, the override of AC_PROG_CC
        dnl in zzgnulib.m4 is inactive, use the original ac_compile.
-       ac_save_ac_compile="$ac_compile"
+       ac_saved_ac_compile="$ac_compile"
        if test -n "$ac_compile_for_check_decl"; then
          ac_compile="$ac_compile_for_check_decl"
        fi
@@ -46,7 +47,7 @@ AC_DEFUN([gl_WARN_ON_USE_PREPARE],
 [[#undef $gl_func
   (void) $gl_func;]])],
            [AS_VAR_SET([gl_Symbol], [yes])], [AS_VAR_SET([gl_Symbol], [no])])])
-       ac_compile="$ac_save_ac_compile"
+       ac_compile="$ac_saved_ac_compile"
        AS_VAR_IF([gl_Symbol], [yes],
          [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_RAW_DECL_$gl_func]), [1])
           dnl Shortcut for an AC_CHECK_DECL invocation that may come later:
diff --git a/gl/m4/wchar_h.m4 b/gl/m4/wchar_h.m4
index 8ec66193..995bdc65 100644
--- a/gl/m4/wchar_h.m4
+++ b/gl/m4/wchar_h.m4
@@ -1,13 +1,13 @@
-dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
-
-dnl Copyright (C) 2007-2023 Free Software Foundation, Inc.
+# wchar_h.m4
+# serial 64
+dnl Copyright (C) 2007-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 Written by Eric Blake.
+dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-# wchar_h.m4 serial 55
+dnl Written by Eric Blake.
 
 AC_DEFUN_ONCE([gl_WCHAR_H],
 [
@@ -86,8 +86,8 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK],
          dnl z/OS when using the XPLINK object format (due to duplicate
          dnl CSECT names). Instead, temporarily redefine $ac_compile so
          dnl that the object file has the latter name from the start.
-         save_ac_compile="$ac_compile"
-         ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest1/`
+         saved_ac_compile="$ac_compile"
+         ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest1/`
          if echo '#include "conftest.c"' >conftest1.c \
             && AC_TRY_EVAL([ac_compile]); then
            AC_LANG_CONFTEST([
@@ -97,7 +97,7 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK],
                int zero (void) { return 0; }
              ]])])
            dnl See note above about renaming object files.
-           ac_compile=`echo "$save_ac_compile" | sed s/conftest/conftest2/`
+           ac_compile=`echo "$saved_ac_compile" | sed s/conftest/conftest2/`
            if echo '#include "conftest.c"' >conftest2.c \
               && AC_TRY_EVAL([ac_compile]); then
              if $CC -o conftest$ac_exeext $CFLAGS $LDFLAGS conftest1.$ac_objext conftest2.$ac_objext $LIBS >&AS_MESSAGE_LOG_FD 2>&1; then
@@ -107,7 +107,7 @@ AC_DEFUN([gl_WCHAR_H_INLINE_OK],
              fi
            fi
          fi
-         ac_compile="$save_ac_compile"
+         ac_compile="$saved_ac_compile"
          rm -f conftest[12].c conftest[12].$ac_objext conftest$ac_exeext
          ;;
      esac
@@ -147,6 +147,7 @@ AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_BTOWC])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTOB])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSINIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSZERO])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRTOWC])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBRLEN])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MBSRTOWCS])
@@ -185,6 +186,7 @@ AC_DEFUN([gl_WCHAR_H_REQUIRE_DEFAULTS],
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSTOK])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSWIDTH])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCSFTIME])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WGETCWD])
     dnl Support Microsoft deprecated alias function names by default.
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_WCSDUP], [1])
   ])
@@ -253,5 +255,10 @@ AC_DEFUN([gl_WCHAR_H_DEFAULTS],
   REPLACE_WCWIDTH=0;    AC_SUBST([REPLACE_WCWIDTH])
   REPLACE_WCSWIDTH=0;   AC_SUBST([REPLACE_WCSWIDTH])
   REPLACE_WCSFTIME=0;   AC_SUBST([REPLACE_WCSFTIME])
+  REPLACE_WCSCMP=0;     AC_SUBST([REPLACE_WCSCMP])
+  REPLACE_WCSNCMP=0;    AC_SUBST([REPLACE_WCSNCMP])
+  REPLACE_WCSSTR=0;     AC_SUBST([REPLACE_WCSSTR])
   REPLACE_WCSTOK=0;     AC_SUBST([REPLACE_WCSTOK])
+  REPLACE_WMEMCMP=0;    AC_SUBST([REPLACE_WMEMCMP])
+  REPLACE_WMEMPCPY=0;   AC_SUBST([REPLACE_WMEMPCPY])
 ])
diff --git a/gl/m4/wchar_t.m4 b/gl/m4/wchar_t.m4
index 50bde08a..968832cb 100644
--- a/gl/m4/wchar_t.m4
+++ b/gl/m4/wchar_t.m4
@@ -1,5 +1,6 @@
-# wchar_t.m4 serial 4 (gettext-0.18.2)
-dnl Copyright (C) 2002-2003, 2008-2023 Free Software Foundation, Inc.
+# 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.
diff --git a/gl/m4/wcrtomb.m4 b/gl/m4/wcrtomb.m4
index d51b36e1..35dff6f0 100644
--- a/gl/m4/wcrtomb.m4
+++ b/gl/m4/wcrtomb.m4
@@ -1,5 +1,6 @@
-# wcrtomb.m4 serial 17
-dnl Copyright (C) 2008-2023 Free Software Foundation, Inc.
+# wcrtomb.m4
+# serial 19
+dnl Copyright (C) 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.
@@ -82,9 +83,11 @@ int main ()
 changequote(,)dnl
           case "$host_os" in
             # Guess no on AIX 4, OSF/1, Solaris, native Windows.
-            aix4* | osf* | solaris* | mingw*) gl_cv_func_wcrtomb_retval="guessing no" ;;
+            aix4* | osf* | solaris* | mingw* | windows*)
+              gl_cv_func_wcrtomb_retval="guessing no" ;;
             # Guess yes otherwise.
-            *)                                gl_cv_func_wcrtomb_retval="guessing yes" ;;
+            *)
+              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
@@ -97,12 +100,14 @@ changequote([,])dnl
 int main ()
 {
   int result = 0;
-  if (setlocale (LC_ALL, "$LOCALE_FR") != NULL)
+  if (strcmp ("$LOCALE_FR", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_FR") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
         result |= 1;
     }
-  if (setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
+  if (strcmp ("$LOCALE_FR_UTF8", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_FR_UTF8") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
         result |= 2;
@@ -113,12 +118,14 @@ int main ()
             result |= 2;
       }
     }
-  if (setlocale (LC_ALL, "$LOCALE_JA") != NULL)
+  if (strcmp ("$LOCALE_JA", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_JA") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
         result |= 4;
     }
-  if (setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
+  if (strcmp ("$LOCALE_ZH_CN", "none") != 0
+      && setlocale (LC_ALL, "$LOCALE_ZH_CN") != NULL)
     {
       if (wcrtomb (NULL, 0, NULL) != 1)
         result |= 8;
diff --git a/gl/m4/wctype.m4 b/gl/m4/wctype.m4
new file mode 100644
index 00000000..e5d70740
--- /dev/null
+++ b/gl/m4/wctype.m4
@@ -0,0 +1,52 @@
+# wctype.m4
+# serial 6
+dnl Copyright (C) 2011-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_ONCE([gl_FUNC_WCTYPE],
+[
+  AC_REQUIRE([gl_WCTYPE_H_DEFAULTS])
+  AC_REQUIRE([gl_WCTYPE_H])
+  AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  HAVE_WCTYPE=$HAVE_WCTYPE_T
+  if test $HAVE_WCTYPE = 1; then
+    AC_CACHE_CHECK([whether wctype supports the "blank" and "punct" character classes],
+      [gl_cv_func_wctype_works],
+      [AC_RUN_IFELSE(
+         [AC_LANG_SOURCE([[
+            #include <ctype.h>
+            #include <wchar.h>
+            #include <wctype.h>
+            int main ()
+            {
+              /* This test fails on mingw.  */
+              if (wctype ("blank") == (wctype_t)0)
+                return 1;
+              /* This test fails on MSVC 14.  */
+              if ((! iswctype ('\t', wctype ("blank"))) != (! iswblank ('\t')))
+                return 2;
+              /* This test fails on Android 11.  */
+              if ((! iswctype ('\`', wctype ("punct"))) != (! ispunct ('\`')))
+                return 4;
+              return 0;
+            }
+         ]])],
+         [gl_cv_func_wctype_works=yes], [gl_cv_func_wctype_works=no],
+         [case "$host_os" in
+                               # Guess no on native Windows.
+            mingw* | windows*) gl_cv_func_wctype_works="guessing no" ;;
+                               # Guess no on Android.
+            android*)          gl_cv_func_wctype_works="guessing no" ;;
+                               # Guess yes otherwise.
+            *)                 gl_cv_func_wctype_works="guessing yes" ;;
+          esac
+         ])
+      ])
+    case "$gl_cv_func_wctype_works" in
+      *yes) ;;
+      *) REPLACE_WCTYPE=1 ;;
+    esac
+  fi
+])
diff --git a/gl/m4/wctype_h.m4 b/gl/m4/wctype_h.m4
index 6856a735..a3b07c2a 100644
--- a/gl/m4/wctype_h.m4
+++ b/gl/m4/wctype_h.m4
@@ -1,8 +1,9 @@
-# wctype_h.m4 serial 30
+# wctype_h.m4
+# serial 33
 
 dnl A placeholder for ISO C99 <wctype.h>, for platforms that lack it.
 
-dnl Copyright (C) 2006-2023 Free Software Foundation, Inc.
+dnl Copyright (C) 2006-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.
@@ -178,6 +179,7 @@ AC_DEFUN([gl_WCTYPE_H_REQUIRE_DEFAULTS],
   m4_defun(GL_MODULE_INDICATOR_PREFIX[_WCTYPE_H_MODULE_INDICATOR_DEFAULTS], [
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWBLANK])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWDIGIT])
+    gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWPUNCT])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWXDIGIT])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_WCTYPE])
     gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_ISWCTYPE])
@@ -196,5 +198,8 @@ AC_DEFUN([gl_WCTYPE_H_DEFAULTS],
   HAVE_WCTRANS_T=1;     AC_SUBST([HAVE_WCTRANS_T])
   REPLACE_ISWBLANK=0;   AC_SUBST([REPLACE_ISWBLANK])
   REPLACE_ISWDIGIT=0;   AC_SUBST([REPLACE_ISWDIGIT])
+  REPLACE_ISWPUNCT=0;   AC_SUBST([REPLACE_ISWPUNCT])
   REPLACE_ISWXDIGIT=0;  AC_SUBST([REPLACE_ISWXDIGIT])
+  REPLACE_WCTRANS=0;    AC_SUBST([REPLACE_WCTRANS])
+  REPLACE_WCTYPE=0;     AC_SUBST([REPLACE_WCTYPE])
 ])
diff --git a/gl/m4/wint_t.m4 b/gl/m4/wint_t.m4
index dfd743b3..883fac28 100644
--- a/gl/m4/wint_t.m4
+++ b/gl/m4/wint_t.m4
@@ -1,5 +1,6 @@
-# wint_t.m4 serial 11
-dnl Copyright (C) 2003, 2007-2023 Free Software Foundation, Inc.
+# wint_t.m4
+# serial 11
+dnl Copyright (C) 2003, 2007-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.
diff --git a/gl/m4/xalloc.m4 b/gl/m4/xalloc.m4
index fc56f59a..d44d0f08 100644
--- a/gl/m4/xalloc.m4
+++ b/gl/m4/xalloc.m4
@@ -1,5 +1,6 @@
-# xalloc.m4 serial 18
-dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc.
+# xalloc.m4
+# serial 18
+dnl Copyright (C) 2002-2006, 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.
diff --git a/gl/m4/xsize.m4 b/gl/m4/xsize.m4
index 649db9c5..e5784973 100644
--- a/gl/m4/xsize.m4
+++ b/gl/m4/xsize.m4
@@ -1,5 +1,6 @@
-# xsize.m4 serial 5
-dnl Copyright (C) 2003-2004, 2008-2023 Free Software Foundation, Inc.
+# xsize.m4
+# serial 5
+dnl Copyright (C) 2003-2004, 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.
diff --git a/gl/m4/zzgnulib.m4 b/gl/m4/zzgnulib.m4
index 362102b6..710fba4e 100644
--- a/gl/m4/zzgnulib.m4
+++ b/gl/m4/zzgnulib.m4
@@ -1,5 +1,6 @@
-# zzgnulib.m4 serial 1
-dnl Copyright (C) 2020-2023 Free Software Foundation, Inc.
+# zzgnulib.m4
+# serial 1
+dnl Copyright (C) 2020-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.
diff --git a/gl/malloc.c b/gl/malloc.c
index 3ade35cb..2a7867a1 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1997-1998, 2006-2007, 2009-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
diff --git a/gl/malloc/dynarray-skeleton.c b/gl/malloc/dynarray-skeleton.c
index 580c278b..a95241ab 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-2024 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 a9a3b085..3163e278 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-2024 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 ebc93109..95e34e7a 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-2024 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 7da53931..7bdba159 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-2024 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
@@ -22,7 +22,7 @@
 
 #include <dynarray.h>
 #include <errno.h>
-#include <intprops.h>
+#include <stdckdint.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -56,7 +56,7 @@ __libc_dynarray_emplace_enlarge (struct dynarray_header *list,
     }
 
   size_t new_size;
-  if (INT_MULTIPLY_WRAPV (new_allocated, element_size, &new_size))
+  if (ckd_mul (&new_size, new_allocated, element_size))
     return false;
   void *new_array;
   if (list->array == scratch)
diff --git a/gl/malloc/dynarray_finalize.c b/gl/malloc/dynarray_finalize.c
index 673595a5..52764f73 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-2024 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 7ecd4de6..7323f8ee 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-2024 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
@@ -22,7 +22,7 @@
 
 #include <dynarray.h>
 #include <errno.h>
-#include <intprops.h>
+#include <stdckdint.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -42,7 +42,7 @@ __libc_dynarray_resize (struct dynarray_header *list, size_t size,
      over-allocation here.  */
 
   size_t new_size_bytes;
-  if (INT_MULTIPLY_WRAPV (size, element_size, &new_size_bytes))
+  if (ckd_mul (&new_size_bytes, size, element_size))
     {
       /* Overflow.  */
       __set_errno (ENOMEM);
diff --git a/gl/malloc/dynarray_resize_clear.c b/gl/malloc/dynarray_resize_clear.c
index bb23c522..aa17f740 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-2024 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 f055b1e5..e75c72df 100644
--- a/gl/malloca.c
+++ b/gl/malloca.c
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003, 2006-2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2009-2024 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
@@ -22,6 +22,9 @@
 #include "malloca.h"
 
 #include <stdckdint.h>
+#if defined __CHERI_PURE_CAPABILITY__
+# include <cheri.h>
+#endif
 
 #include "idx.h"
 
@@ -36,10 +39,15 @@
        allocation.
      - NULL comes from a failed heap allocation.  */
 
+#if defined __CHERI_PURE_CAPABILITY__
+/* Type for holding the original malloc() result.  */
+typedef uintptr_t small_t;
+#else
 /* Type for holding very small pointer differences.  */
 typedef unsigned char small_t;
 /* Verify that it is wide enough.  */
 static_assert (2 * sa_alignment_max - 1 <= (small_t) -1);
+#endif
 
 void *
 mmalloca (size_t n)
@@ -56,20 +64,28 @@ mmalloca (size_t n)
 
       if (mem != NULL)
         {
-          uintptr_t umem = (uintptr_t)mem, umemplus;
+          uintptr_t umem = (uintptr_t) mem;
           /* The ckd_add avoids signed integer overflow on
              theoretical platforms where UINTPTR_MAX <= INT_MAX.  */
+          uintptr_t umemplus;
           ckd_add (&umemplus, umem, sizeof (small_t) + sa_alignment_max - 1);
-          idx_t offset = ((umemplus & ~alignment2_mask)
+          idx_t offset = (umemplus - umemplus % (2 * sa_alignment_max)
                           + sa_alignment_max - umem);
-          void *vp = mem + offset;
-          small_t *p = vp;
+          void *p = mem + offset;
           /* Here p >= mem + sizeof (small_t),
              and p <= mem + sizeof (small_t) + 2 * sa_alignment_max - 1
              hence p + n <= mem + nplus.
              So, the memory range [p, p+n) lies in the allocated memory range
              [mem, mem + nplus).  */
-          p[-1] = offset;
+          small_t *sp = p;
+# if defined __CHERI_PURE_CAPABILITY__
+          sp[-1] = umem;
+          p = (char *) cheri_bounds_set ((char *) p - sizeof (small_t),
+                                         sizeof (small_t) + n)
+              + sizeof (small_t);
+# else
+          sp[-1] = offset;
+# endif
           /* p ≡ sa_alignment_max mod 2*sa_alignment_max.  */
           return p;
         }
@@ -90,15 +106,22 @@ void
 freea (void *p)
 {
   /* Check argument.  */
-  if ((uintptr_t) p & (sa_alignment_max - 1))
+  uintptr_t u = (uintptr_t) p;
+  if (u & (sa_alignment_max - 1))
     {
       /* p was not the result of a malloca() call.  Invalid argument.  */
       abort ();
     }
   /* Determine whether p was a non-NULL pointer returned by mmalloca().  */
-  if ((uintptr_t) p & sa_alignment_max)
+  if (u & sa_alignment_max)
     {
-      void *mem = (char *) p - ((small_t *) p)[-1];
+      char *cp = p;
+      small_t *sp = p;
+# if defined __CHERI_PURE_CAPABILITY__
+      void *mem = sp[-1];
+# else
+      void *mem = cp - sp[-1];
+# endif
       free (mem);
     }
 }
diff --git a/gl/malloca.h b/gl/malloca.h
index 325c7277..c5208421 100644
--- a/gl/malloca.h
+++ b/gl/malloca.h
@@ -1,5 +1,5 @@
 /* Safe automatic memory allocation.
-   Copyright (C) 2003-2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2007, 2009-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2003.
 
    This file is free software: you can redistribute it and/or modify
@@ -18,10 +18,19 @@
 #ifndef _MALLOCA_H
 #define _MALLOCA_H
 
+/* This file uses _GL_ATTRIBUTE_ALLOC_SIZE, _GL_ATTRIBUTE_DEALLOC,
+   _GL_ATTRIBUTE_MALLOC, HAVE_ALLOCA.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include <alloca.h>
 #include <stddef.h>
 #include <stdlib.h>
 #include <stdint.h>
+#if defined __CHERI_PURE_CAPABILITY__
+# include <cheri.h>
+#endif
 
 #include "xalloc-oversized.h"
 
@@ -62,12 +71,24 @@ extern void freea (void *p);
    memory allocated on the stack, that must be freed using freea() before
    the function returns.  Upon failure, it returns NULL.  */
 #if HAVE_ALLOCA
-# define malloca(N) \
-  ((N) < 4032 - (2 * sa_alignment_max - 1)                                   \
-   ? (void *) (((uintptr_t) (char *) alloca ((N) + 2 * sa_alignment_max - 1) \
-                + (2 * sa_alignment_max - 1))                                \
-               & ~(uintptr_t)(2 * sa_alignment_max - 1))                     \
-   : mmalloca (N))
+# if defined __CHERI_PURE_CAPABILITY__
+#  define malloca(N) \
+    ((N) < 4032 - (2 * sa_alignment_max - 1)                                  \
+     ? cheri_bounds_set ((void *) (((uintptr_t)                               \
+                                     (char *)                                 \
+                                      alloca ((N) + 2 * sa_alignment_max - 1) \
+                                    + (2 * sa_alignment_max - 1))             \
+                                   & ~(uintptr_t)(2 * sa_alignment_max - 1)), \
+                         (N))                                                 \
+     : mmalloca (N))
+# else
+#  define malloca(N) \
+    ((N) < 4032 - (2 * sa_alignment_max - 1)                                   \
+     ? (void *) (((uintptr_t) (char *) alloca ((N) + 2 * sa_alignment_max - 1) \
+                  + (2 * sa_alignment_max - 1))                                \
+                 & ~(uintptr_t)(2 * sa_alignment_max - 1))                     \
+     : mmalloca (N))
+# endif
 #else
 # define malloca(N) \
   mmalloca (N)
diff --git a/gl/math.c b/gl/math.c
index 67cabbcf..78da4d4a 100644
--- a/gl/math.c
+++ b/gl/math.c
@@ -1,6 +1,6 @@
 /* Inline functions for <math.h>.
 
-   Copyright (C) 2012-2023 Free Software Foundation, Inc.
+   Copyright (C) 2012-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
@@ -18,5 +18,5 @@
 #include <config.h>
 
 #define _GL_MATH_INLINE _GL_EXTERN_INLINE
-#include "math.h"
+#include <math.h>
 typedef int dummy;
diff --git a/gl/math.in.h b/gl/math.in.h
index f3d58afc..96d0da44 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2007-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
@@ -15,6 +15,11 @@
    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/>.  */
 
+/* On Android, in C++ mode, when /usr/include/c++/v1/math.h is being included
+   and /usr/include/math.h has not yet been included, skip this file, since it
+   would lead to many syntax errors.  */
+#if !(defined __ANDROID__ && defined _LIBCPP_MATH_H && !defined INFINITY)
+
 #ifndef _@GUARD_PREFIX@_MATH_H
 
 #if __GNUC__ >= 3
@@ -43,14 +48,17 @@
 #ifndef _@GUARD_PREFIX@_MATH_H
 #define _@GUARD_PREFIX@_MATH_H
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_ATTRIBUTE_CONST,
+   GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* On OpenVMS, NAN, INFINITY, and HUGEVAL macros are defined in <fp.h>.  */
 #if defined __VMS && ! defined NAN
 # include <fp.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_MATH_INLINE
 # define _GL_MATH_INLINE _GL_INLINE
@@ -1427,6 +1435,29 @@ _GL_WARN_ON_USE (ldexpf, "ldexpf is unportable - "
 #endif
 
 /* Return x * 2^exp.  */
+#if @GNULIB_LDEXP@
+# if @REPLACE_LDEXP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef ldexp
+#   define ldexp rpl_ldexp
+#  endif
+_GL_FUNCDECL_RPL (ldexp, double, (double x, int exp));
+_GL_CXXALIAS_RPL (ldexp, double, (double x, int exp));
+# else
+/* Assume ldexp is always declared.  */
+_GL_CXXALIAS_SYS (ldexp, double, (double x, int exp));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN1 (ldexp, double, (double x, int exp));
+# endif
+#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");
+#endif
+
+/* Return x * 2^exp.  */
 #if @GNULIB_LDEXPL@ && @REPLACE_LDEXPL@
 # if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #  undef ldexpl
@@ -1691,7 +1722,9 @@ _GL_FUNCDECL_SYS (log2f, float, (float x));
 #  endif
 _GL_CXXALIAS_SYS (log2f, float, (float x));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (log2f);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef log2f
 # if HAVE_RAW_DECL_LOG2F
@@ -2512,16 +2545,22 @@ _GL_WARN_REAL_FLOATING_DECL (isinf);
 #if @GNULIB_ISNANF@
 /* Test for NaN for 'float' numbers.  */
 # if @HAVE_ISNANF@
+#  if defined __sun || defined __sgi
+/* Solaris and IRIX have isnanf() and declare it in <ieeefp.h>.  We cannot
+   define isnanf as a macro, because that would conflict with <ieeefp.h>.  */
+_GL_EXTERN_C int isnanf (float x);
+#  else
 /* The original <math.h> included above provides a declaration of isnan macro
    or (older) isnanf function.  */
-#  if (__GNUC__ >= 4) || (__clang_major__ >= 4)
+#   if (__GNUC__ >= 4) || (__clang_major__ >= 4)
     /* GCC >= 4.0 and clang provide a type-generic built-in for isnan.
        GCC >= 4.0 also provides __builtin_isnanf, but clang doesn't.  */
-#   undef isnanf
-#   define isnanf(x) __builtin_isnan ((float)(x))
-#  elif defined isnan
-#   undef isnanf
-#   define isnanf(x) isnan ((float)(x))
+#    undef isnanf
+#    define isnanf(x) __builtin_isnan ((float)(x))
+#   elif defined isnan
+#    undef isnanf
+#    define isnanf(x) isnan ((float)(x))
+#   endif
 #  endif
 # else
 /* Test whether X is a NaN.  */
@@ -2536,15 +2575,21 @@ _GL_EXTERN_C int isnanf (float x);
    This function is a gnulib extension, unlike isnan() which applied only
    to 'double' numbers earlier but now is a type-generic macro.  */
 # if @HAVE_ISNAND@
+#  if defined __sun || defined __sgi
+/* Solaris and IRIX have isnand() and declare it in <ieeefp.h>.  We cannot
+   define isnand as a macro, because that would conflict with <ieeefp.h>.  */
+_GL_EXTERN_C int isnand (double x);
+#  else
 /* The original <math.h> included above provides a declaration of isnan
    macro.  */
-#  if (__GNUC__ >= 4) || (__clang_major__ >= 4)
+#   if (__GNUC__ >= 4) || (__clang_major__ >= 4)
     /* GCC >= 4.0 and clang provide a type-generic built-in for isnan.  */
-#   undef isnand
-#   define isnand(x) __builtin_isnan ((double)(x))
-#  else
-#   undef isnand
-#   define isnand(x) isnan ((double)(x))
+#    undef isnand
+#    define isnand(x) __builtin_isnan ((double)(x))
+#   else
+#    undef isnand
+#    define isnand(x) isnan ((double)(x))
+#   endif
 #  endif
 # else
 /* Test whether X is a NaN.  */
@@ -2617,12 +2662,17 @@ _GL_EXTERN_C int rpl_isnanl (long double x) _GL_ATTRIBUTE_CONST;
 #  if defined isnan || defined GNULIB_NAMESPACE
 _GL_MATH_CXX_REAL_FLOATING_DECL_1 (isnan)
 #   undef isnan
-#   if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__ && __clang_major__ < 12) || (defined __FreeBSD__ && (__clang_major__ < 7 || __clang_major__ >= 11)) || defined __OpenBSD__ || (defined _WIN32 && !defined __CYGWIN__)))
+#   if __GNUC__ >= 6 || (defined __clang__ && !((defined __APPLE__ && defined __MACH__ && __clang_major__ != 12) || (defined __FreeBSD__ && (__clang_major__ < 7 || __clang_major__ >= 11)) || defined __OpenBSD__ || (defined _WIN32 && !defined __CYGWIN__)))
   /* This platform's <cmath> possibly defines isnan through a set of inline
      functions.  */
 _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isnan, rpl_isnan, bool)
 #    define isnan rpl_isnan
 #    define GNULIB_NAMESPACE_LACKS_ISNAN 1
+#   elif __clang_major__ >= 14
+  /* Neither of the two possible _GL_MATH_CXX_REAL_FLOATING_DECL_2 invocations
+     works.  Inline functions are already present in /usr/include/c++/v1/math.h,
+     which comes from LLVM.  */
+#    define GNULIB_NAMESPACE_LACKS_ISNAN 1
 #   else
 _GL_MATH_CXX_REAL_FLOATING_DECL_2 (isnan, isnan, bool)
 #   endif
@@ -2657,12 +2707,13 @@ _GL_WARN_REAL_FLOATING_DECL (isnan);
 _GL_EXTERN_C int gl_signbitf (float arg);
 _GL_EXTERN_C int gl_signbitd (double arg);
 _GL_EXTERN_C int gl_signbitl (long double arg);
-#  if (__GNUC__ >= 2 || defined __clang__) && !defined __STRICT_ANSI__
+#  if __GNUC__ >= 2 || defined __clang__
 #   define _GL_NUM_UINT_WORDS(type) \
       ((sizeof (type) + sizeof (unsigned int) - 1) / sizeof (unsigned int))
 #   if defined FLT_SIGNBIT_WORD && defined FLT_SIGNBIT_BIT && !defined gl_signbitf
 #    define gl_signbitf_OPTIMIZED_MACRO
 #    define gl_signbitf(arg) \
+       __extension__                                                    \
        ({ union { float _value;                                         \
                   unsigned int _word[_GL_NUM_UINT_WORDS (float)];       \
                 } _m;                                                   \
@@ -2673,6 +2724,7 @@ _GL_EXTERN_C int gl_signbitl (long double arg);
 #   if defined DBL_SIGNBIT_WORD && defined DBL_SIGNBIT_BIT && !defined gl_signbitd
 #    define gl_signbitd_OPTIMIZED_MACRO
 #    define gl_signbitd(arg) \
+       __extension__                                                    \
        ({ union { double _value;                                        \
                   unsigned int _word[_GL_NUM_UINT_WORDS (double)];      \
                 } _m;                                                   \
@@ -2683,6 +2735,7 @@ _GL_EXTERN_C int gl_signbitl (long double arg);
 #   if defined LDBL_SIGNBIT_WORD && defined LDBL_SIGNBIT_BIT && !defined gl_signbitl
 #    define gl_signbitl_OPTIMIZED_MACRO
 #    define gl_signbitl(arg) \
+       __extension__                                                    \
        ({ union { long double _value;                                   \
                   unsigned int _word[_GL_NUM_UINT_WORDS (long double)]; \
                 } _m;                                                   \
@@ -2720,8 +2773,323 @@ _GL_WARN_REAL_FLOATING_DECL (signbit);
 # endif
 #endif
 
+
+#if @GNULIB_GETPAYLOADF@
+# if @REPLACE_GETPAYLOADF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getpayloadf
+#   define getpayloadf rpl_getpayloadf
+#  endif
+_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 *));
+#  endif
+_GL_CXXALIAS_SYS (getpayloadf, float, (const float *));
+# endif
+_GL_CXXALIASWARN (getpayloadf);
+#elif defined GNULIB_POSIXCHECK
+# undef getpayloadf
+# if HAVE_RAW_DECL_GETPAYLOADF
+_GL_WARN_ON_USE (getpayloadf, "getpayloadf is unportable - "
+                 "use gnulib module getpayloadf for portability");
+# endif
+#endif
+
+#if @GNULIB_GETPAYLOAD@
+# if @REPLACE_GETPAYLOAD@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getpayload
+#   define getpayload rpl_getpayload
+#  endif
+_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 *));
+#  endif
+_GL_CXXALIAS_SYS (getpayload, double, (const double *));
+# endif
+_GL_CXXALIASWARN (getpayload);
+#elif defined GNULIB_POSIXCHECK
+# undef getpayload
+# if HAVE_RAW_DECL_GETPAYLOAD
+_GL_WARN_ON_USE (getpayload, "getpayload is unportable - "
+                 "use gnulib module getpayload for portability");
+# endif
+#endif
+
+#if @GNULIB_GETPAYLOADL@
+# if @REPLACE_GETPAYLOADL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getpayloadl
+#   define getpayloadl rpl_getpayloadl
+#  endif
+_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 *));
+#  endif
+_GL_CXXALIAS_SYS (getpayloadl, long double, (const long double *));
+# endif
+_GL_CXXALIASWARN (getpayloadl);
+#elif defined GNULIB_POSIXCHECK
+# undef getpayloadl
+# if HAVE_RAW_DECL_GETPAYLOADL
+_GL_WARN_ON_USE (getpayloadl, "getpayloadl is unportable - "
+                 "use gnulib module getpayloadl for portability");
+# endif
+#endif
+
+
+#if @GNULIB_SETPAYLOADF@
+# if !@HAVE_SETPAYLOADF@
+_GL_FUNCDECL_SYS (setpayloadf, int, (float *, float));
+# endif
+_GL_CXXALIAS_SYS (setpayloadf, int, (float *, float));
+_GL_CXXALIASWARN (setpayloadf);
+#elif defined GNULIB_POSIXCHECK
+# undef setpayloadf
+# if HAVE_RAW_DECL_SETPAYLOADF
+_GL_WARN_ON_USE (setpayloadf, "setpayloadf is unportable - "
+                 "use gnulib module setpayloadf for portability");
+# endif
+#endif
+
+#if @GNULIB_SETPAYLOAD@
+# if !@HAVE_SETPAYLOAD@
+_GL_FUNCDECL_SYS (setpayload, int, (double *, double));
+# endif
+_GL_CXXALIAS_SYS (setpayload, int, (double *, double));
+_GL_CXXALIASWARN (setpayload);
+#elif defined GNULIB_POSIXCHECK
+# undef setpayload
+# if HAVE_RAW_DECL_SETPAYLOAD
+_GL_WARN_ON_USE (setpayload, "setpayload is unportable - "
+                 "use gnulib module setpayload for portability");
+# endif
+#endif
+
+#if @GNULIB_SETPAYLOADL@
+# if !@HAVE_SETPAYLOADL@
+_GL_FUNCDECL_SYS (setpayloadl, int, (long double *, long double));
+# endif
+_GL_CXXALIAS_SYS (setpayloadl, int, (long double *, long double));
+_GL_CXXALIASWARN (setpayloadl);
+#elif defined GNULIB_POSIXCHECK
+# undef setpayloadl
+# if HAVE_RAW_DECL_SETPAYLOADL
+_GL_WARN_ON_USE (setpayloadl, "setpayloadl is unportable - "
+                 "use gnulib module setpayloadl for portability");
+# endif
+#endif
+
+
+#if @GNULIB_SETPAYLOADSIGF@
+# if !@HAVE_SETPAYLOADSIGF@
+_GL_FUNCDECL_SYS (setpayloadsigf, int, (float *, float));
+# endif
+_GL_CXXALIAS_SYS (setpayloadsigf, int, (float *, float));
+_GL_CXXALIASWARN (setpayloadsigf);
+#elif defined GNULIB_POSIXCHECK
+# undef setpayloadsigf
+# if HAVE_RAW_DECL_SETPAYLOADSIGF
+_GL_WARN_ON_USE (setpayloadsigf, "setpayloadsigf is unportable - "
+                 "use gnulib module setpayloadsigf for portability");
+# endif
+#endif
+
+#if @GNULIB_SETPAYLOADSIG@
+# if !@HAVE_SETPAYLOADSIG@
+_GL_FUNCDECL_SYS (setpayloadsig, int, (double *, double));
+# endif
+_GL_CXXALIAS_SYS (setpayloadsig, int, (double *, double));
+_GL_CXXALIASWARN (setpayloadsig);
+#elif defined GNULIB_POSIXCHECK
+# undef setpayloadsig
+# if HAVE_RAW_DECL_SETPAYLOADSIG
+_GL_WARN_ON_USE (setpayloadsig, "setpayloadsig is unportable - "
+                 "use gnulib module setpayloadsig for portability");
+# endif
+#endif
+
+#if @GNULIB_SETPAYLOADSIGL@
+# if !@HAVE_SETPAYLOADSIGL@
+_GL_FUNCDECL_SYS (setpayloadsigl, int, (long double *, long double));
+# endif
+_GL_CXXALIAS_SYS (setpayloadsigl, int, (long double *, long double));
+_GL_CXXALIASWARN (setpayloadsigl);
+#elif defined GNULIB_POSIXCHECK
+# undef setpayloadsigl
+# if HAVE_RAW_DECL_SETPAYLOADSIGL
+_GL_WARN_ON_USE (setpayloadsigl, "setpayloadsigl is unportable - "
+                 "use gnulib module setpayloadsigl for portability");
+# endif
+#endif
+
+
+#if @GNULIB_TOTALORDERF@
+# if @REPLACE_TOTALORDERF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef totalorderf
+#   define totalorderf rpl_totalorderf
+#  endif
+_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 *));
+#  endif
+_GL_CXXALIAS_SYS (totalorderf, int, (float const *, float const *));
+# endif
+_GL_CXXALIASWARN (totalorderf);
+#elif defined GNULIB_POSIXCHECK
+# undef totalorderf
+# if HAVE_RAW_DECL_TOTALORDERF
+_GL_WARN_ON_USE (totalorderf, "totalorderf is unportable - "
+                 "use gnulib module totalorderf for portability");
+# endif
+#endif
+
+#if @GNULIB_TOTALORDER@
+# if @REPLACE_TOTALORDER@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef totalorder
+#   define totalorder rpl_totalorder
+#  endif
+_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 *));
+#  endif
+_GL_CXXALIAS_SYS (totalorder, int, (double const *, double const *));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN1 (totalorder, int, (double const *, double const *));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef totalorder
+# if HAVE_RAW_DECL_TOTALORDER
+_GL_WARN_ON_USE (totalorder, "totalorder is unportable - "
+                 "use gnulib module totalorder for portability");
+# endif
+#endif
+
+#if @GNULIB_TOTALORDERL@
+# if @REPLACE_TOTALORDERL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef totalorderl
+#   define totalorderl rpl_totalorderl
+#  endif
+_GL_FUNCDECL_RPL (totalorderl, int,
+                  (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 *));
+#  endif
+_GL_CXXALIAS_SYS (totalorderl, int,
+                  (long double const *, long double const *));
+# endif
+_GL_CXXALIASWARN (totalorderl);
+#elif defined GNULIB_POSIXCHECK
+# undef totalorderl
+# if HAVE_RAW_DECL_TOTALORDERL
+_GL_WARN_ON_USE (totalorderl, "totalorderl is unportable - "
+                 "use gnulib module totalorderl for portability");
+# endif
+#endif
+
+
+#if @GNULIB_TOTALORDERMAGF@
+# if @REPLACE_TOTALORDERMAGF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef totalordermagf
+#   define totalordermagf rpl_totalordermagf
+#  endif
+_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 *));
+#  endif
+_GL_CXXALIAS_SYS (totalordermagf, int, (float const *, float const *));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN1 (totalordermagf, int, (float const *, float const *));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef totalordermagf
+# if HAVE_RAW_DECL_TOTALORDERMAGF
+_GL_WARN_ON_USE (totalordermagf, "totalordermagf is unportable - "
+                 "use gnulib module totalordermagf for portability");
+# endif
+#endif
+
+#if @GNULIB_TOTALORDERMAG@
+# if @REPLACE_TOTALORDERMAG@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef totalordermag
+#   define totalordermag rpl_totalordermag
+#  endif
+_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 *));
+#  endif
+_GL_CXXALIAS_SYS (totalordermag, int, (double const *, double const *));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN1 (totalordermag, int, (double const *, double const *));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef totalordermag
+# if HAVE_RAW_DECL_TOTALORDERMAG
+_GL_WARN_ON_USE (totalordermag, "totalordermag is unportable - "
+                 "use gnulib module totalordermag for portability");
+# endif
+#endif
+
+#if @GNULIB_TOTALORDERMAGL@
+# if @REPLACE_TOTALORDERMAGL@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef totalordermagl
+#   define totalordermagl rpl_totalordermagl
+#  endif
+_GL_FUNCDECL_RPL (totalordermagl, int,
+                  (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 *));
+#  endif
+_GL_CXXALIAS_SYS (totalordermagl, int,
+                  (long double const *, long double const *));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN1 (totalordermagl, int,
+                   (long double const *, long double const *));
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef totalordermagl
+# if HAVE_RAW_DECL_TOTALORDERMAGL
+_GL_WARN_ON_USE (totalordermagl, "totalordermagl is unportable - "
+                 "use gnulib module totalordermagl for portability");
+# endif
+#endif
+
+
 _GL_INLINE_HEADER_END
 
 #endif /* _@GUARD_PREFIX@_MATH_H */
 #endif /* _GL_INCLUDING_MATH_H */
 #endif /* _@GUARD_PREFIX@_MATH_H */
+#endif
diff --git a/gl/mbrtowc-impl-utf8.h b/gl/mbrtowc-impl-utf8.h
index 4fdd65d8..3a3ba13c 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-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
diff --git a/gl/mbrtowc-impl.h b/gl/mbrtowc-impl.h
index e9c04ed7..963631ca 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-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
diff --git a/gl/mbrtowc.c b/gl/mbrtowc.c
index c1a689a2..8a1646d2 100644
--- a/gl/mbrtowc.c
+++ b/gl/mbrtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 1999-2002, 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999-2002, 2005-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
@@ -28,7 +28,11 @@
 # include <stdint.h>
 # include <stdlib.h>
 
-# if defined _WIN32 && !defined __CYGWIN__
+# 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>
diff --git a/gl/mbsinit.c b/gl/mbsinit.c
index 6e600798..d1b8475c 100644
--- a/gl/mbsinit.c
+++ b/gl/mbsinit.c
@@ -1,5 +1,5 @@
 /* Test for initial conversion state.
-   Copyright (C) 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@
        buffered bytes (in the range 0..3), followed by up to 3 buffered bytes.
        See mbrtowc.c.
      - In wc -> mb direction, mbstate_t contains no information. In other
-       words, it is always in the initial state.  */
+       words, it is always in an initial state.  */
 
 static_assert (sizeof (mbstate_t) >= 4);
 
diff --git a/gl/mbszero.c b/gl/mbszero.c
new file mode 100644
index 00000000..25af2848
--- /dev/null
+++ b/gl/mbszero.c
@@ -0,0 +1,23 @@
+/* Put an mbstate_t into an initial conversion state.
+   Copyright (C) 2023-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/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2023.  */
+
+#include <config.h>
+
+#define IN_MBSZERO
+/* Specification and implementation.  */
+#include <wchar.h>
diff --git a/gl/mbtowc-impl.h b/gl/mbtowc-impl.h
index 39b977be..92efb4a7 100644
--- a/gl/mbtowc-impl.h
+++ b/gl/mbtowc-impl.h
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2011.
 
    This file is free software: you can redistribute it and/or modify
@@ -30,7 +30,7 @@ mbtowc (wchar_t *pwc, const char *s, size_t n)
       wchar_t wc;
       size_t result;
 
-      memset (&state, 0, sizeof (mbstate_t));
+      mbszero (&state);
       result = mbrtowc (&wc, s, n, &state);
       if (result == (size_t)-1 || result == (size_t)-2)
         {
diff --git a/gl/mbtowc-lock.c b/gl/mbtowc-lock.c
index 6ca6e10f..9001c5af 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2019-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
@@ -18,9 +18,10 @@
 
 #include <config.h>
 
+/* The option '--disable-threads' explicitly requests no locking.  */
 /* When it is known that the gl_get_mbtowc_lock function is defined
    by a dependency library, it should not be defined here.  */
-#if OMIT_MBTOWC_LOCK
+#if AVOID_ANY_THREADS || OMIT_MBTOWC_LOCK
 
 /* This declaration is solely to ensure that after preprocessing
    this file is never empty.  */
@@ -37,14 +38,14 @@ typedef int dummy;
 
 /* Macro for exporting a symbol (function, not variable) defined in this file,
    when compiled into a shared library.  */
-# ifndef DLL_EXPORTED
+# ifndef SHLIB_EXPORTED
 #  if HAVE_VISIBILITY
   /* Override the effect of the compiler option '-fvisibility=hidden'.  */
-#   define DLL_EXPORTED __attribute__((__visibility__("default")))
+#   define SHLIB_EXPORTED __attribute__((__visibility__("default")))
 #  elif defined _WIN32 || defined __CYGWIN__
-#   define DLL_EXPORTED __declspec(dllexport)
+#   define SHLIB_EXPORTED __declspec(dllexport)
 #  else
-#   define DLL_EXPORTED
+#   define SHLIB_EXPORTED
 #  endif
 # endif
 
@@ -59,7 +60,7 @@ typedef int dummy;
    because the latter is not guaranteed to be a stable ABI in the future.  */
 
 /* Make sure the function gets exported from DLLs.  */
-DLL_EXPORTED CRITICAL_SECTION *gl_get_mbtowc_lock (void);
+SHLIB_EXPORTED CRITICAL_SECTION *gl_get_mbtowc_lock (void);
 
 static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT;
 static CRITICAL_SECTION lock;
@@ -96,7 +97,7 @@ gl_get_mbtowc_lock (void)
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* Make sure the function gets exported from shared libraries.  */
-DLL_EXPORTED pthread_mutex_t *gl_get_mbtowc_lock (void);
+SHLIB_EXPORTED pthread_mutex_t *gl_get_mbtowc_lock (void);
 
 /* Returns the internal lock used by mbrtowc and mbrtoc32.  */
 pthread_mutex_t *
@@ -123,7 +124,7 @@ atomic_init (void)
 }
 
 /* Make sure the function gets exported from shared libraries.  */
-DLL_EXPORTED mtx_t *gl_get_mbtowc_lock (void);
+SHLIB_EXPORTED mtx_t *gl_get_mbtowc_lock (void);
 
 /* Returns the internal lock used by mbrtowc and mbrtoc32.  */
 mtx_t *
diff --git a/gl/mbtowc-lock.h b/gl/mbtowc-lock.h
index 2dc22ace..10f7dc7c 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2019-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
@@ -21,7 +21,7 @@
 static inline int
 mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m)
 {
-  /* Put the hidden internal state of mbtowc into its initial state.
+  /* Put the hidden internal state of mbtowc into an initial state.
      This is needed at least with glibc, uClibc, and MSVC CRT.
      See <https://sourceware.org/bugzilla/show_bug.cgi?id=9674>.  */
   mbtowc (NULL, NULL, 0);
@@ -32,7 +32,7 @@ mbtowc_unlocked (wchar_t *pwc, const char *p, size_t m)
 /* Prohibit renaming this symbol.  */
 #undef gl_get_mbtowc_lock
 
-#if GNULIB_MBRTOWC_SINGLE_THREAD
+#if AVOID_ANY_THREADS || GNULIB_MBRTOWC_SINGLE_THREAD
 
 /* All uses of this function are in a single thread.  No locking needed.  */
 
diff --git a/gl/mbtowc.c b/gl/mbtowc.c
index 8d9b06d2..31a2d635 100644
--- a/gl/mbtowc.c
+++ b/gl/mbtowc.c
@@ -1,5 +1,5 @@
 /* Convert multibyte character to wide character.
-   Copyright (C) 2011-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-2024 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 8e955793..67687a8f 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-2023
+/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2024
    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 97690f2c..0295d7e6 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-2023 Free Software Foundation, Inc.
+# Copyright (C) 2009-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
diff --git a/gl/minmax.h b/gl/minmax.h
index 1fbfc661..f3df58b0 100644
--- a/gl/minmax.h
+++ b/gl/minmax.h
@@ -1,5 +1,5 @@
 /* MIN, MAX macros.
-   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2023 Free Software
+   Copyright (C) 1995, 1998, 2001, 2003, 2005, 2009-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -23,6 +23,11 @@
    MIN, MAX macro redefinitions on some systems; the workaround is to
    #include this file as the last one among the #include list.  */
 
+/* This file uses HAVE_MINMAX_IN_LIMITS_H, HAVE_MINMAX_IN_SYS_PARAM_H.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Before we define the following symbols we get the <limits.h> file
    since otherwise we get redefinitions on some systems if <limits.h> is
    included after this file.  Likewise for <sys/param.h>.
diff --git a/gl/mktime-internal.h b/gl/mktime-internal.h
index 709c36bd..0693aaf1 100644
--- a/gl/mktime-internal.h
+++ b/gl/mktime-internal.h
@@ -1,5 +1,5 @@
 /* Internals of mktime and related functions
-   Copyright 2016-2023 Free Software Foundation, Inc.
+   Copyright 2016-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert <eggert@cs.ucla.edu>.
 
diff --git a/gl/mktime.c b/gl/mktime.c
index 94a4320e..c704f415 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1993-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert <eggert@twinsun.com>.
 
@@ -46,6 +46,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <stdckdint.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -379,7 +380,7 @@ __mktime_internal (struct tm *tp,
   /* Invert CONVERT by probing.  First assume the same offset as last
      time.  */
 
-  INT_SUBTRACT_WRAPV (0, off, &negative_offset_guess);
+  ckd_sub (&negative_offset_guess, 0, off);
   long_int t0 = ydhms_diff (year, yday, hour, min, sec,
                             EPOCH_YEAR - TM_YEAR_BASE, 0, 0, 0,
                             negative_offset_guess);
@@ -465,7 +466,7 @@ __mktime_internal (struct tm *tp,
         for (direction = -1; direction <= 1; direction += 2)
           {
             long_int ot;
-            if (! INT_ADD_WRAPV (t, delta * direction, &ot))
+            if (! ckd_add (&ot, t, delta * direction))
               {
                 struct tm otm;
                 if (! ranged_convert (convert, &ot, &otm))
@@ -503,8 +504,8 @@ __mktime_internal (struct tm *tp,
   /* Set *OFFSET to the low-order bits of T - T0 - NEGATIVE_OFFSET_GUESS.
      This is just a heuristic to speed up the next mktime call, and
      correctness is unaffected if integer overflow occurs here.  */
-  INT_SUBTRACT_WRAPV (t, t0, offset);
-  INT_SUBTRACT_WRAPV (*offset, negative_offset_guess, offset);
+  ckd_sub (offset, t, t0);
+  ckd_sub (offset, *offset, negative_offset_guess);
 
   if (LEAP_SECONDS_POSSIBLE && sec_requested != tm.tm_sec)
     {
@@ -513,7 +514,7 @@ __mktime_internal (struct tm *tp,
       long_int sec_adjustment = sec == 0 && tm.tm_sec == 60;
       sec_adjustment -= sec;
       sec_adjustment += sec_requested;
-      if (INT_ADD_WRAPV (t, sec_adjustment, &t)
+      if (ckd_add (&t, t, sec_adjustment)
           || ! (mktime_min <= t && t <= mktime_max))
         {
           __set_errno (EOVERFLOW);
diff --git a/gl/mountlist.c b/gl/mountlist.c
index 6d384812..06300d6b 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1991-1992, 1997-2024 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
@@ -154,11 +154,18 @@
 
 /* The results of opendir() in this file are not used with dirfd and fchdir,
    therefore save some unnecessary work in fchdir.c.  */
-#ifdef GNULIB_defined_opendir
+#ifdef GNULIB_defined_DIR
+# undef DIR
 # undef opendir
-#endif
-#ifdef GNULIB_defined_closedir
 # undef closedir
+# undef readdir
+#else
+# ifdef GNULIB_defined_opendir
+#  undef opendir
+# endif
+# ifdef GNULIB_defined_closedir
+#  undef closedir
+# endif
 #endif
 
 #define ME_DUMMY_0(Fs_name, Fs_type)            \
@@ -185,11 +192,11 @@
    we grant an exception to any with "bind" in its list of mount options.
    I.e., those are *not* dummy entries.  */
 #ifdef MOUNTED_GETMNTENT1
-# define ME_DUMMY(Fs_name, Fs_type, Bind)       \
-  (ME_DUMMY_0 (Fs_name, Fs_type)                \
+# define ME_DUMMY(Fs_name, Fs_type, Bind) \
+  (ME_DUMMY_0 (Fs_name, Fs_type) \
    || (strcmp (Fs_type, "none") == 0 && !Bind))
 #else
-# define ME_DUMMY(Fs_name, Fs_type)             \
+# define ME_DUMMY(Fs_name, Fs_type) \
   (ME_DUMMY_0 (Fs_name, Fs_type) || strcmp (Fs_type, "none") == 0)
 #endif
 
diff --git a/gl/mountlist.h b/gl/mountlist.h
index aed7f887..9728e38b 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-2023 Free Software
+   Copyright (C) 1991-1992, 1998, 2000-2005, 2009-2024 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -17,9 +17,19 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef MOUNTLIST_H_
-# define MOUNTLIST_H_
+#define MOUNTLIST_H_
+
+/* This file uses _GL_ATTRIBUTE_MALLOC.  */
+#if !_GL_CONFIG_H_INCLUDED
+# error "Please include config.h first."
+#endif
+
+#include <sys/types.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-# include <sys/types.h>
 
 /* A mount table entry. */
 struct mount_entry
@@ -40,4 +50,9 @@ struct mount_entry *read_file_system_list (bool need_fs_type)
   _GL_ATTRIBUTE_MALLOC;
 void free_mount_entry (struct mount_entry *entry);
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/gl/msvc-inval.c b/gl/msvc-inval.c
index c5149a8f..da3fc86a 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
diff --git a/gl/msvc-inval.h b/gl/msvc-inval.h
index ed00461f..7aee6e5d 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
@@ -52,6 +52,11 @@
        AC_DEFINE([MSVC_INVALID_PARAMETER_HANDLING], [SANE_LIBRARY_HANDLING])
  */
 
+/* This file uses HAVE_MSVC_INVALID_PARAMETER_HANDLER.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #define DEFAULT_HANDLING       0
 #define HAIRY_LIBRARY_HANDLING 1
 #define SANE_LIBRARY_HANDLING  2
diff --git a/gl/msvc-nothrow.c b/gl/msvc-nothrow.c
index f729fe66..06b35a61 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
diff --git a/gl/msvc-nothrow.h b/gl/msvc-nothrow.h
index 82d3f6a2..121773d1 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
@@ -25,11 +25,20 @@
    This file defines wrappers that turn such an invalid parameter notification
    into an error code.  */
 
+/* This file uses HAVE_MSVC_INVALID_PARAMETER_HANDLER.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #if defined _WIN32 && ! defined __CYGWIN__
 
 /* Get original declaration of _get_osfhandle.  */
 # include <io.h>
 
+# ifdef __cplusplus
+extern "C" {
+# endif
+
 # if HAVE_MSVC_INVALID_PARAMETER_HANDLER
 
 /* Override _get_osfhandle.  */
@@ -38,6 +47,10 @@ extern intptr_t _gl_nothrow_get_osfhandle (int fd);
 
 # endif
 
+# ifdef __cplusplus
+}
+# endif
+
 #endif
 
 #endif /* _MSVC_NOTHROW_H */
diff --git a/gl/netdb.in.h b/gl/netdb.in.h
index 9549cd73..43409b2f 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-2024 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This file is free software: you can redistribute it and/or modify
@@ -36,6 +36,11 @@
 #ifndef _@GUARD_PREFIX@_NETDB_H
 #define _@GUARD_PREFIX@_NETDB_H
 
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Get <netdb.h> definitions such as 'socklen_t' on IRIX 6.5 and OSF/1 4.0 and
    'struct hostent' on MinGW.  */
 #include <sys/socket.h>
diff --git a/gl/netinet_in.in.h b/gl/netinet_in.in.h
index f88923a3..4e9f6f2d 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
diff --git a/gl/nl_langinfo-lock.c b/gl/nl_langinfo-lock.c
index e5cdcd3e..5a248ed8 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2019-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
@@ -18,9 +18,10 @@
 
 #include <config.h>
 
+/* The option '--disable-threads' explicitly requests no locking.  */
 /* When it is known that the gl_get_nl_langinfo_lock function is defined
    by a dependency library, it should not be defined here.  */
-#if OMIT_NL_LANGINFO_LOCK
+#if AVOID_ANY_THREADS || OMIT_NL_LANGINFO_LOCK
 
 /* This declaration is solely to ensure that after preprocessing
    this file is never empty.  */
@@ -37,14 +38,14 @@ typedef int dummy;
 
 /* Macro for exporting a symbol (function, not variable) defined in this file,
    when compiled into a shared library.  */
-# ifndef DLL_EXPORTED
+# ifndef SHLIB_EXPORTED
 #  if HAVE_VISIBILITY
   /* Override the effect of the compiler option '-fvisibility=hidden'.  */
-#   define DLL_EXPORTED __attribute__((__visibility__("default")))
+#   define SHLIB_EXPORTED __attribute__((__visibility__("default")))
 #  elif defined _WIN32 || defined __CYGWIN__
-#   define DLL_EXPORTED __declspec(dllexport)
+#   define SHLIB_EXPORTED __declspec(dllexport)
 #  else
-#   define DLL_EXPORTED
+#   define SHLIB_EXPORTED
 #  endif
 # endif
 
@@ -59,7 +60,7 @@ typedef int dummy;
    because the latter is not guaranteed to be a stable ABI in the future.  */
 
 /* Make sure the function gets exported from DLLs.  */
-DLL_EXPORTED CRITICAL_SECTION *gl_get_nl_langinfo_lock (void);
+SHLIB_EXPORTED CRITICAL_SECTION *gl_get_nl_langinfo_lock (void);
 
 static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT;
 static CRITICAL_SECTION lock;
@@ -96,7 +97,7 @@ gl_get_nl_langinfo_lock (void)
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* Make sure the function gets exported from shared libraries.  */
-DLL_EXPORTED pthread_mutex_t *gl_get_nl_langinfo_lock (void);
+SHLIB_EXPORTED pthread_mutex_t *gl_get_nl_langinfo_lock (void);
 
 /* Returns the internal lock used by nl_langinfo.  */
 pthread_mutex_t *
@@ -123,7 +124,7 @@ atomic_init (void)
 }
 
 /* Make sure the function gets exported from shared libraries.  */
-DLL_EXPORTED mtx_t *gl_get_nl_langinfo_lock (void);
+SHLIB_EXPORTED mtx_t *gl_get_nl_langinfo_lock (void);
 
 /* Returns the internal lock used by nl_langinfo.  */
 mtx_t *
diff --git a/gl/nl_langinfo.c b/gl/nl_langinfo.c
index 131166fd..64ff93b0 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -30,7 +30,12 @@
 #endif
 
 #if REPLACE_NL_LANGINFO && !NL_LANGINFO_MTSAFE
-# if defined _WIN32 && !defined __CYGWIN__
+
+# 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>
@@ -51,6 +56,7 @@
 #  include <threads.h>
 
 # endif
+
 #endif
 
 /* nl_langinfo() must be multithread-safe.  To achieve this without using
@@ -70,6 +76,8 @@
 static char *
 ctype_codeset (void)
 {
+  /* This function is only used on platforms which don't have uselocale().
+     Therefore we don't need to look at the per-thread locale first, here.  */
   static char result[2 + 10 + 1];
   char buf[2 + 10 + 1];
   char locale[SETLOCALE_NULL_MAX];
@@ -184,7 +192,12 @@ nl_langinfo_unlocked (nl_item item)
 /* Prohibit renaming this symbol.  */
 #  undef gl_get_nl_langinfo_lock
 
-#  if defined _WIN32 && !defined __CYGWIN__
+#  if AVOID_ANY_THREADS
+
+/* The option '--disable-threads' explicitly requests no locking.  */
+#   define nl_langinfo_with_lock nl_langinfo_unlocked
+
+#  elif defined _WIN32 && !defined __CYGWIN__
 
 extern __declspec(dllimport) CRITICAL_SECTION *gl_get_nl_langinfo_lock (void);
 
@@ -449,7 +462,7 @@ nl_langinfo (nl_item item)
     {
       static char const months[][sizeof "September"] = {
         "January", "February", "March", "April", "May", "June", "July",
-        "September", "October", "November", "December"
+        "August", "September", "October", "November", "December"
       };
       case MON_1:
       case MON_2:
@@ -513,7 +526,7 @@ nl_langinfo (nl_item item)
         static char result[12][30];
         static char const abmonths[][sizeof "Jan"] = {
           "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul",
-          "Sep", "Oct", "Nov", "Dec"
+          "Aug", "Sep", "Oct", "Nov", "Dec"
         };
         tmm.tm_mon = item - ABMON_1;
         if (!strftime (buf, sizeof result[0], "%b", &tmm))
diff --git a/gl/open.c b/gl/open.c
index 7ec8fdc3..e690c9ea 100644
--- a/gl/open.c
+++ b/gl/open.c
@@ -1,5 +1,5 @@
 /* Open a descriptor to a file.
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -38,9 +38,13 @@ orig_open (const char *filename, int flags, mode_t mode)
 }
 
 /* Specification.  */
+#ifdef __osf__
 /* Write "fcntl.h" here, not <fcntl.h>, otherwise OSF/1 5.1 DTK cc eliminates
    this include because of the preliminary #include <fcntl.h> above.  */
-#include "fcntl.h"
+# include "fcntl.h"
+#else
+# include <fcntl.h>
+#endif
 
 #include "cloexec.h"
 
diff --git a/gl/pathmax.h b/gl/pathmax.h
index 0dd8f3bc..d6512c6f 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-2023 Free Software
+   Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -39,6 +39,11 @@
          #endif
  */
 
+/* This file uses HAVE_SYS_PARAM_H.  */
+# if !_GL_CONFIG_H_INCLUDED
+#  error "Please include config.h first."
+# endif
+
 # include <unistd.h>
 
 # include <limits.h>
diff --git a/gl/printf-args.c b/gl/printf-args.c
index 5e14f654..eb0d2cdc 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-2023 Free Software
+   Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -29,6 +29,9 @@
 # include "printf-args.h"
 #endif
 
+/* Get INT_WIDTH.  */
+#include <limits.h>
+
 #ifdef STATIC
 STATIC
 #endif
@@ -71,6 +74,102 @@ PRINTF_FETCHARGS (va_list args, arguments *a)
       case TYPE_ULONGLONGINT:
         ap->a.a_ulonglongint = va_arg (args, unsigned long long int);
         break;
+      case TYPE_INT8_T:
+        #if INT8_WIDTH < INT_WIDTH
+        ap->a.a_int8_t = va_arg (args, /* int8_t */ int);
+        #else
+        ap->a.a_int8_t = va_arg (args, int8_t);
+        #endif
+        break;
+      case TYPE_UINT8_T:
+        #if UINT8_WIDTH < INT_WIDTH
+        ap->a.a_uint8_t = va_arg (args, /* uint8_t */ int);
+        #else
+        ap->a.a_uint8_t = va_arg (args, uint8_t);
+        #endif
+        break;
+      case TYPE_INT16_T:
+        #if INT16_WIDTH < INT_WIDTH
+        ap->a.a_int16_t = va_arg (args, /* int16_t */ int);
+        #else
+        ap->a.a_int16_t = va_arg (args, int16_t);
+        #endif
+        break;
+      case TYPE_UINT16_T:
+        #if UINT16_WIDTH < INT_WIDTH
+        ap->a.a_uint16_t = va_arg (args, /* uint16_t */ int);
+        #else
+        ap->a.a_uint16_t = va_arg (args, uint16_t);
+        #endif
+        break;
+      case TYPE_INT32_T:
+        #if INT32_WIDTH < INT_WIDTH
+        ap->a.a_int32_t = va_arg (args, /* int32_t */ int);
+        #else
+        ap->a.a_int32_t = va_arg (args, int32_t);
+        #endif
+        break;
+      case TYPE_UINT32_T:
+        #if UINT32_WIDTH < INT_WIDTH
+        ap->a.a_uint32_t = va_arg (args, /* uint32_t */ int);
+        #else
+        ap->a.a_uint32_t = va_arg (args, uint32_t);
+        #endif
+        break;
+      case TYPE_INT64_T:
+        ap->a.a_int64_t = va_arg (args, int64_t);
+        break;
+      case TYPE_UINT64_T:
+        ap->a.a_uint64_t = va_arg (args, uint64_t);
+        break;
+      case TYPE_INT_FAST8_T:
+        #if INT_FAST8_WIDTH < INT_WIDTH
+        ap->a.a_int_fast8_t = va_arg (args, /* int_fast8_t */ int);
+        #else
+        ap->a.a_int_fast8_t = va_arg (args, int_fast8_t);
+        #endif
+        break;
+      case TYPE_UINT_FAST8_T:
+        #if UINT_FAST8_WIDTH < INT_WIDTH
+        ap->a.a_uint_fast8_t = va_arg (args, /* uint_fast8_t */ int);
+        #else
+        ap->a.a_uint_fast8_t = va_arg (args, uint_fast8_t);
+        #endif
+        break;
+      case TYPE_INT_FAST16_T:
+        #if INT_FAST16_WIDTH < INT_WIDTH
+        ap->a.a_int_fast16_t = va_arg (args, /* int_fast16_t */ int);
+        #else
+        ap->a.a_int_fast16_t = va_arg (args, int_fast16_t);
+        #endif
+        break;
+      case TYPE_UINT_FAST16_T:
+        #if UINT_FAST16_WIDTH < INT_WIDTH
+        ap->a.a_uint_fast16_t = va_arg (args, /* uint_fast16_t */ int);
+        #else
+        ap->a.a_uint_fast16_t = va_arg (args, uint_fast16_t);
+        #endif
+        break;
+      case TYPE_INT_FAST32_T:
+        #if INT_FAST32_WIDTH < INT_WIDTH
+        ap->a.a_int_fast32_t = va_arg (args, /* int_fast32_t */ int);
+        #else
+        ap->a.a_int_fast32_t = va_arg (args, int_fast32_t);
+        #endif
+        break;
+      case TYPE_UINT_FAST32_T:
+        #if UINT_FAST32_WIDTH < INT_WIDTH
+        ap->a.a_uint_fast32_t = va_arg (args, /* uint_fast32_t */ int);
+        #else
+        ap->a.a_uint_fast32_t = va_arg (args, uint_fast32_t);
+        #endif
+        break;
+      case TYPE_INT_FAST64_T:
+        ap->a.a_int_fast64_t = va_arg (args, int_fast64_t);
+        break;
+      case TYPE_UINT_FAST64_T:
+        ap->a.a_uint_fast64_t = va_arg (args, uint_fast64_t);
+        break;
       case TYPE_DOUBLE:
         ap->a.a_double = va_arg (args, double);
         break;
@@ -136,6 +235,30 @@ PRINTF_FETCHARGS (va_list args, arguments *a)
       case TYPE_COUNT_LONGLONGINT_POINTER:
         ap->a.a_count_longlongint_pointer = va_arg (args, long long int *);
         break;
+      case TYPE_COUNT_INT8_T_POINTER:
+        ap->a.a_count_int8_t_pointer = va_arg (args, int8_t *);
+        break;
+      case TYPE_COUNT_INT16_T_POINTER:
+        ap->a.a_count_int16_t_pointer = va_arg (args, int16_t *);
+        break;
+      case TYPE_COUNT_INT32_T_POINTER:
+        ap->a.a_count_int32_t_pointer = va_arg (args, int32_t *);
+        break;
+      case TYPE_COUNT_INT64_T_POINTER:
+        ap->a.a_count_int64_t_pointer = va_arg (args, int64_t *);
+        break;
+      case TYPE_COUNT_INT_FAST8_T_POINTER:
+        ap->a.a_count_int_fast8_t_pointer = va_arg (args, int_fast8_t *);
+        break;
+      case TYPE_COUNT_INT_FAST16_T_POINTER:
+        ap->a.a_count_int_fast16_t_pointer = va_arg (args, int_fast16_t *);
+        break;
+      case TYPE_COUNT_INT_FAST32_T_POINTER:
+        ap->a.a_count_int_fast32_t_pointer = va_arg (args, int_fast32_t *);
+        break;
+      case TYPE_COUNT_INT_FAST64_T_POINTER:
+        ap->a.a_count_int_fast64_t_pointer = va_arg (args, int_fast64_t *);
+        break;
 #if ENABLE_UNISTDIO
       /* The unistdio extensions.  */
       case TYPE_U8_STRING:
diff --git a/gl/printf-args.h b/gl/printf-args.h
index f303cb19..9b80bb39 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-2023 Free Software
+   Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -41,6 +41,9 @@
 # include <wchar.h>
 #endif
 
+/* Get intN_t, uintN_t, intN_fast_t, uintN_fast_t.  */
+#include <stdint.h>
+
 /* Get va_list.  */
 #include <stdarg.h>
 
@@ -59,6 +62,26 @@ typedef enum
   TYPE_ULONGINT,
   TYPE_LONGLONGINT,
   TYPE_ULONGLONGINT,
+  /* According to ISO C 23 § 7.23.6.1, "all exact-width integer types",
+     "all minimum-width integer types", and "all fastest minimum-width integer
+     types" defined in <stdint.h> should be supported.  But for portability
+     between platforms, we support only those with N = 8, 16, 32, 64.  */
+  TYPE_INT8_T,
+  TYPE_UINT8_T,
+  TYPE_INT16_T,
+  TYPE_UINT16_T,
+  TYPE_INT32_T,
+  TYPE_UINT32_T,
+  TYPE_INT64_T,
+  TYPE_UINT64_T,
+  TYPE_INT_FAST8_T,
+  TYPE_UINT_FAST8_T,
+  TYPE_INT_FAST16_T,
+  TYPE_UINT_FAST16_T,
+  TYPE_INT_FAST32_T,
+  TYPE_UINT_FAST32_T,
+  TYPE_INT_FAST64_T,
+  TYPE_UINT_FAST64_T,
   TYPE_DOUBLE,
   TYPE_LONGDOUBLE,
   TYPE_CHAR,
@@ -74,7 +97,15 @@ typedef enum
   TYPE_COUNT_SHORT_POINTER,
   TYPE_COUNT_INT_POINTER,
   TYPE_COUNT_LONGINT_POINTER,
-  TYPE_COUNT_LONGLONGINT_POINTER
+  TYPE_COUNT_LONGLONGINT_POINTER,
+  TYPE_COUNT_INT8_T_POINTER,
+  TYPE_COUNT_INT16_T_POINTER,
+  TYPE_COUNT_INT32_T_POINTER,
+  TYPE_COUNT_INT64_T_POINTER,
+  TYPE_COUNT_INT_FAST8_T_POINTER,
+  TYPE_COUNT_INT_FAST16_T_POINTER,
+  TYPE_COUNT_INT_FAST32_T_POINTER,
+  TYPE_COUNT_INT_FAST64_T_POINTER
 #if ENABLE_UNISTDIO
   /* The unistdio extensions.  */
 , TYPE_U8_STRING
@@ -99,7 +130,23 @@ typedef struct
     unsigned long int           a_ulongint;
     long long int               a_longlongint;
     unsigned long long int      a_ulonglongint;
-    float                       a_float;
+    int8_t                      a_int8_t;
+    uint8_t                     a_uint8_t;
+    int16_t                     a_int16_t;
+    uint16_t                    a_uint16_t;
+    int32_t                     a_int32_t;
+    uint32_t                    a_uint32_t;
+    int64_t                     a_int64_t;
+    uint64_t                    a_uint64_t;
+    int_fast8_t                 a_int_fast8_t;
+    uint_fast8_t                a_uint_fast8_t;
+    int_fast16_t                a_int_fast16_t;
+    uint_fast16_t               a_uint_fast16_t;
+    int_fast32_t                a_int_fast32_t;
+    uint_fast32_t               a_uint_fast32_t;
+    int_fast64_t                a_int_fast64_t;
+    uint_fast64_t               a_uint_fast64_t;
+    float                       a_float;                     /* unused */
     double                      a_double;
     long double                 a_longdouble;
     int                         a_char;
@@ -116,6 +163,14 @@ typedef struct
     int *                       a_count_int_pointer;
     long int *                  a_count_longint_pointer;
     long long int *             a_count_longlongint_pointer;
+    int8_t *                    a_count_int8_t_pointer;
+    int16_t *                   a_count_int16_t_pointer;
+    int32_t *                   a_count_int32_t_pointer;
+    int64_t *                   a_count_int64_t_pointer;
+    int_fast8_t *               a_count_int_fast8_t_pointer;
+    int_fast16_t *              a_count_int_fast16_t_pointer;
+    int_fast32_t *              a_count_int_fast32_t_pointer;
+    int_fast64_t *              a_count_int_fast64_t_pointer;
 #if ENABLE_UNISTDIO
     /* The unistdio extensions.  */
     const uint8_t *             a_u8_string;
diff --git a/gl/printf-parse.c b/gl/printf-parse.c
index 3040749a..a33e27a0 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999-2000, 2002-2003, 2006-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
@@ -326,226 +326,320 @@ PRINTF_PARSE (const CHAR_T *format, DIRECTIVES *d, arguments *a)
             arg_type type;
 
             /* Parse argument type/size specifiers.  */
-            {
-              int flags = 0;
-
-              for (;;)
-                {
-                  if (*cp == 'h')
-                    {
-                      flags |= (1 << (flags & 1));
-                      cp++;
-                    }
-                  else if (*cp == 'L')
-                    {
-                      flags |= 4;
-                      cp++;
-                    }
-                  else if (*cp == 'l')
-                    {
-                      flags += 8;
-                      cp++;
-                    }
-                  else if (*cp == 'j')
-                    {
-                      if (sizeof (intmax_t) > sizeof (long))
-                        {
-                          /* intmax_t = long long */
-                          flags += 16;
-                        }
-                      else if (sizeof (intmax_t) > sizeof (int))
-                        {
-                          /* intmax_t = long */
-                          flags += 8;
-                        }
-                      cp++;
-                    }
-                  else if (*cp == 'z' || *cp == 'Z')
-                    {
-                      /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
-                         because the warning facility in gcc-2.95.2 understands
-                         only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784).  */
-                      if (sizeof (size_t) > sizeof (long))
-                        {
-                          /* size_t = long long */
-                          flags += 16;
-                        }
-                      else if (sizeof (size_t) > sizeof (int))
-                        {
-                          /* size_t = long */
-                          flags += 8;
-                        }
-                      cp++;
-                    }
-                  else if (*cp == 't')
-                    {
-                      if (sizeof (ptrdiff_t) > sizeof (long))
-                        {
-                          /* ptrdiff_t = long long */
-                          flags += 16;
-                        }
-                      else if (sizeof (ptrdiff_t) > sizeof (int))
-                        {
-                          /* ptrdiff_t = long */
-                          flags += 8;
-                        }
-                      cp++;
-                    }
+            /* Relevant for the conversion characters d, i.  */
+            arg_type signed_type = TYPE_INT;
+            /* Relevant for the conversion characters b, o, u, x, X.  */
+            arg_type unsigned_type = TYPE_UINT;
+            /* Relevant for the conversion characters n.  */
+            arg_type pointer_type = TYPE_COUNT_INT_POINTER;
+            /* Relevant for the conversion characters a, A, e, E, f, F, g, G.  */
+            arg_type floatingpoint_type = TYPE_DOUBLE;
+
+            if (*cp == 'h')
+              {
+                if (cp[1] == 'h')
+                  {
+                    signed_type = TYPE_SCHAR;
+                    unsigned_type = TYPE_UCHAR;
+                    pointer_type = TYPE_COUNT_SCHAR_POINTER;
+                    cp += 2;
+                  }
+                else
+                  {
+                    signed_type = TYPE_SHORT;
+                    unsigned_type = TYPE_USHORT;
+                    pointer_type = TYPE_COUNT_SHORT_POINTER;
+                    cp++;
+                  }
+              }
+            else if (*cp == 'l')
+              {
+                if (cp[1] == 'l')
+                  {
+                    signed_type = TYPE_LONGLONGINT;
+                    unsigned_type = TYPE_ULONGLONGINT;
+                    pointer_type = TYPE_COUNT_LONGLONGINT_POINTER;
+                    /* For backward compatibility only.  */
+                    floatingpoint_type = TYPE_LONGDOUBLE;
+                    cp += 2;
+                  }
+                else
+                  {
+                    signed_type = TYPE_LONGINT;
+                    unsigned_type = TYPE_ULONGINT;
+                    pointer_type = TYPE_COUNT_LONGINT_POINTER;
+                    cp++;
+                  }
+              }
+            else if (*cp == 'j')
+              {
+                if (sizeof (intmax_t) > sizeof (long))
+                  {
+                    /* intmax_t = long long */
+                    signed_type = TYPE_LONGLONGINT;
+                    unsigned_type = TYPE_ULONGLONGINT;
+                    pointer_type = TYPE_COUNT_LONGLONGINT_POINTER;
+                    /* For backward compatibility only.  */
+                    floatingpoint_type = TYPE_LONGDOUBLE;
+                  }
+                else if (sizeof (intmax_t) > sizeof (int))
+                  {
+                    /* intmax_t = long */
+                    signed_type = TYPE_LONGINT;
+                    unsigned_type = TYPE_ULONGINT;
+                    pointer_type = TYPE_COUNT_LONGINT_POINTER;
+                  }
+                cp++;
+              }
+            else if (*cp == 'z' || *cp == 'Z')
+              {
+                /* 'z' is standardized in ISO C 99, but glibc uses 'Z'
+                   because the warning facility in gcc-2.95.2 understands
+                   only 'Z' (see gcc-2.95.2/gcc/c-common.c:1784).  */
+                if (sizeof (size_t) > sizeof (long))
+                  {
+                    /* size_t = unsigned long long */
+                    signed_type = TYPE_LONGLONGINT;
+                    unsigned_type = TYPE_ULONGLONGINT;
+                    pointer_type = TYPE_COUNT_LONGLONGINT_POINTER;
+                    /* For backward compatibility only.  */
+                    floatingpoint_type = TYPE_LONGDOUBLE;
+                  }
+                else if (sizeof (size_t) > sizeof (int))
+                  {
+                    /* size_t = unsigned long */
+                    signed_type = TYPE_LONGINT;
+                    unsigned_type = TYPE_ULONGINT;
+                    pointer_type = TYPE_COUNT_LONGINT_POINTER;
+                  }
+                cp++;
+              }
+            else if (*cp == 't')
+              {
+                if (sizeof (ptrdiff_t) > sizeof (long))
+                  {
+                    /* ptrdiff_t = long long */
+                    signed_type = TYPE_LONGLONGINT;
+                    unsigned_type = TYPE_ULONGLONGINT;
+                    pointer_type = TYPE_COUNT_LONGLONGINT_POINTER;
+                    /* For backward compatibility only.  */
+                    floatingpoint_type = TYPE_LONGDOUBLE;
+                  }
+                else if (sizeof (ptrdiff_t) > sizeof (int))
+                  {
+                    /* ptrdiff_t = long */
+                    signed_type = TYPE_LONGINT;
+                    unsigned_type = TYPE_ULONGINT;
+                    pointer_type = TYPE_COUNT_LONGINT_POINTER;
+                  }
+                cp++;
+              }
+            else if (*cp == 'w')
+              {
+                /* wN and wfN are standardized in ISO C 23.  */
+                if (cp[1] == 'f')
+                  {
+                    if (cp[2] == '8')
+                      {
+                        signed_type = TYPE_INT_FAST8_T;
+                        unsigned_type = TYPE_UINT_FAST8_T;
+                        pointer_type = TYPE_COUNT_INT_FAST8_T_POINTER;
+                        cp += 3;
+                      }
+                    else if (cp[2] == '1' && cp[3] == '6')
+                      {
+                        signed_type = TYPE_INT_FAST16_T;
+                        unsigned_type = TYPE_UINT_FAST16_T;
+                        pointer_type = TYPE_COUNT_INT_FAST16_T_POINTER;
+                        cp += 4;
+                      }
+                    else if (cp[2] == '3' && cp[3] == '2')
+                      {
+                        signed_type = TYPE_INT_FAST32_T;
+                        unsigned_type = TYPE_UINT_FAST32_T;
+                        pointer_type = TYPE_COUNT_INT_FAST32_T_POINTER;
+                        cp += 4;
+                      }
+                    else if (cp[2] == '6' && cp[3] == '4')
+                      {
+                        signed_type = TYPE_INT_FAST64_T;
+                        unsigned_type = TYPE_UINT_FAST64_T;
+                        pointer_type = TYPE_COUNT_INT_FAST64_T_POINTER;
+                        cp += 4;
+                      }
+                  }
+                else
+                  {
+                    if (cp[1] == '8')
+                      {
+                        signed_type = TYPE_INT8_T;
+                        unsigned_type = TYPE_UINT8_T;
+                        pointer_type = TYPE_COUNT_INT8_T_POINTER;
+                        cp += 2;
+                      }
+                    else if (cp[1] == '1' && cp[2] == '6')
+                      {
+                        signed_type = TYPE_INT16_T;
+                        unsigned_type = TYPE_UINT16_T;
+                        pointer_type = TYPE_COUNT_INT16_T_POINTER;
+                        cp += 3;
+                      }
+                    else if (cp[1] == '3' && cp[2] == '2')
+                      {
+                        signed_type = TYPE_INT32_T;
+                        unsigned_type = TYPE_UINT32_T;
+                        pointer_type = TYPE_COUNT_INT32_T_POINTER;
+                        cp += 3;
+                      }
+                    else if (cp[1] == '6' && cp[2] == '4')
+                      {
+                        signed_type = TYPE_INT64_T;
+                        unsigned_type = TYPE_UINT64_T;
+                        pointer_type = TYPE_COUNT_INT64_T_POINTER;
+                        cp += 3;
+                      }
+                  }
+              }
+            else if (*cp == 'L')
+              {
+                signed_type = TYPE_LONGLONGINT;
+                unsigned_type = TYPE_ULONGLONGINT;
+                pointer_type = TYPE_COUNT_LONGLONGINT_POINTER;
+                floatingpoint_type = TYPE_LONGDOUBLE;
+                cp++;
+              }
 #if defined __APPLE__ && defined __MACH__
-                  /* On Mac OS X 10.3, PRIdMAX is defined as "qd".
-                     We cannot change it to "lld" because PRIdMAX must also
-                     be understood by the system's printf routines.  */
-                  else if (*cp == 'q')
-                    {
-                      if (64 / 8 > sizeof (long))
-                        {
-                          /* int64_t = long long */
-                          flags += 16;
-                        }
-                      else
-                        {
-                          /* int64_t = long */
-                          flags += 8;
-                        }
-                      cp++;
-                    }
+            /* On Mac OS X 10.3, PRIdMAX is defined as "qd".
+               We cannot change it to "lld" because PRIdMAX must also
+               be understood by the system's printf routines.  */
+            else if (*cp == 'q')
+              {
+                if (64 / 8 > sizeof (long))
+                  {
+                    /* int64_t = long long */
+                    signed_type = TYPE_LONGLONGINT;
+                    unsigned_type = TYPE_ULONGLONGINT;
+                    pointer_type = TYPE_COUNT_LONGLONGINT_POINTER;
+                    /* For backward compatibility only.  */
+                    floatingpoint_type = TYPE_LONGDOUBLE;
+                  }
+                else
+                  {
+                    /* int64_t = long */
+                    signed_type = TYPE_LONGINT;
+                    unsigned_type = TYPE_ULONGINT;
+                    pointer_type = TYPE_COUNT_LONGINT_POINTER;
+                  }
+                cp++;
+              }
 #endif
 #if defined _WIN32 && ! defined __CYGWIN__
-                  /* On native Windows, PRIdMAX is defined as "I64d".
-                     We cannot change it to "lld" because PRIdMAX must also
-                     be understood by the system's printf routines.  */
-                  else if (*cp == 'I' && cp[1] == '6' && cp[2] == '4')
-                    {
-                      if (64 / 8 > sizeof (long))
-                        {
-                          /* __int64 = long long */
-                          flags += 16;
-                        }
-                      else
-                        {
-                          /* __int64 = long */
-                          flags += 8;
-                        }
-                      cp += 3;
-                    }
+            /* On native Windows, PRIdMAX is defined as "I64d".
+               We cannot change it to "lld" because PRIdMAX must also
+               be understood by the system's printf routines.  */
+            else if (*cp == 'I' && cp[1] == '6' && cp[2] == '4')
+              {
+                if (64 / 8 > sizeof (long))
+                  {
+                    /* __int64_t = long long */
+                    signed_type = TYPE_LONGLONGINT;
+                    unsigned_type = TYPE_ULONGLONGINT;
+                    pointer_type = TYPE_COUNT_LONGLONGINT_POINTER;
+                    /* For backward compatibility only.  */
+                    floatingpoint_type = TYPE_LONGDOUBLE;
+                  }
+                else
+                  {
+                    /* __int64_t = long */
+                    signed_type = TYPE_LONGINT;
+                    unsigned_type = TYPE_ULONGINT;
+                    pointer_type = TYPE_COUNT_LONGINT_POINTER;
+                  }
+                cp += 3;
+              }
 #endif
-                  else
-                    break;
-                }
+            (void) pointer_type;
 
-              /* Read the conversion character.  */
-              c = *cp++;
-              switch (c)
-                {
-                case 'd': case 'i':
-                  /* If 'long long' is larger than 'long':  */
-                  if (flags >= 16 || (flags & 4))
-                    type = TYPE_LONGLONGINT;
-                  else
-                  /* If 'long long' is the same as 'long', we parse "lld" into
-                     TYPE_LONGINT.  */
-                  if (flags >= 8)
-                    type = TYPE_LONGINT;
-                  else if (flags & 2)
-                    type = TYPE_SCHAR;
-                  else if (flags & 1)
-                    type = TYPE_SHORT;
-                  else
-                    type = TYPE_INT;
-                  break;
-                case 'o': case 'u': case 'x': case 'X':
-                  /* If 'unsigned long long' is larger than 'unsigned long':  */
-                  if (flags >= 16 || (flags & 4))
-                    type = TYPE_ULONGLONGINT;
-                  else
-                  /* If 'unsigned long long' is the same as 'unsigned long', we
-                     parse "llu" into TYPE_ULONGINT.  */
-                  if (flags >= 8)
-                    type = TYPE_ULONGINT;
-                  else if (flags & 2)
-                    type = TYPE_UCHAR;
-                  else if (flags & 1)
-                    type = TYPE_USHORT;
-                  else
-                    type = TYPE_UINT;
-                  break;
-                case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
-                case 'a': case 'A':
-                  if (flags >= 16 || (flags & 4))
-                    type = TYPE_LONGDOUBLE;
-                  else
-                    type = TYPE_DOUBLE;
-                  break;
-                case 'c':
-                  if (flags >= 8)
+            /* Read the conversion character.  */
+            c = *cp++;
+            switch (c)
+              {
+              case 'd': case 'i':
+                type = signed_type;
+                break;
+              case 'b': case 'o': case 'u': case 'x': case 'X':
+              #if SUPPORT_GNU_PRINTF_DIRECTIVES \
+                  || (__GLIBC__ + (__GLIBC_MINOR__ >= 35) > 2)
+              case 'B':
+              #endif
+                type = unsigned_type;
+                break;
+              case 'f': case 'F': case 'e': case 'E': case 'g': case 'G':
+              case 'a': case 'A':
+                type = floatingpoint_type;
+                break;
+              case 'c':
+                if (signed_type == TYPE_LONGINT
+                    /* For backward compatibility only.  */
+                    || signed_type == TYPE_LONGLONGINT)
 #if HAVE_WINT_T
-                    type = TYPE_WIDE_CHAR;
+                  type = TYPE_WIDE_CHAR;
 #else
-                    goto error;
+                  goto error;
 #endif
-                  else
-                    type = TYPE_CHAR;
-                  break;
+                else
+                  type = TYPE_CHAR;
+                break;
 #if HAVE_WINT_T
-                case 'C':
-                  type = TYPE_WIDE_CHAR;
-                  c = 'c';
-                  break;
+              case 'C':
+                type = TYPE_WIDE_CHAR;
+                c = 'c';
+                break;
 #endif
-                case 's':
-                  if (flags >= 8)
+              case 's':
+                if (signed_type == TYPE_LONGINT
+                    /* For backward compatibility only.  */
+                    || signed_type == TYPE_LONGLONGINT)
 #if HAVE_WCHAR_T
-                    type = TYPE_WIDE_STRING;
+                  type = TYPE_WIDE_STRING;
 #else
-                    goto error;
+                  goto error;
 #endif
-                  else
-                    type = TYPE_STRING;
-                  break;
+                else
+                  type = TYPE_STRING;
+                break;
 #if HAVE_WCHAR_T
-                case 'S':
-                  type = TYPE_WIDE_STRING;
-                  c = 's';
-                  break;
+              case 'S':
+                type = TYPE_WIDE_STRING;
+                c = 's';
+                break;
+#endif
+              case 'p':
+                type = TYPE_POINTER;
+                break;
+#if NEED_PRINTF_WITH_N_DIRECTIVE
+              case 'n':
+                type = pointer_type;
+                break;
 #endif
-                case 'p':
-                  type = TYPE_POINTER;
-                  break;
-                case 'n':
-                  /* If 'long long' is larger than 'long':  */
-                  if (flags >= 16 || (flags & 4))
-                    type = TYPE_COUNT_LONGLONGINT_POINTER;
-                  else
-                  /* If 'long long' is the same as 'long', we parse "lln" into
-                     TYPE_COUNT_LONGINT_POINTER.  */
-                  if (flags >= 8)
-                    type = TYPE_COUNT_LONGINT_POINTER;
-                  else if (flags & 2)
-                    type = TYPE_COUNT_SCHAR_POINTER;
-                  else if (flags & 1)
-                    type = TYPE_COUNT_SHORT_POINTER;
-                  else
-                    type = TYPE_COUNT_INT_POINTER;
-                  break;
 #if ENABLE_UNISTDIO
-                /* The unistdio extensions.  */
-                case 'U':
-                  if (flags >= 16)
-                    type = TYPE_U32_STRING;
-                  else if (flags >= 8)
-                    type = TYPE_U16_STRING;
-                  else
-                    type = TYPE_U8_STRING;
-                  break;
+              /* The unistdio extensions.  */
+              case 'U':
+                if (signed_type == TYPE_LONGLONGINT)
+                  type = TYPE_U32_STRING;
+                else if (signed_type == TYPE_LONGINT)
+                  type = TYPE_U16_STRING;
+                else
+                  type = TYPE_U8_STRING;
+                break;
 #endif
-                case '%':
-                  type = TYPE_NONE;
-                  break;
-                default:
-                  /* Unknown conversion character.  */
-                  goto error;
-                }
-            }
+              case '%':
+                type = TYPE_NONE;
+                break;
+              default:
+                /* Unknown conversion character.  */
+                goto error;
+              }
 
             if (type != TYPE_NONE)
               {
diff --git a/gl/printf-parse.h b/gl/printf-parse.h
index 1f86e32c..949b8754 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-2023 Free Software
+   Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
@@ -61,7 +61,7 @@ typedef struct
   const char* precision_start;
   const char* precision_end;
   size_t precision_arg_index;
-  char conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */
+  char conversion; /* d i b B o u x X f F e E g G a A c s p n U % but not C S */
   size_t arg_index;
 }
 char_directive;
@@ -91,7 +91,7 @@ typedef struct
   const uint8_t* precision_start;
   const uint8_t* precision_end;
   size_t precision_arg_index;
-  uint8_t conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */
+  uint8_t conversion; /* d i b B o u x X f F e E g G a A c s p n U % but not C S */
   size_t arg_index;
 }
 u8_directive;
@@ -119,7 +119,7 @@ typedef struct
   const uint16_t* precision_start;
   const uint16_t* precision_end;
   size_t precision_arg_index;
-  uint16_t conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */
+  uint16_t conversion; /* d i b B o u x X f F e E g G a A c s p n U % but not C S */
   size_t arg_index;
 }
 u16_directive;
@@ -147,7 +147,7 @@ typedef struct
   const uint32_t* precision_start;
   const uint32_t* precision_end;
   size_t precision_arg_index;
-  uint32_t conversion; /* d i o u x X f F e E g G a A c s p n U % but not C S */
+  uint32_t conversion; /* d i b B o u x X f F e E g G a A c s p n U % but not C S */
   size_t arg_index;
 }
 u32_directive;
diff --git a/gl/realloc.c b/gl/realloc.c
index 1063eb09..05731396 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-2023 Free Software
+   Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2024 Free Software
    Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/reallocarray.c b/gl/reallocarray.c
index 8c99250f..09711a0e 100644
--- a/gl/reallocarray.c
+++ b/gl/reallocarray.c
@@ -1,6 +1,6 @@
 /* reallocarray function that is glibc compatible.
 
-   Copyright (C) 2017-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-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
diff --git a/gl/regcomp.c b/gl/regcomp.c
index 89478396..696cf813 100644
--- a/gl/regcomp.c
+++ b/gl/regcomp.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -905,7 +905,7 @@ init_word_char (re_dfa_t *dfa)
       bitset_word_t bits3 = 0x07fffffe;
       if (BITSET_WORD_BITS == 64)
         {
-          /* Pacify gcc -Woverflow on 32-bit platformns.  */
+          /* Pacify gcc -Woverflow on 32-bit platforms.  */
           dfa->word_char[0] = bits1 << 31 << 1 | bits0;
           dfa->word_char[1] = bits3 << 31 << 1 | bits2;
           i = 2;
diff --git a/gl/regex.c b/gl/regex.c
index 3beb0deb..4b1a6ed6 100644
--- a/gl/regex.c
+++ b/gl/regex.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -26,10 +26,6 @@
 #  pragma GCC diagnostic ignored "-Wsuggest-attribute=pure"
 #  pragma GCC diagnostic ignored "-Wvla"
 # endif
-# if __GNUC_PREREQ (4, 3)
-#  pragma GCC diagnostic ignored "-Wold-style-definition"
-#  pragma GCC diagnostic ignored "-Wtype-limits"
-# endif
 #endif
 
 /* Make sure no one compiles this code with a C++ compiler.  */
diff --git a/gl/regex.h b/gl/regex.h
index 9ef0252f..ccf40ceb 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989-2024 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/regex_internal.c b/gl/regex_internal.c
index 998a19b7..8cd096eb 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 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_internal.h b/gl/regex_internal.h
index 149ec2e8..6165cb17 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -29,6 +29,7 @@
 #include <locale.h>
 #include <wchar.h>
 #include <wctype.h>
+#include <stdckdint.h>
 #include <stdint.h>
 
 #ifndef _LIBC
@@ -150,9 +151,6 @@
    as some non-GCC platforms lack them, an issue when this code is
    used in Gnulib.  */
 
-#ifndef SSIZE_MAX
-# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
-#endif
 #ifndef ULONG_WIDTH
 # define ULONG_WIDTH REGEX_UINTEGER_WIDTH (ULONG_MAX)
 /* The number of usable bits in an unsigned integer type with maximum
@@ -822,7 +820,7 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
 }
 
 #ifdef _LIBC
-# if __GNUC__ >= 7
+# if __glibc_has_attribute (__fallthrough__)
 #  define FALLTHROUGH __attribute__ ((__fallthrough__))
 # else
 #  define FALLTHROUGH ((void) 0)
diff --git a/gl/regexec.c b/gl/regexec.c
index 13e0349e..9f065dfa 100644
--- a/gl/regexec.c
+++ b/gl/regexec.c
@@ -1,5 +1,5 @@
 /* Extended regular expression matching and search library.
-   Copyright (C) 2002-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2024 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>.
 
@@ -324,7 +324,7 @@ re_search_2_stub (struct re_pattern_buffer *bufp, const char *string1,
   char *s = NULL;
 
   if (__glibc_unlikely ((length1 < 0 || length2 < 0 || stop < 0
-                         || INT_ADD_WRAPV (length1, length2, &len))))
+                         || ckd_add (&len, length1, length2))))
     return -2;
 
   /* Concatenate the strings.  */
diff --git a/gl/setenv.c b/gl/setenv.c
index f0b88996..9e2e9e2f 100644
--- a/gl/setenv.c
+++ b/gl/setenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2003, 2005-2023 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2003, 2005-2024 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
@@ -82,6 +82,7 @@ typedef int (*compar_fn_t) (const void *, const void *);
 static void *known_values;
 
 # define KNOWN_VALUE(Str) \
+  __extension__                                                               \
   ({                                                                          \
     void *value = tfind (Str, &known_values, (compar_fn_t) strcmp);           \
     value != NULL ? *(char **) value : NULL;                                  \
@@ -375,6 +376,11 @@ rpl_setenv (const char *name, const char *value, int replace)
           int saved_errno;
           size_t len = strlen (value);
           tmp = malloca (len + 2);
+          if (tmp == NULL)
+            {
+              errno = ENOMEM;
+              return -1;
+            }
           /* Since leading '=' is eaten, double it up.  */
           *tmp = '=';
           memcpy (tmp + 1, value, len + 1);
diff --git a/gl/setlocale-lock.c b/gl/setlocale-lock.c
index b70ba09b..192489c4 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2019-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
@@ -18,9 +18,10 @@
 
 #include <config.h>
 
+/* The option '--disable-threads' explicitly requests no locking.  */
 /* When it is known that the gl_get_setlocale_null_lock function is defined
    by a dependency library, it should not be defined here.  */
-#if OMIT_SETLOCALE_LOCK
+#if AVOID_ANY_THREADS || OMIT_SETLOCALE_LOCK
 
 /* This declaration is solely to ensure that after preprocessing
    this file is never empty.  */
@@ -37,14 +38,14 @@ typedef int dummy;
 
 /* Macro for exporting a symbol (function, not variable) defined in this file,
    when compiled into a shared library.  */
-# ifndef DLL_EXPORTED
+# ifndef SHLIB_EXPORTED
 #  if HAVE_VISIBILITY
   /* Override the effect of the compiler option '-fvisibility=hidden'.  */
-#   define DLL_EXPORTED __attribute__((__visibility__("default")))
+#   define SHLIB_EXPORTED __attribute__((__visibility__("default")))
 #  elif defined _WIN32 || defined __CYGWIN__
-#   define DLL_EXPORTED __declspec(dllexport)
+#   define SHLIB_EXPORTED __declspec(dllexport)
 #  else
-#   define DLL_EXPORTED
+#   define SHLIB_EXPORTED
 #  endif
 # endif
 
@@ -59,7 +60,7 @@ typedef int dummy;
    because the latter is not guaranteed to be a stable ABI in the future.  */
 
 /* Make sure the function gets exported from DLLs.  */
-DLL_EXPORTED CRITICAL_SECTION *gl_get_setlocale_null_lock (void);
+SHLIB_EXPORTED CRITICAL_SECTION *gl_get_setlocale_null_lock (void);
 
 static glwthread_initguard_t guard = GLWTHREAD_INITGUARD_INIT;
 static CRITICAL_SECTION lock;
@@ -96,7 +97,7 @@ gl_get_setlocale_null_lock (void)
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 /* Make sure the function gets exported from shared libraries.  */
-DLL_EXPORTED pthread_mutex_t *gl_get_setlocale_null_lock (void);
+SHLIB_EXPORTED pthread_mutex_t *gl_get_setlocale_null_lock (void);
 
 /* Returns the internal lock used by setlocale_null_r.  */
 pthread_mutex_t *
@@ -123,7 +124,7 @@ atomic_init (void)
 }
 
 /* Make sure the function gets exported from shared libraries.  */
-DLL_EXPORTED mtx_t *gl_get_setlocale_null_lock (void);
+SHLIB_EXPORTED mtx_t *gl_get_setlocale_null_lock (void);
 
 /* Returns the internal lock used by setlocale_null_r.  */
 mtx_t *
diff --git a/gl/setlocale_null-unlocked.c b/gl/setlocale_null-unlocked.c
new file mode 100644
index 00000000..0a86f0df
--- /dev/null
+++ b/gl/setlocale_null-unlocked.c
@@ -0,0 +1,149 @@
+/* Query the name of the current global locale, without locking.
+   Copyright (C) 2019-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/>.  */
+
+/* Written by Bruno Haible <bruno@clisp.org>, 2019.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "setlocale_null.h"
+
+#include <errno.h>
+#include <locale.h>
+#include <string.h>
+#if defined _WIN32 && !defined __CYGWIN__
+# include <wchar.h>
+#endif
+
+/* Use the system's setlocale() function, not the gnulib override, here.  */
+#undef setlocale
+
+const char *
+setlocale_null_unlocked (int category)
+{
+  const char *result = setlocale (category, NULL);
+
+#ifdef __ANDROID__
+  if (result == NULL)
+    switch (category)
+      {
+      case LC_CTYPE:
+      case LC_NUMERIC:
+      case LC_TIME:
+      case LC_COLLATE:
+      case LC_MONETARY:
+      case LC_MESSAGES:
+      case LC_ALL:
+      case LC_PAPER:
+      case LC_NAME:
+      case LC_ADDRESS:
+      case LC_TELEPHONE:
+      case LC_MEASUREMENT:
+        result = "C";
+        break;
+      default:
+        break;
+      }
+#endif
+
+  return result;
+}
+
+int
+setlocale_null_r_unlocked (int category, char *buf, size_t bufsize)
+{
+#if defined _WIN32 && !defined __CYGWIN__ && defined _MSC_VER
+  /* On native Windows, nowadays, the setlocale() implementation is based
+     on _wsetlocale() and uses malloc() for the result.  We are better off
+     using _wsetlocale() directly.  */
+  const wchar_t *result = _wsetlocale (category, NULL);
+
+  if (result == NULL)
+    {
+      /* CATEGORY is invalid.  */
+      if (bufsize > 0)
+        /* Return an empty string in BUF.
+           This is a convenience for callers that don't want to write explicit
+           code for handling EINVAL.  */
+        buf[0] = '\0';
+      return EINVAL;
+    }
+  else
+    {
+      size_t length = wcslen (result);
+      if (length < bufsize)
+        {
+          size_t i;
+
+          /* Convert wchar_t[] -> char[], assuming plain ASCII.  */
+          for (i = 0; i <= length; i++)
+            buf[i] = result[i];
+
+          return 0;
+        }
+      else
+        {
+          if (bufsize > 0)
+            {
+              /* Return a truncated result in BUF.
+                 This is a convenience for callers that don't want to write
+                 explicit code for handling ERANGE.  */
+              size_t i;
+
+              /* Convert wchar_t[] -> char[], assuming plain ASCII.  */
+              for (i = 0; i < bufsize; i++)
+                buf[i] = result[i];
+              buf[bufsize - 1] = '\0';
+            }
+          return ERANGE;
+        }
+    }
+#else
+  const char *result = setlocale_null_unlocked (category);
+
+  if (result == NULL)
+    {
+      /* CATEGORY is invalid.  */
+      if (bufsize > 0)
+        /* Return an empty string in BUF.
+           This is a convenience for callers that don't want to write explicit
+           code for handling EINVAL.  */
+        buf[0] = '\0';
+      return EINVAL;
+    }
+  else
+    {
+      size_t length = strlen (result);
+      if (length < bufsize)
+        {
+          memcpy (buf, result, length + 1);
+          return 0;
+        }
+      else
+        {
+          if (bufsize > 0)
+            {
+              /* Return a truncated result in BUF.
+                 This is a convenience for callers that don't want to write
+                 explicit code for handling ERANGE.  */
+              memcpy (buf, result, bufsize - 1);
+              buf[bufsize - 1] = '\0';
+            }
+          return ERANGE;
+        }
+    }
+#endif
+}
diff --git a/gl/setlocale_null.c b/gl/setlocale_null.c
index 6ac563db..5ecf413d 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2019-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
@@ -25,12 +25,14 @@
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined _WIN32 && !defined __CYGWIN__
-# include <wchar.h>
-#endif
 
 #if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE)
-# if defined _WIN32 && !defined __CYGWIN__
+
+# 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>
@@ -51,154 +53,40 @@
 #  include <threads.h>
 
 # endif
-#endif
 
-/* Use the system's setlocale() function, not the gnulib override, here.  */
-#undef setlocale
-
-static const char *
-setlocale_null_androidfix (int category)
-{
-  const char *result = setlocale (category, NULL);
-
-#ifdef __ANDROID__
-  if (result == NULL)
-    switch (category)
-      {
-      case LC_CTYPE:
-      case LC_NUMERIC:
-      case LC_TIME:
-      case LC_COLLATE:
-      case LC_MONETARY:
-      case LC_MESSAGES:
-      case LC_ALL:
-      case LC_PAPER:
-      case LC_NAME:
-      case LC_ADDRESS:
-      case LC_TELEPHONE:
-      case LC_MEASUREMENT:
-        result = "C";
-        break;
-      default:
-        break;
-      }
 #endif
 
-  return result;
-}
-
-static int
-setlocale_null_unlocked (int category, char *buf, size_t bufsize)
-{
-#if defined _WIN32 && !defined __CYGWIN__ && defined _MSC_VER
-  /* On native Windows, nowadays, the setlocale() implementation is based
-     on _wsetlocale() and uses malloc() for the result.  We are better off
-     using _wsetlocale() directly.  */
-  const wchar_t *result = _wsetlocale (category, NULL);
-
-  if (result == NULL)
-    {
-      /* CATEGORY is invalid.  */
-      if (bufsize > 0)
-        /* Return an empty string in BUF.
-           This is a convenience for callers that don't want to write explicit
-           code for handling EINVAL.  */
-        buf[0] = '\0';
-      return EINVAL;
-    }
-  else
-    {
-      size_t length = wcslen (result);
-      if (length < bufsize)
-        {
-          size_t i;
-
-          /* Convert wchar_t[] -> char[], assuming plain ASCII.  */
-          for (i = 0; i <= length; i++)
-            buf[i] = result[i];
+#if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin < 3.4.6 */
 
-          return 0;
-        }
-      else
-        {
-          if (bufsize > 0)
-            {
-              /* Return a truncated result in BUF.
-                 This is a convenience for callers that don't want to write
-                 explicit code for handling ERANGE.  */
-              size_t i;
-
-              /* Convert wchar_t[] -> char[], assuming plain ASCII.  */
-              for (i = 0; i < bufsize; i++)
-                buf[i] = result[i];
-              buf[bufsize - 1] = '\0';
-            }
-          return ERANGE;
-        }
-    }
-#else
-  const char *result = setlocale_null_androidfix (category);
-
-  if (result == NULL)
-    {
-      /* CATEGORY is invalid.  */
-      if (bufsize > 0)
-        /* Return an empty string in BUF.
-           This is a convenience for callers that don't want to write explicit
-           code for handling EINVAL.  */
-        buf[0] = '\0';
-      return EINVAL;
-    }
-  else
-    {
-      size_t length = strlen (result);
-      if (length < bufsize)
-        {
-          memcpy (buf, result, length + 1);
-          return 0;
-        }
-      else
-        {
-          if (bufsize > 0)
-            {
-              /* Return a truncated result in BUF.
-                 This is a convenience for callers that don't want to write
-                 explicit code for handling ERANGE.  */
-              memcpy (buf, result, bufsize - 1);
-              buf[bufsize - 1] = '\0';
-            }
-          return ERANGE;
-        }
-    }
-#endif
-}
-
-#if !(SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE) /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin */
-
-/* Use a lock, so that no two threads can invoke setlocale_null_unlocked
+/* Use a lock, so that no two threads can invoke setlocale_null_r_unlocked
    at the same time.  */
 
 /* Prohibit renaming this symbol.  */
 # undef gl_get_setlocale_null_lock
 
-# if defined _WIN32 && !defined __CYGWIN__
+# if AVOID_ANY_THREADS
+
+/* The option '--disable-threads' explicitly requests no locking.  */
+#  define setlocale_null_r_with_lock setlocale_null_r_unlocked
+
+# elif defined _WIN32 && !defined __CYGWIN__
 
 extern __declspec(dllimport) CRITICAL_SECTION *gl_get_setlocale_null_lock (void);
 
 static int
-setlocale_null_with_lock (int category, char *buf, size_t bufsize)
+setlocale_null_r_with_lock (int category, char *buf, size_t bufsize)
 {
   CRITICAL_SECTION *lock = gl_get_setlocale_null_lock ();
   int ret;
 
   EnterCriticalSection (lock);
-  ret = setlocale_null_unlocked (category, buf, bufsize);
+  ret = setlocale_null_r_unlocked (category, buf, bufsize);
   LeaveCriticalSection (lock);
 
   return ret;
 }
 
-# elif HAVE_PTHREAD_API /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin */
+# elif HAVE_PTHREAD_API /* musl libc, macOS, FreeBSD, NetBSD, OpenBSD, AIX, Haiku, Cygwin < 3.4.6 */
 
 extern
 #  if defined _WIN32 || defined __CYGWIN__
@@ -223,7 +111,7 @@ extern
 #  endif
 
 static int
-setlocale_null_with_lock (int category, char *buf, size_t bufsize)
+setlocale_null_r_with_lock (int category, char *buf, size_t bufsize)
 {
   if (pthread_in_use())
     {
@@ -232,14 +120,14 @@ setlocale_null_with_lock (int category, char *buf, size_t bufsize)
 
       if (pthread_mutex_lock (lock))
         abort ();
-      ret = setlocale_null_unlocked (category, buf, bufsize);
+      ret = setlocale_null_r_unlocked (category, buf, bufsize);
       if (pthread_mutex_unlock (lock))
         abort ();
 
       return ret;
     }
   else
-    return setlocale_null_unlocked (category, buf, bufsize);
+    return setlocale_null_r_unlocked (category, buf, bufsize);
 }
 
 # elif HAVE_THREADS_H
@@ -247,14 +135,14 @@ setlocale_null_with_lock (int category, char *buf, size_t bufsize)
 extern mtx_t *gl_get_setlocale_null_lock (void);
 
 static int
-setlocale_null_with_lock (int category, char *buf, size_t bufsize)
+setlocale_null_r_with_lock (int category, char *buf, size_t bufsize)
 {
   mtx_t *lock = gl_get_setlocale_null_lock ();
   int ret;
 
   if (mtx_lock (lock) != thrd_success)
     abort ();
-  ret = setlocale_null_unlocked (category, buf, bufsize);
+  ret = setlocale_null_r_unlocked (category, buf, bufsize);
   if (mtx_unlock (lock) != thrd_success)
     abort ();
 
@@ -271,27 +159,27 @@ setlocale_null_r (int category, char *buf, size_t bufsize)
 #if SETLOCALE_NULL_ALL_MTSAFE
 # if SETLOCALE_NULL_ONE_MTSAFE
 
-  return setlocale_null_unlocked (category, buf, bufsize);
+  return setlocale_null_r_unlocked (category, buf, bufsize);
 
 # else
 
   if (category == LC_ALL)
-    return setlocale_null_unlocked (category, buf, bufsize);
+    return setlocale_null_r_unlocked (category, buf, bufsize);
   else
-    return setlocale_null_with_lock (category, buf, bufsize);
+    return setlocale_null_r_with_lock (category, buf, bufsize);
 
 # endif
 #else
 # if SETLOCALE_NULL_ONE_MTSAFE
 
   if (category == LC_ALL)
-    return setlocale_null_with_lock (category, buf, bufsize);
+    return setlocale_null_r_with_lock (category, buf, bufsize);
   else
-    return setlocale_null_unlocked (category, buf, bufsize);
+    return setlocale_null_r_unlocked (category, buf, bufsize);
 
 # else
 
-  return setlocale_null_with_lock (category, buf, bufsize);
+  return setlocale_null_r_with_lock (category, buf, bufsize);
 
 # endif
 #endif
@@ -301,7 +189,7 @@ const char *
 setlocale_null (int category)
 {
 #if SETLOCALE_NULL_ALL_MTSAFE && SETLOCALE_NULL_ONE_MTSAFE
-  return setlocale_null_androidfix (category);
+  return setlocale_null_unlocked (category);
 #else
 
   /* This call must be multithread-safe.  To achieve this without using
@@ -317,7 +205,7 @@ setlocale_null (int category)
   if (category == LC_ALL)
     {
 # if SETLOCALE_NULL_ALL_MTSAFE
-      return setlocale_null_androidfix (LC_ALL);
+      return setlocale_null_unlocked (LC_ALL);
 # else
       char buf[SETLOCALE_NULL_ALL_MAX];
       static char resultbuf[SETLOCALE_NULL_ALL_MAX];
@@ -331,7 +219,7 @@ setlocale_null (int category)
   else
     {
 # if SETLOCALE_NULL_ONE_MTSAFE
-      return setlocale_null_androidfix (category);
+      return setlocale_null_unlocked (category);
 # else
       enum
         {
diff --git a/gl/setlocale_null.h b/gl/setlocale_null.h
index c740fa0f..966c53cf 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2019-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
@@ -44,6 +44,34 @@ extern "C" {
    55+5*58.  */
 #define SETLOCALE_NULL_ALL_MAX (148+12*256+1)
 
+/* setlocale_null_r_unlocked (CATEGORY, BUF, BUFSIZE) is like
+   setlocale (CATEGORY, NULL), except that
+     - it returns the resulting locale category name or locale name in the
+       user-supplied buffer BUF, which must be BUFSIZE bytes long.
+   The recommended minimum buffer size is
+     - SETLOCALE_NULL_MAX for CATEGORY != LC_ALL, and
+     - SETLOCALE_NULL_ALL_MAX for CATEGORY == LC_ALL.
+   The return value is an error code: 0 if the call is successful, EINVAL if
+   CATEGORY is invalid, or ERANGE if BUFSIZE is smaller than the length needed
+   size (including the trailing NUL byte).  In the latter case, a truncated
+   result is returned in BUF, but still NUL-terminated if BUFSIZE > 0.
+   This call is guaranteed to be multithread-safe only if
+     - CATEGORY != LC_ALL and SETLOCALE_NULL_ONE_MTSAFE is true, or
+     - CATEGORY == LC_ALL and SETLOCALE_NULL_ALL_MTSAFE is true,
+   and the other threads must not make other setlocale invocations (since
+   changing the global locale has side effects on all threads).  */
+extern int setlocale_null_r_unlocked (int category, char *buf, size_t bufsize)
+  _GL_ARG_NONNULL ((2));
+
+/* setlocale_null_unlocked (CATEGORY) is like setlocale (CATEGORY, NULL).
+   The return value is NULL if CATEGORY is invalid.
+   This call is guaranteed to be multithread-safe only if
+     - CATEGORY != LC_ALL and SETLOCALE_NULL_ONE_MTSAFE is true, or
+     - CATEGORY == LC_ALL and SETLOCALE_NULL_ALL_MTSAFE is true,
+   and the other threads must not make other setlocale invocations (since
+   changing the global locale has side effects on all threads).  */
+extern const char *setlocale_null_unlocked (int category);
+
 /* setlocale_null_r (CATEGORY, BUF, BUFSIZE) is like setlocale (CATEGORY, NULL),
    except that
      - it is guaranteed to be multithread-safe,
diff --git a/gl/sha256-stream.c b/gl/sha256-stream.c
index 0e83380a..08d24b7b 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-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
diff --git a/gl/sha256.c b/gl/sha256.c
index e5fea02b..fe7c5446 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-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
diff --git a/gl/sha256.h b/gl/sha256.h
index 2879477e..a9d7abb8 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2008-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
@@ -18,6 +18,11 @@
 #ifndef SHA256_H
 # define SHA256_H 1
 
+/* This file uses HAVE_OPENSSL_SHA256.  */
+# if !_GL_CONFIG_H_INCLUDED
+#  error "Please include config.h first."
+# endif
+
 # include <stdio.h>
 # include <stdint.h>
 
@@ -25,7 +30,21 @@
 #  ifndef OPENSSL_API_COMPAT
 #   define OPENSSL_API_COMPAT 0x10101000L /* FIXME: Use OpenSSL 1.1+ API.  */
 #  endif
-#  include <openssl/sha.h>
+/* If <openssl/macros.h> would give a compile-time error, don't use OpenSSL.  */
+#  include <openssl/opensslv.h>
+#  if OPENSSL_VERSION_MAJOR >= 3
+#   include <openssl/configuration.h>
+#   if (OPENSSL_CONFIGURED_API \
+        < (OPENSSL_API_COMPAT < 0x900000L ? OPENSSL_API_COMPAT : \
+           ((OPENSSL_API_COMPAT >> 28) & 0xF) * 10000 \
+           + ((OPENSSL_API_COMPAT >> 20) & 0xFF) * 100 \
+           + ((OPENSSL_API_COMPAT >> 12) & 0xFF)))
+#    undef HAVE_OPENSSL_SHA256
+#   endif
+#  endif
+#  if HAVE_OPENSSL_SHA256
+#   include <openssl/sha.h>
+#  endif
 # endif
 
 # ifdef __cplusplus
diff --git a/gl/size_max.h b/gl/size_max.h
index 48af0250..bd2eb43e 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-2024 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This file is free software: you can redistribute it and/or modify
@@ -18,6 +18,11 @@
 #ifndef GNULIB_SIZE_MAX_H
 #define GNULIB_SIZE_MAX_H
 
+/* This file uses HAVE_STDINT_H.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Get SIZE_MAX declaration on systems like Solaris 7/8/9.  */
 # include <limits.h>
 /* Get SIZE_MAX declaration on systems like glibc 2.  */
diff --git a/gl/snprintf.c b/gl/snprintf.c
index cdff3149..c1b93562 100644
--- a/gl/snprintf.c
+++ b/gl/snprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2023 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2024 Free Software Foundation, Inc.
    Written by Simon Josefsson and Paul Eggert.
 
    This file is free software: you can redistribute it and/or modify
diff --git a/gl/sockets.c b/gl/sockets.c
index ca99db8b..92beb7d3 100644
--- a/gl/sockets.c
+++ b/gl/sockets.c
@@ -1,6 +1,6 @@
 /* sockets.c --- wrappers for Windows socket functions
 
-   Copyright (C) 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-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
diff --git a/gl/sockets.h b/gl/sockets.h
index a0b1601d..55077ae9 100644
--- a/gl/sockets.h
+++ b/gl/sockets.h
@@ -1,6 +1,6 @@
 /* sockets.h - wrappers for Windows socket functions
 
-   Copyright (C) 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-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
@@ -20,6 +20,15 @@
 #ifndef SOCKETS_H
 #define SOCKETS_H 1
 
+/* This file uses _GL_ATTRIBUTE_CONST.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define SOCKETS_1_0 0x0001
 #define SOCKETS_1_1 0x0101
 #define SOCKETS_2_0 0x0002
@@ -38,6 +47,11 @@ int gl_sockets_cleanup (void)
 #endif
   ;
 
+#ifdef __cplusplus
+}
+#endif
+
+
 /* This function is useful it 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. */
diff --git a/gl/stat-time.c b/gl/stat-time.c
index bc282232..1ab01f53 100644
--- a/gl/stat-time.c
+++ b/gl/stat-time.c
@@ -1,6 +1,6 @@
 /* stat-related time functions.
 
-   Copyright (C) 2012-2023 Free Software Foundation, Inc.
+   Copyright (C) 2012-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
diff --git a/gl/stat-time.h b/gl/stat-time.h
index 92aa1e64..3cd8478f 100644
--- a/gl/stat-time.h
+++ b/gl/stat-time.h
@@ -1,6 +1,6 @@
 /* stat-related time functions.
 
-   Copyright (C) 2005, 2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007, 2009-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
@@ -20,15 +20,18 @@
 #ifndef STAT_TIME_H
 #define STAT_TIME_H 1
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _GL_UNUSED,
+   _GL_ATTRIBUTE_PURE, HAVE_STRUCT_STAT_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include <errno.h>
 #include <stdckdint.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <time.h>
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_STAT_TIME_INLINE
 # define _GL_STAT_TIME_INLINE _GL_INLINE
@@ -49,11 +52,13 @@ extern "C" {
 #if _GL_WINDOWS_STAT_TIMESPEC || defined HAVE_STRUCT_STAT_ST_ATIM_TV_NSEC
 # if _GL_WINDOWS_STAT_TIMESPEC || defined TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC
 #  define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim)
+#  define STAT_TIMESPEC_OFFSETOF(st_xtim) offsetof (struct stat, st_xtim)
 # else
 #  define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim.tv_nsec)
 # endif
 #elif defined HAVE_STRUCT_STAT_ST_ATIMESPEC_TV_NSEC
 # define STAT_TIMESPEC(st, st_xtim) ((st)->st_xtim##espec)
+# define STAT_TIMESPEC_OFFSETOF(st_xtim) offsetof (struct stat, st_xtim##espec)
 #elif defined HAVE_STRUCT_STAT_ST_ATIMENSEC
 # define STAT_TIMESPEC_NS(st, st_xtim) ((st)->st_xtim##ensec)
 #elif defined HAVE_STRUCT_STAT_ST_ATIM_ST__TIM_TV_NSEC
@@ -119,10 +124,8 @@ get_stat_atime (struct stat const *st)
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_atim);
 #else
-  struct timespec t;
-  t.tv_sec = st->st_atime;
-  t.tv_nsec = get_stat_atime_ns (st);
-  return t;
+  return (struct timespec) { .tv_sec = st->st_atime,
+                             .tv_nsec = get_stat_atime_ns (st) };
 #endif
 }
 
@@ -133,10 +136,8 @@ get_stat_ctime (struct stat const *st)
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_ctim);
 #else
-  struct timespec t;
-  t.tv_sec = st->st_ctime;
-  t.tv_nsec = get_stat_ctime_ns (st);
-  return t;
+  return (struct timespec) { .tv_sec = st->st_ctime,
+                             .tv_nsec = get_stat_ctime_ns (st) };
 #endif
 }
 
@@ -147,10 +148,8 @@ get_stat_mtime (struct stat const *st)
 #ifdef STAT_TIMESPEC
   return STAT_TIMESPEC (st, st_mtim);
 #else
-  struct timespec t;
-  t.tv_sec = st->st_mtime;
-  t.tv_nsec = get_stat_mtime_ns (st);
-  return t;
+  return (struct timespec) { .tv_sec = st->st_mtime,
+                             .tv_nsec = get_stat_mtime_ns (st) };
 #endif
 }
 
@@ -165,8 +164,8 @@ 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.tv_sec = st->st_birthtime;
-  t.tv_nsec = st->st_birthtimensec;
+  t = (struct timespec) { .tv_sec = st->st_birthtime,
+                          .tv_nsec = st->st_birthtimensec };
 #elif defined _WIN32 && ! defined __CYGWIN__
   /* Native Windows platforms (but not Cygwin) put the "file creation
      time" in st_ctime (!).  See
@@ -174,13 +173,11 @@ get_stat_birthtime (_GL_UNUSED struct stat const *st)
 # if _GL_WINDOWS_STAT_TIMESPEC
   t = st->st_ctim;
 # else
-  t.tv_sec = st->st_ctime;
-  t.tv_nsec = 0;
+  t = (struct timespec) { .tv_sec = st->st_ctime };
 # endif
 #else
   /* Birth time is not supported.  */
-  t.tv_sec = -1;
-  t.tv_nsec = -1;
+  t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 };
 #endif
 
 #if (defined HAVE_STRUCT_STAT_ST_BIRTHTIMESPEC_TV_NSEC \
@@ -192,30 +189,28 @@ 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.tv_sec = -1;
-      t.tv_nsec = -1;
-    }
+    t = (struct timespec) { .tv_sec = -1, .tv_nsec = -1 };
 #endif
 
   return t;
 }
 
 /* If a stat-like function returned RESULT, normalize the timestamps
-   in *ST, in case this platform suffers from the Solaris 11 bug where
+   in *ST, if this platform suffers from a macOS and Solaris bug where
    tv_nsec might be negative.  Return the adjusted RESULT, setting
    errno to EOVERFLOW if normalization overflowed.  This function
    is intended to be private to this .h file.  */
 _GL_STAT_TIME_INLINE int
 stat_time_normalize (int result, _GL_UNUSED struct stat *st)
 {
-#if defined __sun && defined STAT_TIMESPEC
+#if (((defined __APPLE__ && defined __MACH__) || defined __sun) \
+     && defined STAT_TIMESPEC_OFFSETOF)
   if (result == 0)
     {
       long int timespec_hz = 1000000000;
-      short int const ts_off[] = { offsetof (struct stat, st_atim),
-                                   offsetof (struct stat, st_mtim),
-                                   offsetof (struct stat, st_ctim) };
+      short int const ts_off[] = { STAT_TIMESPEC_OFFSETOF (st_atim),
+                                   STAT_TIMESPEC_OFFSETOF (st_mtim),
+                                   STAT_TIMESPEC_OFFSETOF (st_ctim) };
       int i;
       for (i = 0; i < sizeof ts_off / sizeof *ts_off; i++)
         {
@@ -229,8 +224,7 @@ stat_time_normalize (int result, _GL_UNUSED struct stat *st)
             }
           ts->tv_nsec = r;
           /* Overflow is possible, as Solaris 11 stat can yield
-             tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000.
-             INT_ADD_WRAPV is OK, since time_t is signed on Solaris.  */
+             tv_sec == TYPE_MINIMUM (time_t) && tv_nsec == -1000000000.  */
           if (ckd_add (&ts->tv_sec, q, ts->tv_sec))
             {
               errno = EOVERFLOW;
diff --git a/gl/stat-w32.c b/gl/stat-w32.c
index 2f011975..ddd6f598 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-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
diff --git a/gl/stat-w32.h b/gl/stat-w32.h
index c6738749..392faed1 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2017-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
diff --git a/gl/stat.c b/gl/stat.c
index 7987e265..ecf9f9bb 100644
--- a/gl/stat.c
+++ b/gl/stat.c
@@ -1,5 +1,5 @@
 /* Work around platform bugs in stat.
-   Copyright (C) 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-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
diff --git a/gl/stdalign.in.h b/gl/stdalign.in.h
deleted file mode 100644
index 7f9dbb46..00000000
--- a/gl/stdalign.in.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/* A substitute for ISO C11 <stdalign.h>.
-
-   Copyright 2011-2023 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 and Bruno Haible.  */
-
-#ifndef _GL_STDALIGN_H
-#define _GL_STDALIGN_H
-
-/* ISO C11 <stdalign.h> for platforms that lack it.
-
-   References:
-   ISO C11 (latest free draft
-   <http://www.open-std.org/jtc1/sc22/wg14/www/docs/n1570.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>)
-   section 18.10. */
-
-/* alignof (TYPE), also known as _Alignof (TYPE), yields the alignment
-   requirement of a structure member (i.e., slot or field) that is of
-   type TYPE, as an integer constant expression.
-
-   This differs from GCC's and clang's __alignof__ operator, which can
-   yield a better-performing alignment for an object of that type.  For
-   example, on x86 with GCC and on Linux/x86 with clang,
-   __alignof__ (double) and __alignof__ (long long) are 8, whereas
-   alignof (double) and alignof (long long) are 4 unless the option
-   '-malign-double' is used.
-
-   The result cannot be used as a value for an 'enum' constant, if you
-   want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc.  */
-
-/* FreeBSD 9.1 <sys/cdefs.h>, included by <stddef.h> and lots of other
-   standard headers, defines conflicting implementations of _Alignas
-   and _Alignof that are no better than ours; override them.  */
-#undef _Alignas
-#undef _Alignof
-
-/* 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.  */
-#if (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 \
-     || (defined __GNUC__ && __GNUC__ < 4 + (__GNUC_MINOR__ < 9) \
-         && !defined __clang__) \
-     || (defined __clang__ && __clang_major__ < 8))
-# ifdef __cplusplus
-#  if (201103 <= __cplusplus || defined _MSC_VER)
-#   define _Alignof(type) alignof (type)
-#  else
-   template <class __t> struct __alignof_helper { char __a; __t __b; };
-#   define _Alignof(type) offsetof (__alignof_helper<type>, __b)
-#   define _GL_STDALIGN_NEEDS_STDDEF 1
-#  endif
-# else
-#  if (defined __GNUC__ && 4 <= __GNUC__) || defined __clang__
-#   define _Alignof(type) __builtin_offsetof (struct { char __a; type __b; }, __b)
-#  else
-#   define _Alignof(type) offsetof (struct { char __a; type __b; }, __b)
-#   define _GL_STDALIGN_NEEDS_STDDEF 1
-#  endif
-# endif
-#endif
-#if ! (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))
-# define alignof _Alignof
-#endif
-#define __alignof_is_defined 1
-
-/* alignas (A), also known as _Alignas (A), aligns a variable or type
-   to the alignment A, where A is an integer constant expression.  For
-   example:
-
-      int alignas (8) foo;
-      struct s { int a; int alignas (8) bar; };
-
-   aligns the address of FOO and the offset of BAR to be multiples of 8.
-
-   A should be a power of two that is at least the type's alignment
-   and at most the implementation's alignment limit.  This limit is
-   2**28 on typical GNUish hosts, and 2**13 on MSVC.  To be portable
-   to MSVC through at least version 10.0, A should be an integer
-   constant, as MSVC does not support expressions such as 1 << 3.
-   To be portable to Sun C 5.11, do not align auto variables to
-   anything stricter than their default alignment.
-
-   The following C11 requirements are not supported here:
-
-     - If A is zero, alignas has no effect.
-     - alignas can be used multiple times; the strictest one wins.
-     - alignas (TYPE) is equivalent to alignas (alignof (TYPE)).
-
-   */
-
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
-# if defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)
-#  define _Alignas(a) alignas (a)
-# elif (!defined __attribute__ \
-        && ((defined __APPLE__ && defined __MACH__ \
-             ? 4 < __GNUC__ + (1 <= __GNUC_MINOR__) \
-             : __GNUC__ && !defined __ibmxl__) \
-            || (4 <= __clang_major__) \
-            || (__ia64 && (61200 <= __HP_cc || 61200 <= __HP_aCC)) \
-            || __ICC || 0x590 <= __SUNPRO_C || 0x0600 <= __xlC__))
-#  define _Alignas(a) __attribute__ ((__aligned__ (a)))
-# elif 1300 <= _MSC_VER
-#  define _Alignas(a) __declspec (align (a))
-# endif
-#endif
-#if ((defined _Alignas \
-      && !(defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER))) \
-     || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# define alignas _Alignas
-#endif
-#if (defined alignas \
-     || (defined __cplusplus && (201103 <= __cplusplus || defined _MSC_VER)))
-# define __alignas_is_defined 1
-#endif
-
-/* Include <stddef.h> if needed for offsetof.  */
-#if _GL_STDALIGN_NEEDS_STDDEF
-# include <stddef.h>
-#endif
-
-#endif /* _GL_STDALIGN_H */
diff --git a/gl/stdckdint.in.h b/gl/stdckdint.in.h
index 71bab5f0..91848806 100644
--- a/gl/stdckdint.in.h
+++ b/gl/stdckdint.in.h
@@ -1,6 +1,6 @@
 /* stdckdint.h -- checked integer arithmetic
 
-   Copyright 2022-2023 Free Software Foundation, Inc.
+   Copyright 2022-2024 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/stddef.in.h b/gl/stddef.in.h
index 6eadcc3d..fa8998d9 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2009-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
@@ -18,7 +18,7 @@
 /* Written by Eric Blake.  */
 
 /*
- * POSIX 2008 <stddef.h> for platforms that have issues.
+ * POSIX 2008 and ISO C 23 <stddef.h> for platforms that have issues.
  * <https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/stddef.h.html>
  */
 
@@ -37,9 +37,9 @@
    remember if special invocation has ever been used to obtain wint_t,
    in which case we need to clean up NULL yet again.  */
 
-# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _GL_STDDEF_WINT_T)
+# if !(defined _@GUARD_PREFIX@_STDDEF_H && defined _@GUARD_PREFIX@_STDDEF_WINT_T)
 #  ifdef __need_wint_t
-#   define _GL_STDDEF_WINT_T
+#   define _@GUARD_PREFIX@_STDDEF_WINT_T
 #  endif
 #  @INCLUDE_NEXT@ @NEXT_STDDEF_H@
    /* On TinyCC, make sure that the macros that indicate the special invocation
@@ -58,7 +58,7 @@
 
 /* On AIX 7.2, with xlc in 64-bit mode, <stddef.h> defines max_align_t to a
    type with alignment 4, but 'long' has alignment 8.  */
-#  if defined _AIX && defined __LP64__
+#  if defined _AIX && defined __LP64__ && !@HAVE_MAX_ALIGN_T@
 #   if !GNULIB_defined_max_align_t
 #    ifdef _MAX_ALIGN_T
 /* /usr/include/stddef.h has already defined max_align_t.  Override it.  */
@@ -69,6 +69,7 @@ typedef long rpl_max_align_t;
 typedef long max_align_t;
 #     define _MAX_ALIGN_T
 #    endif
+#    define __CLANG_MAX_ALIGN_T_DEFINED
 #    define GNULIB_defined_max_align_t 1
 #   endif
 #  endif
@@ -79,7 +80,7 @@ typedef long max_align_t;
 
 /* On NetBSD 5.0, the definition of NULL lacks proper parentheses.  */
 #  if (@REPLACE_NULL@ \
-       && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _GL_STDDEF_WINT_T))
+       && (!defined _@GUARD_PREFIX@_STDDEF_H || defined _@GUARD_PREFIX@_STDDEF_WINT_T))
 #   undef NULL
 #   ifdef __cplusplus
    /* ISO C++ says that the macro NULL must expand to an integer constant
@@ -100,6 +101,33 @@ typedef long max_align_t;
 #  ifndef _@GUARD_PREFIX@_STDDEF_H
 #   define _@GUARD_PREFIX@_STDDEF_H
 
+/* This file uses _Noreturn, _GL_ATTRIBUTE_NOTHROW.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#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 __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* Some platforms lack wchar_t.  */
 #if !@HAVE_WCHAR_T@
 # define wchar_t int
@@ -137,11 +165,49 @@ typedef union
   long int __i _GL_STDDEF_ALIGNAS (long int);
 } rpl_max_align_t;
 #   define max_align_t rpl_max_align_t
+#   define __CLANG_MAX_ALIGN_T_DEFINED
 #   define GNULIB_defined_max_align_t 1
 #  endif
 # endif
 #endif
 
+/* ISO C 23 § 7.21.1 The unreachable macro  */
+#ifndef unreachable
+
+/* 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
+# endif
+
+# if _GL_HAS_BUILTIN_UNREACHABLE
+#  define unreachable() __builtin_unreachable ()
+# elif 1200 <= _MSC_VER
+#  define unreachable() __assume (0)
+# else
+/* Declare abort(), without including <stdlib.h>.  */
+extern
+#  if defined __cplusplus
+"C"
+#  endif
+_Noreturn
+void abort (void)
+#  if defined __cplusplus && (__GLIBC__ >= 2)
+_GL_ATTRIBUTE_NOTHROW
+#  endif
+;
+#  define unreachable() abort ()
+# endif
+
+#endif
+
 #  endif /* _@GUARD_PREFIX@_STDDEF_H */
 # endif /* _@GUARD_PREFIX@_STDDEF_H */
 #endif /* __need_XXX */
diff --git a/gl/stdint.in.h b/gl/stdint.in.h
index 5ddc644b..fea7483b 100644
--- a/gl/stdint.in.h
+++ b/gl/stdint.in.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2002, 2004-2023 Free Software Foundation, Inc.
+/* Copyright (C) 2001-2002, 2004-2024 Free Software Foundation, Inc.
    Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood.
    This file is part of gnulib.
 
@@ -306,6 +306,8 @@ typedef gl_uint_fast32_t gl_uint_fast16_t;
    uintptr_t to avoid conflicting declarations of system functions like
    _findclose in <io.h>.  */
 # if !((defined __KLIBC__ && defined _INTPTR_T_DECLARED) \
+       || (defined __INTPTR_WIDTH__ \
+           && __INTPTR_WIDTH__ != (defined _WIN64 ? LLONG_WIDTH : LONG_WIDTH)) \
        || defined __MINGW32__)
 #  undef intptr_t
 #  undef uintptr_t
diff --git a/gl/stdio-impl.h b/gl/stdio-impl.h
index 46608bed..63ebf7c6 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-2008, 2010-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
diff --git a/gl/stdio-read.c b/gl/stdio-read.c
index 6e2984c5..253b8aa4 100644
--- a/gl/stdio-read.c
+++ b/gl/stdio-read.c
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream read function.
-   Copyright (C) 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-2024 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 9cf36cca..ca6aa00c 100644
--- a/gl/stdio-write.c
+++ b/gl/stdio-write.c
@@ -1,5 +1,5 @@
 /* POSIX compatible FILE stream write function.
-   Copyright (C) 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-2024 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/stdio.in.h b/gl/stdio.in.h
index 59cbea3d..35b9f748 100644
--- a/gl/stdio.in.h
+++ b/gl/stdio.in.h
@@ -1,6 +1,6 @@
 /* A GNU-like <stdio.h>.
 
-   Copyright (C) 2004, 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007-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
@@ -36,6 +36,18 @@
 
 #ifndef _@GUARD_PREFIX@_STDIO_H
 
+/* Suppress macOS deprecation warnings for sprintf and vsprintf.  */
+#if (defined __APPLE__ && defined __MACH__) && !defined _POSIX_C_SOURCE
+# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#  include <AvailabilityMacros.h>
+# endif
+# if (defined MAC_OS_X_VERSION_MIN_REQUIRED \
+      && 130000 <= MAC_OS_X_VERSION_MIN_REQUIRED)
+#  define _POSIX_C_SOURCE 200809L
+#  define _GL_DEFINED__POSIX_C_SOURCE
+# endif
+#endif
+
 #define _GL_ALREADY_INCLUDING_STDIO_H
 
 /* The include_next requires a split double-inclusion guard.  */
@@ -43,9 +55,21 @@
 
 #undef _GL_ALREADY_INCLUDING_STDIO_H
 
+#ifdef _GL_DEFINED__POSIX_C_SOURCE
+# undef _GL_DEFINED__POSIX_C_SOURCE
+# undef _POSIX_C_SOURCE
+#endif
+
 #ifndef _@GUARD_PREFIX@_STDIO_H
 #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_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Get va_list.  Needed on many systems, including glibc 2.8.  */
 #include <stdarg.h>
 
@@ -116,6 +140,38 @@
 # endif
 #endif
 
+/* _GL_ATTRIBUTE_MALLOC declares that the function returns a pointer to freshly
+   allocated memory.  */
+#ifndef _GL_ATTRIBUTE_MALLOC
+# if __GNUC__ >= 3 || defined __clang__
+#  define _GL_ATTRIBUTE_MALLOC __attribute__ ((__malloc__))
+# else
+#  define _GL_ATTRIBUTE_MALLOC
+# 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 __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* An __attribute__ __format__ specifier for a function that takes a format
    string and arguments, where the format string directives are the ones
    standardized by ISO C99 and POSIX.
@@ -193,6 +249,36 @@
 # undef putc_unlocked
 #endif
 
+
+/* Maximum number of characters produced by printing a NaN value.  */
+#ifndef _PRINTF_NAN_LEN_MAX
+# if defined __FreeBSD__ || defined __DragonFly__ \
+     || defined __NetBSD__ \
+     || (defined __APPLE__ && defined __MACH__)
+/* On BSD systems, a NaN value prints as just "nan", without a sign.  */
+#  define _PRINTF_NAN_LEN_MAX 3
+# elif (__GLIBC__ >= 2) || MUSL_LIBC || defined __OpenBSD__ || defined __sun || defined __CYGWIN__
+/* glibc, musl libc, OpenBSD, Solaris libc, and Cygwin produce "[-]nan".  */
+#  define _PRINTF_NAN_LEN_MAX 4
+# elif defined _AIX
+/* AIX produces "[-]NaNQ".  */
+#  define _PRINTF_NAN_LEN_MAX 5
+# elif defined _WIN32 && !defined __CYGWIN__
+/* On native Windows, the output can be:
+   - with MSVC ucrt: "[-]nan" or "[-]nan(ind)" or "[-]nan(snan)",
+   - with mingw: "[-]1.#IND" or "[-]1.#QNAN".  */
+#  define _PRINTF_NAN_LEN_MAX 10
+# elif defined __sgi
+/* On IRIX, the output typically is "[-]nan0xNNNNNNNN" with 8 hexadecimal
+   digits.  */
+#  define _PRINTF_NAN_LEN_MAX 14
+# else
+/* We don't know, but 32 should be a safe maximum.  */
+#  define _PRINTF_NAN_LEN_MAX 32
+# endif
+#endif
+
+
 #if @GNULIB_DPRINTF@
 # if @REPLACE_DPRINTF@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -210,7 +296,9 @@ _GL_FUNCDECL_SYS (dprintf, int, (int fd, const char *restrict format, ...)
 #  endif
 _GL_CXXALIAS_SYS (dprintf, int, (int fd, const char *restrict format, ...));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (dprintf);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef dprintf
 # if HAVE_RAW_DECL_DPRINTF
@@ -273,7 +361,8 @@ _GL_CXXALIASWARN (fcloseall);
 #  endif
 _GL_FUNCDECL_RPL (fdopen, FILE *,
                   (int fd, const char *mode)
-                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 _GL_CXXALIAS_RPL (fdopen, FILE *, (int fd, const char *mode));
 # elif defined _WIN32 && !defined __CYGWIN__
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -284,9 +373,18 @@ _GL_CXXALIAS_MDA (fdopen, FILE *, (int fd, const char *mode));
 # else
 #  if __GNUC__ >= 11
 /* 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_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
+#   else
+_GL_FUNCDECL_SYS (fdopen, FILE *,
+                  (int fd, const char *mode)
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (fdopen, FILE *, (int fd, const char *mode));
 # endif
@@ -294,9 +392,18 @@ _GL_CXXALIASWARN (fdopen);
 #else
 # if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !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
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
+#  else
 _GL_FUNCDECL_SYS (fdopen, FILE *,
                   (int fd, const char *mode)
-                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  _GL_ARG_NONNULL ((2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef fdopen
@@ -407,7 +514,8 @@ _GL_CXXALIASWARN (fileno);
 #  endif
 _GL_FUNCDECL_RPL (fopen, FILE *,
                   (const char *restrict filename, const char *restrict mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 _GL_CXXALIAS_RPL (fopen, FILE *,
                   (const char *restrict filename, const char *restrict mode));
 # else
@@ -799,14 +907,14 @@ _GL_CXXALIAS_SYS (fwrite, size_t,
        && !defined __cplusplus)
 #   undef fwrite
 #   undef fwrite_unlocked
-extern size_t __REDIRECT (rpl_fwrite,
-                          (const void *__restrict, size_t, size_t,
-                           FILE *__restrict),
-                          fwrite);
-extern size_t __REDIRECT (rpl_fwrite_unlocked,
-                          (const void *__restrict, size_t, size_t,
-                           FILE *__restrict),
-                          fwrite_unlocked);
+_GL_EXTERN_C size_t __REDIRECT (rpl_fwrite,
+                                (const void *__restrict, size_t, size_t,
+                                 FILE *__restrict),
+                                fwrite);
+_GL_EXTERN_C size_t __REDIRECT (rpl_fwrite_unlocked,
+                                (const void *__restrict, size_t, size_t,
+                                 FILE *__restrict),
+                                fwrite_unlocked);
 #   define fwrite rpl_fwrite
 #   define fwrite_unlocked rpl_fwrite_unlocked
 #  endif
@@ -882,7 +990,9 @@ _GL_CXXALIAS_SYS (getdelim, ssize_t,
                    int delimiter,
                    FILE *restrict stream));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getdelim);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getdelim
 # if HAVE_RAW_DECL_GETDELIM
@@ -921,7 +1031,7 @@ _GL_CXXALIAS_SYS (getline, ssize_t,
                   (char **restrict lineptr, size_t *restrict linesize,
                    FILE *restrict stream));
 # endif
-# if @HAVE_DECL_GETLINE@
+# if __GLIBC__ >= 2 && @HAVE_DECL_GETLINE@
 _GL_CXXALIASWARN (getline);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -951,9 +1061,17 @@ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
 #  endif
 _GL_CXXALIAS_MDA (getw, int, (FILE *restrict stream));
 # else
+#  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));
+#   endif
 _GL_CXXALIAS_SYS (getw, int, (FILE *restrict stream));
+#  endif
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getw);
+# endif
 #endif
 
 #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
@@ -1052,13 +1170,15 @@ _GL_WARN_ON_USE (perror, "perror is not always POSIX compliant - "
 #  endif
 _GL_FUNCDECL_RPL (popen, FILE *,
                   (const char *cmd, const char *mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 _GL_CXXALIAS_RPL (popen, FILE *, (const char *cmd, const char *mode));
 # else
 #  if !@HAVE_POPEN@ || __GNUC__ >= 11
 _GL_FUNCDECL_SYS (popen, FILE *,
                   (const char *cmd, const char *mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 #  endif
 _GL_CXXALIAS_SYS (popen, FILE *, (const char *cmd, const char *mode));
 # endif
@@ -1068,7 +1188,8 @@ _GL_CXXALIASWARN (popen);
 /* For -Wmismatched-dealloc: Associate popen with pclose or rpl_pclose.  */
 _GL_FUNCDECL_SYS (popen, FILE *,
                   (const char *cmd, const char *mode)
-                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1));
+                  _GL_ARG_NONNULL ((1, 2)) _GL_ATTRIBUTE_DEALLOC (pclose, 1)
+                  _GL_ATTRIBUTE_MALLOC);
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef popen
@@ -1190,9 +1311,17 @@ _GL_CXXALIASWARN (puts);
 #  endif
 _GL_CXXALIAS_MDA (putw, int, (int w, FILE *restrict stream));
 # else
+#  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));
+#   endif
 _GL_CXXALIAS_SYS (putw, int, (int w, FILE *restrict stream));
+#  endif
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (putw);
+# endif
 #endif
 
 #if @GNULIB_REMOVE@
@@ -1398,13 +1527,15 @@ _GL_CXXALIASWARN (tempnam);
 #   define tmpfile rpl_tmpfile
 #  endif
 _GL_FUNCDECL_RPL (tmpfile, FILE *, (void)
-                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                                   _GL_ATTRIBUTE_MALLOC);
 _GL_CXXALIAS_RPL (tmpfile, FILE *, (void));
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose.  */
 _GL_FUNCDECL_SYS (tmpfile, FILE *, (void)
-                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                                   _GL_ATTRIBUTE_MALLOC);
 #  endif
 _GL_CXXALIAS_SYS (tmpfile, FILE *, (void));
 # endif
@@ -1415,7 +1546,8 @@ _GL_CXXALIASWARN (tmpfile);
 # if @GNULIB_FCLOSE@ && __GNUC__ >= 11 && !defined tmpfile
 /* For -Wmismatched-dealloc: Associate tmpfile with fclose or rpl_fclose.  */
 _GL_FUNCDECL_SYS (tmpfile, FILE *, (void)
-                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1));
+                                   _GL_ATTRIBUTE_DEALLOC (fclose, 1)
+                                   _GL_ATTRIBUTE_MALLOC);
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef tmpfile
diff --git a/gl/stdlib.in.h b/gl/stdlib.in.h
index b79e5f70..e74e7c18 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001-2004, 2006-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
@@ -37,6 +37,13 @@
 #ifndef _@GUARD_PREFIX@_STDLIB_H
 #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_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
@@ -67,9 +74,7 @@
 #  include <random.h>
 # endif
 
-# if !@HAVE_STRUCT_RANDOM_DATA@ || @REPLACE_RANDOM_R@ || !@HAVE_RANDOM_R@
-#  include <stdint.h>
-# endif
+# include <stdint.h>
 
 # if !@HAVE_STRUCT_RANDOM_DATA@
 /* Define 'struct random_data'.
@@ -128,6 +133,28 @@ struct random_data
 # 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 __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* 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
@@ -164,11 +191,22 @@ struct random_data
 #if @GNULIB__EXIT@
 /* Terminate the current process with the given return code, without running
    the 'atexit' handlers.  */
-# if !@HAVE__EXIT@
+# if @REPLACE__EXIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef _Exit
+#   define _Exit rpl__Exit
+#  endif
+_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));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (_Exit, void, (int status));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (_Exit);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef _Exit
 # if HAVE_RAW_DECL__EXIT
@@ -185,7 +223,7 @@ _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) throw ());
+_GL_FUNCDECL_RPL (free, void, (void *ptr) _GL_ATTRIBUTE_NOTHROW);
 #  else
 _GL_FUNCDECL_RPL (free, void, (void *ptr));
 #  endif
@@ -219,9 +257,16 @@ _GL_CXXALIAS_RPL (aligned_alloc, void *, (size_t alignment, size_t size));
 #  if @HAVE_ALIGNED_ALLOC@
 #   if __GNUC__ >= 11
 /* 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);
+#    else
 _GL_FUNCDECL_SYS (aligned_alloc, void *,
                   (size_t alignment, size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#    endif
 #   endif
 _GL_CXXALIAS_SYS (aligned_alloc, void *, (size_t alignment, size_t size));
 #  endif
@@ -232,9 +277,16 @@ _GL_CXXALIASWARN (aligned_alloc);
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !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);
+#  else
+_GL_FUNCDECL_SYS (aligned_alloc, void *,
+                  (size_t alignment, size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef aligned_alloc
@@ -277,9 +329,16 @@ _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size));
 # else
 #  if __GNUC__ >= 11
 /* 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);
+#   else
+_GL_FUNCDECL_SYS (calloc, void *,
+                  (size_t nmemb, size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (calloc, void *, (size_t nmemb, size_t size));
 # endif
@@ -289,9 +348,16 @@ _GL_CXXALIASWARN (calloc);
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !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);
+#  else
 _GL_FUNCDECL_SYS (calloc, void *,
                   (size_t nmemb, size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef calloc
@@ -313,10 +379,18 @@ _GL_FUNCDECL_RPL (canonicalize_file_name, char *,
 _GL_CXXALIAS_RPL (canonicalize_file_name, char *, (const char *name));
 # else
 #  if !@HAVE_CANONICALIZE_FILE_NAME@ || __GNUC__ >= 11
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
 _GL_FUNCDECL_SYS (canonicalize_file_name, char *,
                   (const char *name)
+                  _GL_ATTRIBUTE_NOTHROW
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (canonicalize_file_name, char *,
+                  (const char *name)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (canonicalize_file_name, char *, (const char *name));
 # endif
@@ -329,10 +403,18 @@ _GL_CXXALIASWARN (canonicalize_file_name);
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !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
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (canonicalize_file_name, char *,
+                  (const char *name)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef canonicalize_file_name
@@ -416,12 +498,24 @@ _GL_CXXALIASWARN (gcvt);
    The three numbers are the load average of the last 1 minute, the last 5
    minutes, and the last 15 minutes, respectively.
    LOADAVG is an array of NELEM numbers.  */
-# if !@HAVE_DECL_GETLOADAVG@
+# if @REPLACE_GETLOADAVG@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getloadavg
+#   define getloadavg rpl_getloadavg
+#  endif
+_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_ARG_NONNULL ((1)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getloadavg, int, (double loadavg[], int nelem));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getloadavg);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getloadavg
 # if HAVE_RAW_DECL_GETLOADAVG
@@ -430,6 +524,41 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - "
 # endif
 #endif
 
+#if @GNULIB_GETPROGNAME@
+/* Return the base name of the executing program.
+   On native Windows this will usually end in ".exe" or ".EXE". */
+# if @REPLACE_GETPROGNAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getprogname
+#   define getprogname rpl_getprogname
+#  endif
+#  if @HAVE_DECL_PROGRAM_INVOCATION_NAME@
+_GL_FUNCDECL_RPL (getprogname, const char *, (void) _GL_ATTRIBUTE_PURE);
+#  else
+_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);
+#   else
+_GL_FUNCDECL_SYS (getprogname, const char *, (void));
+#   endif
+#  endif
+_GL_CXXALIAS_SYS (getprogname, const char *, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (getprogname);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef getprogname
+# if HAVE_RAW_DECL_GETPROGNAME
+_GL_WARN_ON_USE (getprogname, "getprogname is unportable - "
+                 "use gnulib module getprogname for portability");
+# endif
+#endif
+
 #if @GNULIB_GETSUBOPT@
 /* Assuming *OPTIONP is a comma separated list of elements of the form
    "token" or "token=value", getsubopt parses the first of these elements.
@@ -442,14 +571,28 @@ _GL_WARN_ON_USE (getloadavg, "getloadavg is not portable - "
    Otherwise it returns -1, and *OPTIONP and *VALUEP are undefined.
    For more details see the POSIX specification.
    https://pubs.opengroup.org/onlinepubs/9699919799/functions/getsubopt.html */
-# if !@HAVE_GETSUBOPT@
+# if @REPLACE_GETSUBOPT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef getsubopt
+#   define getsubopt rpl_getsubopt
+#  endif
+_GL_FUNCDECL_RPL (getsubopt, int,
+                  (char **optionp, char *const *tokens, char **valuep)
+                  _GL_ARG_NONNULL ((1, 2, 3)));
+_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)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getsubopt, int,
                   (char **optionp, char *const *tokens, char **valuep));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getsubopt);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getsubopt
 # if HAVE_RAW_DECL_GETSUBOPT
@@ -493,9 +636,16 @@ _GL_CXXALIAS_RPL (malloc, void *, (size_t size));
 # else
 #  if __GNUC__ >= 11
 /* 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);
+#   else
+_GL_FUNCDECL_SYS (malloc, void *,
+                  (size_t size)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (malloc, void *, (size_t size));
 # endif
@@ -505,9 +655,16 @@ _GL_CXXALIASWARN (malloc);
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !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);
+#  else
 _GL_FUNCDECL_SYS (malloc, void *,
                   (size_t size)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
 #  undef malloc
@@ -517,6 +674,51 @@ _GL_WARN_ON_USE (malloc, "malloc is not POSIX compliant everywhere - "
 # endif
 #endif
 
+/* Return maximum number of bytes of a multibyte character.  */
+#if @REPLACE_MB_CUR_MAX@
+# if !GNULIB_defined_MB_CUR_MAX
+static inline
+int gl_MB_CUR_MAX (void)
+{
+  /* Turn the value 3 to the value 4, as needed for the UTF-8 encoding.  */
+  return MB_CUR_MAX + (MB_CUR_MAX == 3);
+}
+#  undef MB_CUR_MAX
+#  define MB_CUR_MAX gl_MB_CUR_MAX ()
+#  define GNULIB_defined_MB_CUR_MAX 1
+# endif
+#endif
+
+/* Convert a string to a wide string.  */
+#if @GNULIB_MBSTOWCS@
+# if @REPLACE_MBSTOWCS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mbstowcs
+#   define mbstowcs rpl_mbstowcs
+#  endif
+_GL_FUNCDECL_RPL (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len)
+                  _GL_ARG_NONNULL ((2)));
+_GL_CXXALIAS_RPL (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len));
+# else
+_GL_CXXALIAS_SYS (mbstowcs, size_t,
+                  (wchar_t *restrict dest, const char *restrict src,
+                   size_t len));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (mbstowcs);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef mbstowcs
+# if HAVE_RAW_DECL_MBSTOWCS
+_GL_WARN_ON_USE (mbstowcs, "mbstowcs is unportable - "
+                 "use gnulib module mbstowcs for portability");
+# endif
+#endif
+
 /* Convert a multibyte character to a wide character.  */
 #if @GNULIB_MBTOWC@
 # if @REPLACE_MBTOWC@
@@ -579,12 +781,24 @@ _GL_WARN_ON_USE (mkdtemp, "mkdtemp is unportable - "
    implementation.
    Returns the open file descriptor if successful, otherwise -1 and errno
    set.  */
-# if !@HAVE_MKOSTEMP@
+# if @REPLACE_MKOSTEMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mkostemp
+#   define mkostemp rpl_mkostemp
+#  endif
+_GL_FUNCDECL_RPL (mkostemp, int, (char * /*template*/, int /*flags*/)
+                                 _GL_ARG_NONNULL ((1)));
+_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)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mkostemp, int, (char * /*template*/, int /*flags*/));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mkostemp);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkostemp
 # if HAVE_RAW_DECL_MKOSTEMP
@@ -607,14 +821,28 @@ _GL_WARN_ON_USE (mkostemp, "mkostemp is unportable - "
    implementation.
    Returns the open file descriptor if successful, otherwise -1 and errno
    set.  */
-# if !@HAVE_MKOSTEMPS@
+# if @REPLACE_MKOSTEMPS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mkostemps
+#   define mkostemps rpl_mkostemps
+#  endif
+_GL_FUNCDECL_RPL (mkostemps, int,
+                  (char * /*template*/, int /*suffixlen*/, int /*flags*/)
+                  _GL_ARG_NONNULL ((1)));
+_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)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mkostemps, int,
                   (char * /*template*/, int /*suffixlen*/, int /*flags*/));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mkostemps);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkostemps
 # if HAVE_RAW_DECL_MKOSTEMPS
@@ -713,7 +941,7 @@ _GL_CXXALIAS_SYS (posix_memalign, int,
                   (void **memptr, size_t alignment, size_t size));
 #  endif
 # endif
-# if @HAVE_POSIX_MEMALIGN@
+# if __GLIBC__ >= 2 && @HAVE_POSIX_MEMALIGN@
 _GL_CXXALIASWARN (posix_memalign);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -727,11 +955,22 @@ _GL_WARN_ON_USE (posix_memalign, "posix_memalign is not portable - "
 #if @GNULIB_POSIX_OPENPT@
 /* Return an FD open to the master side of a pseudo-terminal.  Flags should
    include O_RDWR, and may also include O_NOCTTY.  */
-# if !@HAVE_POSIX_OPENPT@
+# if @REPLACE_POSIX_OPENPT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef posix_openpt
+#   define posix_openpt rpl_posix_openpt
+#  endif
+_GL_FUNCDECL_RPL (posix_openpt, int, (int flags));
+_GL_CXXALIAS_RPL (posix_openpt, int, (int flags));
+# else
+#  if !@HAVE_POSIX_OPENPT@
 _GL_FUNCDECL_SYS (posix_openpt, int, (int flags));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (posix_openpt, int, (int flags));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (posix_openpt);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef posix_openpt
 # if HAVE_RAW_DECL_POSIX_OPENPT
@@ -808,6 +1047,10 @@ _GL_CXXALIAS_RPL (putenv, int, (char *string));
 #   define putenv _putenv
 #  endif
 _GL_CXXALIAS_MDA (putenv, int, (char *string));
+# elif defined __KLIBC__
+/* Need to cast, because on OS/2 kLIBC, the first parameter is
+                                     const char *string.  */
+_GL_CXXALIAS_SYS_CAST (putenv, int, (char *string));
 # else
 _GL_CXXALIAS_SYS (putenv, int, (char *string));
 # endif
@@ -824,6 +1067,10 @@ _GL_CXXALIASWARN (putenv);
 /* Need to cast, because on mingw, the parameter is either
    'const char *string' or 'char *string'.  */
 _GL_CXXALIAS_MDA_CAST (putenv, int, (char *string));
+# elif defined __KLIBC__
+/* Need to cast, because on OS/2 kLIBC, the first parameter is
+                                     const char *string.  */
+_GL_CXXALIAS_SYS_CAST (putenv, int, (char *string));
 # else
 _GL_CXXALIAS_SYS (putenv, int, (char *string));
 # endif
@@ -865,7 +1112,9 @@ _GL_CXXALIAS_SYS (qsort_r, void, (void *base, size_t nmemb, size_t size,
                                   _gl_qsort_r_compar_fn compare,
                                   void *arg));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (qsort_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef qsort_r
 # if HAVE_RAW_DECL_QSORT_R
@@ -875,11 +1124,26 @@ _GL_WARN_ON_USE (qsort_r, "qsort_r is not portable - "
 #endif
 
 
-#if @GNULIB_RANDOM_R@
-# if !@HAVE_RANDOM_R@
-#  ifndef RAND_MAX
-#   define RAND_MAX 2147483647
+#if @GNULIB_RAND@ || (@GNULIB_RANDOM_R@ && !@HAVE_RANDOM_R@)
+# ifndef RAND_MAX
+#  define RAND_MAX 2147483647
+# endif
+#endif
+
+
+#if @GNULIB_RAND@
+# if @REPLACE_RAND@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef rand
+#   define rand rpl_rand
 #  endif
+_GL_FUNCDECL_RPL (rand, int, (void));
+_GL_CXXALIAS_RPL (rand, int, (void));
+# else
+_GL_CXXALIAS_SYS (rand, int, (void));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (rand);
 # endif
 #endif
 
@@ -900,7 +1164,9 @@ _GL_FUNCDECL_SYS (random, long, (void));
                                int.  */
 _GL_CXXALIAS_SYS_CAST (random, long, (void));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (random);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef random
 # if HAVE_RAW_DECL_RANDOM
@@ -925,7 +1191,9 @@ _GL_FUNCDECL_SYS (srandom, void, (unsigned int seed));
                                        unsigned long seed.  */
 _GL_CXXALIAS_SYS_CAST (srandom, void, (unsigned int seed));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (srandom);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef srandom
 # if HAVE_RAW_DECL_SRANDOM
@@ -956,7 +1224,9 @@ _GL_FUNCDECL_SYS (initstate, char *,
 _GL_CXXALIAS_SYS_CAST (initstate, char *,
                        (unsigned int seed, char *buf, size_t buf_size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (initstate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef initstate
 # if HAVE_RAW_DECL_INITSTATE
@@ -981,7 +1251,9 @@ _GL_FUNCDECL_SYS (setstate, char *, (char *arg_state) _GL_ARG_NONNULL ((1)));
    is                                     const char *arg_state.  */
 _GL_CXXALIAS_SYS_CAST (setstate, char *, (char *arg_state));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (setstate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef setstate
 # if HAVE_RAW_DECL_SETSTATE
@@ -1126,8 +1398,16 @@ _GL_CXXALIAS_RPL (realloc, void *, (void *ptr, size_t size));
 # else
 #  if __GNUC__ >= 11
 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free.  */
-_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size)
-                                   _GL_ATTRIBUTE_DEALLOC_FREE);
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (realloc, void *, (void *ptr, size_t size));
 # endif
@@ -1137,8 +1417,16 @@ _GL_CXXALIASWARN (realloc);
 #else
 # if @GNULIB_FREE_POSIX@ && __GNUC__ >= 11 && !defined realloc
 /* For -Wmismatched-dealloc: Associate realloc with free or rpl_free.  */
-_GL_FUNCDECL_SYS (realloc, void *, (void *ptr, size_t size)
-                                   _GL_ATTRIBUTE_DEALLOC_FREE);
+#  if __GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (realloc, void *,
+                  (void *ptr, size_t size)
+                  _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK && !_GL_USE_STDLIB_ALLOC
 #  undef realloc
@@ -1167,7 +1455,9 @@ _GL_FUNCDECL_SYS (reallocarray, void *,
 _GL_CXXALIAS_SYS (reallocarray, void *,
                   (void *ptr, size_t nmemb, size_t size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (reallocarray);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef reallocarray
 # if HAVE_RAW_DECL_REALLOCARRAY
@@ -1301,6 +1591,38 @@ _GL_WARN_ON_USE (strtod, "strtod is unportable - "
 # endif
 #endif
 
+#if @GNULIB_STRTOF@
+ /* Parse a float from STRING, updating ENDP if appropriate.  */
+# if @REPLACE_STRTOF@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define strtof rpl_strtof
+#  endif
+#  define GNULIB_defined_strtof_function 1
+_GL_FUNCDECL_RPL (strtof, float,
+                  (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)
+                  _GL_ARG_NONNULL ((1)));
+#  endif
+_GL_CXXALIAS_SYS (strtof, float,
+                  (const char *restrict str, char **restrict endp));
+# endif
+# if __GLIBC__ >= 2
+_GL_CXXALIASWARN (strtof);
+# endif
+#elif defined GNULIB_POSIXCHECK
+# undef strtof
+# if HAVE_RAW_DECL_STRTOF
+_GL_WARN_ON_USE (strtof, "strtof is unportable - "
+                 "use gnulib module strtof for portability");
+# endif
+#endif
+
 #if @GNULIB_STRTOLD@
  /* Parse a 'long double' from STRING, updating ENDP if appropriate.  */
 # if @REPLACE_STRTOLD@
diff --git a/gl/str-two-way.h b/gl/str-two-way.h
index dfe70224..cf85e268 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-2024 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 3a5ce3e1..7939b404 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2007, 2009-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
@@ -22,8 +22,6 @@
 #include <ctype.h>
 #include <limits.h>
 
-#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
-
 /* 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.
@@ -41,8 +39,8 @@ strcasecmp (const char *s1, const char *s2)
 
   do
     {
-      c1 = TOLOWER (*p1);
-      c2 = TOLOWER (*p2);
+      c1 = tolower (*p1);
+      c2 = tolower (*p2);
 
       if (c1 == '\0')
         break;
diff --git a/gl/strcasestr.c b/gl/strcasestr.c
index 8eea435c..b8c0479d 100644
--- a/gl/strcasestr.c
+++ b/gl/strcasestr.c
@@ -1,5 +1,5 @@
 /* Case-insensitive searching in a string.
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This file is free software: you can redistribute it and/or modify
@@ -23,14 +23,12 @@
 #include <ctype.h>
 #include <strings.h>
 
-#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
-
 /* Two-Way algorithm.  */
 #define RETURN_TYPE char *
 #define AVAILABLE(h, h_l, j, n_l)                       \
   (!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l))     \
    && ((h_l) = (j) + (n_l)))
-#define CANON_ELEMENT(c) TOLOWER (c)
+#define CANON_ELEMENT(c) tolower (c)
 #define CMP_FUNC(p1, p2, l)                             \
   strncasecmp ((const char *) (p1), (const char *) (p2), l)
 #include "str-two-way.h"
@@ -52,8 +50,8 @@ strcasestr (const char *haystack_start, const char *needle_start)
      NEEDLE if HAYSTACK is too short).  */
   while (*haystack && *needle)
     {
-      ok &= (TOLOWER ((unsigned char) *haystack)
-             == TOLOWER ((unsigned char) *needle));
+      ok &= (tolower ((unsigned char) *haystack)
+             == tolower ((unsigned char) *needle));
       haystack++;
       needle++;
     }
diff --git a/gl/streq.h b/gl/streq.h
index 712948eb..8593de6d 100644
--- a/gl/streq.h
+++ b/gl/streq.h
@@ -1,5 +1,5 @@
 /* Optimized string comparison.
-   Copyright (C) 2001-2002, 2007, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2002, 2007, 2009-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
@@ -21,6 +21,11 @@
 
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* STREQ_OPT allows to optimize string comparison with a small literal string.
      STREQ_OPT (s, "EUC-KR", 'E', 'U', 'C', '-', 'K', 'R', 0, 0, 0)
    is semantically equivalent to
@@ -173,4 +178,9 @@ streq0 (const char *s1, const char *s2, char s20, char s21, char s22, char s23,
 
 #endif
 
+
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _GL_STREQ_H */
diff --git a/gl/strerror-override.c b/gl/strerror-override.c
index cddaa4a9..b9c1c7ab 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2010-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
diff --git a/gl/strerror-override.h b/gl/strerror-override.h
index 388cc282..a1734a24 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2010-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
@@ -16,42 +16,57 @@
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 #ifndef _GL_STRERROR_OVERRIDE_H
-# define _GL_STRERROR_OVERRIDE_H
+#define _GL_STRERROR_OVERRIDE_H
+
+/* This file uses _GL_ATTRIBUTE_CONST.  */
+#if !_GL_CONFIG_H_INCLUDED
+# error "Please include config.h first."
+#endif
+
+#include <errno.h>
+#include <stddef.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-# include <errno.h>
-# include <stddef.h>
 
 /* Reasonable buffer size that should never trigger ERANGE; if this
    proves too small, we intentionally abort(), to remind us to fix
    this value.  */
-# define STACKBUF_LEN 256
+#define STACKBUF_LEN 256
 
 /* If ERRNUM maps to an errno value defined by gnulib, return a string
    describing the error.  Otherwise return NULL.  */
-# if REPLACE_STRERROR_0 \
-     || GNULIB_defined_ESOCK \
-     || GNULIB_defined_ESTREAMS \
-     || GNULIB_defined_EWINSOCK \
-     || GNULIB_defined_ENOMSG \
-     || GNULIB_defined_EIDRM \
-     || GNULIB_defined_ENOLINK \
-     || GNULIB_defined_EPROTO \
-     || GNULIB_defined_EMULTIHOP \
-     || GNULIB_defined_EBADMSG \
-     || GNULIB_defined_EOVERFLOW \
-     || GNULIB_defined_ENOTSUP \
-     || GNULIB_defined_ENETRESET \
-     || GNULIB_defined_ECONNABORTED \
-     || GNULIB_defined_ESTALE \
-     || GNULIB_defined_EDQUOT \
-     || GNULIB_defined_ECANCELED \
-     || GNULIB_defined_EOWNERDEAD \
-     || GNULIB_defined_ENOTRECOVERABLE \
-     || GNULIB_defined_EILSEQ
+#if REPLACE_STRERROR_0 \
+    || GNULIB_defined_ESOCK \
+    || GNULIB_defined_ESTREAMS \
+    || GNULIB_defined_EWINSOCK \
+    || GNULIB_defined_ENOMSG \
+    || GNULIB_defined_EIDRM \
+    || GNULIB_defined_ENOLINK \
+    || GNULIB_defined_EPROTO \
+    || GNULIB_defined_EMULTIHOP \
+    || GNULIB_defined_EBADMSG \
+    || GNULIB_defined_EOVERFLOW \
+    || GNULIB_defined_ENOTSUP \
+    || GNULIB_defined_ENETRESET \
+    || GNULIB_defined_ECONNABORTED \
+    || GNULIB_defined_ESTALE \
+    || GNULIB_defined_EDQUOT \
+    || GNULIB_defined_ECANCELED \
+    || GNULIB_defined_EOWNERDEAD \
+    || GNULIB_defined_ENOTRECOVERABLE \
+    || GNULIB_defined_EILSEQ
 extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST;
-# else
-#  define strerror_override(ignored) NULL
-#  define GNULIB_defined_strerror_override_macro 1
-# endif
+#else
+# define strerror_override(ignored) NULL
+# define GNULIB_defined_strerror_override_macro 1
+#endif
+
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _GL_STRERROR_OVERRIDE_H */
diff --git a/gl/strerror.c b/gl/strerror.c
index d754f601..6b760ff4 100644
--- a/gl/strerror.c
+++ b/gl/strerror.c
@@ -1,6 +1,6 @@
 /* strerror.c --- POSIX compatible system error routine
 
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
diff --git a/gl/string.in.h b/gl/string.in.h
index e993b2fb..44ec2e7e 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-1996, 2001-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
@@ -44,6 +44,13 @@
 #ifndef _@GUARD_PREFIX@_STRING_H
 #define _@GUARD_PREFIX@_STRING_H
 
+/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC,
+   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 #include <stddef.h>
 
@@ -59,10 +66,11 @@
 # include <unistd.h>
 #endif
 
-/* AIX 7.2 declares ffsl and ffsll in <strings.h>, not in <string.h>.  */
+/* AIX 7.2 and Android 13 declare ffsl and ffsll in <strings.h>, not in
+   <string.h>.  */
 /* But in any case avoid namespace pollution on glibc systems.  */
 #if ((@GNULIB_FFSL@ || @GNULIB_FFSLL@ || defined GNULIB_POSIXCHECK) \
-     && defined _AIX) \
+     && (defined _AIX || defined __ANDROID__)) \
     && ! defined __GLIBC__
 # include <strings.h>
 #endif
@@ -103,6 +111,28 @@
 # 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 __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* 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
@@ -125,7 +155,11 @@
 # if (@REPLACE_FREE@ && !defined free \
       && !(defined __cplusplus && defined GNULIB_NAMESPACE))
 /* We can't do '#define free rpl_free' here.  */
+#  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
+_GL_EXTERN_C void rpl_free (void *) _GL_ATTRIBUTE_NOTHROW;
+#  else
 _GL_EXTERN_C void rpl_free (void *);
+#  endif
 #  undef _GL_ATTRIBUTE_DEALLOC_FREE
 #  define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1)
 # else
@@ -137,7 +171,7 @@ _GL_EXTERN_C
      void __cdecl free (void *);
 #  else
 #   if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_EXTERN_C void free (void *);
 #   endif
@@ -152,7 +186,7 @@ _GL_EXTERN_C
      void __cdecl free (void *);
 # else
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_EXTERN_C void free (void *);
 #  endif
@@ -255,9 +289,12 @@ _GL_CXXALIAS_SYS_CAST2 (memchr,
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n) throw ());
+_GL_CXXALIASWARN1 (memchr, void *,
+                   (void *__s, int __c, size_t __n)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (memchr, void const *,
-                   (void const *__s, int __c, size_t __n) throw ());
+                   (void const *__s, int __c, size_t __n)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (memchr);
 # endif
@@ -307,16 +344,32 @@ _GL_WARN_ON_USE (memmem, "memmem is unportable and often quadratic - "
 /* Copy N bytes of SRC to DEST, return pointer to bytes after the
    last written byte.  */
 #if @GNULIB_MEMPCPY@
-# if ! @HAVE_MEMPCPY@
+# if @REPLACE_MEMPCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef mempcpy
+#   define mempcpy rpl_mempcpy
+#  endif
+_GL_FUNCDECL_RPL (mempcpy, void *,
+                  (void *restrict __dest, void const *restrict __src,
+                   size_t __n)
+                  _GL_ARG_NONNULL ((1, 2)));
+_GL_CXXALIAS_RPL (mempcpy, void *,
+                  (void *restrict __dest, void const *restrict __src,
+                   size_t __n));
+# else
+#  if !@HAVE_MEMPCPY@
 _GL_FUNCDECL_SYS (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
                    size_t __n)
                   _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (mempcpy, void *,
                   (void *restrict __dest, void const *restrict __src,
                    size_t __n));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mempcpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mempcpy
 # if HAVE_RAW_DECL_MEMPCPY
@@ -341,9 +394,13 @@ _GL_CXXALIAS_SYS_CAST2 (memrchr,
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ());
-_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ());
-# else
+_GL_CXXALIASWARN1 (memrchr, void *,
+                   (void *, int, size_t)
+                   _GL_ATTRIBUTE_NOTHROW);
+_GL_CXXALIASWARN1 (memrchr, void const *,
+                   (void const *, int, size_t)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (memrchr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -357,11 +414,21 @@ _GL_WARN_ON_USE (memrchr, "memrchr is unportable - "
 /* Overwrite a block of memory.  The compiler will not optimize
    effects away, even if the block is dead after the call.  */
 #if @GNULIB_MEMSET_EXPLICIT@
-# if ! @HAVE_MEMSET_EXPLICIT@
+# if @REPLACE_MEMSET_EXPLICIT@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef memset_explicit
+#   define memset_explicit rpl_memset_explicit
+#  endif
+_GL_FUNCDECL_RPL (memset_explicit, void *,
+                  (void *__dest, int __c, size_t __n) _GL_ARG_NONNULL ((1)));
+_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)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (memset_explicit, void *, (void *__dest, int __c, size_t __n));
+# endif
 _GL_CXXALIASWARN (memset_explicit);
 #elif defined GNULIB_POSIXCHECK
 # undef memset_explicit
@@ -389,9 +456,12 @@ _GL_CXXALIAS_SYS_CAST2 (rawmemchr,
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in) throw ());
+_GL_CXXALIASWARN1 (rawmemchr, void *,
+                   (void *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (rawmemchr, void const *,
-                   (void const *__s, int __c_in) throw ());
+                   (void const *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 # else
 _GL_CXXALIASWARN (rawmemchr);
 # endif
@@ -405,14 +475,28 @@ _GL_WARN_ON_USE (rawmemchr, "rawmemchr is unportable - "
 
 /* Copy SRC to DST, returning the address of the terminating '\0' in DST.  */
 #if @GNULIB_STPCPY@
-# if ! @HAVE_STPCPY@
+# if @REPLACE_STPCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef stpcpy
+#   define stpcpy rpl_stpcpy
+#  endif
+_GL_FUNCDECL_RPL (stpcpy, char *,
+                  (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)
                   _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (stpcpy, char *,
                   (char *restrict __dst, char const *restrict __src));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (stpcpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef stpcpy
 # if HAVE_RAW_DECL_STPCPY
@@ -447,7 +531,9 @@ _GL_CXXALIAS_SYS (stpncpy, char *,
                   (char *restrict __dst, char const *restrict __src,
                    size_t __n));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (stpncpy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef stpncpy
 # if HAVE_RAW_DECL_STPNCPY
@@ -495,10 +581,13 @@ _GL_CXXALIAS_SYS_CAST2 (strchrnul,
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ());
+_GL_CXXALIASWARN1 (strchrnul, char *,
+                   (char *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strchrnul, char const *,
-                   (char const *__s, int __c_in) throw ());
-# else
+                   (char const *__s, int __c_in)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strchrnul);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -533,10 +622,18 @@ _GL_CXXALIAS_MDA (strdup, char *, (char const *__s));
 #   undef strdup
 #  endif
 #  if (!@HAVE_DECL_STRDUP@ || __GNUC__ >= 11) && !defined strdup
+#   if __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2
+_GL_FUNCDECL_SYS (strdup, char *,
+                  (char const *__s)
+                  _GL_ATTRIBUTE_NOTHROW
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   else
 _GL_FUNCDECL_SYS (strdup, char *,
                   (char const *__s)
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (strdup, char *, (char const *__s));
 # endif
@@ -544,10 +641,18 @@ _GL_CXXALIASWARN (strdup);
 #else
 # if __GNUC__ >= 11 && !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
                   _GL_ARG_NONNULL ((1))
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  else
+_GL_FUNCDECL_SYS (strdup, char *,
+                  (char const *__s)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef strdup
@@ -616,10 +721,18 @@ _GL_FUNCDECL_RPL (strndup, char *,
 _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n));
 # else
 #  if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !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);
+#   else
+_GL_FUNCDECL_SYS (strndup, char *,
+                  (char const *__s, size_t __n)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n));
 # endif
@@ -627,10 +740,18 @@ _GL_CXXALIASWARN (strndup);
 #else
 # if __GNUC__ >= 11 && !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);
+#  else
+_GL_FUNCDECL_SYS (strndup, char *,
+                  (char const *__s, size_t __n)
+                  _GL_ARG_NONNULL ((1))
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef strndup
@@ -699,9 +820,12 @@ _GL_CXXALIAS_SYS_CAST2 (strpbrk,
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
-_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept) throw ());
+_GL_CXXALIASWARN1 (strpbrk, char *,
+                   (char *__s, char const *__accept)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strpbrk, char const *,
-                   (char const *__s, char const *__accept) throw ());
+                   (char const *__s, char const *__accept)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strpbrk);
 # endif
@@ -809,9 +933,11 @@ _GL_CXXALIAS_SYS_CAST2 (strstr,
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
 _GL_CXXALIASWARN1 (strstr, char *,
-                   (char *haystack, const char *needle) throw ());
+                   (char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strstr, const char *,
-                   (const char *haystack, const char *needle) throw ());
+                   (const char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 # elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strstr);
 # endif
@@ -860,10 +986,12 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr,
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \
          || defined __clang__)
 _GL_CXXALIASWARN1 (strcasestr, char *,
-                   (char *haystack, const char *needle) throw ());
+                   (char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
 _GL_CXXALIASWARN1 (strcasestr, const char *,
-                   (const char *haystack, const char *needle) throw ());
-# else
+                   (const char *haystack, const char *needle)
+                   _GL_ATTRIBUTE_NOTHROW);
+# elif __GLIBC__ >= 2
 _GL_CXXALIASWARN (strcasestr);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1211,7 +1339,7 @@ _GL_FUNCDECL_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen)
 #  endif
 _GL_CXXALIAS_SYS (strerror_r, int, (int errnum, char *buf, size_t buflen));
 # endif
-# if @HAVE_DECL_STRERROR_R@
+# if __GLIBC__ >= 2 && @HAVE_DECL_STRERROR_R@
 _GL_CXXALIASWARN (strerror_r);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -1301,12 +1429,22 @@ _GL_WARN_ON_USE (strsignal, "strsignal is unportable - "
 #endif
 
 #if @GNULIB_STRVERSCMP@
-# if !@HAVE_STRVERSCMP@
+# if @REPLACE_STRVERSCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   define strverscmp rpl_strverscmp
+#  endif
+_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_ATTRIBUTE_PURE
                                    _GL_ARG_NONNULL ((1, 2)));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (strverscmp, int, (const char *, const char *));
+# endif
 _GL_CXXALIASWARN (strverscmp);
 #elif defined GNULIB_POSIXCHECK
 # undef strverscmp
diff --git a/gl/strings.in.h b/gl/strings.in.h
index 2cfe8b16..2b3e062a 100644
--- a/gl/strings.in.h
+++ b/gl/strings.in.h
@@ -1,6 +1,6 @@
 /* A substitute <strings.h>.
 
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -36,6 +36,11 @@
 #ifndef _@GUARD_PREFIX@_STRINGS_H
 #define _@GUARD_PREFIX@_STRINGS_H
 
+/* This file uses GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #if ! @HAVE_DECL_STRNCASECMP@
 /* Get size_t.  */
 # include <stddef.h>
diff --git a/gl/stripslash.c b/gl/stripslash.c
index fe46a9c1..c127ce7e 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-2023 Free Software Foundation,
+   Copyright (C) 1990, 2001, 2003-2006, 2009-2024 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 c5c2cd35..c79161f3 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1998-1999, 2005-2007, 2009-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
@@ -22,8 +22,6 @@
 #include <ctype.h>
 #include <limits.h>
 
-#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch))
-
 /* 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.
@@ -41,8 +39,8 @@ strncasecmp (const char *s1, const char *s2, size_t n)
 
   do
     {
-      c1 = TOLOWER (*p1);
-      c2 = TOLOWER (*p2);
+      c1 = tolower (*p1);
+      c2 = tolower (*p2);
 
       if (--n == 0 || c1 == '\0')
         break;
diff --git a/gl/strsep.c b/gl/strsep.c
index 8e9708a3..eefd85e2 100644
--- a/gl/strsep.c
+++ b/gl/strsep.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2004, 2007, 2009-2023 Free Software Foundation, Inc.
+/* Copyright (C) 2004, 2007, 2009-2024 Free Software Foundation, Inc.
 
    Written by Yoann Vandoorselaere <yoann@prelude-ids.org>.
 
diff --git a/gl/strstr.c b/gl/strstr.c
index 574f4d50..7ea28603 100644
--- a/gl/strstr.c
+++ b/gl/strstr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2023 Free Software
+/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2024 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 0e9556d6..d2f29d80 100644
--- a/gl/sys-limits.h
+++ b/gl/sys-limits.h
@@ -1,6 +1,6 @@
 /* System call limits
 
-   Copyright 2018-2023 Free Software Foundation, Inc.
+   Copyright 2018-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
diff --git a/gl/sys_socket.c b/gl/sys_socket.c
index b7388cec..672d3aac 100644
--- a/gl/sys_socket.c
+++ b/gl/sys_socket.c
@@ -1,6 +1,6 @@
 /* Inline functions for <sys/socket.h>.
 
-   Copyright (C) 2012-2023 Free Software Foundation, Inc.
+   Copyright (C) 2012-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
@@ -18,5 +18,5 @@
 #include <config.h>
 
 #define _GL_SYS_SOCKET_INLINE _GL_EXTERN_INLINE
-#include "sys/socket.h"
+#include <sys/socket.h>
 typedef int dummy;
diff --git a/gl/sys_socket.in.h b/gl/sys_socket.in.h
index 6705593f..13833c0f 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2024 Free Software Foundation, Inc.
    Written by Simon Josefsson.
 
    This file is free software: you can redistribute it and/or modify
@@ -63,9 +63,12 @@
 #ifndef _@GUARD_PREFIX@_SYS_SOCKET_H
 #define _@GUARD_PREFIX@_SYS_SOCKET_H
 
-#ifndef _GL_INLINE_HEADER_BEGIN
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*, alignof.  */
+#if !_GL_CONFIG_H_INCLUDED
  #error "Please include config.h first."
 #endif
+
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_SYS_SOCKET_INLINE
 # define _GL_SYS_SOCKET_INLINE _GL_INLINE
@@ -355,7 +358,9 @@ _GL_CXXALIAS_SYS_CAST (accept, int,
                         struct sockaddr *restrict addr,
                         socklen_t *restrict addrlen));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (accept);
+# endif
 #elif @HAVE_WINSOCK2_H@
 # undef accept
 # define accept accept_used_without_requesting_gnulib_module_accept
@@ -417,7 +422,9 @@ _GL_CXXALIAS_SYS_CAST (getpeername, int,
                        (int fd, struct sockaddr *restrict addr,
                         socklen_t *restrict addrlen));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getpeername);
+# endif
 #elif @HAVE_WINSOCK2_H@
 # undef getpeername
 # define getpeername getpeername_used_without_requesting_gnulib_module_getpeername
@@ -449,7 +456,9 @@ _GL_CXXALIAS_SYS_CAST (getsockname, int,
                        (int fd, struct sockaddr *restrict addr,
                         socklen_t *restrict addrlen));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getsockname);
+# endif
 #elif @HAVE_WINSOCK2_H@
 # undef getsockname
 # define getsockname getsockname_used_without_requesting_gnulib_module_getsockname
@@ -596,7 +605,9 @@ _GL_CXXALIAS_SYS_CAST (recvfrom, ssize_t,
                         struct sockaddr *restrict from,
                         socklen_t *restrict fromlen));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (recvfrom);
+# endif
 #elif @HAVE_WINSOCK2_H@
 # undef recvfrom
 # define recvfrom recvfrom_used_without_requesting_gnulib_module_recvfrom
diff --git a/gl/sys_stat.in.h b/gl/sys_stat.in.h
index 096887c0..bf08f335 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
@@ -25,6 +25,13 @@
 #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
+
 #if defined __need_system_sys_stat_h
 /* Special invocation convention.  */
 
@@ -48,12 +55,41 @@
 #ifndef _@GUARD_PREFIX@_SYS_STAT_H
 #define _@GUARD_PREFIX@_SYS_STAT_H
 
+/* This file uses _GL_ATTRIBUTE_NOTHROW, GNULIB_POSIXCHECK, HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#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 __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# 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.  */
 
+
 /* Before doing "#define mknod rpl_mknod" below, we need to include all
    headers that may declare mknod().  OS/2 kLIBC declares mknod() in
    <unistd.h>, not in <sys/stat.h>.  */
@@ -549,7 +585,7 @@ _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
-# if @HAVE_FUTIMENS@
+# if __GLIBC__ >= 2 && @HAVE_FUTIMENS@
 _GL_CXXALIASWARN (futimens);
 # endif
 #elif defined GNULIB_POSIXCHECK
@@ -563,7 +599,11 @@ _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);
+#  else
 _GL_FUNCDECL_SYS (getumask, mode_t, (void));
+#  endif
 # endif
 _GL_CXXALIAS_SYS (getumask, mode_t, (void));
 # if @HAVE_GETUMASK@
@@ -716,7 +756,9 @@ _GL_FUNCDECL_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode)
 #  endif
 _GL_CXXALIAS_SYS (mkfifoat, int, (int fd, char const *file, mode_t mode));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mkfifoat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mkfifoat
 # if HAVE_RAW_DECL_MKFIFOAT
@@ -773,7 +815,9 @@ _GL_FUNCDECL_SYS (mknodat, int,
 _GL_CXXALIAS_SYS (mknodat, int,
                   (int fd, char const *file, mode_t mode, dev_t dev));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mknodat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mknodat
 # if HAVE_RAW_DECL_MKNODAT
@@ -937,7 +981,7 @@ _GL_FUNCDECL_SYS (utimensat, int, (int fd, char const *name,
 _GL_CXXALIAS_SYS (utimensat, int, (int fd, char const *name,
                                    struct timespec const times[2], int flag));
 # endif
-# if @HAVE_UTIMENSAT@
+# if __GLIBC__ >= 2 && @HAVE_UTIMENSAT@
 _GL_CXXALIASWARN (utimensat);
 # endif
 #elif defined GNULIB_POSIXCHECK
diff --git a/gl/sys_types.in.h b/gl/sys_types.in.h
index 082a6c67..0a0ccc3c 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
@@ -20,6 +20,13 @@
 #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
+
 #if defined _WIN32 && !defined __CYGWIN__ \
     && (defined __need_off_t || defined __need___off64_t \
         || defined __need_ssize_t || defined __need_time_t)
diff --git a/gl/sys_uio.in.h b/gl/sys_uio.in.h
index 64c4fb6d..5e71859d 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2011-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
diff --git a/gl/time.in.h b/gl/time.in.h
index 50c9b30b..df99c8ab 100644
--- a/gl/time.in.h
+++ b/gl/time.in.h
@@ -1,6 +1,6 @@
 /* A more-standard <time.h>.
 
-   Copyright (C) 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -20,6 +20,13 @@
 #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
+
 /* Don't get in the way of glibc when it includes time.h merely to
    declare a few standard symbols, rather than to declare all the
    symbols.  (However, skip this for MinGW as it treats __need_time_t
@@ -45,6 +52,12 @@
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@
 
+/* This file uses _GL_ATTRIBUTE_DEPRECATED, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+# if !_GL_CONFIG_H_INCLUDED
+#  error "Please include config.h first."
+# endif
+
 /* NetBSD 5.0 mis-defines NULL.  */
 # include <stddef.h>
 
@@ -112,23 +125,79 @@ struct __time_t_must_be_integral {
 /* Set *TS to the current time, and return BASE.
    Upon failure, return 0.  */
 # if @GNULIB_TIMESPEC_GET@
-#  if ! @HAVE_TIMESPEC_GET@
+#  if @REPLACE_TIMESPEC_GET@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef timespec_get
+#    define timespec_get rpl_timespec_get
+#   endif
+_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_ARG_NONNULL ((1)));
-#  endif
+#   endif
 _GL_CXXALIAS_SYS (timespec_get, int, (struct timespec *ts, int base));
+#  endif
+#  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (timespec_get);
+#  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef timespec_get
+#  if HAVE_RAW_DECL_TIMESPEC_GET
+_GL_WARN_ON_USE (timespec_get, "timespec_get is unportable - "
+                 "use gnulib module timespec_get for portability");
+#  endif
 # endif
 
 /* Set *TS to the current time resolution, and return BASE.
    Upon failure, return 0.  */
 # if @GNULIB_TIMESPEC_GETRES@
-#  if ! @HAVE_TIMESPEC_GETRES@
+#  if @REPLACE_TIMESPEC_GETRES@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef timespec_getres
+#    define timespec_getres rpl_timespec_getres
+#   endif
+_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_ARG_NONNULL ((1)));
-#  endif
+#   endif
 _GL_CXXALIAS_SYS (timespec_getres, int, (struct timespec *ts, int base));
+#  endif
 _GL_CXXALIASWARN (timespec_getres);
+# elif defined GNULIB_POSIXCHECK
+#  undef timespec_getres
+#  if HAVE_RAW_DECL_TIMESPEC_GETRES
+_GL_WARN_ON_USE (timespec_getres, "timespec_getres is unportable - "
+                 "use gnulib module timespec_getres for portability");
+#  endif
+# endif
+
+/* Return the number of seconds that have elapsed since the Epoch.  */
+# if @GNULIB_TIME@
+#  if @REPLACE_TIME@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    define time rpl_time
+#   endif
+_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));
+#  endif
+#  if __GLIBC__ >= 2
+_GL_CXXALIASWARN (time);
+#  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef time
+#  if HAVE_RAW_DECL_TIME
+_GL_WARN_ON_USE (time, "time has consistency problems - "
+                 "use gnulib module time for portability");
+#  endif
 # endif
 
 /* Sleep for at least RQTP seconds unless interrupted,  If interrupted,
@@ -154,6 +223,12 @@ _GL_CXXALIAS_SYS (nanosleep, int,
                   (struct timespec const *__rqtp, struct timespec *__rmtp));
 #  endif
 _GL_CXXALIASWARN (nanosleep);
+# elif defined GNULIB_POSIXCHECK
+#  undef nanosleep
+#  if HAVE_RAW_DECL_NANOSLEEP
+_GL_WARN_ON_USE (nanosleep, "nanosleep is unportable - "
+                 "use gnulib module nanosleep for portability");
+#  endif
 # endif
 
 /* Initialize time conversion information.  */
@@ -189,6 +264,12 @@ _GL_CXXALIAS_MDA (tzset, void, (void));
 _GL_CXXALIAS_SYS (tzset, void, (void));
 #  endif
 _GL_CXXALIASWARN (tzset);
+# elif defined GNULIB_POSIXCHECK
+#  undef tzset
+#  if HAVE_RAW_DECL_TZSET
+_GL_WARN_ON_USE (tzset, "tzset has portability problems - "
+                 "use gnulib module tzset for portability");
+#  endif
 # endif
 
 /* Return the 'time_t' representation of TP and normalize TP.  */
@@ -205,6 +286,12 @@ _GL_CXXALIAS_SYS (mktime, time_t, (struct tm *__tp));
 #  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mktime);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef mktime
+#  if HAVE_RAW_DECL_MKTIME
+_GL_WARN_ON_USE (mktime, "mktime has portability problems - "
+                 "use gnulib module mktime for portability");
+#  endif
 # endif
 
 /* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
@@ -255,6 +342,17 @@ _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
 #  if @HAVE_DECL_LOCALTIME_R@
 _GL_CXXALIASWARN (gmtime_r);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef localtime_r
+#  if HAVE_RAW_DECL_LOCALTIME_R
+_GL_WARN_ON_USE (localtime_r, "localtime_r is unportable - "
+                 "use gnulib module time_r for portability");
+#  endif
+#  undef gmtime_r
+#  if HAVE_RAW_DECL_GMTIME_R
+_GL_WARN_ON_USE (gmtime_r, "gmtime_r is unportable - "
+                 "use gnulib module time_r for portability");
+#  endif
 # endif
 
 /* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
@@ -275,6 +373,12 @@ _GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer));
 #  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (localtime);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef localtime
+#  if HAVE_RAW_DECL_LOCALTIME
+_GL_WARN_ON_USE (localtime, "localtime has portability problems - "
+                 "use gnulib module localtime for portability");
+#  endif
 # endif
 
 # if 0 || @REPLACE_GMTIME@
@@ -306,6 +410,12 @@ _GL_CXXALIAS_SYS (strptime, char *, (char const *restrict __buf,
                                      char const *restrict __format,
                                      struct tm *restrict __tm));
 _GL_CXXALIASWARN (strptime);
+# elif defined GNULIB_POSIXCHECK
+#  undef strptime
+#  if HAVE_RAW_DECL_STRPTIME
+_GL_WARN_ON_USE (strptime, "strptime is unportable - "
+                 "use gnulib module strptime for portability");
+#  endif
 # endif
 
 /* Convert *TP to a date and time string.  See
@@ -315,7 +425,9 @@ _GL_CXXALIASWARN (strptime);
 #   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #    define ctime rpl_ctime
 #   endif
+#   ifndef __cplusplus
 _GL_ATTRIBUTE_DEPRECATED
+#   endif
 _GL_FUNCDECL_RPL (ctime, char *, (time_t const *__tp)
                                  _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_RPL (ctime, char *, (time_t const *__tp));
@@ -325,6 +437,8 @@ _GL_CXXALIAS_SYS (ctime, char *, (time_t const *__tp));
 #  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ctime);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+/* No need to warn about portability, as a more serious warning is below.  */
 # endif
 
 /* Convert *TP to a date and time string.  See
@@ -349,6 +463,12 @@ _GL_CXXALIAS_SYS (strftime, size_t,
 #  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (strftime);
 #  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef strftime
+#  if HAVE_RAW_DECL_STRFTIME
+_GL_WARN_ON_USE (strftime, "strftime has portability problems - "
+                 "use gnulib module strftime-fixes for portability");
+#  endif
 # endif
 
 # if defined _GNU_SOURCE && @GNULIB_TIME_RZ@ && ! @HAVE_TIMEZONE_T@
@@ -423,7 +543,15 @@ _GL_FUNCDECL_SYS (timegm, time_t, (struct tm *__tm) _GL_ARG_NONNULL ((1)));
 #   endif
 _GL_CXXALIAS_SYS (timegm, time_t, (struct tm *__tm));
 #  endif
+#  if __GLIBC__ >= 2
 _GL_CXXALIASWARN (timegm);
+#  endif
+# elif defined GNULIB_POSIXCHECK
+#  undef timegm
+#  if HAVE_RAW_DECL_TIMEGM
+_GL_WARN_ON_USE (timegm, "timegm is unportable - "
+                 "use gnulib module timegm for portability");
+#  endif
 # endif
 
 /* Encourage applications to avoid unsafe functions that can overrun
@@ -431,8 +559,10 @@ _GL_CXXALIASWARN (timegm);
    applications should use strftime (or even sprintf) instead.  */
 # if defined GNULIB_POSIXCHECK
 #  undef asctime
+#  if HAVE_RAW_DECL_ASCTIME
 _GL_WARN_ON_USE (asctime, "asctime can overrun buffers in some cases - "
                  "better use strftime (or even sprintf) instead");
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef asctime_r
@@ -443,8 +573,10 @@ _GL_WARN_ON_USE (asctime_r, "asctime_r can overrun buffers in some cases - "
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef ctime
+#  if HAVE_RAW_DECL_CTIME
 _GL_WARN_ON_USE (ctime, "ctime can overrun buffers in some cases - "
                  "better use strftime (or even sprintf) instead");
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef ctime_r
diff --git a/gl/time_r.c b/gl/time_r.c
index 97be4fd0..b724f3b3 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006-2007, 2010-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
@@ -21,6 +21,11 @@
 
 #include <time.h>
 
+/* The replacement functions in this file are only used on native Windows.
+   They are multithread-safe, because the gmtime() and localtime() functions
+   on native Windows — both in the ucrt and in the older MSVCRT — return a
+   pointer to a 'struct tm' in thread-local memory.  */
+
 static struct tm *
 copy_tm_result (struct tm *dest, struct tm const *src)
 {
diff --git a/gl/timegm.c b/gl/timegm.c
index b47025a0..e5cf30c0 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1994-2024 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/unistd.c b/gl/unistd.c
index be7a8255..f3b3f7bd 100644
--- a/gl/unistd.c
+++ b/gl/unistd.c
@@ -1,6 +1,6 @@
 /* Inline functions for <unistd.h>.
 
-   Copyright (C) 2012-2023 Free Software Foundation, Inc.
+   Copyright (C) 2012-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
@@ -18,5 +18,5 @@
 #include <config.h>
 
 #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
-#include "unistd.h"
+#include <unistd.h>
 typedef int dummy;
diff --git a/gl/unistd.in.h b/gl/unistd.in.h
index 4812fdb1..b4129663 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-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
@@ -40,6 +40,24 @@
 # undef _GL_INCLUDING_UNISTD_H
 #endif
 
+/* Avoid lseek bugs in FreeBSD, macOS <https://bugs.gnu.org/61386>.
+   This bug is fixed after FreeBSD 13; see <https://bugs.freebsd.org/256205>.
+   Use macOS "9999" to stand for a future fixed macOS version.  */
+#if defined __FreeBSD__ && __FreeBSD__ < 14
+# undef SEEK_DATA
+# undef SEEK_HOLE
+#elif defined __APPLE__ && defined __MACH__ && defined SEEK_DATA
+# ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#  include <AvailabilityMacros.h>
+# endif
+# if (!defined MAC_OS_X_VERSION_MIN_REQUIRED \
+      || MAC_OS_X_VERSION_MIN_REQUIRED < 99990000)
+#  include <sys/fcntl.h> /* It also defines the two macros.  */
+#  undef SEEK_DATA
+#  undef SEEK_HOLE
+# endif
+#endif
+
 /* Get all possible declarations of gethostname().  */
 #if @GNULIB_GETHOSTNAME@ && @UNISTD_H_HAVE_WINSOCK2_H@ \
   && !defined _GL_INCLUDING_WINSOCK2_H
@@ -51,6 +69,12 @@
 #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_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* NetBSD 5.0 mis-defines NULL.  Also get size_t.  */
 /* But avoid namespace pollution on glibc systems.  */
 #ifndef __GLIBC__
@@ -152,9 +176,6 @@
 # include <getopt-pfx-core.h>
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_UNISTD_INLINE
 # define _GL_UNISTD_INLINE _GL_INLINE
@@ -541,17 +562,22 @@ _GL_CXXALIASWARN (dup2);
    Return newfd if successful, otherwise -1 and errno set.
    See the Linux man page at
    <https://www.kernel.org/doc/man-pages/online/pages/man2/dup3.2.html>.  */
-# if @HAVE_DUP3@
+# if @REPLACE_DUP3@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef dup3
 #   define dup3 rpl_dup3
 #  endif
 _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));
+#  endif
 _GL_CXXALIAS_SYS (dup3, int, (int oldfd, int newfd, int flags));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (dup3);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef dup3
 # if HAVE_RAW_DECL_DUP3
@@ -870,7 +896,9 @@ _GL_FUNCDECL_SYS (execvpe, int,
 _GL_CXXALIAS_SYS (execvpe, int,
                   (const char *program, char * const *argv, char * const *env));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (execvpe);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef execvpe
 # if HAVE_RAW_DECL_EXECVPE
@@ -925,7 +953,9 @@ _GL_FUNCDECL_SYS (faccessat, int,
 _GL_CXXALIAS_SYS (faccessat, int,
                   (int fd, char const *file, int mode, int flag));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (faccessat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef faccessat
 # if HAVE_RAW_DECL_FACCESSAT
@@ -941,23 +971,28 @@ _GL_WARN_ON_USE (faccessat, "faccessat is not portable - "
    Return 0 if successful, otherwise -1 and errno set.
    See the POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fchdir.html>.  */
-# if ! @HAVE_FCHDIR@
+# if @REPLACE_FCHDIR@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fchdir
+#   define fchdir rpl_fchdir
+#  endif
+_GL_FUNCDECL_RPL (fchdir, int, (int /*fd*/));
+_GL_CXXALIAS_RPL (fchdir, int, (int /*fd*/));
+# else
+#  if !@HAVE_FCHDIR@ || !@HAVE_DECL_FCHDIR@
 _GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-
+#  endif
+_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
+# endif
+_GL_CXXALIASWARN (fchdir);
+# if @REPLACE_FCHDIR@ || !@HAVE_FCHDIR@
 /* Gnulib internal hooks needed to maintain the fchdir metadata.  */
 _GL_EXTERN_C int _gl_register_fd (int fd, const char *filename)
      _GL_ARG_NONNULL ((2));
 _GL_EXTERN_C void _gl_unregister_fd (int fd);
 _GL_EXTERN_C int _gl_register_dup (int oldfd, int newfd);
 _GL_EXTERN_C const char *_gl_directory_name (int fd);
-
-# else
-#  if !@HAVE_DECL_FCHDIR@
-_GL_FUNCDECL_SYS (fchdir, int, (int /*fd*/));
-#  endif
 # endif
-_GL_CXXALIAS_SYS (fchdir, int, (int /*fd*/));
-_GL_CXXALIASWARN (fchdir);
 #elif defined GNULIB_POSIXCHECK
 # undef fchdir
 # if HAVE_RAW_DECL_FCHDIR
@@ -1002,11 +1037,22 @@ _GL_WARN_ON_USE (fchownat, "fchownat is not portable - "
    Return 0 if successful, otherwise -1 and errno set.
    See POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/fdatasync.html>.  */
-# if !@HAVE_FDATASYNC@ || !@HAVE_DECL_FDATASYNC@
+# if @REPLACE_FDATASYNC@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef fdatasync
+#   define fdatasync rpl_fdatasync
+#  endif
+_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));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (fdatasync, int, (int fd));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (fdatasync);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef fdatasync
 # if HAVE_RAW_DECL_FDATASYNC
@@ -1053,7 +1099,9 @@ _GL_FUNCDECL_SYS (ftruncate, int, (int fd, off_t length));
 #  endif
 _GL_CXXALIAS_SYS (ftruncate, int, (int fd, off_t length));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ftruncate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef ftruncate
 # if HAVE_RAW_DECL_FTRUNCATE
@@ -1070,10 +1118,10 @@ _GL_WARN_ON_USE (ftruncate, "ftruncate is unportable - "
    or SIZE was too small.
    See the POSIX:2008 specification
    <https://pubs.opengroup.org/onlinepubs/9699919799/functions/getcwd.html>.
-   Additionally, the gnulib module 'getcwd' guarantees the following GNU
-   extension: If BUF is NULL, an array is allocated with 'malloc'; the array
-   is SIZE bytes long, unless SIZE == 0, in which case it is as big as
-   necessary.  */
+   Additionally, the gnulib module 'getcwd' or 'getcwd-lgpl' guarantees the
+   following GNU extension: If BUF is NULL, an array is allocated with
+   'malloc'; the array is SIZE bytes long, unless SIZE == 0, in which case
+   it is as big as necessary.  */
 # if @REPLACE_GETCWD@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   define getcwd rpl_getcwd
@@ -1185,11 +1233,22 @@ _GL_WARN_ON_USE (getdtablesize, "getdtablesize is unportable - "
 
 #if @GNULIB_GETENTROPY@
 /* Fill a buffer with random bytes.  */
-# if !@HAVE_GETENTROPY@
+# if @REPLACE_GETENTROPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   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));
+# else
+#  if !@HAVE_GETENTROPY@
 _GL_FUNCDECL_SYS (getentropy, int, (void *buffer, size_t length));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (getentropy, int, (void *buffer, size_t length));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getentropy);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getentropy
 # if HAVE_RAW_DECL_GETENTROPY
@@ -1323,7 +1382,9 @@ _GL_FUNCDECL_SYS (getlogin_r, int, (char *name, size_t size)
                                                      int size.  */
 _GL_CXXALIAS_SYS_CAST (getlogin_r, int, (char *name, size_t size));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (getlogin_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef getlogin_r
 # if HAVE_RAW_DECL_GETLOGIN_R
@@ -1661,7 +1722,9 @@ _GL_CXXALIAS_SYS (linkat, int,
                   (int fd1, const char *path1, int fd2, const char *path2,
                    int flag));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (linkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef linkat
 # if HAVE_RAW_DECL_LINKAT
@@ -1742,8 +1805,9 @@ _GL_WARN_ON_USE (pipe, "pipe is unportable - "
    Return 0 upon success, or -1 with errno set upon failure.
    See also the Linux man page at
    <https://www.kernel.org/doc/man-pages/online/pages/man2/pipe2.2.html>.  */
-# if @HAVE_PIPE2@
+# if @REPLACE_PIPE2@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef pipe2
 #   define pipe2 rpl_pipe2
 #  endif
 _GL_FUNCDECL_RPL (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1)));
@@ -1752,7 +1816,9 @@ _GL_CXXALIAS_RPL (pipe2, int, (int fd[2], int flags));
 _GL_FUNCDECL_SYS (pipe2, int, (int fd[2], int flags) _GL_ARG_NONNULL ((1)));
 _GL_CXXALIAS_SYS (pipe2, int, (int fd[2], int flags));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pipe2);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pipe2
 # if HAVE_RAW_DECL_PIPE2
@@ -1787,7 +1853,9 @@ _GL_FUNCDECL_SYS (pread, ssize_t,
 _GL_CXXALIAS_SYS (pread, ssize_t,
                   (int fd, void *buf, size_t bufsize, off_t offset));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pread);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pread
 # if HAVE_RAW_DECL_PREAD
@@ -1822,7 +1890,9 @@ _GL_FUNCDECL_SYS (pwrite, ssize_t,
 _GL_CXXALIAS_SYS (pwrite, ssize_t,
                   (int fd, const void *buf, size_t bufsize, off_t offset));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (pwrite);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef pwrite
 # if HAVE_RAW_DECL_PWRITE
@@ -1936,7 +2006,9 @@ _GL_CXXALIAS_SYS (readlinkat, ssize_t,
                   (int fd, char const *restrict file,
                    char *restrict buf, size_t len));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (readlinkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef readlinkat
 # if HAVE_RAW_DECL_READLINKAT
@@ -1996,15 +2068,27 @@ _GL_CXXALIASWARN (rmdir);
 
    Platforms with no ability to set the hostname return -1 and set
    errno = ENOSYS.  */
-# if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
+# if @REPLACE_SETHOSTNAME@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   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));
+# else
+#  if !@HAVE_SETHOSTNAME@ || !@HAVE_DECL_SETHOSTNAME@
 _GL_FUNCDECL_SYS (sethostname, int, (const char *name, size_t len)
                                     _GL_ARG_NONNULL ((1)));
-# endif
+#  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));
+# endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (sethostname);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef sethostname
 # if HAVE_RAW_DECL_SETHOSTNAME
@@ -2113,7 +2197,9 @@ _GL_FUNCDECL_SYS (symlinkat, int,
 _GL_CXXALIAS_SYS (symlinkat, int,
                   (char const *contents, int fd, char const *file));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (symlinkat);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef symlinkat
 # if HAVE_RAW_DECL_SYMLINKAT
@@ -2143,7 +2229,9 @@ _GL_FUNCDECL_SYS (truncate, int, (const char *filename, off_t length)
 #  endif
 _GL_CXXALIAS_SYS (truncate, int, (const char *filename, off_t length));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (truncate);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef truncate
 # if HAVE_RAW_DECL_TRUNCATE
@@ -2173,7 +2261,9 @@ _GL_FUNCDECL_SYS (ttyname_r, int,
 _GL_CXXALIAS_SYS (ttyname_r, int,
                   (int fd, char *buf, size_t buflen));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (ttyname_r);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef ttyname_r
 # if HAVE_RAW_DECL_TTYNAME_R
diff --git a/gl/unlocked-io.h b/gl/unlocked-io.h
index fdef624a..0cd9bbf3 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2001-2004, 2009-2024 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
@@ -31,6 +31,11 @@
    the *_unlocked functions directly.  On hosts that lack those
    functions, invoke the non-thread-safe versions instead.  */
 
+/* This file uses HAVE_DECL_*_UNLOCKED.  */
+# if !_GL_CONFIG_H_INCLUDED
+#  error "Please include config.h first."
+# endif
+
 # include <stdio.h>
 
 # if HAVE_DECL_CLEARERR_UNLOCKED || defined clearerr_unlocked
@@ -96,7 +101,7 @@
 #  define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
 # endif
 
-# if HAVE_DECL_GETC_UNLOCKED || defined get_unlocked
+# if HAVE_DECL_GETC_UNLOCKED || defined getc_unlocked
 #  undef getc
 #  define getc(x) getc_unlocked (x)
 # else
diff --git a/gl/unsetenv.c b/gl/unsetenv.c
index e5489490..d8ada2aa 100644
--- a/gl/unsetenv.c
+++ b/gl/unsetenv.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 1995-2002, 2005-2023 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 1995-2002, 2005-2024 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
diff --git a/gl/vasnprintf.c b/gl/vasnprintf.c
index 277c39e3..de204458 100644
--- a/gl/vasnprintf.c
+++ b/gl/vasnprintf.c
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 1999, 2002-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002-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
@@ -83,9 +83,9 @@
 #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() */
+#include <wchar.h>      /* mbstate_t, mbrtowc(), mbrlen(), wcrtomb(), mbszero() */
 #include <errno.h>      /* errno */
-#include <limits.h>     /* CHAR_BIT */
+#include <limits.h>     /* CHAR_BIT, INT_WIDTH, LONG_WIDTH */
 #include <float.h>      /* DBL_MAX_EXP, LDBL_MAX_EXP */
 #if HAVE_NL_LANGINFO
 # include <langinfo.h>
@@ -103,29 +103,29 @@
 
 #include "attribute.h"
 
-#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
+#if NEED_PRINTF_DOUBLE || NEED_PRINTF_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION)
 # include <math.h>
 # include "float+.h"
 #endif
 
-#if (NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE) && !defined IN_LIBINTL
+#if NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_DOUBLE
 # include <math.h>
 # include "isnand-nolibm.h"
 #endif
 
-#if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE) && !defined IN_LIBINTL
+#if NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION)
 # include <math.h>
 # include "isnanl-nolibm.h"
 # include "fpucw.h"
 #endif
 
-#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
+#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_DOUBLE
 # include <math.h>
 # include "isnand-nolibm.h"
 # include "printf-frexp.h"
 #endif
 
-#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
+#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION)
 # include <math.h>
 # include "isnanl-nolibm.h"
 # include "printf-frexpl.h"
@@ -138,8 +138,6 @@
 #  define VASNPRINTF vasnwprintf
 #  define FCHAR_T wchar_t
 #  define DCHAR_T wchar_t
-#  define TCHAR_T wchar_t
-#  define DCHAR_IS_TCHAR 1
 #  define DIRECTIVE wchar_t_directive
 #  define DIRECTIVES wchar_t_directives
 #  define PRINTF_PARSE wprintf_parse
@@ -159,24 +157,32 @@
 # endif
 #endif
 #if WIDE_CHAR_VERSION
-  /* TCHAR_T is wchar_t.  */
-# define USE_SNPRINTF 1
-# if HAVE_DECL__SNWPRINTF
-   /* On Windows, the function swprintf() has a different signature than
-      on Unix; we use the function _snwprintf() or - on mingw - snwprintf()
-      instead.  The mingw function snwprintf() has fewer bugs than the
-      MSVCRT function _snwprintf(), so prefer that.  */
-#  if defined __MINGW32__
-#   define SNPRINTF snwprintf
+  /* DCHAR_T is wchar_t.  */
+# if HAVE_DECL__SNWPRINTF || (HAVE_SWPRINTF && HAVE_WORKING_SWPRINTF)
+#  define TCHAR_T wchar_t
+#  define DCHAR_IS_TCHAR 1
+#  define USE_SNPRINTF 1
+#  if HAVE_DECL__SNWPRINTF
+    /* On Windows, the function swprintf() has a different signature than
+       on Unix; we use the function _snwprintf() or - on mingw - snwprintf()
+       instead.  The mingw function snwprintf() has fewer bugs than the
+       MSVCRT function _snwprintf(), so prefer that.  */
+#   if defined __MINGW32__
+#    define SNPRINTF snwprintf
+#   else
+#    define SNPRINTF _snwprintf
+#    define USE_MSVC__SNPRINTF 1
+#   endif
 #  else
-#   define SNPRINTF _snwprintf
-#   define USE_MSVC__SNPRINTF 1
+    /* Unix.  */
+#   define SNPRINTF swprintf
 #  endif
 # else
-   /* Unix.  */
-#  define SNPRINTF swprintf
+   /* Old platforms such as NetBSD 3.0, OpenBSD 3.8, HP-UX 11.00, IRIX 6.5.  */
+#   define TCHAR_T char
 # endif
-#else
+#endif
+#if !WIDE_CHAR_VERSION || !DCHAR_IS_TCHAR
   /* TCHAR_T is char.  */
   /* Use snprintf if it exists under the name 'snprintf' or '_snprintf'.
      But don't use it on BeOS, since BeOS snprintf produces no output if the
@@ -241,7 +247,7 @@ local_strnlen (const char *string, size_t maxlen)
 # endif
 #endif
 
-#if (((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && WIDE_CHAR_VERSION) || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL)) && !WIDE_CHAR_VERSION && DCHAR_IS_TCHAR)) && HAVE_WCHAR_T
+#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 HAVE_WCSLEN
 #  define local_wcslen wcslen
 # else
@@ -264,8 +270,8 @@ local_wcslen (const wchar_t *s)
 # endif
 #endif
 
-#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION
-# if HAVE_WCSNLEN
+#if (!USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF) && HAVE_WCHAR_T && WIDE_CHAR_VERSION
+# if HAVE_WCSNLEN && HAVE_DECL_WCSNLEN
 #  define local_wcsnlen wcsnlen
 # else
 #  ifndef local_wcsnlen_defined
@@ -283,12 +289,12 @@ 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 && !defined IN_LIBINTL) || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T) || (ENABLE_WCHAR_FALLBACK && HAVE_WINT_T)) && !WIDE_CHAR_VERSION
+#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 ENABLE_WCHAR_FALLBACK
 static size_t
 wctomb_fallback (char *s, wchar_t wc)
 {
-  static char hex[16] = "0123456789ABCDEF";
+  static char const hex[16] = "0123456789ABCDEF";
 
   s[0] = '\\';
   if (sizeof (wchar_t) > 2 && wc > 0xffff)
@@ -351,7 +357,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) && !defined IN_LIBINTL
+#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)
 /* Determine the decimal-point character according to the current locale.  */
 # ifndef decimal_point_char_defined
 #  define decimal_point_char_defined 1
@@ -378,7 +384,7 @@ decimal_point_char (void)
 # endif
 #endif
 
-#if NEED_PRINTF_INFINITE_DOUBLE && !NEED_PRINTF_DOUBLE && !defined IN_LIBINTL
+#if NEED_PRINTF_INFINITE_DOUBLE && !NEED_PRINTF_DOUBLE
 
 /* Equivalent to !isfinite(x) || x == 0, but does not require libm.  */
 static int
@@ -389,7 +395,7 @@ is_infinite_or_zero (double x)
 
 #endif
 
-#if NEED_PRINTF_INFINITE_LONG_DOUBLE && !NEED_PRINTF_LONG_DOUBLE && !defined IN_LIBINTL
+#if NEED_PRINTF_INFINITE_LONG_DOUBLE && !NEED_PRINTF_LONG_DOUBLE
 
 /* Equivalent to !isfinite(x) || x == 0, but does not require libm.  */
 static int
@@ -400,7 +406,7 @@ is_infinite_or_zerol (long double x)
 
 #endif
 
-#if (NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
+#if NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE
 
 /* Converting 'long double' to decimal without rare rounding bugs requires
    real bignums.  We use the naming conventions of GNU gmp, but vastly simpler
@@ -921,6 +927,14 @@ divide (mpn_t a, mpn_t b, mpn_t *q)
   return roomptr;
 }
 
+/* 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
+#  pragma GCC diagnostic push
+#  pragma GCC diagnostic ignored "-Walloc-size-larger-than="
+# endif
+
 /* Convert a bignum a >= 0, multiplied with 10^extra_zeroes, to decimal
    representation.
    Destroys the contents of a.
@@ -977,6 +991,10 @@ convert_to_decimal (mpn_t a, size_t extra_zeroes)
   return c_ptr;
 }
 
+# if __GNUC__ >= 7
+#  pragma GCC diagnostic pop
+# endif
+
 # if NEED_PRINTF_LONG_DOUBLE
 
 /* Assuming x is finite and >= 0:
@@ -1171,8 +1189,6 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *memory, int n)
   void *z_memory;
   char *digits;
 
-  if (memory == NULL)
-    return NULL;
   /* x = 2^e * m, hence
      y = round (2^e * 10^n * m) = round (2^(e+n) * 5^n * m)
        = round (2^s * 5^n * m).  */
@@ -1380,10 +1396,13 @@ scale10_round_decimal_decoded (int e, mpn_t m, void *memory, int n)
 static char *
 scale10_round_decimal_long_double (long double x, int n)
 {
-  int e IF_LINT(= 0);
+  int e;
   mpn_t m;
   void *memory = decode_long_double (x, &e, &m);
-  return scale10_round_decimal_decoded (e, m, memory, n);
+  if (memory != NULL)
+    return scale10_round_decimal_decoded (e, m, memory, n);
+  else
+    return NULL;
 }
 
 # endif
@@ -1398,10 +1417,13 @@ scale10_round_decimal_long_double (long double x, int n)
 static char *
 scale10_round_decimal_double (double x, int n)
 {
-  int e IF_LINT(= 0);
+  int e;
   mpn_t m;
   void *memory = decode_double (x, &e, &m);
-  return scale10_round_decimal_decoded (e, m, memory, n);
+  if (memory != NULL)
+    return scale10_round_decimal_decoded (e, m, memory, n);
+  else
+    return NULL;
 }
 
 # endif
@@ -1604,7 +1626,7 @@ is_borderline (const char *digits, size_t precision)
 
 #endif
 
-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF
+#if !USE_SNPRINTF || (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF
 
 /* Use a different function name, to make it possible that the 'wchar_t'
    parametrization and the 'char' parametrization get compiled in the same
@@ -1627,24 +1649,156 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
   switch (conversion)
     {
     case 'd': case 'i': case 'u':
-      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
-        tmp_length =
-          (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
-                          * 0.30103 /* binary -> decimal */
-                         )
-          + 1; /* turn floor into ceil */
-      else if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
-        tmp_length =
-          (unsigned int) (sizeof (unsigned long) * CHAR_BIT
-                          * 0.30103 /* binary -> decimal */
-                         )
-          + 1; /* turn floor into ceil */
-      else
-        tmp_length =
-          (unsigned int) (sizeof (unsigned int) * CHAR_BIT
-                          * 0.30103 /* binary -> decimal */
-                         )
-          + 1; /* turn floor into ceil */
+      switch (type)
+        {
+        default:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_LONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (long int) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_ULONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned long int) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_LONGLONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (long long int) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_ULONGLONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_INT8_T:
+          tmp_length =
+            (unsigned int) (sizeof (int8_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT8_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint8_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_INT16_T:
+          tmp_length =
+            (unsigned int) (sizeof (int16_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT16_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint16_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_INT32_T:
+          tmp_length =
+            (unsigned int) (sizeof (int32_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT32_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint32_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_INT64_T:
+          tmp_length =
+            (unsigned int) (sizeof (int64_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT64_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint64_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_INT_FAST8_T:
+          tmp_length =
+            (unsigned int) (sizeof (int_fast8_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST8_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_INT_FAST16_T:
+          tmp_length =
+            (unsigned int) (sizeof (int_fast16_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST16_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_INT_FAST32_T:
+          tmp_length =
+            (unsigned int) (sizeof (int_fast32_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST32_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_INT_FAST64_T:
+          tmp_length =
+            (unsigned int) (sizeof (int_fast64_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST64_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT
+                            * 0.30103 /* binary -> decimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        }
       if (tmp_length < precision)
         tmp_length = precision;
       /* Multiply by 2, as an estimate for FLAG_GROUP.  */
@@ -1653,25 +1807,156 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
       tmp_length = xsum (tmp_length, 1);
       break;
 
+    case 'b':
+    #if SUPPORT_GNU_PRINTF_DIRECTIVES \
+        || (__GLIBC__ + (__GLIBC_MINOR__ >= 35) > 2)
+    case 'B':
+    #endif
+      switch (type)
+        {
+        default:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned int) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_ULONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned long int) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_ULONGLONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT8_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint8_t) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT16_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint16_t) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT32_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint32_t) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT64_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint64_t) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST8_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST16_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST32_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST64_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT)
+            + 1; /* turn floor into ceil */
+          break;
+        }
+      if (tmp_length < precision)
+        tmp_length = precision;
+      /* Add 2, to account for a prefix from the alternate form.  */
+      tmp_length = xsum (tmp_length, 2);
+      break;
+
     case 'o':
-      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
-        tmp_length =
-          (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
-                          * 0.333334 /* binary -> octal */
-                         )
-          + 1; /* turn floor into ceil */
-      else if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
-        tmp_length =
-          (unsigned int) (sizeof (unsigned long) * CHAR_BIT
-                          * 0.333334 /* binary -> octal */
-                         )
-          + 1; /* turn floor into ceil */
-      else
-        tmp_length =
-          (unsigned int) (sizeof (unsigned int) * CHAR_BIT
-                          * 0.333334 /* binary -> octal */
-                         )
-          + 1; /* turn floor into ceil */
+      switch (type)
+        {
+        default:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_ULONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned long int) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_ULONGLONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT8_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint8_t) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT16_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint16_t) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT32_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint32_t) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT64_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint64_t) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST8_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST16_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST32_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST64_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT
+                            * 0.333334 /* binary -> octal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        }
       if (tmp_length < precision)
         tmp_length = precision;
       /* Add 1, to account for a leading sign.  */
@@ -1679,27 +1964,89 @@ MAX_ROOM_NEEDED (const arguments *ap, size_t arg_index, FCHAR_T conversion,
       break;
 
     case 'x': case 'X':
-      if (type == TYPE_LONGLONGINT || type == TYPE_ULONGLONGINT)
-        tmp_length =
-          (unsigned int) (sizeof (unsigned long long) * CHAR_BIT
-                          * 0.25 /* binary -> hexadecimal */
-                         )
-          + 1; /* turn floor into ceil */
-      else if (type == TYPE_LONGINT || type == TYPE_ULONGINT)
-        tmp_length =
-          (unsigned int) (sizeof (unsigned long) * CHAR_BIT
-                          * 0.25 /* binary -> hexadecimal */
-                         )
-          + 1; /* turn floor into ceil */
-      else
-        tmp_length =
-          (unsigned int) (sizeof (unsigned int) * CHAR_BIT
-                          * 0.25 /* binary -> hexadecimal */
-                         )
-          + 1; /* turn floor into ceil */
+      switch (type)
+        {
+        default:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned int) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_ULONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned long int) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_ULONGLONGINT:
+          tmp_length =
+            (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT8_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint8_t) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT16_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint16_t) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT32_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint32_t) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT64_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint64_t) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST8_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST16_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST32_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        case TYPE_UINT_FAST64_T:
+          tmp_length =
+            (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT
+                            * 0.25 /* binary -> hexadecimal */
+                           )
+            + 1; /* turn floor into ceil */
+          break;
+        }
       if (tmp_length < precision)
         tmp_length = precision;
-      /* Add 2, to account for a leading sign or alternate form.  */
+      /* Add 2, to account for a prefix from the alternate form.  */
       tmp_length = xsum (tmp_length, 2);
       break;
 
@@ -1988,6 +2335,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 
             if (dp->conversion == 'n')
               {
+#if NEED_PRINTF_WITH_N_DIRECTIVE
                 switch (a.arg[dp->arg_index].type)
                   {
                   case TYPE_COUNT_SCHAR_POINTER:
@@ -2005,9 +2353,36 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   case TYPE_COUNT_LONGLONGINT_POINTER:
                     *a.arg[dp->arg_index].a.a_count_longlongint_pointer = length;
                     break;
+                  case TYPE_COUNT_INT8_T_POINTER:
+                    *a.arg[dp->arg_index].a.a_count_int8_t_pointer = length;
+                    break;
+                  case TYPE_COUNT_INT16_T_POINTER:
+                    *a.arg[dp->arg_index].a.a_count_int16_t_pointer = length;
+                    break;
+                  case TYPE_COUNT_INT32_T_POINTER:
+                    *a.arg[dp->arg_index].a.a_count_int32_t_pointer = length;
+                    break;
+                  case TYPE_COUNT_INT64_T_POINTER:
+                    *a.arg[dp->arg_index].a.a_count_int64_t_pointer = length;
+                    break;
+                  case TYPE_COUNT_INT_FAST8_T_POINTER:
+                    *a.arg[dp->arg_index].a.a_count_int_fast8_t_pointer = length;
+                    break;
+                  case TYPE_COUNT_INT_FAST16_T_POINTER:
+                    *a.arg[dp->arg_index].a.a_count_int_fast16_t_pointer = length;
+                    break;
+                  case TYPE_COUNT_INT_FAST32_T_POINTER:
+                    *a.arg[dp->arg_index].a.a_count_int_fast32_t_pointer = length;
+                    break;
+                  case TYPE_COUNT_INT_FAST64_T_POINTER:
+                    *a.arg[dp->arg_index].a.a_count_int_fast64_t_pointer = length;
+                    break;
                   default:
                     abort ();
                   }
+#else
+                abort ();
+#endif
               }
 #if ENABLE_UNISTDIO
             /* The unistdio extensions.  */
@@ -2130,7 +2505,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (characters < width && !(flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2175,7 +2550,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (characters < width && (flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2232,7 +2607,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (characters < width && !(flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2277,7 +2652,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (characters < width && (flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2334,7 +2709,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           characters = 0;
                         }
 
-                      if (characters < width && !(dp->flags & FLAG_LEFT))
+                      if (characters < width && !(flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2379,7 +2754,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       }
 # endif
 
-                      if (characters < width && (dp->flags & FLAG_LEFT))
+                      if (characters < width && (flags & FLAG_LEFT))
                         {
                           size_t n = width - characters;
                           ENSURE_ALLOCATION (xsum (length, n));
@@ -2394,7 +2769,150 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   }
               }
 #endif
-#if (!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL) || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T
+#if WIDE_CHAR_VERSION && (!DCHAR_IS_TCHAR || NEED_WPRINTF_DIRECTIVE_LC)
+            else if ((dp->conversion == 's'
+                      && a.arg[dp->arg_index].type == TYPE_WIDE_STRING)
+                     || (dp->conversion == 'c'
+                         && a.arg[dp->arg_index].type == TYPE_WIDE_CHAR))
+              {
+                /* %ls or %lc in vasnwprintf.  See the specification of
+                   fwprintf.  */
+                /* It would be silly to use snprintf ("%ls", ...) and then
+                   convert back the result from a char[] to a wchar_t[].
+                   Instead, just copy the argument wchar_t[] to the result.  */
+                int flags = dp->flags;
+                size_t width;
+
+                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);
+                      }
+                  }
+
+                {
+                  const wchar_t *ls_arg;
+                  wchar_t lc_arg[1];
+                  size_t characters;
+
+                  if (dp->conversion == 's')
+                    {
+                      int has_precision;
+                      size_t precision;
+
+                      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;
+                            }
+                        }
+
+                      ls_arg = a.arg[dp->arg_index].a.a_wide_string;
+
+                      if (has_precision)
+                        {
+                          /* Use only at most PRECISION wide characters, from
+                             the left.  */
+                          const wchar_t *ls_arg_end;
+
+                          ls_arg_end = ls_arg;
+                          characters = 0;
+                          for (; precision > 0; precision--)
+                            {
+                              if (*ls_arg_end == 0)
+                                /* Found the terminating null wide character.  */
+                                break;
+                              ls_arg_end++;
+                              characters++;
+                            }
+                        }
+                      else
+                        {
+                          /* Use the entire string, and count the number of wide
+                             characters.  */
+                          characters = local_wcslen (ls_arg);
+                        }
+                    }
+                  else /* dp->conversion == 'c' */
+                    {
+                      lc_arg[0] = (wchar_t) a.arg[dp->arg_index].a.a_wide_char;
+                      ls_arg = lc_arg;
+                      characters = 1;
+                    }
+
+                  {
+                    size_t total = (characters < width ? width : characters);
+                    ENSURE_ALLOCATION (xsum (length, total));
+
+                    if (characters < width && !(flags & FLAG_LEFT))
+                      {
+                        size_t n = width - characters;
+                        DCHAR_SET (result + length, ' ', n);
+                        length += n;
+                      }
+
+                    if (characters > 0)
+                      {
+                        DCHAR_CPY (result + length, ls_arg, characters);
+                        length += characters;
+                      }
+
+                    if (characters < width && (flags & FLAG_LEFT))
+                      {
+                        size_t n = width - characters;
+                        DCHAR_SET (result + length, ' ', n);
+                        length += n;
+                      }
+                  }
+                }
+              }
+#endif
+#if (!USE_SNPRINTF || WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || NEED_PRINTF_DIRECTIVE_LS || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T
             else if (dp->conversion == 's'
 # if WIDE_CHAR_VERSION
                      && a.arg[dp->arg_index].type != TYPE_WIDE_STRING
@@ -2493,7 +3011,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                          wide characters, from the left.  */
 #  if HAVE_MBRTOWC
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #  endif
                       arg_end = arg;
                       characters = 0;
@@ -2521,7 +3039,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                          characters.  */
 #  if HAVE_MBRTOWC
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #  endif
                       arg_end = arg;
                       characters = 0;
@@ -2551,7 +3069,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       characters = 0;
                     }
 
-                  if (characters < width && !(dp->flags & FLAG_LEFT))
+                  if (characters < width && !(flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2565,7 +3083,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       size_t remaining;
 #  if HAVE_MBRTOWC
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #  endif
                       ENSURE_ALLOCATION (xsum (length, characters));
                       for (remaining = characters; remaining > 0; remaining--)
@@ -2591,7 +3109,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     {
 #  if HAVE_MBRTOWC
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #  endif
                       while (arg < arg_end)
                         {
@@ -2602,17 +3120,19 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #  else
                           count = mbtowc (&wc, arg, arg_end - arg);
 #  endif
-                          if (count <= 0)
-                            /* mbrtowc not consistent with mbrlen, or mbtowc
-                               not consistent with mblen.  */
+                          if (count == 0)
+                            /* mbrtowc not consistent with strlen.  */
                             abort ();
+                          if (count < 0)
+                            /* Invalid or incomplete multibyte character.  */
+                            goto fail_with_EILSEQ;
                           ENSURE_ALLOCATION (xsum (length, 1));
                           result[length++] = wc;
                           arg += count;
                         }
                     }
 
-                  if (characters < width && (dp->flags & FLAG_LEFT))
+                  if (characters < width && (flags & FLAG_LEFT))
                     {
                       size_t n = width - characters;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2641,7 +3161,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                          at most PRECISION bytes, from the left.  */
 #  if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #  endif
                       arg_end = arg;
                       characters = 0;
@@ -2674,7 +3194,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                          bytes.  */
 #  if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #  endif
                       arg_end = arg;
                       characters = 0;
@@ -2714,7 +3234,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     size_t remaining;
 #   if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
                     mbstate_t state;
-                    memset (&state, '\0', sizeof (mbstate_t));
+                    mbszero (&state);
 #   endif
                     for (remaining = characters; remaining > 0; )
                       {
@@ -2768,7 +3288,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     /* w doesn't matter.  */
                     w = 0;
 
-                  if (w < width && !(dp->flags & FLAG_LEFT))
+                  if (w < width && !(flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2783,7 +3303,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       size_t remaining;
 #   if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #   endif
                       ENSURE_ALLOCATION (xsum (length, characters));
                       for (remaining = characters; remaining > 0; )
@@ -2809,7 +3329,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     {
 #   if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #   endif
                       while (arg < arg_end)
                         {
@@ -2836,7 +3356,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   length += tmpdst_len;
 #  endif
 
-                  if (w < width && (dp->flags & FLAG_LEFT))
+                  if (w < width && (flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2847,12 +3367,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 # endif
               }
 #endif
-#if ENABLE_WCHAR_FALLBACK && HAVE_WINT_T && !WIDE_CHAR_VERSION
+#if (NEED_PRINTF_DIRECTIVE_LC || ENABLE_WCHAR_FALLBACK) && HAVE_WINT_T && !WIDE_CHAR_VERSION
             else if (dp->conversion == 'c'
                      && a.arg[dp->arg_index].type == TYPE_WIDE_CHAR)
               {
                 /* Implement the 'lc' directive ourselves, in order to provide
-                   the fallback that avoids EILSEQ.  */
+                   a correct behaviour for the null wint_t argument and/or the
+                   fallback that avoids EILSEQ.  */
                 int flags = dp->flags;
                 int has_width;
                 size_t width;
@@ -2907,21 +3428,18 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     {
                       /* Count the number of bytes.  */
                       characters = 0;
-                      if (arg != 0)
-                        {
-                          char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                          int count;
+                      char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
+                      int count;
 # if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
-                          mbstate_t state;
-                          memset (&state, '\0', sizeof (mbstate_t));
+                      mbstate_t state;
+                      mbszero (&state);
 # endif
 
-                          count = local_wcrtomb (cbuf, arg, &state);
-                          if (count < 0)
-                            /* Inconsistency.  */
-                            abort ();
-                          characters = count;
-                        }
+                      count = local_wcrtomb (cbuf, arg, &state);
+                      if (count < 0)
+                        /* Cannot convert.  */
+                        goto fail_with_EILSEQ;
+                      characters = count;
                     }
 # if DCHAR_IS_TCHAR
                   else
@@ -2933,13 +3451,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 
 # if !DCHAR_IS_TCHAR
                   /* Convert the string into a piece of temporary memory.  */
-                  if (characters > 0) /* implies arg != 0 */
+                  if (characters > 0)
                     {
                       char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
                       int count;
 #  if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
                       mbstate_t state;
-                      memset (&state, '\0', sizeof (mbstate_t));
+                      mbszero (&state);
 #  endif
 
                       count = local_wcrtomb (cbuf, arg, &state);
@@ -2977,7 +3495,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     /* w doesn't matter.  */
                     w = 0;
 
-                  if (w < width && !(dp->flags & FLAG_LEFT))
+                  if (w < width && !(flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -2990,12 +3508,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     {
                       /* We know the number of bytes in advance.  */
                       ENSURE_ALLOCATION (xsum (length, characters));
-                      if (characters > 0) /* implies arg != 0 */
+                      if (characters > 0)
                         {
                           int count;
 #  if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
                           mbstate_t state;
-                          memset (&state, '\0', sizeof (mbstate_t));
+                          mbszero (&state);
 #  endif
 
                           count = local_wcrtomb (result + length, arg, &state);
@@ -3007,23 +3525,20 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     }
                   else
                     {
-                      if (arg != 0)
-                        {
-                          char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
-                          int count;
+                      char cbuf[64]; /* Assume MB_CUR_MAX <= 64.  */
+                      int count;
 #  if HAVE_WCRTOMB && !defined GNULIB_defined_mbstate_t
-                          mbstate_t state;
-                          memset (&state, '\0', sizeof (mbstate_t));
+                      mbstate_t state;
+                      mbszero (&state);
 #  endif
 
-                          count = local_wcrtomb (cbuf, arg, &state);
-                          if (count <= 0)
-                            /* Inconsistency.  */
-                            abort ();
-                          ENSURE_ALLOCATION (xsum (length, count));
-                          memcpy (result + length, cbuf, count);
-                          length += count;
-                        }
+                      count = local_wcrtomb (cbuf, arg, &state);
+                      if (count < 0)
+                        /* Cannot convert.  */
+                        goto fail_with_EILSEQ;
+                      ENSURE_ALLOCATION (xsum (length, count));
+                      memcpy (result + length, cbuf, count);
+                      length += count;
                     }
 # else
                   ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len),
@@ -3033,7 +3548,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   length += tmpdst_len;
 # endif
 
-                  if (w < width && (dp->flags & FLAG_LEFT))
+                  if (w < width && (flags & FLAG_LEFT))
                     {
                       size_t n = width - w;
                       ENSURE_ALLOCATION (xsum (length, n));
@@ -3043,14 +3558,399 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                 }
               }
 #endif
-#if (NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE) && !defined IN_LIBINTL
+#if NEED_WPRINTF_DIRECTIVE_C && WIDE_CHAR_VERSION
+            else if (dp->conversion == 'c'
+                     && a.arg[dp->arg_index].type != TYPE_WIDE_CHAR)
+              {
+                /* Implement the 'c' directive ourselves, in order to avoid
+                   EILSEQ in the "C" locale.  */
+                int flags = dp->flags;
+                size_t width;
+
+                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);
+                      }
+                  }
+
+                /* %c in vasnwprintf.  See the specification of fwprintf.  */
+                {
+                  char arg = (char) a.arg[dp->arg_index].a.a_char;
+                  mbstate_t state;
+                  wchar_t wc;
+
+                  mbszero (&state);
+                  int count = mbrtowc (&wc, &arg, 1, &state);
+                  if (count < 0)
+                    /* 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;
+                    }
+
+                  ENSURE_ALLOCATION (xsum (length, 1));
+                  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;
+                    }
+                }
+              }
+#endif
+#if NEED_PRINTF_DIRECTIVE_B || NEED_PRINTF_DIRECTIVE_UPPERCASE_B
+            else if (0
+# if NEED_PRINTF_DIRECTIVE_B
+                     || (dp->conversion == 'b')
+# endif
+# if NEED_PRINTF_DIRECTIVE_UPPERCASE_B
+                     || (dp->conversion == 'B')
+# endif
+                    )
+              {
+                arg_type type = a.arg[dp->arg_index].type;
+                int flags = dp->flags;
+                int has_width;
+                size_t width;
+                int has_precision;
+                size_t precision;
+                size_t tmp_length;
+                size_t count;
+                DCHAR_T tmpbuf[700];
+                DCHAR_T *tmp;
+                DCHAR_T *tmp_end;
+                DCHAR_T *tmp_start;
+                DCHAR_T *pad_ptr;
+                DCHAR_T *p;
+
+                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);
+                      }
+                    has_width = 1;
+                  }
+
+                has_precision = 0;
+                precision = 1;
+                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;
+                      }
+                  }
+
+                /* Allocate a temporary buffer of sufficient size.  */
+                switch (type)
+                  {
+                  default:
+                    tmp_length =
+                      (unsigned int) (sizeof (unsigned int) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_ULONGINT:
+                    tmp_length =
+                      (unsigned int) (sizeof (unsigned long int) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_ULONGLONGINT:
+                    tmp_length =
+                      (unsigned int) (sizeof (unsigned long long int) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_UINT8_T:
+                    tmp_length =
+                      (unsigned int) (sizeof (uint8_t) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_UINT16_T:
+                    tmp_length =
+                      (unsigned int) (sizeof (uint16_t) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_UINT32_T:
+                    tmp_length =
+                      (unsigned int) (sizeof (uint32_t) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_UINT64_T:
+                    tmp_length =
+                      (unsigned int) (sizeof (uint64_t) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_UINT_FAST8_T:
+                    tmp_length =
+                      (unsigned int) (sizeof (uint_fast8_t) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_UINT_FAST16_T:
+                    tmp_length =
+                      (unsigned int) (sizeof (uint_fast16_t) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_UINT_FAST32_T:
+                    tmp_length =
+                      (unsigned int) (sizeof (uint_fast32_t) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  case TYPE_UINT_FAST64_T:
+                    tmp_length =
+                      (unsigned int) (sizeof (uint_fast64_t) * CHAR_BIT)
+                      + 1; /* turn floor into ceil */
+                    break;
+                  }
+                if (tmp_length < precision)
+                  tmp_length = precision;
+                /* Add 2, to account for a prefix from the alternate form.  */
+                tmp_length = xsum (tmp_length, 2);
+
+                if (tmp_length < width)
+                  tmp_length = width;
+
+                if (tmp_length <= sizeof (tmpbuf) / sizeof (DCHAR_T))
+                  tmp = tmpbuf;
+                else
+                  {
+                    size_t tmp_memsize = xtimes (tmp_length, sizeof (DCHAR_T));
+
+                    if (size_overflow_p (tmp_memsize))
+                      /* Overflow, would lead to out of memory.  */
+                      goto out_of_memory;
+                    tmp = (DCHAR_T *) malloc (tmp_memsize);
+                    if (tmp == NULL)
+                      /* Out of memory.  */
+                      goto out_of_memory;
+                  }
+
+                tmp_end = tmp + tmp_length;
+
+                unsigned long long arg;
+                switch (type)
+                  {
+                  case TYPE_UCHAR:
+                    arg = a.arg[dp->arg_index].a.a_uchar;
+                    break;
+                  case TYPE_USHORT:
+                    arg = a.arg[dp->arg_index].a.a_ushort;
+                    break;
+                  case TYPE_UINT:
+                    arg = a.arg[dp->arg_index].a.a_uint;
+                    break;
+                  case TYPE_ULONGINT:
+                    arg = a.arg[dp->arg_index].a.a_ulongint;
+                    break;
+                  case TYPE_ULONGLONGINT:
+                    arg = a.arg[dp->arg_index].a.a_ulonglongint;
+                    break;
+                  case TYPE_UINT8_T:
+                    arg = a.arg[dp->arg_index].a.a_uint8_t;
+                    break;
+                  case TYPE_UINT16_T:
+                    arg = a.arg[dp->arg_index].a.a_uint16_t;
+                    break;
+                  case TYPE_UINT32_T:
+                    arg = a.arg[dp->arg_index].a.a_uint32_t;
+                    break;
+                  case TYPE_UINT64_T:
+                    arg = a.arg[dp->arg_index].a.a_uint64_t;
+                    break;
+                  case TYPE_UINT_FAST8_T:
+                    arg = a.arg[dp->arg_index].a.a_uint_fast8_t;
+                    break;
+                  case TYPE_UINT_FAST16_T:
+                    arg = a.arg[dp->arg_index].a.a_uint_fast16_t;
+                    break;
+                  case TYPE_UINT_FAST32_T:
+                    arg = a.arg[dp->arg_index].a.a_uint_fast32_t;
+                    break;
+                  case TYPE_UINT_FAST64_T:
+                    arg = a.arg[dp->arg_index].a.a_uint_fast64_t;
+                    break;
+                  default:
+                    abort ();
+                  }
+                int need_prefix = ((flags & FLAG_ALT) && arg != 0);
+
+                p = tmp_end;
+                /* "The result of converting a zero value with a precision
+                   of zero is no characters."  */
+                if (!(has_precision && precision == 0 && arg == 0))
+                  {
+                    do
+                      {
+                        *--p = '0' + (arg & 1);
+                        arg = arg >> 1;
+                      }
+                    while (arg != 0);
+                  }
+
+                if (has_precision)
+                  {
+                    DCHAR_T *digits_start = tmp_end - precision;
+                    while (p > digits_start)
+                      *--p = '0';
+                  }
+
+                pad_ptr = p;
+
+                if (need_prefix)
+                  {
+# if NEED_PRINTF_DIRECTIVE_B && !NEED_PRINTF_DIRECTIVE_UPPERCASE_B
+                    *--p = 'b';
+# elif NEED_PRINTF_DIRECTIVE_UPPERCASE_B && !NEED_PRINTF_DIRECTIVE_B
+                    *--p = 'B';
+# else
+                    *--p = dp->conversion;
+# endif
+                    *--p = '0';
+                  }
+                tmp_start = p;
+
+                /* The generated string now extends from tmp_start to tmp_end,
+                   with the zero padding insertion point being at pad_ptr,
+                   tmp_start <= pad_ptr <= tmp_end.  */
+                count = tmp_end - tmp_start;
+
+                if (count < width)
+                  {
+                    size_t pad = width - count;
+
+                    if (flags & FLAG_LEFT)
+                      {
+                        /* Pad with spaces on the right.  */
+                        for (p = tmp_start; p < tmp_end; p++)
+                          *(p - pad) = *p;
+                        for (p = tmp_end - pad; p < tmp_end; p++)
+                          *p = ' ';
+                      }
+                    else if ((flags & FLAG_ZERO)
+                             /* Neither ISO C nor POSIX specify that the '0'
+                                flag is ignored when a width and a precision
+                                are both present.  But most implementations
+                                do so.  */
+                             && !(has_width && has_precision))
+                      {
+                        /* Pad with zeroes.  */
+                        for (p = tmp_start; p < pad_ptr; p++)
+                          *(p - pad) = *p;
+                        for (p = pad_ptr - pad; p < pad_ptr; p++)
+                          *p = '0';
+                      }
+                    else
+                      {
+                        /* Pad with spaces on the left.  */
+                        for (p = tmp_start - pad; p < tmp_start; p++)
+                          *p = ' ';
+                      }
+
+                    tmp_start = tmp_start - pad;
+                  }
+
+                count = tmp_end - tmp_start;
+
+                if (count > tmp_length)
+                  /* tmp_length was incorrectly calculated - fix the
+                     code above!  */
+                  abort ();
+
+                /* Make room for the result.  */
+                if (count >= allocated - length)
+                  {
+                    size_t n = xsum (length, count);
+
+                    ENSURE_ALLOCATION (n);
+                  }
+
+                /* Append the result.  */
+                memcpy (result + length, tmp_start, count * sizeof (DCHAR_T));
+                if (tmp != tmpbuf)
+                  free (tmp);
+                length += count;
+              }
+#endif
+#if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || NEED_PRINTF_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION)
             else if ((dp->conversion == 'a' || dp->conversion == 'A')
 # if !(NEED_PRINTF_DIRECTIVE_A || (NEED_PRINTF_LONG_DOUBLE && NEED_PRINTF_DOUBLE))
                      && (0
 #  if NEED_PRINTF_DOUBLE
                          || a.arg[dp->arg_index].type == TYPE_DOUBLE
 #  endif
-#  if NEED_PRINTF_LONG_DOUBLE
+#  if NEED_PRINTF_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION)
                          || a.arg[dp->arg_index].type == TYPE_LONGDOUBLE
 #  endif
                         )
@@ -3170,7 +4070,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                 p = tmp;
                 if (type == TYPE_LONGDOUBLE)
                   {
-# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE
+# if NEED_PRINTF_DIRECTIVE_A || NEED_PRINTF_LONG_DOUBLE || (NEED_WPRINTF_DIRECTIVE_LA && WIDE_CHAR_VERSION)
                     long double arg = a.arg[dp->arg_index].a.a_longdouble;
 
                     if (isnanl (arg))
@@ -3290,7 +4190,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                 }
                               }
                               *p++ = dp->conversion - 'A' + 'P';
-#  if WIDE_CHAR_VERSION
+#  if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
                               {
                                 static const wchar_t decimal_format[] =
                                   { '%', '+', 'd', '\0' };
@@ -3441,7 +4341,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                 }
                               }
                               *p++ = dp->conversion - 'A' + 'P';
-#  if WIDE_CHAR_VERSION
+#  if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
                               {
                                 static const wchar_t decimal_format[] =
                                   { '%', '+', 'd', '\0' };
@@ -3533,7 +4433,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                 length += count;
               }
 #endif
-#if (NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE) && !defined IN_LIBINTL
+#if NEED_PRINTF_INFINITE_DOUBLE || NEED_PRINTF_DOUBLE || NEED_PRINTF_INFINITE_LONG_DOUBLE || NEED_PRINTF_LONG_DOUBLE
             else if ((dp->conversion == 'f' || dp->conversion == 'F'
                       || dp->conversion == 'e' || dp->conversion == 'E'
                       || dp->conversion == 'g' || dp->conversion == 'G'
@@ -3901,7 +4801,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                   }
 
                                 *p++ = dp->conversion; /* 'e' or 'E' */
-#   if WIDE_CHAR_VERSION
+#   if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
                                 {
                                   static const wchar_t decimal_format[] =
                                     { '%', '+', '.', '2', 'd', '\0' };
@@ -4082,7 +4982,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                               }
                                           }
                                         *p++ = dp->conversion - 'G' + 'E'; /* 'e' or 'E' */
-#   if WIDE_CHAR_VERSION
+#   if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
                                         {
                                           static const wchar_t decimal_format[] =
                                             { '%', '+', '.', '2', 'd', '\0' };
@@ -4359,7 +5259,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                   }
 
                                 *p++ = dp->conversion; /* 'e' or 'E' */
-#   if WIDE_CHAR_VERSION
+#   if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
                                 {
                                   static const wchar_t decimal_format[] =
                                     /* Produce the same number of exponent digits
@@ -4552,7 +5452,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                               }
                                           }
                                         *p++ = dp->conversion - 'G' + 'E'; /* 'e' or 'E' */
-#   if WIDE_CHAR_VERSION
+#   if WIDE_CHAR_VERSION && DCHAR_IS_TCHAR
                                         {
                                           static const wchar_t decimal_format[] =
                                             /* Produce the same number of exponent digits
@@ -4720,24 +5620,24 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
               {
                 arg_type type = a.arg[dp->arg_index].type;
                 int flags = dp->flags;
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#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
                 int has_width;
 #endif
-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#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
                 size_t width;
 #endif
-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || 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) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                 int has_precision;
                 size_t precision;
 #endif
-#if NEED_PRINTF_UNBOUNDED_PRECISION
+#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                 int prec_ourselves;
 #else
 #               define prec_ourselves 0
 #endif
-#if NEED_PRINTF_FLAG_LEFTADJUST
+#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_UNBOUNDED_PRECISION
+#elif !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                 int pad_ourselves;
 #else
 #               define pad_ourselves 0
@@ -4752,10 +5652,10 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                 TCHAR_T *tmp;
 #endif
 
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#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
                 has_width = 0;
 #endif
-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#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
                 width = 0;
                 if (dp->width_start != dp->width_end)
                   {
@@ -4783,13 +5683,13 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           width = xsum (xtimes (width, 10), *digitp++ - '0');
                         while (digitp != dp->width_end);
                       }
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+# 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
                     has_width = 1;
-#endif
+# endif
                   }
 #endif
 
-#if !USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || 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) || !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                 has_precision = 0;
                 precision = 6;
                 if (dp->precision_start != dp->precision_end)
@@ -4822,14 +5722,32 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #endif
 
                 /* Decide whether to handle the precision ourselves.  */
-#if NEED_PRINTF_UNBOUNDED_PRECISION
+#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                 switch (dp->conversion)
                   {
+# if NEED_PRINTF_UNBOUNDED_PRECISION
                   case 'd': case 'i': case 'u':
+                  case 'b':
+                  #if SUPPORT_GNU_PRINTF_DIRECTIVES \
+                      || (__GLIBC__ + (__GLIBC_MINOR__ >= 35) > 2)
+                  case 'B':
+                  #endif
                   case 'o':
-                  case 'x': case 'X': case 'p':
                     prec_ourselves = has_precision && (precision > 0);
                     break;
+# endif
+                  case 'x': case 'X': case 'p':
+                    prec_ourselves =
+                      has_precision
+                      && (0
+# if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO
+                          || (precision == 0)
+# endif
+# if NEED_PRINTF_UNBOUNDED_PRECISION
+                          || (precision > 0)
+# endif
+                         );
+                    break;
                   default:
                     prec_ourselves = 0;
                     break;
@@ -4837,7 +5755,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #endif
 
                 /* Decide whether to perform the padding ourselves.  */
-#if !NEED_PRINTF_FLAG_LEFTADJUST && (!DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_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)
                 switch (dp->conversion)
                   {
 # if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO
@@ -4956,6 +5874,54 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                   {
                   case TYPE_LONGLONGINT:
                   case TYPE_ULONGLONGINT:
+                  #if INT8_WIDTH > LONG_WIDTH
+                  case TYPE_INT8_T:
+                  #endif
+                  #if UINT8_WIDTH > LONG_WIDTH
+                  case TYPE_UINT8_T:
+                  #endif
+                  #if INT16_WIDTH > LONG_WIDTH
+                  case TYPE_INT16_T:
+                  #endif
+                  #if UINT16_WIDTH > LONG_WIDTH
+                  case TYPE_UINT16_T:
+                  #endif
+                  #if INT32_WIDTH > LONG_WIDTH
+                  case TYPE_INT32_T:
+                  #endif
+                  #if UINT32_WIDTH > LONG_WIDTH
+                  case TYPE_UINT32_T:
+                  #endif
+                  #if INT64_WIDTH > LONG_WIDTH
+                  case TYPE_INT64_T:
+                  #endif
+                  #if UINT64_WIDTH > LONG_WIDTH
+                  case TYPE_UINT64_T:
+                  #endif
+                  #if INT_FAST8_WIDTH > LONG_WIDTH
+                  case TYPE_INT_FAST8_T:
+                  #endif
+                  #if UINT_FAST8_WIDTH > LONG_WIDTH
+                  case TYPE_UINT_FAST8_T:
+                  #endif
+                  #if INT_FAST16_WIDTH > LONG_WIDTH
+                  case TYPE_INT_FAST16_T:
+                  #endif
+                  #if UINT_FAST16_WIDTH > LONG_WIDTH
+                  case TYPE_UINT_FAST16_T:
+                  #endif
+                  #if INT_FAST32_WIDTH > LONG_WIDTH
+                  case TYPE_INT3_FAST2_T:
+                  #endif
+                  #if UINT_FAST32_WIDTH > LONG_WIDTH
+                  case TYPE_UINT_FAST32_T:
+                  #endif
+                  #if INT_FAST64_WIDTH > LONG_WIDTH
+                  case TYPE_INT_FAST64_T:
+                  #endif
+                  #if UINT_FAST64_WIDTH > LONG_WIDTH
+                  case TYPE_UINT_FAST64_T:
+                  #endif
 #if defined _WIN32 && ! defined __CYGWIN__
                     *fbp++ = 'I';
                     *fbp++ = '6';
@@ -4967,12 +5933,60 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     FALLTHROUGH;
                   case TYPE_LONGINT:
                   case TYPE_ULONGINT:
-#if HAVE_WINT_T
+                  #if INT8_WIDTH > INT_WIDTH && INT8_WIDTH <= LONG_WIDTH
+                  case TYPE_INT8_T:
+                  #endif
+                  #if UINT8_WIDTH > INT_WIDTH && UINT8_WIDTH <= LONG_WIDTH
+                  case TYPE_UINT8_T:
+                  #endif
+                  #if INT16_WIDTH > INT_WIDTH && INT16_WIDTH <= LONG_WIDTH
+                  case TYPE_INT16_T:
+                  #endif
+                  #if UINT16_WIDTH > INT_WIDTH && UINT16_WIDTH <= LONG_WIDTH
+                  case TYPE_UINT16_T:
+                  #endif
+                  #if INT32_WIDTH > INT_WIDTH && INT32_WIDTH <= LONG_WIDTH
+                  case TYPE_INT32_T:
+                  #endif
+                  #if UINT32_WIDTH > INT_WIDTH && UINT32_WIDTH <= LONG_WIDTH
+                  case TYPE_UINT32_T:
+                  #endif
+                  #if INT64_WIDTH > INT_WIDTH && INT64_WIDTH <= LONG_WIDTH
+                  case TYPE_INT64_T:
+                  #endif
+                  #if UINT64_WIDTH > INT_WIDTH && UINT64_WIDTH <= LONG_WIDTH
+                  case TYPE_UINT64_T:
+                  #endif
+                  #if INT_FAST8_WIDTH > INT_WIDTH && INT_FAST8_WIDTH <= LONG_WIDTH
+                  case TYPE_INT_FAST8_T:
+                  #endif
+                  #if UINT_FAST8_WIDTH > INT_WIDTH && UINT_FAST8_WIDTH <= LONG_WIDTH
+                  case TYPE_UINT_FAST8_T:
+                  #endif
+                  #if INT_FAST16_WIDTH > INT_WIDTH && INT_FAST16_WIDTH <= LONG_WIDTH
+                  case TYPE_INT_FAST16_T:
+                  #endif
+                  #if UINT_FAST16_WIDTH > INT_WIDTH && UINT_FAST16_WIDTH <= LONG_WIDTH
+                  case TYPE_UINT_FAST16_T:
+                  #endif
+                  #if INT_FAST32_WIDTH > INT_WIDTH && INT_FAST32_WIDTH <= LONG_WIDTH
+                  case TYPE_INT_FAST32_T:
+                  #endif
+                  #if UINT_FAST32_WIDTH > INT_WIDTH && UINT_FAST32_WIDTH <= LONG_WIDTH
+                  case TYPE_UINT_FAST32_T:
+                  #endif
+                  #if INT_FAST64_WIDTH > INT_WIDTH && INT_FAST64_WIDTH <= LONG_WIDTH
+                  case TYPE_INT_FAST64_T:
+                  #endif
+                  #if UINT_FAST64_WIDTH > INT_WIDTH && UINT_FAST64_WIDTH <= LONG_WIDTH
+                  case TYPE_UINT_FAST64_T:
+                  #endif
+                  #if HAVE_WINT_T
                   case TYPE_WIDE_CHAR:
-#endif
-#if HAVE_WCHAR_T
+                  #endif
+                  #if HAVE_WCHAR_T
                   case TYPE_WIDE_STRING:
-#endif
+                  #endif
                     *fbp++ = 'l';
                     break;
                   case TYPE_LONGDOUBLE:
@@ -4988,47 +6002,74 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 #endif
                   *fbp = dp->conversion;
 #if USE_SNPRINTF
-# if ((HAVE_SNPRINTF_RETVAL_C99 && HAVE_SNPRINTF_TRUNCATION_C99)            \
+                /* Decide whether to pass %n in the format string
+                   to SNPRINTF.  */
+# if (((!WIDE_CHAR_VERSION || !DCHAR_IS_TCHAR)                              \
+       && (HAVE_SNPRINTF_RETVAL_C99 && HAVE_SNPRINTF_TRUNCATION_C99))       \
       || ((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))       \
           && !defined __UCLIBC__)                                           \
       || (defined __APPLE__ && defined __MACH__)                            \
+      || defined __OpenBSD__                                                \
       || defined __ANDROID__                                                \
-      || (defined _WIN32 && ! defined __CYGWIN__))
-                /* On systems where we know that snprintf's return value
-                   conforms to ISO C 99 (HAVE_SNPRINTF_RETVAL_C99) and that
-                   snprintf always produces NUL-terminated strings
-                   (HAVE_SNPRINTF_TRUNCATION_C99), it is possible to avoid
-                   using %n.  And it is desirable to do so, because more and
-                   more platforms no longer support %n, for "security reasons".
-                   In particular, the following platforms:
+      || (defined _WIN32 && ! defined __CYGWIN__))                          \
+      || (WIDE_CHAR_VERSION && MUSL_LIBC)
+                /* We can avoid passing %n and instead rely on SNPRINTF's
+                   return value if
+                     - !WIDE_CHAR_VERSION || !DCHAR_IS_TCHAR, because otherwise,
+                       when WIDE_CHAR_VERSION && DCHAR_IS_TCHAR,
+                       snwprintf()/_snwprintf() (Windows) and swprintf() (Unix)
+                       don't return the needed buffer size,
+                     and
+                     - we're compiling for a system where we know
+                       - that snprintf's return value conforms to ISO C 99
+                         (HAVE_SNPRINTF_RETVAL_C99) and
+                       - that snprintf always produces NUL-terminated strings
+                         (HAVE_SNPRINTF_TRUNCATION_C99).
+                   And it is desirable to do so, because more and more platforms
+                   no longer support %n, for "security reasons".  */
+                /* On specific platforms, listed below, we *must* avoid %n.
+                   In the case
+                     !WIDE_CHAR_VERSION && HAVE_SNPRINTF_RETVAL_C99 && !USE_MSVC__SNPRINTF
+                   we can rely on the return value of snprintf instead.  Whereas
+                   in the opposite case
+                     WIDE_CHAR_VERSION || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF
+                   we need to make room based on an estimation, computed by
+                   MAX_ROOM_NEEDED.  */
+                /* The following platforms forbid %n:
                      - On glibc2 systems from 2004-10-18 or newer, the use of
                        %n in format strings in writable memory may crash the
                        program (if compiled with _FORTIFY_SOURCE=2).
-                     - On Mac OS X 10.13 or newer, the use of %n in format
+                     - On macOS 10.13 or newer, the use of %n in format
                        strings in writable memory by default crashes the
                        program.
+                     - On OpenBSD, since 2021-08-30, the use of %n in format
+                       strings produces an abort (see
+                       <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/vfprintf.c.diff?r1=1.79&r2=1.80&f=h>,
+                       <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/vfwprintf.c.diff?r1=1.20&r2=1.21&f=h>).
                      - On Android, starting on 2018-03-07, the use of %n in
                        format strings produces a fatal error (see
                        <https://android.googlesource.com/platform/bionic/+/41398d03b7e8e0dfb951660ae713e682e9fc0336>).
-                   On these platforms, HAVE_SNPRINTF_RETVAL_C99 and
-                   HAVE_SNPRINTF_TRUNCATION_C99 are 1. We have listed them
-                   explicitly in the condition above, in case of cross-
-                   compilation (just to be sure).  */
-                /* On native Windows systems (such as mingw), we can avoid using
-                   %n because:
+                     - On native Windows systems (such as mingw) where the OS is
+                       Windows Vista, the use of %n in format strings by default
+                       crashes the program. See
+                         <https://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
+                         <https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/set-printf-count-output>
+                   On the first four of these platforms, if !WIDE_CHAR_VERSION,
+                   it is not a big deal to avoid %n, because on these platforms,
+                   HAVE_SNPRINTF_RETVAL_C99 and HAVE_SNPRINTF_TRUNCATION_C99 are
+                   1.
+                   On native Windows, if !WIDE_CHAR_VERSION, it's not a big deal
+                   either because:
                      - Although the gl_SNPRINTF_TRUNCATION_C99 test fails,
                        snprintf does not write more than the specified number
                        of bytes. (snprintf (buf, 3, "%d %d", 4567, 89) writes
                        '4', '5', '6' into buf, not '4', '5', '\0'.)
                      - Although the gl_SNPRINTF_RETVAL_C99 test fails, snprintf
                        allows us to recognize the case of an insufficient
-                       buffer size: it returns -1 in this case.
-                   On native Windows systems (such as mingw) where the OS is
-                   Windows Vista, the use of %n in format strings by default
-                   crashes the program. See
-                     <https://gcc.gnu.org/ml/gcc/2007-06/msg00122.html> and
-                     <https://docs.microsoft.com/en-us/cpp/c-runtime-library/reference/set-printf-count-output>
-                   So we should avoid %n in this situation.  */
+                       buffer size: it returns -1 in this case.  */
+                /* Additionally, in the WIDE_CHAR_VERSION case, we cannot use %n
+                   on musl libc because we would run into an swprintf() bug.
+                   See <https://www.openwall.com/lists/musl/2023/03/19/1>.  */
                 fbp[1] = '\0';
 # else           /* AIX <= 5.1, HP-UX, IRIX, OSF/1, Solaris <= 9, BeOS */
                 fbp[1] = '%';
@@ -5189,6 +6230,102 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                           SNPRINTF_BUF (arg);
                         }
                         break;
+                      case TYPE_INT8_T:
+                        {
+                          int8_t arg = a.arg[dp->arg_index].a.a_int8_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_UINT8_T:
+                        {
+                          uint8_t arg = a.arg[dp->arg_index].a.a_uint8_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_INT16_T:
+                        {
+                          int16_t arg = a.arg[dp->arg_index].a.a_int16_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_UINT16_T:
+                        {
+                          uint16_t arg = a.arg[dp->arg_index].a.a_uint16_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_INT32_T:
+                        {
+                          int32_t arg = a.arg[dp->arg_index].a.a_int32_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_UINT32_T:
+                        {
+                          uint32_t arg = a.arg[dp->arg_index].a.a_uint32_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_INT64_T:
+                        {
+                          int64_t arg = a.arg[dp->arg_index].a.a_int64_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_UINT64_T:
+                        {
+                          uint64_t arg = a.arg[dp->arg_index].a.a_uint64_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_INT_FAST8_T:
+                        {
+                          int_fast8_t arg = a.arg[dp->arg_index].a.a_int_fast8_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_UINT_FAST8_T:
+                        {
+                          uint_fast8_t arg = a.arg[dp->arg_index].a.a_uint_fast8_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_INT_FAST16_T:
+                        {
+                          int_fast16_t arg = a.arg[dp->arg_index].a.a_int_fast16_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_UINT_FAST16_T:
+                        {
+                          uint_fast16_t arg = a.arg[dp->arg_index].a.a_uint_fast16_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_INT_FAST32_T:
+                        {
+                          int_fast32_t arg = a.arg[dp->arg_index].a.a_int_fast32_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_UINT_FAST32_T:
+                        {
+                          uint_fast32_t arg = a.arg[dp->arg_index].a.a_uint_fast32_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_INT_FAST64_T:
+                        {
+                          int_fast64_t arg = a.arg[dp->arg_index].a.a_int_fast64_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
+                      case TYPE_UINT_FAST64_T:
+                        {
+                          uint_fast64_t arg = a.arg[dp->arg_index].a.a_uint_fast64_t;
+                          SNPRINTF_BUF (arg);
+                        }
+                        break;
                       case TYPE_DOUBLE:
                         {
                           double arg = a.arg[dp->arg_index].a.a_double;
@@ -5271,12 +6408,16 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                             /* Look at the snprintf() return value.  */
                             if (retcount < 0)
                               {
-# if !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF
+# if (WIDE_CHAR_VERSION && DCHAR_IS_TCHAR) || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF
                                 /* HP-UX 10.20 snprintf() is doubly deficient:
                                    It doesn't understand the '%n' directive,
                                    *and* it returns -1 (rather than the length
                                    that would have been required) when the
                                    buffer is too small.
+                                   Likewise, in case of
+                                   WIDE_CHAR_VERSION && DCHAR_IS_TCHAR, the
+                                   functions snwprintf()/_snwprintf() (Windows)
+                                   or swprintf() (Unix).
                                    But a failure at this point can also come
                                    from other reasons than a too small buffer,
                                    such as an invalid wide string argument to
@@ -5312,7 +6453,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 # endif
                               }
                             else
-                              count = retcount;
+                              {
+                                count = retcount;
+# if WIDE_CHAR_VERSION && defined __MINGW32__
+                                if (count == 0 && dp->conversion == 'c')
+                                  /* snwprintf returned 0 instead of 1.  But it
+                                     wrote a null wide character.  */
+                                  count = 1;
+# endif
+                              }
                           }
                       }
 #endif
@@ -5370,7 +6519,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                       }
 #endif
 
-#if NEED_PRINTF_UNBOUNDED_PRECISION
+#if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
                     if (prec_ourselves)
                       {
                         /* Handle the precision.  */
@@ -5430,6 +6579,15 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 
                             count += insert;
                           }
+# if NEED_PRINTF_FLAG_ALT_PRECISION_ZERO
+                        else if (precision == 0
+                                 && move == 1
+                                 && prec_ptr[prefix_count] == '0')
+                          {
+                            /* Replace the "0" result with an empty string.  */
+                            count = prefix_count;
+                          }
+# endif
                       }
 #endif
 
@@ -5442,11 +6600,13 @@ 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')
+                    if (dp->conversion == 'c' || dp->conversion == 's'
+# if __GLIBC__ >= 2 && !defined __UCLIBC__
+                        || (flags & FLAG_LOCALIZED)
+# endif
+                       )
                       {
-                        /* type = TYPE_CHAR or TYPE_WIDE_CHAR or TYPE_STRING
-                           TYPE_WIDE_STRING.
-                           The result string is not certainly ASCII.  */
+                        /* The result string is not guaranteed to be ASCII.  */
                         const TCHAR_T *tmpsrc;
                         DCHAR_T *tmpdst;
                         size_t tmpdst_len;
@@ -5457,6 +6617,56 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
 # else
                         tmpsrc = tmp;
 # endif
+# if WIDE_CHAR_VERSION
+                        /* Convert tmpsrc[0..count-1] to a freshly allocated
+                           wide character array.  */
+                        mbstate_t state;
+
+                        mbszero (&state);
+                        tmpdst_len = 0;
+                        {
+                          const TCHAR_T *src = tmpsrc;
+                          size_t srclen = count;
+
+                          for (; srclen > 0; tmpdst_len++)
+                            {
+                              /* Parse the next multibyte character.  */
+                              size_t ret = mbrtowc (NULL, src, srclen, &state);
+                              if (ret == (size_t)(-2) || ret == (size_t)(-1))
+                                goto fail_with_EILSEQ;
+                              if (ret == 0)
+                                ret = 1;
+                              src += ret;
+                              srclen -= ret;
+                            }
+                        }
+
+                        tmpdst =
+                          (wchar_t *) malloc ((tmpdst_len + 1) * sizeof (wchar_t));
+                        if (tmpdst == NULL)
+                          goto out_of_memory;
+
+                        mbszero (&state);
+                        {
+                          DCHAR_T *destptr = tmpdst;
+                          const TCHAR_T *src = tmpsrc;
+                          size_t srclen = count;
+
+                          for (; srclen > 0; destptr++)
+                            {
+                              /* Parse the next multibyte character.  */
+                              size_t ret = mbrtowc (destptr, src, srclen, &state);
+                              if (ret == (size_t)(-2) || ret == (size_t)(-1))
+                                /* Should already have been caught in the first
+                                   loop, above.  */
+                                abort ();
+                              if (ret == 0)
+                                ret = 1;
+                              src += ret;
+                              srclen -= ret;
+                            }
+                        }
+# else
                         tmpdst =
                           DCHAR_CONV_FROM_ENCODING (locale_charset (),
                                                     iconveh_question_mark,
@@ -5465,6 +6675,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                                     NULL, &tmpdst_len);
                         if (tmpdst == NULL)
                           goto fail_with_errno;
+# endif
                         ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len),
                                                 { free (tmpdst); goto out_of_memory; });
                         DCHAR_CPY (result + length, tmpdst, tmpdst_len);
@@ -5531,7 +6742,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                     /* Here count <= allocated - length.  */
 
                     /* Perform padding.  */
-#if !DCHAR_IS_TCHAR || ENABLE_UNISTDIO || NEED_PRINTF_FLAG_LEFTADJUST || NEED_PRINTF_FLAG_ZERO || NEED_PRINTF_UNBOUNDED_PRECISION
+#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 (pad_ourselves && has_width)
                       {
                         size_t w;
@@ -5590,6 +6801,22 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                   if ((*pad_ptr >= 'A' && *pad_ptr <= 'Z')
                                       || (*pad_ptr >= 'a' && *pad_ptr <= 'z'))
                                     pad_ptr = NULL;
+                                  else
+                                    /* Do the zero-padding after the "0x" or
+                                       "0b" prefix, not before.  */
+                                    if (p - rp >= 2
+                                        && *rp == '0'
+                                        && (((dp->conversion == 'a'
+                                              || dp->conversion == 'x')
+                                             && rp[1] == 'x')
+                                            || ((dp->conversion == 'A'
+                                                 || dp->conversion == 'X')
+                                                && rp[1] == 'X')
+                                            || (dp->conversion == 'b'
+                                                && rp[1] == 'b')
+                                            || (dp->conversion == 'B'
+                                                && rp[1] == 'B')))
+                                      pad_ptr += 2;
                                 }
                               /* The generated string now extends from rp to p,
                                  with the zero padding insertion point being at
@@ -5603,7 +6830,22 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
                                   for (; pad > 0; pad--)
                                     *p++ = ' ';
                                 }
-                              else if ((flags & FLAG_ZERO) && pad_ptr != NULL)
+                              else if ((flags & FLAG_ZERO) && pad_ptr != NULL
+                                       /* ISO C says: "For d, i, o, u, x, and X
+                                          conversions, if a precision is
+                                          specified, the 0 flag is ignored.  */
+                                       && !(has_precision
+                                            && (dp->conversion == 'd'
+                                                || dp->conversion == 'i'
+                                                || dp->conversion == 'o'
+                                                || dp->conversion == 'u'
+                                                || dp->conversion == 'x'
+                                                || dp->conversion == 'X'
+                                                /* Although ISO C does not
+                                                   require it, treat 'b' and 'B'
+                                                   like 'x' and 'X'.  */
+                                                || dp->conversion == 'b'
+                                                || dp->conversion == 'B')))
                                 {
                                   /* Pad with zeroes.  */
                                   DCHAR_T *q = end;
@@ -5697,7 +6939,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp,
     errno = ENOMEM;
     goto fail_with_errno;
 
-#if ENABLE_UNISTDIO || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL) || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T)
+#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)
   fail_with_EILSEQ:
     errno = EILSEQ;
     goto fail_with_errno;
diff --git a/gl/vasnprintf.h b/gl/vasnprintf.h
index f69649fb..7ed9145c 100644
--- a/gl/vasnprintf.h
+++ b/gl/vasnprintf.h
@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2004, 2007-2023 Free Software Foundation, Inc.
+   Copyright (C) 2002-2004, 2007-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
@@ -17,6 +17,11 @@
 #ifndef _VASNPRINTF_H
 #define _VASNPRINTF_H
 
+/* This file uses _GL_ATTRIBUTE_FORMAT.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Get va_list.  */
 #include <stdarg.h>
 
diff --git a/gl/vasprintf.c b/gl/vasprintf.c
index d2878cd9..e52aaca5 100644
--- a/gl/vasprintf.c
+++ b/gl/vasprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2023 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2002, 2006-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
diff --git a/gl/verify.h b/gl/verify.h
index b63cb264..08268c24 100644
--- a/gl/verify.h
+++ b/gl/verify.h
@@ -1,6 +1,6 @@
 /* Compile-time assert-like macros.
 
-   Copyright (C) 2005-2006, 2009-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2006, 2009-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
@@ -188,9 +188,9 @@ template <int w>
     _gl_verify_type<(R) ? 1 : -1>
 #elif defined _GL_HAVE__STATIC_ASSERT
 # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
-    struct {                                   \
-      _Static_assert (R, DIAGNOSTIC);          \
-      int _gl_dummy;                          \
+    struct { \
+      _Static_assert (R, DIAGNOSTIC); \
+      int _gl_dummy; \
     }
 #else
 # define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \
@@ -212,8 +212,8 @@ template <int w>
 #elif defined _GL_HAVE__STATIC_ASSERT
 # define _GL_VERIFY(R, DIAGNOSTIC, ...) _Static_assert (R, DIAGNOSTIC)
 #else
-# define _GL_VERIFY(R, DIAGNOSTIC, ...)                                \
-    extern int (*_GL_GENSYM (_gl_verify_function) (void))              \
+# define _GL_VERIFY(R, DIAGNOSTIC, ...) \
+    extern int (*_GL_GENSYM (_gl_verify_function) (void)) \
       [_GL_VERIFY_TRUE (R, DIAGNOSTIC)]
 # if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
 #  pragma GCC diagnostic ignored "-Wnested-externs"
@@ -222,22 +222,43 @@ template <int w>
 
 /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h.  */
 #ifdef _GL_STATIC_ASSERT_H
-# if !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert
+/* Define _Static_assert if needed.  */
+/* With clang ≥ 3.8.0 in C++ mode, _Static_assert already works and accepts
+   1 or 2 arguments.  We better don't override it, because clang's standard
+   C++ library uses static_assert inside classes in several places, and our
+   replacement via _GL_VERIFY does not work in these contexts.  */
+# if (defined __cplusplus && defined __clang__ \
+      && (4 <= __clang_major__ + (8 <= __clang_minor__)))
+#  if 5 <= __clang_major__
+/* Avoid "warning: 'static_assert' with no message is a C++17 extension".  */
+#   pragma clang diagnostic ignored "-Wc++17-extensions"
+#  else
+/* Avoid "warning: static_assert with no message is a C++1z extension".  */
+#   pragma clang diagnostic ignored "-Wc++1z-extensions"
+#  endif
+# elif !defined _GL_HAVE__STATIC_ASSERT1 && !defined _Static_assert
 #  if !defined _MSC_VER || defined __clang__
 #   define _Static_assert(...) \
       _GL_VERIFY (__VA_ARGS__, "static assertion failed", -)
 #  else
-    /* Work around MSVC preprocessor incompatibility with ISO C; see
-       <https://stackoverflow.com/questions/5134523/>.  */
-#   define _Static_assert(R, ...) \
-      _GL_VERIFY ((R), "static assertion failed", -)
+#   if defined __cplusplus && _MSC_VER >= 1910
+     /* In MSVC 14.1 or newer, static_assert accepts one or two arguments,
+        but _Static_assert is not defined.  */
+#    define _Static_assert static_assert
+#   else
+     /* Work around MSVC preprocessor incompatibility with ISO C; see
+        <https://stackoverflow.com/questions/5134523/>.  */
+#    define _Static_assert(R, ...) \
+       _GL_VERIFY ((R), "static assertion failed", -)
+#   endif
 #  endif
 # endif
+/* Define static_assert if needed.  */
 # if (!defined static_assert \
       && __STDC_VERSION__ < 202311 \
       && (!defined __cplusplus \
           || (__cpp_static_assert < 201411 \
-              && __GNUG__ < 6 && __clang_major__ < 6)))
+              && __GNUG__ < 6 && __clang_major__ < 6 && _MSC_VER < 1910)))
 #  if 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.
@@ -250,6 +271,8 @@ template <int w>
 #   define _GL_SA3 static_assert
 #   define _GL_SA_PICK(x1,x2,x3,x4,...) x4
 #   define static_assert(...) _GL_EXPAND(_GL_SA_PICK(__VA_ARGS__,_GL_SA3,_GL_SA2,_GL_SA1)) (__VA_ARGS__)
+/* Avoid "fatal error C1189: #error:  The C++ Standard Library forbids macroizing keywords."  */
+#   define _ALLOW_KEYWORD_MACROS 1
 #  else
 #   define static_assert _Static_assert /* C11 requires this #define. */
 #  endif
@@ -268,14 +291,16 @@ template <int w>
 # define _GL_HAS_BUILTIN_TRAP 0
 #endif
 
-#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
+#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
 #endif
 
 /* Each of these macros verifies that its argument R is nonzero.  To
diff --git a/gl/vsnprintf.c b/gl/vsnprintf.c
index acd4e2d4..e6676a1f 100644
--- a/gl/vsnprintf.c
+++ b/gl/vsnprintf.c
@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 2004, 2006-2023 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2006-2024 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
diff --git a/gl/w32sock.h b/gl/w32sock.h
index 84e46e33..166a5f77 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-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
diff --git a/gl/warn-on-use.h b/gl/warn-on-use.h
index 30756034..701013a0 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2010-2024 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
@@ -32,6 +32,10 @@
    _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
diff --git a/gl/wchar.in.h b/gl/wchar.in.h
index 09c9185f..a33a10f7 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2007-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
@@ -84,6 +84,13 @@
 #ifndef _@GUARD_PREFIX@_WCHAR_H
 #define _@GUARD_PREFIX@_WCHAR_H
 
+/* This file uses _GL_ATTRIBUTE_DEALLOC, _GL_ATTRIBUTE_MALLOC,
+   _GL_ATTRIBUTE_NOTHROW, _GL_ATTRIBUTE_PURE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#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.  */
@@ -130,6 +137,28 @@
 # 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 __cplusplus >= 201103L
+#    define _GL_ATTRIBUTE_NOTHROW noexcept (true)
+#   else
+#    define _GL_ATTRIBUTE_NOTHROW throw ()
+#   endif
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# else
+#  if (__GNUC__ + (__GNUC_MINOR__ >= 3) > 3) || defined __clang__
+#   define _GL_ATTRIBUTE_NOTHROW __attribute__ ((__nothrow__))
+#  else
+#   define _GL_ATTRIBUTE_NOTHROW
+#  endif
+# endif
+#endif
+
 /* The definitions of _GL_FUNCDECL_RPL etc. are copied here.  */
 
 /* The definition of _GL_ARG_NONNULL is copied here.  */
@@ -188,7 +217,11 @@ typedef int rpl_mbstate_t;
 # if (@REPLACE_FREE@ && !defined free \
       && !(defined __cplusplus && defined GNULIB_NAMESPACE))
 /* We can't do '#define free rpl_free' here.  */
+#  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
+_GL_EXTERN_C void rpl_free (void *) _GL_ATTRIBUTE_NOTHROW;
+#  else
 _GL_EXTERN_C void rpl_free (void *);
+#  endif
 #  undef _GL_ATTRIBUTE_DEALLOC_FREE
 #  define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1)
 # else
@@ -200,7 +233,7 @@ _GL_EXTERN_C
      void __cdecl free (void *);
 #  else
 #   if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #   else
 _GL_EXTERN_C void free (void *);
 #   endif
@@ -215,13 +248,20 @@ _GL_EXTERN_C
      void __cdecl free (void *);
 # else
 #  if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2)
-_GL_EXTERN_C void free (void *) throw ();
+_GL_EXTERN_C void free (void *) _GL_ATTRIBUTE_NOTHROW;
 #  else
 _GL_EXTERN_C void free (void *);
 #  endif
 # endif
 #endif
 
+
+#if @GNULIB_MBSZERO@
+/* Get memset().  */
+# include <string.h>
+#endif
+
+
 /* Convert a single-byte character to a wide character.  */
 #if @GNULIB_BTOWC@
 # if @REPLACE_BTOWC@
@@ -278,7 +318,7 @@ _GL_WARN_ON_USE (wctob, "wctob is unportable - "
 #endif
 
 
-/* Test whether *PS is in the initial state.  */
+/* Test whether *PS is in an initial state.  */
 #if @GNULIB_MBSINIT@
 # if @REPLACE_MBSINIT@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -305,6 +345,208 @@ _GL_WARN_ON_USE (mbsinit, "mbsinit is unportable - "
 #endif
 
 
+/* Put *PS into an initial state.  */
+#if @GNULIB_MBSZERO@
+/* ISO C 23 § 7.31.6.(3) says that zeroing an mbstate_t is a way to put the
+   mbstate_t into an initial state.  However, on many platforms an mbstate_t
+   is large, and it is possible - as an optimization - to get away with zeroing
+   only part of it.  So, instead of
+
+        mbstate_t state = { 0 };
+
+   or
+
+        mbstate_t state;
+        memset (&state, 0, sizeof (mbstate_t));
+
+   we can write this faster code:
+
+        mbstate_t state;
+        mbszero (&state);
+ */
+/* _GL_MBSTATE_INIT_SIZE describes how mbsinit() behaves: It is the number of
+   bytes at the beginning of an mbstate_t that need to be zero, for mbsinit()
+   to return true.
+   _GL_MBSTATE_ZERO_SIZE is the number of bytes at the beginning of an mbstate_t
+   that need to be zero,
+     - for mbsinit() to return true, and
+     - for all other multibyte-aware functions to operate properly.
+   0 < _GL_MBSTATE_INIT_SIZE <= _GL_MBSTATE_ZERO_SIZE <= sizeof (mbstate_t).
+   These values are determined by source code inspection, where possible, and
+   by running the gnulib unit tests.
+   We need _GL_MBSTATE_INIT_SIZE because if we define _GL_MBSTATE_ZERO_SIZE
+   without considering what mbsinit() does, we get test failures such as
+     assertion "mbsinit (&iter->state)" failed
+ */
+# if GNULIB_defined_mbstate_t                             /* AIX, IRIX */
+/* mbstate_t has at least 4 bytes.  They are used as coded in
+   gnulib/lib/mbrtowc.c.  */
+#  define _GL_MBSTATE_INIT_SIZE 1
+/* define _GL_MBSTATE_ZERO_SIZE 4
+   does not work: it causes test failures.
+   So, use the safe fallback value, below.  */
+# elif __GLIBC__ + (__GLIBC_MINOR__ >= 2) > 2             /* glibc */
+/* mbstate_t is defined in <bits/types/__mbstate_t.h>.
+   For more details, see glibc/iconv/skeleton.c.  */
+#  define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (((mbstate_t) {0}).__count) */
+#  define _GL_MBSTATE_ZERO_SIZE /* 8 */ sizeof (mbstate_t)
+# elif defined MUSL_LIBC                                  /* musl libc */
+/* mbstate_t is defined in <bits/alltypes.h>.
+   It is an opaque aligned 8-byte struct, of which at most the first
+   4 bytes are used.
+   For more details, see src/multibyte/mbrtowc.c.  */
+#  define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (unsigned) */
+#  define _GL_MBSTATE_ZERO_SIZE 4
+# elif defined __APPLE__ && defined __MACH__              /* macOS */
+/* On macOS, mbstate_t is defined in <machine/_types.h>.
+   It is an opaque aligned 128-byte struct, of which at most the first
+   12 bytes are used.
+   For more details, see the __mbsinit implementations in
+   Libc-<version>/locale/FreeBSD/
+   {ascii,none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8,utf2}.c.  */
+/* File       INIT_SIZE  ZERO_SIZE
+   ascii.c        0          0
+   none.c         0          0
+   euc.c         12         12
+   mskanji.c      4          4
+   big5.c         4          4
+   gb2312.c       4          6
+   gbk.c          4          4
+   gb18030.c      4          8
+   utf8.c         8         10
+   utf2.c         8         12 */
+#  define _GL_MBSTATE_INIT_SIZE 12
+#  define _GL_MBSTATE_ZERO_SIZE 12
+# elif defined __FreeBSD__                                /* FreeBSD */
+/* On FreeBSD, mbstate_t is defined in src/sys/sys/_types.h.
+   It is an opaque aligned 128-byte struct, of which at most the first
+   12 bytes are used.
+   For more details, see the __mbsinit implementations in
+   src/lib/libc/locale/
+   {ascii,none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8}.c.  */
+/* File       INIT_SIZE  ZERO_SIZE
+   ascii.c        0          0
+   none.c         0          0
+   euc.c         12         12
+   mskanji.c      4          4
+   big5.c         4          4
+   gb2312.c       4          6
+   gbk.c          4          4
+   gb18030.c      4          8
+   utf8.c         8         12 */
+#  define _GL_MBSTATE_INIT_SIZE 12
+#  define _GL_MBSTATE_ZERO_SIZE 12
+# elif defined __NetBSD__                                 /* NetBSD */
+/* On NetBSD, mbstate_t is defined in src/sys/sys/ansi.h.
+   It is an opaque aligned 128-byte struct, of which at most the first
+   28 bytes are used.
+   For more details, see the *State types in
+   src/lib/libc/citrus/modules/citrus_*.c
+   (ignoring citrus_{hz,iso2022,utf7,viqr,zw}.c, since these implement
+   stateful encodings, not usable as locale encodings).  */
+/* File                                ZERO_SIZE
+   citrus/citrus_none.c                    0
+   citrus/modules/citrus_euc.c             8
+   citrus/modules/citrus_euctw.c           8
+   citrus/modules/citrus_mskanji.c         8
+   citrus/modules/citrus_big5.c            8
+   citrus/modules/citrus_gbk2k.c           8
+   citrus/modules/citrus_dechanyu.c        8
+   citrus/modules/citrus_johab.c           6
+   citrus/modules/citrus_utf8.c           12 */
+/* But 12 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test
+   failures for values < 28.  */
+#  define _GL_MBSTATE_ZERO_SIZE 28
+# elif defined __OpenBSD__                                /* OpenBSD */
+/* On OpenBSD, mbstate_t is defined in src/sys/sys/_types.h.
+   It is an opaque aligned 128-byte struct, of which at most the first
+   12 bytes are used.
+   For more details, see src/lib/libc/citrus/citrus_*.c.  */
+/* File           INIT_SIZE  ZERO_SIZE
+   citrus_none.c      0          0
+   citrus_utf8.c     12         12 */
+#  define _GL_MBSTATE_INIT_SIZE 12
+#  define _GL_MBSTATE_ZERO_SIZE 12
+# elif defined __minix                                    /* Minix */
+/* On Minix, mbstate_t is defined in sys/sys/ansi.h.
+   It is an opaque aligned 128-byte struct.
+   For more details, see the *State types in
+   lib/libc/citrus/citrus_*.c.  */
+/* File           INIT_SIZE  ZERO_SIZE
+   citrus_none.c      0          0 */
+/* But 1 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test
+   failures for values < 4.  */
+#  define _GL_MBSTATE_ZERO_SIZE 4
+# elif defined __sun                                      /* Solaris */
+/* On Solaris, mbstate_t is defined in <wchar_impl.h>.
+   It is an opaque aligned 24-byte or 32-byte struct, of which at most the first
+   20 or 28 bytes are used.
+   For more details on OpenSolaris derivatives, see the *State types in
+   illumos-gate/usr/src/lib/libc/port/locale/
+   {none,euc,mskanji,big5,gb2312,gbk,gb18030,utf8}.c.  */
+/* File       INIT_SIZE  ZERO_SIZE
+   none.c         0          0
+   euc.c         12         12
+   mskanji.c      4          4
+   big5.c         4          4
+   gb2312.c       4          6
+   gbk.c          4          4
+   gb18030.c      4          8
+   utf8.c        12         12 */
+/* But 12 is not the correct value for _GL_MBSTATE_ZERO_SIZE: we get test
+   failures
+     - in OpenIndiana and OmniOS: for values < 16,
+     - in Solaris 10 and 11: for values < 20 (in 32-bit mode)
+       or < 28 (in 64-bit mode).
+   Since we don't have a good way to distinguish the OpenSolaris derivatives
+   from the proprietary Solaris versions, and can't inspect the Solaris source
+   code, use the safe fallback values, below.  */
+# elif defined __CYGWIN__                                 /* Cygwin */
+/* On Cygwin, mbstate_t is defined in <sys/_types.h>.
+   For more details, see newlib/libc/stdlib/mbtowc_r.c and
+   winsup/cygwin/strfuncs.cc.  */
+#  define _GL_MBSTATE_INIT_SIZE 4 /* sizeof (int) */
+#  define _GL_MBSTATE_ZERO_SIZE 8
+# elif defined _WIN32 && !defined __CYGWIN__              /* Native Windows.  */
+/* MSVC defines 'mbstate_t' as an aligned 8-byte struct.
+   On mingw, 'mbstate_t' is sometimes defined as 'int', sometimes defined
+   as an aligned 8-byte struct, of which the first 4 bytes matter.
+   Use the safe values, below.  */
+# elif defined __ANDROID__                                /* Android */
+/* Android defines 'mbstate_t' in <bits/mbstate_t.h>.
+   It is an opaque 4-byte or 8-byte struct.
+   For more details, see
+   bionic/libc/private/bionic_mbstate.h
+   bionic/libc/bionic/mbrtoc32.cpp
+   bionic/libc/bionic/mbrtoc16.cpp
+ */
+#  define _GL_MBSTATE_INIT_SIZE 4
+#  define _GL_MBSTATE_ZERO_SIZE 4
+# endif
+/* Use safe values as defaults.  */
+# ifndef _GL_MBSTATE_INIT_SIZE
+#  define _GL_MBSTATE_INIT_SIZE sizeof (mbstate_t)
+# endif
+# ifndef _GL_MBSTATE_ZERO_SIZE
+#  define _GL_MBSTATE_ZERO_SIZE sizeof (mbstate_t)
+# endif
+_GL_BEGIN_C_LINKAGE
+# if defined IN_MBSZERO
+_GL_EXTERN_INLINE
+# else
+_GL_INLINE
+# endif
+_GL_ARG_NONNULL ((1)) void
+mbszero (mbstate_t *ps)
+{
+  memset (ps, 0, _GL_MBSTATE_ZERO_SIZE);
+}
+_GL_END_C_LINKAGE
+_GL_CXXALIAS_SYS (mbszero, void, (mbstate_t *ps));
+_GL_CXXALIASWARN (mbszero);
+#endif
+
+
 /* Convert a multibyte character to a wide character.  */
 #if @GNULIB_MBRTOWC@
 # if @REPLACE_MBRTOWC@
@@ -441,7 +683,9 @@ _GL_CXXALIAS_SYS (mbsnrtowcs, size_t,
                    const char **restrict srcp, size_t srclen, size_t len,
                    mbstate_t *restrict ps));
 # endif
+# if __GLIBC__ >= 2
 _GL_CXXALIASWARN (mbsnrtowcs);
+# endif
 #elif defined GNULIB_POSIXCHECK
 # undef mbsnrtowcs
 # if HAVE_RAW_DECL_MBSNRTOWCS
@@ -629,13 +873,25 @@ _GL_WARN_ON_USE (wmemchr, "wmemchr is unportable - "
 
 /* Compare N wide characters of S1 and S2.  */
 #if @GNULIB_WMEMCMP@
-# if !@HAVE_WMEMCMP@
+# if @REPLACE_WMEMCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wmemcmp
+#   define wmemcmp rpl_wmemcmp
+#  endif
+_GL_FUNCDECL_RPL (wmemcmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n)
+                  _GL_ATTRIBUTE_PURE);
+_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);
-# endif
+#  endif
 _GL_CXXALIAS_SYS (wmemcmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wmemcmp);
 # endif
@@ -694,14 +950,27 @@ _GL_WARN_ON_USE (wmemmove, "wmemmove is unportable - "
 /* Copy N wide characters of SRC to DEST.
    Return pointer to wide characters after the last written wide character.  */
 #if @GNULIB_WMEMPCPY@
-# if !@HAVE_WMEMPCPY@
+# if @REPLACE_WMEMPCPY@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wmempcpy
+#   define wmempcpy rpl_wmempcpy
+#  endif
+_GL_FUNCDECL_RPL (wmempcpy, wchar_t *,
+                  (wchar_t *restrict dest,
+                   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));
+# else
+#  if !@HAVE_WMEMPCPY@
 _GL_FUNCDECL_SYS (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
                    const wchar_t *restrict src, size_t n));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (wmempcpy, wchar_t *,
                   (wchar_t *restrict dest,
                    const wchar_t *restrict src, size_t n));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wmempcpy);
 # endif
@@ -901,11 +1170,21 @@ _GL_WARN_ON_USE (wcsncat, "wcsncat is unportable - "
 
 /* Compare S1 and S2.  */
 #if @GNULIB_WCSCMP@
-# if !@HAVE_WCSCMP@
+# if @REPLACE_WCSCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcscmp
+#   define wcscmp rpl_wcscmp
+#  endif
+_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_ATTRIBUTE_PURE);
-# endif
+#  endif
 _GL_CXXALIAS_SYS (wcscmp, int, (const wchar_t *s1, const wchar_t *s2));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wcscmp);
 # endif
@@ -920,13 +1199,25 @@ _GL_WARN_ON_USE (wcscmp, "wcscmp is unportable - "
 
 /* Compare no more than N wide characters of S1 and S2.  */
 #if @GNULIB_WCSNCMP@
-# if !@HAVE_WCSNCMP@
+# if @REPLACE_WCSNCMP@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsncmp
+#   define wcsncmp rpl_wcsncmp
+#  endif
+_GL_FUNCDECL_RPL (wcsncmp, int,
+                  (const wchar_t *s1, const wchar_t *s2, size_t n)
+                  _GL_ATTRIBUTE_PURE);
+_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);
-# endif
+#  endif
 _GL_CXXALIAS_SYS (wcsncmp, int,
                   (const wchar_t *s1, const wchar_t *s2, size_t n));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wcsncmp);
 # endif
@@ -1035,9 +1326,16 @@ _GL_CXXALIAS_MDA (wcsdup, wchar_t *, (const wchar_t *s));
    namespace, not in the global namespace.  So, force a declaration in
    the global namespace.  */
 #  if !@HAVE_WCSDUP@ || (defined __sun && defined __cplusplus) || __GNUC__ >= 11
+#   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);
+#   else
 _GL_FUNCDECL_SYS (wcsdup, wchar_t *,
                   (const wchar_t *s)
                   _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #  endif
 _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
 # endif
@@ -1045,9 +1343,16 @@ _GL_CXXALIASWARN (wcsdup);
 #else
 # if __GNUC__ >= 11 && !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);
+#  else
+_GL_FUNCDECL_SYS (wcsdup, wchar_t *,
+                  (const wchar_t *s)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#  endif
 # endif
 # if defined GNULIB_POSIXCHECK
 #  undef wcsdup
@@ -1066,9 +1371,16 @@ _GL_WARN_ON_USE (wcsdup, "wcsdup is unportable - "
 #   endif
 _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);
+#   else
+_GL_FUNCDECL_SYS (wcsdup, wchar_t *,
+                  (const wchar_t *s)
+                  _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE);
+#   endif
 #   if @HAVE_DECL_WCSDUP@
 _GL_CXXALIAS_SYS (wcsdup, wchar_t *, (const wchar_t *s));
 #   endif
@@ -1140,7 +1452,7 @@ _GL_WARN_ON_USE (wcsrchr, "wcsrchr is unportable - "
 #endif
 
 
-/* Return the length of the initial segmet of WCS which consists entirely
+/* Return the length of the initial segment of WCS which consists entirely
    of wide characters not in REJECT.  */
 #if @GNULIB_WCSCSPN@
 # if !@HAVE_WCSCSPN@
@@ -1160,7 +1472,7 @@ _GL_WARN_ON_USE (wcscspn, "wcscspn is unportable - "
 #endif
 
 
-/* Return the length of the initial segmet of WCS which consists entirely
+/* Return the length of the initial segment of WCS which consists entirely
    of wide characters in ACCEPT.  */
 #if @GNULIB_WCSSPN@
 # if !@HAVE_WCSSPN@
@@ -1215,12 +1527,25 @@ _GL_WARN_ON_USE (wcspbrk, "wcspbrk is unportable - "
 
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
 #if @GNULIB_WCSSTR@
-# if !@HAVE_WCSSTR@
+# if @REPLACE_WCSSTR@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wcsstr
+#   define wcsstr rpl_wcsstr
+#  endif
+_GL_FUNCDECL_RPL (wcsstr, wchar_t *,
+                  (const wchar_t *restrict haystack,
+                   const wchar_t *restrict needle)
+                  _GL_ATTRIBUTE_PURE);
+_GL_CXXALIAS_RPL (wcsstr, wchar_t *,
+                  (const wchar_t *restrict haystack,
+                   const wchar_t *restrict needle));
+# else
+#  if !@HAVE_WCSSTR@
 _GL_FUNCDECL_SYS (wcsstr, wchar_t *,
                   (const wchar_t *restrict haystack,
                    const wchar_t *restrict needle)
                   _GL_ATTRIBUTE_PURE);
-# endif
+#  endif
   /* On some systems, this function is defined as an overloaded function:
        extern "C++" {
          const wchar_t * std::wcsstr (const wchar_t *, const wchar_t *);
@@ -1231,6 +1556,7 @@ _GL_CXXALIAS_SYS_CAST2 (wcsstr,
                         (const wchar_t *restrict, const wchar_t *restrict),
                         const wchar_t *,
                         (const wchar_t *restrict, const wchar_t *restrict));
+# endif
 # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \
      && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
 _GL_CXXALIASWARN1 (wcsstr, wchar_t *,
@@ -1358,6 +1684,24 @@ _GL_WARN_ON_USE (wcsftime, "wcsftime is unportable - "
 #endif
 
 
+#if @GNULIB_WGETCWD@ && (defined _WIN32 && !defined __CYGWIN__)
+/* Gets the name of the current working directory.
+   (a) If BUF is non-NULL, it is assumed to have room for SIZE wide characters.
+       This function stores the working directory (NUL-terminated) in BUF and
+       returns BUF.
+   (b) If BUF is NULL, an array is allocated with 'malloc'.  The array is SIZE
+       wide characters long, unless SIZE == 0, in which case it is as big as
+       necessary.
+   If the directory couldn't be determined or SIZE was too small, this function
+   returns NULL and sets errno.  For a directory of length LEN, SIZE should be
+   >= LEN + 3 in case (a) or >= LEN + 1 in case (b).
+   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));
+#endif
+
+
 #endif /* _@GUARD_PREFIX@_WCHAR_H */
 #endif /* _@GUARD_PREFIX@_WCHAR_H */
 #endif
diff --git a/gl/wcrtomb.c b/gl/wcrtomb.c
index 48a6c8eb..197b020e 100644
--- a/gl/wcrtomb.c
+++ b/gl/wcrtomb.c
@@ -1,5 +1,5 @@
 /* Convert wide character to multibyte character.
-   Copyright (C) 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2008-2024 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2008.
 
    This file is free software: you can redistribute it and/or modify
@@ -29,7 +29,7 @@ wcrtomb (char *s, wchar_t wc, mbstate_t *ps)
 #undef wcrtomb
 {
   /* This implementation of wcrtomb supports only stateless encodings.
-     ps must be in the initial state.  */
+     ps must be in an initial state.  */
   if (ps != NULL && !mbsinit (ps))
     {
       errno = EINVAL;
diff --git a/gl/wctype-h.c b/gl/wctype-h.c
index 7d3e14a6..7e4ff13a 100644
--- a/gl/wctype-h.c
+++ b/gl/wctype-h.c
@@ -1,6 +1,6 @@
 /* Inline functions for <wctype.h>.
 
-   Copyright (C) 2012-2023 Free Software Foundation, Inc.
+   Copyright (C) 2012-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
@@ -20,4 +20,4 @@
 #include <config.h>
 
 #define _GL_WCTYPE_INLINE _GL_EXTERN_INLINE
-#include "wctype.h"
+#include <wctype.h>
diff --git a/gl/wctype-impl.h b/gl/wctype-impl.h
new file mode 100644
index 00000000..26d68b41
--- /dev/null
+++ b/gl/wctype-impl.h
@@ -0,0 +1,96 @@
+/* Get descriptor for a wide character property.
+   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   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/>.  */
+
+wctype_t
+wctype (const char* name)
+{
+  switch (name[0])
+    {
+    case 'a':
+      switch (name[1])
+        {
+        case 'l':
+          switch (name[2])
+            {
+            case 'n':
+              if (strcmp (name + 3, "um") == 0)
+                return (wctype_t) iswalnum;
+              break;
+            case 'p':
+              if (strcmp (name + 3, "ha") == 0)
+                return (wctype_t) iswalpha;
+              break;
+            default:
+              break;
+            }
+          break;
+        default:
+          break;
+        }
+      break;
+    case 'b':
+      if (strcmp (name + 1, "lank") == 0)
+        return (wctype_t) iswblank;
+      break;
+    case 'c':
+      if (strcmp (name + 1, "ntrl") == 0)
+        return (wctype_t) iswcntrl;
+      break;
+    case 'd':
+      if (strcmp (name + 1, "igit") == 0)
+        return (wctype_t) iswdigit;
+      break;
+    case 'g':
+      if (strcmp (name + 1, "raph") == 0)
+        return (wctype_t) iswgraph;
+      break;
+    case 'l':
+      if (strcmp (name + 1, "ower") == 0)
+        return (wctype_t) iswlower;
+      break;
+    case 'p':
+      switch (name[1])
+        {
+        case 'r':
+          if (strcmp (name + 2, "int") == 0)
+            return (wctype_t) iswprint;
+          break;
+        case 'u':
+          if (strcmp (name + 2, "nct") == 0)
+            return (wctype_t) iswpunct;
+          break;
+        default:
+          break;
+        }
+      break;
+    case 's':
+      if (strcmp (name + 1, "pace") == 0)
+        return (wctype_t) iswspace;
+      break;
+    case 'u':
+      if (strcmp (name + 1, "pper") == 0)
+        return (wctype_t) iswupper;
+      break;
+    case 'x':
+      if (strcmp (name + 1, "digit") == 0)
+        return (wctype_t) iswxdigit;
+      break;
+    default:
+      break;
+    }
+  return NULL;
+}
diff --git a/gl/wctype.c b/gl/wctype.c
new file mode 100644
index 00000000..914f6847
--- /dev/null
+++ b/gl/wctype.c
@@ -0,0 +1,25 @@
+/* Get descriptor for a wide character property.
+   Copyright (C) 2011-2024 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2011.
+
+   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 <wctype.h>
+
+#include <string.h>
+
+#include "wctype-impl.h"
diff --git a/gl/wctype.in.h b/gl/wctype.in.h
index f6e474d3..851c4f4e 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2006-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
@@ -44,6 +44,12 @@
 
 #ifndef _@GUARD_PREFIX@_WCTYPE_H
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, GNULIB_POSIXCHECK,
+   HAVE_RAW_DECL_*.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #if @HAVE_WINT_T@
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
 # include <wchar.h>
@@ -68,9 +74,6 @@
 #ifndef _@GUARD_PREFIX@_WCTYPE_H
 #define _@GUARD_PREFIX@_WCTYPE_H
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef _GL_WCTYPE_INLINE
 # define _GL_WCTYPE_INLINE _GL_INLINE
@@ -78,6 +81,8 @@ _GL_INLINE_HEADER_BEGIN
 
 /* 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.  */
 
 /* Solaris 2.6 <wctype.h> includes <widec.h> which includes <euc.h> which
@@ -127,7 +132,8 @@ typedef unsigned int rpl_wint_t;
 /* FreeBSD 4.4 to 4.11 has <wctype.h> but lacks the functions.
    Linux libc5 has <wctype.h> and the functions but they are broken.
    mingw and MSVC have <wctype.h> and the functions but they take a wchar_t
-   as argument, not an rpl_wint_t.
+   as argument, not an rpl_wint_t.  Additionally, the mingw iswprint function
+   and the Android iswpunct function are broken.
    Assume all 11 functions (all isw* except iswblank) are implemented the
    same way, or not at all.  */
 # if ! @HAVE_ISWCNTRL@ || @REPLACE_ISWCNTRL@
@@ -179,7 +185,11 @@ rpl_iswlower (wint_t wc)
 _GL_WCTYPE_INLINE int
 rpl_iswprint (wint_t wc)
 {
+#   ifdef __MINGW32__
+  return ((wchar_t) wc == wc ? wc == ' ' || iswgraph ((wchar_t) wc) : 0);
+#   else
   return ((wchar_t) wc == wc ? iswprint ((wchar_t) wc) : 0);
+#   endif
 }
 
 _GL_WCTYPE_INLINE int
@@ -484,6 +494,16 @@ _GL_FUNCDECL_RPL (iswdigit, int, (wint_t wc));
 #   endif
 #  endif
 
+#  if @GNULIB_ISWPUNCT@
+#   if @REPLACE_ISWPUNCT@
+#    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#     undef iswpunct
+#     define iswpunct rpl_iswpunct
+#    endif
+_GL_FUNCDECL_RPL (iswpunct, int, (wint_t wc));
+#   endif
+#  endif
+
 #  if @GNULIB_ISWXDIGIT@
 #   if @REPLACE_ISWXDIGIT@
 #    if !(defined __cplusplus && defined GNULIB_NAMESPACE)
@@ -623,14 +643,32 @@ _GL_CXXALIASWARN (iswblank);
 typedef void * wctype_t;
 #  define GNULIB_defined_wctype_t 1
 # endif
+#elif @REPLACE_WCTYPE@
+# if !GNULIB_defined_wctype_t
+typedef void *rpl_wctype_t;
+#  undef wctype_t
+#  define wctype_t rpl_wctype_t
+#  define GNULIB_defined_wctype_t 1
+# endif
 #endif
 
 /* Get a descriptor for a wide character property.  */
 #if @GNULIB_WCTYPE@
-# if !@HAVE_WCTYPE_T@
-_GL_FUNCDECL_SYS (wctype, wctype_t, (const char *name));
-# endif
+# if @REPLACE_WCTYPE@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wctype
+#   define wctype rpl_wctype
+#  endif
+_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_ARG_NONNULL ((1)));
+#  endif
 _GL_CXXALIAS_SYS (wctype, wctype_t, (const char *name));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wctype);
 # endif
@@ -646,7 +684,7 @@ _GL_WARN_ON_USE (wctype, "wctype is unportable - "
    The argument WC must be either a wchar_t value or WEOF.
    The argument DESC must have been returned by the wctype() function.  */
 #if @GNULIB_ISWCTYPE@
-# if @GNULIBHEADERS_OVERRIDE_WINT_T@
+# if @GNULIBHEADERS_OVERRIDE_WINT_T@ || @REPLACE_WCTYPE@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef iswctype
 #   define iswctype rpl_iswctype
@@ -687,14 +725,32 @@ _GL_CXXALIASWARN (towupper);
 typedef void * wctrans_t;
 #  define GNULIB_defined_wctrans_t 1
 # endif
+#elif @REPLACE_WCTRANS@
+# if !GNULIB_defined_wctrans_t
+typedef void *rpl_wctrans_t;
+#  undef wctrans_t
+#  define wctrans_t rpl_wctrans_t
+#  define GNULIB_defined_wctrans_t 1
+# endif
 #endif
 
 /* Get a descriptor for a wide character case conversion.  */
 #if @GNULIB_WCTRANS@
-# if !@HAVE_WCTRANS_T@
-_GL_FUNCDECL_SYS (wctrans, wctrans_t, (const char *name));
-# endif
+# if @REPLACE_WCTRANS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef wctrans
+#   define wctrans rpl_wctrans
+#  endif
+_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_ARG_NONNULL ((1)));
+#  endif
 _GL_CXXALIAS_SYS (wctrans, wctrans_t, (const char *name));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (wctrans);
 # endif
@@ -710,10 +766,19 @@ _GL_WARN_ON_USE (wctrans, "wctrans is unportable - "
    The argument WC must be either a wchar_t value or WEOF.
    The argument DESC must have been returned by the wctrans() function.  */
 #if @GNULIB_TOWCTRANS@
-# if !@HAVE_WCTRANS_T@
+# if @REPLACE_WCTRANS@
+#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#   undef towctrans
+#   define towctrans rpl_towctrans
+#  endif
+_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));
-# endif
+#  endif
 _GL_CXXALIAS_SYS (towctrans, wint_t, (wint_t wc, wctrans_t desc));
+# endif
 # if __GLIBC__ >= 2
 _GL_CXXALIASWARN (towctrans);
 # endif
diff --git a/gl/windows-initguard.h b/gl/windows-initguard.h
index 9d36f53c..6bace3f0 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/windows-mutex.c b/gl/windows-mutex.c
index ab7258c9..b112e13b 100644
--- a/gl/windows-mutex.c
+++ b/gl/windows-mutex.c
@@ -1,5 +1,5 @@
 /* Plain mutexes (native Windows implementation).
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/windows-mutex.h b/gl/windows-mutex.h
index 039eb707..88de4bdc 100644
--- a/gl/windows-mutex.h
+++ b/gl/windows-mutex.h
@@ -1,5 +1,5 @@
 /* Plain mutexes (native Windows implementation).
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/windows-once.c b/gl/windows-once.c
index 0d28281f..17854f5c 100644
--- a/gl/windows-once.c
+++ b/gl/windows-once.c
@@ -1,5 +1,5 @@
 /* Once-only control (native Windows implementation).
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/windows-once.h b/gl/windows-once.h
index 54885680..c5bbcd57 100644
--- a/gl/windows-once.h
+++ b/gl/windows-once.h
@@ -1,5 +1,5 @@
 /* Once-only control (native Windows implementation).
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/windows-recmutex.c b/gl/windows-recmutex.c
index a8ce9a04..e5672baf 100644
--- a/gl/windows-recmutex.c
+++ b/gl/windows-recmutex.c
@@ -1,5 +1,5 @@
 /* Plain recursive mutexes (native Windows implementation).
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/windows-recmutex.h b/gl/windows-recmutex.h
index 08ff4597..9fa445b3 100644
--- a/gl/windows-recmutex.h
+++ b/gl/windows-recmutex.h
@@ -1,5 +1,5 @@
 /* Plain recursive mutexes (native Windows implementation).
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/windows-rwlock.c b/gl/windows-rwlock.c
index 7cbd7bb1..e60c4efc 100644
--- a/gl/windows-rwlock.c
+++ b/gl/windows-rwlock.c
@@ -1,5 +1,5 @@
 /* Read-write locks (native Windows implementation).
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/windows-rwlock.h b/gl/windows-rwlock.h
index fe8381e8..08d67750 100644
--- a/gl/windows-rwlock.h
+++ b/gl/windows-rwlock.h
@@ -1,5 +1,5 @@
 /* Read-write locks (native Windows implementation).
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-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
diff --git a/gl/xalloc-die.c b/gl/xalloc-die.c
index 7605eee1..c053c7a8 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-2023 Free Software
+   Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2024 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 
-#include "error.h"
+#include <error.h>
 #include "exitfail.h"
 
 #include "gettext.h"
diff --git a/gl/xalloc-oversized.h b/gl/xalloc-oversized.h
index 5dbdfb55..7f30f83e 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-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
@@ -29,8 +29,7 @@
    is SIZE_MAX - 1.  */
 #define __xalloc_oversized(n, s) \
   ((s) != 0 \
-   && ((size_t) (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) \
-       < (n)))
+   && (PTRDIFF_MAX < SIZE_MAX ? PTRDIFF_MAX : SIZE_MAX - 1) / (s) < (n))
 
 /* Return 1 if and only if an array of N objects, each of size S,
    cannot exist reliably because its total size in bytes would exceed
@@ -48,13 +47,13 @@
 #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 && !__STRICT_ANSI__ \
-       && PTRDIFF_MAX < SIZE_MAX)
+#elif 5 <= __GNUC__ && !defined __ICC && PTRDIFF_MAX < SIZE_MAX
 # define xalloc_oversized(n, s) \
    (__builtin_constant_p (n) && __builtin_constant_p (s) \
     ? __xalloc_oversized (n, s) \
-    : ({ ptrdiff_t __xalloc_count; \
-         __builtin_mul_overflow (n, s, &__xalloc_count); }))
+    : __extension__ \
+        ({ ptrdiff_t __xalloc_count; \
+           __builtin_mul_overflow (n, s, &__xalloc_count); }))
 
 /* Other compilers use integer division; this may be slower but is
    more portable.  */
diff --git a/gl/xalloc.h b/gl/xalloc.h
index f373c2fe..75a5db30 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2003-2004, 2006-2024 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
@@ -18,6 +18,13 @@
 #ifndef XALLOC_H_
 #define XALLOC_H_
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, _Noreturn,
+   _GL_ATTRIBUTE_ALLOC_SIZE, _GL_ATTRIBUTE_MALLOC,
+   _GL_ATTRIBUTE_RETURNS_NONNULL.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 #include <stddef.h>
 #include <stdlib.h>
 
@@ -25,9 +32,6 @@
 # include "idx.h"
 #endif
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef XALLOC_INLINE
 # define XALLOC_INLINE _GL_INLINE
@@ -46,7 +50,7 @@ extern "C" {
    or by using gnulib's xalloc-die module.  This is the
    function to call when one wants the program to die because of a
    memory allocation failure.  */
-/*extern*/ _Noreturn void xalloc_die (void);
+_Noreturn void xalloc_die (void);
 
 #endif /* GNULIB_XALLOC_DIE */
 
diff --git a/gl/xmalloc.c b/gl/xmalloc.c
index 289cbd05..5befdab7 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-2023 Free Software Foundation, Inc.
+   Copyright (C) 1990-2000, 2002-2006, 2008-2024 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
@@ -30,7 +30,7 @@
 #include <string.h>
 
 static void * _GL_ATTRIBUTE_PURE
-nonnull (void *p)
+check_nonnull (void *p)
 {
   if (!p)
     xalloc_die ();
@@ -42,13 +42,13 @@ nonnull (void *p)
 void *
 xmalloc (size_t s)
 {
-  return nonnull (malloc (s));
+  return check_nonnull (malloc (s));
 }
 
 void *
 ximalloc (idx_t s)
 {
-  return nonnull (imalloc (s));
+  return check_nonnull (imalloc (s));
 }
 
 char *
@@ -72,7 +72,7 @@ xrealloc (void *p, size_t s)
 void *
 xirealloc (void *p, idx_t s)
 {
-  return nonnull (irealloc (p, s));
+  return check_nonnull (irealloc (p, s));
 }
 
 /* Change the size of an allocated block of memory P to an array of N
@@ -90,7 +90,7 @@ xreallocarray (void *p, size_t n, size_t s)
 void *
 xireallocarray (void *p, idx_t n, idx_t s)
 {
-  return nonnull (ireallocarray (p, n, s));
+  return check_nonnull (ireallocarray (p, n, s));
 }
 
 /* Allocate an array of N objects, each with S bytes of memory,
@@ -295,13 +295,13 @@ xizalloc (idx_t s)
 void *
 xcalloc (size_t n, size_t s)
 {
-  return nonnull (calloc (n, s));
+  return check_nonnull (calloc (n, s));
 }
 
 void *
 xicalloc (idx_t n, idx_t s)
 {
-  return nonnull (icalloc (n, s));
+  return check_nonnull (icalloc (n, s));
 }
 
 /* Clone an object P of size S, with error checking.  There's no need
diff --git a/gl/xsize.c b/gl/xsize.c
index 279ae824..87744675 100644
--- a/gl/xsize.c
+++ b/gl/xsize.c
@@ -1,6 +1,6 @@
 /* Checked size_t computations.
 
-   Copyright (C) 2012-2023 Free Software Foundation, Inc.
+   Copyright (C) 2012-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
diff --git a/gl/xsize.h b/gl/xsize.h
index 1ec78e77..619c0edc 100644
--- a/gl/xsize.h
+++ b/gl/xsize.h
@@ -1,6 +1,6 @@
 /* xsize.h -- Checked size_t computations.
 
-   Copyright (C) 2003, 2008-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2008-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
@@ -18,6 +18,11 @@
 #ifndef _XSIZE_H
 #define _XSIZE_H
 
+/* This file uses _GL_INLINE_HEADER_BEGIN, _GL_INLINE, HAVE_STDINT_H.  */
+#if !_GL_CONFIG_H_INCLUDED
+ #error "Please include config.h first."
+#endif
+
 /* Get size_t.  */
 #include <stddef.h>
 
@@ -30,14 +35,16 @@
 /* Get ATTRIBUTE_PURE.  */
 #include "attribute.h"
 
-#ifndef _GL_INLINE_HEADER_BEGIN
- #error "Please include config.h first."
-#endif
 _GL_INLINE_HEADER_BEGIN
 #ifndef XSIZE_INLINE
 # define XSIZE_INLINE _GL_INLINE
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
 /* The size of memory objects is often computed through expressions of
    type size_t. Example:
       void* p = malloc (header_size + n * element_size).
@@ -103,6 +110,11 @@ xmax (size_t size1, size_t size2)
 #define size_in_bounds_p(SIZE) \
   ((SIZE) != SIZE_MAX)
 
+
+#ifdef __cplusplus
+}
+#endif
+
 _GL_INLINE_HEADER_END
 
 #endif /* _XSIZE_H */
diff --git a/lib/Makefile.am b/lib/Makefile.am
index dc3ee893..a9f3ff40 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,8 +7,20 @@ noinst_LIBRARIES = libmonitoringplug.a
 AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\" \
         -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
-EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h maxfd.h
+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_tcp.h \
+        utils_cmd.h \
+        parse_ini.h \
+        extra_opts.h \
+        maxfd.h \
+        perfdata.h \
+        output.h \
+        thresholds.h \
+        states.h \
+        vendor/cJSON/cJSON.h \
+        monitoringplug.h
 
 if USE_PARSE_INI
 libmonitoringplug_a_SOURCES += parse_ini.c extra_opts.c
@@ -16,4 +28,3 @@ endif USE_PARSE_INI
 
 test test-debug:
         cd tests && make $@
-
diff --git a/lib/extra_opts.c b/lib/extra_opts.c
index 771621d8..88787336 100644
--- a/lib/extra_opts.c
+++ b/lib/extra_opts.c
@@ -1,24 +1,24 @@
 /*****************************************************************************
-*
-* Monitoring Plugins extra_opts library
-*
-* License: GPL
-* Copyright (c) 2007 Monitoring Plugins Development Team
-*
-* 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 extra_opts library
+ *
+ * License: GPL
+ * Copyright (c) 2007 - 2024 Monitoring Plugins Development Team
+ *
+ * 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_base.h"
@@ -26,110 +26,115 @@
 #include "extra_opts.h"
 
 /* FIXME: copied from utils.h; we should move a bunch of libs! */
-bool is_option2 (char *str)
-{
+bool is_option2(char *str) {
         if (!str)
                 return false;
-        else if (strspn (str, "-") == 1 || strspn (str, "-") == 2)
+        else if (strspn(str, "-") == 1 || strspn(str, "-") == 2)
                 return true;
         else
                 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;
+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) {
+        if (*argc < 2) {
                 /* No arguments provided */
                 return argv;
         }
 
-        for(i=1; i<*argc; i++){
-                argptr=NULL;
-                optfound=0;
+        for (i = 1; i < *argc; i++) {
+                argptr = NULL;
+                optfound = 0;
 
                 /* Do we have an extra-opts parameter? */
-                if(strncmp(argv[i], "--extra-opts=", 13)==0){
+                if (strncmp(argv[i], "--extra-opts=", 13) == 0) {
                         /* It is a single argument with value */
-                        argptr=argv[i]+13;
+                        argptr = argv[i] + 13;
                         /* Delete the extra opts argument */
-                        for(j=i;j<*argc;j++) argv[j]=argv[j+1];
+                        for (j = i; j < *argc; j++)
+                                argv[j] = argv[j + 1];
                         i--;
-                        *argc-=1;
-                }else if(strcmp(argv[i], "--extra-opts")==0){
-                        if((i+1<*argc)&&!is_option2(argv[i+1])){
+                        *argc -= 1;
+                } else if (strcmp(argv[i], "--extra-opts") == 0) {
+                        if ((i + 1 < *argc) && !is_option2(argv[i + 1])) {
                                 /* It is a argument with separate value */
-                                argptr=argv[i+1];
+                                argptr = argv[i + 1];
                                 /* Delete the extra-opts argument/value */
-                                for(j=i;j<*argc-1;j++) argv[j]=argv[j+2];
-                                i-=2;
-                                *argc-=2;
+                                for (j = i; j < *argc - 1; j++)
+                                        argv[j] = argv[j + 2];
+                                i -= 2;
+                                *argc -= 2;
                                 ea_num--;
-                        }else{
+                        } else {
                                 /* It has no value */
-                                optfound=1;
+                                optfound = 1;
                                 /* Delete the extra opts argument */
-                                for(j=i;j<*argc;j++) argv[j]=argv[j+1];
+                                for (j = i; j < *argc; j++)
+                                        argv[j] = argv[j + 1];
                                 i--;
-                                *argc-=1;
+                                *argc -= 1;
                         }
                 }
 
                 /* If we found extra-opts, expand them and store them for later*/
-                if(argptr||optfound){
+                if (argptr || optfound) {
                         /* Process ini section, returning a linked list of arguments */
-                        ea1=np_get_defaults(argptr, plugin_name);
-                        if(ea1==NULL) {
+                        ea1 = np_get_defaults(argptr, plugin_name);
+                        if (ea1 == NULL) {
                                 /* no extra args (empty section)? */
                                 ea_num--;
                                 continue;
                         }
 
                         /* append the list to extra_args */
-                        if(extra_args==NULL){
-                                extra_args=ea1;
-                                while((ea1 = ea1->next)) ea_num++;
-                        }else{
-                                ea_tmp=extra_args;
-                                while(ea_tmp->next) {
-                                        ea_tmp=ea_tmp->next;
+                        if (extra_args == NULL) {
+                                extra_args = ea1;
+                                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)) ea_num++;
+                                ea_tmp->next = ea1;
+                                while ((ea1 = ea1->next))
+                                        ea_num++;
                         }
-                        ea1=ea_tmp=NULL;
+                        ea1 = ea_tmp = NULL;
                 }
         } /* lather, rince, repeat */
 
-        if(ea_num==*argc && extra_args==NULL){
+        if (ea_num == *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) die(STATE_UNKNOWN, _("malloc() failed!\n"));
+        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;
+        argv_new[0] = argv[0];
+        argc_new = 1;
         /* then parsed ini opts (frying them up in the same run) */
-        while(extra_args){
-                argv_new[argc_new++]=extra_args->arg;
-                ea1=extra_args;
-                extra_args=extra_args->next;
+        while (extra_args) {
+                argv_new[argc_new++] = extra_args->arg;
+                ea1 = extra_args;
+                extra_args = extra_args->next;
                 free(ea1);
         }
         /* finally the rest of the argv array */
-        for (i=1; i<*argc; i++) argv_new[argc_new++]=argv[i];
-        *argc=argc_new;
+        for (i = 1; i < *argc; i++)
+                argv_new[argc_new++] = argv[i];
+        *argc = argc_new;
         /* and terminate. */
-        argv_new[argc_new]=NULL;
+        argv_new[argc_new] = NULL;
 
         return argv_new;
 }
-
diff --git a/lib/extra_opts.h b/lib/extra_opts.h
index 8ff14a16..3f64360f 100644
--- a/lib/extra_opts.h
+++ b/lib/extra_opts.h
@@ -20,4 +20,3 @@
 char **np_extra_opts(int *argc, char **argv, const char *plugin_name);
 
 #endif /* _EXTRA_OPTS_H_ */
-
diff --git a/lib/maxfd.c b/lib/maxfd.c
index 529b3568..ca5b6e54 100644
--- a/lib/maxfd.c
+++ b/lib/maxfd.c
@@ -1,7 +1,27 @@
+/*****************************************************************************
+ *
+ * License: GPL
+ * Copyright (c) 2024 Monitoring Plugins Development Team
+ *
+ * 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 "./maxfd.h"
 #include <errno.h>
 
-long mp_open_max (void) {
+long mp_open_max(void) {
         long maxfd = 0L;
         /* Try sysconf(_SC_OPEN_MAX) first, as it can be higher than OPEN_MAX.
          * If that fails and the macro isn't defined, we fall back to an educated
@@ -10,17 +30,17 @@ long mp_open_max (void) {
 
 #ifdef _SC_OPEN_MAX
         errno = 0;
-        if ((maxfd = sysconf (_SC_OPEN_MAX)) < 0) {
+        if ((maxfd = sysconf(_SC_OPEN_MAX)) < 0) {
                 if (errno == 0)
-                        maxfd = DEFAULT_MAXFD;   /* it's indeterminate */
+                        maxfd = DEFAULT_MAXFD; /* it's indeterminate */
                 else
-                        die (STATE_UNKNOWN, _("sysconf error for _SC_OPEN_MAX\n"));
+                        die(STATE_UNKNOWN, _("sysconf error for _SC_OPEN_MAX\n"));
         }
 #elif defined(OPEN_MAX)
         return OPEN_MAX
-#else   /* sysconf macro unavailable, so guess (may be wildly inaccurate) */
+#else /* sysconf macro unavailable, so guess (may be wildly inaccurate) */
         return DEFAULT_MAXFD;
 #endif
 
-        return(maxfd);
+        return (maxfd);
 }
diff --git a/lib/maxfd.h b/lib/maxfd.h
index 45218d0f..8fcd62d3 100644
--- a/lib/maxfd.h
+++ b/lib/maxfd.h
@@ -1,9 +1,9 @@
 #ifndef _MAXFD_
 #define _MAXFD_
 
-#define DEFAULT_MAXFD  256   /* fallback value if no max open files value is set */
-#define MAXFD_LIMIT   8192   /* upper limit of open files */
+#define DEFAULT_MAXFD 256  /* fallback value if no max open files value is set */
+#define MAXFD_LIMIT   8192 /* upper limit of open files */
 
-long mp_open_max (void);
+long mp_open_max(void);
 
 #endif // _MAXFD_
diff --git a/lib/monitoringplug.h b/lib/monitoringplug.h
new file mode 100644
index 00000000..a555d736
--- /dev/null
+++ b/lib/monitoringplug.h
@@ -0,0 +1,7 @@
+#pragma once
+
+#include "./states.h"
+#include "./utils_base.h"
+#include "./thresholds.h"
+#include "./maxfd.h"
+#include "./output.h"
diff --git a/lib/output.c b/lib/output.c
new file mode 100644
index 00000000..34ff7dab
--- /dev/null
+++ b/lib/output.c
@@ -0,0 +1,633 @@
+#include "./output.h"
+#include "./utils_base.h"
+#include "../plugins/utils.h"
+
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+// #include <cjson/cJSON.h>
+#include "./vendor/cJSON/cJSON.h"
+#include "perfdata.h"
+#include "states.h"
+
+// == 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 inline cJSON *json_serialize_subcheck(mp_subcheck subcheck);
+
+// == Implementation ==
+
+/*
+ * Generate output string for a mp_subcheck object
+ */
+static inline char *fmt_subcheck_perfdata(mp_subcheck check) {
+        char *result = strdup("");
+        int added = 0;
+
+        if (check.perfdata != NULL) {
+                added = asprintf(&result, "%s", pd_list_to_string(*check.perfdata));
+        }
+
+        if (check.subchecks == NULL) {
+                // No subchecks, return here
+                return result;
+        }
+
+        mp_subcheck_list *subchecks = check.subchecks;
+
+        while (subchecks != NULL) {
+                if (added > 0) {
+                        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));
+                }
+
+                subchecks = subchecks->next;
+        }
+
+        return result;
+}
+
+/*
+ * Initialiser for a mp_check object. Always use this to get a new one!
+ * It sets useful defaults
+ */
+mp_check mp_check_init(void) {
+        mp_check check = {
+                .evaluation_function = &mp_eval_check_default,
+        };
+        return check;
+}
+
+/*
+ * Initialiser for a mp_subcheck object. Always use this to get a new one!
+ * It sets useful defaults
+ */
+mp_subcheck mp_subcheck_init(void) {
+        mp_subcheck tmp = {0};
+        tmp.default_state = STATE_UNKNOWN; // Default state is unknown
+        tmp.state_set_explicitly = false;
+        return tmp;
+}
+
+/*
+ * Add a subcheck to a (the one and only) check object
+ */
+int mp_add_subcheck_to_check(mp_check check[static 1], mp_subcheck subcheck) {
+        assert(subcheck.output != NULL); // There must be output in a subcheck
+
+        mp_subcheck_list *tmp = NULL;
+
+        if (check->subchecks == NULL) {
+                check->subchecks = (mp_subcheck_list *)calloc(1, sizeof(mp_subcheck_list));
+                if (check->subchecks == NULL) {
+                        die(STATE_UNKNOWN, "%s - %s #%d: %s", __FILE__, __func__, __LINE__, "malloc failed");
+                }
+
+                check->subchecks->subcheck = subcheck;
+                check->subchecks->next = NULL;
+        } else {
+                // Search for the end
+                tmp = (mp_subcheck_list *)calloc(1, sizeof(mp_subcheck_list));
+                if (tmp == NULL) {
+                        die(STATE_UNKNOWN, "%s - %s #%d: %s", __FILE__, __func__, __LINE__, "malloc failed");
+                }
+
+                tmp->subcheck = subcheck;
+                tmp->next = check->subchecks;
+
+                check->subchecks = tmp;
+        }
+
+        return 0;
+}
+
+/*
+ * Add a mp_perfdata data point to a mp_subcheck object
+ */
+void mp_add_perfdata_to_subcheck(mp_subcheck check[static 1], const mp_perfdata perfData) {
+        if (check->perfdata == NULL) {
+                check->perfdata = pd_list_init();
+        }
+        pd_list_append(check->perfdata, perfData);
+}
+
+/*
+ * Add a mp_subcheck object to another one. The seconde mp_subcheck (argument) is the lower in the
+ * hierarchy
+ */
+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");
+        }
+
+        mp_subcheck_list *tmp = NULL;
+
+        if (check->subchecks == NULL) {
+                check->subchecks = (mp_subcheck_list *)calloc(1, sizeof(mp_subcheck_list));
+                if (check->subchecks == NULL) {
+                        die(STATE_UNKNOWN, "%s - %s #%d: %s", __FILE__, __func__, __LINE__, "malloc failed");
+                }
+
+                tmp = check->subchecks;
+        } else {
+                // Search for the end
+                tmp = check->subchecks;
+
+                while (tmp->next != NULL) {
+                        tmp = tmp->next;
+                }
+
+                tmp->next = (mp_subcheck_list *)calloc(1, sizeof(mp_subcheck_list));
+                if (tmp->next == NULL) {
+                        die(STATE_UNKNOWN, "%s - %s #%d: %s", __FILE__, __func__, __LINE__, "malloc failed");
+                }
+
+                tmp = tmp->next;
+        }
+
+        tmp->subcheck = subcheck;
+
+        return 0;
+}
+
+/*
+ * Add a manual summary to a mp_check object, effectively replacing
+ * the autogenerated one
+ */
+void mp_add_summary(mp_check check[static 1], char *summary) { check->summary = summary; }
+
+/*
+ * Generate the summary string of a mp_check object based on it's subchecks
+ */
+char *get_subcheck_summary(mp_check check) {
+        mp_subcheck_list *subchecks = check.subchecks;
+
+        unsigned int ok = 0;
+        unsigned int warning = 0;
+        unsigned int critical = 0;
+        unsigned int unknown = 0;
+        while (subchecks != NULL) {
+                switch (subchecks->subcheck.state) {
+                case STATE_OK:
+                        ok++;
+                        break;
+                case STATE_WARNING:
+                        warning++;
+                        break;
+                case STATE_CRITICAL:
+                        critical++;
+                        break;
+                case STATE_UNKNOWN:
+                        unknown++;
+                        break;
+                default:
+                        die(STATE_UNKNOWN, "Unknown state in get_subcheck_summary");
+                }
+                subchecks = subchecks->next;
+        }
+        char *result = NULL;
+        asprintf(&result, "ok=%d, warning=%d, critical=%d, unknown=%d", ok, warning, critical, unknown);
+        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 its own state and its subchecks
+ * states
+ */
+mp_state_enum mp_eval_subcheck_default(mp_subcheck subcheck) {
+        if (subcheck.evaluation_function != NULL) {
+                return subcheck.evaluation_function(subcheck);
+        }
+
+        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));
+                scl = scl->next;
+        }
+
+        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_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;
+        mp_state_enum result = STATE_OK;
+
+        while (scl != NULL) {
+                result = max_state_alt(result, mp_compute_subcheck_state(scl->subcheck));
+                scl = scl->next;
+        }
+
+        return result;
+}
+
+/*
+ * Generate output string for a mp_check object
+ * Non static to be available for testing functions
+ */
+char *mp_fmt_output(mp_check check) {
+        char *result = NULL;
+
+        switch (output_format) {
+        case MP_FORMAT_MULTI_LINE: {
+                if (check.summary == NULL) {
+                        check.summary = get_subcheck_summary(check);
+                }
+
+                asprintf(&result, "[%s] - %s", state_text(mp_compute_check_state(check)), check.summary);
+
+                mp_subcheck_list *subchecks = check.subchecks;
+
+                while (subchecks != NULL) {
+                        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;
+                }
+
+                char *pd_string = NULL;
+                subchecks = check.subchecks;
+
+                while (subchecks != NULL) {
+                        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));
+                        }
+
+                        subchecks = subchecks->next;
+                }
+
+                if (pd_string != NULL && strlen(pd_string) > 0) {
+                        asprintf(&result, "%s|%s", result, pd_string);
+                }
+
+                break;
+        }
+        case MP_FORMAT_TEST_JSON: {
+                cJSON *resultObject = cJSON_CreateObject();
+                if (resultObject == NULL) {
+                        die(STATE_UNKNOWN, "cJSON_CreateObject failed");
+                }
+
+                cJSON *resultState = cJSON_CreateString(state_text(mp_compute_check_state(check)));
+                cJSON_AddItemToObject(resultObject, "state", resultState);
+
+                if (check.summary == NULL) {
+                        check.summary = get_subcheck_summary(check);
+                }
+
+                cJSON *summary = cJSON_CreateString(check.summary);
+                cJSON_AddItemToObject(resultObject, "summary", summary);
+
+                if (check.subchecks != NULL) {
+                        cJSON *subchecks = cJSON_CreateArray();
+
+                        mp_subcheck_list *sc = check.subchecks;
+
+                        while (sc != NULL) {
+                                cJSON *sc_json = json_serialize_subcheck(sc->subcheck);
+                                cJSON_AddItemToArray(subchecks, sc_json);
+                                sc = sc->next;
+                        }
+
+                        cJSON_AddItemToObject(resultObject, "checks", subchecks);
+                }
+
+                result = cJSON_PrintUnformatted(resultObject);
+                break;
+        }
+        default:
+                die(STATE_UNKNOWN, "Invalid format");
+        }
+
+        return result;
+}
+
+/*
+ * Helper function to properly indent the output lines when using multiline
+ * formats
+ */
+static char *generate_indentation_string(unsigned int indentation) {
+        char *result = calloc(indentation + 1, sizeof(char));
+
+        for (unsigned int i = 0; i < indentation; i++) {
+                result[i] = '\t';
+        }
+
+        return result;
+}
+
+/*
+ * 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) {
+        char *result = NULL;
+        mp_subcheck_list *subchecks = NULL;
+
+        switch (output_format) {
+        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));
+                        subchecks = subchecks->next;
+                }
+                return result;
+        }
+        default:
+                die(STATE_UNKNOWN, "Invalid format");
+        }
+}
+
+static inline cJSON *json_serialise_pd_value(mp_perfdata_value value) {
+        cJSON *result = cJSON_CreateObject();
+
+        switch (value.type) {
+        case PD_TYPE_DOUBLE:
+                cJSON_AddStringToObject(result, "type", "double");
+                break;
+        case PD_TYPE_INT:
+                cJSON_AddStringToObject(result, "type", "int");
+                break;
+        case PD_TYPE_UINT:
+                cJSON_AddStringToObject(result, "type", "uint");
+                break;
+        case PD_TYPE_NONE:
+                die(STATE_UNKNOWN, "Perfdata type was None in json_serialise_pd_value");
+        }
+        cJSON_AddStringToObject(result, "value", pd_value_to_string(value));
+
+        return result;
+}
+
+static inline cJSON *json_serialise_range(mp_range range) {
+        cJSON *result = cJSON_CreateObject();
+
+        if (range.alert_on_inside_range) {
+                cJSON_AddBoolToObject(result, "alert_on_inside", true);
+        } else {
+                cJSON_AddBoolToObject(result, "alert_on_inside", false);
+        }
+
+        if (range.end_infinity) {
+                cJSON_AddStringToObject(result, "end", "inf");
+        } else {
+                cJSON_AddItemToObject(result, "end", json_serialise_pd_value(range.end));
+        }
+
+        if (range.start_infinity) {
+                cJSON_AddStringToObject(result, "start", "inf");
+        } else {
+                cJSON_AddItemToObject(result, "start", json_serialise_pd_value(range.end));
+        }
+
+        return result;
+}
+
+static inline cJSON *json_serialise_pd(mp_perfdata pd_val) {
+        cJSON *result = cJSON_CreateObject();
+
+        // Label
+        cJSON_AddStringToObject(result, "label", pd_val.label);
+
+        // Value
+        cJSON_AddItemToObject(result, "value", json_serialise_pd_value(pd_val.value));
+
+        // Uom
+        cJSON_AddStringToObject(result, "uom", pd_val.uom);
+
+        // Warn/Crit
+        if (pd_val.warn_present) {
+                cJSON *warn = json_serialise_range(pd_val.warn);
+                cJSON_AddItemToObject(result, "warn", warn);
+        }
+        if (pd_val.crit_present) {
+                cJSON *crit = json_serialise_range(pd_val.crit);
+                cJSON_AddItemToObject(result, "crit", crit);
+        }
+
+        if (pd_val.min_present) {
+                cJSON_AddItemToObject(result, "min", json_serialise_pd_value(pd_val.min));
+        }
+        if (pd_val.max_present) {
+                cJSON_AddItemToObject(result, "max", json_serialise_pd_value(pd_val.max));
+        }
+
+        return result;
+}
+
+static inline cJSON *json_serialise_pd_list(pd_list *list) {
+        cJSON *result = cJSON_CreateArray();
+
+        do {
+                cJSON *pd_value = json_serialise_pd(list->data);
+                cJSON_AddItemToArray(result, pd_value);
+                list = list->next;
+        } while (list != NULL);
+
+        return result;
+}
+
+static inline cJSON *json_serialize_subcheck(mp_subcheck subcheck) {
+        cJSON *result = cJSON_CreateObject();
+
+        // Human readable output
+        cJSON *output = cJSON_CreateString(subcheck.output);
+        cJSON_AddItemToObject(result, "output", output);
+
+        // Test state (aka Exit Code)
+        cJSON *state = cJSON_CreateString(state_text(mp_compute_subcheck_state(subcheck)));
+        cJSON_AddItemToObject(result, "state", state);
+
+        // Perfdata
+        if (subcheck.perfdata != NULL) {
+                cJSON *perfdata = json_serialise_pd_list(subcheck.perfdata);
+                cJSON_AddItemToObject(result, "perfdata", perfdata);
+        }
+
+        if (subcheck.subchecks != NULL) {
+                cJSON *subchecks = cJSON_CreateArray();
+
+                mp_subcheck_list *sc = subcheck.subchecks;
+
+                while (sc != NULL) {
+                        cJSON *sc_json = json_serialize_subcheck(sc->subcheck);
+                        cJSON_AddItemToArray(subchecks, sc_json);
+                        sc = sc->next;
+                }
+
+                cJSON_AddItemToObject(result, "checks", subchecks);
+        }
+
+        return result;
+}
+
+/*
+ * Wrapper function to print the output string of a mp_check object
+ * Use this in concrete plugins.
+ */
+void mp_print_output(mp_check check) { puts(mp_fmt_output(check)); }
+
+/*
+ * Convenience function to print the output string of a mp_check object and exit
+ * the program with the resulting state.
+ * Intended to be used to exit a monitoring plugin.
+ */
+void mp_exit(mp_check check) {
+        mp_print_output(check);
+        if (output_format == MP_FORMAT_TEST_JSON) {
+                exit(0);
+        }
+
+        exit(mp_compute_check_state(check));
+}
+
+/*
+ * Function to set the result state of a mp_subcheck object explicitly.
+ * This will overwrite the default state AND states derived from it's subchecks
+ */
+mp_subcheck mp_set_subcheck_state(mp_subcheck check, mp_state_enum state) {
+        check.state = state;
+        check.state_set_explicitly = true;
+        return check;
+}
+
+/*
+ * Function to set the default result state of a mp_subcheck object. This state
+ * will be used if neither an explicit state is set (see *mp_set_subcheck_state*)
+ * nor does it include other subchecks
+ */
+mp_subcheck mp_set_subcheck_default_state(mp_subcheck check, mp_state_enum state) {
+        check.default_state = state;
+        return check;
+}
+
+char *mp_output_format_map[] = {
+        [MP_FORMAT_MULTI_LINE] = "multi-line",
+        [MP_FORMAT_TEST_JSON] = "mp-test-json",
+};
+
+/*
+ * Function to parse the output from a string
+ */
+parsed_output_format mp_parse_output_format(char *format_string) {
+        parsed_output_format result = {
+                .parsing_success = false,
+                .output_format = MP_FORMAT_DEFAULT,
+        };
+
+        for (mp_output_format i = 0; i < (sizeof(mp_output_format_map) / sizeof(char *)); i++) {
+                if (strcasecmp(mp_output_format_map[i], format_string) == 0) {
+                        result.parsing_success = true;
+                        result.output_format = i;
+                        break;
+                }
+        }
+
+        return result;
+}
+
+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
new file mode 100644
index 00000000..c63c8e3f
--- /dev/null
+++ b/lib/output.h
@@ -0,0 +1,117 @@
+#pragma once
+
+#include "../config.h"
+#include "./perfdata.h"
+#include "./states.h"
+
+/*
+ * A partial check result
+ */
+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)
+
+        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
+
+        // 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
+ */
+typedef struct subcheck_list {
+        mp_subcheck subcheck;
+        struct subcheck_list *next;
+} mp_subcheck_list;
+
+/*
+ * Possible output formats
+ */
+typedef enum output_format {
+        MP_FORMAT_MULTI_LINE,
+        MP_FORMAT_TEST_JSON,
+} mp_output_format;
+
+#define MP_FORMAT_DEFAULT MP_FORMAT_MULTI_LINE
+
+/*
+ * Format related functions
+ */
+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.
+ * This is the "root" of a tree of singular checks.
+ * The final result is always derived from the children and the "worst" state
+ * in the first layer of subchecks
+ */
+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;
+
+        // 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);
+
+mp_subcheck mp_set_subcheck_state(mp_subcheck, mp_state_enum);
+mp_subcheck mp_set_subcheck_default_state(mp_subcheck, mp_state_enum);
+
+int mp_add_subcheck_to_check(mp_check check[static 1], mp_subcheck);
+int mp_add_subcheck_to_subcheck(mp_subcheck check[static 1], mp_subcheck);
+
+void mp_add_perfdata_to_subcheck(mp_subcheck check[static 1], mp_perfdata);
+
+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;
+} parsed_output_format;
+parsed_output_format mp_parse_output_format(char *format_string);
+
+// TODO free and stuff
+// void mp_cleanup_check(mp_check check[static 1]);
+
+char *mp_fmt_output(mp_check);
+
+void mp_print_output(mp_check);
+
+/*
+ * ==================
+ * Exit functionality
+ * ==================
+ */
+
+void mp_exit(mp_check) __attribute__((noreturn));
diff --git a/lib/parse_ini.c b/lib/parse_ini.c
index 09c0dc4f..1289aae2 100644
--- a/lib/parse_ini.c
+++ b/lib/parse_ini.c
@@ -1,25 +1,25 @@
 /*****************************************************************************
-*
-* Monitoring Plugins parse_ini library
-*
-* License: GPL
-* Copyright (c) 2007 Monitoring Plugins Development Team
-*
-* 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 parse_ini library
+ *
+ * License: GPL
+ * Copyright (c) 2007 - 2024 Monitoring Plugins Development Team
+ *
+ * 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 "idpriv.h"
@@ -40,31 +40,20 @@ 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)); } while((c)!=EOF && (c)!=(n))
+#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);
@@ -81,9 +70,7 @@ static char *default_file_in_path(void);
  *      [stanza][@filename]
  * into its separate parts.
  */
-static void
-parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
-{
+static void parse_locator(const char *locator, const char *def_stanza, np_ini_info *i) {
         size_t locator_len = 0, stanza_len = 0;
 
         /* if locator is NULL we'll use default values */
@@ -96,7 +83,7 @@ parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
                 i->stanza = malloc(sizeof(char) * (stanza_len + 1));
                 strncpy(i->stanza, locator, stanza_len);
                 i->stanza[stanza_len] = '\0';
-        } else  {/* otherwise we use the default stanza */
+        } else { /* otherwise we use the default stanza */
                 i->stanza = strdup(def_stanza);
         }
 
@@ -105,7 +92,7 @@ parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
 
         /* check whether there's an @file part */
         if (stanza_len == locator_len) {
-            i->file = default_file();
+                i->file = default_file();
                 i->file_string_on_heap = false;
         } else {
                 i->file = strdup(&(locator[stanza_len + 1]));
@@ -113,35 +100,28 @@ parse_locator(const char *locator, const char *def_stanza, np_ini_info *i)
         }
 
         if (i->file == NULL || i->file[0] == '\0')
-                die(STATE_UNKNOWN,
-                    _("Cannot find config file in any standard location.\n"));
+                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)
-{
+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)
-                die(STATE_UNKNOWN, _("Cannot drop privileges: %s\n"),
-                    strerror(errno));
+                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");
 
         if (inifile == NULL)
-                die(STATE_UNKNOWN, _("Can't read config file: %s\n"),
-                    strerror(errno));
+                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);
+                die(STATE_UNKNOWN, _("Invalid section '%s' in config file '%s'\n"), i.stanza, i.file);
 
         if (i.file_string_on_heap) {
                 free(i.file);
@@ -151,8 +131,7 @@ np_get_defaults(const char *locator, const char *default_section)
                 fclose(inifile);
         free(i.stanza);
         if (is_suid_plugin && idpriv_temp_restore() == -1)
-                die(STATE_UNKNOWN, _("Cannot restore privileges: %s\n"),
-                    strerror(errno));
+                die(STATE_UNKNOWN, _("Cannot restore privileges: %s\n"), strerror(errno));
 
         return defaults;
 }
@@ -164,13 +143,15 @@ 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)
-{
+static int read_defaults(FILE *f, const char *stanza, np_arg_list **opts) {
         int c = 0;
         bool status = false;
         size_t i, stanza_len;
-        enum { NOSTANZA, WRONGSTANZA, RIGHTSTANZA } stanzastate = NOSTANZA;
+        enum {
+                NOSTANZA,
+                WRONGSTANZA,
+                RIGHTSTANZA
+        } stanzastate = NOSTANZA;
 
         stanza_len = strlen(stanza);
 
@@ -217,8 +198,7 @@ read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
                                  * we're dealing with a config error
                                  */
                         case NOSTANZA:
-                                die(STATE_UNKNOWN, "%s\n",
-                                    _("Config file error"));
+                                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');
@@ -227,8 +207,7 @@ read_defaults(FILE *f, const char *stanza, np_arg_list **opts)
                         case RIGHTSTANZA:
                                 ungetc(c, f);
                                 if (add_option(f, opts)) {
-                                        die(STATE_UNKNOWN, "%s\n",
-                                            _("Config file error"));
+                                        die(STATE_UNKNOWN, "%s\n", _("Config file error"));
                                 }
                                 status = true;
                                 break;
@@ -246,9 +225,7 @@ 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)
-{
+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;
@@ -295,8 +272,7 @@ add_option(FILE *f, np_arg_list **optlst)
         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++)
+        for (valptr = eqptr + 1; valptr < lineend && isspace(*valptr); valptr++)
                 continue;
         /* continue to the end of value */
         for (valend = valptr; valend < lineend; valend++)
@@ -365,13 +341,10 @@ add_option(FILE *f, np_arg_list **optlst)
         return 0;
 }
 
-static char *
-default_file(void)
-{
-        char  *ini_file;
+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;
         }
 
@@ -383,9 +356,7 @@ default_file(void)
         return NULL;
 }
 
-static char *
-default_file_in_path(void)
-{
+static char *default_file_in_path(void) {
         char *config_path, **file;
         char *dir, *ini_file, *tokens;
 
diff --git a/lib/parse_ini.h b/lib/parse_ini.h
index e37601b5..d17409e3 100644
--- a/lib/parse_ini.h
+++ b/lib/parse_ini.h
@@ -19,4 +19,3 @@ typedef struct np_arg_el {
 np_arg_list *np_get_defaults(const char *locator, const char *default_section);
 
 #endif /* _PARSE_INI_H_ */
-
diff --git a/lib/perfdata.c b/lib/perfdata.c
new file mode 100644
index 00000000..b87de7e0
--- /dev/null
+++ b/lib/perfdata.c
@@ -0,0 +1,605 @@
+#include "./perfdata.h"
+#include "../plugins/common.h"
+#include "../plugins/utils.h"
+#include "utils_base.h"
+
+#include <assert.h>
+#include <limits.h>
+#include <stdlib.h>
+
+char *pd_value_to_string(const mp_perfdata_value pd) {
+        char *result = NULL;
+
+        assert(pd.type != PD_TYPE_NONE);
+
+        switch (pd.type) {
+        case PD_TYPE_INT:
+                asprintf(&result, "%lli", pd.pd_int);
+                break;
+        case PD_TYPE_UINT:
+                asprintf(&result, "%llu", pd.pd_int);
+                break;
+        case PD_TYPE_DOUBLE:
+                asprintf(&result, "%f", pd.pd_double);
+                break;
+        default:
+                // die here
+                die(STATE_UNKNOWN, "Invalid mp_perfdata mode\n");
+        }
+
+        return result;
+}
+
+char *pd_to_string(mp_perfdata pd) {
+        assert(pd.label != NULL);
+        char *result = NULL;
+        asprintf(&result, "'%s'=", pd.label);
+
+        asprintf(&result, "%s%s", result, pd_value_to_string(pd.value));
+
+        if (pd.uom != NULL) {
+                asprintf(&result, "%s%s", result, pd.uom);
+        }
+
+        if (pd.warn_present) {
+                asprintf(&result, "%s;%s", result, mp_range_to_string(pd.warn));
+        } else {
+                asprintf(&result, "%s;", result);
+        }
+
+        if (pd.crit_present) {
+                asprintf(&result, "%s;%s", result, mp_range_to_string(pd.crit));
+        } else {
+                asprintf(&result, "%s;", result);
+        }
+        if (pd.min_present) {
+                asprintf(&result, "%s;%s", result, pd_value_to_string(pd.min));
+        } else {
+                asprintf(&result, "%s;", result);
+        }
+
+        if (pd.max_present) {
+                asprintf(&result, "%s;%s", result, pd_value_to_string(pd.max));
+        }
+
+        /*printf("pd_to_string: %s\n", result); */
+
+        return result;
+}
+
+char *pd_list_to_string(const pd_list pd) {
+        char *result = pd_to_string(pd.data);
+
+        for (pd_list *elem = pd.next; elem != NULL; elem = elem->next) {
+                asprintf(&result, "%s %s", result, pd_to_string(elem->data));
+        }
+
+        return result;
+}
+
+mp_perfdata perfdata_init() {
+        mp_perfdata pd = {};
+        return pd;
+}
+
+pd_list *pd_list_init() {
+        pd_list *tmp = (pd_list *)calloc(1, sizeof(pd_list));
+        if (tmp == NULL) {
+                die(STATE_UNKNOWN, "calloc failed\n");
+        }
+        tmp->next = NULL;
+        return tmp;
+}
+
+mp_range mp_range_init() {
+        mp_range result = {
+                .alert_on_inside_range = OUTSIDE,
+                .start = {},
+                .start_infinity = true,
+                .end = {},
+                .end_infinity = true,
+        };
+
+        return result;
+}
+
+mp_range mp_range_set_start(mp_range input, mp_perfdata_value perf_val) {
+        input.start = perf_val;
+        input.start_infinity = false;
+        return input;
+}
+
+mp_range mp_range_set_end(mp_range input, mp_perfdata_value perf_val) {
+        input.end = perf_val;
+        input.end_infinity = false;
+        return input;
+}
+
+void pd_list_append(pd_list pdl[1], const mp_perfdata pd) {
+        assert(pdl != NULL);
+
+        if (pdl->data.value.type == PD_TYPE_NONE) {
+                // first entry is still empty
+                pdl->data = pd;
+        } else {
+                // find last element in the list
+                pd_list *curr = pdl;
+                pd_list *next = pdl->next;
+
+                while (next != NULL) {
+                        curr = next;
+                        next = next->next;
+                }
+
+                if (curr->data.value.type == PD_TYPE_NONE) {
+                        // still empty
+                        curr->data = pd;
+                } else {
+                        // new a new one
+                        curr->next = pd_list_init();
+                        curr->next->data = pd;
+                }
+        }
+}
+
+void pd_list_free(pd_list pdl[1]) {
+        while (pdl != NULL) {
+                pd_list *old = pdl;
+                pdl = pdl->next;
+                free(old);
+        }
+}
+
+/*
+ * returns -1 if a < b, 0 if a == b, 1 if a > b
+ */
+int cmp_perfdata_value(const mp_perfdata_value a, const mp_perfdata_value b) {
+        // Test if types are different
+        if (a.type == b.type) {
+
+                switch (a.type) {
+                case PD_TYPE_UINT:
+                        if (a.pd_uint < b.pd_uint) {
+                                return -1;
+                        } else if (a.pd_uint == b.pd_uint) {
+                                return 0;
+                        } else {
+                                return 1;
+                        }
+                        break;
+                case PD_TYPE_INT:
+                        if (a.pd_int < b.pd_int) {
+                                return -1;
+                        } else if (a.pd_int == b.pd_int) {
+                                return 0;
+                        } else {
+                                return 1;
+                        }
+                        break;
+                case PD_TYPE_DOUBLE:
+                        if (a.pd_int < b.pd_int) {
+                                return -1;
+                        } else if (a.pd_int == b.pd_int) {
+                                return 0;
+                        } else {
+                                return 1;
+                        }
+                        break;
+                default:
+                        die(STATE_UNKNOWN, "Error in %s line: %d!", __FILE__, __LINE__);
+                }
+        }
+
+        // Get dirty here
+        long double floating_a = 0;
+
+        switch (a.type) {
+        case PD_TYPE_UINT:
+                floating_a = a.pd_uint;
+                break;
+        case PD_TYPE_INT:
+                floating_a = a.pd_int;
+                break;
+        case PD_TYPE_DOUBLE:
+                floating_a = a.pd_double;
+                break;
+        default:
+                die(STATE_UNKNOWN, "Error in %s line: %d!", __FILE__, __LINE__);
+        }
+
+        long double floating_b = 0;
+        switch (b.type) {
+        case PD_TYPE_UINT:
+                floating_b = b.pd_uint;
+                break;
+        case PD_TYPE_INT:
+                floating_b = b.pd_int;
+                break;
+        case PD_TYPE_DOUBLE:
+                floating_b = b.pd_double;
+                break;
+        default:
+                die(STATE_UNKNOWN, "Error in %s line: %d!", __FILE__, __LINE__);
+        }
+
+        if (floating_a < floating_b) {
+                return -1;
+        }
+        if (floating_a == floating_b) {
+                return 0;
+        }
+        return 1;
+}
+
+char *mp_range_to_string(const mp_range input) {
+        char *result = "";
+        if (input.alert_on_inside_range == INSIDE) {
+                asprintf(&result, "@");
+        }
+
+        if (input.start_infinity) {
+                asprintf(&result, "%s~:", result);
+        } else {
+                asprintf(&result, "%s%s:", result, pd_value_to_string(input.start));
+        }
+
+        if (!input.end_infinity) {
+                asprintf(&result, "%s%s", result, pd_value_to_string(input.end));
+        }
+        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_double(mp_perfdata pd, double value) {
+        pd.value.pd_double = value;
+        pd.value.type = PD_TYPE_DOUBLE;
+        return pd;
+}
+
+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_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_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);
+}
+
+mp_perfdata mp_set_pd_value_long_long(mp_perfdata pd, long long value) {
+        pd.value.pd_int = value;
+        pd.value.type = PD_TYPE_INT;
+        return pd;
+}
+
+mp_perfdata mp_set_pd_value_u_long_long(mp_perfdata pd, unsigned long long value) {
+        pd.value.pd_uint = value;
+        pd.value.type = PD_TYPE_UINT;
+        return pd;
+}
+
+mp_perfdata_value mp_create_pd_value_double(double value) {
+        mp_perfdata_value res = {0};
+        res.type = PD_TYPE_DOUBLE;
+        res.pd_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_char(char value) { return mp_create_pd_value_long_long((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_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};
+        res.type = PD_TYPE_INT;
+        res.pd_int = value;
+        return res;
+}
+
+mp_perfdata_value mp_create_pd_value_u_long_long(unsigned long long value) {
+        mp_perfdata_value res = {0};
+        res.type = PD_TYPE_UINT;
+        res.pd_uint = value;
+        return res;
+}
+
+char *fmt_range(range foo) { return foo.text; }
+
+typedef struct integer_parser_wrapper {
+        int error;
+        mp_perfdata_value value;
+} integer_parser_wrapper;
+
+typedef struct double_parser_wrapper {
+        int error;
+        mp_perfdata_value value;
+} double_parser_wrapper;
+
+typedef struct perfdata_value_parser_wrapper {
+        int error;
+        mp_perfdata_value value;
+} perfdata_value_parser_wrapper;
+
+double_parser_wrapper parse_double(const char *input);
+integer_parser_wrapper parse_integer(const char *input);
+perfdata_value_parser_wrapper parse_pd_value(const char *input);
+
+mp_range_parsed mp_parse_range_string(const char *input) {
+        if (input == NULL) {
+                mp_range_parsed result = {
+                        .error = MP_RANGE_PARSING_FAILURE,
+                };
+                return result;
+        }
+
+        if (strlen(input) == 0) {
+                mp_range_parsed result = {
+                        .error = MP_RANGE_PARSING_FAILURE,
+                };
+                return result;
+        }
+
+        mp_range_parsed result = {
+                .range = mp_range_init(),
+                .error = MP_PARSING_SUCCES,
+        };
+
+        if (input[0] == '@') {
+                // found an '@' at beginning, so invert the range logic
+                result.range.alert_on_inside_range = INSIDE;
+
+                // advance the pointer one symbol
+                input++;
+        }
+
+        char *working_copy = strdup(input);
+        input = working_copy;
+
+        char *separator = index(working_copy, ':');
+        if (separator != NULL) {
+                // Found a separator
+                // set the separator to 0, so we have two different strings
+                *separator = '\0';
+
+                if (input[0] == '~') {
+                        // the beginning starts with '~', so it might be infinity
+                        if (&input[1] != separator) {
+                                // the next symbol after '~' is not the separator!
+                                // so input is probably wrong
+                                result.error = MP_RANGE_PARSING_FAILURE;
+                                free(working_copy);
+                                return result;
+                        }
+
+                        result.range.start_infinity = true;
+                } else {
+                        // No '~' at the beginning, so this should be a number
+                        result.range.start_infinity = false;
+                        perfdata_value_parser_wrapper parsed_pd = parse_pd_value(input);
+
+                        if (parsed_pd.error != MP_PARSING_SUCCES) {
+                                result.error = parsed_pd.error;
+                                free(working_copy);
+                                return result;
+                        }
+
+                        result.range.start = parsed_pd.value;
+                        result.range.start_infinity = false;
+                }
+                // got the first part now
+                // advance the pointer
+                input = separator + 1;
+        }
+
+        // End part or no separator
+        if (input[0] == '\0') {
+                // the end is infinite
+                result.range.end_infinity = true;
+        } else {
+                perfdata_value_parser_wrapper parsed_pd = parse_pd_value(input);
+
+                if (parsed_pd.error != MP_PARSING_SUCCES) {
+                        result.error = parsed_pd.error;
+                        return result;
+                }
+                result.range.end = parsed_pd.value;
+                result.range.end_infinity = false;
+        }
+        free(working_copy);
+        return result;
+}
+
+double_parser_wrapper parse_double(const char *input) {
+        double_parser_wrapper result = {
+                .error = MP_PARSING_SUCCES,
+        };
+
+        if (input == NULL) {
+                result.error = MP_PARSING_FAILURE;
+                return result;
+        }
+
+        char *endptr = NULL;
+        errno = 0;
+        double tmp = strtod(input, &endptr);
+
+        if (input == endptr) {
+                // man 3 strtod says, no conversion performed
+                result.error = MP_PARSING_FAILURE;
+                return result;
+        }
+
+        if (errno) {
+                // some other error
+                // TODO maybe differentiate a little bit
+                result.error = MP_PARSING_FAILURE;
+                return result;
+        }
+
+        result.value = mp_create_pd_value(tmp);
+        return result;
+}
+
+integer_parser_wrapper parse_integer(const char *input) {
+        integer_parser_wrapper result = {
+                .error = MP_PARSING_SUCCES,
+        };
+
+        if (input == NULL) {
+                result.error = MP_PARSING_FAILURE;
+                return result;
+        }
+
+        char *endptr = NULL;
+        errno = 0;
+        long long tmp = strtoll(input, &endptr, 0);
+
+        // validating *sigh*
+        if (*endptr != '\0') {
+                // something went wrong in strtoll
+                if (tmp == LLONG_MIN) {
+                        // underflow
+                        result.error = MP_RANGE_PARSING_UNDERFLOW;
+                        return result;
+                }
+
+                if (tmp == LLONG_MAX) {
+                        // overflow
+                        result.error = MP_RANGE_PARSING_OVERFLOW;
+                        return result;
+                }
+
+                // still wrong, but not sure why, probably invalid characters
+                if (errno == EINVAL) {
+                        result.error = MP_RANGE_PARSING_INVALID_CHAR;
+                        return result;
+                }
+
+                // some other error, do catch all here
+                result.error = MP_RANGE_PARSING_FAILURE;
+                return result;
+        }
+
+        // no error, should be fine
+        result.value = mp_create_pd_value(tmp);
+        return result;
+}
+
+perfdata_value_parser_wrapper parse_pd_value(const char *input) {
+        // try integer first
+        integer_parser_wrapper tmp_int = parse_integer(input);
+
+        if (tmp_int.error == MP_PARSING_SUCCES) {
+                perfdata_value_parser_wrapper result = {
+                        .error = tmp_int.error,
+                        .value = tmp_int.value,
+                };
+                return result;
+        }
+
+        double_parser_wrapper tmp_double = parse_double(input);
+        perfdata_value_parser_wrapper result = {};
+        if (tmp_double.error == MP_PARSING_SUCCES) {
+                result.error = tmp_double.error;
+                result.value = tmp_double.value;
+        } else {
+                result.error = tmp_double.error;
+        }
+        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
new file mode 100644
index 00000000..7fd908a9
--- /dev/null
+++ b/lib/perfdata.h
@@ -0,0 +1,219 @@
+#pragma once
+
+#include "../config.h"
+
+#include <inttypes.h>
+#include <stdbool.h>
+
+// Enum for the specific type of a perfdata_value
+typedef enum pd_value_type {
+        PD_TYPE_NONE = 0,
+        PD_TYPE_INT,
+        PD_TYPE_UINT,
+        PD_TYPE_DOUBLE
+} pd_value_type;
+
+typedef struct {
+        enum pd_value_type type;
+        union {
+                long long pd_int;
+                unsigned long long pd_uint;
+                double pd_double;
+        };
+} mp_perfdata_value;
+
+#define MP_OUTSIDE false
+#define MP_INSIDE  true
+
+/*
+ * New range type with generic numerical values
+ */
+typedef struct mp_range_struct {
+        mp_perfdata_value start;
+        bool start_infinity; /* false (default) or true */
+
+        mp_perfdata_value end;
+        bool end_infinity;
+
+        bool alert_on_inside_range; /* OUTSIDE (default) or INSIDE */
+} mp_range;
+
+/*
+ * Old range type with floating point values
+ */
+typedef struct range_struct {
+        double start;
+        bool start_infinity;
+        double end;
+        int end_infinity;
+        int alert_on; /* OUTSIDE (default) or INSIDE */
+        char *text;   /* original unparsed text input */
+} range;
+
+/*
+ * Perfdata type for storing perfdata output
+ */
+typedef struct perfdata_struct {
+        char *label;
+        char *uom;
+        mp_perfdata_value value;
+
+        bool warn_present;
+        mp_range warn;
+
+        bool crit_present;
+        mp_range crit;
+
+        bool min_present;
+        mp_perfdata_value min;
+
+        bool max_present;
+        mp_perfdata_value max;
+} mp_perfdata;
+
+/*
+ * List of mp_perfdata values
+ */
+typedef struct pd_list_struct {
+        mp_perfdata data;
+        struct pd_list_struct *next;
+} pd_list;
+
+/*
+ * ============
+ * Initializers
+ * ============
+ */
+/*
+ * Initialize mp_perfdata value. Always use this to generate a new one
+ */
+mp_perfdata perfdata_init(void);
+
+/*
+ * Initialize pd_list value. Always use this to generate a new one
+ */
+pd_list *pd_list_init(void);
+
+/*
+ * Initialize a new mp_range value, with unset values (start and end are infinite
+ */
+mp_range mp_range_init(void);
+
+/*
+ * Worker functions
+ */
+
+mp_range mp_range_set_start(mp_range, mp_perfdata_value);
+mp_range mp_range_set_end(mp_range, mp_perfdata_value);
+
+/*
+ * Parsing a range from a string
+ */
+
+typedef enum {
+        MP_PARSING_SUCCES = 0,
+        MP_PARSING_FAILURE,
+        MP_RANGE_PARSING_FAILURE,
+        MP_RANGE_PARSING_UNDERFLOW,
+        MP_RANGE_PARSING_OVERFLOW,
+        MP_RANGE_PARSING_INVALID_CHAR,
+} mp_range_parser_error;
+
+typedef struct mp_range_parsed {
+        mp_range_parser_error error;
+        mp_range range;
+} mp_range_parsed;
+
+mp_range_parsed mp_parse_range_string(const char * /*input*/);
+
+/*
+ * Appends a mp_perfdata value to a pd_list
+ */
+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,                                                                                              \
+                unsigned long long: mp_set_pd_value_u_long_long)(P, V)
+
+mp_perfdata mp_set_pd_value_float(mp_perfdata, float);
+mp_perfdata mp_set_pd_value_double(mp_perfdata, double);
+mp_perfdata mp_set_pd_value_int(mp_perfdata, int);
+mp_perfdata mp_set_pd_value_u_int(mp_perfdata, unsigned int);
+mp_perfdata mp_set_pd_value_long(mp_perfdata, long);
+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,                                                                                                 \
+                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);
+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
+ */
+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
+// =================
+/*
+ * Generate string from mp_perfdata value
+ */
+char *pd_to_string(mp_perfdata);
+
+/*
+ * Generate string from perfdata_value value
+ */
+char *pd_value_to_string(mp_perfdata_value);
+
+/*
+ * Generate string from pd_list value for the final output
+ */
+char *pd_list_to_string(pd_list);
+
+/*
+ * Generate string from a mp_range value
+ */
+char *mp_range_to_string(mp_range);
+char *fmt_range(range);
diff --git a/lib/states.h b/lib/states.h
new file mode 100644
index 00000000..4a170caa
--- /dev/null
+++ b/lib/states.h
@@ -0,0 +1,71 @@
+#ifndef _MP_STATES_
+#define _MP_STATES_
+
+#include "../config.h"
+#include <sys/param.h>
+
+typedef enum state_enum {
+        STATE_OK,
+        STATE_WARNING,
+        STATE_CRITICAL,
+        STATE_UNKNOWN,
+        STATE_DEPENDENT
+} mp_state_enum;
+
+/* **************************************************************************
+ * max_state(STATE_x, STATE_y)
+ * compares STATE_x to  STATE_y and returns result based on the following
+ * STATE_UNKNOWN < STATE_OK < STATE_WARNING < STATE_CRITICAL
+ *
+ * Note that numerically the above does not hold
+ ****************************************************************************/
+
+static inline mp_state_enum max_state(mp_state_enum a, mp_state_enum b) {
+        if (a == STATE_CRITICAL || b == STATE_CRITICAL) {
+                return STATE_CRITICAL;
+        }
+        if (a == STATE_WARNING || b == STATE_WARNING) {
+                return STATE_WARNING;
+        }
+        if (a == STATE_OK || b == STATE_OK) {
+                return STATE_OK;
+        }
+        if (a == STATE_UNKNOWN || b == STATE_UNKNOWN) {
+                return STATE_UNKNOWN;
+        }
+        if (a == STATE_DEPENDENT || b == STATE_DEPENDENT) {
+                return STATE_DEPENDENT;
+        }
+        return MAX(a, b);
+}
+
+/* **************************************************************************
+ * max_state_alt(STATE_x, STATE_y)
+ * compares STATE_x to  STATE_y and returns result based on the following
+ * STATE_OK < STATE_DEPENDENT < STATE_UNKNOWN < STATE_WARNING < STATE_CRITICAL
+ *
+ * The main difference between max_state_alt and max_state it that it doesn't
+ * allow setting a default to UNKNOWN. It will instead prioritixe any valid
+ * non-OK state.
+ ****************************************************************************/
+
+static inline mp_state_enum max_state_alt(mp_state_enum a, mp_state_enum b) {
+        if (a == STATE_CRITICAL || b == STATE_CRITICAL) {
+                return STATE_CRITICAL;
+        }
+        if (a == STATE_WARNING || b == STATE_WARNING) {
+                return STATE_WARNING;
+        }
+        if (a == STATE_UNKNOWN || b == STATE_UNKNOWN) {
+                return STATE_UNKNOWN;
+        }
+        if (a == STATE_DEPENDENT || b == STATE_DEPENDENT) {
+                return STATE_DEPENDENT;
+        }
+        if (a == STATE_OK || b == STATE_OK) {
+                return STATE_OK;
+        }
+        return MAX(a, b);
+}
+
+#endif
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 31d79df6..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
+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
+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
+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 05dd7943..94cb5aa9 100644
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
@@ -1,29 +1,27 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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 "gl/base64.h"
 #include "tap.h"
 
-int
-main (int argc, char **argv)
-{
-#if 0  /* The current base64 function doesn't work on 8bit data */
+int main(int argc, char **argv) {
+#if 0 /* The current base64 function doesn't work on 8bit data */
         char random[1024] = {
         0x8b,0xb0,0xc4,0xe2,0xfc,0x22,0x9f,0x0d,0x85,0xe7,0x2c,0xaa,0x39,0xa1,0x46,0x88,
         0x50,0xe6,0x34,0x37,0x0b,0x45,0x4b,0xb8,0xb2,0x86,0x7a,0x3e,0x7f,0x0c,0x40,0x18,
@@ -182,168 +180,124 @@ 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
-        };
-  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
-        };
+                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};
         char *b64_test;
 
         plan_tests(1);
 
-        base64_encode_alloc (random, 1024, &b64_test);
+        base64_encode_alloc(random, 1024, &b64_test);
 
-        ok(strcmp(b64_known, b64_test) == 0,
-           "Test matching a base64 encoded 1024 bytes random string");
+        ok(strcmp(b64_known, b64_test) == 0, "Test matching a base64 encoded 1024 bytes random string");
 
         return exit_status();
 }
-
diff --git a/lib/tests/test_cmd.c b/lib/tests/test_cmd.c
index 02ae11f5..c8867dfb 100644
--- a/lib/tests/test_cmd.c
+++ b/lib/tests/test_cmd.c
@@ -1,20 +1,20 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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_cmd.h"
@@ -22,27 +22,23 @@
 #include "tap.h"
 
 #define COMMAND_LINE 1024
-#define UNSET 65530
+#define UNSET        65530
 
-char *
-get_command (char *const *line)
-{
+char *get_command(char *const *line) {
         char *cmd;
         int i = 0;
 
-        asprintf (&cmd, " %s", line[i++]);
+        asprintf(&cmd, " %s", line[i++]);
         while (line[i] != NULL) {
-                asprintf (&cmd, "%s %s", cmd, line[i]);
+                asprintf(&cmd, "%s %s", cmd, line[i]);
                 i++;
         }
 
         return cmd;
 }
 
-int
-main (int argc, char **argv)
-{
-        char **command_line = malloc (sizeof (char *) * COMMAND_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;
@@ -51,183 +47,154 @@ main (int argc, char **argv)
 
         plan_tests(51);
 
-        diag ("Running plain echo command, set one");
+        diag("Running plain echo command, set one");
 
         /* ensure everything is empty before we begin */
-        memset (&chld_out, 0, sizeof (output));
-        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");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
-
-        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);
-
-        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 (result == 0, "(array) Checking exit code");
+        memset(&chld_out, 0, sizeof(output));
+        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");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
+
+        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);
+
+        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(result == 0, "(array) Checking exit code");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
-        result = cmd_run (command, &chld_out, &chld_err, 0);
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
-        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 (result == 0, "(string) Checking exit code");
+        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(result == 0, "(string) Checking exit code");
 
-        diag ("Running plain echo command, set two");
+        diag("Running plain echo command, set two");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
-        command_line[0] = strdup ("/bin/echo");
-        command_line[1] = strdup ("this is test two");
+        command_line[0] = strdup("/bin/echo");
+        command_line[1] = strdup("this is test two");
         command_line[2] = NULL;
         command_line[3] = NULL;
         command_line[4] = NULL;
 
-        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 (result == 0, "(array) Checking exit code");
+        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(result == 0, "(array) Checking exit code");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
-
-        result = cmd_run (command, &chld_out, &chld_err, 0);
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
-        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 (result == 0, "(string) Checking exit code");
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
+        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(result == 0, "(string) Checking exit code");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        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 */
         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");
 
-        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,
-                        "(array) Check line 3 for expected stdout output");
-        ok (result == 0, "(array) Checking exit code");
-
-
+        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,
+           "(array) Check line 3 for expected stdout output");
+        ok(result == 0, "(array) Checking exit code");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
-        ok (chld_out.lines == 0, "(initialised) Checking stdout is reset");
-        ok (chld_err.lines == 0, "(initialised) Checking stderr is reset");
-        ok (result == UNSET, "(initialised) Checking exit code is reset");
+        ok(chld_out.lines == 0, "(initialised) Checking stdout is reset");
+        ok(chld_err.lines == 0, "(initialised) Checking stderr is reset");
+        ok(result == UNSET, "(initialised) Checking exit code is reset");
 
         command = (char *)malloc(COMMAND_LINE);
         strcpy(command, "/bin/echo3456 non-existent command");
-        result = cmd_run (command, &chld_out, &chld_err, 0);
-
-        ok (chld_out.lines == 0,
-                        "Non existent command, so no output");
-        ok (chld_err.lines == 0,
-                        "No stderr either");
-        ok (result == 3, "Get return code 3 (?) for non-existent command");
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
+        ok(chld_out.lines == 0, "Non existent command, so no output");
+        ok(chld_err.lines == 0, "No stderr either");
+        ok(result == 3, "Get return code 3 (?) for non-existent command");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
         strcpy(command, "/bin/sh non-existent-file");
-        result = cmd_run (command, &chld_out, &chld_err, 0);
-
-        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 (result != 0, "Get non-zero return code from /bin/sh");
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
+        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(result != 0, "Get non-zero return code from /bin/sh");
 
         /* ensure everything is empty again */
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
-  strcpy(command, "/bin/sh -c 'exit 7'");
-  result = cmd_run (command, NULL, NULL, 0);
-
-  ok (result == 7, "Get return code 7 from /bin/sh");
+        strcpy(command, "/bin/sh -c 'exit 7'");
+        result = cmd_run(command, NULL, NULL, 0);
 
+        ok(result == 7, "Get return code 7 from /bin/sh");
 
         /* ensure everything is empty again */
-        memset (&chld_out, 0, sizeof (output));
-        memset (&chld_err, 0, sizeof (output));
+        memset(&chld_out, 0, sizeof(output));
+        memset(&chld_err, 0, sizeof(output));
         result = UNSET;
 
         command = (char *)malloc(COMMAND_LINE);
         strcpy(command, "/bin/non-existent-command");
-        result = cmd_run (command, &chld_out, &chld_err, 0);
-
-        ok (chld_out.lines == 0,
-                        "/bin/non-existent-command returns no stdout...");
-        ok (chld_err.lines == 0,
-                        "...and no stderr output either");
-        ok (result == 3, "Get return code 3 = UNKNOWN when command does not exist");
+        result = cmd_run(command, &chld_out, &chld_err, 0);
 
+        ok(chld_out.lines == 0, "/bin/non-existent-command returns no stdout...");
+        ok(chld_err.lines == 0, "...and no stderr output either");
+        ok(result == 3, "Get return code 3 = UNKNOWN when command does not exist");
 
-        return exit_status ();
+        return exit_status();
 }
diff --git a/lib/tests/test_disk.c b/lib/tests/test_disk.c
deleted file mode 100644
index e283fe2e..00000000
--- a/lib/tests/test_disk.c
+++ /dev/null
@@ -1,224 +0,0 @@
-/*****************************************************************************
-*
-* 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 "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);
-
-
-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);
-
-        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");
-        ok( np_find_name(exclude_filesystem, "/home") == false, "/home not in list");
-        np_add_name(&exclude_filesystem, "/home");
-        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");
-
-        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");
-
-        ok( np_find_name(exclude_filesystem, "iso9660") == false, "Make sure no clashing in variables");
-
-        /*
-        for (temp_name = exclude_filesystem; temp_name; temp_name = temp_name->next) {
-                printf("Name: %s\n", temp_name->name);
-        }
-        */
-
-        me = (struct mount_entry *) malloc(sizeof *me);
-        me->me_devname = strdup("/dev/c0t0d0s0");
-        me->me_mountdir = strdup("/");
-        *mtail = me;
-        mtail = &me->me_next;
-
-        me = (struct mount_entry *) malloc(sizeof *me);
-        me->me_devname = strdup("/dev/c1t0d1s0");
-        me->me_mountdir = strdup("/var");
-        *mtail = me;
-        mtail = &me->me_next;
-
-        me = (struct mount_entry *) malloc(sizeof *me);
-        me->me_devname = strdup("/dev/c2t0d0s0");
-        me->me_mountdir = strdup("/home");
-        *mtail = me;
-        mtail = &me->me_next;
-
-        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) {
-                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");
-                } 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");
-                } 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");
-                }
-        }
-
-        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");
-
-        np_set_best_match(paths, dummy_mount_list, true);
-        for (p = paths; p; p = p->name_next) {
-                if (! strcmp(p->name, "/home/groups")) {
-                        ok( ! p->best_match , "/home/groups correctly not found");
-                } else if (! strcmp(p->name, "/var")) {
-                        ok( p->best_match, "/var found");
-                } else if (! strcmp(p->name, "/tmp")) {
-                        ok(! p->best_match, "/tmp correctly not found");
-                } else if (! strcmp(p->name, "/home/tonvoon")) {
-                        ok(! p->best_match, "/home/tonvoon not found");
-                } else if (! strcmp(p->name, "/home")) {
-                        ok( p->best_match, "/home found");
-                }
-        }
-
-        /* 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;
-        }
-        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;
-                }
-        }
-
-        for (p = paths; p; p = p->name_next) {
-                if (! strcmp(p->name, "/tmp"))
-                        found = 1;
-                if (p->name_next)
-                        prev = p;
-                else
-                        last = p;
-        }
-        ok(found == 0, "/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;
-                last = p;
-                count++;
-        }
-        ok(found == 0, "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))
-                                matches++;
-                }
-                ok( matches == expect,
-                    "%s '%s' matched %i/3 entries. ok: %i/3",
-                    desc, regstr, expect, matches);
-
-        } else
-                ok ( false, "regex '%s' not compilable", regstr);
-}
-
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 b/lib/tests/test_generic_output
new file mode 100755
index 00000000..51e299a0
--- /dev/null
+++ b/lib/tests/test_generic_output
diff --git a/lib/tests/test_generic_output.c b/lib/tests/test_generic_output.c
new file mode 100644
index 00000000..e67aefc9
--- /dev/null
+++ b/lib/tests/test_generic_output.c
@@ -0,0 +1,315 @@
+#include "../lib/output.h"
+#include "../../tap/tap.h"
+#include "./states.h"
+
+#include <string.h>
+
+void test_one_subcheck(void);
+void test_two_subchecks(void);
+
+void test_perfdata_formatting(void);
+void test_perfdata_formatting2(void);
+
+void test_deep_check_hierarchy(void);
+void test_deep_check_hierarchy2(void);
+
+void test_default_states1(void);
+void test_default_states2(void);
+
+int main(void) {
+        plan_tests(19);
+
+        diag("Simple test with one subcheck");
+        test_one_subcheck();
+
+        diag("Test with two subchecks");
+        test_two_subchecks();
+
+        diag("Test for performance data formatting");
+        test_perfdata_formatting();
+
+        diag("Another test for performance data formatting");
+        test_perfdata_formatting2();
+
+        diag("Test for deeper hierarchies");
+        test_deep_check_hierarchy();
+
+        diag("Another test for deeper hierarchies");
+        test_deep_check_hierarchy2();
+
+        diag("Testing the default state logic");
+        test_default_states1();
+
+        diag("Testing the default state logic #2");
+        test_default_states2();
+
+        return exit_status();
+}
+
+void test_one_subcheck(void) {
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_check check = mp_check_init();
+        mp_add_subcheck_to_check(&check, sc1);
+
+        ok(mp_compute_check_state(check) == STATE_WARNING, "Main state should be warning");
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output");
+        // diag(output);
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n";
+
+        // diag("Expected output");
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Simple output test");
+}
+
+void test_perfdata_formatting2(void) {
+        mp_perfdata pd1 = perfdata_init();
+        mp_perfdata pd2 = perfdata_init();
+
+        pd1.label = "foo";
+        pd2.label = "bar";
+
+        pd1 = mp_set_pd_value(pd1, 23);
+        pd2 = mp_set_pd_value(pd2, 1LL);
+
+        pd_list *tmp = pd_list_init();
+
+        pd_list_append(tmp, pd1);
+        pd_list_append(tmp, pd2);
+
+        char *result = pd_list_to_string(*tmp);
+
+        ok(strcmp(result, "foo=23;;; bar=1;;;") == 0, "Perfdata string formatting");
+}
+
+void test_perfdata_formatting(void) {
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        char *pd_string = pd_to_string(pd1);
+
+        ok(strcmp(pd_string, "foo=23s;;;") == 0, "Perfdata string formatting");
+}
+
+void test_two_subchecks(void) {
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        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");
+
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        ok(mp_compute_subcheck_state(sc2) == STATE_OK, "Test subcheck 2 state after setting it");
+
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+
+        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);
+
+        ok(mp_compute_check_state(check) == STATE_WARNING, "Test main check result");
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output. Length: %u", strlen(output));
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "|foo=23s;;; \n";
+
+        // diag("Expected output. Length: %u", strlen(expected));
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_deep_check_hierarchy(void) {
+        // level 4
+        mp_subcheck sc4 = mp_subcheck_init();
+        sc4.output = "level4";
+        sc4 = mp_set_subcheck_state(sc4, STATE_OK);
+
+        // level 3
+        mp_subcheck sc3 = mp_subcheck_init();
+        sc3.output = "level3";
+        sc3 = mp_set_subcheck_state(sc3, STATE_OK);
+
+        // level 2
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        // level 1
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_perfdata pd1 = perfdata_init();
+
+        pd1.uom = "s";
+        pd1.label = "foo";
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        // main check
+        mp_check check = mp_check_init();
+
+        mp_add_subcheck_to_subcheck(&sc3, sc4);
+        mp_add_subcheck_to_subcheck(&sc2, sc3);
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+        mp_add_subcheck_to_check(&check, sc1);
+
+        char *output = mp_fmt_output(check);
+
+        size_t output_length = strlen(output);
+
+        // diag("Formatted output of length %i", output_length);
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "\t\t\t\\_[OK] - level3\n"
+                                          "\t\t\t\t\\_[OK] - level4\n"
+                                          "|foo=23s;;; \n";
+
+        size_t expected_length = strlen(expected);
+
+        // diag("Expected output of length: %i", expected_length);
+        // diag(expected);
+
+        ok(output_length == expected_length, "Outputs are of equal length");
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_deep_check_hierarchy2(void) {
+        // level 1
+        mp_subcheck sc1 = mp_subcheck_init();
+
+        sc1.output = "foobar";
+        sc1 = mp_set_subcheck_state(sc1, STATE_WARNING);
+
+        mp_perfdata pd1 = perfdata_init();
+        pd1.uom = "s";
+        pd1.label = "foo";
+        pd1 = mp_set_pd_value(pd1, 23);
+
+        mp_add_perfdata_to_subcheck(&sc1, pd1);
+
+        // level 2
+        mp_subcheck sc2 = mp_subcheck_init();
+        sc2.output = "baz";
+        sc2 = mp_set_subcheck_state(sc2, STATE_OK);
+
+        mp_perfdata pd2 = perfdata_init();
+        pd2.uom = "B";
+        pd2.label = "baz";
+        pd2 = mp_set_pd_value(pd2, 1024);
+        mp_add_perfdata_to_subcheck(&sc2, pd2);
+
+        // level 3
+        mp_subcheck sc3 = mp_subcheck_init();
+        sc3.output = "level3";
+        sc3 = mp_set_subcheck_state(sc3, STATE_OK);
+
+        mp_perfdata pd3 = perfdata_init();
+        pd3.label = "floatMe";
+        pd3 = mp_set_pd_value(pd3, 1024.1024);
+        mp_add_perfdata_to_subcheck(&sc3, pd3);
+
+        // level 4
+        mp_subcheck sc4 = mp_subcheck_init();
+        sc4.output = "level4";
+        sc4 = mp_set_subcheck_state(sc4, STATE_OK);
+
+        mp_check check = mp_check_init();
+
+        mp_add_subcheck_to_subcheck(&sc3, sc4);
+        mp_add_subcheck_to_subcheck(&sc2, sc3);
+        mp_add_subcheck_to_subcheck(&sc1, sc2);
+        mp_add_subcheck_to_check(&check, sc1);
+
+        char *output = mp_fmt_output(check);
+
+        // diag("Formatted output of length: %i", strlen(output));
+        // diag(output);
+
+        ok(output != NULL, "Output should not be NULL");
+
+        char expected[] = "[WARNING] - ok=0, warning=1, critical=0, unknown=0\n"
+                                          "\t\\_[WARNING] - foobar\n"
+                                          "\t\t\\_[OK] - baz\n"
+                                          "\t\t\t\\_[OK] - level3\n"
+                                          "\t\t\t\t\\_[OK] - level4\n"
+                                          "|foo=23s;;; baz=1024B;;; floatMe=1024.102400;;; \n";
+
+        // diag("Expected output of length: %i", strlen(expected));
+        // diag(expected);
+
+        ok(strcmp(output, expected) == 0, "Output is as expected");
+}
+
+void test_default_states1(void) {
+        mp_subcheck sc = mp_subcheck_init();
+
+        mp_state_enum state1 = mp_compute_subcheck_state(sc);
+        ok(state1 == STATE_UNKNOWN, "Default default state is Unknown");
+
+        sc = mp_set_subcheck_default_state(sc, STATE_CRITICAL);
+
+        mp_state_enum state2 = mp_compute_subcheck_state(sc);
+        ok(state2 == STATE_CRITICAL, "Default state is Critical");
+
+        sc = mp_set_subcheck_state(sc, STATE_OK);
+
+        mp_state_enum state3 = mp_compute_subcheck_state(sc);
+        ok(state3 == STATE_OK, "Default state is Critical");
+}
+
+void test_default_states2(void) {
+        mp_check check = mp_check_init();
+
+        mp_subcheck sc = mp_subcheck_init();
+        sc.output = "placeholder";
+        sc = mp_set_subcheck_default_state(sc, STATE_CRITICAL);
+
+        mp_add_subcheck_to_check(&check, sc);
+
+        mp_state_enum result_state = mp_compute_check_state(check);
+        ok(result_state == STATE_CRITICAL, "Derived state is the proper default state");
+}
diff --git a/lib/tests/test_generic_output.t b/lib/tests/test_generic_output.t
new file mode 100644
index 00000000..48c2ddf4
--- /dev/null
+++ b/lib/tests/test_generic_output.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_generic_output") {
+        plan skip_all => "./test_generic_output not compiled - please enable libtap library to test";
+}
+exec "./test_generic_output";
diff --git a/lib/tests/test_ini1.c b/lib/tests/test_ini1.c
index 6843bac2..246c1250 100644
--- a/lib/tests/test_ini1.c
+++ b/lib/tests/test_ini1.c
@@ -1,20 +1,20 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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_base.h"
@@ -29,81 +29,93 @@ void my_free(char *string) {
         }
 }
 
-char*
-list2str(np_arg_list *optlst)
-{
-        char *optstr=NULL;
+char *list2str(np_arg_list *optlst) {
+        char *optstr = NULL;
         np_arg_list *optltmp;
 
         /* Put everything as a space-separated string */
         asprintf(&optstr, "");
         while (optlst) {
                 asprintf(&optstr, "%s%s ", optstr, optlst->arg);
-                optltmp=optlst;
-                optlst=optlst->next;
+                optltmp = optlst;
+                optlst = optlst->next;
                 free(optltmp);
         }
         /* Strip last whitespace */
-        if (strlen(optstr)>1) optstr[strlen(optstr)-1]='\0';
+        if (strlen(optstr) > 1)
+                optstr[strlen(optstr) - 1] = '\0';
 
         return optstr;
 }
 
-int
-main (int argc, char **argv)
-{
-        char *optstr=NULL;
+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");
+        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");
+        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");
         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");
+        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");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk"));
-        ok( !strcmp(optstr, "--this=that"), "config-tiny.ini's filename as section name");
+        optstr = list2str(np_get_defaults("/path/to/file.txt@./config-tiny.ini", "check_disk"));
+        ok(!strcmp(optstr, "--this=that"), "config-tiny.ini's filename as section name");
         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");
+        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");
         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");
+        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");
         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");
+        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");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("check_mysql2@./plugin.ini", "check_disk"));
-        ok( !strcmp(optstr, "-u=admin -p=secret"), "plugin.ini's check_mysql2 as expected");
+        optstr = list2str(np_get_defaults("check_mysql2@./plugin.ini", "check_disk"));
+        ok(!strcmp(optstr, "-u=admin -p=secret"), "plugin.ini's check_mysql2 as expected");
         my_free(optstr);
 
-        optstr=list2str(np_get_defaults("check space_and_flags@./plugin.ini", "check_disk"));
-        ok( !strcmp(optstr, "--foo=bar -a -b --bar"), "plugin.ini space in stanza and flag arguments");
+        optstr = list2str(np_get_defaults("check space_and_flags@./plugin.ini", "check_disk"));
+        ok(!strcmp(optstr, "--foo=bar -a -b --bar"), "plugin.ini space in stanza and flag arguments");
         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");
+        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");
         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");
+        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");
         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 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"), "Long options");
+        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 "
+                                           "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"),
+           "Long options");
         my_free(optstr);
 
         return exit_status();
 }
-
diff --git a/lib/tests/test_ini3.c b/lib/tests/test_ini3.c
index 8a2a0414..2186e4bb 100644
--- a/lib/tests/test_ini3.c
+++ b/lib/tests/test_ini3.c
@@ -1,26 +1,24 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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 "parse_ini.h"
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
 
         /*
          * This is for testing arguments expected to die.
@@ -30,4 +28,3 @@ main (int argc, char **argv)
 
         return 0;
 }
-
diff --git a/lib/tests/test_opts1.c b/lib/tests/test_opts1.c
index 077c5b63..984183d3 100644
--- a/lib/tests/test_opts1.c
+++ b/lib/tests/test_opts1.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*****************************************************************************/
+ *
+ * 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_base.h"
@@ -40,23 +40,24 @@ 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;
-        printf ("    Arg(%i): ", *argc+1);
-        printf ("'%s' ", newargv[0]);
-        for (i=1; i<*argc; i++) {
-                printf ("'%s' ", newargv[i]);
+        int i, freeflag = 1;
+        printf("    Arg(%i): ", *argc + 1);
+        printf("'%s' ", newargv[0]);
+        for (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;
+                                freeflag = 0;
                         else
                                 free(newargv[i]);
                 }
         }
-        printf ("\n");
+        printf("\n");
         /* Free only if it's a different array */
-        if (newargv != argv) free(newargv);
-        *argc=0;
+        if (newargv != argv)
+                free(newargv);
+        *argc = 0;
 }
 #endif
 
@@ -67,9 +68,10 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
                 printf("    Argument count doesn't match!\n");
                 return 0;
         }
-        for (i=0; i<=i1; i++) {
-                if (a1[i]==NULL && a2[i]==NULL) continue;
-                if (a1[i]==NULL || a2[i]==NULL) {
+        for (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;
                 }
@@ -81,59 +83,58 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
         return 1;
 }
 
-int
-main (int argc, char **argv)
-{
-        char **argv_new=NULL;
+int main(int argc, char **argv) {
+        char **argv_new = NULL;
         int i, argc_test;
 
         plan_tests(5);
 
         {
-                char *argv_test[] = {"prog_name", (char *) NULL};
-                argc_test=1;
-                char *argv_known[] = {"prog_name", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", (char *)NULL};
+                argc_test = 1;
+                char *argv_known[] = {"prog_name", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 1, argv_known), "No opts, returns correct argv/argc");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
-                argc_test=5;
-                char *argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *)NULL};
+                argc_test = 5;
+                char *argv_known[] = {"prog_name", "arg1", "--arg2=val1", "--arg3", "val2", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 5, argv_known), "No extra opts, verbatim copy of argv");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                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};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                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};
+                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};
-                argc_test=4;
-                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");
+                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};
+                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};
-                argc_test=6;
-                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");
+                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};
+                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);
         }
 
         return exit_status();
 }
-
diff --git a/lib/tests/test_opts2.c b/lib/tests/test_opts2.c
index 780220ee..23496617 100644
--- a/lib/tests/test_opts2.c
+++ b/lib/tests/test_opts2.c
@@ -1,19 +1,19 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*****************************************************************************/
+ *
+ * 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_base.h"
@@ -23,23 +23,24 @@
 
 void my_free(int *argc, char **newargv, char **argv) {
         /* Free stuff (and print while we're at it) */
-        int i, freeflag=1;
-        printf ("    Arg(%i): ", *argc+1);
-        printf ("'%s' ", newargv[0]);
-        for (i=1; i<*argc; i++) {
-                printf ("'%s' ", newargv[i]);
+        int i, freeflag = 1;
+        printf("    Arg(%i): ", *argc + 1);
+        printf("'%s' ", newargv[0]);
+        for (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;
+                                freeflag = 0;
                         else
                                 free(newargv[i]);
                 }
         }
-        printf ("\n");
+        printf("\n");
         /* Free only if it's a different array */
-        if (newargv != argv) free(newargv);
-        *argc=0;
+        if (newargv != argv)
+                free(newargv);
+        *argc = 0;
 }
 
 int array_diff(int i1, char **a1, int i2, char **a2) {
@@ -49,9 +50,10 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
                 printf("    Argument count doesn't match!\n");
                 return 0;
         }
-        for (i=0; i<=i1; i++) {
-                if (a1[i]==NULL && a2[i]==NULL) continue;
-                if (a1[i]==NULL || a2[i]==NULL) {
+        for (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;
                 }
@@ -63,59 +65,77 @@ int array_diff(int i1, char **a1, int i2, char **a2) {
         return 1;
 }
 
-int
-main (int argc, char **argv)
-{
-        char **argv_new=NULL;
+int main(int argc, char **argv) {
+        char **argv_new = NULL;
         int i, argc_test;
 
         plan_tests(5);
 
         {
-                char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "--arg3", "val2", (char *) NULL};
-                argc_test=5;
-                char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "--arg3", "val2", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "--arg3", "val2", (char *)NULL};
+                argc_test = 5;
+                char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "--arg3", "val2", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 1");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "--extra-opts", (char *) NULL};
-                argc_test=2;
-                char *argv_known[] = {"prog_name", "--foo=bar", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "--extra-opts", (char *)NULL};
+                argc_test = 2;
+                char *argv_known[] = {"prog_name", "--foo=bar", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 2, argv_known), "Default section 2");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                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");
+                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");
                 ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 3");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "-arg3", "val2", (char *) NULL};
-                argc_test=5;
-                char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "-arg3", "val2", (char *) NULL};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_disk");
+                char *argv_test[] = {"prog_name", "arg1", "--extra-opts", "-arg3", "val2", (char *)NULL};
+                argc_test = 5;
+                char *argv_known[] = {"prog_name", "--foo=bar", "arg1", "-arg3", "val2", (char *)NULL};
+                argv_new = np_extra_opts(&argc_test, argv_test, "check_disk");
                 ok(array_diff(argc_test, argv_new, 5, argv_known), "Default section 4");
                 my_free(&argc_test, argv_new, argv_test);
         }
 
         {
-                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};
-                argv_new=np_extra_opts(&argc_test, argv_test, "check_tcp");
+                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};
+                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);
         }
 
         return exit_status();
 }
-
diff --git a/lib/tests/test_opts3.c b/lib/tests/test_opts3.c
index b64270da..cecea437 100644
--- a/lib/tests/test_opts3.c
+++ b/lib/tests/test_opts3.c
@@ -1,31 +1,28 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*****************************************************************************/
+ *
+ * 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 "extra_opts.h"
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
 
         /*
          * This is for testing arguments expected to die.
          */
-        argv=np_extra_opts(&argc, argv, argv[0]);
+        argv = np_extra_opts(&argc, argv, argv[0]);
 
         return 0;
 }
-
diff --git a/lib/tests/test_tcp.c b/lib/tests/test_tcp.c
index 1954b0fb..1b3003e9 100644
--- a/lib/tests/test_tcp.c
+++ b/lib/tests/test_tcp.c
@@ -1,34 +1,32 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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_tcp.h"
 #include "tap.h"
 
-int
-main(void)
-{
+int main(void) {
         char **server_expect;
         int server_expect_count = 3;
 
         plan_tests(9);
 
-        server_expect = malloc(sizeof(char*) * server_expect_count);
+        server_expect = malloc(sizeof(char *) * server_expect_count);
 
         server_expect[0] = strdup("AA");
         server_expect[1] = strdup("bb");
@@ -42,17 +40,13 @@ main(void)
            "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,
            "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 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)");
 
-
         return exit_status();
 }
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c
index 01afacdc..c3150f00 100644
--- a/lib/tests/test_utils.c
+++ b/lib/tests/test_utils.c
@@ -1,20 +1,20 @@
 /*****************************************************************************
-*
-* 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/>.
-*
-*
-*****************************************************************************/
+ *
+ * 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_base.h"
@@ -27,331 +27,323 @@
 
 #include "utils_base.c"
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         char state_path[1024];
-        range   *range;
-        double  temp;
+        range *range;
+        double temp;
         thresholds *thresholds = NULL;
-        int     i, rc;
-        char    *temp_string;
+        int i, rc;
+        char *temp_string;
         state_key *temp_state_key = NULL;
         state_data *temp_state_data;
-        time_t  current_time;
+        time_t current_time;
 
         plan_tests(185);
 
-        ok( this_monitoring_plugin==NULL, "monitoring_plugin not initialised");
+        ok(this_monitoring_plugin == NULL, "monitoring_plugin not initialised");
 
-        np_init( "check_test", argc, argv );
+        np_init("check_test", argc, argv);
 
-        ok( this_monitoring_plugin!=NULL, "monitoring_plugin now initialised");
-        ok( !strcmp(this_monitoring_plugin->plugin_name, "check_test"), "plugin name initialised" );
+        ok(this_monitoring_plugin != NULL, "monitoring_plugin now initialised");
+        ok(!strcmp(this_monitoring_plugin->plugin_name, "check_test"), "plugin name initialised");
 
-        ok( this_monitoring_plugin->argc==argc, "Argc set" );
-        ok( this_monitoring_plugin->argv==argv, "Argv set" );
+        ok(this_monitoring_plugin->argc == argc, "Argc set");
+        ok(this_monitoring_plugin->argv == argv, "Argv set");
 
-        np_set_args(0,0);
+        np_set_args(0, 0);
 
-        ok( this_monitoring_plugin->argc==0, "argc changed" );
-        ok( this_monitoring_plugin->argv==0, "argv changed" );
+        ok(this_monitoring_plugin->argc == 0, "argc changed");
+        ok(this_monitoring_plugin->argv == 0, "argv changed");
 
         np_set_args(argc, argv);
 
         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");
-        ok( range->end == 6, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "'6' is valid range");
+        ok(range->start == 0, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 6, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("1:12%%");
-        ok( range != NULL, "'1:12%%' is valid - percentages are ignored");
-        ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 12, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "'1:12%%' is valid - percentages are ignored");
+        ok(range->start == 1, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 12, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("-7:23");
-        ok( range != NULL, "'-7:23' is valid range");
-        ok( range->start == -7, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 23, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "'-7:23' is valid range");
+        ok(range->start == -7, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 23, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string(":5.75");
-        ok( range != NULL, "':5.75' is valid range");
-        ok( range->start == 0, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 5.75, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "':5.75' is valid range");
+        ok(range->start == 0, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 5.75, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("~:-95.99");
-        ok( range != NULL, "~:-95.99' is valid range");
-        ok( range->start_infinity == true, "Using negative infinity");
-        ok( range->end == -95.99, "End correct (with rounding errors)");
-        ok( range->end_infinity == false, "Not using infinity");
+        ok(range != NULL, "~:-95.99' is valid range");
+        ok(range->start_infinity == true, "Using negative infinity");
+        ok(range->end == -95.99, "End correct (with rounding errors)");
+        ok(range->end_infinity == false, "Not using infinity");
         free(range);
 
         range = parse_range_string("12345678901234567890:");
-        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");
-        ok( range->end_infinity == true, "Using infinity");
+        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");
+        ok(range->end_infinity == true, "Using infinity");
         /* Cannot do a "-1" on temp, as it appears to be same value */
-        ok( check_range(temp/1.1, range) == true, "12345678901234567890/1.1 - alert");
-        ok( check_range(temp, range) == false, "12345678901234567890 - no alert");
-        ok( check_range(temp*2, range) == false, "12345678901234567890*2 - no alert");
+        ok(check_range(temp / 1.1, range) == true, "12345678901234567890/1.1 - alert");
+        ok(check_range(temp, range) == false, "12345678901234567890 - no alert");
+        ok(check_range(temp * 2, range) == false, "12345678901234567890*2 - no alert");
         free(range);
 
         range = parse_range_string("~:0");
-        ok( range != NULL, "'~:0' is valid range");
-        ok( range->start_infinity == true, "Using negative infinity");
-        ok( range->end == 0, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
-        ok( range->alert_on == OUTSIDE, "Will alert on outside of this range");
-        ok( check_range(0.5, range) == true, "0.5 - alert");
-        ok( check_range(-10, range) == false, "-10 - no alert");
-        ok( check_range(0, range)   == false, "0 - no alert");
+        ok(range != NULL, "'~:0' is valid range");
+        ok(range->start_infinity == true, "Using negative infinity");
+        ok(range->end == 0, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
+        ok(range->alert_on == OUTSIDE, "Will alert on outside of this range");
+        ok(check_range(0.5, range) == true, "0.5 - alert");
+        ok(check_range(-10, range) == false, "-10 - no alert");
+        ok(check_range(0, range) == false, "0 - no alert");
         free(range);
 
         range = parse_range_string("@0:657.8210567");
-        ok( range != 0, "@0:657.8210567' is a valid range");
-        ok( range->start == 0, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 657.8210567, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
-        ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
-        ok( check_range(32.88, range) == true, "32.88 - alert");
-        ok( check_range(-2, range)    == false, "-2 - no alert");
-        ok( check_range(657.8210567, range) == true, "657.8210567 - alert");
-        ok( check_range(0, range)     == true, "0 - alert");
+        ok(range != 0, "@0:657.8210567' is a valid range");
+        ok(range->start == 0, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 657.8210567, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
+        ok(range->alert_on == INSIDE, "Will alert on inside of this range");
+        ok(check_range(32.88, range) == true, "32.88 - alert");
+        ok(check_range(-2, range) == false, "-2 - no alert");
+        ok(check_range(657.8210567, range) == true, "657.8210567 - alert");
+        ok(check_range(0, range) == true, "0 - alert");
         free(range);
 
         range = parse_range_string("@1:1");
-        ok( range != NULL, "'@1:1' is a valid range");
-        ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 1, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
-        ok( range->alert_on == INSIDE, "Will alert on inside of this range" );
-        ok( check_range(0.5, range) == false, "0.5 - no alert");
-        ok( check_range(1, range) == true, "1 - alert");
-        ok( check_range(5.2, range) == false, "5.2 - no alert");
+        ok(range != NULL, "'@1:1' is a valid range");
+        ok(range->start == 1, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 1, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
+        ok(range->alert_on == INSIDE, "Will alert on inside of this range");
+        ok(check_range(0.5, range) == false, "0.5 - no alert");
+        ok(check_range(1, range) == true, "1 - alert");
+        ok(check_range(5.2, range) == false, "5.2 - no alert");
         free(range);
 
         range = parse_range_string("1:1");
-        ok( range != NULL, "'1:1' is a valid range");
-        ok( range->start == 1, "Start correct");
-        ok( range->start_infinity == false, "Not using negative infinity");
-        ok( range->end == 1, "End correct");
-        ok( range->end_infinity == false, "Not using infinity");
-        ok( check_range(0.5, range) == true, "0.5 - alert");
-        ok( check_range(1, range) == false, "1 - no alert");
-        ok( check_range(5.2, range) == true, "5.2 - alert");
+        ok(range != NULL, "'1:1' is a valid range");
+        ok(range->start == 1, "Start correct");
+        ok(range->start_infinity == false, "Not using negative infinity");
+        ok(range->end == 1, "End correct");
+        ok(range->end_infinity == false, "Not using infinity");
+        ok(check_range(0.5, range) == true, "0.5 - alert");
+        ok(check_range(1, range) == false, "1 - no alert");
+        ok(check_range(5.2, range) == true, "5.2 - alert");
         free(range);
 
         range = parse_range_string("2:1");
-        ok( range == NULL, "'2:1' rejected");
+        ok(range == NULL, "'2:1' rejected");
 
         rc = _set_thresholds(&thresholds, NULL, NULL);
-        ok( rc == 0, "Thresholds (NULL, NULL) set");
-        ok( thresholds->warning == NULL, "Warning not set");
-        ok( thresholds->critical == NULL, "Critical not set");
+        ok(rc == 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");
-        ok( thresholds->warning == NULL, "Warning not set");
-        ok( thresholds->critical->end == 80, "Critical set correctly");
+        ok(rc == 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");
-        ok( thresholds->warning->start == 5, "Warning start set");
-        ok( thresholds->warning->end == 33, "Warning end set");
-        ok( thresholds->critical == NULL, "Critical not set");
+        ok(rc == 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");
-        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");
+        ok(rc == 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");
-        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");
-        ok( thresholds->critical->end == 20, "Critical end set correctly");
-        ok( get_status(-31, thresholds) == STATE_CRITICAL, "-31 - critical");
-        ok( get_status(-29, thresholds) == STATE_WARNING, "-29 - warning");
-        ok( get_status(-11, thresholds) == STATE_WARNING, "-11 - warning");
-        ok( get_status(-10, thresholds) == STATE_OK, "-10 - ok");
-        ok( get_status(-2, thresholds) == STATE_OK, "-2 - ok");
-        ok( get_status(-1, thresholds) == STATE_WARNING, "-1 - warning");
-        ok( get_status(19, thresholds) == STATE_WARNING, "19 - warning");
-        ok( get_status(21, thresholds) == STATE_CRITICAL, "21 - critical");
+        ok(rc == 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");
+        ok(thresholds->critical->end == 20, "Critical end set correctly");
+        ok(get_status(-31, thresholds) == STATE_CRITICAL, "-31 - critical");
+        ok(get_status(-29, thresholds) == STATE_WARNING, "-29 - warning");
+        ok(get_status(-11, thresholds) == STATE_WARNING, "-11 - warning");
+        ok(get_status(-10, thresholds) == STATE_OK, "-10 - ok");
+        ok(get_status(-2, thresholds) == STATE_OK, "-2 - ok");
+        ok(get_status(-1, thresholds) == STATE_WARNING, "-1 - warning");
+        ok(get_status(19, thresholds) == STATE_WARNING, "19 - warning");
+        ok(get_status(21, thresholds) == STATE_CRITICAL, "21 - critical");
 
         char *test;
         test = np_escaped_string("bob\\n");
-        ok( strcmp(test, "bob\n") == 0, "bob\\n ok");
+        ok(strcmp(test, "bob\n") == 0, "bob\\n ok");
         free(test);
 
         test = np_escaped_string("rhuba\\rb");
-        ok( strcmp(test, "rhuba\rb") == 0, "rhuba\\rb okay");
+        ok(strcmp(test, "rhuba\rb") == 0, "rhuba\\rb okay");
         free(test);
 
         test = np_escaped_string("ba\\nge\\r");
-        ok( strcmp(test, "ba\nge\r") == 0, "ba\\nge\\r okay");
+        ok(strcmp(test, "ba\nge\r") == 0, "ba\\nge\\r okay");
         free(test);
 
         test = np_escaped_string("\\rabbi\\t");
-        ok( strcmp(test, "\rabbi\t") == 0, "\\rabbi\\t okay");
+        ok(strcmp(test, "\rabbi\t") == 0, "\\rabbi\\t okay");
         free(test);
 
         test = np_escaped_string("and\\\\or");
-        ok( strcmp(test, "and\\or") == 0, "and\\\\or okay");
+        ok(strcmp(test, "and\\or") == 0, "and\\\\or okay");
         free(test);
 
         test = np_escaped_string("bo\\gus");
-        ok( strcmp(test, "bogus") == 0, "bo\\gus okay");
+        ok(strcmp(test, "bogus") == 0, "bo\\gus okay");
         free(test);
 
         test = np_escaped_string("everything");
-        ok( strcmp(test, "everything") == 0, "everything okay");
+        ok(strcmp(test, "everything") == 0, "everything okay");
 
         /* np_extract_ntpvar tests (23) */
-        test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foo");
+        test = np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foo");
         ok(test && !strcmp(test, "bar"), "1st test as expected");
         free(test);
 
-        test=np_extract_ntpvar("foo=bar,bar=foo,foobar=barfoo\n", "bar");
+        test = np_extract_ntpvar("foo=bar,bar=foo,foobar=barfoo\n", "bar");
         ok(test && !strcmp(test, "foo"), "2nd test as expected");
         free(test);
 
-        test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foobar");
+        test = np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foobar");
         ok(test && !strcmp(test, "barfoo"), "3rd test as expected");
         free(test);
 
-        test=np_extract_ntpvar("foo=bar\n", "foo");
+        test = np_extract_ntpvar("foo=bar\n", "foo");
         ok(test && !strcmp(test, "bar"), "Single test as expected");
         free(test);
 
-        test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfooi\n", "abcd");
+        test = np_extract_ntpvar("foo=bar, bar=foo, foobar=barfooi\n", "abcd");
         ok(!test, "Key not found 1");
 
-        test=np_extract_ntpvar("foo=bar\n", "abcd");
+        test = np_extract_ntpvar("foo=bar\n", "abcd");
         ok(!test, "Key not found 2");
 
-        test=np_extract_ntpvar("foo=bar=foobar", "foo");
+        test = np_extract_ntpvar("foo=bar=foobar", "foo");
         ok(test && !strcmp(test, "bar=foobar"), "Strange string 1");
         free(test);
 
-        test=np_extract_ntpvar("foo", "foo");
+        test = np_extract_ntpvar("foo", "foo");
         ok(!test, "Malformed string 1");
 
-        test=np_extract_ntpvar("foo,", "foo");
+        test = np_extract_ntpvar("foo,", "foo");
         ok(!test, "Malformed string 2");
 
-        test=np_extract_ntpvar("foo=", "foo");
+        test = np_extract_ntpvar("foo=", "foo");
         ok(!test, "Malformed string 3");
 
-        test=np_extract_ntpvar("foo=,bar=foo", "foo");
+        test = np_extract_ntpvar("foo=,bar=foo", "foo");
         ok(!test, "Malformed string 4");
 
-        test=np_extract_ntpvar(",foo", "foo");
+        test = np_extract_ntpvar(",foo", "foo");
         ok(!test, "Malformed string 5");
 
-        test=np_extract_ntpvar("=foo", "foo");
+        test = np_extract_ntpvar("=foo", "foo");
         ok(!test, "Malformed string 6");
 
-        test=np_extract_ntpvar("=foo,", "foo");
+        test = np_extract_ntpvar("=foo,", "foo");
         ok(!test, "Malformed string 7");
 
-        test=np_extract_ntpvar(",,,", "foo");
+        test = np_extract_ntpvar(",,,", "foo");
         ok(!test, "Malformed string 8");
 
-        test=np_extract_ntpvar("===", "foo");
+        test = np_extract_ntpvar("===", "foo");
         ok(!test, "Malformed string 9");
 
-        test=np_extract_ntpvar(",=,=,", "foo");
+        test = np_extract_ntpvar(",=,=,", "foo");
         ok(!test, "Malformed string 10");
 
-        test=np_extract_ntpvar("=,=,=", "foo");
+        test = np_extract_ntpvar("=,=,=", "foo");
         ok(!test, "Malformed string 11");
 
-        test=np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "foo");
+        test = np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "foo");
         ok(test && !strcmp(test, "bar"), "Random spaces and newlines 1");
         free(test);
 
-        test=np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "bar");
+        test = np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "bar");
         ok(test && !strcmp(test, "foo"), "Random spaces and newlines 2");
         free(test);
 
-        test=np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "foobar");
+        test = np_extract_ntpvar("  foo=bar  ,\n bar=foo\n , foobar=barfoo  \n  ", "foobar");
         ok(test && !strcmp(test, "barfoo"), "Random spaces and newlines 3");
         free(test);
 
-        test=np_extract_ntpvar("  foo=bar  ,\n bar\n \n= \n foo\n , foobar=barfoo  \n  ", "bar");
+        test = np_extract_ntpvar("  foo=bar  ,\n bar\n \n= \n foo\n , foobar=barfoo  \n  ", "bar");
         ok(test && !strcmp(test, "foo"), "Random spaces and newlines 4");
         free(test);
 
-        test=np_extract_ntpvar("", "foo");
+        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" );
-
+        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->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" );
+        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" );
+        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" );
+        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" );
-
+        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");
 
-        ok(temp_state_key==NULL, "temp_state_key initially empty");
-
-        this_monitoring_plugin->argc=1;
+        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" );
-
+        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" );
-
+        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 */
         /*
@@ -363,73 +355,65 @@ main (int argc, char **argv)
         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->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" );
+        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" );
-
+        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_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_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" );
+        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_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;
+        ok(temp_state_data == NULL, "Older data version gives NULL");
+        temp_state_key->data_version = 54;
 
-        temp_state_key->_filename="var/nonexistent";
+        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" );
+        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_key->_filename = "var/oldformat";
         temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Old file format gives NULL" );
+        ok(temp_state_data == NULL, "Old file format gives NULL");
 
-        temp_state_key->_filename="var/baddate";
+        temp_state_key->_filename = "var/baddate";
         temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Bad date gives NULL" );
+        ok(temp_state_data == NULL, "Bad date gives NULL");
 
-        temp_state_key->_filename="var/missingdataline";
+        temp_state_key->_filename = "var/missingdataline";
         temp_state_data = np_state_read();
-        ok( temp_state_data==NULL, "Missing data line gives NULL" );
-
-
-
+        ok(temp_state_data == NULL, "Missing data line gives NULL");
 
         unlink("var/generated");
-        temp_state_key->_filename="var/generated";
-        current_time=1234567890;
+        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");
-
-
-
+        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;
+        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");
+        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 */
         /*
@@ -438,15 +422,13 @@ main (int argc, char **argv)
         np_state_write_string(current_time, "String to read");
         */
 
-
-        temp_state_key->_filename="var/generated";
+        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");
-
+        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 */
         /*
@@ -454,23 +436,16 @@ main (int argc, char **argv)
         np_state_write_string(0, "Bad file");
         */
 
-
         np_cleanup();
 
-        ok(this_monitoring_plugin==NULL, "Free'd this_monitoring_plugin");
+        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++) {
+        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 */
                 char *statelower = strdup(states[i]);
                 char *stateupper = strdup(states[i]);
@@ -488,23 +463,23 @@ main (int argc, char **argv)
                 char testname[64] = "Translate state string: ";
                 int tlen = strlen(testname);
 
-                strcpy(testname+tlen, states[i]);
-                ok(i==mp_translate_state(states[i]), testname);
+                strcpy(testname + tlen, states[i]);
+                ok(i == mp_translate_state(states[i]), testname);
 
-                strcpy(testname+tlen, statelower);
-                ok(i==mp_translate_state(statelower), testname);
+                strcpy(testname + tlen, statelower);
+                ok(i == mp_translate_state(statelower), testname);
 
-                strcpy(testname+tlen, stateupper);
-                ok(i==mp_translate_state(stateupper), testname);
+                strcpy(testname + tlen, stateupper);
+                ok(i == mp_translate_state(stateupper), testname);
 
-                strcpy(testname+tlen, statenum);
-                ok(i==mp_translate_state(statenum), testname);
+                strcpy(testname + tlen, statenum);
+                ok(i == mp_translate_state(statenum), testname);
         }
-        ok(ERROR==mp_translate_state("warningfewgw"), "Translate state string with garbage");
-        ok(ERROR==mp_translate_state("00"), "Translate state string: bad numeric string 1");
-        ok(ERROR==mp_translate_state("01"), "Translate state string: bad numeric string 2");
-        ok(ERROR==mp_translate_state("10"), "Translate state string: bad numeric string 3");
-        ok(ERROR==mp_translate_state(""), "Translate state string: empty string");
+        ok(ERROR == mp_translate_state("warningfewgw"), "Translate state string with garbage");
+        ok(ERROR == mp_translate_state("00"), "Translate state string: bad numeric string 1");
+        ok(ERROR == mp_translate_state("01"), "Translate state string: bad numeric string 2");
+        ok(ERROR == mp_translate_state("10"), "Translate state string: bad numeric string 3");
+        ok(ERROR == mp_translate_state(""), "Translate state string: empty string");
 
         return exit_status();
 }
diff --git a/lib/thresholds.c b/lib/thresholds.c
new file mode 100644
index 00000000..de2b9315
--- /dev/null
+++ b/lib/thresholds.c
@@ -0,0 +1,71 @@
+#include "./thresholds.h"
+#include "./utils_base.h"
+#include "perfdata.h"
+
+#include <stddef.h>
+
+mp_thresholds mp_thresholds_init() {
+        mp_thresholds tmp = {
+                .critical = {},
+                .critical_is_set = false,
+                .warning = {},
+                .warning_is_set = false,
+        };
+        return tmp;
+}
+
+char *fmt_threshold_warning(const thresholds th) {
+        if (th.warning == NULL) {
+                return "";
+        }
+
+        return fmt_range(*th.warning);
+}
+
+char *fmt_threshold_critical(const thresholds th) {
+        if (th.critical == NULL) {
+                return "";
+        }
+        return fmt_range(*th.critical);
+}
+
+mp_perfdata mp_pd_set_thresholds(mp_perfdata perfdata, mp_thresholds threshold) {
+        if (threshold.critical_is_set) {
+                perfdata.crit = threshold.critical;
+                perfdata.crit_present = true;
+        }
+
+        if (threshold.warning_is_set) {
+                perfdata.warn = threshold.warning;
+                perfdata.warn_present = true;
+        }
+
+        return perfdata;
+}
+
+mp_state_enum mp_get_pd_status(mp_perfdata perfdata) {
+        if (perfdata.crit_present) {
+                if (mp_check_range(perfdata.value, perfdata.crit)) {
+                        return STATE_CRITICAL;
+                }
+        }
+        if (perfdata.warn_present) {
+                if (mp_check_range(perfdata.value, perfdata.warn)) {
+                        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
new file mode 100644
index 00000000..5f9f9247
--- /dev/null
+++ b/lib/thresholds.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include "./perfdata.h"
+#include "states.h"
+
+/*
+ * Old threshold type using the old range type
+ */
+typedef struct thresholds_struct {
+        range *warning;
+        range *critical;
+} thresholds;
+
+typedef struct mp_thresholds_struct {
+        bool warning_is_set;
+        mp_range warning;
+        bool critical_is_set;
+        mp_range critical;
+} mp_thresholds;
+
+mp_thresholds mp_thresholds_init(void);
+
+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 f8592f41..c49a473f 100644
--- a/lib/utils_base.c
+++ b/lib/utils_base.c
@@ -1,28 +1,28 @@
 /*****************************************************************************
-*
-* utils_base.c
-*
-* License: GPL
-* Copyright (c) 2006 Monitoring Plugins Development Team
-*
-* Library of useful functions for 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/>.
-*
-*
-*****************************************************************************/
+ *
+ * utils_base.c
+ *
+ * License: GPL
+ * Copyright (c) 2006 - 2024 Monitoring Plugins Development Team
+ *
+ * Library of useful functions for 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/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "../plugins/common.h"
 #include <stdarg.h>
@@ -33,43 +33,49 @@
 #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;
+monitoring_plugin *this_monitoring_plugin = NULL;
 
 int timeout_state = STATE_CRITICAL;
 unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
 
 bool _np_state_read_file(FILE *);
 
-void np_init( char *plugin_name, int argc, char **argv ) {
-        if (this_monitoring_plugin==NULL) {
+void np_init(char *plugin_name, int argc, char **argv) {
+        if (this_monitoring_plugin == NULL) {
                 this_monitoring_plugin = calloc(1, sizeof(monitoring_plugin));
-                if (this_monitoring_plugin==NULL) {
-                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                            strerror(errno));
+                if (this_monitoring_plugin == NULL) {
+                        die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
                 }
                 this_monitoring_plugin->plugin_name = strdup(plugin_name);
-                if (this_monitoring_plugin->plugin_name==NULL)
+                if (this_monitoring_plugin->plugin_name == NULL) {
                         die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
+                }
                 this_monitoring_plugin->argc = argc;
                 this_monitoring_plugin->argv = argv;
         }
 }
 
-void np_set_args( int argc, char **argv ) {
-        if (this_monitoring_plugin==NULL)
+void np_set_args(int argc, char **argv) {
+        if (this_monitoring_plugin == NULL) {
                 die(STATE_UNKNOWN, _("This requires np_init to be called"));
+        }
 
         this_monitoring_plugin->argc = argc;
         this_monitoring_plugin->argv = argv;
 }
 
-
-void np_cleanup() {
-        if (this_monitoring_plugin!=NULL) {
-                if(this_monitoring_plugin->state!=NULL) {
-                        if(this_monitoring_plugin->state->state_data) {
+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);
                         }
@@ -79,48 +85,43 @@ void np_cleanup() {
                 np_free(this_monitoring_plugin->plugin_name);
                 np_free(this_monitoring_plugin);
         }
-        this_monitoring_plugin=NULL;
+        this_monitoring_plugin = NULL;
 }
 
 /* Hidden function to get a pointer to this_monitoring_plugin for testing */
-void _get_monitoring_plugin( monitoring_plugin **pointer ){
-        *pointer = this_monitoring_plugin;
-}
+void _get_monitoring_plugin(monitoring_plugin **pointer) { *pointer = this_monitoring_plugin; }
 
-void
-die (int result, const char *fmt, ...)
-{
-        if(fmt!=NULL) {
+void die(int result, const char *fmt, ...) {
+        if (fmt != NULL) {
                 va_list ap;
-                va_start (ap, fmt);
-                vprintf (fmt, ap);
-                va_end (ap);
+                va_start(ap, fmt);
+                vprintf(fmt, ap);
+                va_end(ap);
         }
 
-        if(this_monitoring_plugin!=NULL) {
+        if (this_monitoring_plugin != NULL) {
                 np_cleanup();
         }
-        exit (result);
+        exit(result);
 }
 
-void set_range_start (range *this, double value) {
+void set_range_start(range *this, double value) {
         this->start = value;
         this->start_infinity = false;
 }
 
-void set_range_end (range *this, double value) {
+void set_range_end(range *this, double value) {
         this->end = value;
         this->end_infinity = false;
 }
 
-range
-*parse_range_string (char *str) {
+range *parse_range_string(char *str) {
         range *temp_range;
         double start;
         double end;
         char *end_str;
 
-        temp_range = (range *) calloc(1, sizeof(range));
+        temp_range = (range *)calloc(1, sizeof(range));
 
         /* Set defaults */
         temp_range->start = 0;
@@ -140,10 +141,10 @@ range
                 if (str[0] == '~') {
                         temp_range->start_infinity = true;
                 } else {
-                        start = strtod(str, NULL);      /* Will stop at the ':' */
+                        start = strtod(str, NULL); /* Will stop at the ':' */
                         set_range_start(temp_range, start);
                 }
-                end_str++;              /* Move past the ':' */
+                end_str++; /* Move past the ':' */
         } else {
                 end_str = str;
         }
@@ -152,9 +153,7 @@ range
                 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 == true || temp_range->end_infinity == true || temp_range->start <= temp_range->end) {
                 return temp_range;
         }
         free(temp_range);
@@ -162,14 +161,12 @@ range
 }
 
 /* returns 0 if okay, otherwise 1 */
-int
-_set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string)
-{
+int _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string) {
         thresholds *temp_thresholds = NULL;
 
-        if ((temp_thresholds = calloc(1, sizeof(thresholds))) == NULL)
-                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"),
-                    strerror(errno));
+        if ((temp_thresholds = calloc(1, sizeof(thresholds))) == NULL) {
+                die(STATE_UNKNOWN, _("Cannot allocate memory: %s"), strerror(errno));
+        }
 
         temp_thresholds->warning = NULL;
         temp_thresholds->critical = NULL;
@@ -190,9 +187,7 @@ _set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_st
         return 0;
 }
 
-void
-set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string)
-{
+void set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_string) {
         switch (_set_thresholds(my_thresholds, warn_string, critical_string)) {
         case 0:
                 return;
@@ -206,7 +201,7 @@ set_thresholds(thresholds **my_thresholds, char *warn_string, char *critical_str
 
 void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
         printf("%s - ", threshold_name);
-        if (! my_threshold) {
+        if (!my_threshold) {
                 printf("Threshold not set");
         } else {
                 if (my_threshold->warning) {
@@ -223,9 +218,36 @@ void print_thresholds(const char *threshold_name, thresholds *my_threshold) {
         printf("\n");
 }
 
+/* Returns true if alert should be raised based on the range, false otherwise */
+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) {
+                // range:  .........|---inside---|...........
+                // value
+                is_inside = ((cmp_perfdata_value(my_range.start, value) < 1) && (cmp_perfdata_value(value, my_range.end) <= 0));
+        } else if (my_range.start_infinity == false && my_range.end_infinity == true) {
+                // range:  .........|---inside---------
+                // value
+                is_inside = (cmp_perfdata_value(my_range.start, value) < 0);
+        } else if (my_range.start_infinity == true && my_range.end_infinity == false) {
+                // range:  -inside--------|....................
+                // value
+                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)) {
+                return true;
+        }
+
+        return false;
+}
+
 /* Returns true if alert should be raised based on the range */
-bool check_range(double value, range *my_range)
-{
+bool check_range(double value, range *my_range) {
         bool no = false;
         bool yes = true;
 
@@ -237,30 +259,28 @@ bool check_range(double value, range *my_range)
         if (my_range->end_infinity == false && my_range->start_infinity == false) {
                 if ((my_range->start <= value) && (value <= my_range->end)) {
                         return no;
-                } else {
-                        return yes;
                 }
-        } else if (my_range->start_infinity == false && my_range->end_infinity == true) {
+                return yes;
+        }
+
+        if (my_range->start_infinity == false && my_range->end_infinity == true) {
                 if (my_range->start <= value) {
                         return no;
-                } else {
-                        return yes;
                 }
-        } else if (my_range->start_infinity == true && my_range->end_infinity == false) {
+                return yes;
+        }
+
+        if (my_range->start_infinity == true && my_range->end_infinity == false) {
                 if (value <= my_range->end) {
                         return no;
-                } else {
-                        return yes;
                 }
-        } else {
-                return no;
+                return yes;
         }
+        return no;
 }
 
 /* Returns status */
-int
-get_status(double value, thresholds *my_thresholds)
-{
+int get_status(double value, thresholds *my_thresholds) {
         if (my_thresholds->critical != NULL) {
                 if (check_range(value, my_thresholds->critical) == true) {
                         return STATE_CRITICAL;
@@ -274,27 +294,28 @@ get_status(double value, thresholds *my_thresholds)
         return STATE_OK;
 }
 
-char *np_escaped_string (const char *string) {
+char *np_escaped_string(const char *string) {
         char *data;
-        int i, j=0;
+        int i;
+        int j = 0;
         data = strdup(string);
-        for (i=0; data[i]; i++) {
+        for (i = 0; data[i]; i++) {
                 if (data[i] == '\\') {
-                        switch(data[++i]) {
-                                case 'n':
-                                        data[j++] = '\n';
-                                        break;
-                                case 'r':
-                                        data[j++] = '\r';
-                                        break;
-                                case 't':
-                                        data[j++] = '\t';
-                                        break;
-                                case '\\':
-                                        data[j++] = '\\';
-                                        break;
-                                default:
-                                        data[j++] = data[i];
+                        switch (data[++i]) {
+                        case 'n':
+                                data[j++] = '\n';
+                                break;
+                        case 'r':
+                                data[j++] = '\r';
+                                break;
+                        case 't':
+                                data[j++] = '\t';
+                                break;
+                        case '\\':
+                                data[j++] = '\\';
+                                break;
+                        default:
+                                data[j++] = data[i];
                         }
                 } else {
                         data[j++] = data[i];
@@ -313,33 +334,41 @@ int np_check_if_root(void) { return (geteuid() == 0); }
  * data strings.
  */
 char *np_extract_value(const char *varlist, const char *name, char sep) {
-        char *tmp=NULL, *value=NULL;
+        char *tmp = NULL;
+        char *value = NULL;
         int i;
 
         while (1) {
                 /* 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[tmp-varlist] = '\0';
+                                        if (tmp - varlist == 0) {
+                                                continue;
+                                        }
+                                        value = (char *)calloc(1, tmp - varlist + 1);
+                                        strncpy(value, varlist, tmp - varlist);
+                                        value[tmp - varlist] = '\0';
                                 } else {
                                         /* Value is delimited by a \0 */
-                                        if (strlen(varlist) == 0) continue;
+                                        if (strlen(varlist) == 0) {
+                                                continue;
+                                        }
                                         value = (char *)calloc(1, strlen(varlist) + 1);
                                         strncpy(value, varlist, strlen(varlist));
                                         value[strlen(varlist)] = '\0';
@@ -357,14 +386,16 @@ 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--) value[i] = '\0';
+        if (value) {
+                for (i = strlen(value) - 1; isspace(value[i]); i--) {
+                        value[i] = '\0';
+                }
+        }
 
         return value;
 }
 
-const char *
-state_text (int result)
-{
+const char *state_text(int result) {
         switch (result) {
         case STATE_OK:
                 return "OK";
@@ -383,15 +414,19 @@ state_text (int result)
  * Read a string representing a state (ok, warning... or numeric: 0, 1) and
  * return the corresponding STATE_ value or ERROR)
  */
-int mp_translate_state (char *state_text) {
-        if (!strcasecmp(state_text,"OK") || !strcmp(state_text,"0"))
+int mp_translate_state(char *state_text) {
+        if (!strcasecmp(state_text, "OK") || !strcmp(state_text, "0")) {
                 return STATE_OK;
-        if (!strcasecmp(state_text,"WARNING") || !strcmp(state_text,"1"))
+        }
+        if (!strcasecmp(state_text, "WARNING") || !strcmp(state_text, "1")) {
                 return STATE_WARNING;
-        if (!strcasecmp(state_text,"CRITICAL") || !strcmp(state_text,"2"))
+        }
+        if (!strcasecmp(state_text, "CRITICAL") || !strcmp(state_text, "2")) {
                 return STATE_CRITICAL;
-        if (!strcasecmp(state_text,"UNKNOWN") || !strcmp(state_text,"3"))
+        }
+        if (!strcasecmp(state_text, "UNKNOWN") || !strcmp(state_text, "3")) {
                 return STATE_UNKNOWN;
+        }
         return ERROR;
 }
 
@@ -400,11 +435,11 @@ int mp_translate_state (char *state_text) {
  * 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() {
+char *_np_state_generate_key(void) {
         int i;
         char **argv = this_monitoring_plugin->argv;
         char keyname[41];
-        char *p=NULL;
+        char *p = NULL;
 
         unsigned char result[256];
 
@@ -418,7 +453,7 @@ char *_np_state_generate_key() {
 
         EVP_DigestInit(ctx, EVP_sha256());
 
-        for(i=0; i<this_monitoring_plugin->argc; i++) {
+        for (i = 0; i < this_monitoring_plugin->argc; i++) {
                 EVP_DigestUpdate(ctx, argv[i], strlen(argv[i]));
         }
 
@@ -427,28 +462,28 @@ char *_np_state_generate_key() {
 
         struct sha256_ctx ctx;
 
-        for(i=0; i<this_monitoring_plugin->argc; i++) {
+        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]);
+        for (i = 0; i < 20; ++i) {
+                sprintf(&keyname[2 * i], "%02x", result[i]);
         }
 
-        keyname[40]='\0';
+        keyname[40] = '\0';
 
         p = strdup(keyname);
-        if(p==NULL) {
+        if (p == NULL) {
                 die(STATE_UNKNOWN, _("Cannot execute strdup: %s"), strerror(errno));
         }
         return p;
 }
 
-void _cleanup_state_data() {
-        if (this_monitoring_plugin->state->state_data!=NULL) {
+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);
         }
@@ -459,19 +494,21 @@ void _cleanup_state_data() {
  *   envvar NAGIOS_PLUGIN_STATE_DIRECTORY
  *   statically compiled shared state directory
  */
-char* _np_state_calculate_location_prefix(){
+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')
+                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')
+                if (env_dir && env_dir[0] != '\0') {
                         return env_dir;
+                }
         }
 
         return NP_STATE_DIR_PREFIX;
@@ -486,46 +523,47 @@ 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;
+        char *p = NULL;
         int ret;
 
-        if(this_monitoring_plugin==NULL)
+        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));
+        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) {
+        if (keyname == NULL) {
                 temp_keyname = _np_state_generate_key();
         } else {
                 temp_keyname = strdup(keyname);
-                if(temp_keyname==NULL)
+                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 == '_')) {
+        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;
+        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));
+        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_state->_filename = temp_filename;
 
         this_monitoring_plugin->state = this_state;
 }
@@ -537,24 +575,25 @@ void np_enable_state(char *keyname, int expected_data_version) {
  * If numerically lower, then return as no previous state. die with UNKNOWN
  * if exceptional error.
  */
-state_data *np_state_read() {
-        state_data *this_state_data=NULL;
+state_data *np_state_read(void) {
+        state_data *this_state_data = NULL;
         FILE *statefile;
         bool rc = false;
 
-        if(this_monitoring_plugin==NULL)
+        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) {
+        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 = (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_state_data->data = NULL;
                 this_monitoring_plugin->state->state_data = this_state_data;
 
                 rc = _np_state_read_file(statefile);
@@ -562,7 +601,7 @@ state_data *np_state_read() {
                 fclose(statefile);
         }
 
-        if(!rc) {
+        if (!rc) {
                 _cleanup_state_data();
         }
 
@@ -577,60 +616,70 @@ bool _np_state_read_file(FILE *f) {
         size_t pos;
         char *line;
         int i;
-        int failure=0;
+        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;
+        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';
+        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;
+                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:
-                                ;
+                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:;
                 }
         }
 
@@ -647,77 +696,78 @@ bool _np_state_read_file(FILE *f) {
  */
 void np_state_write_string(time_t data_time, char *data_string) {
         FILE *fp;
-        char *temp_file=NULL;
-        int fd=0, result=0;
+        char *temp_file = NULL;
+        int fd = 0, result = 0;
         time_t current_time;
-        char *directories=NULL;
-        char *p=NULL;
+        char *directories = NULL;
+        char *p = NULL;
 
-        if(data_time==0)
+        if (data_time == 0) {
                 time(&current_time);
-        else
-                current_time=data_time;
+        } else {
+                current_time = data_time;
+        }
 
         /* If file doesn't currently exist, create directories */
-        if(access(this_monitoring_plugin->state->_filename,F_OK)!=0) {
+        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)) {
+                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='/';
+                                *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));
+        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) {
+        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) {
+        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);
+        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);
+        result = fclose(fp);
 
         fsync(fd);
 
-        if(result!=0) {
+        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) {
+        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"));
diff --git a/lib/utils_base.h b/lib/utils_base.h
index 9d4dffed..123066f8 100644
--- a/lib/utils_base.h
+++ b/lib/utils_base.h
@@ -2,8 +2,15 @@
 #define _UTILS_BASE_
 /* Header file for Monitoring Plugins utils_base.c */
 
+#include "../config.h"
+#include <time.h>
+
+#include "./perfdata.h"
+#include "./thresholds.h"
+
+
 #ifndef USE_OPENSSL
-# include "sha256.h"
+#       include "sha256.h"
 #endif
 
 /* This file holds header information for thresholds - use this in preference to
@@ -19,49 +26,35 @@
 #define OUTSIDE 0
 #define INSIDE  1
 
-typedef struct range_struct {
-        double  start;
-        bool start_infinity;
-        double  end;
-        int     end_infinity;
-        int     alert_on;               /* OUTSIDE (default) or INSIDE */
-        char* text; /* original unparsed text input */
-        } range;
-
-typedef struct thresholds_struct {
-        range   *warning;
-        range   *critical;
-        } thresholds;
-
 #define NP_STATE_FORMAT_VERSION 1
 
 typedef struct state_data_struct {
-        time_t  time;
-        void    *data;
-        int     length; /* Of binary data */
-        } state_data;
-
+        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;
+        char *name;
+        char *plugin_name;
+        int data_version;
+        char *_filename;
         state_data *state_data;
-        } state_key;
+} state_key;
 
 typedef struct np_struct {
-        char      *plugin_name;
+        char *plugin_name;
         state_key *state;
-        int       argc;
-        char      **argv;
-        } monitoring_plugin;
+        int argc;
+        char **argv;
+} monitoring_plugin;
 
-range *parse_range_string (char *);
+range *parse_range_string(char *);
 int _set_thresholds(thresholds **, char *, char *);
 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 *);
 
 /* Handle timeouts */
@@ -71,13 +64,13 @@ extern unsigned int timeout_interval;
 /* All possible characters in a threshold range */
 #define NP_THRESHOLDS_CHARS "-0123456789.:@~"
 
-char *np_escaped_string (const char *);
+char *np_escaped_string(const char *);
 
-void die (int, const char *, ...) __attribute__((noreturn,format(printf, 2, 3)));
+void die(int, const char *, ...) __attribute__((noreturn, format(printf, 2, 3)));
 
 /* Return codes for _set_thresholds */
 #define NP_RANGE_UNPARSEABLE 1
-#define NP_WARN_WITHIN_CRIT 2
+#define NP_WARN_WITHIN_CRIT  2
 
 /* a simple check to see if we're running as root.
  * returns zero on failure, nonzero on success */
@@ -93,7 +86,7 @@ int np_check_if_root(void);
  * This function can be used to parse NTP control packet data and performance
  * data strings.
  */
-char *np_extract_value(const char*, const char*, char);
+char *np_extract_value(const char *, const char *, char);
 
 /*
  * Same as np_extract_value with separator suitable for NTP control packet
@@ -105,15 +98,15 @@ char *np_extract_value(const char*, const char*, char);
  * Read a string representing a state (ok, warning... or numeric: 0, 1) and
  * return the corresponding NP_STATE or ERROR)
  */
-int mp_translate_state (char *);
+int mp_translate_state(char *);
 
 void np_enable_state(char *, int);
-state_data *np_state_read();
+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();
-const char *state_text (int);
+void np_cleanup(void);
+const char *state_text(int);
 
 #endif /* _UTILS_BASE_ */
diff --git a/lib/utils_cmd.c b/lib/utils_cmd.c
index 7957ec14..9b222409 100644
--- a/lib/utils_cmd.c
+++ b/lib/utils_cmd.c
@@ -1,40 +1,40 @@
 /*****************************************************************************
-*
-* Monitoring run command utilities
-*
-* License: GPL
-* Copyright (c) 2005-2006 Monitoring Plugins Development Team
-*
-* Description :
-*
-* A simple interface to executing programs from other programs, using an
-* optimized and safe popen()-like implementation. It is considered safe
-* in that no shell needs to be spawned and the environment passed to the
-* execve()'d program is essentially empty.
-*
-* The code in this file is a derivative of popen.c which in turn was taken
-* from "Advanced Programming for the Unix Environment" by W. Richard Stevens.
-*
-* Care has been taken to make sure the functions are async-safe. The one
-* function which isn't is cmd_init() which it doesn't make sense to
-* call twice anyway, so the api as a whole should be considered async-safe.
-*
-*
-* 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 run command utilities
+ *
+ * License: GPL
+ * Copyright (c) 2005-2024 Monitoring Plugins Development Team
+ *
+ * Description :
+ *
+ * A simple interface to executing programs from other programs, using an
+ * optimized and safe popen()-like implementation. It is considered safe
+ * in that no shell needs to be spawned and the environment passed to the
+ * execve()'d program is essentially empty.
+ *
+ * The code in this file is a derivative of popen.c which in turn was taken
+ * from "Advanced Programming for the Unix Environment" by W. Richard Stevens.
+ *
+ * Care has been taken to make sure the functions are async-safe. The one
+ * function which isn't is cmd_init() which it doesn't make sense to
+ * call twice anyway, so the api as a whole should be considered async-safe.
+ *
+ *
+ * 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/>.
+ *
+ *
+ *****************************************************************************/
 
 #define NAGIOSPLUG_API_C 1
 
@@ -59,7 +59,7 @@ static pid_t *_cmd_pids = NULL;
 #include <fcntl.h>
 
 #ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
+#       include <sys/wait.h>
 #endif
 
 /* used in _cmd_open to pass the environment to commands */
@@ -67,57 +67,48 @@ extern char **environ;
 
 /** macros **/
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#       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 */
 #if defined(SIG_IGN) && !defined(SIG_ERR)
-# define SIG_ERR ((Sigfunc *)-1)
+#       define SIG_ERR ((Sigfunc *)-1)
 #endif
 
 /** prototypes **/
-static int _cmd_open (char *const *, int *, int *)
-        __attribute__ ((__nonnull__ (1, 2, 3)));
+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_fetch_output(int, output *, int) __attribute__((__nonnull__(2)));
 
-static int _cmd_close (int);
+static int _cmd_close(int);
 
 /* prototype imported from utils.h */
-extern void die (int, const char *, ...)
-        __attribute__ ((__noreturn__, __format__ (__printf__, 2, 3)));
-
+extern void die(int, const char *, ...) __attribute__((__noreturn__, __format__(__printf__, 2, 3)));
 
 /* this function is NOT async-safe. It is exported so multithreaded
  * plugins (or other apps) can call it prior to running any commands
  * through this api and thus achieve async-safeness throughout the api */
-void
-cmd_init (void)
-{
+void cmd_init(void) {
         long maxfd = mp_open_max();
 
         /* if maxfd is unnaturally high, we force it to a lower value
          * ( e.g. on SunOS, when ulimit is set to unlimited: 2147483647 this would cause
          * a segfault when following calloc is called ...  ) */
 
-        if ( maxfd > MAXFD_LIMIT ) {
+        if (maxfd > MAXFD_LIMIT) {
                 maxfd = MAXFD_LIMIT;
         }
 
         if (!_cmd_pids)
-                _cmd_pids = calloc (maxfd, sizeof (pid_t));
+                _cmd_pids = calloc(maxfd, sizeof(pid_t));
 }
 
-
 /* Start running a command, array style */
-static int
-_cmd_open (char *const *argv, int *pfd, int *pfderr)
-{
+static int _cmd_open(char *const *argv, int *pfd, int *pfderr) {
         pid_t pid;
 #ifdef RLIMIT_CORE
         struct rlimit limit;
@@ -130,26 +121,26 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
 
         setenv("LC_ALL", "C", 1);
 
-        if (pipe (pfd) < 0 || pipe (pfderr) < 0 || (pid = fork ()) < 0)
-                return -1;                                                                      /* errno set by the failing function */
+        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) {
-#ifdef  RLIMIT_CORE
+#ifdef RLIMIT_CORE
                 /* the program we execve shouldn't leave core files */
-                getrlimit (RLIMIT_CORE, &limit);
+                getrlimit(RLIMIT_CORE, &limit);
                 limit.rlim_cur = 0;
-                setrlimit (RLIMIT_CORE, &limit);
+                setrlimit(RLIMIT_CORE, &limit);
 #endif
-                close (pfd[0]);
+                close(pfd[0]);
                 if (pfd[1] != STDOUT_FILENO) {
-                        dup2 (pfd[1], STDOUT_FILENO);
-                        close (pfd[1]);
+                        dup2(pfd[1], STDOUT_FILENO);
+                        close(pfd[1]);
                 }
-                close (pfderr[0]);
+                close(pfderr[0]);
                 if (pfderr[1] != STDERR_FILENO) {
-                        dup2 (pfderr[1], STDERR_FILENO);
-                        close (pfderr[1]);
+                        dup2(pfderr[1], STDERR_FILENO);
+                        close(pfderr[1]);
                 }
 
                 /* close all descriptors in _cmd_pids[]
@@ -158,16 +149,16 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
                 long maxfd = mp_open_max();
                 for (i = 0; i < maxfd; i++)
                         if (_cmd_pids[i] > 0)
-                                close (i);
+                                close(i);
 
-                execve (argv[0], argv, environ);
-                _exit (STATE_UNKNOWN);
+                execve(argv[0], argv, environ);
+                _exit(STATE_UNKNOWN);
         }
 
         /* parent picks up execution here */
         /* close children descriptors in our address space */
-        close (pfd[1]);
-        close (pfderr[1]);
+        close(pfd[1]);
+        close(pfderr[1]);
 
         /* tag our file's entry in the pid-list and return it */
         _cmd_pids[pfd[0]] = pid;
@@ -175,9 +166,7 @@ _cmd_open (char *const *argv, int *pfd, int *pfderr)
         return pfd[0];
 }
 
-static int
-_cmd_close (int fd)
-{
+static int _cmd_close(int fd) {
         int status;
         pid_t pid;
 
@@ -187,40 +176,37 @@ _cmd_close (int fd)
                 return -1;
 
         _cmd_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)
+        while (waitpid(pid, &status, 0) < 0)
                 if (errno != EINTR)
                         return -1;
 
         /* return child's termination status */
-        return (WIFEXITED (status)) ? WEXITSTATUS (status) : -1;
+        return (WIFEXITED(status)) ? WEXITSTATUS(status) : -1;
 }
 
-
-static int
-_cmd_fetch_output (int fd, output * op, int flags)
-{
+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 */
+        size_t rsf = 6, ary_size = 0; /* rsf = right shift factor, dec'ed uncond once */
         char *buf = NULL;
         int ret;
         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);
+        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;
                 i++;
         }
 
         if (ret < 0) {
-                printf ("read() returned %d: %s\n", ret, strerror (errno));
+                printf("read() returned %d: %s\n", ret, strerror(errno));
                 return ret;
         }
 
@@ -231,10 +217,9 @@ _cmd_fetch_output (int fd, output * op, int flags)
 
         /* and some may want both */
         if (flags & CMD_NO_ASSOC) {
-                buf = malloc (op->buflen);
-                memcpy (buf, op->buf, op->buflen);
-        }
-        else
+                buf = malloc(op->buflen);
+                memcpy(buf, op->buf, op->buflen);
+        } else
                 buf = op->buf;
 
         op->line = NULL;
@@ -248,8 +233,8 @@ _cmd_fetch_output (int fd, output * op, int flags)
                                 ary_size = op->buflen >> --rsf;
                         } while (!ary_size);
 
-                        op->line = realloc (op->line, ary_size * sizeof (char *));
-                        op->lens = realloc (op->lens, ary_size * sizeof (size_t));
+                        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 */
@@ -261,7 +246,7 @@ _cmd_fetch_output (int fd, output * op, int flags)
                 buf[i] = '\0';
 
                 /* calculate the string length using pointer difference */
-                op->lens[lineno] = (size_t) & buf[i] - (size_t) op->line[lineno];
+                op->lens[lineno] = (size_t)&buf[i] - (size_t)op->line[lineno];
 
                 lineno++;
                 i++;
@@ -270,10 +255,7 @@ _cmd_fetch_output (int fd, output * op, int flags)
         return lineno;
 }
 
-
-int
-cmd_run (const char *cmdstring, output * out, output * err, int flags)
-{
+int cmd_run(const char *cmdstring, output *out, output *err, int flags) {
         int i = 0, argc;
         size_t cmdlen;
         char **argv = NULL;
@@ -285,120 +267,114 @@ cmd_run (const char *cmdstring, output * out, output * err, int flags)
 
         /* initialize the structs */
         if (out)
-                memset (out, 0, sizeof (output));
+                memset(out, 0, sizeof(output));
         if (err)
-                memset (err, 0, sizeof (output));
+                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)
+        cmdlen = strlen(cmdstring);
+        if ((cmd = malloc(cmdlen + 1)) == NULL)
                 return -1;
-        memcpy (cmd, cmdstring, cmdlen);
+        memcpy(cmd, cmdstring, cmdlen);
         cmd[cmdlen] = '\0';
 
         /* This is not a shell, so we don't handle "???" */
-        if (strstr (cmdstring, "\"")) return -1;
+        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 (sizeof (char *), argc);
+        argv = calloc((size_t)argc, sizeof(char *));
 
         if (argv == NULL) {
-                printf ("%s\n", _("Could not malloc argv array in popen()"));
+                printf("%s\n", _("Could not malloc argv array in popen()"));
                 return -1;
         }
 
         /* get command arguments (stupidly, but fairly quickly) */
         while (cmd) {
                 str = cmd;
-                str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
+                str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
 
-                if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
+                if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
                         str++;
-                        if (!strstr (str, "'"))
-                                return -1;                                                      /* 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 {
+                        if (!strstr(str, "'"))
+                                return -1; /* 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"))
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n"))
                         cmd = NULL;
 
                 argv[i++] = str;
         }
 
-        return cmd_run_array (argv, out, err, flags);
+        return cmd_run_array(argv, out, err, flags);
 }
 
-int
-cmd_run_array (char *const *argv, output * out, output * err, int flags)
-{
+int cmd_run_array(char *const *argv, output *out, output *err, int flags) {
         int fd, pfd_out[2], pfd_err[2];
 
         /* initialize the structs */
         if (out)
-                memset (out, 0, sizeof (output));
+                memset(out, 0, sizeof(output));
         if (err)
-                memset (err, 0, sizeof (output));
+                memset(err, 0, sizeof(output));
 
-        if ((fd = _cmd_open (argv, pfd_out, pfd_err)) == -1)
-                die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), argv[0]);
+        if ((fd = _cmd_open(argv, pfd_out, pfd_err)) == -1)
+                die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), argv[0]);
 
         if (out)
-                out->lines = _cmd_fetch_output (pfd_out[0], out, flags);
+                out->lines = _cmd_fetch_output(pfd_out[0], out, flags);
         if (err)
-                err->lines = _cmd_fetch_output (pfd_err[0], err, flags);
+                err->lines = _cmd_fetch_output(pfd_err[0], err, flags);
 
-        return _cmd_close (fd);
+        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)
-                memset (out, 0, sizeof(output));
+        if (out)
+                memset(out, 0, sizeof(output));
 
         if ((fd = open(filename, O_RDONLY)) == -1) {
-                die( STATE_UNKNOWN, _("Error opening %s: %s"), filename, strerror(errno) );
+                die(STATE_UNKNOWN, _("Error opening %s: %s"), filename, strerror(errno));
         }
 
-        if(out)
-                out->lines = _cmd_fetch_output (fd, out, flags);
+        if (out)
+                out->lines = _cmd_fetch_output(fd, out, flags);
 
         if (close(fd) == -1)
-                die( STATE_UNKNOWN, _("Error closing %s: %s"), filename, strerror(errno) );
+                die(STATE_UNKNOWN, _("Error closing %s: %s"), filename, strerror(errno));
 
         return 0;
 }
 
-void
-timeout_alarm_handler (int signo)
-{
+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) for(long int i = 0; i < maxfd; i++) {
-                        if(_cmd_pids[i] != 0) kill(_cmd_pids[i], SIGKILL);
-                }
+                if (_cmd_pids)
+                        for (long int i = 0; i < maxfd; i++) {
+                                if (_cmd_pids[i] != 0)
+                                        kill(_cmd_pids[i], SIGKILL);
+                        }
 
-                exit (timeout_state);
+                exit(timeout_state);
         }
 }
diff --git a/lib/utils_cmd.h b/lib/utils_cmd.h
index 061f5d4f..728ece23 100644
--- a/lib/utils_cmd.h
+++ b/lib/utils_cmd.h
@@ -4,12 +4,10 @@
 /*
  * Header file for Monitoring Plugins utils_cmd.c
  *
- *
  */
 
 /** types **/
-struct output
-{
+struct output {
         char *buf;     /* output buffer */
         size_t buflen; /* output buffer content length */
         char **line;   /* array of lines (points to buf) */
@@ -20,20 +18,18 @@ struct output
 typedef struct 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_run(const char *, output *, output *, int);
+int cmd_run_array(char *const *, output *, output *, int);
+int cmd_file_read(const char *, output *, int);
 
 /* only multi-threaded plugins need to bother with this */
-void cmd_init (void);
+void cmd_init(void);
 #define CMD_INIT cmd_init()
 
 /* possible flags for cmd_run()'s fourth argument */
-#define CMD_NO_ARRAYS 0x01   /* don't populate arrays at all */
-#define CMD_NO_ASSOC 0x02    /* output.line won't point to buf */
-
-
-void timeout_alarm_handler (int);
+#define CMD_NO_ARRAYS 0x01 /* don't populate arrays at all */
+#define CMD_NO_ASSOC  0x02 /* output.line won't point to buf */
 
+void timeout_alarm_handler(int);
 
 #endif /* _UTILS_CMD_ */
diff --git a/lib/utils_disk.c b/lib/utils_disk.c
deleted file mode 100644
index 483be06d..00000000
--- a/lib/utils_disk.c
+++ /dev/null
@@ -1,270 +0,0 @@
-/*****************************************************************************
-*
-* Library for check_disk
-*
-* License: GPL
-* Copyright (c) 1999-2007 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 5b2caf23..00000000
--- a/lib/utils_disk.h
+++ /dev/null
@@ -1,52 +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 23ee4a95..daae1d54 100644
--- a/lib/utils_tcp.c
+++ b/lib/utils_tcp.c
@@ -1,51 +1,46 @@
 /*****************************************************************************
-*
-* Library for check_tcp
-*
-* License: GPL
-* Copyright (c) 1999-2013 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains utilities for check_tcp. 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/>.
-*
-*
-*****************************************************************************/
+ *
+ * Library for check_tcp
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains utilities for check_tcp. 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_tcp.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)
-{
+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);
+                        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) {
@@ -58,15 +53,14 @@ np_expect_match(char *status, char **server_expect, int expect_count, int flags)
                                 continue;
                         }
                 } else if (strstr(status, server_expect[i]) != NULL) {
-                                VERBOSE("found it");
-                                match++;
-                                continue;
+                        VERBOSE("found it");
+                        match++;
+                        continue;
                 }
                 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))
                 return NP_MATCH_RETRY;
diff --git a/lib/utils_tcp.h b/lib/utils_tcp.h
index 0328a9cf..a7d83c59 100644
--- a/lib/utils_tcp.h
+++ b/lib/utils_tcp.h
@@ -1,8 +1,8 @@
 /* Header file for utils_tcp */
 
-#define NP_MATCH_ALL            0x1
-#define NP_MATCH_EXACT          0x2
-#define NP_MATCH_VERBOSE        0x4
+#define NP_MATCH_ALL     0x1
+#define NP_MATCH_EXACT   0x2
+#define NP_MATCH_VERBOSE 0x4
 
 /*
  * The NP_MATCH_RETRY state indicates that matching might succeed if
@@ -11,12 +11,10 @@
  * 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/lib/vendor/cJSON/cJSON.c b/lib/vendor/cJSON/cJSON.c
new file mode 100644
index 00000000..12076e92
--- /dev/null
+++ b/lib/vendor/cJSON/cJSON.c
@@ -0,0 +1,3165 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+/* cJSON */
+/* JSON parser in C. */
+
+/* disable warnings about old C89 functions in MSVC */
+#if !defined(_CRT_SECURE_NO_DEPRECATE) && defined(_MSC_VER)
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+
+#ifdef __GNUC__
+#pragma GCC visibility push(default)
+#endif
+#if defined(_MSC_VER)
+#pragma warning (push)
+/* disable warning about single line comments in system headers */
+#pragma warning (disable : 4001)
+#endif
+
+#include "../../../config.h"
+#include <string.h>
+#include <stdio.h>
+#include <math.h>
+#include <stdlib.h>
+#include <limits.h>
+#include <ctype.h>
+#include <float.h>
+
+#ifdef ENABLE_LOCALES
+#include <locale.h>
+#endif
+
+#if defined(_MSC_VER)
+#pragma warning (pop)
+#endif
+#ifdef __GNUC__
+#pragma GCC visibility pop
+#endif
+
+#include "cJSON.h"
+
+/* define our own boolean type */
+#ifdef true
+#undef true
+#endif
+#define true ((cJSON_bool)1)
+
+#ifdef false
+#undef false
+#endif
+#define false ((cJSON_bool)0)
+
+/* define isnan and isinf for ANSI C, if in C99 or above, isnan and isinf has been defined in math.h */
+#ifndef isinf
+#define isinf(d) (isnan((d - d)) && !isnan(d))
+#endif
+#ifndef isnan
+#define isnan(d) (d != d)
+#endif
+
+#ifndef NAN
+#ifdef _WIN32
+#define NAN sqrt(-1.0)
+#else
+#define NAN 0.0/0.0
+#endif
+#endif
+
+typedef struct {
+    const unsigned char *json;
+    size_t position;
+} error;
+static error global_error = { NULL, 0 };
+
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void)
+{
+    return (const char*) (global_error.json + global_error.position);
+}
+
+CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item)
+{
+    if (!cJSON_IsString(item))
+    {
+        return NULL;
+    }
+
+    return item->valuestring;
+}
+
+CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item)
+{
+    if (!cJSON_IsNumber(item))
+    {
+        return (double) NAN;
+    }
+
+    return item->valuedouble;
+}
+
+/* This is a safeguard to prevent copy-pasters from using incompatible C and header files */
+#if (CJSON_VERSION_MAJOR != 1) || (CJSON_VERSION_MINOR != 7) || (CJSON_VERSION_PATCH != 18)
+    #error cJSON.h and cJSON.c have different versions. Make sure that both have the same.
+#endif
+
+CJSON_PUBLIC(const char*) cJSON_Version(void)
+{
+    static char version[15];
+    sprintf(version, "%i.%i.%i", CJSON_VERSION_MAJOR, CJSON_VERSION_MINOR, CJSON_VERSION_PATCH);
+
+    return version;
+}
+
+/* Case insensitive string comparison, doesn't consider two NULL pointers equal though */
+static int case_insensitive_strcmp(const unsigned char *string1, const unsigned char *string2)
+{
+    if ((string1 == NULL) || (string2 == NULL))
+    {
+        return 1;
+    }
+
+    if (string1 == string2)
+    {
+        return 0;
+    }
+
+    for(; tolower(*string1) == tolower(*string2); (void)string1++, string2++)
+    {
+        if (*string1 == '\0')
+        {
+            return 0;
+        }
+    }
+
+    return tolower(*string1) - tolower(*string2);
+}
+
+typedef struct internal_hooks
+{
+    void *(CJSON_CDECL *allocate)(size_t size);
+    void (CJSON_CDECL *deallocate)(void *pointer);
+    void *(CJSON_CDECL *reallocate)(void *pointer, size_t size);
+} internal_hooks;
+
+#if defined(_MSC_VER)
+/* work around MSVC error C2322: '...' address of dllimport '...' is not static */
+static void * CJSON_CDECL internal_malloc(size_t size)
+{
+    return malloc(size);
+}
+static void CJSON_CDECL internal_free(void *pointer)
+{
+    free(pointer);
+}
+static void * CJSON_CDECL internal_realloc(void *pointer, size_t size)
+{
+    return realloc(pointer, size);
+}
+#else
+#define internal_malloc malloc
+#define internal_free free
+#define internal_realloc realloc
+#endif
+
+/* strlen of character literals resolved at compile time */
+#define static_strlen(string_literal) (sizeof(string_literal) - sizeof(""))
+
+static internal_hooks global_hooks = { internal_malloc, internal_free, internal_realloc };
+
+static unsigned char* cJSON_strdup(const unsigned char* string, const internal_hooks * const hooks)
+{
+    size_t length = 0;
+    unsigned char *copy = NULL;
+
+    if (string == NULL)
+    {
+        return NULL;
+    }
+
+    length = strlen((const char*)string) + sizeof("");
+    copy = (unsigned char*)hooks->allocate(length);
+    if (copy == NULL)
+    {
+        return NULL;
+    }
+    memcpy(copy, string, length);
+
+    return copy;
+}
+
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks)
+{
+    if (hooks == NULL)
+    {
+        /* Reset hooks */
+        global_hooks.allocate = malloc;
+        global_hooks.deallocate = free;
+        global_hooks.reallocate = realloc;
+        return;
+    }
+
+    global_hooks.allocate = malloc;
+    if (hooks->malloc_fn != NULL)
+    {
+        global_hooks.allocate = hooks->malloc_fn;
+    }
+
+    global_hooks.deallocate = free;
+    if (hooks->free_fn != NULL)
+    {
+        global_hooks.deallocate = hooks->free_fn;
+    }
+
+    /* use realloc only if both free and malloc are used */
+    global_hooks.reallocate = NULL;
+    if ((global_hooks.allocate == malloc) && (global_hooks.deallocate == free))
+    {
+        global_hooks.reallocate = realloc;
+    }
+}
+
+/* Internal constructor. */
+static cJSON *cJSON_New_Item(const internal_hooks * const hooks)
+{
+    cJSON* node = (cJSON*)hooks->allocate(sizeof(cJSON));
+    if (node)
+    {
+        memset(node, '\0', sizeof(cJSON));
+    }
+
+    return node;
+}
+
+/* Delete a cJSON structure. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item)
+{
+    cJSON *next = NULL;
+    while (item != NULL)
+    {
+        next = item->next;
+        if (!(item->type & cJSON_IsReference) && (item->child != NULL))
+        {
+            cJSON_Delete(item->child);
+        }
+        if (!(item->type & cJSON_IsReference) && (item->valuestring != NULL))
+        {
+            global_hooks.deallocate(item->valuestring);
+            item->valuestring = NULL;
+        }
+        if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+        {
+            global_hooks.deallocate(item->string);
+            item->string = NULL;
+        }
+        global_hooks.deallocate(item);
+        item = next;
+    }
+}
+
+/* get the decimal point character of the current locale */
+static unsigned char get_decimal_point(void)
+{
+#ifdef ENABLE_LOCALES
+    struct lconv *lconv = localeconv();
+    return (unsigned char) lconv->decimal_point[0];
+#else
+    return '.';
+#endif
+}
+
+typedef struct
+{
+    const unsigned char *content;
+    size_t length;
+    size_t offset;
+    size_t depth; /* How deeply nested (in arrays/objects) is the input at the current offset. */
+    internal_hooks hooks;
+} parse_buffer;
+
+/* check if the given size is left to read in a given parse buffer (starting with 1) */
+#define can_read(buffer, size) ((buffer != NULL) && (((buffer)->offset + size) <= (buffer)->length))
+/* check if the buffer can be accessed at the given index (starting with 0) */
+#define can_access_at_index(buffer, index) ((buffer != NULL) && (((buffer)->offset + index) < (buffer)->length))
+#define cannot_access_at_index(buffer, index) (!can_access_at_index(buffer, index))
+/* get a pointer to the buffer at the position */
+#define buffer_at_offset(buffer) ((buffer)->content + (buffer)->offset)
+
+/* Parse the input text to generate a number, and populate the result into item. */
+static cJSON_bool parse_number(cJSON * const item, parse_buffer * const input_buffer)
+{
+    double number = 0;
+    unsigned char *after_end = NULL;
+    unsigned char number_c_string[64];
+    unsigned char decimal_point = get_decimal_point();
+    size_t i = 0;
+
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false;
+    }
+
+    /* copy the number into a temporary buffer and replace '.' with the decimal point
+     * of the current locale (for strtod)
+     * This also takes care of '\0' not necessarily being available for marking the end of the input */
+    for (i = 0; (i < (sizeof(number_c_string) - 1)) && can_access_at_index(input_buffer, i); i++)
+    {
+        switch (buffer_at_offset(input_buffer)[i])
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            case '+':
+            case '-':
+            case 'e':
+            case 'E':
+                number_c_string[i] = buffer_at_offset(input_buffer)[i];
+                break;
+
+            case '.':
+                number_c_string[i] = decimal_point;
+                break;
+
+            default:
+                goto loop_end;
+        }
+    }
+loop_end:
+    number_c_string[i] = '\0';
+
+    number = strtod((const char*)number_c_string, (char**)&after_end);
+    if (number_c_string == after_end)
+    {
+        return false; /* parse_error */
+    }
+
+    item->valuedouble = number;
+
+    /* use saturation in case of overflow */
+    if (number >= INT_MAX)
+    {
+        item->valueint = INT_MAX;
+    }
+    else if (number <= (double)INT_MIN)
+    {
+        item->valueint = INT_MIN;
+    }
+    else
+    {
+        item->valueint = (int)number;
+    }
+
+    item->type = cJSON_Number;
+
+    input_buffer->offset += (size_t)(after_end - number_c_string);
+    return true;
+}
+
+/* don't ask me, but the original cJSON_SetNumberValue returns an integer or double */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number)
+{
+    if (number >= INT_MAX)
+    {
+        object->valueint = INT_MAX;
+    }
+    else if (number <= (double)INT_MIN)
+    {
+        object->valueint = INT_MIN;
+    }
+    else
+    {
+        object->valueint = (int)number;
+    }
+
+    return object->valuedouble = number;
+}
+
+/* Note: when passing a NULL valuestring, cJSON_SetValuestring treats this as an error and return NULL */
+CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring)
+{
+    char *copy = NULL;
+    size_t v1_len;
+    size_t v2_len;
+    /* if object's type is not cJSON_String or is cJSON_IsReference, it should not set valuestring */
+    if ((object == NULL) || !(object->type & cJSON_String) || (object->type & cJSON_IsReference))
+    {
+        return NULL;
+    }
+    /* return NULL if the object is corrupted or valuestring is NULL */
+    if (object->valuestring == NULL || valuestring == NULL)
+    {
+        return NULL;
+    }
+
+    v1_len = strlen(valuestring);
+    v2_len = strlen(object->valuestring);
+
+    if (v1_len <= v2_len)
+    {
+        /* strcpy does not handle overlapping string: [X1, X2] [Y1, Y2] => X2 < Y1 or Y2 < X1 */
+        if (!( valuestring + v1_len < object->valuestring || object->valuestring + v2_len < valuestring ))
+        {
+            return NULL;
+        }
+        strcpy(object->valuestring, valuestring);
+        return object->valuestring;
+    }
+    copy = (char*) cJSON_strdup((const unsigned char*)valuestring, &global_hooks);
+    if (copy == NULL)
+    {
+        return NULL;
+    }
+    if (object->valuestring != NULL)
+    {
+        cJSON_free(object->valuestring);
+    }
+    object->valuestring = copy;
+
+    return copy;
+}
+
+typedef struct
+{
+    unsigned char *buffer;
+    size_t length;
+    size_t offset;
+    size_t depth; /* current nesting depth (for formatted printing) */
+    cJSON_bool noalloc;
+    cJSON_bool format; /* is this print a formatted print */
+    internal_hooks hooks;
+} printbuffer;
+
+/* realloc printbuffer if necessary to have at least "needed" bytes more */
+static unsigned char* ensure(printbuffer * const p, size_t needed)
+{
+    unsigned char *newbuffer = NULL;
+    size_t newsize = 0;
+
+    if ((p == NULL) || (p->buffer == NULL))
+    {
+        return NULL;
+    }
+
+    if ((p->length > 0) && (p->offset >= p->length))
+    {
+        /* make sure that offset is valid */
+        return NULL;
+    }
+
+    if (needed > INT_MAX)
+    {
+        /* sizes bigger than INT_MAX are currently not supported */
+        return NULL;
+    }
+
+    needed += p->offset + 1;
+    if (needed <= p->length)
+    {
+        return p->buffer + p->offset;
+    }
+
+    if (p->noalloc) {
+        return NULL;
+    }
+
+    /* calculate new buffer size */
+    if (needed > (INT_MAX / 2))
+    {
+        /* overflow of int, use INT_MAX if possible */
+        if (needed <= INT_MAX)
+        {
+            newsize = INT_MAX;
+        }
+        else
+        {
+            return NULL;
+        }
+    }
+    else
+    {
+        newsize = needed * 2;
+    }
+
+    if (p->hooks.reallocate != NULL)
+    {
+        /* reallocate with realloc if available */
+        newbuffer = (unsigned char*)p->hooks.reallocate(p->buffer, newsize);
+        if (newbuffer == NULL)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+    }
+    else
+    {
+        /* otherwise reallocate manually */
+        newbuffer = (unsigned char*)p->hooks.allocate(newsize);
+        if (!newbuffer)
+        {
+            p->hooks.deallocate(p->buffer);
+            p->length = 0;
+            p->buffer = NULL;
+
+            return NULL;
+        }
+
+        memcpy(newbuffer, p->buffer, p->offset + 1);
+        p->hooks.deallocate(p->buffer);
+    }
+    p->length = newsize;
+    p->buffer = newbuffer;
+
+    return newbuffer + p->offset;
+}
+
+/* calculate the new length of the string in a printbuffer and update the offset */
+static void update_offset(printbuffer * const buffer)
+{
+    const unsigned char *buffer_pointer = NULL;
+    if ((buffer == NULL) || (buffer->buffer == NULL))
+    {
+        return;
+    }
+    buffer_pointer = buffer->buffer + buffer->offset;
+
+    buffer->offset += strlen((const char*)buffer_pointer);
+}
+
+/* securely comparison of floating-point variables */
+static cJSON_bool compare_double(double a, double b)
+{
+    double maxVal = fabs(a) > fabs(b) ? fabs(a) : fabs(b);
+    return (fabs(a - b) <= maxVal * DBL_EPSILON);
+}
+
+/* Render the number nicely from the given item into a string. */
+static cJSON_bool print_number(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    double d = item->valuedouble;
+    int length = 0;
+    size_t i = 0;
+    unsigned char number_buffer[26] = {0}; /* temporary buffer to print the number into */
+    unsigned char decimal_point = get_decimal_point();
+    double test = 0.0;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* This checks for NaN and Infinity */
+    if (isnan(d) || isinf(d))
+    {
+        length = sprintf((char*)number_buffer, "null");
+    }
+    else if(d == (double)item->valueint)
+    {
+        length = sprintf((char*)number_buffer, "%d", item->valueint);
+    }
+    else
+    {
+        /* Try 15 decimal places of precision to avoid nonsignificant nonzero digits */
+        length = sprintf((char*)number_buffer, "%1.15g", d);
+
+        /* Check whether the original double can be recovered */
+        if ((sscanf((char*)number_buffer, "%lg", &test) != 1) || !compare_double((double)test, d))
+        {
+            /* If not, print with 17 decimal places of precision */
+            length = sprintf((char*)number_buffer, "%1.17g", d);
+        }
+    }
+
+    /* sprintf failed or buffer overrun occurred */
+    if ((length < 0) || (length > (int)(sizeof(number_buffer) - 1)))
+    {
+        return false;
+    }
+
+    /* reserve appropriate space in the output */
+    output_pointer = ensure(output_buffer, (size_t)length + sizeof(""));
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    /* copy the printed number to the output and replace locale
+     * dependent decimal point with '.' */
+    for (i = 0; i < ((size_t)length); i++)
+    {
+        if (number_buffer[i] == decimal_point)
+        {
+            output_pointer[i] = '.';
+            continue;
+        }
+
+        output_pointer[i] = number_buffer[i];
+    }
+    output_pointer[i] = '\0';
+
+    output_buffer->offset += (size_t)length;
+
+    return true;
+}
+
+/* parse 4 digit hexadecimal number */
+static unsigned parse_hex4(const unsigned char * const input)
+{
+    unsigned int h = 0;
+    size_t i = 0;
+
+    for (i = 0; i < 4; i++)
+    {
+        /* parse digit */
+        if ((input[i] >= '0') && (input[i] <= '9'))
+        {
+            h += (unsigned int) input[i] - '0';
+        }
+        else if ((input[i] >= 'A') && (input[i] <= 'F'))
+        {
+            h += (unsigned int) 10 + input[i] - 'A';
+        }
+        else if ((input[i] >= 'a') && (input[i] <= 'f'))
+        {
+            h += (unsigned int) 10 + input[i] - 'a';
+        }
+        else /* invalid */
+        {
+            return 0;
+        }
+
+        if (i < 3)
+        {
+            /* shift left to make place for the next nibble */
+            h = h << 4;
+        }
+    }
+
+    return h;
+}
+
+/* converts a UTF-16 literal to UTF-8
+ * A literal can be one or two sequences of the form \uXXXX */
+static unsigned char utf16_literal_to_utf8(const unsigned char * const input_pointer, const unsigned char * const input_end, unsigned char **output_pointer)
+{
+    long unsigned int codepoint = 0;
+    unsigned int first_code = 0;
+    const unsigned char *first_sequence = input_pointer;
+    unsigned char utf8_length = 0;
+    unsigned char utf8_position = 0;
+    unsigned char sequence_length = 0;
+    unsigned char first_byte_mark = 0;
+
+    if ((input_end - first_sequence) < 6)
+    {
+        /* input ends unexpectedly */
+        goto fail;
+    }
+
+    /* get the first utf16 sequence */
+    first_code = parse_hex4(first_sequence + 2);
+
+    /* check that the code is valid */
+    if (((first_code >= 0xDC00) && (first_code <= 0xDFFF)))
+    {
+        goto fail;
+    }
+
+    /* UTF16 surrogate pair */
+    if ((first_code >= 0xD800) && (first_code <= 0xDBFF))
+    {
+        const unsigned char *second_sequence = first_sequence + 6;
+        unsigned int second_code = 0;
+        sequence_length = 12; /* \uXXXX\uXXXX */
+
+        if ((input_end - second_sequence) < 6)
+        {
+            /* input ends unexpectedly */
+            goto fail;
+        }
+
+        if ((second_sequence[0] != '\\') || (second_sequence[1] != 'u'))
+        {
+            /* missing second half of the surrogate pair */
+            goto fail;
+        }
+
+        /* get the second utf16 sequence */
+        second_code = parse_hex4(second_sequence + 2);
+        /* check that the code is valid */
+        if ((second_code < 0xDC00) || (second_code > 0xDFFF))
+        {
+            /* invalid second half of the surrogate pair */
+            goto fail;
+        }
+
+
+        /* calculate the unicode codepoint from the surrogate pair */
+        codepoint = 0x10000 + (((first_code & 0x3FF) << 10) | (second_code & 0x3FF));
+    }
+    else
+    {
+        sequence_length = 6; /* \uXXXX */
+        codepoint = first_code;
+    }
+
+    /* encode as UTF-8
+     * takes at maximum 4 bytes to encode:
+     * 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx */
+    if (codepoint < 0x80)
+    {
+        /* normal ascii, encoding 0xxxxxxx */
+        utf8_length = 1;
+    }
+    else if (codepoint < 0x800)
+    {
+        /* two bytes, encoding 110xxxxx 10xxxxxx */
+        utf8_length = 2;
+        first_byte_mark = 0xC0; /* 11000000 */
+    }
+    else if (codepoint < 0x10000)
+    {
+        /* three bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 3;
+        first_byte_mark = 0xE0; /* 11100000 */
+    }
+    else if (codepoint <= 0x10FFFF)
+    {
+        /* four bytes, encoding 1110xxxx 10xxxxxx 10xxxxxx 10xxxxxx */
+        utf8_length = 4;
+        first_byte_mark = 0xF0; /* 11110000 */
+    }
+    else
+    {
+        /* invalid unicode codepoint */
+        goto fail;
+    }
+
+    /* encode as utf8 */
+    for (utf8_position = (unsigned char)(utf8_length - 1); utf8_position > 0; utf8_position--)
+    {
+        /* 10xxxxxx */
+        (*output_pointer)[utf8_position] = (unsigned char)((codepoint | 0x80) & 0xBF);
+        codepoint >>= 6;
+    }
+    /* encode first byte */
+    if (utf8_length > 1)
+    {
+        (*output_pointer)[0] = (unsigned char)((codepoint | first_byte_mark) & 0xFF);
+    }
+    else
+    {
+        (*output_pointer)[0] = (unsigned char)(codepoint & 0x7F);
+    }
+
+    *output_pointer += utf8_length;
+
+    return sequence_length;
+
+fail:
+    return 0;
+}
+
+/* Parse the input text into an unescaped cinput, and populate item. */
+static cJSON_bool parse_string(cJSON * const item, parse_buffer * const input_buffer)
+{
+    const unsigned char *input_pointer = buffer_at_offset(input_buffer) + 1;
+    const unsigned char *input_end = buffer_at_offset(input_buffer) + 1;
+    unsigned char *output_pointer = NULL;
+    unsigned char *output = NULL;
+
+    /* not a string */
+    if (buffer_at_offset(input_buffer)[0] != '\"')
+    {
+        goto fail;
+    }
+
+    {
+        /* calculate approximate size of the output (overestimate) */
+        size_t allocation_length = 0;
+        size_t skipped_bytes = 0;
+        while (((size_t)(input_end - input_buffer->content) < input_buffer->length) && (*input_end != '\"'))
+        {
+            /* is escape sequence */
+            if (input_end[0] == '\\')
+            {
+                if ((size_t)(input_end + 1 - input_buffer->content) >= input_buffer->length)
+                {
+                    /* prevent buffer overflow when last input character is a backslash */
+                    goto fail;
+                }
+                skipped_bytes++;
+                input_end++;
+            }
+            input_end++;
+        }
+        if (((size_t)(input_end - input_buffer->content) >= input_buffer->length) || (*input_end != '\"'))
+        {
+            goto fail; /* string ended unexpectedly */
+        }
+
+        /* This is at most how much we need for the output */
+        allocation_length = (size_t) (input_end - buffer_at_offset(input_buffer)) - skipped_bytes;
+        output = (unsigned char*)input_buffer->hooks.allocate(allocation_length + sizeof(""));
+        if (output == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+    }
+
+    output_pointer = output;
+    /* loop through the string literal */
+    while (input_pointer < input_end)
+    {
+        if (*input_pointer != '\\')
+        {
+            *output_pointer++ = *input_pointer++;
+        }
+        /* escape sequence */
+        else
+        {
+            unsigned char sequence_length = 2;
+            if ((input_end - input_pointer) < 1)
+            {
+                goto fail;
+            }
+
+            switch (input_pointer[1])
+            {
+                case 'b':
+                    *output_pointer++ = '\b';
+                    break;
+                case 'f':
+                    *output_pointer++ = '\f';
+                    break;
+                case 'n':
+                    *output_pointer++ = '\n';
+                    break;
+                case 'r':
+                    *output_pointer++ = '\r';
+                    break;
+                case 't':
+                    *output_pointer++ = '\t';
+                    break;
+                case '\"':
+                case '\\':
+                case '/':
+                    *output_pointer++ = input_pointer[1];
+                    break;
+
+                /* UTF-16 literal */
+                case 'u':
+                    sequence_length = utf16_literal_to_utf8(input_pointer, input_end, &output_pointer);
+                    if (sequence_length == 0)
+                    {
+                        /* failed to convert UTF16-literal to UTF-8 */
+                        goto fail;
+                    }
+                    break;
+
+                default:
+                    goto fail;
+            }
+            input_pointer += sequence_length;
+        }
+    }
+
+    /* zero terminate the output */
+    *output_pointer = '\0';
+
+    item->type = cJSON_String;
+    item->valuestring = (char*)output;
+
+    input_buffer->offset = (size_t) (input_end - input_buffer->content);
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (output != NULL)
+    {
+        input_buffer->hooks.deallocate(output);
+        output = NULL;
+    }
+
+    if (input_pointer != NULL)
+    {
+        input_buffer->offset = (size_t)(input_pointer - input_buffer->content);
+    }
+
+    return false;
+}
+
+/* Render the cstring provided to an escaped version that can be printed. */
+static cJSON_bool print_string_ptr(const unsigned char * const input, printbuffer * const output_buffer)
+{
+    const unsigned char *input_pointer = NULL;
+    unsigned char *output = NULL;
+    unsigned char *output_pointer = NULL;
+    size_t output_length = 0;
+    /* numbers of additional characters needed for escaping */
+    size_t escape_characters = 0;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* empty string */
+    if (input == NULL)
+    {
+        output = ensure(output_buffer, sizeof("\"\""));
+        if (output == NULL)
+        {
+            return false;
+        }
+        strcpy((char*)output, "\"\"");
+
+        return true;
+    }
+
+    /* set "flag" to 1 if something needs to be escaped */
+    for (input_pointer = input; *input_pointer; input_pointer++)
+    {
+        switch (*input_pointer)
+        {
+            case '\"':
+            case '\\':
+            case '\b':
+            case '\f':
+            case '\n':
+            case '\r':
+            case '\t':
+                /* one character escape sequence */
+                escape_characters++;
+                break;
+            default:
+                if (*input_pointer < 32)
+                {
+                    /* UTF-16 escape sequence uXXXX */
+                    escape_characters += 5;
+                }
+                break;
+        }
+    }
+    output_length = (size_t)(input_pointer - input) + escape_characters;
+
+    output = ensure(output_buffer, output_length + sizeof("\"\""));
+    if (output == NULL)
+    {
+        return false;
+    }
+
+    /* no characters have to be escaped */
+    if (escape_characters == 0)
+    {
+        output[0] = '\"';
+        memcpy(output + 1, input, output_length);
+        output[output_length + 1] = '\"';
+        output[output_length + 2] = '\0';
+
+        return true;
+    }
+
+    output[0] = '\"';
+    output_pointer = output + 1;
+    /* copy the string */
+    for (input_pointer = input; *input_pointer != '\0'; (void)input_pointer++, output_pointer++)
+    {
+        if ((*input_pointer > 31) && (*input_pointer != '\"') && (*input_pointer != '\\'))
+        {
+            /* normal character, copy */
+            *output_pointer = *input_pointer;
+        }
+        else
+        {
+            /* character needs to be escaped */
+            *output_pointer++ = '\\';
+            switch (*input_pointer)
+            {
+                case '\\':
+                    *output_pointer = '\\';
+                    break;
+                case '\"':
+                    *output_pointer = '\"';
+                    break;
+                case '\b':
+                    *output_pointer = 'b';
+                    break;
+                case '\f':
+                    *output_pointer = 'f';
+                    break;
+                case '\n':
+                    *output_pointer = 'n';
+                    break;
+                case '\r':
+                    *output_pointer = 'r';
+                    break;
+                case '\t':
+                    *output_pointer = 't';
+                    break;
+                default:
+                    /* escape and print as unicode codepoint */
+                    sprintf((char*)output_pointer, "u%04x", *input_pointer);
+                    output_pointer += 4;
+                    break;
+            }
+        }
+    }
+    output[output_length + 1] = '\"';
+    output[output_length + 2] = '\0';
+
+    return true;
+}
+
+/* Invoke print_string_ptr (which is useful) on an item. */
+static cJSON_bool print_string(const cJSON * const item, printbuffer * const p)
+{
+    return print_string_ptr((unsigned char*)item->valuestring, p);
+}
+
+/* Predeclare these prototypes. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer);
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer);
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer);
+
+/* Utility to jump whitespace and cr/lf */
+static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL))
+    {
+        return NULL;
+    }
+
+    if (cannot_access_at_index(buffer, 0))
+    {
+        return buffer;
+    }
+
+    while (can_access_at_index(buffer, 0) && (buffer_at_offset(buffer)[0] <= 32))
+    {
+       buffer->offset++;
+    }
+
+    if (buffer->offset == buffer->length)
+    {
+        buffer->offset--;
+    }
+
+    return buffer;
+}
+
+/* skip the UTF-8 BOM (byte order mark) if it is at the beginning of a buffer */
+static parse_buffer *skip_utf8_bom(parse_buffer * const buffer)
+{
+    if ((buffer == NULL) || (buffer->content == NULL) || (buffer->offset != 0))
+    {
+        return NULL;
+    }
+
+    if (can_access_at_index(buffer, 4) && (strncmp((const char*)buffer_at_offset(buffer), "\xEF\xBB\xBF", 3) == 0))
+    {
+        buffer->offset += 3;
+    }
+
+    return buffer;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated)
+{
+    size_t buffer_length;
+
+    if (NULL == value)
+    {
+        return NULL;
+    }
+
+    /* Adding null character size due to require_null_terminated. */
+    buffer_length = strlen(value) + sizeof("");
+
+    return cJSON_ParseWithLengthOpts(value, buffer_length, return_parse_end, require_null_terminated);
+}
+
+/* Parse an object - create a new root, and populate. */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated)
+{
+    parse_buffer buffer = { 0, 0, 0, 0, { 0, 0, 0 } };
+    cJSON *item = NULL;
+
+    /* reset error position */
+    global_error.json = NULL;
+    global_error.position = 0;
+
+    if (value == NULL || 0 == buffer_length)
+    {
+        goto fail;
+    }
+
+    buffer.content = (const unsigned char*)value;
+    buffer.length = buffer_length;
+    buffer.offset = 0;
+    buffer.hooks = global_hooks;
+
+    item = cJSON_New_Item(&global_hooks);
+    if (item == NULL) /* memory fail */
+    {
+        goto fail;
+    }
+
+    if (!parse_value(item, buffer_skip_whitespace(skip_utf8_bom(&buffer))))
+    {
+        /* parse failure. ep is set. */
+        goto fail;
+    }
+
+    /* if we require null-terminated JSON without appended garbage, skip and then check for a null terminator */
+    if (require_null_terminated)
+    {
+        buffer_skip_whitespace(&buffer);
+        if ((buffer.offset >= buffer.length) || buffer_at_offset(&buffer)[0] != '\0')
+        {
+            goto fail;
+        }
+    }
+    if (return_parse_end)
+    {
+        *return_parse_end = (const char*)buffer_at_offset(&buffer);
+    }
+
+    return item;
+
+fail:
+    if (item != NULL)
+    {
+        cJSON_Delete(item);
+    }
+
+    if (value != NULL)
+    {
+        error local_error;
+        local_error.json = (const unsigned char*)value;
+        local_error.position = 0;
+
+        if (buffer.offset < buffer.length)
+        {
+            local_error.position = buffer.offset;
+        }
+        else if (buffer.length > 0)
+        {
+            local_error.position = buffer.length - 1;
+        }
+
+        if (return_parse_end != NULL)
+        {
+            *return_parse_end = (const char*)local_error.json + local_error.position;
+        }
+
+        global_error = local_error;
+    }
+
+    return NULL;
+}
+
+/* Default options for cJSON_Parse */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value)
+{
+    return cJSON_ParseWithOpts(value, 0, 0);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length)
+{
+    return cJSON_ParseWithLengthOpts(value, buffer_length, 0, 0);
+}
+
+#define cjson_min(a, b) (((a) < (b)) ? (a) : (b))
+
+static unsigned char *print(const cJSON * const item, cJSON_bool format, const internal_hooks * const hooks)
+{
+    static const size_t default_buffer_size = 256;
+    printbuffer buffer[1];
+    unsigned char *printed = NULL;
+
+    memset(buffer, 0, sizeof(buffer));
+
+    /* create buffer */
+    buffer->buffer = (unsigned char*) hooks->allocate(default_buffer_size);
+    buffer->length = default_buffer_size;
+    buffer->format = format;
+    buffer->hooks = *hooks;
+    if (buffer->buffer == NULL)
+    {
+        goto fail;
+    }
+
+    /* print the value */
+    if (!print_value(item, buffer))
+    {
+        goto fail;
+    }
+    update_offset(buffer);
+
+    /* check if reallocate is available */
+    if (hooks->reallocate != NULL)
+    {
+        printed = (unsigned char*) hooks->reallocate(buffer->buffer, buffer->offset + 1);
+        if (printed == NULL) {
+            goto fail;
+        }
+        buffer->buffer = NULL;
+    }
+    else /* otherwise copy the JSON over to a new buffer */
+    {
+        printed = (unsigned char*) hooks->allocate(buffer->offset + 1);
+        if (printed == NULL)
+        {
+            goto fail;
+        }
+        memcpy(printed, buffer->buffer, cjson_min(buffer->length, buffer->offset + 1));
+        printed[buffer->offset] = '\0'; /* just to be sure */
+
+        /* free the buffer */
+        hooks->deallocate(buffer->buffer);
+        buffer->buffer = NULL;
+    }
+
+    return printed;
+
+fail:
+    if (buffer->buffer != NULL)
+    {
+        hooks->deallocate(buffer->buffer);
+        buffer->buffer = NULL;
+    }
+
+    if (printed != NULL)
+    {
+        hooks->deallocate(printed);
+        printed = NULL;
+    }
+
+    return NULL;
+}
+
+/* Render a cJSON item/entity/structure to text. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item)
+{
+    return (char*)print(item, true, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item)
+{
+    return (char*)print(item, false, &global_hooks);
+}
+
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if (prebuffer < 0)
+    {
+        return NULL;
+    }
+
+    p.buffer = (unsigned char*)global_hooks.allocate((size_t)prebuffer);
+    if (!p.buffer)
+    {
+        return NULL;
+    }
+
+    p.length = (size_t)prebuffer;
+    p.offset = 0;
+    p.noalloc = false;
+    p.format = fmt;
+    p.hooks = global_hooks;
+
+    if (!print_value(item, &p))
+    {
+        global_hooks.deallocate(p.buffer);
+        p.buffer = NULL;
+        return NULL;
+    }
+
+    return (char*)p.buffer;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format)
+{
+    printbuffer p = { 0, 0, 0, 0, 0, 0, { 0, 0, 0 } };
+
+    if ((length < 0) || (buffer == NULL))
+    {
+        return false;
+    }
+
+    p.buffer = (unsigned char*)buffer;
+    p.length = (size_t)length;
+    p.offset = 0;
+    p.noalloc = true;
+    p.format = format;
+    p.hooks = global_hooks;
+
+    return print_value(item, &p);
+}
+
+/* Parser core - when encountering text, process appropriately. */
+static cJSON_bool parse_value(cJSON * const item, parse_buffer * const input_buffer)
+{
+    if ((input_buffer == NULL) || (input_buffer->content == NULL))
+    {
+        return false; /* no input */
+    }
+
+    /* parse the different types of values */
+    /* null */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "null", 4) == 0))
+    {
+        item->type = cJSON_NULL;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* false */
+    if (can_read(input_buffer, 5) && (strncmp((const char*)buffer_at_offset(input_buffer), "false", 5) == 0))
+    {
+        item->type = cJSON_False;
+        input_buffer->offset += 5;
+        return true;
+    }
+    /* true */
+    if (can_read(input_buffer, 4) && (strncmp((const char*)buffer_at_offset(input_buffer), "true", 4) == 0))
+    {
+        item->type = cJSON_True;
+        item->valueint = 1;
+        input_buffer->offset += 4;
+        return true;
+    }
+    /* string */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '\"'))
+    {
+        return parse_string(item, input_buffer);
+    }
+    /* number */
+    if (can_access_at_index(input_buffer, 0) && ((buffer_at_offset(input_buffer)[0] == '-') || ((buffer_at_offset(input_buffer)[0] >= '0') && (buffer_at_offset(input_buffer)[0] <= '9'))))
+    {
+        return parse_number(item, input_buffer);
+    }
+    /* array */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '['))
+    {
+        return parse_array(item, input_buffer);
+    }
+    /* object */
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '{'))
+    {
+        return parse_object(item, input_buffer);
+    }
+
+    return false;
+}
+
+/* Render a value to text. */
+static cJSON_bool print_value(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output = NULL;
+
+    if ((item == NULL) || (output_buffer == NULL))
+    {
+        return false;
+    }
+
+    switch ((item->type) & 0xFF)
+    {
+        case cJSON_NULL:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "null");
+            return true;
+
+        case cJSON_False:
+            output = ensure(output_buffer, 6);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "false");
+            return true;
+
+        case cJSON_True:
+            output = ensure(output_buffer, 5);
+            if (output == NULL)
+            {
+                return false;
+            }
+            strcpy((char*)output, "true");
+            return true;
+
+        case cJSON_Number:
+            return print_number(item, output_buffer);
+
+        case cJSON_Raw:
+        {
+            size_t raw_length = 0;
+            if (item->valuestring == NULL)
+            {
+                return false;
+            }
+
+            raw_length = strlen(item->valuestring) + sizeof("");
+            output = ensure(output_buffer, raw_length);
+            if (output == NULL)
+            {
+                return false;
+            }
+            memcpy(output, item->valuestring, raw_length);
+            return true;
+        }
+
+        case cJSON_String:
+            return print_string(item, output_buffer);
+
+        case cJSON_Array:
+            return print_array(item, output_buffer);
+
+        case cJSON_Object:
+            return print_object(item, output_buffer);
+
+        default:
+            return false;
+    }
+}
+
+/* Build an array from input text. */
+static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* head of the linked list */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (buffer_at_offset(input_buffer)[0] != '[')
+    {
+        /* not an array */
+        goto fail;
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ']'))
+    {
+        /* empty array */
+        goto success;
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        /* parse next value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || buffer_at_offset(input_buffer)[0] != ']')
+    {
+        goto fail; /* expected end of array */
+    }
+
+success:
+    input_buffer->depth--;
+
+    if (head != NULL) {
+        head->prev = current_item;
+    }
+
+    item->type = cJSON_Array;
+    item->child = head;
+
+    input_buffer->offset++;
+
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an array to text */
+static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_element = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output array. */
+    /* opening square bracket */
+    output_pointer = ensure(output_buffer, 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer = '[';
+    output_buffer->offset++;
+    output_buffer->depth++;
+
+    while (current_element != NULL)
+    {
+        if (!print_value(current_element, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+        if (current_element->next)
+        {
+            length = (size_t) (output_buffer->format ? 2 : 1);
+            output_pointer = ensure(output_buffer, length + 1);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            *output_pointer++ = ',';
+            if(output_buffer->format)
+            {
+                *output_pointer++ = ' ';
+            }
+            *output_pointer = '\0';
+            output_buffer->offset += length;
+        }
+        current_element = current_element->next;
+    }
+
+    output_pointer = ensure(output_buffer, 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    *output_pointer++ = ']';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Build an object from the text. */
+static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer)
+{
+    cJSON *head = NULL; /* linked list head */
+    cJSON *current_item = NULL;
+
+    if (input_buffer->depth >= CJSON_NESTING_LIMIT)
+    {
+        return false; /* to deeply nested */
+    }
+    input_buffer->depth++;
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '{'))
+    {
+        goto fail; /* not an object */
+    }
+
+    input_buffer->offset++;
+    buffer_skip_whitespace(input_buffer);
+    if (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == '}'))
+    {
+        goto success; /* empty object */
+    }
+
+    /* check if we skipped to the end of the buffer */
+    if (cannot_access_at_index(input_buffer, 0))
+    {
+        input_buffer->offset--;
+        goto fail;
+    }
+
+    /* step back to character in front of the first element */
+    input_buffer->offset--;
+    /* loop through the comma separated array elements */
+    do
+    {
+        /* allocate next item */
+        cJSON *new_item = cJSON_New_Item(&(input_buffer->hooks));
+        if (new_item == NULL)
+        {
+            goto fail; /* allocation failure */
+        }
+
+        /* attach next item to list */
+        if (head == NULL)
+        {
+            /* start the linked list */
+            current_item = head = new_item;
+        }
+        else
+        {
+            /* add to the end and advance */
+            current_item->next = new_item;
+            new_item->prev = current_item;
+            current_item = new_item;
+        }
+
+        if (cannot_access_at_index(input_buffer, 1))
+        {
+            goto fail; /* nothing comes after the comma */
+        }
+
+        /* parse the name of the child */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_string(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse name */
+        }
+        buffer_skip_whitespace(input_buffer);
+
+        /* swap valuestring and string, because we parsed the name */
+        current_item->string = current_item->valuestring;
+        current_item->valuestring = NULL;
+
+        if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != ':'))
+        {
+            goto fail; /* invalid object */
+        }
+
+        /* parse the value */
+        input_buffer->offset++;
+        buffer_skip_whitespace(input_buffer);
+        if (!parse_value(current_item, input_buffer))
+        {
+            goto fail; /* failed to parse value */
+        }
+        buffer_skip_whitespace(input_buffer);
+    }
+    while (can_access_at_index(input_buffer, 0) && (buffer_at_offset(input_buffer)[0] == ','));
+
+    if (cannot_access_at_index(input_buffer, 0) || (buffer_at_offset(input_buffer)[0] != '}'))
+    {
+        goto fail; /* expected end of object */
+    }
+
+success:
+    input_buffer->depth--;
+
+    if (head != NULL) {
+        head->prev = current_item;
+    }
+
+    item->type = cJSON_Object;
+    item->child = head;
+
+    input_buffer->offset++;
+    return true;
+
+fail:
+    if (head != NULL)
+    {
+        cJSON_Delete(head);
+    }
+
+    return false;
+}
+
+/* Render an object to text. */
+static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer)
+{
+    unsigned char *output_pointer = NULL;
+    size_t length = 0;
+    cJSON *current_item = item->child;
+
+    if (output_buffer == NULL)
+    {
+        return false;
+    }
+
+    /* Compose the output: */
+    length = (size_t) (output_buffer->format ? 2 : 1); /* fmt: {\n */
+    output_pointer = ensure(output_buffer, length + 1);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+
+    *output_pointer++ = '{';
+    output_buffer->depth++;
+    if (output_buffer->format)
+    {
+        *output_pointer++ = '\n';
+    }
+    output_buffer->offset += length;
+
+    while (current_item)
+    {
+        if (output_buffer->format)
+        {
+            size_t i;
+            output_pointer = ensure(output_buffer, output_buffer->depth);
+            if (output_pointer == NULL)
+            {
+                return false;
+            }
+            for (i = 0; i < output_buffer->depth; i++)
+            {
+                *output_pointer++ = '\t';
+            }
+            output_buffer->offset += output_buffer->depth;
+        }
+
+        /* print key */
+        if (!print_string_ptr((unsigned char*)current_item->string, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        length = (size_t) (output_buffer->format ? 2 : 1);
+        output_pointer = ensure(output_buffer, length);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        *output_pointer++ = ':';
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\t';
+        }
+        output_buffer->offset += length;
+
+        /* print value */
+        if (!print_value(current_item, output_buffer))
+        {
+            return false;
+        }
+        update_offset(output_buffer);
+
+        /* print comma if not last */
+        length = ((size_t)(output_buffer->format ? 1 : 0) + (size_t)(current_item->next ? 1 : 0));
+        output_pointer = ensure(output_buffer, length + 1);
+        if (output_pointer == NULL)
+        {
+            return false;
+        }
+        if (current_item->next)
+        {
+            *output_pointer++ = ',';
+        }
+
+        if (output_buffer->format)
+        {
+            *output_pointer++ = '\n';
+        }
+        *output_pointer = '\0';
+        output_buffer->offset += length;
+
+        current_item = current_item->next;
+    }
+
+    output_pointer = ensure(output_buffer, output_buffer->format ? (output_buffer->depth + 1) : 2);
+    if (output_pointer == NULL)
+    {
+        return false;
+    }
+    if (output_buffer->format)
+    {
+        size_t i;
+        for (i = 0; i < (output_buffer->depth - 1); i++)
+        {
+            *output_pointer++ = '\t';
+        }
+    }
+    *output_pointer++ = '}';
+    *output_pointer = '\0';
+    output_buffer->depth--;
+
+    return true;
+}
+
+/* Get Array size/item / object item. */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array)
+{
+    cJSON *child = NULL;
+    size_t size = 0;
+
+    if (array == NULL)
+    {
+        return 0;
+    }
+
+    child = array->child;
+
+    while(child != NULL)
+    {
+        size++;
+        child = child->next;
+    }
+
+    /* FIXME: Can overflow here. Cannot be fixed without breaking the API */
+
+    return (int)size;
+}
+
+static cJSON* get_array_item(const cJSON *array, size_t index)
+{
+    cJSON *current_child = NULL;
+
+    if (array == NULL)
+    {
+        return NULL;
+    }
+
+    current_child = array->child;
+    while ((current_child != NULL) && (index > 0))
+    {
+        index--;
+        current_child = current_child->next;
+    }
+
+    return current_child;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index)
+{
+    if (index < 0)
+    {
+        return NULL;
+    }
+
+    return get_array_item(array, (size_t)index);
+}
+
+static cJSON *get_object_item(const cJSON * const object, const char * const name, const cJSON_bool case_sensitive)
+{
+    cJSON *current_element = NULL;
+
+    if ((object == NULL) || (name == NULL))
+    {
+        return NULL;
+    }
+
+    current_element = object->child;
+    if (case_sensitive)
+    {
+        while ((current_element != NULL) && (current_element->string != NULL) && (strcmp(name, current_element->string) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+    else
+    {
+        while ((current_element != NULL) && (case_insensitive_strcmp((const unsigned char*)name, (const unsigned char*)(current_element->string)) != 0))
+        {
+            current_element = current_element->next;
+        }
+    }
+
+    if ((current_element == NULL) || (current_element->string == NULL)) {
+        return NULL;
+    }
+
+    return current_element;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, false);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string)
+{
+    return get_object_item(object, string, true);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string)
+{
+    return cJSON_GetObjectItem(object, string) ? 1 : 0;
+}
+
+/* Utility for array list handling. */
+static void suffix_object(cJSON *prev, cJSON *item)
+{
+    prev->next = item;
+    item->prev = prev;
+}
+
+/* Utility for handling references. */
+static cJSON *create_reference(const cJSON *item, const internal_hooks * const hooks)
+{
+    cJSON *reference = NULL;
+    if (item == NULL)
+    {
+        return NULL;
+    }
+
+    reference = cJSON_New_Item(hooks);
+    if (reference == NULL)
+    {
+        return NULL;
+    }
+
+    memcpy(reference, item, sizeof(cJSON));
+    reference->string = NULL;
+    reference->type |= cJSON_IsReference;
+    reference->next = reference->prev = NULL;
+    return reference;
+}
+
+static cJSON_bool add_item_to_array(cJSON *array, cJSON *item)
+{
+    cJSON *child = NULL;
+
+    if ((item == NULL) || (array == NULL) || (array == item))
+    {
+        return false;
+    }
+
+    child = array->child;
+    /*
+     * To find the last item in array quickly, we use prev in array
+     */
+    if (child == NULL)
+    {
+        /* list is empty, start new one */
+        array->child = item;
+        item->prev = item;
+        item->next = NULL;
+    }
+    else
+    {
+        /* append to the end */
+        if (child->prev)
+        {
+            suffix_object(child->prev, item);
+            array->child->prev = item;
+        }
+    }
+
+    return true;
+}
+
+/* Add item to array/object. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item)
+{
+    return add_item_to_array(array, item);
+}
+
+#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic push
+#endif
+#ifdef __GNUC__
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
+/* helper function to cast away const */
+static void* cast_away_const(const void* string)
+{
+    return (void*)string;
+}
+#if defined(__clang__) || (defined(__GNUC__)  && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 5))))
+    #pragma GCC diagnostic pop
+#endif
+
+
+static cJSON_bool add_item_to_object(cJSON * const object, const char * const string, cJSON * const item, const internal_hooks * const hooks, const cJSON_bool constant_key)
+{
+    char *new_key = NULL;
+    int new_type = cJSON_Invalid;
+
+    if ((object == NULL) || (string == NULL) || (item == NULL) || (object == item))
+    {
+        return false;
+    }
+
+    if (constant_key)
+    {
+        new_key = (char*)cast_away_const(string);
+        new_type = item->type | cJSON_StringIsConst;
+    }
+    else
+    {
+        new_key = (char*)cJSON_strdup((const unsigned char*)string, hooks);
+        if (new_key == NULL)
+        {
+            return false;
+        }
+
+        new_type = item->type & ~cJSON_StringIsConst;
+    }
+
+    if (!(item->type & cJSON_StringIsConst) && (item->string != NULL))
+    {
+        hooks->deallocate(item->string);
+    }
+
+    item->string = new_key;
+    item->type = new_type;
+
+    return add_item_to_array(object, item);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item)
+{
+    return add_item_to_object(object, string, item, &global_hooks, false);
+}
+
+/* Add an item to an object with constant string as key */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item)
+{
+    return add_item_to_object(object, string, item, &global_hooks, true);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item)
+{
+    if (array == NULL)
+    {
+        return false;
+    }
+
+    return add_item_to_array(array, create_reference(item, &global_hooks));
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item)
+{
+    if ((object == NULL) || (string == NULL))
+    {
+        return false;
+    }
+
+    return add_item_to_object(object, string, create_reference(item, &global_hooks), &global_hooks, false);
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name)
+{
+    cJSON *null = cJSON_CreateNull();
+    if (add_item_to_object(object, name, null, &global_hooks, false))
+    {
+        return null;
+    }
+
+    cJSON_Delete(null);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name)
+{
+    cJSON *true_item = cJSON_CreateTrue();
+    if (add_item_to_object(object, name, true_item, &global_hooks, false))
+    {
+        return true_item;
+    }
+
+    cJSON_Delete(true_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name)
+{
+    cJSON *false_item = cJSON_CreateFalse();
+    if (add_item_to_object(object, name, false_item, &global_hooks, false))
+    {
+        return false_item;
+    }
+
+    cJSON_Delete(false_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean)
+{
+    cJSON *bool_item = cJSON_CreateBool(boolean);
+    if (add_item_to_object(object, name, bool_item, &global_hooks, false))
+    {
+        return bool_item;
+    }
+
+    cJSON_Delete(bool_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number)
+{
+    cJSON *number_item = cJSON_CreateNumber(number);
+    if (add_item_to_object(object, name, number_item, &global_hooks, false))
+    {
+        return number_item;
+    }
+
+    cJSON_Delete(number_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string)
+{
+    cJSON *string_item = cJSON_CreateString(string);
+    if (add_item_to_object(object, name, string_item, &global_hooks, false))
+    {
+        return string_item;
+    }
+
+    cJSON_Delete(string_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw)
+{
+    cJSON *raw_item = cJSON_CreateRaw(raw);
+    if (add_item_to_object(object, name, raw_item, &global_hooks, false))
+    {
+        return raw_item;
+    }
+
+    cJSON_Delete(raw_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name)
+{
+    cJSON *object_item = cJSON_CreateObject();
+    if (add_item_to_object(object, name, object_item, &global_hooks, false))
+    {
+        return object_item;
+    }
+
+    cJSON_Delete(object_item);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name)
+{
+    cJSON *array = cJSON_CreateArray();
+    if (add_item_to_object(object, name, array, &global_hooks, false))
+    {
+        return array;
+    }
+
+    cJSON_Delete(array);
+    return NULL;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item)
+{
+    if ((parent == NULL) || (item == NULL) || (item != parent->child && item->prev == NULL))
+    {
+        return NULL;
+    }
+
+    if (item != parent->child)
+    {
+        /* not the first element */
+        item->prev->next = item->next;
+    }
+    if (item->next != NULL)
+    {
+        /* not the last element */
+        item->next->prev = item->prev;
+    }
+
+    if (item == parent->child)
+    {
+        /* first element */
+        parent->child = item->next;
+    }
+    else if (item->next == NULL)
+    {
+        /* last element */
+        parent->child->prev = item->prev;
+    }
+
+    /* make sure the detached item doesn't point anywhere anymore */
+    item->prev = NULL;
+    item->next = NULL;
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which)
+{
+    if (which < 0)
+    {
+        return NULL;
+    }
+
+    return cJSON_DetachItemViaPointer(array, get_array_item(array, (size_t)which));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which)
+{
+    cJSON_Delete(cJSON_DetachItemFromArray(array, which));
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItem(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON *to_detach = cJSON_GetObjectItemCaseSensitive(object, string);
+
+    return cJSON_DetachItemViaPointer(object, to_detach);
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObject(object, string));
+}
+
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string)
+{
+    cJSON_Delete(cJSON_DetachItemFromObjectCaseSensitive(object, string));
+}
+
+/* Replace array/object items with new ones. */
+CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    cJSON *after_inserted = NULL;
+
+    if (which < 0 || newitem == NULL)
+    {
+        return false;
+    }
+
+    after_inserted = get_array_item(array, (size_t)which);
+    if (after_inserted == NULL)
+    {
+        return add_item_to_array(array, newitem);
+    }
+
+    if (after_inserted != array->child && after_inserted->prev == NULL) {
+        /* return false if after_inserted is a corrupted array item */
+        return false;
+    }
+
+    newitem->next = after_inserted;
+    newitem->prev = after_inserted->prev;
+    after_inserted->prev = newitem;
+    if (after_inserted == array->child)
+    {
+        array->child = newitem;
+    }
+    else
+    {
+        newitem->prev->next = newitem;
+    }
+    return true;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement)
+{
+    if ((parent == NULL) || (parent->child == NULL) || (replacement == NULL) || (item == NULL))
+    {
+        return false;
+    }
+
+    if (replacement == item)
+    {
+        return true;
+    }
+
+    replacement->next = item->next;
+    replacement->prev = item->prev;
+
+    if (replacement->next != NULL)
+    {
+        replacement->next->prev = replacement;
+    }
+    if (parent->child == item)
+    {
+        if (parent->child->prev == parent->child)
+        {
+            replacement->prev = replacement;
+        }
+        parent->child = replacement;
+    }
+    else
+    {   /*
+         * To find the last item in array quickly, we use prev in array.
+         * We can't modify the last item's next pointer where this item was the parent's child
+         */
+        if (replacement->prev != NULL)
+        {
+            replacement->prev->next = replacement;
+        }
+        if (replacement->next == NULL)
+        {
+            parent->child->prev = replacement;
+        }
+    }
+
+    item->next = NULL;
+    item->prev = NULL;
+    cJSON_Delete(item);
+
+    return true;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem)
+{
+    if (which < 0)
+    {
+        return false;
+    }
+
+    return cJSON_ReplaceItemViaPointer(array, get_array_item(array, (size_t)which), newitem);
+}
+
+static cJSON_bool replace_item_in_object(cJSON *object, const char *string, cJSON *replacement, cJSON_bool case_sensitive)
+{
+    if ((replacement == NULL) || (string == NULL))
+    {
+        return false;
+    }
+
+    /* replace the name in the replacement */
+    if (!(replacement->type & cJSON_StringIsConst) && (replacement->string != NULL))
+    {
+        cJSON_free(replacement->string);
+    }
+    replacement->string = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+    if (replacement->string == NULL)
+    {
+        return false;
+    }
+
+    replacement->type &= ~cJSON_StringIsConst;
+
+    return cJSON_ReplaceItemViaPointer(object, get_object_item(object, string, case_sensitive), replacement);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object, const char *string, cJSON *newitem)
+{
+    return replace_item_in_object(object, string, newitem, false);
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object, const char *string, cJSON *newitem)
+{
+    return replace_item_in_object(object, string, newitem, true);
+}
+
+/* Create basic types: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_NULL;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_True;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = boolean ? cJSON_True : cJSON_False;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Number;
+        item->valuedouble = num;
+
+        /* use saturation in case of overflow */
+        if (num >= INT_MAX)
+        {
+            item->valueint = INT_MAX;
+        }
+        else if (num <= (double)INT_MIN)
+        {
+            item->valueint = INT_MIN;
+        }
+        else
+        {
+            item->valueint = (int)num;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_String;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)string, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL)
+    {
+        item->type = cJSON_String | cJSON_IsReference;
+        item->valuestring = (char*)cast_away_const(string);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL) {
+        item->type = cJSON_Object | cJSON_IsReference;
+        item->child = (cJSON*)cast_away_const(child);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child) {
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item != NULL) {
+        item->type = cJSON_Array | cJSON_IsReference;
+        item->child = (cJSON*)cast_away_const(child);
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type = cJSON_Raw;
+        item->valuestring = (char*)cJSON_strdup((const unsigned char*)raw, &global_hooks);
+        if(!item->valuestring)
+        {
+            cJSON_Delete(item);
+            return NULL;
+        }
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if(item)
+    {
+        item->type=cJSON_Array;
+    }
+
+    return item;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void)
+{
+    cJSON *item = cJSON_New_Item(&global_hooks);
+    if (item)
+    {
+        item->type = cJSON_Object;
+    }
+
+    return item;
+}
+
+/* Create Arrays: */
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if (!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber((double)numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (numbers == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for(i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateNumber(numbers[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p, n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count)
+{
+    size_t i = 0;
+    cJSON *n = NULL;
+    cJSON *p = NULL;
+    cJSON *a = NULL;
+
+    if ((count < 0) || (strings == NULL))
+    {
+        return NULL;
+    }
+
+    a = cJSON_CreateArray();
+
+    for (i = 0; a && (i < (size_t)count); i++)
+    {
+        n = cJSON_CreateString(strings[i]);
+        if(!n)
+        {
+            cJSON_Delete(a);
+            return NULL;
+        }
+        if(!i)
+        {
+            a->child = n;
+        }
+        else
+        {
+            suffix_object(p,n);
+        }
+        p = n;
+    }
+
+    if (a && a->child) {
+        a->child->prev = n;
+    }
+
+    return a;
+}
+
+/* Duplication */
+cJSON * cJSON_Duplicate_rec(const cJSON *item, size_t depth, cJSON_bool recurse);
+
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse)
+{
+    return cJSON_Duplicate_rec(item, 0, recurse );
+}
+
+cJSON * cJSON_Duplicate_rec(const cJSON *item, size_t depth, cJSON_bool recurse)
+{
+    cJSON *newitem = NULL;
+    cJSON *child = NULL;
+    cJSON *next = NULL;
+    cJSON *newchild = NULL;
+
+    /* Bail on bad ptr */
+    if (!item)
+    {
+        goto fail;
+    }
+    /* Create new item */
+    newitem = cJSON_New_Item(&global_hooks);
+    if (!newitem)
+    {
+        goto fail;
+    }
+    /* Copy over all vars */
+    newitem->type = item->type & (~cJSON_IsReference);
+    newitem->valueint = item->valueint;
+    newitem->valuedouble = item->valuedouble;
+    if (item->valuestring)
+    {
+        newitem->valuestring = (char*)cJSON_strdup((unsigned char*)item->valuestring, &global_hooks);
+        if (!newitem->valuestring)
+        {
+            goto fail;
+        }
+    }
+    if (item->string)
+    {
+        newitem->string = (item->type&cJSON_StringIsConst) ? item->string : (char*)cJSON_strdup((unsigned char*)item->string, &global_hooks);
+        if (!newitem->string)
+        {
+            goto fail;
+        }
+    }
+    /* If non-recursive, then we're done! */
+    if (!recurse)
+    {
+        return newitem;
+    }
+    /* Walk the ->next chain for the child. */
+    child = item->child;
+    while (child != NULL)
+    {
+        if(depth >= CJSON_CIRCULAR_LIMIT) {
+            goto fail;
+        }
+        newchild = cJSON_Duplicate_rec(child, depth + 1, true); /* Duplicate (with recurse) each item in the ->next chain */
+        if (!newchild)
+        {
+            goto fail;
+        }
+        if (next != NULL)
+        {
+            /* If newitem->child already set, then crosswire ->prev and ->next and move on */
+            next->next = newchild;
+            newchild->prev = next;
+            next = newchild;
+        }
+        else
+        {
+            /* Set newitem->child and move to it */
+            newitem->child = newchild;
+            next = newchild;
+        }
+        child = child->next;
+    }
+    if (newitem && newitem->child)
+    {
+        newitem->child->prev = newchild;
+    }
+
+    return newitem;
+
+fail:
+    if (newitem != NULL)
+    {
+        cJSON_Delete(newitem);
+    }
+
+    return NULL;
+}
+
+static void skip_oneline_comment(char **input)
+{
+    *input += static_strlen("//");
+
+    for (; (*input)[0] != '\0'; ++(*input))
+    {
+        if ((*input)[0] == '\n') {
+            *input += static_strlen("\n");
+            return;
+        }
+    }
+}
+
+static void skip_multiline_comment(char **input)
+{
+    *input += static_strlen("/*");
+
+    for (; (*input)[0] != '\0'; ++(*input))
+    {
+        if (((*input)[0] == '*') && ((*input)[1] == '/'))
+        {
+            *input += static_strlen("*/");
+            return;
+        }
+    }
+}
+
+static void minify_string(char **input, char **output) {
+    (*output)[0] = (*input)[0];
+    *input += static_strlen("\"");
+    *output += static_strlen("\"");
+
+
+    for (; (*input)[0] != '\0'; (void)++(*input), ++(*output)) {
+        (*output)[0] = (*input)[0];
+
+        if ((*input)[0] == '\"') {
+            (*output)[0] = '\"';
+            *input += static_strlen("\"");
+            *output += static_strlen("\"");
+            return;
+        } else if (((*input)[0] == '\\') && ((*input)[1] == '\"')) {
+            (*output)[1] = (*input)[1];
+            *input += static_strlen("\"");
+            *output += static_strlen("\"");
+        }
+    }
+}
+
+CJSON_PUBLIC(void) cJSON_Minify(char *json)
+{
+    char *into = json;
+
+    if (json == NULL)
+    {
+        return;
+    }
+
+    while (json[0] != '\0')
+    {
+        switch (json[0])
+        {
+            case ' ':
+            case '\t':
+            case '\r':
+            case '\n':
+                json++;
+                break;
+
+            case '/':
+                if (json[1] == '/')
+                {
+                    skip_oneline_comment(&json);
+                }
+                else if (json[1] == '*')
+                {
+                    skip_multiline_comment(&json);
+                } else {
+                    json++;
+                }
+                break;
+
+            case '\"':
+                minify_string(&json, (char**)&into);
+                break;
+
+            default:
+                into[0] = json[0];
+                json++;
+                into++;
+        }
+    }
+
+    /* and null-terminate. */
+    *into = '\0';
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Invalid;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_False;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xff) == cJSON_True;
+}
+
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & (cJSON_True | cJSON_False)) != 0;
+}
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_NULL;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Number;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_String;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Array;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Object;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item)
+{
+    if (item == NULL)
+    {
+        return false;
+    }
+
+    return (item->type & 0xFF) == cJSON_Raw;
+}
+
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive)
+{
+    if ((a == NULL) || (b == NULL) || ((a->type & 0xFF) != (b->type & 0xFF)))
+    {
+        return false;
+    }
+
+    /* check if type is valid */
+    switch (a->type & 0xFF)
+    {
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+        case cJSON_Number:
+        case cJSON_String:
+        case cJSON_Raw:
+        case cJSON_Array:
+        case cJSON_Object:
+            break;
+
+        default:
+            return false;
+    }
+
+    /* identical objects are equal */
+    if (a == b)
+    {
+        return true;
+    }
+
+    switch (a->type & 0xFF)
+    {
+        /* in these cases and equal type is enough */
+        case cJSON_False:
+        case cJSON_True:
+        case cJSON_NULL:
+            return true;
+
+        case cJSON_Number:
+            if (compare_double(a->valuedouble, b->valuedouble))
+            {
+                return true;
+            }
+            return false;
+
+        case cJSON_String:
+        case cJSON_Raw:
+            if ((a->valuestring == NULL) || (b->valuestring == NULL))
+            {
+                return false;
+            }
+            if (strcmp(a->valuestring, b->valuestring) == 0)
+            {
+                return true;
+            }
+
+            return false;
+
+        case cJSON_Array:
+        {
+            cJSON *a_element = a->child;
+            cJSON *b_element = b->child;
+
+            for (; (a_element != NULL) && (b_element != NULL);)
+            {
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+
+                a_element = a_element->next;
+                b_element = b_element->next;
+            }
+
+            /* one of the arrays is longer than the other */
+            if (a_element != b_element) {
+                return false;
+            }
+
+            return true;
+        }
+
+        case cJSON_Object:
+        {
+            cJSON *a_element = NULL;
+            cJSON *b_element = NULL;
+            cJSON_ArrayForEach(a_element, a)
+            {
+                /* TODO This has O(n^2) runtime, which is horrible! */
+                b_element = get_object_item(b, a_element->string, case_sensitive);
+                if (b_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(a_element, b_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            /* doing this twice, once on a and b to prevent true comparison if a subset of b
+             * TODO: Do this the proper way, this is just a fix for now */
+            cJSON_ArrayForEach(b_element, b)
+            {
+                a_element = get_object_item(a, b_element->string, case_sensitive);
+                if (a_element == NULL)
+                {
+                    return false;
+                }
+
+                if (!cJSON_Compare(b_element, a_element, case_sensitive))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        default:
+            return false;
+    }
+}
+
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size)
+{
+    return global_hooks.allocate(size);
+}
+
+CJSON_PUBLIC(void) cJSON_free(void *object)
+{
+    global_hooks.deallocate(object);
+    object = NULL;
+}
diff --git a/lib/vendor/cJSON/cJSON.h b/lib/vendor/cJSON/cJSON.h
new file mode 100644
index 00000000..37520bbc
--- /dev/null
+++ b/lib/vendor/cJSON/cJSON.h
@@ -0,0 +1,306 @@
+/*
+  Copyright (c) 2009-2017 Dave Gamble and cJSON contributors
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+*/
+
+#ifndef cJSON__h
+#define cJSON__h
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if !defined(__WINDOWS__) && (defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32))
+#define __WINDOWS__
+#endif
+
+#ifdef __WINDOWS__
+
+/* When compiling for windows, we specify a specific calling convention to avoid issues where we are being called from a project with a different default calling convention.  For windows you have 3 define options:
+
+CJSON_HIDE_SYMBOLS - Define this in the case where you don't want to ever dllexport symbols
+CJSON_EXPORT_SYMBOLS - Define this on library build when you want to dllexport symbols (default)
+CJSON_IMPORT_SYMBOLS - Define this if you want to dllimport symbol
+
+For *nix builds that support visibility attribute, you can define similar behavior by
+
+setting default visibility to hidden by adding
+-fvisibility=hidden (for gcc)
+or
+-xldscope=hidden (for sun cc)
+to CFLAGS
+
+then using the CJSON_API_VISIBILITY flag to "export" the same symbols the way CJSON_EXPORT_SYMBOLS does
+
+*/
+
+#define CJSON_CDECL __cdecl
+#define CJSON_STDCALL __stdcall
+
+/* export symbols by default, this is necessary for copy pasting the C and header file */
+#if !defined(CJSON_HIDE_SYMBOLS) && !defined(CJSON_IMPORT_SYMBOLS) && !defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_EXPORT_SYMBOLS
+#endif
+
+#if defined(CJSON_HIDE_SYMBOLS)
+#define CJSON_PUBLIC(type)   type CJSON_STDCALL
+#elif defined(CJSON_EXPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllexport) type CJSON_STDCALL
+#elif defined(CJSON_IMPORT_SYMBOLS)
+#define CJSON_PUBLIC(type)   __declspec(dllimport) type CJSON_STDCALL
+#endif
+#else /* !__WINDOWS__ */
+#define CJSON_CDECL
+#define CJSON_STDCALL
+
+#if (defined(__GNUC__) || defined(__SUNPRO_CC) || defined (__SUNPRO_C)) && defined(CJSON_API_VISIBILITY)
+#define CJSON_PUBLIC(type)   __attribute__((visibility("default"))) type
+#else
+#define CJSON_PUBLIC(type) type
+#endif
+#endif
+
+/* project version */
+#define CJSON_VERSION_MAJOR 1
+#define CJSON_VERSION_MINOR 7
+#define CJSON_VERSION_PATCH 18
+
+#include <stddef.h>
+
+/* cJSON Types: */
+#define cJSON_Invalid (0)
+#define cJSON_False  (1 << 0)
+#define cJSON_True   (1 << 1)
+#define cJSON_NULL   (1 << 2)
+#define cJSON_Number (1 << 3)
+#define cJSON_String (1 << 4)
+#define cJSON_Array  (1 << 5)
+#define cJSON_Object (1 << 6)
+#define cJSON_Raw    (1 << 7) /* raw json */
+
+#define cJSON_IsReference 256
+#define cJSON_StringIsConst 512
+
+/* The cJSON structure: */
+typedef struct cJSON
+{
+    /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */
+    struct cJSON *next;
+    struct cJSON *prev;
+    /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */
+    struct cJSON *child;
+
+    /* The type of the item, as above. */
+    int type;
+
+    /* The item's string, if type==cJSON_String  and type == cJSON_Raw */
+    char *valuestring;
+    /* writing to valueint is DEPRECATED, use cJSON_SetNumberValue instead */
+    int valueint;
+    /* The item's number, if type==cJSON_Number */
+    double valuedouble;
+
+    /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */
+    char *string;
+} cJSON;
+
+typedef struct cJSON_Hooks
+{
+      /* malloc/free are CDECL on Windows regardless of the default calling convention of the compiler, so ensure the hooks allow passing those functions directly. */
+      void *(CJSON_CDECL *malloc_fn)(size_t sz);
+      void (CJSON_CDECL *free_fn)(void *ptr);
+} cJSON_Hooks;
+
+typedef int cJSON_bool;
+
+/* Limits how deeply nested arrays/objects can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_NESTING_LIMIT
+#define CJSON_NESTING_LIMIT 1000
+#endif
+
+/* Limits the length of circular references can be before cJSON rejects to parse them.
+ * This is to prevent stack overflows. */
+#ifndef CJSON_CIRCULAR_LIMIT
+#define CJSON_CIRCULAR_LIMIT 10000
+#endif
+
+/* returns the version of cJSON as a string */
+CJSON_PUBLIC(const char*) cJSON_Version(void);
+
+/* Supply malloc, realloc and free functions to cJSON */
+CJSON_PUBLIC(void) cJSON_InitHooks(cJSON_Hooks* hooks);
+
+/* Memory Management: the caller is always responsible to free the results from all variants of cJSON_Parse (with cJSON_Delete) and cJSON_Print (with stdlib free, cJSON_Hooks.free_fn, or cJSON_free as appropriate). The exception is cJSON_PrintPreallocated, where the caller has full responsibility of the buffer. */
+/* Supply a block of JSON, and this returns a cJSON object you can interrogate. */
+CJSON_PUBLIC(cJSON *) cJSON_Parse(const char *value);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLength(const char *value, size_t buffer_length);
+/* ParseWithOpts allows you to require (and check) that the JSON is null terminated, and to retrieve the pointer to the final byte parsed. */
+/* If you supply a ptr in return_parse_end and parsing fails, then return_parse_end will contain a pointer to the error so will match cJSON_GetErrorPtr(). */
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithOpts(const char *value, const char **return_parse_end, cJSON_bool require_null_terminated);
+CJSON_PUBLIC(cJSON *) cJSON_ParseWithLengthOpts(const char *value, size_t buffer_length, const char **return_parse_end, cJSON_bool require_null_terminated);
+
+/* Render a cJSON entity to text for transfer/storage. */
+CJSON_PUBLIC(char *) cJSON_Print(const cJSON *item);
+/* Render a cJSON entity to text for transfer/storage without any formatting. */
+CJSON_PUBLIC(char *) cJSON_PrintUnformatted(const cJSON *item);
+/* Render a cJSON entity to text using a buffered strategy. prebuffer is a guess at the final size. guessing well reduces reallocation. fmt=0 gives unformatted, =1 gives formatted */
+CJSON_PUBLIC(char *) cJSON_PrintBuffered(const cJSON *item, int prebuffer, cJSON_bool fmt);
+/* Render a cJSON entity to text using a buffer already allocated in memory with given length. Returns 1 on success and 0 on failure. */
+/* NOTE: cJSON is not always 100% accurate in estimating how much memory it will use, so to be safe allocate 5 bytes more than you actually need */
+CJSON_PUBLIC(cJSON_bool) cJSON_PrintPreallocated(cJSON *item, char *buffer, const int length, const cJSON_bool format);
+/* Delete a cJSON entity and all subentities. */
+CJSON_PUBLIC(void) cJSON_Delete(cJSON *item);
+
+/* Returns the number of items in an array (or object). */
+CJSON_PUBLIC(int) cJSON_GetArraySize(const cJSON *array);
+/* Retrieve item number "index" from array "array". Returns NULL if unsuccessful. */
+CJSON_PUBLIC(cJSON *) cJSON_GetArrayItem(const cJSON *array, int index);
+/* Get item "string" from object. Case insensitive. */
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItem(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON *) cJSON_GetObjectItemCaseSensitive(const cJSON * const object, const char * const string);
+CJSON_PUBLIC(cJSON_bool) cJSON_HasObjectItem(const cJSON *object, const char *string);
+/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */
+CJSON_PUBLIC(const char *) cJSON_GetErrorPtr(void);
+
+/* Check item type and return its value */
+CJSON_PUBLIC(char *) cJSON_GetStringValue(const cJSON * const item);
+CJSON_PUBLIC(double) cJSON_GetNumberValue(const cJSON * const item);
+
+/* These functions check the type of an item */
+CJSON_PUBLIC(cJSON_bool) cJSON_IsInvalid(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsFalse(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsTrue(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsBool(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNull(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsNumber(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsString(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsArray(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsObject(const cJSON * const item);
+CJSON_PUBLIC(cJSON_bool) cJSON_IsRaw(const cJSON * const item);
+
+/* These calls create a cJSON item of the appropriate type. */
+CJSON_PUBLIC(cJSON *) cJSON_CreateNull(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateTrue(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFalse(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateBool(cJSON_bool boolean);
+CJSON_PUBLIC(cJSON *) cJSON_CreateNumber(double num);
+CJSON_PUBLIC(cJSON *) cJSON_CreateString(const char *string);
+/* raw json */
+CJSON_PUBLIC(cJSON *) cJSON_CreateRaw(const char *raw);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArray(void);
+CJSON_PUBLIC(cJSON *) cJSON_CreateObject(void);
+
+/* Create a string where valuestring references a string so
+ * it will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringReference(const char *string);
+/* Create an object/array that only references it's elements so
+ * they will not be freed by cJSON_Delete */
+CJSON_PUBLIC(cJSON *) cJSON_CreateObjectReference(const cJSON *child);
+CJSON_PUBLIC(cJSON *) cJSON_CreateArrayReference(const cJSON *child);
+
+/* These utilities create an Array of count items.
+ * The parameter count cannot be greater than the number of elements in the number array, otherwise array access will be out of bounds.*/
+CJSON_PUBLIC(cJSON *) cJSON_CreateIntArray(const int *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateFloatArray(const float *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateDoubleArray(const double *numbers, int count);
+CJSON_PUBLIC(cJSON *) cJSON_CreateStringArray(const char *const *strings, int count);
+
+/* Append item to the specified array/object. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item);
+/* Use this when string is definitely const (i.e. a literal, or as good as), and will definitely survive the cJSON object.
+ * WARNING: When this function was used, make sure to always check that (item->type & cJSON_StringIsConst) is zero before
+ * writing to `item->string` */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemToObjectCS(cJSON *object, const char *string, cJSON *item);
+/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item);
+CJSON_PUBLIC(cJSON_bool) cJSON_AddItemReferenceToObject(cJSON *object, const char *string, cJSON *item);
+
+/* Remove/Detach items from Arrays/Objects. */
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemViaPointer(cJSON *parent, cJSON * const item);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromArray(cJSON *array, int which);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(cJSON *) cJSON_DetachItemFromObjectCaseSensitive(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObject(cJSON *object, const char *string);
+CJSON_PUBLIC(void) cJSON_DeleteItemFromObjectCaseSensitive(cJSON *object, const char *string);
+
+/* Update array items. */
+CJSON_PUBLIC(cJSON_bool) cJSON_InsertItemInArray(cJSON *array, int which, cJSON *newitem); /* Shifts pre-existing items to the right. */
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemViaPointer(cJSON * const parent, cJSON * const item, cJSON * replacement);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObject(cJSON *object,const char *string,cJSON *newitem);
+CJSON_PUBLIC(cJSON_bool) cJSON_ReplaceItemInObjectCaseSensitive(cJSON *object,const char *string,cJSON *newitem);
+
+/* Duplicate a cJSON item */
+CJSON_PUBLIC(cJSON *) cJSON_Duplicate(const cJSON *item, cJSON_bool recurse);
+/* Duplicate will create a new, identical cJSON item to the one you pass, in new memory that will
+ * need to be released. With recurse!=0, it will duplicate any children connected to the item.
+ * The item->next and ->prev pointers are always zero on return from Duplicate. */
+/* Recursively compare two cJSON items for equality. If either a or b is NULL or invalid, they will be considered unequal.
+ * case_sensitive determines if object keys are treated case sensitive (1) or case insensitive (0) */
+CJSON_PUBLIC(cJSON_bool) cJSON_Compare(const cJSON * const a, const cJSON * const b, const cJSON_bool case_sensitive);
+
+/* Minify a strings, remove blank characters(such as ' ', '\t', '\r', '\n') from strings.
+ * The input pointer json cannot point to a read-only address area, such as a string constant, 
+ * but should point to a readable and writable address area. */
+CJSON_PUBLIC(void) cJSON_Minify(char *json);
+
+/* Helper functions for creating and adding items to an object at the same time.
+ * They return the added item or NULL on failure. */
+CJSON_PUBLIC(cJSON*) cJSON_AddNullToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddTrueToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddFalseToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddBoolToObject(cJSON * const object, const char * const name, const cJSON_bool boolean);
+CJSON_PUBLIC(cJSON*) cJSON_AddNumberToObject(cJSON * const object, const char * const name, const double number);
+CJSON_PUBLIC(cJSON*) cJSON_AddStringToObject(cJSON * const object, const char * const name, const char * const string);
+CJSON_PUBLIC(cJSON*) cJSON_AddRawToObject(cJSON * const object, const char * const name, const char * const raw);
+CJSON_PUBLIC(cJSON*) cJSON_AddObjectToObject(cJSON * const object, const char * const name);
+CJSON_PUBLIC(cJSON*) cJSON_AddArrayToObject(cJSON * const object, const char * const name);
+
+/* When assigning an integer value, it needs to be propagated to valuedouble too. */
+#define cJSON_SetIntValue(object, number) ((object) ? (object)->valueint = (object)->valuedouble = (number) : (number))
+/* helper for the cJSON_SetNumberValue macro */
+CJSON_PUBLIC(double) cJSON_SetNumberHelper(cJSON *object, double number);
+#define cJSON_SetNumberValue(object, number) ((object != NULL) ? cJSON_SetNumberHelper(object, (double)number) : (number))
+/* Change the valuestring of a cJSON_String object, only takes effect when type of object is cJSON_String */
+CJSON_PUBLIC(char*) cJSON_SetValuestring(cJSON *object, const char *valuestring);
+
+/* If the object is not a boolean type this does nothing and returns cJSON_Invalid else it returns the new type*/
+#define cJSON_SetBoolValue(object, boolValue) ( \
+    (object != NULL && ((object)->type & (cJSON_False|cJSON_True))) ? \
+    (object)->type=((object)->type &(~(cJSON_False|cJSON_True)))|((boolValue)?cJSON_True:cJSON_False) : \
+    cJSON_Invalid\
+)
+
+/* Macro for iterating over an array or object */
+#define cJSON_ArrayForEach(element, array) for(element = (array != NULL) ? (array)->child : NULL; element != NULL; element = element->next)
+
+/* malloc/free objects using the malloc/free functions that have been set with cJSON_InitHooks */
+CJSON_PUBLIC(void *) cJSON_malloc(size_t size);
+CJSON_PUBLIC(void) cJSON_free(void *object);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/opttest.pl b/opttest.pl
deleted file mode 100755
index 85e3b494..00000000
--- a/opttest.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/perl -w
-use strict;
-use Test;
-
-use vars qw($dir $file $prog $idx $state $output %progs @dirs);
-
-my $tests = 0;
-
-@dirs = qw(plugins plugins-scripts);
-
-foreach $dir (@dirs) {
-        opendir(DIR, $dir) || die "can't opendir $dir: $!";
-        while ($file = readdir(DIR)) {
-                if (-x "$dir/$file" && -f "$dir/$file") {
-                        $tests++;
-                        $progs{"$dir/$file"} = $file;
-                }
-        }
-        closedir DIR;
-}
-
-plan tests => $tests;
-
-for $prog (keys %progs) {
-        $state = 0;
-        $file = `basename $prog`;
-
-        $idx = 1;
-        $output = `$prog -h 2>&1`;
-        if($?) {$state++;print "$prog failed test $idx\n";}
-        unless ($output =~ m/$progs{$prog}/ms) {
-                $idx++; $state++;print "$output\n$prog failed test $idx\n";
-        }
-
-        $idx++;
-        `$prog --help 2>&1 > /dev/null`;
-        if($?) {$state++;print "$prog failed test $idx\n";}
-
-        $idx++;
-                `$prog -V 2>&1 > /dev/null`;
-        if($?) {$state++;print "$prog failed test $idx\n";}
-
-        $idx++;
-        `$prog --version 2>&1 > /dev/null`;
-        if($?) {$state++;print "$prog failed test $idx\n";}
-
-        print "$prog ($idx tests) ";
-        ok $state,0;
-}
-
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 4b8f5e27..daed9cb0 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-2007 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-2023";
+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>
@@ -59,45 +63,45 @@ const char *email = "devel@monitoring-plugins.org";
 #include <arpa/inet.h>
 
 #if HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>
+#       include <sys/sockio.h>
 #endif // HAVE_SYS_SOCKIO_H
 
-#if defined( __linux__ )
+#if defined(__linux__)
 
-#include <linux/if_ether.h>
-#include <features.h>
+#       include <linux/if_ether.h>
+#       include <features.h>
 
-#elif defined (__bsd__)
+#elif defined(__bsd__)
 
-#include <netinet/if_ether.h>
-#include <sys/param.h>
-#include <sys/sysctl.h>
-#include <net/if_dl.h>
+#       include <netinet/if_ether.h>
+#       include <sys/param.h>
+#       include <sys/sysctl.h>
+#       include <net/if_dl.h>
 
 #elif defined(__sun__) || defined(__solaris__) || defined(__hpux__)
 
-#define INSAP 22
-#define OUTSAP 24
+#       define INSAP  22
+#       define OUTSAP 24
 
-#include <signal.h>
-#include <ctype.h>
-#include <sys/stropts.h>
-#include <sys/poll.h>
-#include <sys/dlpi.h>
+#       include <signal.h>
+#       include <ctype.h>
+#       include <sys/stropts.h>
+#       include <sys/poll.h>
+#       include <sys/dlpi.h>
 
-#define bcopy(source, destination, length) memcpy(destination, source, length)
+#       define bcopy(source, destination, length) memcpy(destination, source, length)
 
-#define AREA_SZ 5000            /* buffer length in bytes */
+#       define AREA_SZ 5000 /* buffer length in bytes */
 static u_long ctl_area[AREA_SZ];
 static u_long dat_area[AREA_SZ];
 static struct strbuf ctl = {AREA_SZ, 0, (char *)ctl_area};
 static struct strbuf dat = {AREA_SZ, 0, (char *)dat_area};
 
-#define GOT_CTRL 1
-#define GOT_DATA 2
-#define GOT_BOTH 3
-#define GOT_INTR 4
-#define GOT_ERR 128
+#       define GOT_CTRL 1
+#       define GOT_DATA 2
+#       define GOT_BOTH 3
+#       define GOT_INTR 4
+#       define GOT_ERR  128
 
 static int get_msg(int);
 static int check_ctrl(int);
@@ -105,226 +109,241 @@ static int put_ctrl(int, int, int);
 static int put_both(int, int, int, int);
 static int dl_open(const char *, int, int *);
 static int dl_bind(int, int, u_char *);
-long mac_addr_dlpi( const char *, int, u_char *);
+static long mac_addr_dlpi(const char *, int, u_char *);
 
 #endif // __sun__ || __solaris__ || __hpux
 
-
-
 /**** Common definitions ****/
 
-#define OK                0
-#define ERROR             -1
-
+#define OK           0
+#define ERROR        -1
+#define MAC_ADDR_LEN 6
 
 /**** DHCP definitions ****/
 
-#define MAX_DHCP_CHADDR_LENGTH           16
-#define MAX_DHCP_SNAME_LENGTH            64
-#define MAX_DHCP_FILE_LENGTH             128
-#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 */
-        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?) */
-        char options[MAX_DHCP_OPTIONS_LENGTH];  /* options */
-}dhcp_packet;
-
-
-typedef struct dhcp_offer_struct{
-        struct in_addr server_address;   /* address of DHCP server that sent this offer */
-        struct in_addr offered_address;  /* the IP address that was offered to us */
+#define MAX_DHCP_CHADDR_LENGTH  16
+#define MAX_DHCP_SNAME_LENGTH   64
+#define MAX_DHCP_FILE_LENGTH    128
+#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 */
+        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?) */
+        char options[MAX_DHCP_OPTIONS_LENGTH];        /* options */
+} dhcp_packet;
+
+typedef struct dhcp_offer_struct {
+        struct in_addr server_address;  /* address of DHCP server that sent this offer */
+        struct in_addr offered_address; /* the IP address that was offered to us */
         uint32_t lease_time;            /* lease time in seconds */
         uint32_t renewal_time;          /* renewal time in seconds */
         uint32_t rebinding_time;        /* rebinding time in seconds */
-        bool desired;                 /* is this offer desired (necessary in exclusive mode) */
+        bool desired;                   /* is this offer desired (necessary in exclusive mode) */
         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
-
-#define DHCPDISCOVER    1
-#define DHCPOFFER       2
-#define DHCPREQUEST     3
-#define DHCPDECLINE     4
-#define DHCPACK         5
-#define DHCPNACK        6
-#define DHCPRELEASE     7
-
-#define DHCP_OPTION_MESSAGE_TYPE        53
-#define DHCP_OPTION_HOST_NAME           12
-#define DHCP_OPTION_BROADCAST_ADDRESS   28
-#define DHCP_OPTION_REQUESTED_ADDRESS   50
-#define DHCP_OPTION_LEASE_TIME          51
-#define DHCP_OPTION_SERVER_IDENTIFIER   54
-#define DHCP_OPTION_RENEWAL_TIME        58
-#define DHCP_OPTION_REBINDING_TIME      59
-#define DHCP_OPTION_END                 255
-
-#define DHCP_INFINITE_TIME              0xFFFFFFFF
+} dhcp_offer;
+
+#define BOOTREQUEST 1
+#define BOOTREPLY   2
+
+#define DHCPDISCOVER 1
+#define DHCPOFFER    2
+#define DHCPREQUEST  3
+#define DHCPDECLINE  4
+#define DHCPACK      5
+#define DHCPNACK     6
+#define DHCPRELEASE  7
+
+#define DHCP_OPTION_MESSAGE_TYPE      53
+#define DHCP_OPTION_HOST_NAME         12
+#define DHCP_OPTION_BROADCAST_ADDRESS 28
+#define DHCP_OPTION_REQUESTED_ADDRESS 50
+#define DHCP_OPTION_LEASE_TIME        51
+#define DHCP_OPTION_SERVER_IDENTIFIER 54
+#define DHCP_OPTION_RENEWAL_TIME      58
+#define DHCP_OPTION_REBINDING_TIME    59
+#define DHCP_OPTION_END               255
+
+#define DHCP_INFINITE_TIME 0xFFFFFFFF
 
 #define DHCP_BROADCAST_FLAG 32768
 
-#define DHCP_SERVER_PORT   67
-#define DHCP_CLIENT_PORT   68
-
-#define ETHERNET_HARDWARE_ADDRESS            1     /* used in htype field of dhcp packet */
-#define ETHERNET_HARDWARE_ADDRESS_LENGTH     6     /* length of Ethernet hardware addresses */
-
-bool unicast = false;        /* unicast mode: mimic a DHCP relay */
-bool exclusive = false;      /* exclusive mode aka "rogue DHCP server detection" */
-struct in_addr my_ip;        /* our address (required for relay) */
-struct in_addr dhcp_ip;      /* server to query (if in unicast mode) */
-unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH]="";
-unsigned char *user_specified_mac=NULL;
+#define DHCP_SERVER_PORT 67
+#define DHCP_CLIENT_PORT 68
 
-char network_interface_name[IFNAMSIZ]="eth0";
+#define ETHERNET_HARDWARE_ADDRESS        1 /* used in htype field of dhcp packet */
+#define ETHERNET_HARDWARE_ADDRESS_LENGTH 6 /* length of Ethernet hardware addresses */
 
-uint32_t packet_xid=0;
+static int verbose = 0;
 
-uint32_t dhcp_lease_time=0;
-uint32_t dhcp_renewal_time=0;
-uint32_t dhcp_rebinding_time=0;
+typedef struct process_arguments_wrapper {
+        int error;
+        check_dhcp_config config;
+} process_arguments_wrapper;
 
-int dhcpoffer_timeout=2;
-
-dhcp_offer *dhcp_offer_list=NULL;
-requested_server *requested_server_list=NULL;
-
-int valid_responses=0;     /* number of valid DHCPOFFERs we received */
-int requested_servers=0;
-int requested_responses=0;
-
-bool request_specific_address=false;
-bool received_requested_address=false;
-int verbose=0;
-struct in_addr requested_address;
-
-
-int process_arguments(int, char **);
-int call_getopt(int, char **);
-int validate_arguments(int);
+static process_arguments_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 void print_usage(void);
-void print_help(void);
-
-void resolve_host(const char *in,struct in_addr *out);
-unsigned char *mac_aton(const char *);
-void print_hardware_address(const unsigned char *);
-int get_hardware_address(int,char *);
-int get_ip_address(int,char *);
-
-int send_dhcp_discover(int);
-int get_dhcp_offer(int);
+static void print_help(void);
+
+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) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
-int get_results(void);
-
-int add_dhcp_offer(struct in_addr,dhcp_packet *);
-int free_dhcp_offer_list(void);
-int free_requested_server_list(void);
-
-int create_dhcp_socket(void);
-int close_dhcp_socket(int);
-int send_dhcp_packet(void *,int,int,struct sockaddr_in *);
-int receive_dhcp_packet(void *,int,int,int,struct sockaddr_in *);
-
-
-
-int main(int argc, char **argv){
-        int dhcp_socket;
-        int result = STATE_UNKNOWN;
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        process_arguments_wrapper tmp = process_arguments(argc, argv);
 
-        /* Parse extra opts if any */
-        argv=np_extra_opts(&argc, argv, progname);
+        if (tmp.error != OK) {
+                usage4(_("Could not parse arguments"));
+        }
 
-        if(process_arguments(argc,argv)!=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 */
-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;
 
-        strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name)-1);
-        ifr.ifr_name[sizeof(ifr.ifr_name)-1]='\0';
+        strncpy((char *)&ifr.ifr_name, interface_name, sizeof(ifr.ifr_name) - 1);
+        ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
 
         /* try and grab hardware address of requested interface */
-        if(ioctl(sock,SIOCGIFHWADDR,&ifr)<0){
-                printf(_("Error: Could not get hardware address of interface '%s'\n"),interface_name);
+        if (ioctl(sock, SIOCGIFHWADDR, &ifr) < 0) {
+                printf(_("Error: Could not get hardware address of interface '%s'\n"), 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 */
 
-        size_t                  len;
-        int                     mib[6];
-        char                    *buf;
-        unsigned char           *ptr;
-        struct if_msghdr        *ifm;
-        struct sockaddr_dl      *sdl;
+        size_t len;
+        int mib[6];
+        char *buf;
+        unsigned char *ptr;
+        struct if_msghdr *ifm;
+        struct sockaddr_dl *sdl;
 
         mib[0] = CTL_NET;
         mib[1] = AF_ROUTE;
@@ -332,22 +351,22 @@ int get_hardware_address(int sock,char *interface_name){
         mib[3] = AF_LINK;
         mib[4] = NET_RT_IFLIST;
 
-        if((mib[5] = if_nametoindex(interface_name)) == 0){
+        if ((mib[5] = if_nametoindex(interface_name)) == 0) {
                 printf(_("Error: if_nametoindex error - %s.\n"), strerror(errno));
                 exit(STATE_UNKNOWN);
         }
 
-        if(sysctl(mib, 6, NULL, &len, NULL, 0) < 0){
+        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));
                 exit(STATE_UNKNOWN);
         }
 
-        if((buf = malloc(len)) == NULL){
+        if ((buf = malloc(len)) == NULL) {
                 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){
+        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));
                 exit(STATE_UNKNOWN);
         }
@@ -355,7 +374,7 @@ int get_hardware_address(int sock,char *interface_name){
         ifm = (struct if_msghdr *)buf;
         sdl = (struct sockaddr_dl *)(ifm + 1);
         ptr = (unsigned char *)LLADDR(sdl);
-        memcpy(&client_hardware_address[0], ptr, 6) ;
+        memcpy(&client_hardware_address[0], ptr, 6);
         /* King 2004 */
 
 #elif defined(__sun__) || defined(__solaris__)
@@ -368,22 +387,22 @@ int get_hardware_address(int sock,char *interface_name){
 
         /* get last number from interfacename, eg lnc0, e1000g0*/
         int i;
-        p = interface_name + strlen(interface_name) -1;
-        for(i = strlen(interface_name) -1; i > 0; p--) {
-                if(isalpha(*p))
+        p = interface_name + strlen(interface_name) - 1;
+        for (i = strlen(interface_name) - 1; i > 0; p--) {
+                if (isalpha(*p)) {
                         break;
+                }
         }
         p++;
-        if( p != interface_name ){
-                unit = atoi(p) ;
-                strncat(dev, interface_name, 6) ;
-        }
-        else{
+        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);
                 exit(STATE_UNKNOWN);
         }
         stat = mac_addr_dlpi(dev, unit, client_hardware_address);
-        if(stat != 0){
+        if (stat != 0) {
                 printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"), dev, unit);
                 exit(STATE_UNKNOWN);
         }
@@ -391,11 +410,11 @@ int get_hardware_address(int sock,char *interface_name){
 #elif defined(__hpux__)
 
         long stat;
-        char dev[20] = "/dev/dlpi" ;
+        char dev[20] = "/dev/dlpi";
         int unit = 0;
 
         stat = mac_addr_dlpi(dev, unit, client_hardware_address);
-        if(stat != 0){
+        if (stat != 0) {
                 printf(_("Error: can't read MAC address from DLPI streams interface for device %s unit %d.\n"), dev, unit);
                 exit(STATE_UNKNOWN);
         }
@@ -406,68 +425,69 @@ 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 */
-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;
 
-        strncpy((char *)&ifr.ifr_name,interface_name,sizeof(ifr.ifr_name)-1);
-        ifr.ifr_name[sizeof(ifr.ifr_name)-1]='\0';
+        strncpy((char *)&ifr.ifr_name, interface_name, sizeof(ifr.ifr_name) - 1);
+        ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
 
-        if(ioctl(sock,SIOCGIFADDR,&ifr)<0){
-                printf(_("Error: Cannot determine IP address of interface %s\n"),
-                                interface_name);
+        if (ioctl(sock, SIOCGIFADDR, &ifr) < 0) {
+                printf(_("Error: Cannot determine IP address of interface %s\n"), 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 */
-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;
+        discover_packet.op = BOOTREQUEST;
 
         /* hardware address type */
-        discover_packet.htype=ETHERNET_HARDWARE_ADDRESS;
+        discover_packet.htype = ETHERNET_HARDWARE_ADDRESS;
 
         /* length of our hardware address */
-        discover_packet.hlen=ETHERNET_HARDWARE_ADDRESS_LENGTH;
+        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);
+        srand(time(NULL) ^ getpid());
+        result.packet_xid = random();
+        discover_packet.xid = htonl(result.packet_xid);
 
         /*discover_packet.secs=htons(65535);*/
-        discover_packet.secs=0xFF;
+        discover_packet.secs = 0xFF;
 
         /*
          * server needs to know if it should broadcast or unicast its response:
@@ -476,408 +496,414 @@ int send_dhcp_discover(int sock){
         discover_packet.flags = unicast ? 0 : htons(DHCP_BROADCAST_FLAG);
 
         /* our hardware address */
-        memcpy(discover_packet.chaddr,client_hardware_address,ETHERNET_HARDWARE_ADDRESS_LENGTH);
+        memcpy(discover_packet.chaddr, client_hardware_address, ETHERNET_HARDWARE_ADDRESS_LENGTH);
 
         /* first four bytes of options field is magic cookie (as per RFC 2132) */
-        discover_packet.options[0]='\x63';
-        discover_packet.options[1]='\x82';
-        discover_packet.options[2]='\x53';
-        discover_packet.options[3]='\x63';
+        discover_packet.options[0] = '\x63';
+        discover_packet.options[1] = '\x82';
+        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++]=DHCPDISCOVER;
+        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 */
-        if(request_specific_address){
-                discover_packet.options[opts++]=DHCP_OPTION_REQUESTED_ADDRESS;
-                discover_packet.options[opts++]='\x04';
-                memcpy(&discover_packet.options[opts],&requested_address,sizeof(requested_address));
+        if (request_specific_address) {
+                discover_packet.options[opts++] = DHCP_OPTION_REQUESTED_ADDRESS;
+                discover_packet.options[opts++] = '\x04';
+                memcpy(&discover_packet.options[opts], &requested_address, sizeof(requested_address));
                 opts += sizeof(requested_address);
         }
-        discover_packet.options[opts++]= (char)DHCP_OPTION_END;
+        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("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));
-                printf("DHCDISCOVER giaddr:  %s\n",inet_ntoa(discover_packet.giaddr));
+        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("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));
+                printf("DHCDISCOVER giaddr:  %s\n", inet_ntoa(discover_packet.giaddr));
         }
 
         /* send the DHCPDISCOVER packet out */
-        send_dhcp_packet(&discover_packet,sizeof(discover_packet),sock,&sockaddr_broadcast);
+        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 */
-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 = OK;
+                result = receive_dhcp_packet(&offer_packet, sizeof(offer_packet), sock, dhcpoffer_timeout, &source);
 
-                if(result!=OK){
-                        if(verbose)
+                if (result != OK) {
+                        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 */
-                memcpy(&via,&source,sizeof(source)) ;
+                struct sockaddr_in via = {0};
+                memcpy(&via, &source, sizeof(source));
 
-                if(verbose){
-                        printf(_("DHCPOFFER from IP address %s"),inet_ntoa(source.sin_addr));
-                        printf(_(" via %s\n"),inet_ntoa(via.sin_addr));
-                        printf("DHCPOFFER XID: %u (0x%X)\n",ntohl(offer_packet.xid),ntohl(offer_packet.xid));
+                if (verbose) {
+                        printf(_("DHCPOFFER from IP address %s"), inet_ntoa(source.sin_addr));
+                        printf(_(" via %s\n"), inet_ntoa(via.sin_addr));
+                        printf("DHCPOFFER XID: %u (0x%X)\n", ntohl(offer_packet.xid), ntohl(offer_packet.xid));
                 }
 
                 /* 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 (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)
+                result = OK;
+                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])
-                                result=ERROR;
+                        if (offer_packet.chaddr[i] != client_hardware_address[i]) {
+                                result = ERROR;
+                        }
                 }
-                if(verbose)
+                if (verbose) {
                         printf("\n");
+                }
 
-                if(result==ERROR){
-                        if(verbose)
+                if (result == ERROR) {
+                        if (verbose) {
                                 printf(_("DHCPOFFER hardware address did not match our own - ignoring packet\n"));
+                        }
 
                         continue;
                 }
 
-                if(verbose){
-                        printf("DHCPOFFER ciaddr: %s\n",inet_ntoa(offer_packet.ciaddr));
-                        printf("DHCPOFFER yiaddr: %s\n",inet_ntoa(offer_packet.yiaddr));
-                        printf("DHCPOFFER siaddr: %s\n",inet_ntoa(offer_packet.siaddr));
-                        printf("DHCPOFFER giaddr: %s\n",inet_ntoa(offer_packet.giaddr));
+                if (verbose) {
+                        printf("DHCPOFFER ciaddr: %s\n", inet_ntoa(offer_packet.ciaddr));
+                        printf("DHCPOFFER yiaddr: %s\n", inet_ntoa(offer_packet.yiaddr));
+                        printf("DHCPOFFER siaddr: %s\n", inet_ntoa(offer_packet.siaddr));
+                        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++;
         }
 
-        if(verbose){
-                printf(_("Total responses seen on the wire: %d\n"),responses);
-                printf(_("Valid responses for this machine: %d\n"),valid_responses);
+        if (verbose) {
+                printf(_("Total responses seen on the wire: %d\n"), responses);
+                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 */
-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)
-                printf(_("send_dhcp_packet result: %d\n"),result);
+        if (verbose) {
+                printf(_("send_dhcp_packet result: %d\n"), result);
+        }
 
-        if(result<0)
+        if (result < 0) {
                 return ERROR;
+        }
 
         return OK;
 }
 
-
-
 /* receives a DHCP packet */
-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);
+        FD_SET(sock, &readfds);
+        FD_SET(sock, &oobfds);
+        int nfound = select(sock + 1, &readfds, NULL, &oobfds, &timeout_val);
 
         /* make sure some data has arrived */
-        if(!FD_ISSET(sock,&readfds)){
-                if(verbose)
+        if (!FD_ISSET(sock, &readfds)) {
+                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 */
-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);
-        if(sock<0){
+        int sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+        if (sock < 0) {
                 printf(_("Error: Could not create socket!\n"));
                 exit(STATE_UNKNOWN);
         }
 
-        if(verbose)
-                printf("DHCP socket: %d\n",sock);
+        if (verbose) {
+                printf("DHCP socket: %d\n", sock);
+        }
 
         /* set the reuse address flag so we don't get errors when restarting */
-        flag=1;
-        if(setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(char *)&flag,sizeof(flag))<0){
+        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);
         }
 
         /* set the broadcast option - we need this to listen to DHCP broadcast messages */
-        if(!unicast && setsockopt(sock,SOL_SOCKET,SO_BROADCAST,(char *)&flag,sizeof flag)<0){
+        if (!unicast && setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char *)&flag, sizeof flag) < 0) {
                 printf(_("Error: Could not set broadcast option on DHCP socket!\n"));
                 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);
+        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);
                 exit(STATE_UNKNOWN);
         }
 
 #else
-        strncpy(interface.ifr_name,network_interface_name,IFNAMSIZ-1);
-        interface.ifr_name[IFNAMSIZ-1]='\0';
+        strncpy(interface.ifr_name, network_interface_name, IFNAMSIZ - 1);
+        interface.ifr_name[IFNAMSIZ - 1] = '\0';
 #endif
 
         /* 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);
+        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);
                 exit(STATE_UNKNOWN);
         }
 
         return sock;
 }
 
-
 /* closes DHCP socket */
-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 */
-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->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)
-                printf(_("Requested server address: %s\n"),inet_ntoa(new_server->server_address));
+        if (verbose) {
+                printf(_("Requested server address: %s\n"), inet_ntoa(new_server->server_address));
+        }
 
         return OK;
 }
 
-
-
-
 /* adds a DHCP OFFER to list in memory */
-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)
-                        printf("Option: %d (0x%02X)\n",option_type,option_length);
+                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));
-                                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));
-                                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));
-                                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));
-                                break;
+                switch (option_type) {
+                case DHCP_OPTION_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[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[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[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 (verbose) {
+                if (dhcp_lease_time == DHCP_INFINITE_TIME) {
                         printf(_("Lease Time: Infinite\n"));
-                else
-                        printf(_("Lease Time: %lu seconds\n"),(unsigned long)dhcp_lease_time);
-                if(dhcp_renewal_time==DHCP_INFINITE_TIME)
+                } else {
+                        printf(_("Lease Time: %lu seconds\n"), (unsigned long)dhcp_lease_time);
+                }
+                if (dhcp_renewal_time == DHCP_INFINITE_TIME) {
                         printf(_("Renewal Time: Infinite\n"));
-                else
-                        printf(_("Renewal Time: %lu seconds\n"),(unsigned long)dhcp_renewal_time);
-                if(dhcp_rebinding_time==DHCP_INFINITE_TIME)
+                } else {
+                        printf(_("Renewal Time: %lu seconds\n"), (unsigned long)dhcp_renewal_time);
+                }
+                if (dhcp_rebinding_time == DHCP_INFINITE_TIME) {
                         printf(_("Rebinding Time: Infinite\n"));
-                printf(_("Rebinding Time: %lu seconds\n"),(unsigned long)dhcp_rebinding_time);
+                }
+                printf(_("Rebinding Time: %lu seconds\n"), (unsigned long)dhcp_rebinding_time);
         }
 
-        new_offer=(dhcp_offer *)malloc(sizeof(dhcp_offer));
+        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
@@ -891,298 +917,336 @@ int add_dhcp_offer(struct in_addr source,dhcp_packet *offer_packet){
          * DHCPOFFER from.  If 'serv_ident' isn't available for some reason, we
          * use 'source'.
          */
-        new_offer->server_address=serv_ident.s_addr?serv_ident:source;
-        new_offer->offered_address=offer_packet->yiaddr;
-        new_offer->lease_time=dhcp_lease_time;
-        new_offer->renewal_time=dhcp_renewal_time;
-        new_offer->rebinding_time=dhcp_rebinding_time;
-        new_offer->desired=false; /* exclusive mode: we'll check that in get_results */
-
-
-        if(verbose){
-                printf(_("Added offer from server @ %s"),inet_ntoa(new_offer->server_address));
-                printf(_(" of IP address %s\n"),inet_ntoa(new_offer->offered_address));
+        new_offer->server_address = serv_ident.s_addr ? serv_ident : source;
+        new_offer->offered_address = offer_packet->yiaddr;
+        new_offer->lease_time = dhcp_lease_time;
+        new_offer->renewal_time = dhcp_renewal_time;
+        new_offer->rebinding_time = dhcp_rebinding_time;
+        new_offer->desired = false; /* exclusive mode: we'll check that in get_results */
+
+        if (verbose) {
+                printf(_("Added offer from server @ %s"), inet_ntoa(new_offer->server_address));
+                printf(_(" of IP address %s\n"), inet_ntoa(new_offer->offered_address));
         }
 
         /* add new offer to head of list */
-        new_offer->next=dhcp_offer_list;
-        dhcp_offer_list=new_offer;
+        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 */
-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){
-                next_offer=this_offer->next;
+        for (dhcp_offer *this_offer = dhcp_offer_list; this_offer != NULL; this_offer = next_offer) {
+                next_offer = this_offer->next;
                 free(this_offer);
         }
 
         return OK;
 }
 
-
 /* frees memory allocated to requested server list */
-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){
-                next_server=this_server->next;
+        for (requested_server *this_server = requested_server_list; this_server != NULL; this_server = next_server) {
+                next_server = this_server->next;
                 free(this_server);
         }
 
         return OK;
 }
 
-
 /* gets state and plugin output to return */
-int get_results(void){
-        dhcp_offer *temp_offer, *undesired_offer=NULL;
-        requested_server *temp_server;
-        int result;
-        uint32_t max_lease_time=0;
-
-        received_requested_address=false;
+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);
 
-        /* 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)
-                                        max_lease_time=temp_offer->lease_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)))
-                                        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))){
-                                        if(verbose){
-                                                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 (!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))) {
+                                        if (verbose) {
+                                                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) {
                                                         printf(_(" (duplicate)"));
+                                                }
                                                 printf(_("\n"));
                                         }
-                                        if(!temp_server->answered){
+
+                                        if (!temp_server->answered) {
                                                 requested_responses++;
-                                                temp_server->answered=true;
-                                                temp_offer->desired=true;
+                                                temp_server->answered = true;
+                                                temp_offer->desired = true;
                                         }
                                 }
                         }
                 }
 
                 /* 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 */
+                                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{
 
-                for(temp_offer=dhcp_offer_list;temp_offer!=NULL;temp_offer=temp_offer->next){
+                mp_subcheck sc_rqust_srvs = mp_subcheck_init();
+                xasprintf(&sc_rqust_srvs.output, "%d of %d requested servers responded", requested_responses, requested_servers);
+
+                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)
-                                max_lease_time=temp_offer->lease_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)))
-                                received_requested_address=true;
+                        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 (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(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;
-        }
+                        // 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(requested_servers>0)
-                printf(_(", %s%d of %d requested servers responded"),((requested_responses<requested_servers) && requested_responses>0)?"only ":"",requested_responses,requested_servers);
+                        if (server_address != server_address_transformed) {
+                                die(STATE_UNKNOWN, "inet_ntop failed");
+                        }
 
-        if(request_specific_address)
-                printf(_(", requested address (%s) was %soffered"),inet_ntoa(requested_address),(received_requested_address)?"":_("not "));
+                        // 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(_(", max lease time = "));
-        if(max_lease_time==DHCP_INFINITE_TIME)
-                printf(_("Infinity"));
-        else
-                printf("%lu sec",(unsigned long)max_lease_time);
+                        if (offered_address != offered_address_transformed) {
+                                die(STATE_UNKNOWN, "inet_ntop failed");
+                        }
 
-        printf(".\n");
+                        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);
+        }
 
-        return result;
-}
+        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));
+                }
 
-/* process command-line arguments */
-int process_arguments(int argc, char **argv){
-        if(argc<1)
-                return ERROR;
+                mp_add_subcheck_to_subcheck(&sc_dhcp_results, sc_rqustd_addr);
+        }
 
-        call_getopt(argc,argv);
-        return validate_arguments(argc);
+        return sc_dhcp_results;
 }
 
+/* process command-line arguments */
+process_arguments_wrapper process_arguments(int argc, char **argv) {
+        if (argc < 1) {
+                process_arguments_wrapper tmp = {
+                        .error = ERROR,
+                };
+                return tmp;
+        }
 
-
-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}
+        enum {
+                output_format_index = CHAR_MAX + 1,
         };
 
-        int c=0;
-        while(true){
-                c=getopt_long(argc,argv,"+hVvxt:s:r:t:i:m:u",long_options,&option_index);
-
-                if(c==-1||c==EOF||c==1)
+        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'},
+                                                                                   {"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) {
+                option_char = getopt_long(argc, argv, "+hVvxt:s:r:t:i:m:u", long_options, &option_index);
+
+                if (option_char == -1 || option_char == EOF || option_char == 1) {
                         break;
+                }
 
-                switch(c){
-
-                        case 's': /* DHCP server address */
-                                resolve_host(optarg,&dhcp_ip);
-                                add_requested_server(dhcp_ip);
-                                break;
-
-                        case 'r': /* address we are requested from DHCP servers */
-                                resolve_host(optarg,&requested_address);
-                                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");
-                                         */
-                                break;
+                switch (option_char) {
+                case 's': /* DHCP server address */
+                        resolve_host(optarg, &config.dhcp_ip);
+                        add_requested_server(config.dhcp_ip, &config.num_of_requested_servers, &config.requested_server_list);
+                        break;
 
-                        case 'm': /* MAC address */
+                case 'r': /* address we are requested from DHCP servers */
+                        resolve_host(optarg, &config.requested_address);
+                        config.request_specific_address = true;
+                        break;
 
-                                if((user_specified_mac=mac_aton(optarg)) == NULL)
-                                        usage("Cannot parse MAC address.\n");
-                                if(verbose)
-                                        print_hardware_address(user_specified_mac);
+                case 't': /* timeout */
+                        if (atoi(optarg) > 0) {
+                                config.dhcpoffer_timeout = atoi(optarg);
+                        }
+                        break;
 
-                                break;
+                case 'm': /* MAC address */
+                        if ((config.user_specified_mac = mac_aton(optarg)) == NULL) {
+                                usage("Cannot parse MAC address.\n");
+                        }
+                        if (verbose) {
+                                print_hardware_address(config.user_specified_mac);
+                        }
+                        break;
 
-                        case 'i': /* interface name */
+                case 'i': /* interface name */
+                        strncpy(config.network_interface_name, optarg, sizeof(config.network_interface_name) - 1);
+                        config.network_interface_name[sizeof(config.network_interface_name) - 1] = '\x0';
+                        break;
 
-                                strncpy(network_interface_name,optarg,sizeof(network_interface_name)-1);
-                                network_interface_name[sizeof(network_interface_name)-1]='\x0';
+                case 'u': /* unicast testing */
+                        config.unicast_mode = true;
+                        break;
 
-                                break;
+                case 'x': /* exclusive testing aka "rogue DHCP server detection" */
+                        config.exclusive_mode = true;
+                        break;
 
-                        case 'u': /* unicast testing */
-                                unicast=true;
-                                break;
-                        case 'x': /* exclusive testing aka "rogue DHCP server detection" */
-                                exclusive=true;
-                                break;
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
 
-                        case 'V': /* version */
-                                print_revision(progname, NP_VERSION);
-                                exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
 
-                        case 'h': /* help */
-                                print_help();
+                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);
+                        }
 
-                        case 'v': /* verbose */
-                                verbose=1;
-                                break;
-                        case '?': /* help */
-                                usage5 ();
-                                break;
+                        config.output_format_is_set = true;
+                        config.output_format = parser.output_format;
+                        break;
+                }
+                case '?': /* help */
+                        usage5();
+                        break;
 
-                        default:
-                                break;
+                default:
+                        break;
                 }
         }
-        return optind;
-}
 
-
-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__)
 /* Kompf 2000-2003      see ACKNOWLEDGEMENTS */
 
 /* get a message from a stream; return type of message */
-static int get_msg(int fd){
+static int get_msg(int fd) {
         int flags = 0;
         int res, ret;
         ctl_area[0] = 0;
@@ -1190,30 +1254,29 @@ static int get_msg(int fd){
         ret = 0;
         res = getmsg(fd, &ctl, &dat, &flags);
 
-        if(res < 0){
-                if(errno == EINTR){
-                        return(GOT_INTR);
-                }
-                else{
+        if (res < 0) {
+                if (errno == EINTR) {
+                        return (GOT_INTR);
+                } else {
                         printf("%s\n", "get_msg FAILED.");
-                        return(GOT_ERR);
+                        return (GOT_ERR);
                 }
         }
-        if(ctl.len > 0){
+        if (ctl.len > 0) {
                 ret |= GOT_CTRL;
         }
-        if(dat.len > 0){
+        if (dat.len > 0) {
                 ret |= GOT_DATA;
         }
 
-        return(ret);
+        return (ret);
 }
 
 /* verify that dl_primitive in ctl_area = prim */
-static int check_ctrl(int prim){
+static int check_ctrl(int prim) {
         dl_error_ack_t *err_ack = (dl_error_ack_t *)ctl_area;
 
-        if(err_ack->dl_primitive != prim){
+        if (err_ack->dl_primitive != prim) {
                 printf(_("Error: DLPI stream API failed to get MAC in check_ctrl: %s.\n"), strerror(errno));
                 exit(STATE_UNKNOWN);
         }
@@ -1222,35 +1285,35 @@ static int check_ctrl(int prim){
 }
 
 /* put a control message on a stream */
-static int put_ctrl(int fd, int len, int pri){
+static int put_ctrl(int fd, int len, int pri) {
 
         ctl.len = len;
-        if(putmsg(fd, &ctl, 0, pri) < 0){
+        if (putmsg(fd, &ctl, 0, pri) < 0) {
                 printf(_("Error: DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n"), strerror(errno));
                 exit(STATE_UNKNOWN);
         }
 
-        return  0;
+        return 0;
 }
 
 /* put a control + data message on a stream */
-static int put_both(int fd, int clen, int dlen, int pri){
+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){
+        if (putmsg(fd, &ctl, &dat, pri) < 0) {
                 printf(_("Error: DLPI stream API failed to get MAC in put_both/putmsg().\n"), strerror(errno));
                 exit(STATE_UNKNOWN);
         }
 
-        return  0;
+        return 0;
 }
 
 /* open file descriptor and attach */
-static int dl_open(const char *dev, int unit, int *fd){
+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){
+        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));
                 exit(STATE_UNKNOWN);
         }
@@ -1262,7 +1325,7 @@ static int dl_open(const char *dev, int unit, int *fd){
 }
 
 /* send DL_BIND_REQ */
-static int dl_bind(int fd, int sap, u_char *addr){
+static int dl_bind(int fd, int sap, u_char *addr) {
         dl_bind_req_t *bind_req = (dl_bind_req_t *)ctl_area;
         dl_bind_ack_t *bind_ack = (dl_bind_ack_t *)ctl_area;
 
@@ -1274,12 +1337,11 @@ static int dl_bind(int fd, int sap, u_char *addr){
         bind_req->dl_xidtest_flg = 0;
         put_ctrl(fd, sizeof(dl_bind_req_t), 0);
         get_msg(fd);
-        if (GOT_ERR == check_ctrl(DL_BIND_ACK)){
+        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));
                 exit(STATE_UNKNOWN);
         }
-        bcopy((u_char *)bind_ack + bind_ack->dl_addr_offset, addr,
-                        bind_ack->dl_addr_length);
+        bcopy((u_char *)bind_ack + bind_ack->dl_addr_offset, addr, bind_ack->dl_addr_length);
 
         return 0;
 }
@@ -1296,13 +1358,13 @@ static int dl_bind(int fd, int sap, u_char *addr){
  *
  ***********************************************************************/
 
-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];
 
-        if(GOT_ERR != dl_open(dev, unit, &fd)){
-                if(GOT_ERR != dl_bind(fd, INSAP, mac_addr)){
-                        bcopy( mac_addr, addr, 6);
+        if (GOT_ERR != dl_open(dev, unit, &fd)) {
+                if (GOT_ERR != dl_bind(fd, INSAP, mac_addr)) {
+                        bcopy(mac_addr, addr, 6);
                         return 0;
                 }
         }
@@ -1314,99 +1376,93 @@ long mac_addr_dlpi( const char *dev, int unit, u_char  *addr){
 /* Kompf 2000-2003 */
 #endif
 
-
 /* resolve host name or die (TODO: move this to netutils.c!) */
-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)
-                usage_va(_("Invalid hostname/address - %s"),optarg);
+        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 */
-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);
+                }
+                tmp[0] = string[i];
+                tmp[1] = string[i + 1];
+                tmp[2] = '\0';
+                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;
 }
 
-
-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 */
-void print_help(void){
+void print_help(void) {
 
         print_revision(progname, NP_VERSION);
 
         printf("Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n");
-        printf (COPYRIGHT, copyright, email);
+        printf(COPYRIGHT, copyright, email);
 
         printf("%s\n", _("This plugin tests the availability of DHCP servers on a network."));
 
-        printf ("\n\n");
+        printf("\n\n");
 
         print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (UT_VERBOSE);
-
-        printf (" %s\n", "-s, --serverip=IPADDRESS");
-        printf ("    %s\n", _("IP address of DHCP server that we must hear from"));
-        printf (" %s\n", "-r, --requestedip=IPADDRESS");
-        printf ("    %s\n", _("IP address that should be offered by at least one DHCP server"));
-        printf (" %s\n", "-t, --timeout=INTEGER");
-        printf ("    %s\n", _("Seconds to wait for DHCPOFFER before timeout occurs"));
-        printf (" %s\n", "-i, --interface=STRING");
-        printf ("    %s\n", _("Interface to to use for listening (i.e. eth0)"));
-        printf (" %s\n", "-m, --mac=STRING");
-        printf ("    %s\n", _("MAC address to use in the DHCP request"));
-        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 (UT_SUPPORT);
-        return;
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_OUTPUT_FORMAT);
+        printf(UT_VERBOSE);
+
+        printf(" %s\n", "-s, --serverip=IPADDRESS");
+        printf("    %s\n", _("IP address of DHCP server that we must hear from"));
+        printf(" %s\n", "-r, --requestedip=IPADDRESS");
+        printf("    %s\n", _("IP address that should be offered by at least one DHCP server"));
+        printf(" %s\n", "-t, --timeout=INTEGER");
+        printf("    %s\n", _("Seconds to wait for DHCPOFFER before timeout occurs"));
+        printf(" %s\n", "-i, --interface=STRING");
+        printf("    %s\n", _("Interface to to use for listening (i.e. eth0)"));
+        printf(" %s\n", "-m, --mac=STRING");
+        printf("    %s\n", _("MAC address to use in the DHCP request"));
+        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(UT_SUPPORT);
 }
 
+void print_usage(void) {
 
-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;
+        printf("%s\n", _("Usage:"));
+        printf(" %s [-v] [-u] [-x] [-s serverip] [-r requestedip] [-t timeout]\n", progname);
+        printf("                  [-i interface] [-m mac]\n");
 }
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 f788d428..d46d2ccc 100644
--- a/plugins-root/check_icmp.c
+++ b/plugins-root/check_icmp.c
@@ -1,54 +1,56 @@
 /*****************************************************************************
-*
-* Monitoring check_icmp plugin
-*
-* License: GPL
-* Copyright (c) 2005-2008 Monitoring Plugins Development Team
-* Original Author : Andreas Ericsson <ae@op5.se>
-*
-* Description:
-*
-* This file contains the check_icmp plugin
-*
-* Relevant RFC's: 792 (ICMP), 791 (IP)
-*
-* This program was modeled somewhat after the check_icmp program,
-* which was in turn a hack of fping (www.fping.org) but has been
-* completely rewritten since to generate higher precision rta values,
-* and support several different modes as well as setting ttl to control.
-* redundant routes. The only remainders of fping is currently a few
-* function names.
-*
-*
-* 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_icmp plugin
+ *
+ * License: GPL
+ * Copyright (c) 2005-2024 Monitoring Plugins Development Team
+ * Original Author : Andreas Ericsson <ae@op5.se>
+ *
+ * Description:
+ *
+ * This file contains the check_icmp plugin
+ *
+ * Relevant RFC's: 792 (ICMP), 791 (IP)
+ *
+ * This program was modeled somewhat after the check_icmp program,
+ * which was in turn a hack of fping (www.fping.org) but has been
+ * completely rewritten since to generate higher precision rta values,
+ * and support several different modes as well as setting ttl to control.
+ * redundant routes. The only remainders of fping is currently a few
+ * function names.
+ *
+ *
+ * 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/>.
+ *
+ *
+ *****************************************************************************/
 
 /* progname may change */
 /* char *progname = "check_icmp"; */
 char *progname;
-const char *copyright = "2005-2008";
+const char *copyright = "2005-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 /** Monitoring Plugins basic includes */
 #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>
+#       include <sys/sockio.h>
 #endif
 
 #include <sys/time.h>
@@ -64,87 +66,50 @@ const char *email = "devel@monitoring-plugins.org";
 #include <netinet/ip_icmp.h>
 #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
-# define MAXTTL 255
+#       define MAXTTL 255
 #endif
 #ifndef INADDR_NONE
-# define INADDR_NONE (in_addr_t)(-1)
+#       define INADDR_NONE (in_addr_t)(-1)
 #endif
 
 #ifndef SOL_IP
-#define SOL_IP 0
+#       define SOL_IP 0
 #endif
 
 /* we bundle these in one #ifndef, since they're all from BSD
  * Put individual #ifndef's around those that bother you */
 #ifndef ICMP_UNREACH_NET_UNKNOWN
-# define ICMP_UNREACH_NET_UNKNOWN 6
-# define ICMP_UNREACH_HOST_UNKNOWN 7
-# define ICMP_UNREACH_ISOLATED 8
-# define ICMP_UNREACH_NET_PROHIB 9
-# define ICMP_UNREACH_HOST_PROHIB 10
-# define ICMP_UNREACH_TOSNET 11
-# define ICMP_UNREACH_TOSHOST 12
+#       define ICMP_UNREACH_NET_UNKNOWN  6
+#       define ICMP_UNREACH_HOST_UNKNOWN 7
+#       define ICMP_UNREACH_ISOLATED     8
+#       define ICMP_UNREACH_NET_PROHIB   9
+#       define ICMP_UNREACH_HOST_PROHIB  10
+#       define ICMP_UNREACH_TOSNET       11
+#       define ICMP_UNREACH_TOSHOST      12
 #endif
 /* tru64 has the ones above, but not these */
 #ifndef ICMP_UNREACH_FILTER_PROHIB
-# define ICMP_UNREACH_FILTER_PROHIB 13
-# define ICMP_UNREACH_HOST_PRECEDENCE 14
-# define ICMP_UNREACH_PRECEDENCE_CUTOFF 15
+#       define ICMP_UNREACH_FILTER_PROHIB     13
+#       define ICMP_UNREACH_HOST_PRECEDENCE   14
+#       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;
+#define FLAG_LOST_CAUSE 0x01 /* decidedly dead target. */
 
 typedef union ip_hdr {
         struct ip ip;
@@ -158,24 +123,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,156 +133,587 @@ 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_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;
+void print_help();
+void print_usage(void);
+
+/* 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);
+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 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");
+                }
+        }
 
-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;
-float pkt_backoff_factor = 1.5;
-float target_backoff_factor = 1.5;
-bool rta_mode=false;
-bool pl_mode=false;
-bool jitter_mode=false;
-bool score_mode=false;
-bool mos_mode=false;
-bool order_mode=false;
+        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;
+static void crash(const char *fmt, ...) {
 
         printf("%s: ", progname);
 
+        va_list ap;
         va_start(ap, fmt);
         vprintf(fmt, ap);
         va_end(ap);
 
-        if(errno) printf(": %s", strerror(errno));
+        if (errno) {
+                printf(": %s", strerror(errno));
+        }
         puts("");
 
         exit(3);
 }
 
-
-static const char *
-get_icmp_error_msg(unsigned char icmp_type, unsigned char icmp_code)
-{
+static const char *get_icmp_error_msg(unsigned char icmp_type, unsigned char icmp_code) {
         const char *msg = "unreachable";
 
-        if(debug > 1) printf("get_icmp_error_msg(%u, %u)\n", icmp_type, icmp_code);
-        switch(icmp_type) {
+        if (debug > 1) {
+                printf("get_icmp_error_msg(%u, %u)\n", icmp_type, icmp_code);
+        }
+        switch (icmp_type) {
         case ICMP_UNREACH:
-                switch(icmp_code) {
-                case ICMP_UNREACH_NET: msg = "Net unreachable"; break;
-                case ICMP_UNREACH_HOST: msg = "Host unreachable"; break;
-                case ICMP_UNREACH_PROTOCOL: msg = "Protocol unreachable (firewall?)"; break;
-                case ICMP_UNREACH_PORT: msg = "Port unreachable (firewall?)"; break;
-                case ICMP_UNREACH_NEEDFRAG: msg = "Fragmentation needed"; break;
-                case ICMP_UNREACH_SRCFAIL: msg = "Source route failed"; break;
-                case ICMP_UNREACH_ISOLATED: msg = "Source host isolated"; break;
-                case ICMP_UNREACH_NET_UNKNOWN: msg = "Unknown network"; break;
-                case ICMP_UNREACH_HOST_UNKNOWN: msg = "Unknown host"; break;
-                case ICMP_UNREACH_NET_PROHIB: msg = "Network denied (firewall?)"; break;
-                case ICMP_UNREACH_HOST_PROHIB: msg = "Host denied (firewall?)"; break;
-                case ICMP_UNREACH_TOSNET: msg = "Bad TOS for network (firewall?)"; break;
-                case ICMP_UNREACH_TOSHOST: msg = "Bad TOS for host (firewall?)"; break;
-                case ICMP_UNREACH_FILTER_PROHIB: msg = "Prohibited by filter (firewall)"; break;
-                case ICMP_UNREACH_HOST_PRECEDENCE: msg = "Host precedence violation"; break;
-                case ICMP_UNREACH_PRECEDENCE_CUTOFF: msg = "Precedence cutoff"; break;
-                default: msg = "Invalid code"; break;
+                switch (icmp_code) {
+                case ICMP_UNREACH_NET:
+                        msg = "Net unreachable";
+                        break;
+                case ICMP_UNREACH_HOST:
+                        msg = "Host unreachable";
+                        break;
+                case ICMP_UNREACH_PROTOCOL:
+                        msg = "Protocol unreachable (firewall?)";
+                        break;
+                case ICMP_UNREACH_PORT:
+                        msg = "Port unreachable (firewall?)";
+                        break;
+                case ICMP_UNREACH_NEEDFRAG:
+                        msg = "Fragmentation needed";
+                        break;
+                case ICMP_UNREACH_SRCFAIL:
+                        msg = "Source route failed";
+                        break;
+                case ICMP_UNREACH_ISOLATED:
+                        msg = "Source host isolated";
+                        break;
+                case ICMP_UNREACH_NET_UNKNOWN:
+                        msg = "Unknown network";
+                        break;
+                case ICMP_UNREACH_HOST_UNKNOWN:
+                        msg = "Unknown host";
+                        break;
+                case ICMP_UNREACH_NET_PROHIB:
+                        msg = "Network denied (firewall?)";
+                        break;
+                case ICMP_UNREACH_HOST_PROHIB:
+                        msg = "Host denied (firewall?)";
+                        break;
+                case ICMP_UNREACH_TOSNET:
+                        msg = "Bad TOS for network (firewall?)";
+                        break;
+                case ICMP_UNREACH_TOSHOST:
+                        msg = "Bad TOS for host (firewall?)";
+                        break;
+                case ICMP_UNREACH_FILTER_PROHIB:
+                        msg = "Prohibited by filter (firewall)";
+                        break;
+                case ICMP_UNREACH_HOST_PRECEDENCE:
+                        msg = "Host precedence violation";
+                        break;
+                case ICMP_UNREACH_PRECEDENCE_CUTOFF:
+                        msg = "Precedence cutoff";
+                        break;
+                default:
+                        msg = "Invalid code";
+                        break;
                 }
                 break;
 
         case ICMP_TIMXCEED:
                 /* really 'out of reach', or non-existent host behind a router serving
                  * two different subnets */
-                switch(icmp_code) {
-                case ICMP_TIMXCEED_INTRANS: msg = "Time to live exceeded in transit"; break;
-                case ICMP_TIMXCEED_REASS: msg = "Fragment reassembly time exceeded"; break;
-                default: msg = "Invalid code"; break;
+                switch (icmp_code) {
+                case ICMP_TIMXCEED_INTRANS:
+                        msg = "Time to live exceeded in transit";
+                        break;
+                case ICMP_TIMXCEED_REASS:
+                        msg = "Fragment reassembly time exceeded";
+                        break;
+                default:
+                        msg = "Invalid code";
+                        break;
                 }
                 break;
 
-        case ICMP_SOURCEQUENCH: msg = "Transmitting too fast"; break;
-        case ICMP_REDIRECT: msg = "Redirect (change route)"; break;
-        case ICMP_PARAMPROB: msg = "Bad IP header (required option absent)"; break;
+        case ICMP_SOURCEQUENCH:
+                msg = "Transmitting too fast";
+                break;
+        case ICMP_REDIRECT:
+                msg = "Redirect (change route)";
+                break;
+        case ICMP_PARAMPROB:
+                msg = "Bad IP header (required option absent)";
+                break;
 
                 /* the following aren't error messages, so ignore */
         case ICMP_TSTAMP:
@@ -344,25 +722,29 @@ get_icmp_error_msg(unsigned char icmp_type, unsigned char icmp_code)
         case ICMP_IREQREPLY:
         case ICMP_MASKREQ:
         case ICMP_MASKREPLY:
-        default: msg = ""; break;
+        default:
+                msg = "";
+                break;
         }
 
         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);
+        if (debug) {
+                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
          * us in a sane network (if it is anyway, it will be counted as lost
@@ -374,327 +756,139 @@ handle_random_icmp(unsigned char *packet, struct sockaddr_storage *addr)
          * 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(debug) printf("Packet is no response to a packet we sent\n");
+        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");
+                }
                 return 0;
         }
 
         /* it is indeed a response for us */
-        host = table[ntohs(sent_icmp.icmp_seq)/packets];
-        if(debug) {
+        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) return 0;
+        if (host->flags & FLAG_LOST_CAUSE) {
+                return 0;
+        }
 
         /* 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;
-        }
-        else {
-                targets_down++;
+        if (icmp_packet.icmp_type == ICMP_SOURCEQUENCH) {
+                *target_interval = (unsigned int)((double)*target_interval * TARGET_BACKOFF_FACTOR);
+        } else {
+                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);
-        break;
+                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);
-        break;
+                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);
+int main(int argc, char **argv) {
+        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;
+        /* POSIXLY_CORRECT might break things, so unset it (the portable way) */
+        environ = NULL;
 
-        address_family = -1;
-        int icmp_proto = IPPROTO_ICMP;
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
 
-        /* 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];
-
-        /* 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;
-
-        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;
-        }
+        check_icmp_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        /* 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");
+        if (tmp_config.errorcode != OK) {
+                crash("failed to parse 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;
-                        }
-                }
+        const check_icmp_config config = tmp_config.config;
+
+        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 (config.need_v6) {
+                sockset.socket6 = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6);
+                if (sockset.socket6 == -1) {
+                        crash("Failed to obtain ICMP v6 socket");
+                }
         }
-        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");
-#endif // SO_TIMESTAMP
 
         /* now drop privileges (no effect if not setsuid or geteuid() == 0) */
         if (setuid(getuid()) == -1) {
@@ -702,177 +896,182 @@ 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(debug) {
-                        if(result == -1) printf("setsockopt failed\n");
-                        else printf("ttl set to %u\n", 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 %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);
-        alarm(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);
+                        }
+                }
+        }
 
         /* 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);
 
-        if(debug) {
+        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 (debug) {
+                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);
-        }
-
-        if(packets > 20) {
-                errno = 0;
-                crash("packets is > 20 (%d)", packets);
+        if (debug) {
+                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(min_hosts_alive < -1) {
+        if (config.min_hosts_alive < -1) {
                 errno = 0;
-                crash("minimum alive hosts is negative (%i)", min_hosts_alive);
+                crash("minimum alive hosts is negative (%i)", config.min_hosts_alive);
         }
 
-        host = list;
-        table = malloc(sizeof(struct rta_host *) * targets);
-        if(!table) {
+        // 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;
-        while(host) {
-                host->id = i*packets;
-                table[i] = host;
+        unsigned short target_index = 0;
+        while (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);
 
-static void
-run_checks()
-{
-        u_int i, t;
-        u_int final_wait, time_passed;
+        if (sockset.socket4) {
+                close(sockset.socket4);
+        }
+        if (sockset.socket6) {
+                close(sockset.socket6);
+        }
 
+        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(table[t]->flags & FLAG_LOST_CAUSE) {
-                                if(debug) printf("%s is a lost cause. not sending any more\n",
-                                                                 table[t]->name);
+                        if (!targets_alive(number_of_targets, program_state->targets_down)) {
+                                return;
+                        }
+                        if (table[target_index]->flags & FLAG_LOST_CAUSE) {
+                                if (debug) {
+
+                                        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);
+                if (debug) {
+                        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);
+                if (time_passed > max_completion_time) {
+                        if (debug) {
+                                printf("Time passed. Finishing up\n");
+                        }
+                        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);
-                wait_for_reply(icmp_sock, final_wait);
+                if (debug) {
+                        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);
+                }
         }
 }
 
-
 /* response structure:
  * IPv4:
  * ip header   : 20 bytes
@@ -883,211 +1082,186 @@ run_checks()
  * 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 */
+                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(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);
+        // Get current time stamp
+        struct timeval wait_start;
+        gettimeofday(&wait_start, NULL);
 
-        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;
-
-                /* 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) {
-                        if(debug > 1) {
-                                printf("recvfrom_wto() timed out during a %u usecs wait\n",
-                                           per_pkt_wait);
+                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 %ld usecs wait\n", per_pkt_wait);
                         }
-                        continue;       /* timeout for this one, so keep trying */
+                        continue; /* timeout for this one, so keep trying */
                 }
-                if(n < 0) {
-                        if(debug) printf("recvfrom_wto() returned errors\n");
+
+                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) {
+                        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);
+                                           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(debug > 2) printf("not a proper ICMP_ECHOREPLY\n");
-                        handle_random_icmp(buf + hlen, &resp_addr);
+
+                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, 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);
-                        host = table[ntohs(packet.icp->icmp_seq)/packets];
+                        if (debug > 2) {
+                                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);
+                        }
+                        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);
-                        host = table[ntohs(packet.icp6->icmp6_seq)/packets];
+                        if (debug > 2) {
+                                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);
+                        }
+                        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++;
-                if (tdiff > (unsigned int)host->rtmax)
-                        host->rtmax = tdiff;
-                if (tdiff < (unsigned int)host->rtmin)
-                        host->rtmin = tdiff;
+                target->time_waited += tdiff;
+                target->icmp_recv++;
+                program_state->icmp_recv++;
 
-                if(debug) {
-                        char address[INET6_ADDRSTRLEN];
-                        parse_address(&resp_addr, address, sizeof(address));
+                if (tdiff > (unsigned int)target->rtmax) {
+                        target->rtmax = (double)tdiff;
+                }
 
-                        switch(address_family) {
-                                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);
-                                        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);
-                                          };
-                           }
+                if ((target->rtmin == INFINITY) || (tdiff < (unsigned int)target->rtmin)) {
+                        target->rtmin = (double)tdiff;
                 }
 
-                /* 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);
+                if (debug) {
+                        char address[INET6_ADDRSTRLEN];
+                        parse_address(&resp_addr, address, sizeof(address));
+
+                        switch (recv_foo.recv_proto) {
+                        case AF_INET: {
+                                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, max: %0.3f, min: %0.3f\n", (float)tdiff / 1000,
+                                           address, (float)target->rtmax / 1000, (float)target->rtmin / 1000);
+                        };
+                        }
                 }
         }
 
@@ -1096,42 +1270,29 @@ 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;
-        }
-
-        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 */
-                }
+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) {
+                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));
+
+        socklen_t addrlen = 0;
 
-        if (address_family == AF_INET) {
-                struct icmp *icp = (struct icmp*)buf;
+        if (host->address.ss_family == AF_INET) {
+                struct icmp *icp = (struct icmp *)buf;
                 addrlen = sizeof(struct sockaddr_in);
 
                 memcpy(&icp->icmp_data, &data, sizeof(data));
@@ -1139,16 +1300,20 @@ 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);
+                icp->icmp_cksum = icmp_checksum((uint16_t *)buf, (size_t)icmp_pkt_size);
+
+                if (debug > 2) {
+                        char address[INET6_ADDRSTRLEN];
+                        parse_address((&host->address), address, sizeof(address));
 
-                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);
-        }
-        else {
-                struct icmp6_hdr *icp6 = (struct icmp6_hdr*)buf;
+                                   sizeof(data), ntohs(icp->icmp_id), ntohs(icp->icmp_seq), icp->icmp_cksum,
+                                   address);
+                }
+        } else if (host->address.ss_family == AF_INET6) {
+                struct icmp6_hdr *icp6 = (struct icmp6_hdr *)buf;
                 addrlen = sizeof(struct sockaddr_in6);
 
                 memcpy(&icp6->icmp6_dataun.icmp6_un_data8[4], &data, sizeof(data));
@@ -1156,685 +1321,466 @@ 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(sock, &hdr, MSG_CONFIRM);
+                len = sendmsg(sockset.socket4, &hdr, MSG_CONFIRM);
 #else
-        len = sendmsg(sock, &hdr, 0);
+                len = sendmsg(sockset.socket4, &hdr, 0);
 #endif
+        } else if (host->address.ss_family == AF_INET6) {
+#ifdef MSG_CONFIRM
+                len = sendmsg(sockset.socket6, &hdr, MSG_CONFIRM);
+#else
+                len = sendmsg(sockset.socket6, &hdr, 0);
+#endif
+        } else {
+                assert(false);
+        }
 
         free(buf);
 
-        if(len < 0 || (unsigned int)len != icmp_pkt_size) {
-                if(debug) {
+        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;
+        struct cmsghdr *chdr;
 #endif
 
-        if(!*timo) {
-                if(debug) printf("*timo is not\n");
-                return 0;
-        }
-
-        to.tv_sec = *timo / 1000000;
-        to.tv_usec = (*timo - (to.tv_sec * 1000000));
-
-        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) crash("select() in recvfrom_wto");
-        gettimeofday(&now, &tz);
-        *timo = get_timevaldiff(&then, &now);
-
-        if(!n) return 0;                                /* timeout */
-
-        slen = sizeof(struct sockaddr_storage);
-
-        memset(&iov, 0, sizeof(iov));
-        iov.iov_base = buf;
-        iov.iov_len = len;
+        recvfrom_wto_wrapper result = {
+                .received = 0,
+                .recv_proto = AF_UNSPEC,
+        };
 
-        memset(&hdr, 0, sizeof(hdr));
-        hdr.msg_name = saddr;
-        hdr.msg_namelen = slen;
-        hdr.msg_iov = &iov;
-        hdr.msg_iovlen = 1;
-#ifdef HAVE_MSGHDR_MSG_CONTROL
-        hdr.msg_control = ans_data;
-        hdr.msg_controllen = sizeof(ans_data);
-#endif
-
-        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));
-                        break ;
+        if (!*timeout) {
+                if (debug) {
+                        printf("*timeout is not\n");
                 }
+                return result;
         }
 
-        if (!chdr)
-#endif // SO_TIMESTAMP
-                gettimeofday(tv, &tz);
-        return (ret);
-}
+        struct timeval real_timeout;
+        real_timeout.tv_sec = *timeout / 1000000;
+        real_timeout.tv_usec = (*timeout - (real_timeout.tv_sec * 1000000));
 
-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;
+        // Dummy fds for select
+        fd_set dummy_write_fds;
+        FD_ZERO(&dummy_write_fds);
 
-        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);
+        // Read fds for select with the socket
+        fd_set read_fds;
+        FD_ZERO(&read_fds);
 
-        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);
+        if (sockset.socket4 != -1) {
+                FD_SET(sockset.socket4, &read_fds);
+        }
+        if (sockset.socket6 != -1) {
+                FD_SET(sockset.socket6, &read_fds);
         }
 
-        /* iterate thrice to calculate values, give output, and print perfparse */
-        status=STATE_OK;
-        host = list;
+        int nfds = (sockset.socket4 > sockset.socket6 ? sockset.socket4 : sockset.socket6) + 1;
 
-        while(host) {
-                this_status = STATE_OK;
+        struct timeval then;
+        gettimeofday(&then, NULL);
 
-                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);
-                        }
+        errno = 0;
+        int select_return = select(nfds, &read_fds, &dummy_write_fds, NULL, &real_timeout);
+        if (select_return < 0) {
+                crash("select() in recvfrom_wto");
+        }
 
-                        // 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);
+        struct timeval now;
+        gettimeofday(&now, NULL);
+        *timeout = get_timevaldiff(then, now);
 
-                        if (R < 0) {
-                                R = 0;
-                        }
+        if (!select_return) {
+                return result; /* timeout */
+        }
 
-                        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;
-                }
+        unsigned int slen = sizeof(struct sockaddr_storage);
 
-                host->pl = pl;
-                host->rta = rta;
+        struct iovec iov = {
+                .iov_base = buf,
+                .iov_len = len,
+        };
 
-                /* 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;
-                }
+        struct msghdr hdr = {
+                .msg_name = saddr,
+                .msg_namelen = slen,
+                .msg_iov = &iov,
+                .msg_iovlen = 1,
+#ifdef HAVE_MSGHDR_MSG_CONTROL
+                .msg_control = ans_data,
+                .msg_controllen = sizeof(ans_data),
+#endif
+        };
 
-                /* 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;
-                        }
-                }
+        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);
+        }
 
-                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;
-                        }
-                }
+        result.received = ret;
 
-                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;
-                        }
+#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(received_timestamp, CMSG_DATA(chdr), sizeof(*received_timestamp));
+                        break;
                 }
+        }
 
-                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 (!chdr) {
+                gettimeofday(received_timestamp, NULL);
+        }
+#else
+        gettimeofday(tv, NULL);
+#endif // SO_TIMESTAMP
 
-                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;
-                        }
-                }
+        return (result);
+}
 
-                if (this_status == STATE_WARNING) {
-                        hosts_warn++;
-                } else if (this_status == STATE_OK) {
-                        hosts_ok++;
-                }
+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);
 
-                host = host->next;
+        if (debug > 1) {
+                printf("finish(%d) called\n", sig);
         }
 
-
-        /* 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;
+        if (debug) {
+                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));
         }
-        printf("%s - ", status_string[status]);
 
-        host = list;
-        while(host) {
+        // 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(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;
-        }
+                targets_ok += host_check.targets_ok;
+                targets_warn += host_check.targets_warn;
 
-        /* iterate once more for pretty perfparse output */
-        if (!(!rta_mode && !pl_mode && !jitter_mode && !score_mode && !mos_mode && order_mode)) {
-                        printf("|");
+                mp_add_subcheck_to_check(overall, host_check.sc_host);
         }
-        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 (min_hosts_alive > -1) {
+                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 (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 (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);
 
-                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 : "");
-                        }
+                        // 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);
-
-        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 (debug) {
+                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);
         }
-        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);
 
-        if (address_family == AF_INET)
-                sin = (struct sockaddr_in *)in;
-        else
-                sin6 = (struct sockaddr_in6 *)in;
+        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 (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 {
+                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 {
+                result.error_code = target_wrapper.errorcode;
         }
-        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;
-
-        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");
+        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) {
-                        if(debug > 2) printf("mode: %d\n", mode);
+                if (mode == MODE_HOSTCHECK || mode == MODE_ALL) {
+                        if (debug > 2) {
+                                printf("mode: %d\n", mode);
+                        }
                         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;
-        if((src.sin_addr.s_addr = inet_addr(arg)) == INADDR_NONE)
+        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);
-        if(bind(icmp_sock, (struct sockaddr *)&src, sizeof(src)) == -1)
+        }
+        if (bind(icmp_sock, (struct sockaddr *)&src, sizeof(src)) == -1) {
                 crash("Cannot bind to IP address %s", 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)
-{
-  // 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
+static in_addr_t get_ip_address(const char *ifname) {
+        // TODO: Rewrite this so the function return an error and we exit somewhere else
+        struct sockaddr_in ip_address;
+        ip_address.sin_addr.s_addr = 0; // Fake initialization to make compiler happy
 #if defined(SIOCGIFADDR)
         struct ifreq ifr;
 
@@ -1842,16 +1788,17 @@ get_ip_address(const char *ifname)
 
         ifr.ifr_name[sizeof(ifr.ifr_name) - 1] = '\0';
 
-        if(ioctl(icmp_sock, SIOCGIFADDR, &ifr) == -1)
+        if (ioctl(icmp_sock, SIOCGIFADDR, &ifr) == -1) {
                 crash("Cannot determine IP address of interface %s", ifname);
+        }
 
         memcpy(&ip, &ifr.ifr_addr, sizeof(ip));
 #else
-        (void) ifname;
+        (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;
 }
 
 /*
@@ -1860,76 +1807,127 @@ 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 */
-
-        if(!str) return 0;
-        len = strlen(str);
-        if(!len) return 0;
+static get_timevar_wrapper get_timevar(const char *str) {
+        get_timevar_wrapper result = {
+                .error_code = OK,
+                .time_range = 0,
+        };
+
+        if (!str) {
+                result.error_code = ERROR;
+                return result;
+        }
+
+        size_t len = strlen(str);
+        if (!len) {
+                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];
-        if(len >= 2 && !isdigit((int)str[len - 2])) p = str[len - 2];
-        if(p && u == 's') u = p;
-        else if(!p) p = u;
-        if(debug > 2) printf("evaluating %s, u: %c, p: %c\n", str, u, p);
-
-        if(u == 'u') factor = 1;            /* microseconds */
-        else if(u == 'm') factor = 1000;        /* milliseconds */
-        else if(u == 's') factor = 1000000;     /* seconds */
-        if(debug > 2) printf("factor is %u\n", factor);
-
-        i = strtoul(str, &ptr, 0);
-        if(!ptr || *ptr != '.' || strlen(ptr) < 2 || factor == 1)
-                return i * factor;
+        char tmp = '\0';
+        char unit = str[len - 1];
+        if (len >= 2 && !isdigit((int)str[len - 2])) {
+                tmp = str[len - 2];
+        }
+
+        if (tmp && unit == 's') {
+                unit = tmp;
+        } else if (!tmp) {
+                tmp = unit;
+        }
+
+        if (debug > 2) {
+                printf("evaluating %s, u: %c, p: %c\n", str, unit, tmp);
+        }
+
+        unsigned int factor = 1000; /* default to milliseconds */
+        if (unit == 'u') {
+                factor = 1; /* microseconds */
+        } else if (unit == 'm') {
+                factor = 1000; /* milliseconds */
+        } else if (unit == 's') {
+                factor = 1000000; /* seconds */
+        }
+
+        if (debug > 2) {
+                printf("factor is %u\n", factor);
+        }
+
+        char *ptr;
+        unsigned long pre_radix;
+        pre_radix = strtoul(str, &ptr, 0);
+        if (!ptr || *ptr != '.' || strlen(ptr) < 2 || factor == 1) {
+                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;
+        if (factor == 1) {
+                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(th->rta > MAXTTL * 1000000) th->rta = MAXTTL * 1000000;
-        if(th->pl > 100) th->pl = 100;
+        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;
+        }
 
-        return 0;
+        if (result.threshold.rta > MAXTTL * 1000000) {
+                result.threshold.rta = MAXTTL * 1000000;
+        }
+        if (result.threshold.pl > 100) {
+                result.threshold.pl = 100;
+        }
+
+        return result;
 }
 
 /*
@@ -1940,190 +1938,537 @@ 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;
-                        break;
-                case const_packet_loss_mode:
-                        thr->pl = (unsigned char)strtoul(s, &resultChecker, 0);
-                        break;
-                case const_jitter_mode:
-                        thr->jitter = strtod(s, &resultChecker);
-
-                        break;
-                case const_mos_mode:
-                        thr->mos = strtod(s, &resultChecker);
-                        break;
-                case const_score_mode:
-                        thr->score = strtod(s, &resultChecker);
-                        break;
+        case const_rta_mode:
+                result.result.rta = (unsigned int)(strtod(threshold_string, &resultChecker) * 1000);
+                break;
+        case const_packet_loss_mode:
+                result.result.pl = (unsigned char)strtoul(threshold_string, &resultChecker, 0);
+                break;
+        case const_jitter_mode:
+                result.result.jitter = strtod(threshold_string, &resultChecker);
+                break;
+        case const_mos_mode:
+                result.result.mos = strtod(threshold_string, &resultChecker);
+                break;
+        case const_score_mode:
+                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 */
+        sum = (sum >> 16) + (sum & 0xffff); /* add hi 16 to low 16 */
+        sum += (sum >> 16);                 /* add carry */
+        unsigned short cksum;
+        cksum = (unsigned short)~sum; /* ones-complement, trunc to 16 bits */
 
         return cksum;
 }
 
-void
-print_help(void)
-{
-        /*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 ("    %s\n", _("packet loss mode, ex. 40%,50% , unit in %"));
-        printf (" %s\n", "-J");
-        printf ("    %s\n", _("jitter mode  warning,critical, ex. 40.000ms,50.000ms , unit in ms "));
-        printf (" %s\n", "-M");
-        printf ("    %s\n", _("MOS mode, between 0 and 4.4  warning,critical, ex. 3.5,3.0"));
-        printf (" %s\n", "-S");
-        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", "-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 ("\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 ("\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 ("\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 (UT_SUPPORT);
+void print_help(void) {
+        // print_revision (progname); /* FIXME: Why? */
+        printf("Copyright (c) 2005 Andreas Ericsson <ae@op5.se>\n");
+
+        printf(COPYRIGHT, copyright, email);
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        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, --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, --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, --score-mode-thresholds=SCORE_MODE_THRESHOLD");
+        printf("    %s\n", _("score  mode, max value 100  warning,critical, ex. 80,70 "));
+        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", _("[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, --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", _("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."));
+
+        printf(UT_SUPPORT);
+}
+
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        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;
+        }
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf(" %s [options] [-H] host1 host2 hostN\n", progname);
+        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..d56fbd8b
--- /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 = OK,
+        };
+
+        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 = ERROR;
+                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..c348bef5
--- /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/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-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 38b87fcc..f0b7c491 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -97,11 +97,12 @@ my $opt_V ;
 my $opt_u;
 my $opt_n;
 my $opt_x ;
+my $opt_d;
 my %excluded ;
 my %unused_names ;
 my @unused_ports ;
 my %session_opts;
-
+my @exclude_descriptions;
 
 
 
@@ -134,6 +135,7 @@ if (!defined($session)) {
 }
 
 
+push(@snmpoids,$snmpLocIfDescr);
 push(@snmpoids,$snmpIfOperStatus);
 push(@snmpoids,$snmpIfAdminStatus);
 push(@snmpoids,$snmpIfDescr);
@@ -180,18 +182,28 @@ foreach $key (keys %ifStatus) {
                 if ($ifStatus{$key}{$snmpIfAdminStatus} == 1 ) {
                         #check only if interface is not excluded
                         if (!defined $unused_names{$ifStatus{$key}{$snmpIfDescr}} ) {
-                                # check only if interface type is not listed in %excluded
-                                if (!defined $excluded{$ifStatus{$key}{$snmpIfType}} ) {
-                                        if ($ifStatus{$key}{$snmpIfOperStatus} == 1 ) { $ifup++ ; }
-                                        if ($ifStatus{$key}{$snmpIfOperStatus} == 2 ) {
-                                                                        $ifdown++ ;
-                                                                        if (defined $ifXTable) {
-                                                                                $ifmessage .= sprintf("%s: down -> %s<BR>\n", $ifStatus{$key}{$snmpIfName}, $ifStatus{$key}{$snmpIfAlias});
-                                                                        }else{
-                                                                                $ifmessage .= sprintf("%s: down <BR>\n",$ifStatus{$key}{$snmpIfDescr});
-                                                                        }
+                                #check only if interface is not excluded (by description)
+                                #counter for matching descriptions
+                                my $match_descr = 0;
+                                foreach my $description (@exclude_descriptions) {
+                                        if ($ifStatus{$key}{$snmpLocIfDescr} =~ /^$description/) { $match_descr = 1; }
+                                }
+                                if ($match_descr == 0) {
+                                        # check only if interface type is not listed in %excluded
+                                        if (!defined $excluded{$ifStatus{$key}{$snmpIfType}} ) {
+                                                if ($ifStatus{$key}{$snmpIfOperStatus} == 1 ) { $ifup++ ; }
+                                                if ($ifStatus{$key}{$snmpIfOperStatus} == 2 ) {
+                                                                                $ifdown++ ;
+                                                                                if (defined $ifXTable) {
+                                                                                        $ifmessage .= sprintf("%s: down -> %s<BR>\n", $ifStatus{$key}{$snmpIfName}, $ifStatus{$key}{$snmpIfAlias});
+                                                                                }else{
+                                                                                        $ifmessage .= sprintf("%s: down <BR>\n",$ifStatus{$key}{$snmpIfDescr});
+                                                                                }
+                                                }
+                                                if ($ifStatus{$key}{$snmpIfOperStatus} == 5 ) { $ifdormant++ ;}
+                                        } else {
+                                                $ifexclude++;
                                         }
-                                        if ($ifStatus{$key}{$snmpIfOperStatus} == 5 ) { $ifdormant++ ;}
                                 } else {
                                         $ifexclude++;
                                 }
@@ -264,6 +276,9 @@ sub print_help() {
         printf "                     the descriptive name.  Do not use if you don't know what this is. \n";
         printf "   -x (--exclude)    A comma separated list of ifType values that should be excluded \n";
         printf "                     from the report (default for an empty list is PPP(23).\n";
+        printf "   -d (--exclude_ports_by_description) A comma separated list of LocIfDescr values that should be excluded \n";
+        printf "                     from the report (default is an empty exclusion list). Done using regexp '/^arg/', ex:\n";
+        printf "                     '-d connect,test' will match with descriptions like 'testing phase' but not 'in testing'.\n";
         printf "   -n (--unused_ports_by_name) A comma separated list of ifDescr values that should be excluded \n";
         printf "                     from the report (default is an empty exclusion list).\n";
         printf "   -u (--unused_ports) A comma separated list of ifIndex values that should be excluded \n";
@@ -306,6 +321,7 @@ sub process_arguments() {
                 "I"             => \$ifXTable, "ifmib" => \$ifXTable,
                 "x:s"           =>      \$opt_x,   "exclude:s" => \$opt_x,
                 "u=s" => \$opt_u,  "unused_ports=s" => \$opt_u,
+                "d=s" => \$opt_d, "exclude_ports_by_description=s" => \$opt_d,
                 "n=s" => \$opt_n, "unused_ports_by_name=s" => \$opt_n,
                 "M=i" => \$maxmsgsize, "maxmsgsize=i" => \$maxmsgsize,
                 "t=i" => \$timeout,    "timeout=i" => \$timeout,
@@ -414,6 +430,11 @@ sub process_arguments() {
                 }
         }
         
+        # Exclude interfaces by descriptions
+        if (defined $opt_d) {
+                @exclude_descriptions = split(/,/,$opt_d);
+        }
+
         # Excluded interface descriptors
         if (defined $opt_n) {
                 my @unused = split(/,/,$opt_n);
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index 8a56b9fc..0968982e 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -311,18 +311,18 @@ sub get_rpcinfo {
                 printf "$line " if $verbose;
                 chomp $line;
 
-        if ( $line =~ /program $prognum version ([0-9]*) ready and waiting/ ) {
+        if ( $line =~ /[Pp]rogram $prognum version ([0-9]*) ready and waiting/ ) {
                         $response .= " version $1";
                         $state = 'OK' unless $state ne 'UNKNOWN';
                         print "1:$response \n" if $verbose;
         }
 
-                if ( $line =~ /program $prognum version ([0-9]*) is not available/ ) {
+                if ( $line =~ /[Pp]rogram $prognum version ([0-9]*) is not available/ ) {
                         $response2 .= " version $1";
                         $state = 'CRITICAL';
                         print "2:$response2 \n" if $verbose;
                 }
-                if ( $line =~ /program $prognum is not available/ ) {
+                if ( $line =~ /[Pp]rogram $prognum is not available/ ) {
                         $response3 = "";
                         $response3 = "tcp" if $opt_t;
                         $response3 = "udp" if $opt_u;
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index 866e0e0f..ba3581b1 100755..100644
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -20,7 +20,6 @@ print_help() {
         echo "This plugin checks hardware status using the lm_sensors package."
         echo ""
         support
-        exit "$STATE_OK"
 }
 
 case "$1" in
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 49086b7a..192a2549 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -27,7 +27,7 @@ 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_overcr check_ping \
+        check_mrtg check_mrtgtraf check_ntp 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@
@@ -38,19 +38,63 @@ check_tcp_programs = check_ftp check_imap check_nntp check_pop \
 EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp 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_procs check_mysql_query check_apt check_dbi check_curl
+        check_procs check_mysql_query check_apt check_dbi check_curl \
+        \
+        tests/test_check_swap \
+        tests/test_check_disk
 
 SUBDIRS = picohttpparser
 
-EXTRA_DIST = t tests
+np_test_scripts = tests/test_check_swap.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_disk.d \
+                         check_time.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_mysql.d \
+                         check_ntp_time.d \
+                         check_dig.d \
+                         check_cluster.d \
+                         check_ups.d \
+                         check_fping.d
 
 PLUGINHDRS = common.h
 
 noinst_LIBRARIES = libnpcommon.a
+noinst_PROGRAMS = @EXTRA_PLUGIN_TESTS@
+# These two lines support "make check", but we use "make test"
+check_PROGRAMS = @EXTRA_PLUGIN_TESTS@
 
 libnpcommon_a_SOURCES = utils.c netutils.c sslutils.c runcmd.c  \
         popen.c utils.h netutils.h popen.h common.h runcmd.c runcmd.h
 
+
 BASEOBJS = libnpcommon.a ../lib/libmonitoringplug.a ../gl/libgnu.a $(LIB_CRYPTO)
 NETOBJS = $(BASEOBJS) $(EXTRA_NETOBLS)
 NETLIBS = $(NETOBJS) $(SOCKETLIBS)
@@ -58,7 +102,10 @@ SSLOBJS = $(BASEOBJS) $(NETLIBS) $(SSLLIBS) $(LIB_CRYPTO)
 
 TESTS_ENVIRONMENT = perl -I $(top_builddir) -I $(top_srcdir)
 
-TESTS = @PLUGIN_TEST@
+tap_ldflags = -L$(top_srcdir)/tap
+
+TESTS = @PLUGIN_TEST@ @EXTRA_PLUGIN_TESTS@
+
 
 test:
         perl -I $(top_builddir) -I $(top_srcdir) ../test.pl
@@ -77,6 +124,7 @@ check_curl_LDADD = $(NETLIBS) $(LIBCURLLIBS) $(SSLOBJS) $(URIPARSERLIBS) picohtt
 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)
@@ -97,8 +145,6 @@ check_nagios_LDADD = $(BASEOBJS)
 check_nt_LDADD = $(NETLIBS)
 check_ntp_LDADD = $(NETLIBS) $(MATHLIBS)
 check_ntp_peer_LDADD = $(NETLIBS) $(MATHLIBS)
-check_nwstat_LDADD = $(NETLIBS)
-check_overcr_LDADD = $(NETLIBS)
 check_pgsql_LDADD = $(NETLIBS) $(PGLIBS)
 check_ping_LDADD = $(NETLIBS)
 check_procs_LDADD = $(BASEOBJS)
@@ -107,6 +153,7 @@ check_real_LDADD = $(NETLIBS)
 check_snmp_LDADD = $(BASEOBJS)
 check_smtp_LDADD = $(SSLOBJS)
 check_ssh_LDADD = $(NETLIBS)
+check_swap_SOURCES = check_swap.c check_swap.d/swap.c
 check_swap_LDADD = $(MATHLIBS) $(BASEOBJS)
 check_tcp_LDADD = $(SSLOBJS)
 check_time_LDADD = $(NETLIBS)
@@ -122,6 +169,11 @@ if !HAVE_UTMPX
 check_users_LDADD += popen.o
 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_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 5c0f6e28..e840184b 100644
--- a/plugins/check_apt.c
+++ b/plugins/check_apt.c
@@ -1,55 +1,54 @@
 /*****************************************************************************
-*
-* Monitoring check_apt plugin
-*
-* License: GPL
-* Copyright (c) 2006-2008 Monitoring Plugins Development Team
-*
-* Original author: Sean Finney
-*
-* Description:
-*
-* This file contains the check_apt plugin
-*
-* Check for available updates in apt package management systems
-*
-*
-* 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_apt plugin
+ *
+ * License: GPL
+ * Copyright (c) 2006-2024 Monitoring Plugins Development Team
+ *
+ * Original author: Sean Finney
+ *
+ * Description:
+ *
+ * This file contains the check_apt plugin
+ *
+ * Check for available updates in apt package management systems
+ *
+ *
+ * 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 "states.h"
 const char *progname = "check_apt";
-const char *copyright = "2006-2008";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
 #include "utils.h"
 #include "regex.h"
-
-/* some constants */
-typedef enum { UPGRADE, DIST_UPGRADE, NO_UPGRADE } upgrade_type;
+#include "check_apt.d/config.h"
 
 /* Character for hidden input file option (for testing). */
-#define INPUT_FILE_OPT CHAR_MAX+1
+#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"
+#define 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"
+#       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 "
@@ -57,97 +56,106 @@ typedef enum { UPGRADE, DIST_UPGRADE, NO_UPGRADE } upgrade_type;
 #define SECURITY_RE "^[^\\(]*\\(.* (Debian-Security:|Ubuntu:[^/]*/[^-]*-security)"
 
 /* some standard functions */
-int process_arguments(int, char **);
-void print_help(void);
+typedef struct {
+        int errorcode;
+        check_apt_config config;
+} check_apt_config_wrapper;
+static check_apt_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
 void print_usage(void);
 
 /* construct the appropriate apt-get cmdline */
-char* construct_cmdline(upgrade_type u, const char *opts);
+static char *construct_cmdline(upgrade_type /*u*/, const char * /*opts*/);
 /* run an apt-get update */
-int run_update(void);
+static int run_update(char * /*update_opts*/);
+
+typedef struct {
+        int errorcode;
+        int package_count;
+        int security_package_count;
+        char **packages_list;
+        char **secpackages_list;
+} run_upgrade_result;
+
 /* run an apt-get upgrade */
-int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkglist);
+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 */
-char* add_to_regexp(char *expr, const char *next);
+static char *add_to_regexp(char * /*expr*/, const char * /*next*/);
 /* extract package name from Inst line */
-char* pkg_name(char *line);
+static char *pkg_name(char * /*line*/);
 /* string comparison function for qsort */
-int cmpstringp(const void *p1, const void *p2);
+static int cmpstringp(const void * /*p1*/, const void * /*p2*/);
 
 /* configuration variables */
-static int verbose = 0;      /* -v */
-static bool list = false;         /* list packages available for upgrade */
-static bool do_update = false;    /* whether to call apt-get update */
-static bool only_critical = false;    /* whether to warn about non-critical updates */
-static upgrade_type upgrade = UPGRADE; /* which type of upgrade to do */
-static char *upgrade_opts = NULL; /* options to override defaults for upgrade */
-static char *update_opts = NULL; /* options to override defaults for update */
-static char *do_include = NULL;  /* regexp to only include certain packages */
-static char *do_exclude = NULL;  /* regexp to only exclude certain packages */
-static char *do_critical = NULL;  /* regexp specifying critical packages */
-static char *input_filename = NULL; /* input filename for testing */
-/* number of packages available for upgrade to return WARNING status */
-static int packages_warning = 1;
+static int verbose = 0; /* -v */
 
 /* other global variables */
-static int stderr_warning = 0;   /* if a cmd issued output on stderr */
-static int exec_warning = 0;     /* if a cmd exited non-zero */
-
-int main (int argc, char **argv) {
-        int result=STATE_UNKNOWN, packages_available=0, sec_count=0;
-        char **packages_list=NULL, **secpackages_list=NULL;
+static bool stderr_warning = false; /* if a cmd issued output on stderr */
+static bool exec_warning = false;   /* if a cmd exited non-zero */
 
+int main(int argc, char **argv) {
         /* Parse extra opts if any */
-        argv=np_extra_opts(&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments(argc, argv) == ERROR)
+        check_apt_config_wrapper tmp_config = process_arguments(argc, argv);
+
+        if (tmp_config.errorcode == ERROR) {
                 usage_va(_("Could not parse arguments"));
+        }
+
+        const check_apt_config config = tmp_config.config;
 
         /* Set signal handling and alarm timeout */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
         }
 
         /* handle timeouts gracefully... */
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 
+        mp_state_enum result = STATE_UNKNOWN;
         /* if they want to run apt-get update first... */
-        if(do_update) result = run_update();
+        if (config.do_update) {
+                result = run_update(config.update_opts);
+        }
 
         /* apt-get upgrade */
-        result = max_state(result, run_upgrade(&packages_available, &sec_count, &packages_list, &secpackages_list));
+        run_upgrade_result upgrad_res =
+                run_upgrade(config.upgrade, config.do_include, config.do_exclude, config.do_critical, config.upgrade_opts, config.input_filename);
+
+        result = max_state(result, upgrad_res.errorcode);
+        int packages_available = upgrad_res.package_count;
+        int sec_count = upgrad_res.security_package_count;
+        char **packages_list = upgrad_res.packages_list;
+        char **secpackages_list = upgrad_res.secpackages_list;
 
-        if(sec_count > 0){
+        if (sec_count > 0) {
                 result = max_state(result, STATE_CRITICAL);
-        } else if(packages_available >= packages_warning && only_critical == false){
+        } else if (packages_available >= config.packages_warning && !config.only_critical) {
                 result = max_state(result, STATE_WARNING);
-        } else if(result > STATE_UNKNOWN){
+        } else if (result > STATE_UNKNOWN) {
                 result = STATE_UNKNOWN;
         }
 
         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,
-               (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
-               );
-
-        if(list) {
-                qsort(secpackages_list, sec_count, sizeof(char*), cmpstringp);
-                qsort(packages_list, packages_available-sec_count, sizeof(char*), cmpstringp);
-
-                for(int i = 0; i < sec_count; i++)
+                   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);
+
+        if (config.list) {
+                qsort(secpackages_list, sec_count, sizeof(char *), cmpstringp);
+                qsort(packages_list, packages_available - sec_count, sizeof(char *), cmpstringp);
+
+                for (int i = 0; i < sec_count; i++) {
                         printf("%s (security)\n", secpackages_list[i]);
+                }
 
-                if (only_critical == false) {
-                        for(int i = 0; i < packages_available - sec_count; i++)
+                if (!config.only_critical) {
+                        for (int i = 0; i < packages_available - sec_count; i++) {
                                 printf("%s\n", packages_list[i]);
+                        }
                 }
         }
 
@@ -155,34 +163,37 @@ int main (int argc, char **argv) {
 }
 
 /* process command-line arguments */
-int process_arguments (int argc, char **argv) {
-        int c;
-
-        static struct option longopts[] = {
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"verbose", no_argument, 0, 'v'},
-                {"timeout", required_argument, 0, 't'},
-                {"update", optional_argument, 0, 'u'},
-                {"upgrade", optional_argument, 0, 'U'},
-                {"no-upgrade", no_argument, 0, 'n'},
-                {"dist-upgrade", optional_argument, 0, 'd'},
-                {"list", no_argument, false, 'l'},
-                {"include", required_argument, 0, 'i'},
-                {"exclude", required_argument, 0, 'e'},
-                {"critical", required_argument, 0, 'c'},
-                {"only-critical", no_argument, 0, 'o'},
-                {"input-file", required_argument, 0, INPUT_FILE_OPT},
-                {"packages-warning", required_argument, 0, 'w'},
-                {0, 0, 0, 0}
+check_apt_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'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"update", optional_argument, 0, 'u'},
+                                                                           {"upgrade", optional_argument, 0, 'U'},
+                                                                           {"no-upgrade", no_argument, 0, 'n'},
+                                                                           {"dist-upgrade", optional_argument, 0, 'd'},
+                                                                           {"list", no_argument, 0, 'l'},
+                                                                           {"include", required_argument, 0, 'i'},
+                                                                           {"exclude", required_argument, 0, 'e'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"only-critical", no_argument, 0, 'o'},
+                                                                           {"input-file", required_argument, 0, INPUT_FILE_OPT},
+                                                                           {"packages-warning", required_argument, 0, 'w'},
+                                                                           {0, 0, 0, 0}};
+
+        check_apt_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_apt_config_init(),
         };
 
-        while(1) {
-                c = getopt_long(argc, argv, "hVvt:u::U::d::nli:e:c:ow:", longopts, NULL);
+        while (true) {
+                int option_char = getopt_long(argc, argv, "hVvt:u::U::d::nli:e:c:ow:", longopts, NULL);
 
-                if(c == -1 || c == EOF || c == 1) break;
+                if (option_char == -1 || option_char == EOF || option_char == 1) {
+                        break;
+                }
 
-                switch(c) {
+                switch (option_char) {
                 case 'h':
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -193,52 +204,58 @@ int process_arguments (int argc, char **argv) {
                         verbose++;
                         break;
                 case 't':
-                        timeout_interval=atoi(optarg);
+                        timeout_interval = atoi(optarg);
                         break;
                 case 'd':
-                        upgrade=DIST_UPGRADE;
-                        if(optarg!=NULL){
-                                upgrade_opts=strdup(optarg);
-                                if(upgrade_opts==NULL) die(STATE_UNKNOWN, "strdup failed");
+                        result.config.upgrade = DIST_UPGRADE;
+                        if (optarg != NULL) {
+                                result.config.upgrade_opts = strdup(optarg);
+                                if (result.config.upgrade_opts == NULL) {
+                                        die(STATE_UNKNOWN, "strdup failed");
+                                }
                         }
                         break;
                 case 'U':
-                        upgrade=UPGRADE;
-                        if(optarg!=NULL){
-                                upgrade_opts=strdup(optarg);
-                                if(upgrade_opts==NULL) die(STATE_UNKNOWN, "strdup failed");
+                        result.config.upgrade = UPGRADE;
+                        if (optarg != NULL) {
+                                result.config.upgrade_opts = strdup(optarg);
+                                if (result.config.upgrade_opts == NULL) {
+                                        die(STATE_UNKNOWN, "strdup failed");
+                                }
                         }
                         break;
                 case 'n':
-                        upgrade=NO_UPGRADE;
+                        result.config.upgrade = NO_UPGRADE;
                         break;
                 case 'u':
-                        do_update=true;
-                        if(optarg!=NULL){
-                                update_opts=strdup(optarg);
-                                if(update_opts==NULL) die(STATE_UNKNOWN, "strdup failed");
+                        result.config.do_update = true;
+                        if (optarg != NULL) {
+                                result.config.update_opts = strdup(optarg);
+                                if (result.config.update_opts == NULL) {
+                                        die(STATE_UNKNOWN, "strdup failed");
+                                }
                         }
                         break;
                 case 'l':
-                        list=true;
+                        result.config.list = true;
                         break;
                 case 'i':
-                        do_include=add_to_regexp(do_include, optarg);
+                        result.config.do_include = add_to_regexp(result.config.do_include, optarg);
                         break;
                 case 'e':
-                        do_exclude=add_to_regexp(do_exclude, optarg);
+                        result.config.do_exclude = add_to_regexp(result.config.do_exclude, optarg);
                         break;
                 case 'c':
-                        do_critical=add_to_regexp(do_critical, optarg);
+                        result.config.do_critical = add_to_regexp(result.config.do_critical, optarg);
                         break;
                 case 'o':
-                        only_critical=true;
+                        result.config.only_critical = true;
                         break;
                 case INPUT_FILE_OPT:
-                        input_filename = optarg;
+                        result.config.input_filename = optarg;
                         break;
                 case 'w':
-                        packages_warning = atoi(optarg);
+                        result.config.packages_warning = atoi(optarg);
                         break;
                 default:
                         /* print short usage statement if args not parsable */
@@ -246,71 +263,82 @@ int process_arguments (int argc, char **argv) {
                 }
         }
 
-        return OK;
+        return result;
 }
 
-
 /* run an apt-get upgrade */
-int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkglist){
-        int result=STATE_UNKNOWN, regres=0, pc=0, spc=0;
-        struct output chld_out, chld_err;
-        regex_t ireg, ereg, sreg;
-        char *cmdline=NULL, rerrbuf[64];
-
+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;
         /* initialize ereg as it is possible it is printed while uninitialized */
         memset(&ereg, '\0', sizeof(ereg.buffer));
 
-        if(upgrade==NO_UPGRADE) return STATE_OK;
+        run_upgrade_result result = {
+                .errorcode = STATE_UNKNOWN,
+        };
+
+        if (upgrade == NO_UPGRADE) {
+                result.errorcode = STATE_OK;
+                return result;
+        }
 
+        int regres = 0;
+        regex_t ireg;
+        char rerrbuf[64];
         /* compile the regexps */
         if (do_include != NULL) {
-                regres=regcomp(&ireg, do_include, REG_EXTENDED);
-                if (regres!=0) {
+                regres = regcomp(&ireg, do_include, REG_EXTENDED);
+                if (regres != 0) {
                         regerror(regres, &ireg, rerrbuf, 64);
                         die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
                 }
         }
 
-        if(do_exclude!=NULL){
-                regres=regcomp(&ereg, do_exclude, REG_EXTENDED);
-                if(regres!=0) {
+        if (do_exclude != NULL) {
+                regres = regcomp(&ereg, do_exclude, REG_EXTENDED);
+                if (regres != 0) {
                         regerror(regres, &ereg, rerrbuf, 64);
-                        die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"),
-                            progname, rerrbuf);
+                        die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
                 }
         }
 
+        regex_t sreg;
         const char *crit_ptr = (do_critical != NULL) ? do_critical : SECURITY_RE;
-        regres=regcomp(&sreg, crit_ptr, REG_EXTENDED);
-        if(regres!=0) {
+        regres = regcomp(&sreg, crit_ptr, REG_EXTENDED);
+        if (regres != 0) {
                 regerror(regres, &ereg, rerrbuf, 64);
-                die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"),
-                    progname, rerrbuf);
+                die(STATE_UNKNOWN, _("%s: Error compiling regexp: %s"), progname, rerrbuf);
         }
 
-        cmdline=construct_cmdline(upgrade, upgrade_opts);
+        struct output chld_out;
+        struct output chld_err;
+        char *cmdline = NULL;
+        cmdline = construct_cmdline(upgrade, upgrade_opts);
         if (input_filename != NULL) {
                 /* read input from a file for testing */
-                result = cmd_file_read(input_filename, &chld_out, 0);
+                result.errorcode = cmd_file_read(input_filename, &chld_out, 0);
         } else {
                 /* run the upgrade */
-                result = np_runcmd(cmdline, &chld_out, &chld_err, 0);
+                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 != 0){
-                exec_warning=1;
-                result = STATE_UNKNOWN;
-                fprintf(stderr, _("'%s' exited with non-zero status.\n"),
-                    cmdline);
+        if (result.errorcode != STATE_OK) {
+                exec_warning = 1;
+                result.errorcode = STATE_UNKNOWN;
+                fprintf(stderr, _("'%s' exited with non-zero status.\n"), cmdline);
         }
 
-        *pkglist=malloc(sizeof(char *) * chld_out.lines);
-        if(!pkglist) die(STATE_UNKNOWN, "malloc failed!\n");
-        *secpkglist=malloc(sizeof(char *) * chld_out.lines);
-        if(!secpkglist) die(STATE_UNKNOWN, "malloc failed!\n");
+        char **pkglist = malloc(sizeof(char *) * chld_out.lines);
+        if (!pkglist) {
+                die(STATE_UNKNOWN, "malloc failed!\n");
+        }
+        char **secpkglist = malloc(sizeof(char *) * chld_out.lines);
+        if (!secpkglist) {
+                die(STATE_UNKNOWN, "malloc failed!\n");
+        }
 
         /* parse the output, which should only consist of lines like
          *
@@ -321,82 +349,91 @@ int run_upgrade(int *pkgcount, int *secpkgcount, char ***pkglist, char ***secpkg
          * we may need to switch to the --print-uris output format,
          * in which case the logic here will slightly change.
          */
-        for(size_t i = 0; i < chld_out.lines; i++) {
-                if(verbose){
+        int package_counter = 0;
+        int 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(&ireg, 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){
-                                pc++;
-                                if(regexec(&sreg, chld_out.line[i], 0, NULL, 0)==0){
-                                        spc++;
-                                        if(verbose) printf("*");
-                                        (*secpkglist)[spc-1] = pkg_name(chld_out.line[i]);
+                        if (do_exclude == NULL || regexec(&ereg, 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)[pc-spc-1] = pkg_name(chld_out.line[i]);
+                                        (pkglist)[package_counter - security_package_counter - 1] = pkg_name(chld_out.line[i]);
                                 }
-                                if(verbose){
+                                if (verbose) {
                                         printf("*%s\n", chld_out.line[i]);
                                 }
                         }
                 }
         }
-        *pkgcount=pc;
-        *secpkgcount=spc;
+        result.package_count = package_counter;
+        result.security_package_count = security_package_counter;
+        result.packages_list = pkglist;
+        result.secpackages_list = secpkglist;
 
         /* If we get anything on stderr, at least set warning */
         if (input_filename == NULL && chld_err.buflen) {
-                stderr_warning=1;
-                result = max_state(result, STATE_WARNING);
-                if(verbose){
-                        for(size_t i = 0; i < chld_err.lines; i++) {
+                stderr_warning = true;
+                result.errorcode = max_state(result.errorcode, STATE_WARNING);
+                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);
+        if (do_include != NULL) {
+                regfree(&ireg);
+        }
         regfree(&sreg);
-        if(do_exclude!=NULL) regfree(&ereg);
+        if (do_exclude != NULL) {
+                regfree(&ereg);
+        }
         free(cmdline);
         return result;
 }
 
 /* run an apt-get update (needs root) */
-int run_update(void){
-        int result=STATE_UNKNOWN;
-        struct output chld_out, chld_err;
+int run_update(char *update_opts) {
+        int result = STATE_UNKNOWN;
         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);
         /* 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){
-                exec_warning=1;
+        if (result != 0) {
+                exec_warning = true;
                 result = STATE_CRITICAL;
-                fprintf(stderr, _("'%s' exited with non-zero status.\n"),
-                        cmdline);
+                fprintf(stderr, _("'%s' exited with non-zero status.\n"), cmdline);
         }
 
-        if(verbose){
-                for(size_t i = 0; i < chld_out.lines; i++) {
+        if (verbose) {
+                for (size_t i = 0; i < chld_out.lines; i++) {
                         printf("%s\n", chld_out.line[i]);
                 }
         }
 
         /* If we get anything on stderr, at least set warning */
-        if(chld_err.buflen){
-                stderr_warning=1;
+        if (chld_err.buflen) {
+                stderr_warning = 1;
                 result = max_state(result, STATE_WARNING);
-                if(verbose){
-                        for(size_t i = 0; i < chld_err.lines; i++) {
+                if (verbose) {
+                        for (size_t i = 0; i < chld_err.lines; i++) {
                                 fprintf(stderr, "%s\n", chld_err.line[i]);
                         }
                 }
@@ -405,158 +442,168 @@ int run_update(void){
         return result;
 }
 
-char* pkg_name(char *line){
-        char *start=NULL, *space=NULL, *pkg=NULL;
-        int len=0;
+char *pkg_name(char *line) {
+        char *start = line + strlen(PKGINST_PREFIX);
 
-        start = line + strlen(PKGINST_PREFIX);
-        len = strlen(start);
+        size_t len = strlen(start);
 
-        space = index(start, ' ');
-        if(space!=NULL){
+        char *space = index(start, ' ');
+        if (space != NULL) {
                 len = space - start;
         }
 
-        pkg=malloc(sizeof(char)*(len+1));
-        if(!pkg) die(STATE_UNKNOWN, "malloc failed!\n");
+        char *pkg = malloc(sizeof(char) * (len + 1));
+        if (!pkg) {
+                die(STATE_UNKNOWN, "malloc failed!\n");
+        }
 
         strncpy(pkg, start, len);
-        pkg[len]='\0';
+        pkg[len] = '\0';
 
         return pkg;
 }
 
-int cmpstringp(const void *p1, const void *p2){
-        return strcmp(* (char * const *) p1, * (char * const *) p2);
+int cmpstringp(const void *left_string, const void *right_string) {
+        return strcmp(*(char *const *)left_string, *(char *const *)right_string);
 }
 
-char* add_to_regexp(char *expr, const char *next){
-        char *re=NULL;
+char *add_to_regexp(char *expr, const char *next) {
+        char *regex_string = NULL;
 
-        if(expr==NULL){
-                re=malloc(sizeof(char)*(strlen("()")+strlen(next)+1));
-                if(!re) die(STATE_UNKNOWN, "malloc failed!\n");
-                sprintf(re, "(%s)", next);
+        if (expr == NULL) {
+                regex_string = malloc(sizeof(char) * (strlen("()") + strlen(next) + 1));
+                if (!regex_string) {
+                        die(STATE_UNKNOWN, "malloc failed!\n");
+                }
+                sprintf(regex_string, "(%s)", next);
         } else {
                 /* resize it, adding an extra char for the new '|' separator */
-                re=realloc(expr, sizeof(char)*(strlen(expr)+1+strlen(next)+1));
-                if(!re) die(STATE_UNKNOWN, "realloc failed!\n");
+                regex_string = realloc(expr, sizeof(char) * (strlen(expr) + 1 + strlen(next) + 1));
+                if (!regex_string) {
+                        die(STATE_UNKNOWN, "realloc failed!\n");
+                }
                 /* append it starting at ')' in the old re */
-                sprintf((char*)(re+strlen(re)-1), "|%s)", next);
+                sprintf((char *)(regex_string + strlen(regex_string) - 1), "|%s)", next);
         }
 
-        return re;
+        return regex_string;
 }
 
-char* construct_cmdline(upgrade_type u, const char *opts){
-        int len=0;
-        const char *opts_ptr=NULL, *aptcmd=NULL;
-        char *cmd=NULL;
+char *construct_cmdline(upgrade_type upgrade, const char *opts) {
+        const char *opts_ptr = NULL;
+        const char *aptcmd = NULL;
 
-        switch(u){
+        switch (upgrade) {
         case UPGRADE:
-                if(opts==NULL) opts_ptr=UPGRADE_DEFAULT_OPTS;
-                else opts_ptr=opts;
-                aptcmd="upgrade";
+                if (opts == NULL) {
+                        opts_ptr = UPGRADE_DEFAULT_OPTS;
+                } else {
+                        opts_ptr = opts;
+                }
+                aptcmd = "upgrade";
                 break;
         case DIST_UPGRADE:
-                if(opts==NULL) opts_ptr=UPGRADE_DEFAULT_OPTS;
-                else opts_ptr=opts;
-                aptcmd="dist-upgrade";
+                if (opts == NULL) {
+                        opts_ptr = UPGRADE_DEFAULT_OPTS;
+                } else {
+                        opts_ptr = opts;
+                }
+                aptcmd = "dist-upgrade";
                 break;
         case NO_UPGRADE:
-                if(opts==NULL) opts_ptr=UPDATE_DEFAULT_OPTS;
-                else opts_ptr=opts;
-                aptcmd="update";
+                if (opts == NULL) {
+                        opts_ptr = UPDATE_DEFAULT_OPTS;
+                } else {
+                        opts_ptr = opts;
+                }
+                aptcmd = "update";
                 break;
         }
 
-        len+=strlen(PATH_TO_APTGET)+1; /* "/usr/bin/apt-get " */
-        len+=strlen(opts_ptr)+1;       /* "opts " */
-        len+=strlen(aptcmd)+1;         /* "upgrade\0" */
+        int len = 0;
+        len += strlen(PATH_TO_APTGET) + 1; /* "/usr/bin/apt-get " */
+        len += strlen(opts_ptr) + 1;       /* "opts " */
+        len += strlen(aptcmd) + 1;         /* "upgrade\0" */
 
-        cmd=(char*)malloc(sizeof(char)*len);
-        if(cmd==NULL) die(STATE_UNKNOWN, "malloc failed");
+        char *cmd = (char *)malloc(sizeof(char) * len);
+        if (cmd == NULL) {
+                die(STATE_UNKNOWN, "malloc failed");
+        }
         sprintf(cmd, "%s %s %s", PATH_TO_APTGET, opts_ptr, aptcmd);
         return cmd;
 }
 
 /* informative help message */
-void
-print_help (void)
-{
-  print_revision(progname, NP_VERSION);
-
-  printf(_(COPYRIGHT), copyright, email);
-
-  printf("%s\n", _("This plugin checks for software updates on systems that use"));
-  printf("%s\n", _("package management systems based on the apt-get(8) command"));
-  printf("%s\n", _("found in Debian GNU/Linux"));
-
-  printf ("\n\n");
-
-  print_usage();
-
-  printf(UT_HELP_VRSN);
-  printf(UT_EXTRA_OPTS);
-
-  printf(UT_PLUG_TIMEOUT, timeout_interval);
-
-  printf (" %s\n", "-n, --no-upgrade");
-  printf ("    %s\n", _("Do not run the upgrade.  Probably not useful (without -u at least)."));
-  printf (" %s\n", "-l, --list");
-  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", _("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."));
-  printf (" %s\n", "-e, --exclude=REGEXP");
-  printf ("    %s\n", _("Exclude packages matching REGEXP from the list of packages that would"));
-  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", _("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:"));
-  printf ("    \t%s\n", SECURITY_RE);
-  printf ("    %s\n", _("Note that the package must first match the include list before its"));
-  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", _("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\n", _("Default is 1 package."));
-
-  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", _("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."));
-  printf (" %s\n", "-U, --upgrade=OPTS");
-  printf ("    %s\n", _("Perform an upgrade. If an optional OPTS argument is provided,"));
-  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", "-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."));
-
-  printf(UT_SUPPORT);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf(_(COPYRIGHT), copyright, email);
+
+        printf("%s\n", _("This plugin checks for software updates on systems that use"));
+        printf("%s\n", _("package management systems based on the apt-get(8) command"));
+        printf("%s\n", _("found in Debian GNU/Linux"));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_PLUG_TIMEOUT, timeout_interval);
+
+        printf(" %s\n", "-n, --no-upgrade");
+        printf("    %s\n", _("Do not run the upgrade.  Probably not useful (without -u at least)."));
+        printf(" %s\n", "-l, --list");
+        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", _("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."));
+        printf(" %s\n", "-e, --exclude=REGEXP");
+        printf("    %s\n", _("Exclude packages matching REGEXP from the list of packages that would"));
+        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", _("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:"));
+        printf("    \t%s\n", SECURITY_RE);
+        printf("    %s\n", _("Note that the package must first match the include list before its"));
+        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", _("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\n", _("Default is 1 package."));
+
+        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", _("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."));
+        printf(" %s\n", "-U, --upgrade=OPTS");
+        printf("    %s\n", _("Perform an upgrade. If an optional OPTS argument is provided,"));
+        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", "-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."));
+
+        printf(UT_SUPPORT);
 }
 
-
 /* simple usage heading */
-void
-print_usage(void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf ("%s [[-d|-u|-U]opts] [-n] [-l] [-t timeout] [-w packages-warning]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s [[-d|-u|-U]opts] [-n] [-l] [-t timeout] [-w packages-warning]\n", progname);
 }
diff --git a/plugins/check_apt.d/config.h b/plugins/check_apt.d/config.h
new file mode 100644
index 00000000..981f4f42
--- /dev/null
+++ b/plugins/check_apt.d/config.h
@@ -0,0 +1,41 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+/* some constants */
+typedef enum {
+        UPGRADE,
+        DIST_UPGRADE,
+        NO_UPGRADE
+} upgrade_type;
+
+typedef struct {
+        bool do_update;       /* whether to call apt-get update */
+        upgrade_type upgrade; /* which type of upgrade to do */
+        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;
+
+        char *upgrade_opts;   /* options to override defaults for upgrade */
+        char *update_opts;    /* options to override defaults for update */
+        char *do_include;     /* regexp to only include certain packages */
+        char *do_exclude;     /* regexp to only exclude certain packages */
+        char *do_critical;    /* regexp specifying critical packages */
+        char *input_filename; /* input filename for testing */
+} check_apt_config;
+
+check_apt_config check_apt_config_init() {
+        check_apt_config tmp = {.do_update = false,
+                                                        .upgrade = UPGRADE,
+                                                        .only_critical = false,
+                                                        .list = false,
+                                                        .packages_warning = 1,
+                                                        .update_opts = NULL,
+                                                        .do_include = NULL,
+                                                        .do_exclude = NULL,
+                                                        .do_critical = NULL,
+                                                        .input_filename = NULL};
+        return tmp;
+}
diff --git a/plugins/check_by_ssh.c b/plugins/check_by_ssh.c
index 2a23b397..2bc38d49 100644
--- a/plugins/check_by_ssh.c
+++ b/plugins/check_by_ssh.c
@@ -1,495 +1,509 @@
 /*****************************************************************************
-* 
-* Monitoring check_by_ssh plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_by_ssh plugin
-* 
-* 
-* 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_by_ssh plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_by_ssh plugin
+ *
+ *
+ * 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_by_ssh";
-const char *copyright = "2000-2008";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
-#include "netutils.h"
 #include "utils_cmd.h"
+#include "check_by_ssh.d/config.h"
+#include "states.h"
 
 #ifndef NP_MAXARGS
-#define NP_MAXARGS 1024
+#       define NP_MAXARGS 1024
 #endif
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void comm_append (const char *);
-void print_help (void);
-void print_usage (void);
-
-unsigned int commands = 0;
-unsigned int services = 0;
-int skip_stdout = 0;
-int skip_stderr = 0;
-int warn_on_stderr = 0;
-bool unknown_timeout = false;
-char *remotecmd = NULL;
-char **commargv = NULL;
-int commargc = 0;
-char *hostname = NULL;
-char *outputfile = NULL;
-char *host_shortname = NULL;
-char **service;
-bool passive = false;
-bool verbose = false;
-
-int
-main (int argc, char **argv)
-{
+typedef struct {
+        int errorcode;
+        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*/);
 
-        char *status_text;
-        int cresult;
-        int result = STATE_UNKNOWN;
-        time_t local_time;
-        FILE *fp = NULL;
-        output chld_out, chld_err;
+static command_construct comm_append(command_construct /*cmd*/, const char * /*str*/);
+static void print_help(void);
+void print_usage(void);
 
-        remotecmd = "";
-        comm_append(SSH_COMMAND);
+static bool verbose = false;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_by_ssh_config_wrapper tmp_config = process_arguments(argc, argv);
 
         /* process arguments */
-        if (process_arguments (argc, argv) == ERROR)
+        if (tmp_config.errorcode == ERROR) {
                 usage_va(_("Could not parse arguments"));
+        }
+
+        const check_by_ssh_config config = tmp_config.config;
 
         /* Set signal handling and alarm timeout */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
         }
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 
         /* run the command */
         if (verbose) {
-                printf ("Command: %s\n", commargv[0]);
-                for (int i = 1; i < commargc; i++)
-                        printf ("Argument %i: %s\n", i, commargv[i]);
+                printf("Command: %s\n", config.cmd.commargv[0]);
+                for (int i = 1; i < config.cmd.commargc; i++) {
+                        printf("Argument %i: %s\n", i, config.cmd.commargv[i]);
+                }
         }
 
-        result = cmd_run_array (commargv, &chld_out, &chld_err, 0);
+        output chld_out;
+        output chld_err;
+        mp_state_enum result = cmd_run_array(config.cmd.commargv, &chld_out, &chld_err, 0);
 
         /* SSH returns 255 if connection attempt fails; include the first line of error output */
-        if (result == 255 && unknown_timeout) {
-                printf (_("SSH connection failed: %s\n"),
-                        chld_err.lines > 0 ? chld_err.line[0] : "(no 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;
         }
 
         if (verbose) {
-                for(size_t i = 0; i < chld_out.lines; i++)
+                for (size_t i = 0; i < chld_out.lines; i++) {
                         printf("stdout: %s\n", chld_out.line[i]);
-                for(size_t i = 0; i < chld_err.lines; i++)
+                }
+                for (size_t i = 0; i < chld_err.lines; i++) {
                         printf("stderr: %s\n", chld_err.line[i]);
+                }
         }
 
-        if (skip_stdout == -1) /* --skip-stdout specified without argument */
+        size_t skip_stdout = 0;
+        if (config.skip_stdout == -1) { /* --skip-stdout specified without argument */
                 skip_stdout = chld_out.lines;
-        if (skip_stderr == -1) /* --skip-stderr specified without argument */
+        } else {
+                skip_stdout = config.skip_stdout;
+        }
+
+        size_t skip_stderr = 0;
+        if (config.skip_stderr == -1) { /* --skip-stderr specified without argument */
                 skip_stderr = chld_err.lines;
+        } else {
+                skip_stderr = config.skip_stderr;
+        }
 
         /* 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]);
-                if ( warn_on_stderr ) 
+        if (chld_err.lines > (size_t)skip_stderr) {
+                printf(_("Remote command execution failed: %s\n"), chld_err.line[skip_stderr]);
+                if (config.warn_on_stderr) {
                         return max_state_alt(result, STATE_WARNING);
-                else
-                        return max_state_alt(result, STATE_UNKNOWN);
+                }
+                return max_state_alt(result, STATE_UNKNOWN);
         }
 
         /* this is simple if we're not supposed to be passive.
          * Wrap up quickly and keep the tricks below */
-        if(!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]);
-                else
-                        printf (_("%s - check_by_ssh: Remote command '%s' returned status %d\n"),
-                                state_text(result), remotecmd, result);
-                return result;  /* return error status from remote command */
+        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]);
+                        }
+                } else {
+                        printf(_("%s - check_by_ssh: Remote command '%s' returned status %d\n"), state_text(result), config.remotecmd, result);
+                }
+                return result; /* return error status from remote command */
         }
 
-
         /*
          * Passive mode
          */
 
         /* process output */
-        if (!(fp = fopen (outputfile, "a"))) {
-                printf (_("SSH WARNING: could not open %s\n"), outputfile);
-                exit (STATE_UNKNOWN);
+        FILE *file_pointer = NULL;
+        if (!(file_pointer = fopen(config.outputfile, "a"))) {
+                printf(_("SSH WARNING: could not open %s\n"), config.outputfile);
+                exit(STATE_UNKNOWN);
         }
 
-        local_time = time (NULL);
-        commands = 0;
-        for(size_t i = skip_stdout; i < chld_out.lines; i++) {
+        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);
-
-                if (service[commands] && status_text
-                        && sscanf (chld_out.line[i], "STATUS CODE: %d", &cresult) == 1)
-                {
-                        fprintf (fp, "[%d] PROCESS_SERVICE_CHECK_RESULT;%s;%s;%d;%s\n",
-                                 (int) local_time, host_shortname, service[commands++],
-                                 cresult, status_text);
+                if (i == chld_out.lines || strstr(chld_out.line[i], "STATUS CODE: ") == NULL) {
+                        die(STATE_UNKNOWN, _("%s: Error parsing output\n"), progname);
+                }
+
+                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);
                 }
         }
-        
+
         /* Multiple commands and passive checking should always return OK */
-        return result;
+        exit(result);
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-        char *p1, *p2;
-
-        int option = 0;
-        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}
+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}};
+
+        check_by_ssh_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_by_ssh_config_init(),
         };
 
-        if (argc < 2)
-                return ERROR;
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
+
+        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");
+        result.config.cmd = comm_append(result.config.cmd, SSH_COMMAND);
 
-        while (1) {
-                c = getopt_long (argc, argv, "Vvh1246fqt:UH:O:p:i:u:l:C:S::E::n:s:o:F:", longopts,
-                                 &option);
+        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);
 
-                if (c == -1 || c == EOF)
+                if (opt_index == -1 || opt_index == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'v':                                                                       /* help */
+                switch (opt_index) {
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'v': /* help */
                         verbose = true;
                         break;
-                case 't':                                                                       /* timeout period */
-                        if (!is_integer (optarg))
+                case 't': /* timeout period */
+                        if (!is_integer(optarg)) {
                                 usage_va(_("Timeout interval must be a positive integer"));
-                        else
-                                timeout_interval = atoi (optarg);
+                        } else {
+                                timeout_interval = atoi(optarg);
+                        }
                         break;
                 case 'U':
-                        unknown_timeout = true;
+                        result.config.unknown_timeout = true;
                         break;
-                case 'H':                                                                       /* host */
-                        hostname = optarg;
+                case 'H': /* host */
+                        result.config.hostname = optarg;
                         break;
                 case 'p': /* port number */
-                        if (!is_integer (optarg))
+                        if (!is_integer(optarg)) {
                                 usage_va(_("Port must be a positive integer"));
-                        comm_append("-p");
-                        comm_append(optarg);
+                        }
+                        result.config.cmd = comm_append(result.config.cmd, "-p");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
-                case 'O':                                                                       /* output file */
-                        outputfile = optarg;
-                        passive = true;
+                case 'O': /* output file */
+                        result.config.outputfile = optarg;
+                        result.config.passive = true;
                         break;
-                case 's':                                                                       /* description of service to check */
+                case 's': /* description of service to check */ {
+                        char *p1;
+                        char *p2;
+
                         p1 = optarg;
-                        service = realloc (service, (++services) * sizeof(char *));
-                        while ((p2 = index (p1, ':'))) {
+                        result.config.service = realloc(result.config.service, (++result.config.number_of_services) * sizeof(char *));
+                        while ((p2 = index(p1, ':'))) {
                                 *p2 = '\0';
-                                service[services - 1] = p1;
-                                service = realloc (service, (++services) * sizeof(char *));
+                                result.config.service[result.config.number_of_services - 1] = p1;
+                                result.config.service = realloc(result.config.service, (++result.config.number_of_services) * sizeof(char *));
                                 p1 = p2 + 1;
                         }
-                        service[services - 1] = p1;
+                        result.config.service[result.config.number_of_services - 1] = p1;
                         break;
-                case 'n':                                                                       /* short name of host in the monitoring configuration */
-                        host_shortname = optarg;
-                        break;
-
+                case 'n': /* short name of host in the monitoring configuration */
+                        result.config.host_shortname = optarg;
+                } break;
                 case 'u':
-                        comm_append("-l");
-                        comm_append(optarg);
+                        result.config.cmd = comm_append(result.config.cmd, "-l");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
-                case 'l':                                                                       /* login name */
-                        comm_append("-l");
-                        comm_append(optarg);
+                case 'l': /* login name */
+                        result.config.cmd = comm_append(result.config.cmd, "-l");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
-                case 'i':                                                                       /* identity */
-                        comm_append("-i");
-                        comm_append(optarg);
+                case 'i': /* identity */
+                        result.config.cmd = comm_append(result.config.cmd, "-i");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
 
-                case '1':                                                                       /* Pass these switches directly to ssh */
-                        comm_append("-1");
+                case '1': /* Pass these switches directly to ssh */
+                        result.config.cmd = comm_append(result.config.cmd, "-1");
                         break;
-                case '2':                                                                       /* 1 to force version 1, 2 to force version 2 */
-                        comm_append("-2");
+                case '2': /* 1 to force version 1, 2 to force version 2 */
+                        result.config.cmd = comm_append(result.config.cmd, "-2");
                         break;
-                case '4':                                                                       /* -4 for IPv4 */
-                        comm_append("-4");
+                case '4': /* -4 for IPv4 */
+                        result.config.cmd = comm_append(result.config.cmd, "-4");
                         break;
-                case '6':                                                               /* -6 for IPv6 */
-                        comm_append("-6");
+                case '6': /* -6 for IPv6 */
+                        result.config.cmd = comm_append(result.config.cmd, "-6");
                         break;
-                case 'f':                                                                       /* fork to background */
-                        comm_append("-f");
+                case 'f': /* fork to background */
+                        result.config.cmd = comm_append(result.config.cmd, "-f");
                         break;
-                case 'C':                                                                       /* Command for remote machine */
-                        commands++;
-                        if (commands > 1)
-                                xasprintf (&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
-                        xasprintf (&remotecmd, "%s%s", remotecmd, optarg);
+                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%s", result.config.remotecmd, optarg);
                         break;
-                case 'S':                                                                       /* skip n (or all) lines on stdout */
-                        if (optarg == NULL)
-                                skip_stdout = -1; /* skip all output on stdout */
-                        else if (!is_integer (optarg))
+                case 'S': /* skip n (or all) lines on stdout */
+                        if (optarg == NULL) {
+                                result.config.skip_stdout = -1; /* skip all output on stdout */
+                        } else if (!is_integer(optarg)) {
                                 usage_va(_("skip-stdout argument must be an integer"));
-                        else
-                                skip_stdout = atoi (optarg);
+                        } else {
+                                result.config.skip_stdout = atoi(optarg);
+                        }
                         break;
-                case 'E':                                                                       /* skip n (or all) lines on stderr */
-                        if (optarg == NULL)
-                                skip_stderr = -1; /* skip all output on stderr */
-                        else if (!is_integer (optarg))
+                case 'E': /* skip n (or all) lines on stderr */
+                        if (optarg == NULL) {
+                                result.config.skip_stderr = -1; /* skip all output on stderr */
+                        } else if (!is_integer(optarg)) {
                                 usage_va(_("skip-stderr argument must be an integer"));
-                        else
-                                skip_stderr = atoi (optarg);
+                        } else {
+                                result.config.skip_stderr = atoi(optarg);
+                        }
                         break;
-                case 'W':                                                                       /* exit with warning if there is an output on stderr */
-                        warn_on_stderr = 1;
+                case 'W': /* exit with warning if there is an output on stderr */
+                        result.config.warn_on_stderr = true;
                         break;
-                case 'o':                                                                       /* Extra options for the ssh command */
-                        comm_append("-o");
-                        comm_append(optarg);
+                case 'o': /* Extra options for the ssh command */
+                        result.config.cmd = comm_append(result.config.cmd, "-o");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
-                case 'q':                                                                       /* Tell the ssh command to be quiet */
-                        comm_append("-q");
+                case 'q': /* Tell the ssh command to be quiet */
+                        result.config.cmd = comm_append(result.config.cmd, "-q");
                         break;
-                case 'F':                                                                       /* ssh configfile */
-                        comm_append("-F");
-                        comm_append(optarg);
+                case 'F': /* ssh configfile */
+                        result.config.cmd = comm_append(result.config.cmd, "-F");
+                        result.config.cmd = comm_append(result.config.cmd, optarg);
                         break;
-                default:                                                                        /* help */
+                default: /* help */
                         usage5();
                 }
         }
 
-        c = optind;
-        if (hostname == NULL) {
+        int c = optind;
+        if (result.config.hostname == NULL) {
                 if (c <= argc) {
-                        die (STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);
+                        die(STATE_UNKNOWN, _("%s: You must provide a host name\n"), progname);
                 }
-                hostname = argv[c++];
+                result.config.hostname = argv[c++];
         }
 
-        if (strlen(remotecmd) == 0) {
-                for (; c < argc; c++)
-                        if (strlen(remotecmd) > 0)
-                                xasprintf (&remotecmd, "%s %s", remotecmd, argv[c]);
-                        else
-                                xasprintf (&remotecmd, "%s", argv[c]);
+        if (strlen(result.config.remotecmd) == 0) {
+                for (; c < argc; c++) {
+                        if (strlen(result.config.remotecmd) > 0) {
+                                xasprintf(&result.config.remotecmd, "%s %s", result.config.remotecmd, argv[c]);
+                        } else {
+                                xasprintf(&result.config.remotecmd, "%s", argv[c]);
+                        }
+                }
         }
 
-        if (commands > 1 || passive)
-                xasprintf (&remotecmd, "%s;echo STATUS CODE: $?;", remotecmd);
+        if (result.config.commands > 1 || result.config.passive) {
+                xasprintf(&result.config.remotecmd, "%s;echo STATUS CODE: $?;", result.config.remotecmd);
+        }
 
-        if (remotecmd == NULL || strlen (remotecmd) <= 1)
+        if (result.config.remotecmd == NULL || strlen(result.config.remotecmd) <= 1) {
                 usage_va(_("No remotecmd"));
+        }
 
-        comm_append(hostname);
-        comm_append(remotecmd);
+        result.config.cmd = comm_append(result.config.cmd, result.config.hostname);
+        result.config.cmd = comm_append(result.config.cmd, result.config.remotecmd);
 
-        return validate_arguments ();
+        return validate_arguments(result);
 }
 
+command_construct comm_append(command_construct cmd, const char *str) {
 
-void
-comm_append (const char *str)
-{
+        if (verbose) {
+                for (int i = 0; i < cmd.commargc; i++) {
+                        printf("Current command: [%i] %s\n", i, cmd.commargv[i]);
+                }
+
+                printf("Appending: %s\n", str);
+        }
 
-        if (++commargc > NP_MAXARGS)
+        if (++cmd.commargc > NP_MAXARGS) {
                 die(STATE_UNKNOWN, _("%s: Argument limit of %d exceeded\n"), progname, NP_MAXARGS);
+        }
 
-        if ((commargv = (char **)realloc(commargv, (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"));
+        }
 
-        commargv[commargc-1] = strdup(str);
-        commargv[commargc] = NULL;
+        cmd.commargv[cmd.commargc - 1] = strdup(str);
+        cmd.commargv[cmd.commargc] = NULL;
 
+        return cmd;
 }
 
-int
-validate_arguments (void)
-{
-        if (remotecmd == NULL || hostname == NULL)
-                return ERROR;
+check_by_ssh_config_wrapper validate_arguments(check_by_ssh_config_wrapper config_wrapper) {
+        if (config_wrapper.config.remotecmd == NULL || config_wrapper.config.hostname == NULL) {
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
+        }
 
-        if (passive && commands != 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 (passive && host_shortname == NULL)
-                die (STATE_UNKNOWN, _("%s: In passive mode, you must provide the host short name from the monitoring configs.\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);
+        }
 
-        return OK;
+        return config_wrapper;
 }
 
-
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf (_("This plugin uses SSH to execute commands on a remote host"));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-
-        printf (UT_EXTRA_OPTS);
-
-        printf (UT_HOST_PORT, 'p', "none");
-
-        printf (UT_IPv46);
-
-  printf (" %s\n", "-1, --proto1");
-  printf ("    %s\n", _("tell ssh to use Protocol 1 [optional]"));
-  printf (" %s\n", "-2, --proto2");
-  printf ("    %s\n", _("tell ssh to use Protocol 2 [optional]"));
-  printf (" %s\n", "-S, --skip-stdout[=n]");
-  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", "-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","-C, --command='COMMAND STRING'");
-  printf ("    %s\n", _("command to execute on the remote machine"));
-  printf (" %s\n","-l, --logname=USERNAME");
-  printf ("    %s\n", _("SSH user name on remote host [optional]"));
-  printf (" %s\n","-i, --identity=KEYFILE");
-  printf ("    %s\n", _("identity of an authorized key [optional]"));
-  printf (" %s\n","-O, --output=FILE");
-  printf ("    %s\n", _("external command file for monitoring [optional]"));
-  printf (" %s\n","-s, --services=LIST");
-  printf ("    %s\n", _("list of monitoring service names, separated by ':' [optional]"));
-  printf (" %s\n","-n, --name=NAME");
-  printf ("    %s\n", _("short name of host in the monitoring configuration [optional]"));
-  printf (" %s\n","-o, --ssh-option=OPTION");
-  printf ("    %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
-  printf (" %s\n","-F, --configfile");
-  printf ("    %s\n", _("Tell ssh to use this configfile [optional]"));
-  printf (" %s\n","-q, --quiet");
-  printf ("    %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
-        printf (UT_WARN_CRIT);
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-        printf (" %s\n","-U, --unknown-timeout");
-        printf ("    %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL"));
-        printf (UT_VERBOSE);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
+        printf(COPYRIGHT, copyright, email);
+
+        printf(_("This plugin uses SSH to execute commands on a remote host"));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_HOST_PORT, 'p', "none");
+
+        printf(UT_IPv46);
+
+        printf(" %s\n", "-1, --proto1");
+        printf("    %s\n", _("tell ssh to use Protocol 1 [optional]"));
+        printf(" %s\n", "-2, --proto2");
+        printf("    %s\n", _("tell ssh to use Protocol 2 [optional]"));
+        printf(" %s\n", "-S, --skip-stdout[=n]");
+        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", "-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", "-C, --command='COMMAND STRING'");
+        printf("    %s\n", _("command to execute on the remote machine"));
+        printf(" %s\n", "-l, --logname=USERNAME");
+        printf("    %s\n", _("SSH user name on remote host [optional]"));
+        printf(" %s\n", "-i, --identity=KEYFILE");
+        printf("    %s\n", _("identity of an authorized key [optional]"));
+        printf(" %s\n", "-O, --output=FILE");
+        printf("    %s\n", _("external command file for monitoring [optional]"));
+        printf(" %s\n", "-s, --services=LIST");
+        printf("    %s\n", _("list of monitoring service names, separated by ':' [optional]"));
+        printf(" %s\n", "-n, --name=NAME");
+        printf("    %s\n", _("short name of host in the monitoring configuration [optional]"));
+        printf(" %s\n", "-o, --ssh-option=OPTION");
+        printf("    %s\n", _("Call ssh with '-o OPTION' (may be used multiple times) [optional]"));
+        printf(" %s\n", "-F, --configfile");
+        printf("    %s\n", _("Tell ssh to use this configfile [optional]"));
+        printf(" %s\n", "-q, --quiet");
+        printf("    %s\n", _("Tell ssh to suppress warning and diagnostic messages [optional]"));
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(" %s\n", "-U, --unknown-timeout");
+        printf("    %s\n", _("Make connection problems return UNKNOWN instead of CRITICAL"));
+        printf(UT_VERBOSE);
+        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"));
+        printf(" %s\n", _("passphrase and the public key should be listed in the authorized_keys"));
+        printf(" %s\n", _("file of the remote host. Usually the key will be restricted to running"));
+        printf(" %s\n", _("only one command on the remote server. If the remote SSH server tracks"));
+        printf(" %s\n", _("invocation arguments, the one remote program may be an agent that can"));
+        printf(" %s\n", _("execute additional commands as proxy"));
         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"));
-  printf (" %s\n", _("passphrase and the public key should be listed in the authorized_keys"));
-  printf (" %s\n", _("file of the remote host. Usually the key will be restricted to running"));
-  printf (" %s\n", _("only one command on the remote server. If the remote SSH server tracks"));
-  printf (" %s\n", _("invocation arguments, the one remote program may be an agent that can"));
-  printf (" %s\n", _("execute additional commands as proxy"));
-  printf("\n");
-  printf (" %s\n", _("To use passive mode, provide multiple '-C' options, and provide"));
-  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", "$ 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");
-  printf (" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days");
+        printf(" %s\n", _("To use passive mode, provide multiple '-C' options, and provide"));
+        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", "$ 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");
+        printf(" %s\n", "[1080933700] PROCESS_SERVICE_CHECK_RESULT;flint;c3;0; up 2 days");
 
         printf(UT_SUPPORT);
 }
 
-
-
-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"
-                "       [-l user] [-n name] [-s servicelist] [-O outputfile]\n"
-                "       [-p port] [-o ssh-option] [-F configfile]\n",
-                progname);
+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"
+                   "       [-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
new file mode 100644
index 00000000..05435def
--- /dev/null
+++ b/plugins/check_by_ssh.d/config.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+typedef struct {
+        int commargc;
+        char **commargv;
+} command_construct;
+
+typedef struct {
+        char *hostname;
+        char *host_shortname;
+
+        char **service;
+        unsigned int number_of_services;
+
+        unsigned int commands; // Not needed during actual test run
+        char *remotecmd;
+
+        command_construct cmd;
+
+        bool unknown_timeout;
+        bool warn_on_stderr;
+        int skip_stdout;
+        int skip_stderr;
+        bool passive;
+        char *outputfile;
+} check_by_ssh_config;
+
+check_by_ssh_config check_by_ssh_config_init() {
+        check_by_ssh_config tmp = {
+                .hostname = NULL,
+                .host_shortname = NULL,
+
+                .service = NULL,
+                .number_of_services = 0,
+
+                .commands = 0,
+                .remotecmd = "",
+
+                .cmd =
+                        {
+                                .commargc = 0,
+                                .commargv = NULL,
+                        },
+
+                .unknown_timeout = false,
+                .warn_on_stderr = false,
+                .skip_stderr = 0,
+                .skip_stdout = 0,
+                .passive = false,
+                .outputfile = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_cluster.c b/plugins/check_cluster.c
index e1ede9f7..9b695499 100644
--- a/plugins/check_cluster.c
+++ b/plugins/check_cluster.c
@@ -1,92 +1,82 @@
 /*****************************************************************************
-* 
-* check_cluster.c - Host and Service Cluster Plugin for Monitoring
-* 
-* License: GPL
-* Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2007 Monitoring Plugins Development Team
-* 
-* 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/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * check_cluster.c - Host and Service Cluster Plugin for Monitoring
+ *
+ * License: GPL
+ * Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 2007-2024 Monitoring Plugins Development Team
+ *
+ * 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_cluster";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 #include "utils_base.h"
+#include "check_cluster.d/config.h"
 
-#define CHECK_SERVICES  1
-#define CHECK_HOSTS     2
+static void print_help(void);
+void print_usage(void);
 
-void print_help (void);
-void print_usage (void);
+static int verbose = 0;
 
-int total_services_ok=0;
-int total_services_warning=0;
-int total_services_unknown=0;
-int total_services_critical=0;
+typedef struct {
+        int errorcode;
+        check_cluster_config config;
+} check_cluster_config_wrapper;
+static check_cluster_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 
-int total_hosts_up=0;
-int total_hosts_down=0;
-int total_hosts_unreachable=0;
-
-char *warn_threshold;
-char *crit_threshold;
-
-int check_type=CHECK_SERVICES;
-
-char *data_vals=NULL;
-char *label=NULL;
-
-int verbose=0;
-
-int process_arguments(int,char **);
-
-
-
-int main(int argc, char **argv){
-        char *ptr;
-        int data_val;
-        int return_code=STATE_OK;
-        thresholds *thresholds = NULL;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if(process_arguments(argc,argv)==ERROR)
+        check_cluster_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
                 usage(_("Could not parse arguments"));
+        }
+
+        const check_cluster_config config = tmp_config.config;
 
         /* Initialize the thresholds */
-        set_thresholds(&thresholds, warn_threshold, crit_threshold);
-        if(verbose)
-                print_thresholds("check_cluster", thresholds);
+        if (verbose) {
+                print_thresholds("check_cluster", config.thresholds);
+        }
 
+        int data_val;
+        int total_services_ok = 0;
+        int total_services_warning = 0;
+        int total_services_unknown = 0;
+        int total_services_critical = 0;
+        int total_hosts_up = 0;
+        int total_hosts_down = 0;
+        int total_hosts_unreachable = 0;
         /* check the data values */
-        for(ptr=strtok(data_vals,",");ptr!=NULL;ptr=strtok(NULL,",")){
+        for (char *ptr = strtok(config.data_vals, ","); ptr != NULL; ptr = strtok(NULL, ",")) {
 
-                data_val=atoi(ptr);
+                data_val = atoi(ptr);
 
-                if(check_type==CHECK_SERVICES){
-                        switch(data_val){
+                if (config.check_type == CHECK_SERVICES) {
+                        switch (data_val) {
                         case 0:
                                 total_services_ok++;
                                 break;
@@ -101,10 +91,9 @@ int main(int argc, char **argv){
                                 break;
                         default:
                                 break;
-                        }
-                }
-                else{
-                        switch(data_val){
+                        }
+                } else {
+                        switch (data_val) {
                         case 0:
                                 total_hosts_up++;
                                 break;
@@ -116,125 +105,117 @@ int main(int argc, char **argv){
                                 break;
                         default:
                                 break;
-                        }
-                }
-        }
-
+                        }
+                }
+        }
 
+        int return_code = STATE_OK;
         /* return the status of the cluster */
-        if(check_type==CHECK_SERVICES){
-                return_code=get_status(total_services_warning+total_services_unknown+total_services_critical, thresholds);
-                printf("CLUSTER %s: %s: %d ok, %d warning, %d unknown, %d critical\n",
-                        state_text(return_code), (label==NULL)?"Service cluster":label,
-                        total_services_ok,total_services_warning,
-                        total_services_unknown,total_services_critical);
-        }
-        else{
-                return_code=get_status(total_hosts_down+total_hosts_unreachable, thresholds);
-                printf("CLUSTER %s: %s: %d up, %d down, %d unreachable\n",
-                        state_text(return_code), (label==NULL)?"Host cluster":label,
-                        total_hosts_up,total_hosts_down,total_hosts_unreachable);
+        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);
+        } 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);
         }
 
-        return return_code;
+        exit(return_code);
 }
 
+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}};
 
-
-int process_arguments(int argc, char **argv){
-        int c;
-        char *ptr;
-        int option=0;
-        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}
+        check_cluster_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_cluster_config_init(),
         };
 
         /* no options were supplied */
-        if(argc<2)
-                return ERROR;
-
-        while(1){
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-                c=getopt_long(argc,argv,"hHsvVw:c:d:l:",longopts,&option);
+        int option = 0;
+        char *warn_threshold = NULL;
+        char *crit_threshold = NULL;
+        while (true) {
+                int option_index = getopt_long(argc, argv, "hHsvVw:c:d:l:", longopts, &option);
 
-                if(c==-1 || c==EOF || c==1)
+                if (option_index == -1 || option_index == EOF || option_index == 1) {
                         break;
+                }
 
-                switch(c){
-
+                switch (option_index) {
                 case 'h': /* host cluster */
-                        check_type=CHECK_HOSTS;
+                        result.config.check_type = CHECK_HOSTS;
                         break;
-
                 case 's': /* service cluster */
-                        check_type=CHECK_SERVICES;
+                        result.config.check_type = CHECK_SERVICES;
                         break;
-
                 case 'w': /* warning threshold */
                         warn_threshold = strdup(optarg);
                         break;
-
                 case 'c': /* warning threshold */
                         crit_threshold = strdup(optarg);
                         break;
-
                 case 'd': /* data values */
-                        data_vals=(char *)strdup(optarg);
+                        result.config.data_vals = strdup(optarg);
                         /* validate data */
-                        for (ptr=data_vals;ptr!=NULL;ptr+=2){
-                                if (ptr[0]<'0' || ptr[0]>'3')
-                                        return ERROR;
-                                if (ptr[1]=='\0')
+                        for (char *ptr = result.config.data_vals; ptr != NULL; ptr += 2) {
+                                if (ptr[0] < '0' || ptr[0] > '3') {
+                                        result.errorcode = ERROR;
+                                        return result;
+                                }
+                                if (ptr[1] == '\0') {
                                         break;
-                                if (ptr[1]!=',')
-                                        return ERROR;
+                                }
+                                if (ptr[1] != ',') {
+                                        result.errorcode = ERROR;
+                                        return result;
+                                }
                         }
                         break;
-
                 case 'l': /* text label */
-                        label=(char *)strdup(optarg);
+                        result.config.label = strdup(optarg);
                         break;
-
                 case 'v': /* verbose */
                         verbose++;
                         break;
-
                 case 'V': /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
                         break;
-
                 case 'H': /* help */
                         print_help();
                         exit(STATE_UNKNOWN);
                         break;
-
                 default:
-                        return ERROR;
+                        result.errorcode = ERROR;
+                        return result;
                         break;
-                }
+                }
         }
 
-        if(data_vals==NULL)
-                return ERROR;
+        if (result.config.data_vals == NULL) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        return OK;
+        set_thresholds(&result.config.thresholds, warn_threshold, crit_threshold);
+        return result;
 }
 
-void
-print_help(void)
-{
+void print_help(void) {
         print_revision(progname, NP_VERSION);
-        printf ("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
+        printf("Copyright (c) 2000-2004 Ethan Galstad (nagios@nagios.org)\n");
         printf(COPYRIGHT, copyright, email);
 
         printf(_("Host/Service Cluster Plugin for Monitoring"));
@@ -245,21 +226,21 @@ print_help(void)
         printf("\n");
         printf("%s\n", _("Options:"));
         printf(UT_EXTRA_OPTS);
-        printf (" %s\n", "-s, --service");
-        printf ("    %s\n", _("Check service cluster status"));
-        printf (" %s\n", "-h, --host");
-        printf ("    %s\n", _("Check host cluster status"));
-        printf (" %s\n", "-l, --label=STRING");
-        printf ("    %s\n", _("Optional prepended text output (i.e. \"Host cluster\")"));
-        printf (" %s\n", "-w, --warning=THRESHOLD");
-        printf ("    %s\n", _("Specifies the range of hosts or services in cluster that must be in a"));
-        printf ("    %s\n", _("non-OK state in order to return a WARNING status level"));
-        printf (" %s\n", "-c, --critical=THRESHOLD");
-        printf ("    %s\n", _("Specifies the range of hosts or services in cluster that must be in a"));
-        printf ("    %s\n", _("non-OK state in order to return a CRITICAL status level"));
-        printf (" %s\n", "-d, --data=LIST");
-        printf ("    %s\n", _("The status codes of the hosts or services in the cluster, separated by"));
-        printf ("    %s\n", _("commas"));
+        printf(" %s\n", "-s, --service");
+        printf("    %s\n", _("Check service cluster status"));
+        printf(" %s\n", "-h, --host");
+        printf("    %s\n", _("Check host cluster status"));
+        printf(" %s\n", "-l, --label=STRING");
+        printf("    %s\n", _("Optional prepended text output (i.e. \"Host cluster\")"));
+        printf(" %s\n", "-w, --warning=THRESHOLD");
+        printf("    %s\n", _("Specifies the range of hosts or services in cluster that must be in a"));
+        printf("    %s\n", _("non-OK state in order to return a WARNING status level"));
+        printf(" %s\n", "-c, --critical=THRESHOLD");
+        printf("    %s\n", _("Specifies the range of hosts or services in cluster that must be in a"));
+        printf("    %s\n", _("non-OK state in order to return a CRITICAL status level"));
+        printf(" %s\n", "-d, --data=LIST");
+        printf("    %s\n", _("The status codes of the hosts or services in the cluster, separated by"));
+        printf("    %s\n", _("commas"));
 
         printf(UT_VERBOSE);
 
@@ -267,23 +248,18 @@ print_help(void)
         printf("%s\n", _("Notes:"));
         printf(UT_THRESHOLDS_NOTES);
 
-        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", _("state.") );
+        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", _("state."));
 
         printf(UT_SUPPORT);
 }
 
-
-void
-print_usage(void)
-{
+void print_usage(void) {
 
         printf("%s\n", _("Usage:"));
         printf(" %s (-s | -h) -d val1[,val2,...,valn] [-l label]\n", progname);
         printf("[-w threshold] [-c threshold] [-v] [--help]\n");
-
 }
-
diff --git a/plugins/check_cluster.d/config.h b/plugins/check_cluster.d/config.h
new file mode 100644
index 00000000..fc386415
--- /dev/null
+++ b/plugins/check_cluster.d/config.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "../../config.h"
+#include "../../lib/thresholds.h"
+#include <stddef.h>
+
+enum {
+        CHECK_SERVICES = 1,
+        CHECK_HOSTS = 2
+};
+
+typedef struct {
+        char *data_vals;
+        thresholds *thresholds;
+        int check_type;
+        char *label;
+} check_cluster_config;
+
+check_cluster_config check_cluster_config_init() {
+        check_cluster_config tmp = {
+                .data_vals = NULL,
+                .thresholds = NULL,
+                .check_type = CHECK_SERVICES,
+                .label = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_curl.c b/plugins/check_curl.c
index e25d7a79..748201e8 100644
--- a/plugins/check_curl.c
+++ b/plugins/check_curl.c
@@ -1,40 +1,40 @@
 /*****************************************************************************
-*
-* Monitoring check_curl plugin
-*
-* License: GPL
-* Copyright (c) 1999-2019 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_curl 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 plugin uses functions from the curl library, see
-* http://curl.haxx.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/>.
-*
-*
-*****************************************************************************/
+ *
+ * Monitoring check_curl plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_curl 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 plugin uses functions from the curl library, see
+ * http://curl.haxx.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/>.
+ *
+ *
+ *****************************************************************************/
 const char *progname = "check_curl";
 
-const char *copyright = "2006-2019";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include <stdbool.h>
@@ -44,7 +44,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include "utils.h"
 
 #ifndef LIBCURL_PROTOCOL_HTTP
-#error libcurl compiled without HTTP support, compiling check_curl plugin does not makes a lot of sense
+#       error libcurl compiled without HTTP support, compiling check_curl plugin does not makes a lot of sense
 #endif
 
 #include "curl/curl.h"
@@ -58,7 +58,7 @@ const char *email = "devel@monitoring-plugins.org";
 #include <netinet/in.h>
 
 #if defined(HAVE_SSL) && defined(USE_OPENSSL)
-#include <openssl/opensslv.h>
+#       include <openssl/opensslv.h>
 #endif
 
 #include <netdb.h>
@@ -66,1092 +66,1052 @@ const char *email = "devel@monitoring-plugins.org";
 #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
+#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
+        MAX_IPV4_HOSTLENGTH = 255,
+        HTTP_PORT = 80,
+        HTTPS_PORT = 443,
+        MAX_PORT = 65535,
+        DEFAULT_MAX_REDIRS = 15
 };
 
 enum {
-  STICKY_NONE = 0,
-  STICKY_HOST = 1,
-  STICKY_PORT = 2
+        STICKY_NONE = 0,
+        STICKY_HOST = 1,
+        STICKY_PORT = 2
 };
 
 enum {
-  FOLLOW_HTTP_CURL = 0,
-  FOLLOW_LIBCURL = 1
+        FOLLOW_HTTP_CURL = 0,
+        FOLLOW_LIBCURL = 1
 };
 
 /* for buffers for header and body */
 typedef struct {
-  char *buf;
-  size_t buflen;
-  size_t bufsize;
+        char *buf;
+        size_t buflen;
+        size_t bufsize;
 } curlhelp_write_curlbuf;
 
 /* for buffering the data sent in PUT */
 typedef struct {
-  char *buf;
-  size_t buflen;
-  off_t pos;
+        char *buf;
+        size_t buflen;
+        off_t pos;
 } 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 */
+        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_UNKNOWN,
+        CURLHELP_SSL_LIBRARY_OPENSSL,
+        CURLHELP_SSL_LIBRARY_LIBRESSL,
+        CURLHELP_SSL_LIBRARY_GNUTLS,
+        CURLHELP_SSL_LIBRARY_NSS
 } curlhelp_ssl_library;
 
 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];
-int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
-int errcode;
-bool invert_regex = false;
-int state_regex = STATE_CRITICAL;
-
-char *server_address = NULL;
-char *host_name = NULL;
-char *server_url = 0;
-char server_ip[DEFAULT_BUFFER_SIZE];
-struct curl_slist *server_ips = NULL;
-bool specify_port = false;
-unsigned short server_port = HTTP_PORT;
-unsigned short virtual_port = 0;
-int host_name_length;
-char output_header_search[30] = "";
-char output_string_search[30] = "";
-char *warning_thresholds = NULL;
-char *critical_thresholds = NULL;
-int days_till_exp_warn, days_till_exp_crit;
-thresholds *thlds;
-char user_agent[DEFAULT_BUFFER_SIZE];
-int verbose = 0;
-bool show_extended_perfdata = false;
-bool show_body = false;
-int min_page_len = 0;
-int max_page_len = 0;
-int redir_depth = 0;
-int max_depth = DEFAULT_MAX_REDIRS;
-char *http_method = NULL;
-char *http_post_data = NULL;
-char *http_content_type = NULL;
-CURL *curl;
-bool curl_global_initialized = false;
-bool curl_easy_initialized = false;
-struct curl_slist *header_list = NULL;
-bool body_buf_initialized = false;
-curlhelp_write_curlbuf body_buf;
-bool header_buf_initialized = false;
-curlhelp_write_curlbuf header_buf;
-bool status_line_initialized = false;
-curlhelp_statusline status_line;
-bool put_buf_initialized = false;
-curlhelp_read_curlbuf put_buf;
-char http_header[DEFAULT_BUFFER_SIZE];
-long code;
-long socket_timeout = DEFAULT_SOCKET_TIMEOUT;
-double total_time;
-double time_connect;
-double time_appconnect;
-double time_headers;
-double time_firstbyte;
-char errbuf[MAX_INPUT_BUFFER];
-CURLcode res;
-char url[DEFAULT_BUFFER_SIZE];
-char msg[DEFAULT_BUFFER_SIZE];
-char perfstring[DEFAULT_BUFFER_SIZE];
-char header_expect[MAX_INPUT_BUFFER] = "";
-char string_expect[MAX_INPUT_BUFFER] = "";
-char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
-int server_expect_yn = 0;
-char user_auth[MAX_INPUT_BUFFER] = "";
-char proxy_auth[MAX_INPUT_BUFFER] = "";
-char **http_opt_headers;
-int http_opt_headers_count = 0;
-bool display_html = false;
-int onredirect = STATE_OK;
-int followmethod = FOLLOW_HTTP_CURL;
-int followsticky = STICKY_NONE;
-bool use_ssl = false;
-bool use_sni = true;
-bool check_cert = false;
-bool continue_after_check_cert = false;
+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;
+        struct curl_slist *to_info;
+        struct curl_certinfo *to_certinfo;
 } cert_ptr_union;
-cert_ptr_union cert_ptr;
-int ssl_version = CURL_SSLVERSION_DEFAULT;
-char *client_cert = NULL;
-char *client_privkey = NULL;
-char *ca_cert = NULL;
-bool verify_peer_and_host = false;
-bool is_openssl_callback = false;
+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)
-X509 *cert = NULL;
+static X509 *cert = NULL;
 #endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
-bool no_body = false;
-int maximum_age = -1;
-int address_family = AF_UNSPEC;
-curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
-int curl_http_version = CURL_HTTP_VERSION_NONE;
-bool automatic_decompression = false;
-char *cookie_jar_file = NULL;
-bool haproxy_protocol = false;
-
-bool process_arguments (int, char**);
-void handle_curl_option_return_code (CURLcode res, const char* option);
-int check_http (void);
-void redir (curlhelp_write_curlbuf*);
-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);
-void print_curl_version (void);
-int curlhelp_initwritebuffer (curlhelp_write_curlbuf*);
-size_t curlhelp_buffer_write_callback(void*, size_t , size_t , void*);
-void curlhelp_freewritebuffer (curlhelp_write_curlbuf*);
-int curlhelp_initreadbuffer (curlhelp_read_curlbuf *, const char *, size_t);
-size_t curlhelp_buffer_read_callback(void *, size_t , size_t , void *);
-void curlhelp_freereadbuffer (curlhelp_read_curlbuf *);
-curlhelp_ssl_library curlhelp_get_ssl_library ();
-const char* curlhelp_get_ssl_library_string (curlhelp_ssl_library);
-int net_noopenssl_check_certificate (cert_ptr_union*, int, int);
-
-int curlhelp_parse_statusline (const char*, curlhelp_statusline *);
-void curlhelp_free_statusline (curlhelp_statusline *);
-char *get_header_value (const struct phr_header* headers, const size_t nof_headers, const char* header);
-int check_document_dates (const curlhelp_write_curlbuf *, char (*msg)[DEFAULT_BUFFER_SIZE]);
-int get_content_length (const curlhelp_write_curlbuf* header_buf, const curlhelp_write_curlbuf* body_buf);
+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);
 
 #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);
 #endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
 
-void remove_newlines (char *);
-void test_file (char *);
+static void test_file(char * /*path*/);
 
-int
-main (int argc, char **argv)
-{
-  int result = STATE_UNKNOWN;
+int main(int argc, char **argv) {
+        int result = STATE_UNKNOWN;
 
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
-  /* Parse extra opts if any */
-  argv = np_extra_opts (&argc, argv, progname);
+        /* 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());
+        /* 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)
-    usage4 (_("Could not parse arguments"));
+        /* parse arguments */
+        if (process_arguments(argc, argv) == false)
+                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);
+        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);
 
-  result = check_http ();
-  return result;
+        result = check_http();
+        return result;
 }
 
 #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
-   * should we test?
-   * TODO: is the last certificate always the server certificate?
-   */
-  cert = X509_STORE_CTX_get_current_cert(x509_ctx);
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-  X509_up_ref(cert);
-#endif
-  if (verbose>=2) {
-    puts("* SSL verify callback with certificate:");
-    X509_NAME *subject, *issuer;
-    printf("*   issuer:\n");
-    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_print_ex_fp(stdout, subject, 5, XN_FLAG_MULTILINE);
-    puts("");
-  }
-  return 1;
+#       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
+         * should we test?
+         * TODO: is the last certificate always the server certificate?
+         */
+        cert = X509_STORE_CTX_get_current_cert(x509_ctx);
+#               if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        X509_up_ref(cert);
+#               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_print_ex_fp(stdout, issuer, 5, XN_FLAG_MULTILINE);
+                printf("* curl verify_callback:\n*   subject:\n");
+                subject = X509_get_subject_name(cert);
+                X509_NAME_print_ex_fp(stdout, subject, 5, XN_FLAG_MULTILINE);
+                puts("");
+        }
+        return 1;
 }
 
-CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm)
-{
-        (void) curl; // ignore unused parameter
-        (void) parm; // ignore unused parameter
-  SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, verify_callback);
+CURLcode sslctxfun(CURL *curl, SSL_CTX *sslctx, void *parm) {
+        (void)curl; // ignore unused parameter
+        (void)parm; // ignore unused parameter
+        if (add_sslctx_verify_fun) {
+                SSL_CTX_set_verify(sslctx, SSL_VERIFY_PEER, verify_callback);
+        }
 
-  return CURLE_OK;
+        // workaround for issue:
+        // OpenSSL SSL_read: error:0A000126:SSL routines::unexpected eof while reading, errno 0
+        // see discussion https://github.com/openssl/openssl/discussions/22690
+#               ifdef SSL_OP_IGNORE_UNEXPECTED_EOF
+        SSL_CTX_set_options(sslctx, SSL_OP_IGNORE_UNEXPECTED_EOF);
+#               endif
+
+        return CURLE_OK;
 }
 
-#endif /* USE_OPENSSL */
-#endif /* HAVE_SSL */
+#       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;
+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, *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;
 }
 
-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);
-  }
+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);
+        }
 }
 
-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;
-    }
-
-    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;
+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;
+                }
+
+                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;
 }
 
-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;
+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;
 }
 
-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");
-  }
-  curl_easy_initialized = true;
-
-  /* register cleanup function to shut down libcurl properly */
-  atexit (cleanup);
-
-  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)
+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");
+        }
+        curl_easy_initialized = true;
+
+        /* register cleanup function to shut down libcurl properly */
+        atexit(cleanup);
+
+        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");
+                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");
+                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;
-  }
-
-  /* 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");
-  }
-
-  /* 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];
-      }
-    }
-  }
-
-  /* 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);
-  }
-
-  /* always close connection, be nice to servers */
-  snprintf (http_header, DEFAULT_BUFFER_SIZE, "Connection: close");
-  header_list = curl_slist_append (header_list, http_header);
-
-  /* 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); */
-  }
-
-  /* set HTTP headers */
-  handle_curl_option_return_code (curl_easy_setopt( curl, CURLOPT_HTTPHEADER, header_list ), "CURLOPT_HTTPHEADER");
+        /* 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;
+        }
+
+        /* 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");
+        }
+
+        /* 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];
+                        }
+                }
+        }
+
+        /* 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);
+        }
+
+        /* always close connection, be nice to servers */
+        snprintf(http_header, DEFAULT_BUFFER_SIZE, "Connection: close");
+        header_list = curl_slist_append(header_list, http_header);
+
+        /* 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); */
+        }
+
+        /* set HTTP headers */
+        handle_curl_option_return_code(curl_easy_setopt(curl, CURLOPT_HTTPHEADER, header_list), "CURLOPT_HTTPHEADER");
 
 #ifdef LIBCURL_FEATURE_SSL
 
-  /* 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 */
-        handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
-        is_openssl_callback = true;
-#else /* USE_OPENSSL */
-#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;
-    }
-#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)
-      handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
-    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) */
-  }
+        /* 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;
+                }
+#       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) */
+        /* 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");
+                        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");
+                        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)");
+                        /* 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
 
-  /* 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");
-    }
-  }
-
-  /* cookie handling */
-  if (cookie_jar_file != NULL) {
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR");
-    handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEFILE, cookie_jar_file), "CURLOPT_COOKIEFILE");
-  }
-
-  /* do the request */
-  res = curl_easy_perform(curl);
-
-  if (verbose>=2 && http_post_data)
-    printf ("**** REQUEST CONTENT ****\n%s\n", http_post_data);
-
-  /* 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;
-  }
-
-  /* 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);
-  }
-
-  /* certificate checks */
+        /* 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");
+                }
+        }
+
+        /* 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);
+
+        /* 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;
+        }
+
+        /* 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);
+        }
+
+        /* 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;
-
-        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);
-        }
-      }
-    }
-  }
+        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;
+
+                                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 */
 
-  /* 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)
-    );
-  }
-
-  /* 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);
-  }
-  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);
-
-  /* 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));
-  }
-
-  /* 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 : "");
-  }
-
-  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 {
-    /* 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;
-        /* client errors result in a warning state */
-    } else if (code >= 400) {
-      result = 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 {
-          /* old check_http style redirection, if we come
-           * back here, we are in the same status as with
-           * the libcurl method
-           */
-          redir (&header_buf);
-        }
-      } else {
-        /* this is a specific code in the command line to
-         * be returned when a redirection is encountered
-         */
-      }
-      result = max_state_alt (onredirect, result);
-    /* all other codes are considered ok */
-    } else {
-      result = 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);
-    }
-  }
-
-  /* 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 (maximum_age >= 0) {
-    result = max_state_alt(check_document_dates(&header_buf, &msg), result);
-  }
-
-  /* Page and Header content checks go here */
-
-  if (strlen (header_expect)) {
-    if (!strstr (header_buf.buf, header_expect)) {
-
-      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);
-      }
+        /* 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));
+        }
 
-                                char tmp[DEFAULT_BUFFER_SIZE];
+        /* 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"));
 
-                                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);
+        /* 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);
+        }
+        status_line_initialized = true;
 
-                                strcpy(msg, tmp);
+        /* 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);
 
-                                result = STATE_CRITICAL;
-    }
-  }
+        /* 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));
+        }
 
-  if (strlen (string_expect)) {
-    if (!strstr (body_buf.buf, string_expect)) {
+        /* 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 : "");
+        }
 
-      strncpy(&output_string_search[0],string_expect,sizeof(output_string_search));
+        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 {
+                /* 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;
+                        /* client errors result in a warning state */
+                } else if (code >= 400) {
+                        result = 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 {
+                                        /* old check_http style redirection, if we come
+                                         * back here, we are in the same status as with
+                                         * the libcurl method
+                                         */
+                                        redir(&header_buf);
+                                }
+                        } else {
+                                /* this is a specific code in the command line to
+                                 * be returned when a redirection is encountered
+                                 */
+                        }
+                        result = max_state_alt(onredirect, result);
+                        /* all other codes are considered ok */
+                } else {
+                        result = STATE_OK;
+                }
+        }
 
-      if(output_string_search[sizeof(output_string_search)-1]!='\0') {
-        bcopy("...",&output_string_search[sizeof(output_string_search)-4],4);
-      }
+        /* 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);
+                }
+        }
+
+        /* 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 (maximum_age >= 0) {
+                result = max_state_alt(check_document_dates(&header_buf, &msg), result);
+        }
+
+        /* Page and Header content checks go here */
+
+        if (strlen(header_expect)) {
+                if (!strstr(header_buf.buf, header_expect)) {
+
+                        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);
+                        }
+
+                        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);
+
+                        strcpy(msg, tmp);
+
+                        result = STATE_CRITICAL;
+                }
+        }
+
+        if (strlen(string_expect)) {
+                if (!strstr(body_buf.buf, string_expect)) {
+
+                        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);
+                        }
 
                         char tmp[DEFAULT_BUFFER_SIZE];
 
-                        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);
+                        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;
-    }
-  }
-
-  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 (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];
 
-                                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%spattern not found, "), msg);
+                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spattern not found, "), msg);
                                 strcpy(msg, tmp);
 
                         } else {
                                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%spattern found, "), msg);
+                                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spattern found, "), msg);
                                 strcpy(msg, tmp);
-
                         }
                         result = state_regex;
                 } else {
-                        regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                        regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
 
                         char tmp[DEFAULT_BUFFER_SIZE];
 
-                        snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sExecute Error: %s, "), msg, errbuf);
+                        snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sExecute Error: %s, "), msg, errbuf);
                         strcpy(msg, tmp);
                         result = STATE_UNKNOWN;
                 }
-  }
+        }
 
-  /* make sure the page is of an appropriate size */
+        /* make sure the page is of an appropriate size */
         if ((max_page_len > 0) && (page_len > max_page_len)) {
                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too large, "), msg, page_len);
+                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too large, "), msg, page_len);
 
                 strcpy(msg, tmp);
 
@@ -1160,1281 +1120,1233 @@ GOT_FIRST_CERT:
         } else if ((min_page_len > 0) && (page_len < min_page_len)) {
                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too small, "), msg, page_len);
+                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%spage size %d too small, "), msg, page_len);
                 strcpy(msg, tmp);
                 result = max_state_alt(STATE_WARNING, result);
         }
 
-  /* -w, -c: check warning and critical level */
-  result = max_state_alt(get_status(total_time, thlds), result);
-
-  /* Cut-off trailing characters */
-  if (strlen(msg) >= 2) {
-      if(msg[strlen(msg)-2] == ',')
-        msg[strlen(msg)-2] = '\0';
-      else
-        msg[strlen(msg)-3] = '\0';
-    }
-
-  /* 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);
+        /* -w, -c: check warning and critical level */
+        result = max_state_alt(get_status(total_time, thlds), result);
+
+        /* Cut-off trailing characters */
+        if (strlen(msg) >= 2) {
+                if (msg[strlen(msg) - 2] == ',')
+                        msg[strlen(msg) - 2] = '\0';
+                else
+                        msg[strlen(msg) - 3] = '\0';
+        }
+
+        /* 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);
 }
 
-int
-uri_strcmp (const UriTextRangeA range, const char* s)
-{
-  if (!range.first) return -1;
-  if ( (size_t)(range.afterLast - range.first) < strlen (s) ) return -1;
-  return strncmp (s, range.first, min( (size_t)(range.afterLast - range.first), strlen (s)));
+int uri_strcmp(const UriTextRangeA range, const char *s) {
+        if (!range.first)
+                return -1;
+        if ((size_t)(range.afterLast - range.first) < strlen(s))
+                return -1;
+        return strncmp(s, range.first, min((size_t)(range.afterLast - range.first), strlen(s)));
 }
 
-char*
-uri_string (const UriTextRangeA range, char* buf, size_t buflen)
-{
-  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;
+char *uri_string(const UriTextRangeA range, char *buf, size_t buflen) {
+        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;
-  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);
+void redir(curlhelp_write_curlbuf *header_buf) {
+        char *location = NULL;
+        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);
 
         if (res == -1) {
-                die (STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
-        }
-
-  location = get_header_value (headers, nof_headers, "location");
-
-  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>" : ""));
-
-  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>" : ""));
-    } else if (state.errorCode == URI_ERROR_MALLOC) {
-      die (STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
-    }
-  }
-
-  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));
-    printf (_("** port: %s\n"),
-      uri_string (uri.portText, buf, DEFAULT_BUFFER_SIZE));
-    if (uri.hostData.ip4) {
-      inet_ntop (AF_INET, uri.hostData.ip4->data, ipstr, sizeof (ipstr));
-      printf (_("** IPv4: %s\n"), ipstr);
-    }
-    if (uri.hostData.ip6) {
-      inet_ntop (AF_INET, uri.hostData.ip6->data, ipstr, sizeof (ipstr));
-      printf (_("** IPv6: %s\n"), ipstr);
-    }
-    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));
-      }
-      puts ("");
-    }
-    if (uri.query.first) {
-      printf (_("** query: %s\n"),
-      uri_string (uri.query, buf, DEFAULT_BUFFER_SIZE));
-    }
-    if (uri.fragment.first) {
-      printf (_("** fragment: %s\n"),
-      uri_string (uri.fragment, buf, DEFAULT_BUFFER_SIZE));
-    }
-  }
-
-  if (uri.scheme.first) {
-    if (!uri_strcmp (uri.scheme, "https"))
-      use_ssl = true;
-    else
-      use_ssl = false;
-  }
-
-  /* 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
-   */
-  if (uri.portText.first) {
-    new_port = atoi (uri_string (uri.portText, buf, DEFAULT_BUFFER_SIZE));
-  } else {
-    new_port = HTTP_PORT;
-    if (use_ssl)
-      new_port = HTTPS_PORT;
-  }
-  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
-   */
-  if (!uri.scheme.first && !uri.hostText.first) {
-    new_host = strdup (host_name ? host_name : server_address);
-    new_port = server_port;
-    if(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);
-  if (uri.pathHead) {
-    const UriPathSegmentA* p = uri.pathHead;
-    for (; p; p = p->next) {
-      strncat (new_url, "/", DEFAULT_BUFFER_SIZE);
-      strncat (new_url, uri_string (p->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>" : ""));
-
-  /* set new values for redirected request */
-
-  if (!(followsticky & STICKY_HOST)) {
-    free (server_address);
-    server_address = strndup (new_host, MAX_IPV4_HOSTLENGTH);
-  }
-  if (!(followsticky & STICKY_PORT)) {
-    server_port = (unsigned short)new_port;
-  }
-
-  free (host_name);
-  host_name = strndup (new_host, MAX_IPV4_HOSTLENGTH);
-
-  /* reset virtual port */
-  virtual_port = server_port;
-
-  free(new_host);
-  free (server_url);
-  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);
-
-  /* TODO: the hash component MUST be taken from the original URL and
-   * attached to the URL in Location
-   */
-
-  cleanup ();
-  check_http ();
+                die(STATE_UNKNOWN, _("HTTP UNKNOWN - Failed to parse Response\n"));
+        }
+
+        location = get_header_value(headers, nof_headers, "location");
+
+        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>" : ""));
+
+        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>" : ""));
+                } else if (state.errorCode == URI_ERROR_MALLOC) {
+                        die(STATE_UNKNOWN, _("HTTP UNKNOWN - Could not allocate URL\n"));
+                }
+        }
+
+        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));
+                printf(_("** port: %s\n"), uri_string(uri.portText, buf, DEFAULT_BUFFER_SIZE));
+                if (uri.hostData.ip4) {
+                        inet_ntop(AF_INET, uri.hostData.ip4->data, ipstr, sizeof(ipstr));
+                        printf(_("** IPv4: %s\n"), ipstr);
+                }
+                if (uri.hostData.ip6) {
+                        inet_ntop(AF_INET, uri.hostData.ip6->data, ipstr, sizeof(ipstr));
+                        printf(_("** IPv6: %s\n"), ipstr);
+                }
+                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));
+                        }
+                        puts("");
+                }
+                if (uri.query.first) {
+                        printf(_("** query: %s\n"), uri_string(uri.query, buf, DEFAULT_BUFFER_SIZE));
+                }
+                if (uri.fragment.first) {
+                        printf(_("** fragment: %s\n"), uri_string(uri.fragment, buf, DEFAULT_BUFFER_SIZE));
+                }
+        }
+
+        if (uri.scheme.first) {
+                if (!uri_strcmp(uri.scheme, "https"))
+                        use_ssl = true;
+                else
+                        use_ssl = false;
+        }
+
+        /* 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
+         */
+        if (uri.portText.first) {
+                new_port = atoi(uri_string(uri.portText, buf, DEFAULT_BUFFER_SIZE));
+        } else {
+                new_port = HTTP_PORT;
+                if (use_ssl)
+                        new_port = HTTPS_PORT;
+        }
+        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
+         */
+        if (!uri.scheme.first && !uri.hostText.first) {
+                new_host = strdup(host_name ? host_name : server_address);
+                new_port = server_port;
+                if (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);
+        if (uri.pathHead) {
+                const UriPathSegmentA *p = uri.pathHead;
+                for (; p; p = p->next) {
+                        strncat(new_url, "/", DEFAULT_BUFFER_SIZE);
+                        strncat(new_url, uri_string(p->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>" : ""));
+
+        /* set new values for redirected request */
+
+        if (!(followsticky & STICKY_HOST)) {
+                free(server_address);
+                server_address = strndup(new_host, MAX_IPV4_HOSTLENGTH);
+        }
+        if (!(followsticky & STICKY_PORT)) {
+                server_port = (unsigned short)new_port;
+        }
+
+        free(host_name);
+        host_name = strndup(new_host, MAX_IPV4_HOSTLENGTH);
+
+        /* reset virtual port */
+        virtual_port = server_port;
+
+        free(new_host);
+        free(server_url);
+        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);
+
+        /* 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);
+void test_file(char *path) {
+        if (access(path, R_OK) == 0)
+                return;
+        usage2(_("file does not exist or is not readable"), path);
 }
 
-bool
-process_arguments (int argc, char **argv)
-{
-  char *p;
-  int c = 1;
-  char *temp;
-
-  enum {
-    INVERT_REGEX = CHAR_MAX + 1,
-    SNI_OPTION,
-    MAX_REDIRS_OPTION,
-    CONTINUE_AFTER_CHECK_CERT,
-    CA_CERT_OPTION,
-    HTTP_VERSION_OPTION,
-    AUTOMATIC_DECOMPRESSION,
-    COOKIE_JAR,
-    HAPROXY_PROTOCOL,
-    STATE_REGEX
-  };
-
-  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;
-
-  /* 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");
-  }
-
-  server_url = strdup(DEFAULT_SERVER_URL);
-
-  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)
-      break;
-
-    switch (c) {
-    case 'h':
-      print_help();
-      exit(STATE_UNKNOWN);
-      break;
-    case 'V':
-      print_revision(progname, NP_VERSION);
-      print_curl_version();
-      exit(STATE_UNKNOWN);
-      break;
-    case 'v':
-      verbose++;
-      break;
-    case 't': /* timeout period */
-      if (!is_intnonneg (optarg))
-        usage2 (_("Timeout interval must be a positive integer"), optarg);
-      else
-        socket_timeout = (int)strtol (optarg, NULL, 10);
-      break;
-    case 'c': /* critical time threshold */
-      critical_thresholds = optarg;
-      break;
-    case 'w': /* warning time threshold */
-      warning_thresholds = optarg;
-      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);
-          /* cut off the port */
-          host_name_length = strlen (host_name) - strlen (p) - 1;
-          free (host_name);
-          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);
-          /* cut off the port */
-          host_name_length = strlen (host_name) - strlen (p) - 1;
-          free (host_name);
-          host_name = strndup (optarg, host_name_length);
-        }
-      break;
-    case 'I': /* internet address */
-      server_address = strdup (optarg);
-      break;
-    case 'u': /* URL path */
-      server_url = strdup (optarg);
-      break;
-    case 'p': /* Server port */
-      if (!is_intnonneg (optarg))
-        usage2 (_("Invalid port number, expecting a non-negative number"), optarg);
-      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);
-        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);
-      break;
-    case 'A': /* useragent */
-      strncpy (user_agent, optarg, DEFAULT_BUFFER_SIZE);
-      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;
-      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) {
+        char *p;
+        int c = 1;
+        char *temp;
+
+        enum {
+                INVERT_REGEX = CHAR_MAX + 1,
+                SNI_OPTION,
+                MAX_REDIRS_OPTION,
+                CONTINUE_AFTER_CHECK_CERT,
+                CA_CERT_OPTION,
+                HTTP_VERSION_OPTION,
+                AUTOMATIC_DECOMPRESSION,
+                COOKIE_JAR,
+                HAPROXY_PROTOCOL,
+                STATE_REGEX
+        };
+
+        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;
+
+        /* 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");
+        }
+
+        server_url = strdup(DEFAULT_SERVER_URL);
+
+        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)
+                        break;
+
+                switch (c) {
+                case 'h':
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                        break;
+                case 'V':
+                        print_revision(progname, NP_VERSION);
+                        print_curl_version();
+                        exit(STATE_UNKNOWN);
+                        break;
+                case 'v':
+                        verbose++;
+                        break;
+                case 't': /* timeout period */
+                        if (!is_intnonneg(optarg))
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        else
+                                socket_timeout = (int)strtol(optarg, NULL, 10);
+                        break;
+                case 'c': /* critical time threshold */
+                        critical_thresholds = optarg;
+                        break;
+                case 'w': /* warning time threshold */
+                        warning_thresholds = optarg;
+                        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);
+                                        /* cut off the port */
+                                        host_name_length = strlen(host_name) - strlen(p) - 1;
+                                        free(host_name);
+                                        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);
+                                /* cut off the port */
+                                host_name_length = strlen(host_name) - strlen(p) - 1;
+                                free(host_name);
+                                host_name = strndup(optarg, host_name_length);
+                        }
+                        break;
+                case 'I': /* internet address */
+                        server_address = strdup(optarg);
+                        break;
+                case 'u': /* URL path */
+                        server_url = strdup(optarg);
+                        break;
+                case 'p': /* Server port */
+                        if (!is_intnonneg(optarg))
+                                usage2(_("Invalid port number, expecting a non-negative number"), optarg);
+                        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);
+                                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);
+                        break;
+                case 'A': /* useragent */
+                        strncpy(user_agent, optarg, DEFAULT_BUFFER_SIZE);
+                        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;
+                        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 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;
+                        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 LIBCURL_FEATURE_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 LIBCURL_FEATURE_SSL
-      test_file(optarg);
-      client_privkey = optarg;
-      goto enable_ssl;
+                        test_file(optarg);
+                        client_privkey = optarg;
+                        goto enable_ssl;
 #endif
 #ifdef LIBCURL_FEATURE_SSL
-    case CA_CERT_OPTION: /* use CA chain file */
-      test_file(optarg);
-      ca_cert = optarg;
-      goto enable_ssl;
+                case CA_CERT_OPTION: /* use CA chain file */
+                        test_file(optarg);
+                        ca_cert = optarg;
+                        goto enable_ssl;
 #endif
 #ifdef LIBCURL_FEATURE_SSL
-    case 'D': /* verify peer certificate & host */
-      verify_peer_and_host = true;
-      break;
+                case 'D': /* verify peer certificate & host */
+                        verify_peer_and_host = true;
+                        break;
 #endif
-    case 'S': /* use SSL */
+                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;
-      break;
-#else /* LIBCURL_FEATURE_SSL */
-      /* -C -J and -K fall through to here without SSL */
-      usage4 (_("Invalid option - SSL is not available"));
-      break;
-    case SNI_OPTION: /* --sni is parsed, but ignored, the default is true with libcurl */
-      use_sni = true;
-      break;
+                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;
+                        break;
+#else  /* LIBCURL_FEATURE_SSL */
+                        /* -C -J and -K fall through to here without SSL */
+                        usage4(_("Invalid option - SSL is not available"));
+                        break;
+                case SNI_OPTION: /* --sni is parsed, but ignored, the default is true with libcurl */
+                        use_sni = true;
+                        break;
 #endif /* LIBCURL_FEATURE_SSL */
-    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, "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 usage2 (_("Invalid onredirect option"), optarg);
-      if (verbose >= 2)
-        printf(_("* Following redirects set to %s\n"), state_text(onredirect));
-      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 */
-      http_content_type = strdup (optarg);
-     break;
-    case 'l': /* linespan */
-      cflags &= ~REG_NEWLINE;
-      break;
-    case 'R': /* regex */
-      cflags |= REG_ICASE;
+                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, "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
+                                usage2(_("Invalid onredirect option"), optarg);
+                        if (verbose >= 2)
+                                printf(_("* Following redirects set to %s\n"), state_text(onredirect));
+                        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 */
+                        http_content_type = strdup(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 = true;
-      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':
-#if defined (USE_IPV6) && defined (LIBCURL_FEATURE_IPV6)
-      address_family = AF_INET6;
+                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 = true;
+                        break;
+                case STATE_REGEX:
+                        if (!strcasecmp(optarg, "critical"))
+                                state_regex = STATE_CRITICAL;
+                        else if (!strcasecmp(optarg, "warning"))
+                                state_regex = STATE_WARNING;
+                        else
+                                usage2(_("Invalid state-regex option"), optarg);
+                        break;
+                case '4':
+                        address_family = AF_INET;
+                        break;
+                case '6':
+#if defined(USE_IPV6) && defined(LIBCURL_FEATURE_IPV6)
+                        address_family = AF_INET6;
 #else
-      usage4 (_("IPv6 support not available"));
+                        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);
-      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);
-      }
-      if (verbose >= 2)
-        printf ("* Maximal age of document set to %d seconds\n", maximum_age);
-    }
-    break;
-    case 'E': /* show extended perfdata */
-      show_extended_perfdata = true;
-      break;
-    case 'B': /* print body content after status line */
-      show_body = true;
-      break;
-    case HTTP_VERSION_OPTION:
-      curl_http_version = CURL_HTTP_VERSION_NONE;
-      if (strcmp (optarg, "1.0") == 0) {
-        curl_http_version = CURL_HTTP_VERSION_1_0;
-      } else if (strcmp (optarg, "1.1") == 0) {
-        curl_http_version = CURL_HTTP_VERSION_1_1;
-      } else if ((strcmp (optarg, "2.0") == 0) || (strcmp (optarg, "2") == 0)) {
+                        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);
+                        }
+                        if (verbose >= 2)
+                                printf("* Maximal age of document set to %d seconds\n", maximum_age);
+                } break;
+                case 'E': /* show extended perfdata */
+                        show_extended_perfdata = true;
+                        break;
+                case 'B': /* print body content after status line */
+                        show_body = true;
+                        break;
+                case HTTP_VERSION_OPTION:
+                        curl_http_version = CURL_HTTP_VERSION_NONE;
+                        if (strcmp(optarg, "1.0") == 0) {
+                                curl_http_version = CURL_HTTP_VERSION_1_0;
+                        } else if (strcmp(optarg, "1.1") == 0) {
+                                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;
+                                curl_http_version = CURL_HTTP_VERSION_2_0;
 #else
-        curl_http_version = CURL_HTTP_VERSION_NONE;
+                                curl_http_version = CURL_HTTP_VERSION_NONE;
 #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 33, 0) */
-      } else {
-        fprintf (stderr, "unknown http-version parameter: %s\n", optarg);
-        exit (STATE_WARNING);
-      }
-      break;
-    case AUTOMATIC_DECOMPRESSION:
-      automatic_decompression = true;
-      break;
-    case COOKIE_JAR:
-      cookie_jar_file = optarg;
-      break;
-    case HAPROXY_PROTOCOL:
-      haproxy_protocol = true;
-      break;
-    case '?':
-      /* print short usage statement if args not parsable */
-      usage5 ();
-      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 (verbose >= 2)
-    printf ("* Socket timeout set to %ld seconds\n", socket_timeout);
-
-  if (http_method == NULL)
-    http_method = 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;
-  else {
-    if ((use_ssl && server_port == HTTPS_PORT) || (!use_ssl && server_port == HTTP_PORT))
-      if(!specify_port)
-        server_port = virtual_port;
-  }
-
-  return true;
+                        } else {
+                                fprintf(stderr, "unknown http-version parameter: %s\n", optarg);
+                                exit(STATE_WARNING);
+                        }
+                        break;
+                case AUTOMATIC_DECOMPRESSION:
+                        automatic_decompression = true;
+                        break;
+                case COOKIE_JAR:
+                        cookie_jar_file = optarg;
+                        break;
+                case HAPROXY_PROTOCOL:
+                        haproxy_protocol = true;
+                        break;
+                case '?':
+                        /* print short usage statement if args not parsable */
+                        usage5();
+                        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 (verbose >= 2)
+                printf("* Socket timeout set to %ld seconds\n", socket_timeout);
+
+        if (http_method == NULL)
+                http_method = 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;
+        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(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_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 ? true : false), min_page_len, (min_page_len > 0 ? true : false), 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 ("\n");
-  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("%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");
+        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");
+        printf("\n\n");
 
-  print_usage ();
+        print_usage();
 
-  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 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", _("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 and SSLv3 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", _("      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", _("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", _(" --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", "--ca-cert=FILE");
-  printf ("   %s\n", _("CA certificate file to verify peer against"));
-  printf (" %s\n", "-D, --verify-cert");
-  printf ("   %s\n", _("Verify the peer's SSL certificate and hostname"));
+        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, 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", _("      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", _("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", _(" --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", "--ca-cert=FILE");
+        printf("   %s\n", _("CA certificate file to verify peer against"));
+        printf(" %s\n", "-D, --verify-cert");
+        printf("   %s\n", _("Verify the peer's SSL certificate and hostname"));
 #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)");
-  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", "--regex-state=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|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."));
-  printf ("    %s\n", _("follow uses the old redirection algorithm of check_http."));
-  printf ("    %s\n", _("curl uses CURL_FOLLOWLOCATION built into libcurl."));
-  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 ("\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", "--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 ("\n");
-
-  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)");
+        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. 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");
+        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|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."));
+        printf("    %s\n", _("follow uses the old redirection algorithm of check_http."));
+        printf("    %s\n", _("curl uses CURL_FOLLOWLOCATION built into libcurl."));
+        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("\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", "--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("\n");
+
+        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 LIBCURL_FEATURE_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_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_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 ("\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", _("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("\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_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_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("\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", _("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"));
 #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", _("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("\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", _("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"));
 
 #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", _("a STATE_CRITICAL will be returned."));
+        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", _("a STATE_CRITICAL will be returned."));
 
 #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>] [--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 ("       [-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");
-  printf ("       [--http-version=<version>] [--enable-automatic-decompression]\n");
-  printf ("       [--cookie-jar=<cookie jar file>\n");
-  printf (" %s -H <vhost> | -I <IP-address> -C <warn_age>[,<crit_age>]\n",progname);
-  printf ("       [-p <port>] [-t <timeout>] [-4|-6] [--sni]\n");
-  printf ("\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>] [--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("       [-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");
+        printf("       [--http-version=<version>] [--enable-automatic-decompression]\n");
+        printf("       [--cookie-jar=<cookie jar file>\n");
+        printf(" %s -H <vhost> | -I <IP-address> -C <warn_age>[,<crit_age>]\n", progname);
+        printf("       [-p <port>] [-t <timeout>] [-4|-6] [--sni]\n");
+        printf("\n");
 #ifdef LIBCURL_FEATURE_SSL
-  printf ("%s\n", _("In the first form, make an HTTP request."));
-  printf ("%s\n\n", _("In the second form, connect to the server and check the TLS certificate."));
+        printf("%s\n", _("In the first form, make an HTTP request."));
+        printf("%s\n\n", _("In the second form, connect to the server and check the TLS certificate."));
 #endif
 }
 
-void
-print_curl_version (void)
-{
-  printf( "%s\n", curl_version());
-}
+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;
+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;
+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;
-    }
-  }
+        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';
+        memcpy(buf->buf + buf->buflen, buffer, size * nmemb);
+        buf->buflen += size * nmemb;
+        buf->buf[buf->buflen] = '\0';
 
-  return (int)(size * nmemb);
+        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 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);
+        size_t n = min(nmemb * size, buf->buflen - buf->pos);
 
-  memcpy (buffer, buf->buf + buf->pos, n);
-  buf->pos += n;
+        memcpy(buffer, buf->buf + buf->pos, n);
+        buf->pos += n;
 
-  return (int)n;
+        return (int)n;
 }
 
-void
-curlhelp_freewritebuffer (curlhelp_write_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)
-{
-  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;
+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;
+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;
-      else
-        return prev_pos;
-    }
-    counter++;
-    prev_pos = pos;
-    pos += len;
-    if (*pos == '\0') return prev_pos;
-  }
+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;
-}
+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;
+        }
 
-void
-curlhelp_free_statusline (curlhelp_statusline *status_line)
-{
-  free (status_line->first_line);
-}
+        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 */
+        }
 
-void
-remove_newlines (char *s)
-{
-  char *p;
+        /* status code: "404" or "404.1", then SP */
 
-  for (p = s; *p != '\0'; p++)
-    if (*p == '\r' || *p == '\n')
-      *p = ' ';
+        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;
 }
 
-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;
+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);
+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"));
+                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");
+        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);
+                snprintf(tmp, DEFAULT_BUFFER_SIZE, _("%sServer date unknown, "), *msg);
                 strcpy(*msg, tmp);
 
                 date_result = max_state_alt(STATE_UNKNOWN, date_result);
@@ -2442,34 +2354,34 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA
         } else if (!document_date || !*document_date) {
                 char tmp[DEFAULT_BUFFER_SIZE];
 
-                snprintf (tmp, DEFAULT_BUFFER_SIZE, _("%sDocument modification date unknown, "), *msg);
+                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);
+        } 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);
+                        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);
+                        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);
+                        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);
@@ -2478,14 +2390,14 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA
                         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);
+                                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);
+                                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);
@@ -2493,132 +2405,128 @@ check_document_dates (const curlhelp_write_curlbuf *header_buf, char (*msg)[DEFA
                 }
         }
 
-  if (server_date) free (server_date);
-  if (document_date) free (document_date);
+        if (server_date)
+                free(server_date);
+        if (document_date)
+                free(document_date);
 
-  return date_result;
+        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
-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);
+        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"));
+                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? */
-  }
+        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);
+        if (content_length_s)
+                free(content_length_s);
 
-  return header_buf->buflen + body_buf->buflen;
+        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 ()
-{
-  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;
+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";
-  }
+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) return -1;
-
-  /* Jan 17 14:25:12 2020 GMT */
-  res = strptime (s, "%Y-%m-%d %H:%M:%S GMT", &tm);
-  /* Sep 11 12:00:00 2020 GMT */
-  if (res == NULL) strptime (s, "%Y %m %d %H:%M:%S GMT", &tm);
-  date = mktime (&tm);
-
-  return date;
+#       ifndef USE_OPENSSL
+time_t parse_cert_date(const char *s) {
+        struct tm tm;
+        time_t date;
+        char *res;
+
+        if (!s)
+                return -1;
+
+        /* Jan 17 14:25:12 2020 GMT */
+        res = strptime(s, "%Y-%m-%d %H:%M:%S GMT", &tm);
+        /* Sep 11 12:00:00 2020 GMT */
+        if (res == NULL)
+                strptime(s, "%Y %m %d %H:%M:%S GMT", &tm);
+        date = mktime(&tm);
+
+        return date;
 }
 
 /* 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;
+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;
@@ -2626,66 +2534,64 @@ net_noopenssl_check_certificate (cert_ptr_union* cert_ptr, int days_till_exp_war
         char timestamp[50] = "";
         int status = STATE_UNKNOWN;
 
-  if (verbose >= 2)
-    printf ("**** REQUEST CERTIFICATES ****\n");
-
-  for (i = 0; i < cert_ptr->to_certinfo->num_of_certs; i++) {
-    for (slist = cert_ptr->to_certinfo->certinfo[i]; slist; slist = slist->next) {
-      /* find first common name in subject,
-       * TODO: check alternative subjects for
-       * TODO: have a decent parser here and not a hack
-       * multi-host certificate, check wildcards
-       */
-      if (strncasecmp (slist->data, "Subject:", 8) == 0) {
-        int d = 3;
-        char* p = strstr (slist->data, "CN=");
-        if (p == NULL) {
-          d = 5;
-          p = strstr (slist->data, "CN = ");
-        }
-        if (p != NULL) {
-          if (strncmp (host_name, p+d, strlen (host_name)) == 0) {
-            cname_found = 1;
-          }
-        }
-      } else if (strncasecmp (slist->data, "Start Date:", 11) == 0) {
-        start_date_str = &slist->data[11];
-      } 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;
-      }
-      if (verbose >= 2)
-        printf ("%d ** %s\n", i, slist->data);
-    }
-  }
+        if (verbose >= 2)
+                printf("**** REQUEST CERTIFICATES ****\n");
+
+        for (i = 0; i < cert_ptr->to_certinfo->num_of_certs; i++) {
+                for (slist = cert_ptr->to_certinfo->certinfo[i]; slist; slist = slist->next) {
+                        /* find first common name in subject,
+                         * TODO: check alternative subjects for
+                         * TODO: have a decent parser here and not a hack
+                         * multi-host certificate, check wildcards
+                         */
+                        if (strncasecmp(slist->data, "Subject:", 8) == 0) {
+                                int d = 3;
+                                char *p = strstr(slist->data, "CN=");
+                                if (p == NULL) {
+                                        d = 5;
+                                        p = strstr(slist->data, "CN = ");
+                                }
+                                if (p != NULL) {
+                                        if (strncmp(host_name, p + d, strlen(host_name)) == 0) {
+                                                cname_found = 1;
+                                        }
+                                }
+                        } else if (strncasecmp(slist->data, "Start Date:", 11) == 0) {
+                                start_date_str = &slist->data[11];
+                        } 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;
+                        }
+                        if (verbose >= 2)
+                                printf("%d ** %s\n", i, slist->data);
+                }
+        }
 HAVE_FIRST_CERT:
 
-  if (verbose >= 2)
-    printf ("**** REQUEST CERTIFICATES ****\n");
+        if (verbose >= 2)
+                printf("**** REQUEST CERTIFICATES ****\n");
 
-  if (!cname_found) {
-                printf("%s\n",_("CRITICAL - Cannot retrieve certificate subject."));
+        if (!cname_found) {
+                printf("%s\n", _("CRITICAL - Cannot retrieve certificate subject."));
                 return STATE_CRITICAL;
-  }
-
-  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);
-    puts (msg);
-    return STATE_WARNING;
-  }
-
-  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);
-    puts (msg);
-    return STATE_WARNING;
-  }
-
-  time_left = difftime (end_date, time(NULL));
+        }
+
+        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);
+                puts(msg);
+                return STATE_WARNING;
+        }
+
+        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);
+                puts(msg);
+                return STATE_WARNING;
+        }
+
+        time_left = difftime(end_date, time(NULL));
         days_left = time_left / 86400;
         tz = getenv("TZ");
         setenv("TZ", "GMT", 1);
@@ -2698,30 +2604,31 @@ HAVE_FIRST_CERT:
         tzset();
 
         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);
+                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
                         status = STATE_CRITICAL;
         } else if (days_left == 0 && time_left > 0) {
                 if (time_left >= 3600)
-                        time_remaining = (int) time_left / 3600;
+                        time_remaining = (int)time_left / 3600;
                 else
-                        time_remaining = (int) time_left / 60;
+                        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
                         status = STATE_CRITICAL;
         } else if (time_left < 0) {
                 printf(_("CRITICAL - Certificate '%s' expired on %s.\n"), host_name, timestamp);
-                status=STATE_CRITICAL;
+                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);
+                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
@@ -2732,5 +2639,5 @@ HAVE_FIRST_CERT:
         }
         return status;
 }
-#endif /* USE_OPENSSL */
-#endif /* LIBCURL_FEATURE_SSL */
+#       endif /* USE_OPENSSL */
+#endif     /* LIBCURL_FEATURE_SSL */
diff --git a/plugins/check_dbi.c b/plugins/check_dbi.c
index 29c85206..9efcd1cb 100644
--- a/plugins/check_dbi.c
+++ b/plugins/check_dbi.c
@@ -1,38 +1,40 @@
 /*****************************************************************************
-* 
-* Monitoring check_dbi plugin
-* 
-* License: GPL
-* Copyright (c) 2011 Monitoring Plugins Development Team
-* Author: Sebastian 'tokkee' Harl <sh@teamix.net>
-* 
-* Description:
-* 
-* This file contains the check_dbi plugin
-* 
-* Runs an arbitrary (SQL) command and checks the result.
-* 
-* 
-* 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_dbi plugin
+ *
+ * License: GPL
+ * Copyright (c) 2011-2024 Monitoring Plugins Development Team
+ * Original Author: Sebastian 'tokkee' Harl <sh@teamix.net>
+ *
+ * Description:
+ *
+ * This file contains the check_dbi plugin
+ *
+ * Runs an arbitrary (SQL) command and checks the result.
+ *
+ *
+ * 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_dbi";
-const char *copyright = "2011";
+const char *copyright = "2011-2024";
 const char *email = "devel@monitoring-plugins.org";
 
+#include "../lib/monitoringplug.h"
+#include "check_dbi.d/config.h"
 #include "common.h"
 #include "utils.h"
 #include "utils_cmd.h"
@@ -43,7 +45,7 @@ const char *email = "devel@monitoring-plugins.org";
 
 /* required for NAN */
 #ifndef _ISOC99_SOURCE
-#define _ISOC99_SOURCE
+#       define _ISOC99_SOURCE
 #endif
 
 #include <assert.h>
@@ -53,59 +55,26 @@ const char *email = "devel@monitoring-plugins.org";
 
 #include <stdarg.h>
 
-typedef enum {
-        METRIC_CONN_TIME,
-        METRIC_SERVER_VERSION,
-        METRIC_QUERY_RESULT,
-        METRIC_QUERY_TIME,
-} np_dbi_metric_t;
-
-typedef enum {
-        TYPE_NUMERIC,
-        TYPE_STRING,
-} np_dbi_type_t;
+static int verbose = 0;
 
 typedef struct {
-        char *key;
-        char *value;
-} driver_option_t;
-
-char *host = NULL;
-int verbose = 0;
-
-char *warning_range = NULL;
-char *critical_range = NULL;
-thresholds *dbi_thresholds = NULL;
-
-char *expect = NULL;
-
-regex_t expect_re;
-char *expect_re_str = NULL;
-int expect_re_cflags = 0;
-
-np_dbi_metric_t metric = METRIC_QUERY_RESULT;
-np_dbi_type_t type = TYPE_NUMERIC;
+        int errorcode;
+        check_dbi_config config;
+} check_dbi_config_wrapper;
 
-char *np_dbi_driver = NULL;
-driver_option_t *np_dbi_options = NULL;
-int np_dbi_options_num = 0;
-char *np_dbi_database = NULL;
-char *np_dbi_query = NULL;
+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);
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_usage (void);
-void print_help (void);
+static double timediff(struct timeval /*start*/, struct timeval /*end*/);
 
-double timediff (struct timeval, struct timeval);
+static void np_dbi_print_error(dbi_conn /*conn*/, char * /*fmt*/, ...);
 
-void np_dbi_print_error (dbi_conn, char *, ...);
+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*/);
 
-int do_query (dbi_conn, const char **, double *, double *);
-
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         int status = STATE_UNKNOWN;
 
         dbi_driver driver;
@@ -113,714 +82,725 @@ main (int argc, char **argv)
 
         unsigned int server_version;
 
-        struct timeval start_timeval, end_timeval;
+        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;
 
-        int i;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        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_dbi_config_wrapper tmp = process_arguments(argc, argv);
+
+        if (tmp.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        const check_dbi_config config = tmp.config;
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGALRM"));
         }
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 
-        if (verbose > 2)
-                printf ("Initializing DBI\n");
+        if (verbose > 2) {
+                printf("Initializing DBI\n");
+        }
 
-        dbi_inst *instance_p = { 0 };
+        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");
+                printf("UNKNOWN - failed to initialize DBI; possibly you don't have any drivers installed.\n");
                 return STATE_UNKNOWN;
         }
 
         if (instance_p == NULL) {
-                printf ("UNKNOWN - failed to initialize DBI.\n");
+                printf("UNKNOWN - failed to initialize DBI.\n");
                 return STATE_UNKNOWN;
         }
 
-        if (verbose)
-                printf ("Opening DBI driver '%s'\n", np_dbi_driver);
+        if (verbose) {
+                printf("Opening DBI driver '%s'\n", config.dbi_driver);
+        }
 
-        driver = dbi_driver_open_r(np_dbi_driver, instance_p);
-        if (! driver) {
-                printf ("UNKNOWN - failed to open DBI driver '%s'; possibly it's not installed.\n",
-                                np_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 ("Known drivers:\n");
+                printf("Known drivers:\n");
                 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));
+                        printf(" - %s\n", dbi_driver_get_name(driver));
                 }
                 return STATE_UNKNOWN;
         }
 
         /* make a connection to the database */
-        gettimeofday (&start_timeval, NULL);
+        gettimeofday(&start_timeval, NULL);
 
-        conn = dbi_conn_open (driver);
-        if (! conn) {
-                printf ("UNKNOWN - failed top open connection object.\n");
-                dbi_conn_close (conn);
+        conn = dbi_conn_open(driver);
+        if (!conn) {
+                printf("UNKNOWN - failed top open connection object.\n");
+                dbi_conn_close(conn);
                 return STATE_UNKNOWN;
         }
 
-        for (i = 0; i < np_dbi_options_num; ++i) {
+        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",
-                                        np_dbi_options[i].key, np_dbi_options[i].value);
+                if (verbose > 1) {
+                        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, np_dbi_options[i].key, np_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'",
-                                np_dbi_options[i].key, np_dbi_options[i].value);
-                printf ("Known driver options:\n");
+                np_dbi_print_error(conn, "UNKNOWN - 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)) {
-                        printf (" - %s\n", 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);
+                dbi_conn_close(conn);
                 return STATE_UNKNOWN;
         }
 
-        if (host) {
-                if (verbose > 1)
-                        printf ("Setting DBI driver option 'host' to '%s'\n", host);
-                dbi_conn_set_option (conn, "host", host);
+        if (config.host) {
+                if (verbose > 1) {
+                        printf("Setting DBI driver option 'host' to '%s'\n", config.host);
+                }
+                dbi_conn_set_option(conn, "host", config.host);
         }
 
         if (verbose) {
-                const char *dbname, *host;
+                const char *dbname;
+                const char *host;
 
-                dbname = dbi_conn_get_option (conn, "dbname");
-                host = dbi_conn_get_option (conn, "host");
+                dbname = dbi_conn_get_option(conn, "dbname");
+                host = dbi_conn_get_option(conn, "host");
 
-                if (! dbname)
+                if (!dbname) {
                         dbname = "<unspecified>";
-                if (! host)
+                }
+                if (!host) {
                         host = "<unspecified>";
+                }
 
-                printf ("Connecting to database '%s' at host '%s'\n",
-                                dbname, host);
+                printf("Connecting to database '%s' at host '%s'\n", dbname, host);
         }
 
-        if (dbi_conn_connect (conn) < 0) {
-                np_dbi_print_error (conn, "UNKNOWN - failed to connect to database");
+        if (dbi_conn_connect(conn) < 0) {
+                np_dbi_print_error(conn, "UNKNOWN - failed to connect to database");
                 return STATE_UNKNOWN;
         }
 
-        gettimeofday (&end_timeval, NULL);
-        conn_time = timediff (start_timeval, end_timeval);
+        gettimeofday(&end_timeval, NULL);
+        conn_time = timediff(start_timeval, end_timeval);
 
-        server_version = dbi_conn_get_engine_version (conn);
-        if (verbose)
-                printf ("Connected to server version %u\n", server_version);
+        server_version = dbi_conn_get_engine_version(conn);
+        if (verbose) {
+                printf("Connected to server version %u\n", server_version);
+        }
 
-        if (metric == METRIC_SERVER_VERSION)
-                status = get_status (server_version, dbi_thresholds);
+        if (config.metric == METRIC_SERVER_VERSION) {
+                status = get_status(server_version, config.dbi_thresholds);
+        }
 
-        if (verbose)
-                printf ("Time elapsed: %f\n", conn_time);
+        if (verbose) {
+                printf("Time elapsed: %f\n", conn_time);
+        }
 
-        if (metric == METRIC_CONN_TIME)
-                status = get_status (conn_time, dbi_thresholds);
+        if (config.metric == METRIC_CONN_TIME) {
+                status = get_status(conn_time, config.dbi_thresholds);
+        }
 
         /* select a database */
-        if (np_dbi_database) {
-                if (verbose > 1)
-                        printf ("Selecting database '%s'\n", np_dbi_database);
+        if (config.dbi_database) {
+                if (verbose > 1) {
+                        printf("Selecting database '%s'\n", config.dbi_database);
+                }
 
-                if (dbi_conn_select_db (conn, np_dbi_database)) {
-                        np_dbi_print_error (conn, "UNKNOWN - failed to select database '%s'",
-                                        np_dbi_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;
                 }
         }
 
-        if (np_dbi_query) {
+        if (config.dbi_query) {
                 /* execute query */
-                status = do_query (conn, &query_val_str, &query_val, &query_time);
-                if (status != STATE_OK)
+                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;
+                }
 
-                if (metric == METRIC_QUERY_RESULT) {
-                        if (expect) {
-                                if ((! query_val_str) || strcmp (query_val_str, expect))
+                if (config.metric == METRIC_QUERY_RESULT) {
+                        if (config.expect) {
+                                if ((!query_val_str) || strcmp(query_val_str, config.expect)) {
                                         status = STATE_CRITICAL;
-                                else
+                                } else {
                                         status = STATE_OK;
-                        }
-                        else if (expect_re_str) {
+                                }
+                        } else if (config.expect_re_str) {
                                 int err;
 
-                                err = regexec (&expect_re, query_val_str, 0, NULL, /* flags = */ 0);
-                                if (! 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)
+                                } else if (err == REG_NOMATCH) {
                                         status = STATE_CRITICAL;
-                                else {
+                                } else {
                                         char errmsg[1024];
-                                        regerror (err, &expect_re, errmsg, sizeof (errmsg));
-                                        printf ("ERROR - failed to execute regular expression: %s\n",
-                                                        errmsg);
+                                        regerror(err, &expect_re, errmsg, sizeof(errmsg));
+                                        printf("ERROR - failed to execute regular expression: %s\n", errmsg);
                                         status = STATE_CRITICAL;
                                 }
+                        } else {
+                                status = get_status(query_val, config.dbi_thresholds);
                         }
-                        else
-                                status = get_status (query_val, dbi_thresholds);
+                } else if (config.metric == METRIC_QUERY_TIME) {
+                        status = get_status(query_time, config.dbi_thresholds);
                 }
-                else if (metric == METRIC_QUERY_TIME)
-                        status = get_status (query_time, dbi_thresholds);
         }
 
-        if (verbose)
+        if (verbose) {
                 printf("Closing connection\n");
-        dbi_conn_close (conn);
+        }
+        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 ((metric != METRIC_QUERY_RESULT) || (! isnan (query_val))
-                        || (type == TYPE_STRING));
+        assert((config.metric != METRIC_QUERY_RESULT) || (!isnan(query_val)) || (config.type == TYPE_STRING));
 
-        assert ((type != TYPE_STRING) || (expect || expect_re_str));
+        assert((config.type != TYPE_STRING) || (config.expect || config.expect_re_str));
 
-        printf ("%s - connection time: %fs", state_text (status), conn_time);
-        if (np_dbi_query) {
-                if (type == TYPE_STRING) {
-                        assert (expect || expect_re_str);
-                        printf (", '%s' returned '%s' in %fs", np_dbi_query,
-                                        query_val_str ? query_val_str : "<nothing>", query_time);
+        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 (expect)
-                                        printf (" (expected '%s')", expect);
-                                else if (expect_re_str)
-                                        printf (" (expected regex /%s/%s)", expect_re_str,
-                                                        ((expect_re_cflags & REG_ICASE) ? "i" : ""));
+                                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);
                 }
-                else if (isnan (query_val))
-                        printf (", '%s' query execution time: %fs", np_dbi_query, query_time);
-                else
-                        printf (", '%s' returned %f in %fs", np_dbi_query, query_val, query_time);
-        }
-
-        printf (" | conntime=%fs;%s;%s;0; server_version=%u;%s;%s;0;", conn_time,
-                        ((metric == METRIC_CONN_TIME) && warning_range) ? warning_range : "",
-                        ((metric == METRIC_CONN_TIME) && critical_range) ? critical_range : "",
-                        server_version,
-                        ((metric == METRIC_SERVER_VERSION) && warning_range) ? warning_range : "",
-                        ((metric == METRIC_SERVER_VERSION) && critical_range) ? critical_range : "");
-        if (np_dbi_query) {
-                if (! isnan (query_val)) /* this is also true when -e is used */
-                        printf (" query=%f;%s;%s;;", query_val,
-                                        ((metric == METRIC_QUERY_RESULT) && warning_range) ? warning_range : "",
-                                        ((metric == METRIC_QUERY_RESULT) && critical_range) ? critical_range : "");
-                printf (" querytime=%fs;%s;%s;0;", query_time,
-                                ((metric == METRIC_QUERY_TIME) && warning_range) ? warning_range : "",
-                                ((metric == METRIC_QUERY_TIME) && critical_range) ? critical_range : "");
-        }
-        printf ("\n");
+        }
+
+        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;
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
+check_dbi_config_wrapper process_arguments(int argc, char **argv) {
 
         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'},
-                {"metric", required_argument, 0, 'm'},
-                {"driver", required_argument, 0, 'd'},
-                {"option", required_argument, 0, 'o'},
-                {"query", required_argument, 0, 'q'},
-                {"database", required_argument, 0, 'D'},
-                {0, 0, 0, 0}
+        static struct option longopts[] = {STD_LONG_OPTS,
+
+                                                                           {"expect", required_argument, 0, 'e'},
+                                                                           {"regex", required_argument, 0, 'r'},
+                                                                           {"regexi", required_argument, 0, 'R'},
+                                                                           {"metric", required_argument, 0, 'm'},
+                                                                           {"driver", required_argument, 0, 'd'},
+                                                                           {"option", required_argument, 0, 'o'},
+                                                                           {"query", required_argument, 0, 'q'},
+                                                                           {"database", required_argument, 0, 'D'},
+                                                                           {0, 0, 0, 0}};
+
+        check_dbi_config_wrapper result = {
+                .config = check_dbi_config_init(),
+                .errorcode = OK,
         };
+        int option_char;
+        while (true) {
+                option_char = getopt_long(argc, argv, "Vvht:c:w:e:r:R:m:H:d:o:q:D:", longopts, &option);
 
-        while (1) {
-                c = getopt_long (argc, argv, "Vvht:c:w:e:r:R:m:H:d:o:q:D:",
-                                longopts, &option);
-
-                if (c == EOF)
+                if (option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case '?':     /* usage */
-                        usage5 ();
-                case 'h':     /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':     /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-
-                case 'c':     /* critical range */
-                        critical_range = optarg;
-                        type = TYPE_NUMERIC;
+                switch (option_char) {
+                case '?': /* usage */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+
+                case 'c': /* critical range */
+                        result.config.critical_range = optarg;
+                        result.config.type = TYPE_NUMERIC;
                         break;
-                case 'w':     /* warning range */
-                        warning_range = optarg;
-                        type = TYPE_NUMERIC;
+                case 'w': /* warning range */
+                        result.config.warning_range = optarg;
+                        result.config.type = TYPE_NUMERIC;
                         break;
                 case 'e':
-                        expect = optarg;
-                        type = TYPE_STRING;
+                        result.config.expect = optarg;
+                        result.config.type = TYPE_STRING;
                         break;
                 case 'R':
-                        expect_re_cflags = REG_ICASE;
+                        result.config.expect_re_cflags = REG_ICASE;
                         /* fall through */
-                case 'r':
-                        {
-                                int err;
-
-                                expect_re_cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-                                expect_re_str = optarg;
-                                type = TYPE_STRING;
-
-                                err = regcomp (&expect_re, expect_re_str, expect_re_cflags);
-                                if (err) {
-                                        char errmsg[1024];
-                                        regerror (err, &expect_re, errmsg, sizeof (errmsg));
-                                        printf ("ERROR - failed to compile regular expression: %s\n",
-                                                        errmsg);
-                                        return ERROR;
-                                }
-                                break;
+                case 'r': {
+                        int err;
+
+                        result.config.expect_re_cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
+                        result.config.expect_re_str = optarg;
+                        result.config.type = TYPE_STRING;
+
+                        regex_t expect_re = {};
+                        err = regcomp(&expect_re, result.config.expect_re_str, result.config.expect_re_cflags);
+                        if (err) {
+                                char errmsg[1024];
+                                regerror(err, &expect_re, errmsg, sizeof(errmsg));
+                                printf("ERROR - failed to compile regular expression: %s\n", errmsg);
+
+                                result.errorcode = ERROR;
+                                return result;
                         }
+                        break;
+                }
 
                 case 'm':
-                        if (! strcasecmp (optarg, "CONN_TIME"))
-                                metric = METRIC_CONN_TIME;
-                        else if (! strcasecmp (optarg, "SERVER_VERSION"))
-                                metric = METRIC_SERVER_VERSION;
-                        else if (! strcasecmp (optarg, "QUERY_RESULT"))
-                                metric = METRIC_QUERY_RESULT;
-                        else if (! strcasecmp (optarg, "QUERY_TIME"))
-                                metric = METRIC_QUERY_TIME;
-                        else
-                                usage2 (_("Invalid metric"), optarg);
+                        if (!strcasecmp(optarg, "CONN_TIME")) {
+                                result.config.metric = METRIC_CONN_TIME;
+                        } else if (!strcasecmp(optarg, "SERVER_VERSION")) {
+                                result.config.metric = METRIC_SERVER_VERSION;
+                        } else if (!strcasecmp(optarg, "QUERY_RESULT")) {
+                                result.config.metric = METRIC_QUERY_RESULT;
+                        } else if (!strcasecmp(optarg, "QUERY_TIME")) {
+                                result.config.metric = METRIC_QUERY_TIME;
+                        } else {
+                                usage2(_("Invalid metric"), optarg);
+                        }
                         break;
-                case 't':     /* timeout */
-                        if (!is_intnonneg (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
-                        else
-                                timeout_interval = atoi (optarg);
+                case 't': /* timeout */
+                        if (!is_intnonneg(optarg)) {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        } else {
+                                timeout_interval = atoi(optarg);
+                        }
 
                         break;
-                case 'H':     /* host */
-                        if (!is_host (optarg))
-                                usage2 (_("Invalid hostname/address"), optarg);
-                        else
-                                host = optarg;
+                case 'H': /* host */
+                        if (!is_host(optarg)) {
+                                usage2(_("Invalid hostname/address"), optarg);
+                        } else {
+                                result.config.host = optarg;
+                        }
                         break;
                 case 'v':
                         verbose++;
                         break;
 
                 case 'd':
-                        np_dbi_driver = optarg;
+                        result.config.dbi_driver = optarg;
                         break;
-                case 'o':
-                        {
-                                driver_option_t *new;
-
-                                char *k, *v;
+                case 'o': {
+                        driver_option_t *new = NULL;
 
-                                k = optarg;
-                                v = strchr (k, (int)'=');
+                        char *key = optarg;
+                        char *value = strchr(key, '=');
 
-                                if (! v)
-                                        usage2 (_("Option must be '<key>=<value>'"), optarg);
+                        if (!value) {
+                                usage2(_("Option must be '<key>=<value>'"), optarg);
+                        }
 
-                                *v = '\0';
-                                ++v;
+                        *value = '\0';
+                        ++value;
 
-                                new = realloc (np_dbi_options,
-                                                (np_dbi_options_num + 1) * sizeof (*new));
-                                if (! new) {
-                                        printf ("UNKNOWN - failed to reallocate memory\n");
-                                        exit (STATE_UNKNOWN);
-                                }
+                        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);
+                        }
 
-                                np_dbi_options = new;
-                                new = np_dbi_options + np_dbi_options_num;
-                                ++np_dbi_options_num;
+                        result.config.dbi_options = new;
+                        new = result.config.dbi_options + result.config.dbi_options_num;
+                        result.config.dbi_options_num++;
 
-                                new->key = k;
-                                new->value = v;
-                        }
-                        break;
+                        new->key = key;
+                        new->value = value;
+                } break;
                 case 'q':
-                        np_dbi_query = optarg;
+                        result.config.dbi_query = optarg;
                         break;
                 case 'D':
-                        np_dbi_database = optarg;
+                        result.config.dbi_database = optarg;
                         break;
                 }
         }
 
-        set_thresholds (&dbi_thresholds, warning_range, critical_range);
+        set_thresholds(&result.config.dbi_thresholds, result.config.warning_range, result.config.critical_range);
 
-        return validate_arguments ();
+        return validate_arguments(result);
 }
 
-int
-validate_arguments ()
-{
-        if (! np_dbi_driver)
-                usage ("Must specify a DBI driver");
+check_dbi_config_wrapper validate_arguments(check_dbi_config_wrapper config_wrapper) {
+        if (!config_wrapper.config.dbi_driver) {
+                usage("Must specify a DBI driver");
+        }
 
-        if (((metric == METRIC_QUERY_RESULT) || (metric == METRIC_QUERY_TIME))
-                        && (! np_dbi_query))
-                usage ("Must specify a query to execute (metric == QUERY_RESULT)");
+        if (((config_wrapper.config.metric == METRIC_QUERY_RESULT) || (config_wrapper.config.metric == METRIC_QUERY_TIME)) &&
+                (!config_wrapper.config.dbi_query)) {
+                usage("Must specify a query to execute (metric == QUERY_RESULT)");
+        }
 
-        if ((metric != METRIC_CONN_TIME)
-                        && (metric != METRIC_SERVER_VERSION)
-                        && (metric != METRIC_QUERY_RESULT)
-                        && (metric != METRIC_QUERY_TIME))
-                usage ("Invalid metric specified");
+        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)) {
+                usage("Invalid metric specified");
+        }
 
-        if (expect && (warning_range || critical_range || expect_re_str))
-                usage ("Do not mix -e and -w/-c/-r/-R");
+        if (config_wrapper.config.expect && (config_wrapper.config.warning_range || config_wrapper.config.critical_range || config_wrapper.config.expect_re_str)) {
+                usage("Do not mix -e and -w/-c/-r/-R");
+        }
 
-        if (expect_re_str && (warning_range || critical_range || expect))
-                usage ("Do not mix -r/-R and -w/-c/-e");
+        if (config_wrapper.config.expect_re_str && (config_wrapper.config.warning_range || config_wrapper.config.critical_range || config_wrapper.config.expect)) {
+                usage("Do not mix -r/-R and -w/-c/-e");
+        }
 
-        if (expect && (metric != METRIC_QUERY_RESULT))
-                usage ("Option -e requires metric QUERY_RESULT");
+        if (config_wrapper.config.expect && (config_wrapper.config.metric != METRIC_QUERY_RESULT)) {
+                usage("Option -e requires metric QUERY_RESULT");
+        }
 
-        if (expect_re_str && (metric != METRIC_QUERY_RESULT))
-                usage ("Options -r/-R require metric QUERY_RESULT");
+        if (config_wrapper.config.expect_re_str && (config_wrapper.config.metric != METRIC_QUERY_RESULT)) {
+                usage("Options -r/-R require metric QUERY_RESULT");
+        }
 
-        return OK;
+        config_wrapper.errorcode = OK;
+        return config_wrapper;
 }
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-        printf (COPYRIGHT, copyright, email);
+        printf(COPYRIGHT, copyright, email);
 
-        printf (_("This program connects to an (SQL) database using DBI and checks the\n"
-                        "specified metric against threshold levels. The default metric is\n"
-                        "the result of the specified query.\n"));
+        printf(_("This program connects to an (SQL) database using DBI and checks the\n"
+                         "specified metric against threshold levels. The default metric is\n"
+                         "the result of the specified query.\n"));
 
-        printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
+        printf(UT_HELP_VRSN);
 /* include this conditionally to avoid 'zero-length printf format string'
  * compiler warnings */
 #ifdef NP_EXTRA_OPTS
-        printf (UT_EXTRA_OPTS);
+        printf(UT_EXTRA_OPTS);
 #endif
-        printf ("\n");
-
-        printf (" %s\n", "-d, --driver=STRING");
-        printf ("    %s\n", _("DBI driver to use"));
-        printf (" %s\n", "-o, --option=STRING");
-        printf ("    %s\n", _("DBI driver options"));
-        printf (" %s\n", "-q, --query=STRING");
-        printf ("    %s\n", _("query to execute"));
-        printf ("\n");
-
-        printf (UT_WARN_CRIT_RANGE);
-        printf (" %s\n", "-e, --expect=STRING");
-        printf ("    %s\n", _("String to expect as query result"));
-        printf ("    %s\n", _("Do not mix with -w, -c, -r, or -R!"));
-        printf (" %s\n", "-r, --regex=REGEX");
-        printf ("    %s\n", _("Extended POSIX regular expression to check query result against"));
-        printf ("    %s\n", _("Do not mix with -w, -c, -e, or -R!"));
-        printf (" %s\n", "-R, --regexi=REGEX");
-        printf ("    %s\n", _("Case-insensitive extended POSIX regex to check query result against"));
-        printf ("    %s\n", _("Do not mix with -w, -c, -e, or -r!"));
-        printf (" %s\n", "-m, --metric=METRIC");
-        printf ("    %s\n", _("Metric to check thresholds against. Available metrics:"));
-        printf ("    CONN_TIME    - %s\n", _("time used for setting up the database connection"));
-        printf ("    QUERY_RESULT - %s\n", _("result (first column of first row) of the query"));
-        printf ("    QUERY_TIME   - %s\n", _("time used to execute the query"));
-        printf ("                   %s\n", _("(ignore the query result)"));
-        printf ("\n");
-
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-        printf (UT_VERBOSE);
-
-        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)."));
-
-        printf (" %s\n", _("This plugin connects to an (SQL) database using libdbi and, optionally,"));
-        printf (" %s\n", _("executes the specified query. The first column of the first row of the"));
-        printf (" %s\n", _("result will be parsed and, in QUERY_RESULT mode, compared with the"));
-        printf (" %s\n", _("warning and critical ranges. The result from the query has to be numeric"));
-        printf (" %s\n\n", _("(strings representing numbers are fine)."));
-
-        printf (" %s\n", _("The number and type of required DBI driver options depends on the actual"));
-        printf (" %s\n", _("driver. See its documentation at http://libdbi-drivers.sourceforge.net/"));
-        printf (" %s\n\n", _("for details."));
-
-        printf (" %s\n", _("Examples:"));
-        printf ("  check_dbi -d pgsql -o username=postgres -m QUERY_RESULT \\\n");
-        printf ("    -q 'SELECT COUNT(*) FROM pg_stat_activity' -w 5 -c 10\n");
-        printf ("  Warning if more than five connections; critical if more than ten.\n\n");
-
-        printf ("  check_dbi -d mysql -H localhost -o username=user -o password=secret \\\n");
-        printf ("    -q 'SELECT COUNT(*) FROM logged_in_users -w 5:20 -c 0:50\n");
-        printf ("  Warning if less than 5 or more than 20 users are logged in; critical\n");
-        printf ("  if more than 50 users.\n\n");
-
-        printf ("  check_dbi -d firebird -o username=user -o password=secret -o dbname=foo \\\n");
-        printf ("    -m CONN_TIME -w 0.5 -c 2\n");
-        printf ("  Warning if connecting to the database takes more than half of a second;\n");
-        printf ("  critical if it takes more than 2 seconds.\n\n");
-
-        printf ("  check_dbi -d mysql -H localhost -o username=user \\\n");
-        printf ("    -q 'SELECT concat(@@version, \" \", @@version_comment)' \\\n");
-        printf ("    -r '^5\\.[01].*MySQL Enterprise Server'\n");
-        printf ("  Critical if the database server is not a MySQL enterprise server in either\n");
-        printf ("  version 5.0.x or 5.1.x.\n\n");
-
-        printf ("  check_dbi -d pgsql -u username=user -m SERVER_VERSION \\\n");
-        printf ("    -w 090000:090099 -c 090000:090199\n");
-        printf ("  Warn if the PostgreSQL server version is not 9.0.x; critical if the version\n");
-        printf ("  is less than 9.x or higher than 9.1.x.\n");
-
-        printf (UT_SUPPORT);
+        printf("\n");
+
+        printf(" %s\n", "-d, --driver=STRING");
+        printf("    %s\n", _("DBI driver to use"));
+        printf(" %s\n", "-o, --option=STRING");
+        printf("    %s\n", _("DBI driver options"));
+        printf(" %s\n", "-q, --query=STRING");
+        printf("    %s\n", _("query to execute"));
+        printf(" %s\n", "-H STRING");
+        printf("    %s\n", _("target database host"));
+        printf("\n");
+
+        printf(UT_WARN_CRIT_RANGE);
+        printf(" %s\n", "-e, --expect=STRING");
+        printf("    %s\n", _("String to expect as query result"));
+        printf("    %s\n", _("Do not mix with -w, -c, -r, or -R!"));
+        printf(" %s\n", "-r, --regex=REGEX");
+        printf("    %s\n", _("Extended POSIX regular expression to check query result against"));
+        printf("    %s\n", _("Do not mix with -w, -c, -e, or -R!"));
+        printf(" %s\n", "-R, --regexi=REGEX");
+        printf("    %s\n", _("Case-insensitive extended POSIX regex to check query result against"));
+        printf("    %s\n", _("Do not mix with -w, -c, -e, or -r!"));
+        printf(" %s\n", "-m, --metric=METRIC");
+        printf("    %s\n", _("Metric to check thresholds against. Available metrics:"));
+        printf("    CONN_TIME    - %s\n", _("time used for setting up the database connection"));
+        printf("    QUERY_RESULT - %s\n", _("result (first column of first row) of the query"));
+        printf("    QUERY_TIME   - %s\n", _("time used to execute the query"));
+        printf("                   %s\n", _("(ignore the query result)"));
+        printf("\n");
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf(UT_VERBOSE);
+
+        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)."));
+
+        printf(" %s\n", _("This plugin connects to an (SQL) database using libdbi and, optionally,"));
+        printf(" %s\n", _("executes the specified query. The first column of the first row of the"));
+        printf(" %s\n", _("result will be parsed and, in QUERY_RESULT mode, compared with the"));
+        printf(" %s\n", _("warning and critical ranges. The result from the query has to be numeric"));
+        printf(" %s\n\n", _("(strings representing numbers are fine)."));
+
+        printf(" %s\n", _("The number and type of required DBI driver options depends on the actual"));
+        printf(" %s\n", _("driver. See its documentation at http://libdbi-drivers.sourceforge.net/"));
+        printf(" %s\n\n", _("for details."));
+
+        printf(" %s\n", _("Examples:"));
+        printf("  check_dbi -d pgsql -o username=postgres -m QUERY_RESULT \\\n");
+        printf("    -q 'SELECT COUNT(*) FROM pg_stat_activity' -w 5 -c 10\n");
+        printf("  Warning if more than five connections; critical if more than ten.\n\n");
+
+        printf("  check_dbi -d mysql -H localhost -o username=user -o password=secret \\\n");
+        printf("    -q 'SELECT COUNT(*) FROM logged_in_users -w 5:20 -c 0:50\n");
+        printf("  Warning if less than 5 or more than 20 users are logged in; critical\n");
+        printf("  if more than 50 users.\n\n");
+
+        printf("  check_dbi -d firebird -o username=user -o password=secret -o dbname=foo \\\n");
+        printf("    -m CONN_TIME -w 0.5 -c 2\n");
+        printf("  Warning if connecting to the database takes more than half of a second;\n");
+        printf("  critical if it takes more than 2 seconds.\n\n");
+
+        printf("  check_dbi -d mysql -H localhost -o username=user \\\n");
+        printf("    -q 'SELECT concat(@@version, \" \", @@version_comment)' \\\n");
+        printf("    -r '^5\\.[01].*MySQL Enterprise Server'\n");
+        printf("  Critical if the database server is not a MySQL enterprise server in either\n");
+        printf("  version 5.0.x or 5.1.x.\n\n");
+
+        printf("  check_dbi -d pgsql -u username=user -m SERVER_VERSION \\\n");
+        printf("    -w 090000:090099 -c 090000:090199\n");
+        printf("  Warn if the PostgreSQL server version is not 9.0.x; critical if the version\n");
+        printf("  is less than 9.x or higher than 9.1.x.\n");
+
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -d <DBI driver> [-o <DBI driver option> [...]] [-q <query>]\n", progname);
-        printf (" [-H <host>] [-c <critical range>] [-w <warning range>] [-m <metric>]\n");
-        printf (" [-e <string>] [-r|-R <regex>]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -d <DBI driver> [-o <DBI driver option> [...]] [-q <query>]\n", progname);
+        printf(" [-H <host>] [-c <critical range>] [-w <warning range>] [-m <metric>]\n");
+        printf(" [-e <string>] [-r|-R <regex>]\n");
 }
 
-#define CHECK_IGNORE_ERROR(s) \
-        do { \
-                if (metric != METRIC_QUERY_RESULT) \
-                        return (s); \
-        } while (0)
-
-const char *
-get_field_str (dbi_conn conn, dbi_result res, unsigned short field_type)
-{
+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");
+                printf("CRITICAL - result value is not a string\n");
                 return NULL;
         }
 
-        str = dbi_result_get_string_idx (res, 1);
-        if ((! str) || (strcmp (str, "ERROR") == 0)) {
-                CHECK_IGNORE_ERROR (NULL);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch string value");
+        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;
         }
 
-        if ((verbose && (type == TYPE_STRING)) || (verbose > 2))
-                printf ("Query returned string '%s'\n", str);
+        if ((verbose && (type == TYPE_STRING)) || (verbose > 2)) {
+                printf("Query returned string '%s'\n", str);
+        }
         return str;
 }
 
-double
-get_field (dbi_conn conn, dbi_result res, unsigned short *field_type)
-{
+double get_field(dbi_conn conn, dbi_result res, unsigned short *field_type, mp_dbi_metric metric, mp_dbi_type type) {
         double val = NAN;
 
         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) {
+                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) {
                 const char *val_str;
                 char *endptr = NULL;
 
-                val_str = get_field_str (conn, res, *field_type);
-                if (! val_str) {
-                        CHECK_IGNORE_ERROR (NAN);
+                val_str = get_field_str(conn, res, *field_type, metric, type);
+                if (!val_str) {
+                        if (metric != METRIC_QUERY_RESULT) {
+                                return NAN;
+                        }
                         *field_type = DBI_TYPE_ERROR;
                         return NAN;
                 }
 
-                val = strtod (val_str, &endptr);
+                val = strtod(val_str, &endptr);
                 if (endptr == val_str) {
-                        CHECK_IGNORE_ERROR (NAN);
-                        printf ("CRITICAL - result value is not a numeric: %s\n", val_str);
+                        if (metric != METRIC_QUERY_RESULT) {
+                                return NAN;
+                        }
+                        printf("CRITICAL - result value is not a numeric: %s\n", val_str);
                         *field_type = DBI_TYPE_ERROR;
                         return NAN;
                 }
-                else if ((endptr != NULL) && (*endptr != '\0')) {
-                        if (verbose)
-                                printf ("Garbage after value: %s\n", endptr);
+                if ((endptr != NULL) && (*endptr != '\0')) {
+                        if (verbose) {
+                                printf("Garbage after value: %s\n", endptr);
+                        }
                 }
-        }
-        else {
-                CHECK_IGNORE_ERROR (NAN);
-                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);
+        } else {
+                if (metric != METRIC_QUERY_RESULT) {
+                        return NAN;
+                }
+                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;
 }
 
-double
-get_query_result (dbi_conn conn, dbi_result res, const char **res_val_str, double *res_val)
-{
+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) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch rows");
+        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) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                printf ("WARNING - no rows returned\n");
+        if (dbi_result_get_numrows(res) < 1) {
+                if (metric != METRIC_QUERY_RESULT) {
+                        return STATE_OK;
+                }
+                printf("WARNING - no rows returned\n");
                 return STATE_WARNING;
         }
 
-        if (dbi_result_get_numfields (res) == DBI_FIELD_ERROR) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch fields");
+        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) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                printf ("WARNING - no fields returned\n");
+        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) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch first row");
+        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;
         }
 
-        field_type = dbi_result_get_field_type_idx (res, 1);
+        field_type = dbi_result_get_field_type_idx(res, 1);
         if (field_type != DBI_TYPE_ERROR) {
-                if (type == TYPE_STRING)
+                if (type == TYPE_STRING) {
                         /* the value will be freed in dbi_result_free */
-                        *res_val_str = strdup (get_field_str (conn, res, field_type));
-                else
-                        val = get_field (conn, res, &field_type);
+                        *res_val_str = strdup(get_field_str(conn, res, field_type, metric, type));
+                } else {
+                        val = get_field(conn, res, &field_type, metric, type);
+                }
         }
 
         *res_val = val;
 
         if (field_type == DBI_TYPE_ERROR) {
-                CHECK_IGNORE_ERROR (STATE_OK);
-                np_dbi_print_error (conn, "CRITICAL - failed to fetch data");
+                if (metric != METRIC_QUERY_RESULT) {
+                        return STATE_OK;
+                }
+                np_dbi_print_error(conn, "CRITICAL - failed to fetch data");
                 return STATE_CRITICAL;
         }
 
-        dbi_result_free (res);
+        dbi_result_free(res);
         return STATE_OK;
 }
 
-#undef CHECK_IGNORE_ERROR
-
-int
-do_query (dbi_conn conn, const char **res_val_str, double *res_val, double *res_time)
-{
+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, timeval_end;
-        int status = STATE_OK;
+        struct timeval timeval_start;
+        struct timeval timeval_end;
+        mp_state_enum status = STATE_OK;
 
-        assert (np_dbi_query);
+        assert(np_dbi_query);
 
-        if (verbose)
-                printf ("Executing query '%s'\n", np_dbi_query);
+        if (verbose) {
+                printf("Executing query '%s'\n", np_dbi_query);
+        }
 
-        gettimeofday (&timeval_start, NULL);
+        gettimeofday(&timeval_start, NULL);
 
-        res = dbi_conn_query (conn, np_dbi_query);
-        if (! res) {
-                np_dbi_print_error (conn, "CRITICAL - failed to execute query '%s'", np_dbi_query);
+        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;
         }
 
-        status = get_query_result (conn, res, res_val_str, res_val);
+        status = get_query_result(conn, res, res_val_str, res_val, metric, type);
 
-        gettimeofday (&timeval_end, NULL);
-        *res_time = timediff (timeval_start, timeval_end);
+        gettimeofday(&timeval_end, NULL);
+        *res_time = timediff(timeval_start, timeval_end);
 
-        if (verbose)
-                printf ("Time elapsed: %f\n", *res_time);
+        if (verbose) {
+                printf("Time elapsed: %f\n", *res_time);
+        }
 
         return status;
 }
 
-double
-timediff (struct timeval start, struct timeval end)
-{
+double timediff(struct timeval start, struct timeval end) {
         double diff;
 
         while (start.tv_usec > end.tv_usec) {
                 --end.tv_sec;
                 end.tv_usec += 1000000;
         }
-        diff = (double)(end.tv_sec - start.tv_sec)
-                + (double)(end.tv_usec - start.tv_usec) / 1000000.0;
+        diff = (double)(end.tv_sec - start.tv_sec) + (double)(end.tv_usec - start.tv_usec) / 1000000.0;
         return diff;
 }
 
-void
-np_dbi_print_error (dbi_conn conn, char *fmt, ...)
-{
+void np_dbi_print_error(dbi_conn conn, char *fmt, ...) {
         const char *errmsg = NULL;
         va_list ap;
 
-        va_start (ap, fmt);
+        va_start(ap, fmt);
 
-        dbi_conn_error (conn, &errmsg);
-        vprintf (fmt, ap);
-        printf (": %s\n", errmsg);
+        dbi_conn_error(conn, &errmsg);
+        vprintf(fmt, ap);
+        printf(": %s\n", errmsg);
 
-        va_end (ap);
+        va_end(ap);
 }
-
diff --git a/plugins/check_dbi.d/config.h b/plugins/check_dbi.d/config.h
new file mode 100644
index 00000000..f6f0d7b3
--- /dev/null
+++ b/plugins/check_dbi.d/config.h
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+#include "../../lib/monitoringplug.h"
+
+typedef enum {
+        METRIC_CONN_TIME,
+        METRIC_SERVER_VERSION,
+        METRIC_QUERY_RESULT,
+        METRIC_QUERY_TIME,
+} mp_dbi_metric;
+
+typedef enum {
+        TYPE_NUMERIC,
+        TYPE_STRING,
+} mp_dbi_type;
+
+typedef struct {
+        char *key;
+        char *value;
+} driver_option_t;
+
+typedef struct {
+        char *dbi_driver;
+        char *host;
+        driver_option_t *dbi_options;
+        size_t dbi_options_num;
+        char *dbi_database;
+        char *dbi_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_config;
+
+check_dbi_config check_dbi_config_init() {
+        check_dbi_config tmp = {
+                .dbi_driver = NULL,
+                .host = NULL,
+                .dbi_options = NULL,
+                .dbi_options_num = 0,
+                .dbi_database = NULL,
+                .dbi_query = NULL,
+
+                .expect = NULL,
+                .expect_re_str = NULL,
+                .expect_re_cflags = 0,
+                .metric = METRIC_QUERY_RESULT,
+                .type = TYPE_NUMERIC,
+
+                .warning_range = NULL,
+                .critical_range = NULL,
+                .dbi_thresholds = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_dig.c b/plugins/check_dig.c
index be7a6101..d0903be2 100644
--- a/plugins/check_dig.c
+++ b/plugins/check_dig.c
@@ -1,30 +1,30 @@
 /*****************************************************************************
-* 
-* Monitoring check_dig plugin
-* 
-* License: GPL
-* Copyright (c) 2002-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_dig plugin
-* 
-* 
-* 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_dig plugin
+ *
+ * License: GPL
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_dig plugin
+ *
+ *
+ * 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/>.
+ *
+ *
+ *****************************************************************************/
 
 /* Hackers note:
  *  There are typecasts to (char *) from _("foo bar") in this file.
@@ -33,7 +33,7 @@
  *  because on some architectures those strings are in non-writable memory */
 
 const char *progname = "check_dig";
-const char *copyright = "2002-2008";
+const char *copyright = "2002-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -41,340 +41,319 @@ const char *email = "devel@monitoring-plugins.org";
 #include "utils.h"
 #include "runcmd.h"
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-
-#define UNDEFINED 0
-#define DEFAULT_PORT 53
-#define DEFAULT_TRIES 2
-
-char *query_address = NULL;
-char *record_type = "A";
-char *expected_address = NULL;
-char *dns_server = NULL;
-char *dig_args = "";
-char *query_transport = "";
-bool verbose = false;
-int server_port = DEFAULT_PORT;
-int number_tries = DEFAULT_TRIES;
-double warning_interval = UNDEFINED;
-double critical_interval = UNDEFINED;
-struct timeval tv;
-
-int
-main (int argc, char **argv)
-{
-  char *command_line;
-  output chld_out, chld_err;
-  char *msg = NULL;
-  size_t i;
-  char *t;
-  long microsec;
-  double elapsed_time;
-  int result = STATE_UNKNOWN;
-  int timeout_interval_dig;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  /* Set signal handling and alarm */
-  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR)
-    usage_va(_("Cannot catch SIGALRM"));
-
-  /* Parse extra opts if any */
-  argv=np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == ERROR)
-    usage_va(_("Could not parse arguments"));
-
-  /* dig applies the timeout to each try, so we need to work around this */
-  timeout_interval_dig = timeout_interval / number_tries + number_tries;
-
-  /* get the command to run */
-  xasprintf (&command_line, "%s %s %s -p %d @%s %s %s +retry=%d +time=%d",
-            PATH_TO_DIG, dig_args, query_transport, server_port, dns_server, query_address, record_type, number_tries, timeout_interval_dig);
-
-  alarm (timeout_interval);
-  gettimeofday (&tv, NULL);
-
-  if (verbose) {
-    printf ("%s\n", command_line);
-    if(expected_address != NULL) {
-      printf (_("Looking for: '%s'\n"), expected_address);
-    } else {
-      printf (_("Looking for: '%s'\n"), query_address);
-    }
-  }
-
-  /* run the command */
-  if(np_runcmd(command_line, &chld_out, &chld_err, 0) != 0) {
-    result = STATE_WARNING;
-    msg = (char *)_("dig returned an error status");
-  }
-
-  for(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:")) {
-
-      /* loop through the whole 'ANSWER SECTION' */
-      for(; i < chld_out.lines; i++) {
-        /* get the host address */
-        if (verbose)
-          printf ("%s\n", chld_out.line[i]);
-
-        if (strcasestr (chld_out.line[i], (expected_address == NULL ? query_address : expected_address)) != NULL) {
-          msg = chld_out.line[i];
-          result = STATE_OK;
-
-          /* Translate output TAB -> SPACE */
-          t = msg;
-          while ((t = strchr(t, '\t')) != NULL) *t = ' ';
-          break;
-        }
-      }
-
-      if (result == STATE_UNKNOWN) {
-        msg = (char *)_("Server not found in ANSWER SECTION");
-        result = STATE_WARNING;
-      }
-
-      /* we found the answer section, so break out of the loop */
-      break;
-    }
-  }
-
-  if (result == STATE_UNKNOWN) {
-    msg = (char *)_("No ANSWER SECTION found");
-    result = STATE_CRITICAL;
-  }
-
-  /* If we get anything on STDERR, at least set warning */
-  if(chld_err.buflen > 0) {
-    result = max_state(result, STATE_WARNING);
-    if(!msg) for(i = 0; i < chld_err.lines; i++) {
-      msg = strchr(chld_err.line[0], ':');
-      if(msg) {
-        msg++;
-        break;
-      }
-    }
-  }
-
-  microsec = deltime (tv);
-  elapsed_time = (double)microsec / 1.0e6;
-
-  if (critical_interval > UNDEFINED && elapsed_time > critical_interval)
-    result = STATE_CRITICAL;
-
-  else if (warning_interval > UNDEFINED && elapsed_time > warning_interval)
-    result = STATE_WARNING;
-
-  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",
-                    (warning_interval>UNDEFINED ? true:false),
-                    warning_interval,
-                    (critical_interval>UNDEFINED ? true:false),
-            critical_interval,
-            true, 0, false, 0));
-  return result;
+#include "check_dig.d/config.h"
+#include "states.h"
+
+typedef struct {
+        int errorcode;
+        check_dig_config config;
+} check_dig_config_wrapper;
+static check_dig_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_dig_config_wrapper validate_arguments(check_dig_config_wrapper /*config_wrapper*/);
+
+static void print_help(void);
+void print_usage(void);
+
+static int verbose = 0;
+
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        /* Set signal handling and alarm */
+        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
+                usage_va(_("Cannot catch SIGALRM"));
+        }
+
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_dig_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage_va(_("Could not parse arguments"));
+        }
+
+        const check_dig_config config = tmp_config.config;
+
+        /* dig applies the timeout to each try, so we need to work around this */
+        int timeout_interval_dig = ((int)timeout_interval / config.number_tries) + config.number_tries;
+
+        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);
+
+        alarm(timeout_interval);
+        struct timeval start_time;
+        gettimeofday(&start_time, NULL);
+
+        if (verbose) {
+                printf("%s\n", command_line);
+                if (config.expected_address != NULL) {
+                        printf(_("Looking for: '%s'\n"), config.expected_address);
+                } else {
+                        printf(_("Looking for: '%s'\n"), config.query_address);
+                }
+        }
+
+        output chld_out;
+        output chld_err;
+        char *msg = NULL;
+        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");
+        }
+
+        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:")) {
+
+                        /* loop through the whole 'ANSWER SECTION' */
+                        for (; i < chld_out.lines; i++) {
+                                /* get the host address */
+                                if (verbose) {
+                                        printf("%s\n", chld_out.line[i]);
+                                }
+
+                                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;
+
+                                        /* Translate output TAB -> SPACE */
+                                        char *temp = msg;
+                                        while ((temp = strchr(temp, '\t')) != NULL) {
+                                                *temp = ' ';
+                                        }
+                                        break;
+                                }
+                        }
+
+                        if (result == STATE_UNKNOWN) {
+                                msg = (char *)_("Server not found in ANSWER SECTION");
+                                result = STATE_WARNING;
+                        }
+
+                        /* we found the answer section, so break out of the loop */
+                        break;
+                }
+        }
+
+        if (result == STATE_UNKNOWN) {
+                msg = (char *)_("No ANSWER SECTION found");
+                result = STATE_CRITICAL;
+        }
+
+        /* If we get anything on STDERR, at least set warning */
+        if (chld_err.buflen > 0) {
+                result = max_state(result, STATE_WARNING);
+                if (!msg) {
+                        for (size_t i = 0; i < chld_err.lines; i++) {
+                                msg = strchr(chld_err.line[0], ':');
+                                if (msg) {
+                                        msg++;
+                                        break;
+                                }
+                        }
+                }
+        }
+
+        long microsec = deltime(start_time);
+        double elapsed_time = (double)microsec / 1.0e6;
+
+        if (config.critical_interval > UNDEFINED && elapsed_time > config.critical_interval) {
+                result = STATE_CRITICAL;
+        }
+
+        else if (config.warning_interval > UNDEFINED && elapsed_time > config.warning_interval) {
+                result = STATE_WARNING;
+        }
+
+        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));
+        exit(result);
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-  int c;
-
-  int option = 0;
-  static struct option longopts[] = {
-    {"hostname", required_argument, 0, 'H'},
-    {"query_address", required_argument, 0, 'l'},
-    {"warning", required_argument, 0, 'w'},
-    {"critical", required_argument, 0, 'c'},
-    {"timeout", required_argument, 0, 't'},
-    {"dig-arguments", required_argument, 0, 'A'},
-    {"verbose", no_argument, 0, 'v'},
-    {"version", no_argument, 0, 'V'},
-    {"help", no_argument, 0, 'h'},
-    {"record_type", required_argument, 0, 'T'},
-    {"expected_address", required_argument, 0, 'a'},
-    {"port", required_argument, 0, 'p'},
-    {"use-ipv4", no_argument, 0, '4'},
-    {"use-ipv6", no_argument, 0, '6'},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return ERROR;
-
-  while (1) {
-    c = getopt_long (argc, argv, "hVvt:l:H:w:c:T:p:a:A:46", longopts, &option);
-
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case 'h':                 /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case 'V':                 /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'H':                 /* hostname */
-      host_or_die(optarg);
-      dns_server = optarg;
-      break;
-    case 'p':                 /* server port */
-      if (is_intpos (optarg)) {
-        server_port = atoi (optarg);
-      }
-      else {
-        usage_va(_("Port must be a positive integer - %s"), optarg);
-      }
-      break;
-    case 'l':                 /* address to lookup */
-      query_address = optarg;
-      break;
-    case 'w':                 /* warning */
-      if (is_nonnegative (optarg)) {
-        warning_interval = strtod (optarg, NULL);
-      }
-      else {
-        usage_va(_("Warning interval must be a positive integer - %s"), optarg);
-      }
-      break;
-    case 'c':                 /* critical */
-      if (is_nonnegative (optarg)) {
-        critical_interval = strtod (optarg, NULL);
-      }
-      else {
-        usage_va(_("Critical interval must be a positive integer - %s"), optarg);
-      }
-      break;
-    case 't':                 /* timeout */
-      if (is_intnonneg (optarg)) {
-        timeout_interval = atoi (optarg);
-      }
-      else {
-        usage_va(_("Timeout interval must be a positive integer - %s"), optarg);
-      }
-      break;
-    case 'A':                 /* dig arguments */
-      dig_args = strdup(optarg);
-      break;
-    case 'v':                 /* verbose */
-      verbose = true;
-      break;
-    case 'T':
-      record_type = optarg;
-      break;
-    case 'a':
-      expected_address = optarg;
-      break;
-    case '4':
-      query_transport = "-4";
-      break;
-    case '6':
-      query_transport = "-6";
-      break;
-    default:                  /* usage5 */
-      usage5();
-    }
-  }
-
-  c = optind;
-  if (dns_server == NULL) {
-    if (c < argc) {
-      host_or_die(argv[c]);
-      dns_server = argv[c];
-    }
-    else {
-      if (strcmp(query_transport,"-6") == 0)
-        dns_server = strdup("::1");
-      else
-        dns_server = strdup ("127.0.0.1");
-    }
-  }
-
-  return validate_arguments ();
+check_dig_config_wrapper process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"query_address", required_argument, 0, 'l'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"dig-arguments", required_argument, 0, 'A'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"record_type", required_argument, 0, 'T'},
+                                                                           {"expected_address", required_argument, 0, 'a'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {0, 0, 0, 0}};
+
+        check_dig_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_dig_config_init(),
+        };
+
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
+
+        int option = 0;
+        while (true) {
+                int option_index = getopt_long(argc, argv, "hVvt:l:H:w:c:T:p:a:A:46", longopts, &option);
+
+                if (option_index == -1 || option_index == EOF) {
+                        break;
+                }
+
+                switch (option_index) {
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'H': /* hostname */
+                        host_or_die(optarg);
+                        result.config.dns_server = optarg;
+                        break;
+                case 'p': /* server port */
+                        if (is_intpos(optarg)) {
+                                result.config.server_port = atoi(optarg);
+                        } else {
+                                usage_va(_("Port must be a positive integer - %s"), optarg);
+                        }
+                        break;
+                case 'l': /* address to lookup */
+                        result.config.query_address = optarg;
+                        break;
+                case 'w': /* warning */
+                        if (is_nonnegative(optarg)) {
+                                result.config.warning_interval = strtod(optarg, NULL);
+                        } else {
+                                usage_va(_("Warning interval must be a positive integer - %s"), optarg);
+                        }
+                        break;
+                case 'c': /* critical */
+                        if (is_nonnegative(optarg)) {
+                                result.config.critical_interval = strtod(optarg, NULL);
+                        } else {
+                                usage_va(_("Critical interval must be a positive integer - %s"), optarg);
+                        }
+                        break;
+                case 't': /* timeout */
+                        if (is_intnonneg(optarg)) {
+                                timeout_interval = atoi(optarg);
+                        } else {
+                                usage_va(_("Timeout interval must be a positive integer - %s"), optarg);
+                        }
+                        break;
+                case 'A': /* dig arguments */
+                        result.config.dig_args = strdup(optarg);
+                        break;
+                case 'v': /* verbose */
+                        verbose++;
+                        break;
+                case 'T':
+                        result.config.record_type = optarg;
+                        break;
+                case 'a':
+                        result.config.expected_address = optarg;
+                        break;
+                case '4':
+                        result.config.query_transport = "-4";
+                        break;
+                case '6':
+                        result.config.query_transport = "-6";
+                        break;
+                default: /* usage5 */
+                        usage5();
+                }
+        }
+
+        int index = optind;
+        if (result.config.dns_server == NULL) {
+                if (index < argc) {
+                        host_or_die(argv[index]);
+                        result.config.dns_server = argv[index];
+                } else {
+                        if (strcmp(result.config.query_transport, "-6") == 0) {
+                                result.config.dns_server = strdup("::1");
+                        } else {
+                                result.config.dns_server = strdup("127.0.0.1");
+                        }
+                }
+        }
+
+        return validate_arguments(result);
 }
 
-
-
-int
-validate_arguments (void)
-{
-  if (query_address != NULL)
-    return OK;
-  else
-    return ERROR;
+check_dig_config_wrapper validate_arguments(check_dig_config_wrapper config_wrapper) {
+        if (config_wrapper.config.query_address == NULL) {
+                config_wrapper.errorcode = ERROR;
+        }
+        return config_wrapper;
 }
 
+void print_help(void) {
+        char *myport;
 
+        xasprintf(&myport, "%d", DEFAULT_PORT);
 
-void
-print_help (void)
-{
-  char *myport;
+        print_revision(progname, NP_VERSION);
 
-  xasprintf (&myport, "%d", DEFAULT_PORT);
+        printf("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
+        printf(COPYRIGHT, copyright, email);
 
-  print_revision (progname, NP_VERSION);
+        printf(_("This plugin tests the DNS service on the specified host using dig"));
 
-  printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("\n\n");
 
-  printf (_("This plugin tests the DNS service on the specified host using dig"));
+        print_usage();
 
-  printf ("\n\n");
+        printf(UT_HELP_VRSN);
 
-  print_usage ();
+        printf(UT_EXTRA_OPTS);
 
-  printf (UT_HELP_VRSN);
+        printf(UT_HOST_PORT, 'p', myport);
 
-  printf (UT_EXTRA_OPTS);
+        printf(" %s\n", "-4, --use-ipv4");
+        printf("    %s\n", _("Force dig to only use IPv4 query transport"));
+        printf(" %s\n", "-6, --use-ipv6");
+        printf("    %s\n", _("Force dig to only use IPv6 query transport"));
+        printf(" %s\n", "-l, --query_address=STRING");
+        printf("    %s\n", _("Machine name to lookup"));
+        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", _("was in -l"));
+        printf(" %s\n", "-A, --dig-arguments=STRING");
+        printf("    %s\n", _("Pass STRING as argument(s) to dig"));
+        printf(UT_WARN_CRIT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_VERBOSE);
 
-  printf (UT_HOST_PORT, 'p', myport);
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "check_dig -H DNSSERVER -l www.example.com -A \"+tcp\"");
+        printf(" %s\n", "This will send a tcp query to DNSSERVER for www.example.com");
 
-  printf (" %s\n","-4, --use-ipv4");
-  printf ("    %s\n",_("Force dig to only use IPv4 query transport"));
-  printf (" %s\n","-6, --use-ipv6");
-  printf ("    %s\n",_("Force dig to only use IPv6 query transport"));
-  printf (" %s\n","-l, --query_address=STRING");
-  printf ("    %s\n",_("Machine name to lookup"));
-  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",_("was in -l"));
-  printf (" %s\n","-A, --dig-arguments=STRING");
-  printf ("    %s\n",_("Pass STRING as argument(s) to dig"));
-  printf (UT_WARN_CRIT);
-  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-  printf (UT_VERBOSE);
-
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n", "check_dig -H DNSSERVER -l www.example.com -A \"+tcp\"");
-  printf (" %s\n", "This will send a tcp query to DNSSERVER for www.example.com");
-
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-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");
+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");
 }
diff --git a/plugins/check_dig.d/config.h b/plugins/check_dig.d/config.h
new file mode 100644
index 00000000..a570b633
--- /dev/null
+++ b/plugins/check_dig.d/config.h
@@ -0,0 +1,40 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+#define UNDEFINED     0
+#define DEFAULT_PORT  53
+#define DEFAULT_TRIES 2
+
+typedef struct {
+        char *query_address;
+        char *record_type;
+        char *expected_address;
+        char *dns_server;
+        char *query_transport;
+        int server_port;
+        char *dig_args;
+        int number_tries;
+
+        double warning_interval;
+        double critical_interval;
+} check_dig_config;
+
+check_dig_config check_dig_config_init() {
+        check_dig_config tmp = {
+                .query_address = NULL,
+                .record_type = "A",
+                .expected_address = NULL,
+                .dns_server = NULL,
+                .query_transport = "",
+                .server_port = DEFAULT_PORT,
+                .dig_args = "",
+                .number_tries = DEFAULT_TRIES,
+
+                .warning_interval = UNDEFINED,
+                .critical_interval = UNDEFINED,
+
+        };
+        return tmp;
+}
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 24de2d45..515ddff0 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -1,1161 +1,1220 @@
 /*****************************************************************************
-*
-* Monitoring check_disk plugin
-*
-* License: GPL
-* Copyright (c) 1999-2008 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_disk plugin
-*
-*
-* 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_disk plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_disk plugin
+ *
+ *
+ * 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_disk";
-const char *program_name = "check_disk";  /* Required for coreutils libs */
-const char *copyright = "1999-2008";
+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>
+#       include <sys/stat.h>
 #endif
+
 #if HAVE_INTTYPES_H
-# include <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>
+#       include <limits.h>
 #endif
+
 #include "regex.h"
 
 #ifdef __CYGWIN__
-# include <windows.h>
-# undef ERROR
-# define ERROR -1
+#       include <windows.h>
+#       undef ERROR
+#       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;
+#ifdef _AIX
+#       pragma alloca
+#endif
 
-/* Linked list of filesystem types to check.
-   If the list is empty, include all types.  */
-static struct regex_list *fs_include_list;
+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 void print_help(void);
+
+static int verbose = 0;
+
+// 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);
 
-static struct name_list *dp_exclude_list;
+#ifdef __CYGWIN__
+        char mountdir[32];
+#endif
 
-static struct parameter_list *path_select_list = NULL;
+        // Parse extra opts if any
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_disk_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        check_disk_config config = tmp_config.config;
+
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
+
+        if (config.erronly) {
+                mp_set_level_of_detail(MP_DETAIL_NON_OK_ONLY);
+        }
+
+        if (!config.path_ignored) {
+                mp_int_fs_list_set_best_match(config.path_select_list, config.mount_list, config.exact_match);
+        }
+
+        // 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. */
+                        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"), elem->name);
+                }
+
+                elem = mp_int_fs_list_get_next(elem);
+        }
+
+        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);
+        }
 
-/* Linked list of mounted filesystems. */
-static struct mount_entry *mount_list;
+        // 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;
+                }
 
-/* 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
-};
+                struct mount_entry *mount_entry = path->best_match;
 
-#ifdef _AIX
-#pragma alloca
+#ifdef __CYGWIN__
+                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) {
+                        mount_entry->me_remote = 1;
+                }
 #endif
 
-int process_arguments (int, char **);
-void print_path (const char *mypath);
-void set_all_thresholds (struct parameter_list *path);
-int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, char *);
-void print_help (void);
-void print_usage (void);
-double calculate_percent(uintmax_t, uintmax_t);
-bool stat_path (struct parameter_list *p);
-void get_stats (struct parameter_list *p, struct fs_usage *fsp);
-void get_path_stats (struct parameter_list *p, struct fs_usage *fsp);
-
-char *exclude_device;
-char *units;
-uintmax_t mult = 1024 * 1024;
-int verbose = 0;
-bool erronly = false;
-bool display_mntp = false;
-bool exact_match = false;
-bool ignore_missing = false;
-bool freespace_ignore_reserved = false;
-bool display_inodes_perfdata = false;
-char *warn_freespace_units = NULL;
-char *crit_freespace_units = NULL;
-char *warn_freespace_percent = NULL;
-char *crit_freespace_percent = NULL;
-char *warn_usedspace_units = NULL;
-char *crit_usedspace_units = NULL;
-char *warn_usedspace_percent = NULL;
-char *crit_usedspace_percent = NULL;
-char *warn_usedinodes_percent = NULL;
-char *crit_usedinodes_percent = NULL;
-char *warn_freeinodes_percent = NULL;
-char *crit_freeinodes_percent = NULL;
-bool path_selected = false;
-bool path_ignored = false;
-char *group = NULL;
-struct stat *stat_buf;
-struct name_list *seen = NULL;
-
-
-int
-main (int argc, char **argv)
-{
-  int result = STATE_UNKNOWN;
-  int disk_result = STATE_UNKNOWN;
-  char *output;
-  char *ignored;
-  char *details;
-  char *perf;
-  char *perf_ilabel;
-  char *preamble = " - free space:";
-  char *ignored_preamble = " - ignored paths:";
-  char *flag_header;
-  int temp_result;
-
-  struct mount_entry *me;
-  struct fs_usage fsp;
-  struct parameter_list *temp_list, *path;
+                /* Remove filesystems already seen */
+                if (np_seen_name(config.seen, mount_entry->me_mountdir)) {
+                        path = mp_int_fs_list_del(&config.path_select_list, path);
+                        continue;
+                }
+
+                if (path->group == NULL) {
+                        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;
+                        }
 
-#ifdef __CYGWIN__
-  char mountdir[32];
-#endif
+                        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;
+                        }
 
-  output = strdup ("");
-  ignored = strdup ("");
-  details = strdup ("");
-  perf = strdup ("");
-  perf_ilabel = strdup ("");
-  stat_buf = malloc(sizeof *stat_buf);
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  mount_list = read_file_system_list (0);
-
-  /* Parse extra opts if any */
-  argv = np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == 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);
-    }
-  }
-
-  if (path_ignored == false) {
-    np_set_best_match(path_select_list, mount_list, exact_match);
-  }
-
-  /* Error if no match found for specified paths */
-  temp_list = path_select_list;
-
-  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);
-      /* 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) {
-      /* 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;
-    }
-  }
-
-  path_select_list = temp_list;
-
-  if (! path_select_list && ignore_missing == true) {
-    result = STATE_OK;
-    if (verbose >= 2) {
-      printf ("None of the provided paths were found\n");
-    }
-  }
-
-  /* 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) {
-      continue;
-    }
+                        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;
+                        }
 
-#ifdef __CYGWIN__
-    if (strncmp(path->name, "/cygdrive/", 10) != 0 || strlen(path->name) > 11)
-        continue;
-    snprintf(mountdir, sizeof(mountdir), "%s:\\", me->me_mountdir + 10);
-    if (GetDriveType(mountdir) != DRIVE_FIXED)
-        me->me_remote = 1;
-#endif
-    /* Filters */
-
-    /* Remove filesystems already seen */
-    if (np_seen_name(seen, me->me_mountdir)) {
-      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);
-          }
-        }
-        continue;
-      /* Skip pseudo fs's if we haven't asked for all fs's */
-      } else if (me->me_dummy && !show_all_fs) {
-        continue;
-      /* Skip excluded fstypes */
-      } else if (fs_exclude_list && np_find_regmatch (fs_exclude_list, me->me_type)) {
-        continue;
-      /* Skip excluded fs's */
-      } else if (dp_exclude_list &&
-               (np_find_name (dp_exclude_list, me->me_devname) ||
-                np_find_name (dp_exclude_list, me->me_mountdir))) {
-        continue;
-      /* Skip not included fstypes */
-      } else if (fs_include_list && !np_find_regmatch(fs_include_list, me->me_type)) {
-        continue;
-      }
-    }
-
-    if (!stat_path(path)) {
-      if (ignore_missing == true) {
-        result = STATE_OK;
-        xasprintf (&ignored, "%s %s;", ignored, path->name);
-      }
-      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;
-
-      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)) );
-      }
-
-      uint64_t critical_high_tide = UINT64_MAX;
-
-      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)) );
-      }
-
-      /* 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 (disk_result==STATE_OK && erronly && !verbose)
-        continue;
-
-          if(disk_result && verbose >= 1) {
-                  xasprintf(&flag_header, " %s [", state_text (disk_result));
-          } else {
-                  xasprintf(&flag_header, "");
-          }
-          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 {
-                  xasprintf(&output, "%s inode=%.0f%%)%s;", output, path->dfree_inodes_percent, ((disk_result && verbose >= 1) ? "]" : ""));
-          }
-      free(flag_header);
-    }
-  }
-
-  if (verbose >= 2)
-    xasprintf (&output, "%s%s", output, details);
-
-  if (strcmp(output, "") == 0 && ! erronly) {
-    preamble = "";
-    xasprintf (&output, " - No disks were found for provided parameters");
-  }
-
-  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;
-}
+                        /* 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;
+                        }
 
+                        // 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;
+                        }
+                }
+
+                path = mp_int_fs_list_get_next(path);
+        }
+
+        // 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);
+
+                if (fsp.fsu_blocks != 0 && strcmp("none", mount_entry->me_mountdir) != 0) {
+                        *filesystem = get_path_stats(*filesystem, fsp, config.freespace_ignore_reserved);
+
+                        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);
+        }
+
+        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);
+                        }
+                }
+        }
+
+        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 {
+                                current = add_measurement_list(measurements, unit);
+                        }
+                } 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 {
+                                // 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);
+                                }
+                        }
+                }
+        }
+
+        /* 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 (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);
+        }
+
+        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;
-  }
-  return pct;
+        double pct = -1;
+        if (value <= DBL_MAX && total != 0) {
+                pct = (double)value / (double)total * 100.0;
+        }
+
+        return pct;
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-  int c, err;
-  struct parameter_list *se;
-  struct parameter_list *temp_list = NULL, *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;
-
-  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'},
-    {"units", required_argument, 0, 'u'},
-    {"path", required_argument, 0, 'p'},
-    {"partition", required_argument, 0, 'p'},
-    {"exclude_device", required_argument, 0, 'x'},
-    {"exclude-type", required_argument, 0, 'X'},
-    {"include-type", required_argument, 0, 'N'},
-    {"group", required_argument, 0, 'g'},
-    {"eregi-path", required_argument, 0, 'R'},
-    {"eregi-partition", required_argument, 0, 'R'},
-    {"ereg-path", required_argument, 0, 'r'},
-    {"ereg-partition", required_argument, 0, 'r'},
-    {"freespace-ignore-reserved", no_argument, 0, 'f'},
-    {"ignore-ereg-path", required_argument, 0, 'i'},
-    {"ignore-ereg-partition", required_argument, 0, 'i'},
-    {"ignore-eregi-path", required_argument, 0, 'I'},
-    {"ignore-eregi-partition", required_argument, 0, 'I'},
-    {"ignore-missing", no_argument, 0, 'n'},
-    {"local", no_argument, 0, 'l'},
-    {"stat-remote-fs", no_argument, 0, 'L'},
-    {"iperfdata", no_argument, 0, 'P'},
-    {"mountpoint", no_argument, 0, 'M'},
-    {"errors-only", no_argument, 0, 'e'},
-    {"exact-match", no_argument, 0, 'E'},
-    {"all", no_argument, 0, 'A'},
-    {"verbose", no_argument, 0, 'v'},
-    {"quiet", no_argument, 0, 'q'},
-    {"clear", no_argument, 0, 'C'},
-    {"version", no_argument, 0, 'V'},
-    {"help", no_argument, 0, 'h'},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return ERROR;
-
-  np_add_regex(&fs_exclude_list, "iso9660", REG_EXTENDED);
-
-  for (c = 1; c < argc; c++)
-    if (strcmp ("-to", argv[c]) == 0)
-      strcpy (argv[c], "-t");
-
-  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);
-
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case 't':                 /* timeout period */
-      if (is_integer (optarg)) {
-        timeout_interval = atoi (optarg);
-        break;
-      }
-      else {
-        usage2 (_("Timeout interval must be a positive integer"), optarg);
-      }
-
-    /* See comments for 'c' */
-    case 'w':                 /* warning threshold */
+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,
+        };
+
+        static struct option longopts[] = {{"timeout", required_argument, 0, 't'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"iwarning", required_argument, 0, 'W'},
+                                                                           {"icritical", required_argument, 0, 'K'},
+                                                                           {"kilobytes", no_argument, 0, 'k'},
+                                                                           {"megabytes", no_argument, 0, 'm'},
+                                                                           {"units", required_argument, 0, 'u'},
+                                                                           {"path", required_argument, 0, 'p'},
+                                                                           {"partition", required_argument, 0, 'p'},
+                                                                           {"exclude_device", required_argument, 0, 'x'},
+                                                                           {"exclude-type", required_argument, 0, 'X'},
+                                                                           {"include-type", required_argument, 0, 'N'},
+                                                                           {"group", required_argument, 0, 'g'},
+                                                                           {"eregi-path", required_argument, 0, 'R'},
+                                                                           {"eregi-partition", required_argument, 0, 'R'},
+                                                                           {"ereg-path", required_argument, 0, 'r'},
+                                                                           {"ereg-partition", required_argument, 0, 'r'},
+                                                                           {"freespace-ignore-reserved", no_argument, 0, 'f'},
+                                                                           {"ignore-ereg-path", required_argument, 0, 'i'},
+                                                                           {"ignore-ereg-partition", required_argument, 0, 'i'},
+                                                                           {"ignore-eregi-path", required_argument, 0, 'I'},
+                                                                           {"ignore-eregi-partition", required_argument, 0, 'I'},
+                                                                           {"ignore-missing", no_argument, 0, 'n'},
+                                                                           {"local", no_argument, 0, 'l'},
+                                                                           {"stat-remote-fs", no_argument, 0, 'L'},
+                                                                           {"iperfdata", no_argument, 0, 'P'},
+                                                                           {"mountpoint", no_argument, 0, 'M'},
+                                                                           {"errors-only", no_argument, 0, 'e'},
+                                                                           {"exact-match", no_argument, 0, 'E'},
+                                                                           {"all", no_argument, 0, 'A'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"quiet", no_argument, 0, 'q'},
+                                                                           {"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}};
+
+        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;
+
+        bool path_selected = false;
+        char *group = NULL;
+        byte_unit unit = MebiBytes_factor;
+
+        result.config.mount_list = read_file_system_list(false);
+
+        np_add_regex(&result.config.fs_exclude_list, "iso9660", REG_EXTENDED);
+
+        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 (option_index) {
+                case 't': /* timeout period */
+                        if (is_integer(optarg)) {
+                                timeout_interval = atoi(optarg);
+                                break;
+                        } else {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        }
+
+                /* See comments for 'c' */
+                case 'w': /* warning threshold */
                         if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
-                                        die(STATE_UNKNOWN, "Argument for --warning invalid or missing: %s\n", optarg);
+                                die(STATE_UNKNOWN, "Argument for --warning invalid or missing: %s\n", optarg);
                         }
 
-      if (strstr(optarg, "%")) {
-        if (*optarg == '@') {
-          warn_freespace_percent = optarg;
-        } else {
-          xasprintf(&warn_freespace_percent, "@%s", optarg);
-        }
-      } else {
-        if (*optarg == '@') {
-          warn_freespace_units = optarg;
-        } else {
-          xasprintf(&warn_freespace_units, "@%s", optarg);
-        }
-      }
-      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
-    */
-    case 'c':                 /* critical threshold */
+                        if (strstr(optarg, "%")) {
+                                if (*optarg == '@') {
+                                        warn_freespace_percent = optarg;
+                                } else {
+                                        xasprintf(&warn_freespace_percent, "@%s", optarg);
+                                }
+                        } else {
+                                if (*optarg == '@') {
+                                        warn_freespace_units = optarg;
+                                } else {
+                                        xasprintf(&warn_freespace_units, "@%s", optarg);
+                                }
+                        }
+                        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
+                 */
+                case 'c': /* critical threshold */
                         if (!is_percentage_expression(optarg) && !is_numeric(optarg)) {
-                                        die(STATE_UNKNOWN, "Argument for --critical invalid or missing: %s\n", optarg);
+                                die(STATE_UNKNOWN, "Argument for --critical invalid or missing: %s\n", optarg);
                         }
 
-      if (strstr(optarg, "%")) {
-        if (*optarg == '@') {
-          crit_freespace_percent = optarg;
-        } else {
-          xasprintf(&crit_freespace_percent, "@%s", optarg);
-        }
-      } else {
-        if (*optarg == '@') {
-          crit_freespace_units = optarg;
-        } else {
-          xasprintf(&crit_freespace_units, "@%s", optarg);
-        }
-      }
-      break;
-
-    case 'W':            /* warning inode threshold */
-      if (*optarg == '@') {
-        warn_freeinodes_percent = optarg;
-      } else {
-        xasprintf(&warn_freeinodes_percent, "@%s", optarg);
-      }
-      break;
-    case 'K':            /* critical inode threshold */
-      if (*optarg == '@') {
-        crit_freeinodes_percent = optarg;
-      } else {
-        xasprintf(&crit_freeinodes_percent, "@%s", optarg);
-      }
-      break;
-    case 'u':
-      if (units)
-        free(units);
-      if (! strcasecmp (optarg, "bytes")) {
-        mult = (uintmax_t)1;
-        units = strdup ("B");
-      } else if (!strcmp(optarg, "KiB")) {
-        mult = (uintmax_t)1024;
-        units = strdup ("KiB");
-      } else if (! strcmp (optarg, "kB")) {
-        mult = (uintmax_t)1000;
-        units = strdup ("kB");
-      } else if (!strcmp(optarg, "MiB")) {
-        mult = (uintmax_t)1024 * 1024;
-        units = strdup ("MiB");
-      } else if (! strcmp (optarg, "MB")) {
-        mult = (uintmax_t)1000 * 1000;
-        units = strdup ("MB");
-      } else if (!strcmp(optarg, "GiB")) {
-        mult = (uintmax_t)1024 * 1024 * 1024;
-        units = strdup ("GiB");
-      } else if (! strcmp (optarg, "GB")){
-        mult = (uintmax_t)1000 * 1000 * 1000;
-        units = strdup ("GB");
-      } else if (!strcmp(optarg, "TiB")) {
-        mult = (uintmax_t)1024 * 1024 * 1024 * 1024;
-        units = strdup ("TiB");
-      } else if (! strcmp (optarg, "TB")) {
-        mult = (uintmax_t)1000 * 1000 * 1000 * 1000;
-        units = strdup ("TB");
-      } else if (!strcmp(optarg, "PiB")) {
-        mult = (uintmax_t)1024 * 1024 * 1024 * 1024 * 1024;
-        units = strdup ("PiB");
-      } else if (! strcmp (optarg, "PB")){
-        mult = (uintmax_t)1000 * 1000 * 1000 * 1000 * 1000;
-        units = strdup ("PB");
-      } 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");
-      break;
-    case 'm': /* display mountpoint */
-      mult = 1024 * 1024;
-      if (units)
-        free(units);
-      units = strdup ("MiB");
-      break;
-    case 'L':
-      stat_remote_fs = 1;
-      /* fallthrough */
-    case 'l':
-      show_local_fs = 1;
-      break;
-    case 'P':
-      display_inodes_perfdata = 1;
-      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"));
-      }
-
-      /* 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;
-          }
-      }
-      se->group = group;
-      set_all_thresholds(se);
-
-      /* 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);
-
-      path_selected = true;
-      break;
-    case 'x':                 /* exclude path or partition */
-      np_add_name(&dp_exclude_list, optarg);
-      break;
-    case 'X':                 /* exclude file system type */
-      err = np_add_regex(&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);
-      }
-      break;
-    case 'N':                 /* include file system type */
-      err = np_add_regex(&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);
-      }
-      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;
-      break;
-    case 'e':
-      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;
-      break;
-    case 'f':
-      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"));
-      group = optarg;
-      break;
-    case 'I':
-      cflags |= REG_ICASE;
-          // Intentional fallthrough
-    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);
-      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);
-      }
-
-      temp_list = path_select_list;
-
-      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", 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;
-          }
-        } else {
-          previous = temp_list;
-          temp_list = temp_list->name_next;
-        }
-      }
-
-
-      cflags = default_cflags;
-      break;
-
-    case 'n':
-      ignore_missing = true;
-      break;
-    case 'A':
-      optarg = strdup(".*");
-          // Intentional fallthrough
-    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 )) {
-        die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -r/-R/-A (--ereg-path/--eregi-path/--all)\n"));
-      }
-
-      err = regcomp(&re, 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);
-      }
-
-      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);
-
-          /* 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);
-          }
-          se->group = group;
-          set_all_thresholds(se);
-        }
-      }
-
-      if (!fnd && ignore_missing == true) {
-        path_ignored = true;
-        path_selected = true;
-        break;
-      } else 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);
-      cflags = default_cflags;
-
-      break;
-    case 'M': /* display mountpoint */
-      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);
-           path->best_match = me;
-           path->group = group;
-           set_all_thresholds(path);
-         }
-      }
-      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;
-    case 'V':                 /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'h':                 /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case '?':                 /* help */
-      usage (_("Unknown argument"));
-    }
-  }
-
-  /* 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++];
-
-  if (crit_usedspace_percent == NULL && argc > c && is_intnonneg (argv[c]))
-    crit_usedspace_percent = argv[c++];
-
-  if (argc > c) {
-    se = np_add_parameter(&path_select_list, strdup(argv[c++]));
-    path_selected = true;
-    set_all_thresholds(se);
-  }
-
-  if (units == NULL) {
-    units = strdup ("MiB");
-    mult = (uintmax_t)1024 * 1024;
-  }
-
-  return true;
-}
+                        if (strstr(optarg, "%")) {
+                                if (*optarg == '@') {
+                                        crit_freespace_percent = optarg;
+                                } else {
+                                        xasprintf(&crit_freespace_percent, "@%s", optarg);
+                                }
+                        } else {
+                                if (*optarg == '@') {
+                                        crit_freespace_units = optarg;
+                                } else {
+                                        xasprintf(&crit_freespace_units, "@%s", optarg);
+                                }
+                        }
+                        break;
 
+                case 'W': /* warning inode threshold */
+                        if (*optarg == '@') {
+                                warn_freeinodes_percent = optarg;
+                        } else {
+                                xasprintf(&warn_freeinodes_percent, "@%s", optarg);
+                        }
+                        break;
+                case 'K': /* critical inode threshold */
+                        if (*optarg == '@') {
+                                crit_freeinodes_percent = optarg;
+                        } else {
+                                xasprintf(&crit_freeinodes_percent, "@%s", optarg);
+                        }
+                        break;
+                case 'u':
+                        if (!strcasecmp(optarg, "bytes")) {
+                                unit = Bytes_Factor;
+                        } else if (!strcmp(optarg, "KiB")) {
+                                unit = KibiBytes_factor;
+                        } else if (!strcmp(optarg, "kB")) {
+                                unit = KiloBytes_factor;
+                        } else if (!strcmp(optarg, "MiB")) {
+                                unit = MebiBytes_factor;
+                        } else if (!strcmp(optarg, "MB")) {
+                                unit = MegaBytes_factor;
+                        } else if (!strcmp(optarg, "GiB")) {
+                                unit = GibiBytes_factor;
+                        } else if (!strcmp(optarg, "GB")) {
+                                unit = GigaBytes_factor;
+                        } else if (!strcmp(optarg, "TiB")) {
+                                unit = TebiBytes_factor;
+                        } else if (!strcmp(optarg, "TB")) {
+                                unit = TeraBytes_factor;
+                        } else if (!strcmp(optarg, "PiB")) {
+                                unit = PebiBytes_factor;
+                        } else if (!strcmp(optarg, "PB")) {
+                                unit = PetaBytes_factor;
+                        } else {
+                                die(STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
+                        }
+                        break;
+                case 'k':
+                        unit = KibiBytes_factor;
+                        break;
+                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':
+                        result.config.stat_remote_fs = true;
+                        /* fallthrough */
+                case 'l':
+                        result.config.show_local_fs = true;
+                        break;
+                case 'P':
+                        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_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  */
+                        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);
 
-void
-print_path (const char *mypath)
-{
-  if (mypath == NULL)
-    printf ("\n");
-  else
-    printf (_(" for %s\n"), mypath);
-}
+                                // struct stat stat_buf = {};
+                                // if (stat(optarg, &stat_buf) && result.config.ignore_missing) {
+                                // result.config.path_ignored = true;
+                                // break;
+                                // }
+                        }
+                        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, 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;
+                case 'x': /* exclude path or partition */
+                        np_add_name(&result.config.device_path_exclude_list, optarg);
+                        break;
+                case 'X': /* exclude file system type */ {
+                        int err = np_add_regex(&result.config.fs_exclude_list, optarg, REG_EXTENDED);
+                        if (err != 0) {
+                                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(&result.config.fs_include_list, optarg, REG_EXTENDED);
+                        if (err != 0) {
+                                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 '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 */
+                        result.config.erronly = true;
+                        break;
+                case 'e':
+                        result.config.erronly = true;
+                        break;
+                case 'E':
+                        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':
+                        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"));
+                        }
+                        group = optarg;
+                        break;
+                case 'I':
+                        cflags |= REG_ICASE;
+                        // Intentional fallthrough
+                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"));
+                        }
+                        regex_t regex;
+                        int err = regcomp(&regex, optarg, cflags);
+                        if (err != 0) {
+                                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 (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)) {
 
-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);
-}
+                                                if (verbose >= 3) {
+                                                        printf("ignoring %s matching regex\n", elem->name);
+                                                }
 
-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", _("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 ("\n\n");
-
-  print_usage ();
-
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
-
-  printf (" %s\n", "-w, --warning=INTEGER");
-  printf ("    %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
-  printf (" %s\n", "-w, --warning=PERCENT%");
-  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of disk space is free"));
-  printf (" %s\n", "-c, --critical=INTEGER");
-  printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER units of disk are free"));
-  printf (" %s\n", "-c, --critical=PERCENT%");
-  printf ("    %s\n", _("Exit with CRITICAL status if less than PERCENT of disk space is free"));
-  printf (" %s\n", "-W, --iwarning=PERCENT%");
-  printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free"));
-  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", "-x, --exclude_device=PATH <STRING>");
-  printf ("    %s\n", _("Ignore device (only works if -p unspecified)"));
-  printf (" %s\n", "-C, --clear");
-  printf ("    %s\n", _("Clear thresholds"));
-  printf (" %s\n", "-E, --exact-match");
-  printf ("    %s\n", _("For paths or partitions specified with -p, only check for exact paths"));
-  printf (" %s\n", "-e, --errors-only");
-  printf ("    %s\n", _("Display only devices/mountpoints with errors"));
-  printf (" %s\n", "-f, --freespace-ignore-reserved");
-  printf ("    %s\n", _("Don't account root-reserved blocks into freespace in perfdata"));
-  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", "-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", _("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", "-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", "-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", "-n, --ignore-missing");
-  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 (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", "-N, --include-type=TYPE_REGEX");
-  printf ("    %s\n", _("Check only filesystems where the type matches this given regex(7) (may be repeated)"));
-
-  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", _("\"-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 ("\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 -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 (UT_SUPPORT);
-}
+                                                elem = mp_int_fs_list_del(&result.config.path_select_list, elem);
+                                                continue;
+                                        }
+                                }
 
+                                elem = mp_int_fs_list_get_next(elem);
+                        }
 
+                        cflags = default_cflags;
+                } break;
+                case 'n':
+                        result.config.ignore_missing = true;
+                        break;
+                case 'A':
+                        optarg = strdup(".*");
+                        // Intentional fallthrough
+                case 'R':
+                        cflags |= REG_ICASE;
+                        // Intentional fallthrough
+                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"));
+                        }
 
-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 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");
+                        regex_t regex;
+                        int err = regcomp(&regex, optarg, cflags);
+                        if (err != 0) {
+                                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);
+                        }
+
+                        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  */
+                                        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, warn_freespace_units, crit_freespace_units, warn_freespace_percent, crit_freespace_percent,
+                                                                           warn_freeinodes_percent, crit_freeinodes_percent);
+                                }
+                        }
+
+                        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);
+                        }
+
+                        path_selected = true;
+                        mp_int_fs_list_set_best_match(result.config.path_select_list, result.config.mount_list, result.config.exact_match);
+                        cflags = default_cflags;
+
+                } break;
+                case 'M': /* display mountpoint */
+                        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) {
+                                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, 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_freespace_percent = NULL;
+                        crit_freespace_percent = NULL;
+                        warn_freeinodes_percent = NULL;
+                        crit_freeinodes_percent = NULL;
+
+                        path_selected = false;
+                        group = NULL;
+                } break;
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        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 */
+        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;
+
+                warn_freespace_percent = mp_range_to_string(tmp_range);
+
+                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, warn_freespace_units, crit_freespace_units, warn_freespace_percent, crit_freespace_percent,
+                                                   warn_freeinodes_percent, crit_freeinodes_percent);
+        }
+
+        // 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);
+                }
+        }
+
+        // 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;
 }
 
-bool
-stat_path (struct parameter_list *p)
-{
-  /* 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) {
-      return false;
-    } else {
-      printf("DISK %s - ", _("CRITICAL"));
-      die (STATE_CRITICAL, _("%s %s: %s\n"), p->name, _("is not accessible"), strerror(errno));
-    }
-  }
-  return true;
+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) {
+        print_revision(progname, NP_VERSION);
+
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        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("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" %s\n", "-w, --warning=INTEGER");
+        printf("    %s\n", _("Exit with WARNING status if less than INTEGER units of disk are free"));
+        printf(" %s\n", "-w, --warning=PERCENT%");
+        printf("    %s\n", _("Exit with WARNING status if less than PERCENT of disk space is free"));
+        printf(" %s\n", "-c, --critical=INTEGER");
+        printf("    %s\n", _("Exit with CRITICAL status if less than INTEGER units of disk are free"));
+        printf(" %s\n", "-c, --critical=PERCENT%");
+        printf("    %s\n", _("Exit with CRITICAL status if less than PERCENT of disk space is free"));
+        printf(" %s\n", "-W, --iwarning=PERCENT%");
+        printf("    %s\n", _("Exit with WARNING status if less than PERCENT of inode space is free"));
+        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", "-x, --exclude_device=PATH <STRING>");
+        printf("    %s\n", _("Ignore device (only works if -p unspecified)"));
+        printf(" %s\n", "-C, --clear");
+        printf("    %s\n", _("Clear thresholds"));
+        printf(" %s\n", "-E, --exact-match");
+        printf("    %s\n", _("For paths or partitions specified with -p, only check for exact paths"));
+        printf(" %s\n", "-e, --errors-only");
+        printf("    %s\n", _("Display only devices/mountpoints with errors"));
+        printf(" %s\n", "-f, --freespace-ignore-reserved");
+        printf("    %s\n", _("Don't account root-reserved blocks into freespace in perfdata"));
+        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", "-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", _("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", "-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", "-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", "-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", "-n, --ignore-missing");
+        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", _("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", "-N, --include-type=TYPE_REGEX");
+        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", _("\"-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("\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 -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(UT_SUPPORT);
+}
 
-void
-get_stats (struct parameter_list *p, struct fs_usage *fsp) {
-  struct parameter_list *p_list;
-  struct fs_usage tmpfsp;
-  int first = 1;
+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 "
+                   "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");
+}
 
-  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;
+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", 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"), parameters->name, _("is not accessible"), strerror(errno));
+        }
+
+        return true;
+}
 
+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 (freespace_ignore_reserved) {
+                /* option activated : we subtract the root-reserved space from the total */
+                total = fsp.fsu_blocks - available_to_root + available;
+        } else {
+                /* default behaviour : take all the blocks into account */
+                total = fsp.fsu_blocks;
+        }
+
+        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...*/
+        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 */
+                parameters.inodes_total = fsp.fsu_files - parameters.inodes_free_to_root + parameters.inodes_free;
+        } else {
+                /* default behaviour : take all the inodes into account */
+                parameters.inodes_total = fsp.fsu_files;
+        }
+
+        return parameters;
 }
 
-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;
-  } else {
-    /* default behaviour : take all the blocks into account */
-    p->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;
-  /* 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;
-  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;
-  } else {
-    /* default behaviour : take all the inodes into account */
-    p->inodes_total = fsp->fsu_files;
-  }
-  np_add_name(&seen, p->best_match->me_mountdir);
+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..eec1282b
--- /dev/null
+++ b/plugins/check_disk.d/utils_disk.c
@@ -0,0 +1,517 @@
+/*****************************************************************************
+ *
+ * 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..6831d1fd
--- /dev/null
+++ b/plugins/check_disk.d/utils_disk.h
@@ -0,0 +1,157 @@
+#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 468bc958..95f33083 100644
--- a/plugins/check_dns.c
+++ b/plugins/check_dns.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_dns plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_dns plugin
-* 
-* LIMITATION: nslookup on Solaris 7 can return output over 2 lines, which
-* will not be picked up by this plugin
-* 
-* 
-* 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_dns plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_dns plugin
+ *
+ * LIMITATION: nslookup on Solaris 7 can return output over 2 lines, which
+ * will not be picked up by this plugin
+ *
+ *
+ * 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_dns";
-const char *copyright = "2000-2008";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -39,579 +39,591 @@ const char *email = "devel@monitoring-plugins.org";
 #include "netutils.h"
 #include "runcmd.h"
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-int error_scan (char *, bool *);
-bool ip_match_cidr(const char *, const char *);
-unsigned long ip2long(const char *);
-void print_help (void);
-void print_usage (void);
-
-#define ADDRESS_LENGTH 256
-char query_address[ADDRESS_LENGTH] = "";
-char dns_server[ADDRESS_LENGTH] = "";
-char ptr_server[ADDRESS_LENGTH] = "";
-bool verbose = false;
-char **expected_address = NULL;
-int expected_address_cnt = 0;
-bool expect_nxdomain = false;
-
-bool expect_authority = false;
-bool all_match = false;
-thresholds *time_thresholds = NULL;
-
-static int
-qstrcmp(const void *p1, const void *p2)
-{
+#include "states.h"
+#include "check_dns.d/config.h"
+
+typedef struct {
+        int errorcode;
+        check_dns_config config;
+} 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 bool ip_match_cidr(const char * /*addr*/, const char * /*cidr_ro*/);
+static unsigned long ip2long(const char * /*src*/);
+static void print_help(void);
+void print_usage(void);
+
+static bool verbose = false;
+
+static int qstrcmp(const void *p1, const void *p2) {
         /* The actual arguments to this function are "pointers to
            pointers to char", but strcmp() arguments are "pointers
            to char", hence the following cast plus dereference */
-        return strcmp(* (char * const *) p1, * (char * const *) p2);
+        return strcmp(*(char *const *)p1, *(char *const *)p2);
 }
 
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        /* Set signal handling and alarm */
+        if (signal(SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
+                usage_va(_("Cannot catch SIGALRM"));
+        }
+
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_dns_config_wrapper tmp = process_arguments(argc, argv);
+
+        if (tmp.errorcode == ERROR) {
+                usage_va(_("Could not parse arguments"));
+        }
+
+        const check_dns_config config = tmp.config;
+
+        char *command_line = NULL;
+        /* get the command to run */
+        xasprintf(&command_line, "%s %s %s", NSLOOKUP_COMMAND, config.query_address, config.dns_server);
+
+        struct timeval tv;
+        alarm(timeout_interval);
+        gettimeofday(&tv, NULL);
+
+        if (verbose) {
+                printf("%s\n", command_line);
+        }
+
+        output chld_out;
+        output chld_err;
+        char *msg = NULL;
+        mp_state_enum result = STATE_UNKNOWN;
+        /* run the command */
+        if ((np_runcmd(command_line, &chld_out, &chld_err, 0)) != 0) {
+                msg = (char *)_("nslookup returned an error status");
+                result = STATE_WARNING;
+        }
+
+        /* =====
+         * scan stdout, main results get retrieved here
+         * =====
+         */
+        char *address = NULL;    /* comma separated str with addrs/ptrs (sorted) */
+        char **addresses = NULL; // All addresses parsed from stdout
+        size_t n_addresses = 0;  // counter for retrieved addresses
+        bool non_authoritative = false;
+        bool is_nxdomain = false;
+        bool parse_address = false; /* This flag scans for Address: but only after Name: */
+        for (size_t i = 0; i < chld_out.lines; i++) {
+                if (addresses == NULL) {
+                        addresses = malloc(sizeof(*addresses) * 10);
+                } else if (!(n_addresses % 10)) {
+                        addresses = realloc(addresses, sizeof(*addresses) * (n_addresses + 10));
+                }
+
+                if (verbose) {
+                        puts(chld_out.line[i]);
+                }
+
+                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;
+                        }
+                        char *temp_buffer = NULL;
+                        if ((temp_buffer = strstr(chld_out.line[i], "name = "))) {
+                                addresses[n_addresses++] = strdup(temp_buffer + 7);
+                        } else {
+                                msg = (char *)_("Warning plugin error");
+                                result = STATE_WARNING;
+                        }
+                }
+
+                /* bug ID: 2946553 - Older versions of bind will use all available dns
+                                                         servers, we have to match the one specified */
+                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);
+                        }
+
+                        temp_buffer++;
+
+                        /* Strip leading tabs */
+                        for (; *temp_buffer != '\0' && *temp_buffer == '\t'; temp_buffer++) {
+                                /* NOOP */;
+                        }
+
+                        strip(temp_buffer);
+                        if (strlen(temp_buffer) == 0) {
+                                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);
+                        }
+                }
+
+                /* 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:"))) {
+                        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);
+                        }
+
+                        temp_buffer++;
+
+                        /* Strip leading spaces */
+                        while (*temp_buffer == ' ') {
+                                temp_buffer++;
+                        }
+
+                        strip(temp_buffer);
+                        if (strlen(temp_buffer) == 0) {
+                                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' returned empty host name string\n"), NSLOOKUP_COMMAND);
+                        }
+
+                        addresses[n_addresses++] = strdup(temp_buffer);
+                } else if (strstr(chld_out.line[i], _("Non-authoritative answer:"))) {
+                        non_authoritative = true;
+                }
+
+                result = error_scan(chld_out.line[i], &is_nxdomain, config.dns_server);
+                if (result != STATE_OK) {
+                        msg = strchr(chld_out.line[i], ':');
+                        if (msg) {
+                                msg++;
+                        }
+                        break;
+                }
+        }
+
+        char input_buffer[MAX_INPUT_BUFFER];
+        /* scan stderr */
+        for (size_t i = 0; i < chld_err.lines; i++) {
+                if (verbose) {
+                        puts(chld_err.line[i]);
+                }
+
+                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));
+                        msg = strchr(input_buffer, ':');
+                        if (msg) {
+                                msg++;
+                        } else {
+                                msg = input_buffer;
+                        }
+                }
+        }
+
+        if (is_nxdomain && !config.expect_nxdomain) {
+                die(STATE_CRITICAL, _("Domain '%s' was not found by the server\n"), config.query_address);
+        }
+
+        if (addresses) {
+                size_t slen = 1;
+                char *adrp = NULL;
+                qsort(addresses, n_addresses, sizeof(*addresses), qstrcmp);
+                for (size_t i = 0; i < n_addresses; i++) {
+                        slen += strlen(addresses[i]) + 1;
+                }
+
+                // Temporary pointer adrp gets moved, address stays on the beginning
+                adrp = address = malloc(slen);
+                for (size_t i = 0; i < n_addresses; i++) {
+                        if (i) {
+                                *adrp++ = ',';
+                        }
+                        strcpy(adrp, addresses[i]);
+                        adrp += strlen(addresses[i]);
+                }
+                *adrp = 0;
+        } else {
+                die(STATE_CRITICAL, _("DNS CRITICAL - '%s' msg parsing exited with no address\n"), NSLOOKUP_COMMAND);
+        }
+
+        /* compare to expected address */
+        if (result == STATE_OK && config.expected_address_cnt > 0) {
+                result = STATE_CRITICAL;
+                char *temp_buffer = "";
+                unsigned long expect_match = (1 << config.expected_address_cnt) - 1;
+                unsigned long addr_match = (1 << n_addresses) - 1;
+
+                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])) {
+                                        result = STATE_OK;
+                                        addr_match &= ~(1 << j);
+                                        expect_match &= ~(1 << i);
+                                }
+                        }
+
+                        /* prepare an error string */
+                        xasprintf(&temp_buffer, "%s%s; ", temp_buffer, config.expected_address[i]);
+                }
+                /* check if expected_address must cover all in addresses and none may be missing */
+                if (config.all_match && (expect_match != 0 || addr_match != 0)) {
+                        result = STATE_CRITICAL;
+                }
+                if (result == STATE_CRITICAL) {
+                        /* Strip off last semicolon... */
+                        temp_buffer[strlen(temp_buffer) - 2] = '\0';
+                        xasprintf(&msg, _("expected '%s' but got '%s'"), temp_buffer, address);
+                }
+        }
+
+        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);
+                } else {
+                        if (address != NULL) {
+                                free(address);
+                        }
+                        address = "NXDOMAIN";
+                }
+        }
+
+        /* 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);
+        }
+
+        long microsec = deltime(tv);
+        double elapsed_time = (double)microsec / 1.0e6;
+
+        if (result == STATE_OK) {
+                result = get_status(elapsed_time, config.time_thresholds);
+                if (result == STATE_OK) {
+                        printf("DNS %s: ", _("OK"));
+                } else if (result == STATE_WARNING) {
+                        printf("DNS %s: ", _("WARNING"));
+                } else if (result == STATE_CRITICAL) {
+                        printf("DNS %s: ", _("CRITICAL"));
+                }
+                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,
+                                                                          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 {
+                        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);
+        } else if (result == STATE_CRITICAL) {
+                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);
+        }
 
-int
-main (int argc, char **argv)
-{
-  char *command_line = NULL;
-  char input_buffer[MAX_INPUT_BUFFER];
-  char *address = NULL; /* comma separated str with addrs/ptrs (sorted) */
-  char **addresses = NULL;
-  int n_addresses = 0;
-  char *msg = NULL;
-  char *temp_buffer = NULL;
-  bool non_authoritative = false;
-  int result = STATE_UNKNOWN;
-  double elapsed_time;
-  long microsec;
-  struct timeval tv;
-  bool parse_address = false; /* This flag scans for Address: but only after Name: */
-  output chld_out, chld_err;
-  bool is_nxdomain = false;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  /* Set signal handling and alarm */
-  if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
-    usage_va(_("Cannot catch SIGALRM"));
-  }
-
-  /* Parse extra opts if any */
-  argv=np_extra_opts (&argc, argv, progname);
-
-  if (process_arguments (argc, argv) == ERROR) {
-    usage_va(_("Could not parse arguments"));
-  }
-
-  /* get the command to run */
-  xasprintf (&command_line, "%s %s %s", NSLOOKUP_COMMAND, query_address, dns_server);
-
-  alarm (timeout_interval);
-  gettimeofday (&tv, NULL);
-
-  if (verbose)
-    printf ("%s\n", command_line);
-
-  /* run the command */
-  if((np_runcmd(command_line, &chld_out, &chld_err, 0)) != 0) {
-    msg = (char *)_("nslookup returned an error status");
-    result = STATE_WARNING;
-  }
-
-  /* scan stdout */
-  for(size_t i = 0; i < chld_out.lines; i++) {
-    if (addresses == NULL)
-      addresses = malloc(sizeof(*addresses)*10);
-    else if (!(n_addresses % 10))
-      addresses = realloc(addresses,sizeof(*addresses) * (n_addresses + 10));
-
-    if (verbose)
-      puts(chld_out.line[i]);
-
-    if (strcasestr (chld_out.line[i], ".in-addr.arpa") || strcasestr (chld_out.line[i], ".ip6.arpa")) {
-      if ((temp_buffer = strstr (chld_out.line[i], "name = ")))
-        addresses[n_addresses++] = strdup (temp_buffer + 7);
-      else {
-        msg = (char *)_("Warning plugin error");
-        result = STATE_WARNING;
-      }
-    }
-
-    /* bug ID: 2946553 - Older versions of bind will use all available dns 
-                         servers, we have to match the one specified */
-    if (strstr (chld_out.line[i], "Server:") && strlen(dns_server) > 0) {
-      temp_buffer = strchr (chld_out.line[i], ':');
-      temp_buffer++;
-
-      /* Strip leading tabs */
-      for (; *temp_buffer != '\0' && *temp_buffer == '\t'; temp_buffer++)
-        /* NOOP */;
-
-      strip(temp_buffer);
-      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
-        die (STATE_CRITICAL,
-             _("DNS CRITICAL - '%s' returned empty server string\n"),
-             NSLOOKUP_COMMAND);
-      }
-
-      if (strcmp(temp_buffer, dns_server) != 0) {
-        die (STATE_CRITICAL, _("DNS CRITICAL - No response from DNS %s\n"), 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:"))) {
-      temp_buffer = index (chld_out.line[i], ':');
-      temp_buffer++;
-
-      /* Strip leading spaces */
-      while (*temp_buffer == ' ')
-        temp_buffer++;
-
-      strip(temp_buffer);
-      if (temp_buffer==NULL || strlen(temp_buffer)==0) {
-        die (STATE_CRITICAL,
-             _("DNS CRITICAL - '%s' returned empty host name string\n"),
-             NSLOOKUP_COMMAND);
-      }
-
-      addresses[n_addresses++] = strdup(temp_buffer);
-    }
-    else if (strstr (chld_out.line[i], _("Non-authoritative answer:"))) {
-      non_authoritative = true;
-    }
-
-
-    result = error_scan (chld_out.line[i], &is_nxdomain);
-    if (result != STATE_OK) {
-      msg = strchr (chld_out.line[i], ':');
-      if(msg) msg++;
-      break;
-    }
-  }
-
-  /* scan stderr */
-  for(size_t i = 0; i < chld_err.lines; i++) {
-    if (verbose)
-      puts(chld_err.line[i]);
-
-    if (error_scan (chld_err.line[i], &is_nxdomain) != STATE_OK) {
-      result = max_state (result, error_scan (chld_err.line[i], &is_nxdomain));
-      msg = strchr(input_buffer, ':');
-      if(msg)
-         msg++;
-      else
-         msg = input_buffer;
-    }
-  }
-
-  if (is_nxdomain && !expect_nxdomain) {
-    die (STATE_CRITICAL, _("Domain '%s' was not found by the server\n"), query_address);
-  }
-
-  if (addresses) {
-    int i,slen;
-    char *adrp;
-    qsort(addresses, n_addresses, sizeof(*addresses), qstrcmp);
-    for(i=0, slen=1; i < n_addresses; i++) {
-      slen += strlen(addresses[i])+1;
-    }
-    adrp = address = malloc(slen);
-    for(i=0; i < n_addresses; i++) {
-      if (i) *adrp++ = ',';
-      strcpy(adrp, addresses[i]);
-      adrp += strlen(addresses[i]);
-    }
-    *adrp = 0;
-  } else
-    die (STATE_CRITICAL,
-         _("DNS CRITICAL - '%s' msg parsing exited with no address\n"),
-         NSLOOKUP_COMMAND);
-
-  /* compare to expected address */
-  if (result == STATE_OK && expected_address_cnt > 0) {
-    result = STATE_CRITICAL;
-    temp_buffer = "";
-    unsigned long expect_match = (1 << expected_address_cnt) - 1;
-    unsigned long addr_match = (1 << n_addresses) - 1;
-
-    for (int i=0; i<expected_address_cnt; i++) {
-      int j;
-      /* check if we get a match on 'raw' ip or cidr */
-      for (j=0; j<n_addresses; j++) {
-        if ( strcmp(addresses[j], expected_address[i]) == 0
-             || ip_match_cidr(addresses[j], expected_address[i]) ) {
-          result = STATE_OK;
-          addr_match &= ~(1 << j);
-          expect_match &= ~(1 << i);
-        }
-      }
-
-      /* prepare an error string */
-      xasprintf(&temp_buffer, "%s%s; ", temp_buffer, expected_address[i]);
-    }
-    /* check if expected_address must cover all in addresses and none may be missing */
-    if (all_match && (expect_match != 0 || addr_match != 0))
-      result = STATE_CRITICAL;
-    if (result == STATE_CRITICAL) {
-      /* Strip off last semicolon... */
-      temp_buffer[strlen(temp_buffer)-2] = '\0';
-      xasprintf(&msg, _("expected '%s' but got '%s'"), temp_buffer, address);
-    }
-  }
-
-  if (expect_nxdomain) {
-    if (!is_nxdomain) {
-      result = STATE_CRITICAL;
-      xasprintf(&msg, _("Domain '%s' was found by the server: '%s'\n"), query_address, address);
-    } else {
-      if (address != NULL) free(address);
-      address = "NXDOMAIN";
-    }
-  }
-
-  /* check if authoritative */
-  if (result == STATE_OK && expect_authority && non_authoritative) {
-    result = STATE_CRITICAL;
-    xasprintf(&msg, _("server %s is not authoritative for %s"), dns_server, query_address);
-  }
-
-  microsec = deltime (tv);
-  elapsed_time = (double)microsec / 1.0e6;
-
-  if (result == STATE_OK) {
-    result = get_status(elapsed_time, time_thresholds);
-    if (result == STATE_OK) {
-      printf ("DNS %s: ", _("OK"));
-    } else if (result == STATE_WARNING) {
-      printf ("DNS %s: ", _("WARNING"));
-    } else if (result == STATE_CRITICAL) {
-      printf ("DNS %s: ", _("CRITICAL"));
-    }
-    printf (ngettext("%.3f second response time", "%.3f seconds response time", elapsed_time), elapsed_time);
-    printf (_(". %s returns %s"), query_address, address);
-    if ((time_thresholds->warning != NULL) && (time_thresholds->critical != NULL)) {
-      printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  true, time_thresholds->warning->end,
-                                  true, time_thresholds->critical->end,
-                                  true, 0, false, 0));
-    } else if ((time_thresholds->warning == NULL) && (time_thresholds->critical != NULL)) {
-      printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  false, 0,
-                                  true, time_thresholds->critical->end,
-                                  true, 0, false, 0));
-    } else if ((time_thresholds->warning != NULL) && (time_thresholds->critical == NULL)) {
-      printf ("|%s\n", fperfdata ("time", elapsed_time, "s",
-                                  true, 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));
-  }
-  else if (result == STATE_WARNING)
-    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);
-  else
-    printf (_("DNS UNKNOWN - %s\n"),
-            !strcmp (msg, "") ? _(" Probably a non-existent host/domain") : msg);
-
-  return result;
+        exit(result);
 }
 
 bool ip_match_cidr(const char *addr, const char *cidr_ro) {
-  char *subnet, *mask_c, *cidr = strdup(cidr_ro);
-  int mask;
-  subnet = strtok(cidr, "/");
-  mask_c = strtok(NULL, "\0");
-  if (!subnet || !mask_c) {
-    return false;
+        char *subnet;
+        char *mask_c;
+        char *cidr = strdup(cidr_ro);
+        int mask;
+        subnet = strtok(cidr, "/");
+        mask_c = strtok(NULL, "\0");
+        if (!subnet || !mask_c) {
+                return false;
         }
-  mask = atoi(mask_c);
+        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);
+        /* https://www.cryptobells.com/verifying-ips-in-a-subnet-in-php/ */
+        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)
-          ? ip[0] << 24 | ip[1] << 16 | ip[2] << 8 | ip[3]
-          : 0; 
+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)
+                           ? ip[0] << 24 | ip[1] << 16 | ip[2] << 8 | ip[3]
+                           : 0;
 }
 
-int
-error_scan (char *input_buffer, bool *is_nxdomain)
-{
-
-  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")) ||
-      strstr (input_buffer, _("the `-sil[ent]' option to prevent this message from appearing.")))
-    return STATE_OK;
-
-  /* DNS server is not running... */
-  else if (strstr (input_buffer, "No response from server"))
-    die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
-  else if (strstr (input_buffer, "no servers could be reached"))
-    die (STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
-
-  /* Host name is valid, but server doesn't have records... */
-  else if (strstr (input_buffer, "No records"))
-    die (STATE_CRITICAL, _("DNS %s has no records\n"), dns_server);
-
-  /* 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")))
-    die (STATE_CRITICAL, _("Connection to DNS %s was refused\n"), dns_server);
-
-  /* Query refused (usually by an ACL in the namserver) */
-  else if (strstr (input_buffer, "Query refused"))
-    die (STATE_CRITICAL, _("Query was refused by DNS server at %s\n"), dns_server);
-
-  /* No information (e.g. nameserver IP has two PTR records) */
-  else if (strstr (input_buffer, "No information"))
-    die (STATE_CRITICAL, _("No information returned by DNS server at %s\n"), dns_server);
-
-  /* Network is unreachable */
-  else if (strstr (input_buffer, "Network is unreachable"))
-    die (STATE_CRITICAL, _("Network is unreachable\n"));
-
-  /* Internal server failure */
-  else if (strstr (input_buffer, "Server failure"))
-    die (STATE_CRITICAL, _("DNS failure for %s\n"), dns_server);
-
-  /* Request error or the DNS lookup timed out */
-  else if (strstr (input_buffer, "Format error") ||
-           strstr (input_buffer, "Timed out"))
-    return STATE_WARNING;
-
-  return STATE_OK;
+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") ||
+                                                 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")) ||
+                strstr(input_buffer, _("the `-sil[ent]' option to prevent this message from appearing."))) {
+                return STATE_OK;
+        }
 
-/* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-  int c;
-  char *warning = NULL;
-  char *critical = NULL;
-
-  int opt_index = 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'},
-    {"server", required_argument, 0, 's'},
-    {"reverse-server", required_argument, 0, 'r'},
-    {"expected-address", required_argument, 0, 'a'},
-    {"expect-nxdomain",  no_argument, 0, 'n'},
-    {"expect-authority", no_argument, 0, 'A'},
-    {"all", no_argument, 0, 'L'},
-    {"warning", required_argument, 0, 'w'},
-    {"critical", required_argument, 0, 'c'},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return ERROR;
-
-  for (c = 1; c < argc; c++)
-    if (strcmp ("-to", argv[c]) == 0)
-      strcpy (argv[c], "-t");
-
-  while (1) {
-    c = getopt_long (argc, argv, "hVvALnt:H:s:r:a:w:c:", long_opts, &opt_index);
-
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case 'h': /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case 'V': /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'v': /* version */
-      verbose = true;
-      break;
-    case 't': /* timeout period */
-      timeout_interval = atoi (optarg);
-      break;
-    case 'H': /* hostname */
-      if (strlen (optarg) >= ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      strcpy (query_address, optarg);
-      break;
-    case 's': /* server name */
-      /* TODO: this host_or_die check is probably unnecessary.
-       * Better to confirm nslookup response matches */
-      host_or_die(optarg);
-      if (strlen (optarg) >= ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      strcpy (dns_server, optarg);
-      break;
-    case 'r': /* reverse server name */
-      /* TODO: Is this host_or_die necessary? */
-      host_or_die(optarg);
-      if (strlen (optarg) >= ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      strcpy (ptr_server, optarg);
-      break;
-    case 'a': /* expected address */
-      if (strlen (optarg) >= ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      if (strchr(optarg, ',') != NULL) {
-        char *comma = strchr(optarg, ',');
-        while (comma != NULL) {
-          expected_address = (char **)realloc(expected_address, (expected_address_cnt+1) * sizeof(char**));
-          expected_address[expected_address_cnt] = strndup(optarg, comma - optarg);
-          expected_address_cnt++;
-          optarg = comma + 1;
-          comma = strchr(optarg, ',');
+        /* DNS server is not running... */
+        else if (strstr(input_buffer, "No response from server")) {
+                die(STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
+        } else if (strstr(input_buffer, "no servers could be reached")) {
+                die(STATE_CRITICAL, _("No response from DNS %s\n"), dns_server);
+        }
+
+        /* Host name is valid, but server doesn't have records... */
+        else if (strstr(input_buffer, "No records")) {
+                die(STATE_CRITICAL, _("DNS %s has no records\n"), dns_server);
+        }
+
+        /* 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"))) {
+                die(STATE_CRITICAL, _("Connection to DNS %s was refused\n"), dns_server);
+        }
+
+        /* Query refused (usually by an ACL in the namserver) */
+        else if (strstr(input_buffer, "Query refused")) {
+                die(STATE_CRITICAL, _("Query was refused by DNS server at %s\n"), dns_server);
+        }
+
+        /* No information (e.g. nameserver IP has two PTR records) */
+        else if (strstr(input_buffer, "No information")) {
+                die(STATE_CRITICAL, _("No information returned by DNS server at %s\n"), dns_server);
+        }
+
+        /* Network is unreachable */
+        else if (strstr(input_buffer, "Network is unreachable")) {
+                die(STATE_CRITICAL, _("Network is unreachable\n"));
+        }
+
+        /* Internal server failure */
+        else if (strstr(input_buffer, "Server failure")) {
+                die(STATE_CRITICAL, _("DNS failure for %s\n"), dns_server);
         }
-        expected_address = (char **)realloc(expected_address, (expected_address_cnt+1) * sizeof(char**));
-        expected_address[expected_address_cnt] = strdup(optarg);
-        expected_address_cnt++;
-      } else {
-        expected_address = (char **)realloc(expected_address, (expected_address_cnt+1) * sizeof(char**));
-        expected_address[expected_address_cnt] = strdup(optarg);
-        expected_address_cnt++;
-      }
-      break;
-    case 'n': /* expect NXDOMAIN */
-      expect_nxdomain = true;
-      break;
-    case 'A': /* expect authority */
-      expect_authority = true;
-      break;
-    case 'L': /* all must match */
-      all_match = true;
-      break;
-    case 'w':
-      warning = optarg;
-      break;
-    case 'c':
-      critical = optarg;
-      break;
-    default: /* args not parsable */
-      usage5();
-    }
-  }
-
-  c = optind;
-  if (strlen(query_address)==0 && c<argc) {
-    if (strlen(argv[c])>=ADDRESS_LENGTH)
-      die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-    strcpy (query_address, argv[c++]);
-  }
-
-  if (strlen(dns_server)==0 && c<argc) {
-    /* TODO: See -s option */
-    host_or_die(argv[c]);
-    if (strlen(argv[c]) >= ADDRESS_LENGTH)
-      die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-    strcpy (dns_server, argv[c++]);
-  }
-
-  set_thresholds(&time_thresholds, warning, critical);
-
-  return validate_arguments ();
+
+        /* Request error or the DNS lookup timed out */
+        else if (strstr(input_buffer, "Format error") || strstr(input_buffer, "Timed out")) {
+                return STATE_WARNING;
+        }
+
+        return STATE_OK;
 }
 
+/* process command-line arguments */
+check_dns_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'},
+                                                                                {"server", required_argument, 0, 's'},
+                                                                                {"reverse-server", required_argument, 0, 'r'},
+                                                                                {"expected-address", required_argument, 0, 'a'},
+                                                                                {"expect-nxdomain", no_argument, 0, 'n'},
+                                                                                {"expect-authority", no_argument, 0, 'A'},
+                                                                                {"all", no_argument, 0, 'L'},
+                                                                                {"warning", required_argument, 0, 'w'},
+                                                                                {"critical", required_argument, 0, 'c'},
+                                                                                {0, 0, 0, 0}};
+
+        check_dns_config_wrapper result = {
+                .config = check_dns_config_init(),
+                .errorcode = OK,
+        };
+
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
+
+        for (int index = 1; index < argc; index++) {
+                if (strcmp("-to", argv[index]) == 0) {
+                        strcpy(argv[index], "-t");
+                }
+        }
+
+        char *warning = NULL;
+        char *critical = NULL;
+        int opt_index = 0;
+        int index = 0;
+        while (true) {
+                index = getopt_long(argc, argv, "hVvALnt:H:s:r:a:w:c:", long_opts, &opt_index);
+
+                if (index == -1 || index == EOF) {
+                        break;
+                }
+
+                switch (index) {
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'v': /* version */
+                        verbose = true;
+                        break;
+                case 't': /* timeout period */
+                        timeout_interval = atoi(optarg);
+                        break;
+                case 'H': /* hostname */
+                        if (strlen(optarg) >= ADDRESS_LENGTH) {
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        }
+                        strcpy(result.config.query_address, optarg);
+                        break;
+                case 's': /* server name */
+                        /* TODO: this host_or_die check is probably unnecessary.
+                         * Better to confirm nslookup response matches */
+                        host_or_die(optarg);
+                        if (strlen(optarg) >= ADDRESS_LENGTH) {
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        }
+                        strcpy(result.config.dns_server, optarg);
+                        break;
+                case 'r': /* reverse server name */
+                        /* TODO: Is this host_or_die necessary? */
+                        // TODO This does not do anything!!! 2025-03-08 rincewind
+                        host_or_die(optarg);
+                        if (strlen(optarg) >= ADDRESS_LENGTH) {
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        }
+                        static char ptr_server[ADDRESS_LENGTH] = "";
+                        strcpy(ptr_server, optarg);
+                        break;
+                case 'a': /* expected address */
+                        if (strlen(optarg) >= ADDRESS_LENGTH) {
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        }
+                        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_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 **));
+                                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 **));
+                                result.config.expected_address[result.config.expected_address_cnt] = strdup(optarg);
+                                result.config.expected_address_cnt++;
+                        }
+                        break;
+                case 'n': /* expect NXDOMAIN */
+                        result.config.expect_nxdomain = true;
+                        break;
+                case 'A': /* expect authority */
+                        result.config.expect_authority = true;
+                        break;
+                case 'L': /* all must match */
+                        result.config.all_match = true;
+                        break;
+                case 'w':
+                        warning = optarg;
+                        break;
+                case 'c':
+                        critical = optarg;
+                        break;
+                default: /* args not parsable */
+                        usage5();
+                }
+        }
+
+        index = optind;
+        if (strlen(result.config.query_address) == 0 && index < argc) {
+                if (strlen(argv[index]) >= ADDRESS_LENGTH) {
+                        die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                }
+                strcpy(result.config.query_address, argv[index++]);
+        }
 
-int
-validate_arguments ()
-{
-  if (query_address[0] == 0) {
-    printf ("missing --host argument\n");
-    return ERROR;
-  }
+        if (strlen(result.config.dns_server) == 0 && index < argc) {
+                /* TODO: See -s option */
+                host_or_die(argv[index]);
+                if (strlen(argv[index]) >= ADDRESS_LENGTH) {
+                        die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                }
+                strcpy(result.config.dns_server, argv[index++]);
+        }
 
-  if (expected_address_cnt > 0 && expect_nxdomain) {
-    printf ("--expected-address and --expect-nxdomain cannot be combined\n");
-    return ERROR;
-  }
+        set_thresholds(&result.config.time_thresholds, warning, critical);
 
-  return OK;
+        return validate_arguments(result);
 }
 
+check_dns_config_wrapper validate_arguments(check_dns_config_wrapper config_wrapper) {
+        if (config_wrapper.config.query_address[0] == 0) {
+                printf("missing --host argument\n");
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
+        }
+
+        if (config_wrapper.config.expected_address_cnt > 0 && config_wrapper.config.expect_nxdomain) {
+                printf("--expected-address and --expect-nxdomain cannot be combined\n");
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
+        }
 
-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", _("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 ("\n\n");
-
-  print_usage ();
-
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
-
-  printf (" -H, --hostname=HOST\n");
-  printf ("    %s\n", _("The name or address you want to query"));
-  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", _("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", _("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"));
-  printf (" -w, --warning=seconds\n");
-  printf ("    %s\n", _("Return warning if elapsed time exceeds value. Default off"));
-  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", _("returned. Default off"));
-
-  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-  printf (UT_SUPPORT);
+        return config_wrapper;
 }
 
+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", _("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("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" -H, --hostname=HOST\n");
+        printf("    %s\n", _("The name or address you want to query"));
+        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", _("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", _("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"));
+        printf(" -w, --warning=seconds\n");
+        printf("    %s\n", _("Return warning if elapsed time exceeds value. Default off"));
+        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", _("returned. Default off"));
+
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf(UT_SUPPORT);
+}
 
-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);
+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);
 }
diff --git a/plugins/check_dns.d/config.h b/plugins/check_dns.d/config.h
new file mode 100644
index 00000000..9ec4eb82
--- /dev/null
+++ b/plugins/check_dns.d/config.h
@@ -0,0 +1,34 @@
+#pragma once
+
+#include "../../config.h"
+#include "thresholds.h"
+#include <stddef.h>
+
+#define ADDRESS_LENGTH 256
+
+typedef struct {
+        bool all_match;
+        char dns_server[ADDRESS_LENGTH];
+        char query_address[ADDRESS_LENGTH];
+        bool expect_nxdomain;
+        bool expect_authority;
+        char **expected_address;
+        size_t expected_address_cnt;
+
+        thresholds *time_thresholds;
+} check_dns_config;
+
+check_dns_config check_dns_config_init() {
+        check_dns_config tmp = {
+                .all_match = false,
+                .dns_server = "",
+                .query_address = "",
+                .expect_nxdomain = false,
+                .expect_authority = false,
+                .expected_address = NULL,
+                .expected_address_cnt = 0,
+
+                .time_thresholds = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_dummy.c b/plugins/check_dummy.c
index 212a1344..19f6c046 100644
--- a/plugins/check_dummy.c
+++ b/plugins/check_dummy.c
@@ -1,124 +1,111 @@
 /*****************************************************************************
-* 
-* Monitoring check_dummy plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_dummy plugin
-* 
-* This plugin will simply return the state corresponding to the numeric value
-* 
-* 
-* 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_dummy plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_dummy plugin
+ *
+ * This plugin will simply return the state corresponding to the numeric value
+ *
+ *
+ * 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_dummy";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 
-void print_help (void);
-void print_usage (void);
-
-
-int
-main (int argc, char **argv)
-{
-  int result = STATE_UNKNOWN;
-
-  setlocale (LC_ALL, "");
-  bindtextdomain (PACKAGE, LOCALEDIR);
-  textdomain (PACKAGE);
-
-  if (argc < 2)
-    usage4 (_("Could not parse arguments"));
-  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]))
-    usage4 (_("Arguments to check_dummy must be an integer"));
-  else
-    result = atoi (argv[1]);
-
-  switch (result) {
-  case STATE_OK:
-    printf (_("OK"));
-    break;
-  case STATE_WARNING:
-    printf (_("WARNING"));
-    break;
-  case STATE_CRITICAL:
-    printf (_("CRITICAL"));
-    break;
-  case STATE_UNKNOWN:
-    printf (_("UNKNOWN"));
-    break;
-  default:
-    printf (_("UNKNOWN"));
-    printf (": ");
-    printf (_("Status %d is not a supported error state\n"), result);
-    return STATE_UNKNOWN;
-  }
-
-  if (argc >= 3)
-    printf (": %s", argv[2]);
-
-  printf("\n");
-
-  return result;
+static void print_help(void);
+void print_usage(void);
+
+int main(int argc, char **argv) {
+        int result = STATE_UNKNOWN;
+
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+
+        if (argc < 2)
+                usage4(_("Could not parse arguments"));
+        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]))
+                usage4(_("Arguments to check_dummy must be an integer"));
+        else
+                result = atoi(argv[1]);
+
+        switch (result) {
+        case STATE_OK:
+                printf(_("OK"));
+                break;
+        case STATE_WARNING:
+                printf(_("WARNING"));
+                break;
+        case STATE_CRITICAL:
+                printf(_("CRITICAL"));
+                break;
+        case STATE_UNKNOWN:
+                printf(_("UNKNOWN"));
+                break;
+        default:
+                printf(_("UNKNOWN"));
+                printf(": ");
+                printf(_("Status %d is not a supported error state\n"), result);
+                return STATE_UNKNOWN;
+        }
+
+        if (argc >= 3)
+                printf(": %s", argv[2]);
+
+        printf("\n");
+
+        return result;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
+        printf("%s\n", _("This plugin will simply return the state corresponding to the numeric value"));
 
-  printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("%s\n", _("of the <state> argument with optional text"));
 
-  printf ("%s\n", _("This plugin will simply return the state corresponding to the numeric value"));
+        printf("\n\n");
 
-  printf ("%s\n", _("of the <state> argument with optional text"));
+        print_usage();
 
-  printf ("\n\n");
+        printf(UT_HELP_VRSN);
 
-  print_usage ();
-
-  printf (UT_HELP_VRSN);
-
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s <integer state> [optional text]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s <integer state> [optional text]\n", progname);
 }
diff --git a/plugins/check_fping.c b/plugins/check_fping.c
index 70d6f9fc..8018e06d 100644
--- a/plugins/check_fping.c
+++ b/plugins/check_fping.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring check_fping plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_disk plugin
-* 
-* This plugin will use the fping command to ping the specified host for a
-* fast check
-* 
-* 
-* 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_fping plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_fping plugin
+ *
+ * This plugin will use the fping command to ping the specified host for a
+ * fast check
+ *
+ *
+ * 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_fping";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -38,490 +38,544 @@ const char *email = "devel@monitoring-plugins.org";
 #include "netutils.h"
 #include "utils.h"
 #include <stdbool.h>
+#include "check_fping.d/config.h"
+#include "states.h"
 
 enum {
-  PACKET_COUNT = 1,
-  PACKET_SIZE = 56,
-  PL = 0,
-  RTA = 1
+        PL = 0,
+        RTA = 1
 };
 
-int textscan (char *buf);
-int process_arguments (int, char **);
-int get_threshold (char *arg, char *rv[2]);
-void print_help (void);
-void print_usage (void);
-
-char *server_name = NULL;
-char *sourceip = NULL;
-char *sourceif = NULL;
-int packet_size = PACKET_SIZE;
-int packet_count = PACKET_COUNT;
-int target_timeout = 0;
-int packet_interval = 0;
-bool verbose = false;
-int cpl;
-int wpl;
-double crta;
-double wrta;
-bool cpl_p = false;
-bool wpl_p = false;
-bool alive_p = false;
-bool crta_p = false;
-bool wrta_p = false;
-
-int
-main (int argc, char **argv)
-{
-/* normally should be  int result = STATE_UNKNOWN; */
-
-  int status = STATE_UNKNOWN;
-  int result = 0;
-  char *fping_prog = NULL;
-  char *server = NULL;
-  char *command_line = NULL;
-  char *input_buffer = NULL;
-  char *option_string = "";
-  input_buffer = malloc (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"));
-
-  server = strscpy (server, server_name);
-
-  /* compose the command */
-  if (target_timeout)
-    xasprintf(&option_string, "%s-t %d ", option_string, target_timeout);
-  if (packet_interval)
-    xasprintf(&option_string, "%s-p %d ", option_string, packet_interval);
-  if (sourceip)
-    xasprintf(&option_string, "%s-S %s ", option_string, sourceip);
-  if (sourceif)
-    xasprintf(&option_string, "%s-I %s ", option_string, sourceif);
-
-#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);
-#else
-  fping_prog = strdup(PATH_TO_FPING);
-#endif
-
-  xasprintf (&command_line, "%s %s-b %d -c %d %s", fping_prog,
-            option_string, packet_size, packet_count, server);
-
-  if (verbose)
-    printf ("%s\n", command_line);
-
-  /* run the command */
-  child_process = spopen (command_line);
-  if (child_process == NULL) {
-    printf (_("Could not open pipe: %s\n"), command_line);
-    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"), command_line);
-  }
-
-  while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
-    if (verbose)
-      printf ("%s", input_buffer);
-    status = max_state (status, textscan (input_buffer));
-  }
-
-  /* If we get anything on STDERR, at least set warning */
-  while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
-    status = max_state (status, STATE_WARNING);
-    if (verbose)
-      printf ("%s", input_buffer);
-    status = max_state (status, textscan (input_buffer));
-  }
-  (void) fclose (child_stderr);
-
-  /* close the pipe */
-  result = spclose (child_process);
-  if (result) {
-    /* need to use max_state not max */
-    status = max_state (status, STATE_WARNING);
-  }
-
-  if (result > 1 ) {
-    status = max_state (status, STATE_UNKNOWN);
-    if (result == 2) {
-      die (STATE_UNKNOWN, _("FPING UNKNOWN - IP address not found\n"));
-    }
-    if (result == 3) {
-      die (STATE_UNKNOWN, _("FPING UNKNOWN - invalid commandline argument\n"));
-    }
-    if (result == 4) {
-      die (STATE_UNKNOWN, _("FPING UNKNOWN - failed system call\n"));
-    }
-
-  }
-
-  printf ("FPING %s - %s\n", state_text (status), server_name);
-
-  return status;
+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;
+        check_fping_config config;
+} check_fping_config_wrapper;
+static check_fping_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static int get_threshold(char *arg, char *rv[2]);
+static void print_help(void);
+void print_usage(void);
+
+static bool verbose = false;
+
+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_fping_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        const check_fping_config config = tmp_config.config;
+
+        char *server = NULL;
+        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);
+        }
+        if (config.packet_interval) {
+                xasprintf(&option_string, "%s-p %d ", option_string, config.packet_interval);
+        }
+        if (config.sourceip) {
+                xasprintf(&option_string, "%s-S %s ", option_string, config.sourceip);
+        }
+        if (config.sourceif) {
+                xasprintf(&option_string, "%s-I %s ", option_string, config.sourceif);
+        }
+        if (config.dontfrag) {
+                xasprintf(&option_string, "%s-M ", option_string);
+        }
+        if (config.randomize_packet_data) {
+                xasprintf(&option_string, "%s-R ", option_string);
+        }
+
+        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);
+        }
+
+        char *command_line = NULL;
+
+        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);
+        }
+
+        /* run the command */
+        child_process = spopen(command_line);
+        if (child_process == NULL) {
+                printf(_("Could not open pipe: %s\n"), command_line);
+                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"), command_line);
+        }
+
+        char *input_buffer = malloc(MAX_INPUT_BUFFER);
+        mp_state_enum status = STATE_UNKNOWN;
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+                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));
+        }
+
+        /* If we get anything on STDERR, at least set warning */
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+                status = max_state(status, STATE_WARNING);
+                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));
+        }
+        (void)fclose(child_stderr);
+
+        /* close the pipe */
+        int result = spclose(child_process);
+        if (result) {
+                /* need to use max_state not max */
+                status = max_state(status, STATE_WARNING);
+        }
+
+        if (result > 1) {
+                status = max_state(status, STATE_UNKNOWN);
+                if (result == 2) {
+                        die(STATE_UNKNOWN, _("FPING UNKNOWN - IP address not found\n"));
+                }
+                if (result == 3) {
+                        die(STATE_UNKNOWN, _("FPING UNKNOWN - invalid commandline argument\n"));
+                }
+                if (result == 4) {
+                        die(STATE_UNKNOWN, _("FPING UNKNOWN - failed system call\n"));
+                }
+        }
+
+        printf("FPING %s - %s\n", state_text(status), config.server_name);
+
+        return status;
 }
 
-
-int textscan (char *buf) {
-  char *rtastr = NULL;
-  char *losstr = NULL;
-  char *xmtstr = NULL;
-  double loss;
-  double rta;
-  double xmt;
-  int status = STATE_UNKNOWN;
-
-  /* stops testing after the first successful reply. */
-  if (alive_p && strstr(buf, "avg, 0% loss)")) {
-    rtastr = strstr (buf, "ms (");
-    rtastr = 1 + index(rtastr, '(');
-    rta = strtod(rtastr, NULL);
-    loss=strtod("0",NULL);
-    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));
-  }
-
-  if (strstr (buf, "not found")) {
-    die (STATE_CRITICAL, _("FPING UNKNOWN - %s not found\n"), server_name);
-
-  }
-  else if (strstr (buf, "is unreachable") || strstr (buf, "Unreachable")) {
-    die (STATE_CRITICAL, _("FPING CRITICAL - %s is unreachable\n"),
-               "host");
-
-  }
-  else if (strstr (buf, "Operation not permitted") || strstr (buf, "No such device") ) {
-    die (STATE_UNKNOWN, _("FPING UNKNOWN - %s parameter error\n"),
-               "host");
-  }
-  else if (strstr (buf, "is down")) {
-    die (STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
-
-  }
-  else if (strstr (buf, "is alive")) {
-    status = STATE_OK;
-
-  }
-  else if (strstr (buf, "xmt/rcv/%loss") && strstr (buf, "min/avg/max")) {
-    losstr = strstr (buf, "=");
-    losstr = 1 + strstr (losstr, "/");
-    losstr = 1 + strstr (losstr, "/");
-    rtastr = strstr (buf, "min/avg/max");
-    rtastr = strstr (rtastr, "=");
-    rtastr = 1 + index (rtastr, '/');
-    loss = strtod (losstr, NULL);
-    rta = strtod (rtastr, NULL);
-    if (cpl_p && loss > cpl)
-      status = STATE_CRITICAL;
-    else if (crta_p && rta > crta)
-      status = STATE_CRITICAL;
-    else if (wpl_p && loss > wpl)
-      status = STATE_WARNING;
-    else if (wrta_p && rta > wrta)
-      status = STATE_WARNING;
-    else
-      status = STATE_OK;
-    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, true, 0, true, 100),
-         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 */
-    /* in v2.4b2: 10.99.0.1 : xmt/rcv/%loss = 0/0/0% */
-    losstr = strstr (buf, "=");
-    xmtstr = 1 + losstr;
-    xmt = strtod (xmtstr, NULL);
-    if(xmt == 0)
-        die (STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
-    losstr = 1 + strstr (losstr, "/");
-    losstr = 1 + strstr (losstr, "/");
-    loss = strtod (losstr, NULL);
-    if (atoi(losstr) == 100)
-      status = STATE_CRITICAL;
-    else if (cpl_p && loss > cpl)
-      status = STATE_CRITICAL;
-    else if (wpl_p && loss > wpl)
-      status = STATE_WARNING;
-    else
-      status = STATE_OK;
-    /* loss=%.0f%%;%d;%d;0;100 */
-    die (status, _("FPING %s - %s (loss=%.0f%% )|%s\n"),
-         state_text (status), server_name, loss ,
-         perfdata ("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, true, 0, true, 100));
-
-  }
-  else {
-    status = max_state (status, STATE_WARNING);
-  }
-
-  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) {
+        /* stops testing after the first successful reply. */
+        double rta;
+        double loss;
+        char *rtastr = NULL;
+        if (alive_p && strstr(buf, "avg, 0% loss)")) {
+                rtastr = strstr(buf, "ms (");
+                rtastr = 1 + index(rtastr, '(');
+                rta = strtod(rtastr, NULL);
+                loss = strtod("0", NULL);
+                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));
+        }
+
+        mp_state_enum status = STATE_UNKNOWN;
+        char *xmtstr = NULL;
+        double xmt;
+        char *losstr = NULL;
+        if (strstr(buf, "not found")) {
+                die(STATE_CRITICAL, _("FPING UNKNOWN - %s not found\n"), server_name);
+
+        } else if (strstr(buf, "is unreachable") || strstr(buf, "Unreachable")) {
+                die(STATE_CRITICAL, _("FPING CRITICAL - %s is unreachable\n"), "host");
+
+        } else if (strstr(buf, "Operation not permitted") || strstr(buf, "No such device")) {
+                die(STATE_UNKNOWN, _("FPING UNKNOWN - %s parameter error\n"), "host");
+        } else if (strstr(buf, "is down")) {
+                die(STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
+
+        } else if (strstr(buf, "is alive")) {
+                status = STATE_OK;
+
+        } else if (strstr(buf, "xmt/rcv/%loss") && strstr(buf, "min/avg/max")) {
+                losstr = strstr(buf, "=");
+                losstr = 1 + strstr(losstr, "/");
+                losstr = 1 + strstr(losstr, "/");
+                rtastr = strstr(buf, "min/avg/max");
+                rtastr = strstr(rtastr, "=");
+                rtastr = 1 + index(rtastr, '/');
+                loss = strtod(losstr, NULL);
+                rta = strtod(rtastr, NULL);
+                if (cpl_p && loss > cpl) {
+                        status = STATE_CRITICAL;
+                } else if (crta_p && rta > crta) {
+                        status = STATE_CRITICAL;
+                } else if (wpl_p && loss > wpl) {
+                        status = STATE_WARNING;
+                } else if (wrta_p && rta > wrta) {
+                        status = STATE_WARNING;
+                } else {
+                        status = STATE_OK;
+                }
+                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));
+
+        } else if (strstr(buf, "xmt/rcv/%loss")) {
+                /* no min/max/avg if host was unreachable in fping v2.2.b1 */
+                /* in v2.4b2: 10.99.0.1 : xmt/rcv/%loss = 0/0/0% */
+                losstr = strstr(buf, "=");
+                xmtstr = 1 + losstr;
+                xmt = strtod(xmtstr, NULL);
+                if (xmt == 0) {
+                        die(STATE_CRITICAL, _("FPING CRITICAL - %s is down\n"), server_name);
+                }
+                losstr = 1 + strstr(losstr, "/");
+                losstr = 1 + strstr(losstr, "/");
+                loss = strtod(losstr, NULL);
+                if (atoi(losstr) == 100) {
+                        status = STATE_CRITICAL;
+                } else if (cpl_p && loss > cpl) {
+                        status = STATE_CRITICAL;
+                } else if (wpl_p && loss > wpl) {
+                        status = STATE_WARNING;
+                } else {
+                        status = STATE_OK;
+                }
+                /* loss=%.0f%%;%d;%d;0;100 */
+                die(status, _("FPING %s - %s (loss=%.0f%% )|%s\n"), state_text(status), server_name, loss,
+                        perfdata("loss", (long int)loss, "%", wpl_p, wpl, cpl_p, cpl, false, 0, false, 0));
+
+        } else {
+                status = max_state(status, STATE_WARNING);
+        }
+
+        return status;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-  int c;
-  char *rv[2];
-
-  int option = 0;
-  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'},
-    {0, 0, 0, 0}
-  };
-
-  rv[PL] = NULL;
-  rv[RTA] = NULL;
-
-  if (argc < 2)
-    return ERROR;
-
-  if (!is_option (argv[1])) {
-    server_name = argv[1];
-    argv[1] = argv[0];
-    argv = &argv[1];
-    argc--;
-  }
-
-  while (1) {
-    c = getopt_long (argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:46", longopts, &option);
-
-    if (c == -1 || c == EOF || c == 1)
-      break;
-
-    switch (c) {
-    case '?':                 /* print short usage statement if args not parsable */
-      usage5 ();
-    case 'a':                 /* host alive mode */
-      alive_p = true;
-      break;
-    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) == false) {
-        usage2 (_("Invalid hostname/address"), optarg);
-      }
-      server_name = strscpy (server_name, optarg);
-      break;
-    case 'S':                 /* sourceip */
-      if (is_host (optarg) == false) {
-        usage2 (_("Invalid hostname/address"), optarg);
-      }
-      sourceip = strscpy (sourceip, optarg);
-      break;
-    case 'I':                 /* sourceip */
-      sourceif = strscpy (sourceif, optarg);
-                        break;
-    case '4':                 /* IPv4 only */
-      address_family = AF_INET;
-      break;
-    case '6':                 /* IPv6 only */
-#ifdef USE_IPV6
-      address_family = AF_INET6;
-#else
-      usage (_("IPv6 support not available\n"));
+check_fping_config_wrapper process_arguments(int argc, char **argv) {
+        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
-      break;
-    case 'c':
-      get_threshold (optarg, rv);
-      if (rv[RTA]) {
-        crta = strtod (rv[RTA], NULL);
-        crta_p = true;
-        rv[RTA] = NULL;
-      }
-      if (rv[PL]) {
-        cpl = atoi (rv[PL]);
-        cpl_p = true;
-        rv[PL] = NULL;
-      }
-      break;
-    case 'w':
-      get_threshold (optarg, rv);
-      if (rv[RTA]) {
-        wrta = strtod (rv[RTA], NULL);
-        wrta_p = true;
-        rv[RTA] = NULL;
-      }
-      if (rv[PL]) {
-        wpl = atoi (rv[PL]);
-        wpl_p = true;
-        rv[PL] = NULL;
-      }
-      break;
-    case 'b':                 /* bytes per packet */
-      if (is_intpos (optarg))
-        packet_size = atoi (optarg);
-      else
-        usage (_("Packet size must be a positive integer"));
-      break;
-    case 'n':                 /* number of packets */
-      if (is_intpos (optarg))
-        packet_count = atoi (optarg);
-      else
-        usage (_("Packet count must be a positive integer"));
-      break;
-    case 'T':                 /* timeout in msec */
-      if (is_intpos (optarg))
-        target_timeout = atoi (optarg);
-      else
-        usage (_("Target timeout must be a positive integer"));
-      break;
-    case 'i':                 /* interval in msec */
-      if (is_intpos (optarg))
-        packet_interval = atoi (optarg);
-      else
-        usage (_("Interval must be a positive integer"));
-      break;
-    }
-  }
-
-  if (server_name == NULL)
-    usage4 (_("Hostname was not supplied"));
-
-  return OK;
-}
-
+                                                                           {0, 0, 0, 0}};
 
-int
-get_threshold (char *arg, char *rv[2])
-{
-  char *arg1 = NULL;
-  char *arg2 = NULL;
-
-  arg1 = strscpy (arg1, arg);
-  if (strpbrk (arg1, ",:"))
-    arg2 = 1 + strpbrk (arg1, ",:");
-
-  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);
-    if (!strstr (arg1, "%") && !strstr (arg2, "%"))
-      die (STATE_UNKNOWN,
-                 _("%s: Only one threshold must be packet loss (%s)\n"),
-                 progname, arg);
-  }
-
-  if (arg2 && strstr (arg2, "%")) {
-    rv[PL] = arg2;
-    rv[RTA] = arg1;
-  }
-  else if (arg2) {
-    rv[PL] = arg1;
-    rv[RTA] = arg2;
-  }
-  else if (strstr (arg1, "%")) {
-    rv[PL] = arg1;
-  }
-  else {
-    rv[RTA] = arg1;
-  }
-
-  return OK;
-}
+        char *rv[2];
+        rv[PL] = NULL;
+        rv[RTA] = NULL;
 
+        int option = 0;
 
-void print_help (void) {
+        check_fping_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_fping_config_init(),
+        };
 
-  print_revision (progname, NP_VERSION);
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-  printf ("Copyright (c) 1999 Didi Rieder <adrieder@sbox.tu-graz.ac.at>\n");
-  printf (COPYRIGHT, copyright, email);
+        if (!is_option(argv[1])) {
+                result.config.server_name = argv[1];
+                argv[1] = argv[0];
+                argv = &argv[1];
+                argc--;
+        }
 
-  printf ("%s\n", _("This plugin will use the fping command to ping the specified host for a fast check"));
+        while (true) {
+                int option_index = getopt_long(argc, argv, "+hVvaH:S:c:w:b:n:T:i:I:M:R:46", longopts, &option);
 
-  printf ("%s\n", _("Note that it is necessary to set the suid flag on fping."));
+                if (option_index == -1 || option_index == EOF || option_index == 1) {
+                        break;
+                }
 
-  printf ("\n\n");
+                switch (option_index) {
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'a': /* host alive mode */
+                        result.config.alive_p = true;
+                        break;
+                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);
+                        }
+                        result.config.server_name = optarg;
+                        break;
+                case 'S': /* sourceip */
+                        if (!is_host(optarg)) {
+                                usage2(_("Invalid hostname/address"), optarg);
+                        }
+                        result.config.sourceip = optarg;
+                        break;
+                case 'I': /* sourceip */
+                        result.config.sourceif = optarg;
+                        break;
+                case '4': /* IPv4 only */
+                        address_family = AF_INET;
+                        break;
+                case '6': /* IPv6 only */
+                        address_family = AF_INET6;
+                        break;
+                case 'c':
+                        get_threshold(optarg, rv);
+                        if (rv[RTA]) {
+                                result.config.crta = strtod(rv[RTA], NULL);
+                                result.config.crta_p = true;
+                                rv[RTA] = NULL;
+                        }
+                        if (rv[PL]) {
+                                result.config.cpl = atoi(rv[PL]);
+                                result.config.cpl_p = true;
+                                rv[PL] = NULL;
+                        }
+                        break;
+                case 'w':
+                        get_threshold(optarg, rv);
+                        if (rv[RTA]) {
+                                result.config.wrta = strtod(rv[RTA], NULL);
+                                result.config.wrta_p = true;
+                                rv[RTA] = NULL;
+                        }
+                        if (rv[PL]) {
+                                result.config.wpl = atoi(rv[PL]);
+                                result.config.wpl_p = true;
+                                rv[PL] = NULL;
+                        }
+                        break;
+                case 'b': /* bytes per packet */
+                        if (is_intpos(optarg)) {
+                                result.config.packet_size = atoi(optarg);
+                        } else {
+                                usage(_("Packet size must be a positive integer"));
+                        }
+                        break;
+                case 'n': /* number of packets */
+                        if (is_intpos(optarg)) {
+                                result.config.packet_count = atoi(optarg);
+                        } else {
+                                usage(_("Packet count must be a positive integer"));
+                        }
+                        break;
+                case 'T': /* timeout in msec */
+                        if (is_intpos(optarg)) {
+                                result.config.target_timeout = atoi(optarg);
+                        } else {
+                                usage(_("Target timeout must be a positive integer"));
+                        }
+                        break;
+                case 'i': /* interval in msec */
+                        if (is_intpos(optarg)) {
+                                result.config.packet_interval = atoi(optarg);
+                        } else {
+                                usage(_("Interval must be a positive integer"));
+                        }
+                        break;
+                case 'R':
+                        result.config.randomize_packet_data = true;
+                        break;
+                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;
+                }
+        }
 
-  print_usage ();
+        if (result.config.server_name == NULL) {
+                usage4(_("Hostname was not supplied"));
+        }
 
-  printf (UT_HELP_VRSN);
-  printf (UT_EXTRA_OPTS);
+        return result;
+}
 
-  printf (UT_IPv46);
+int get_threshold(char *arg, char *rv[2]) {
+        char *arg2 = NULL;
+
+        char *arg1 = strdup(arg);
+        if (strpbrk(arg1, ",:")) {
+                arg2 = 1 + strpbrk(arg1, ",:");
+        }
+
+        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);
+                }
+                if (!strstr(arg1, "%") && !strstr(arg2, "%")) {
+                        die(STATE_UNKNOWN, _("%s: Only one threshold must be packet loss (%s)\n"), progname, arg);
+                }
+        }
+
+        if (arg2 && strstr(arg2, "%")) {
+                rv[PL] = arg2;
+                rv[RTA] = arg1;
+        } else if (arg2) {
+                rv[PL] = arg1;
+                rv[RTA] = arg2;
+        } else if (strstr(arg1, "%")) {
+                rv[PL] = arg1;
+        } else {
+                rv[RTA] = arg1;
+        }
+
+        return OK;
+}
 
-  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", "-w, --warning=THRESHOLD");
-  printf ("    %s\n", _("warning threshold pair"));
-  printf (" %s\n", "-c, --critical=THRESHOLD");
-  printf ("    %s\n", _("critical threshold pair"));
-  printf (" %s\n", "-a, --alive");
-  printf ("    %s\n", _("Return OK after first successful reply"));
-  printf (" %s\n", "-b, --bytes=INTEGER");
-  printf ("    %s (default: %d)\n", _("size of ICMP packet"),PACKET_SIZE);
-  printf (" %s\n", "-n, --number=INTEGER");
-  printf ("    %s (default: %d)\n", _("number of ICMP packets to send"),PACKET_COUNT);
-  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\n", "-S, --sourceip=HOST");
-  printf ("    %s\n", _("name or IP Address of sourceip"));
-  printf (" %s\n", "-I, --sourceif=IF");
-  printf ("    %s\n", _("source interface name"));
-  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", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
-  printf (" %s\n", _("packet loss to trigger an alarm state."));
+void print_help(void) {
+
+        print_revision(progname, NP_VERSION);
+
+        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", _("Note that it is necessary to set the suid flag on fping."));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        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", "-w, --warning=THRESHOLD");
+        printf("    %s\n", _("warning threshold pair"));
+        printf(" %s\n", "-c, --critical=THRESHOLD");
+        printf("    %s\n", _("critical threshold pair"));
+        printf(" %s\n", "-a, --alive");
+        printf("    %s\n", _("Return OK after first successful reply"));
+        printf(" %s\n", "-b, --bytes=INTEGER");
+        printf("    %s (default: %d)\n", _("size of ICMP packet"), PACKET_SIZE);
+        printf(" %s\n", "-n, --number=INTEGER");
+        printf("    %s (default: %d)\n", _("number of ICMP packets to send"), PACKET_COUNT);
+        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\n", "-S, --sourceip=HOST");
+        printf("    %s\n", _("name or IP Address of sourceip"));
+        printf(" %s\n", "-I, --sourceif=IF");
+        printf("    %s\n", _("source interface name"));
+        printf(" %s\n", "-M, --dontfrag");
+        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", _("which triggers a WARNING or CRITICAL state, and <pl> is the percentage of"));
+        printf(" %s\n", _("packet loss to trigger an alarm state."));
 
-  printf ("\n");
-  printf (" %s\n", _("IPv4 is used by default. Specify -6 to use IPv6."));
+        printf("\n");
+        printf(" %s\n", _("IPv4 is used by default. Specify -6 to use IPv6."));
 
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-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);
+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);
 }
diff --git a/plugins/check_fping.d/config.h b/plugins/check_fping.d/config.h
new file mode 100644
index 00000000..d95e9ded
--- /dev/null
+++ b/plugins/check_fping.d/config.h
@@ -0,0 +1,82 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+enum {
+        PACKET_SIZE = 56,
+        PACKET_COUNT = 1,
+};
+
+typedef struct {
+        char *server_name;
+        char *sourceip;
+        char *sourceif;
+        int packet_size;
+        int packet_count;
+        int target_timeout;
+        int packet_interval;
+        bool randomize_packet_data;
+        bool dontfrag;
+        bool alive_p;
+
+        double crta;
+        bool crta_p;
+        double wrta;
+        bool wrta_p;
+
+        int cpl;
+        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() {
+        check_fping_config tmp = {
+                .server_name = NULL,
+                .sourceip = NULL,
+                .sourceif = NULL,
+                .packet_size = PACKET_SIZE,
+                .packet_count = PACKET_COUNT,
+                .target_timeout = 0,
+                .packet_interval = 0,
+                .randomize_packet_data = false,
+                .dontfrag = false,
+                .alive_p = false,
+
+                .crta = 0,
+                .crta_p = false,
+                .wrta = 0,
+                .wrta_p = false,
+
+                .cpl = 0,
+                .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 ca126973..c0193b03 100644
--- a/plugins/check_game.c
+++ b/plugins/check_game.c
@@ -1,335 +1,317 @@
 /*****************************************************************************
-* 
-* Monitoring check_game plugin
-* 
-* License: GPL
-* Copyright (c) 2002-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_game plugin
-* 
-* This plugin tests game server connections with the specified host.
-* using the qstat program
-* 
-* 
-* 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_game plugin
+ *
+ * License: GPL
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_game plugin
+ *
+ * This plugin tests game server connections with the specified host.
+ * using the qstat program
+ *
+ *
+ * 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_game";
-const char *copyright = "2002-2007";
+const char *copyright = "2002-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 #include "runcmd.h"
+#include "check_game.d/config.h"
+#include "../lib/monitoringplug.h"
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
+typedef struct {
+        int errorcode;
+        check_game_config config;
+} check_game_config_wrapper;
 
-#define QSTAT_DATA_DELIMITER  ","
+static check_game_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
+void print_usage(void);
 
-#define QSTAT_HOST_ERROR  "ERROR"
-#define QSTAT_HOST_DOWN   "DOWN"
-#define QSTAT_HOST_TIMEOUT  "TIMEOUT"
-#define QSTAT_MAX_RETURN_ARGS 12
-
-char *server_ip;
-char *game_type;
-int port = 0;
-
-bool verbose = false;
-
-int qstat_game_players_max = -1;
-int qstat_game_players = -1;
-int qstat_game_field = -1;
-int qstat_map_field = -1;
-int qstat_ping_field = -1;
-
-
-int
-main (int argc, char **argv)
-{
-  char *command_line;
-  int result = STATE_UNKNOWN;
-  char *p, *ret[QSTAT_MAX_RETURN_ARGS];
-  size_t i = 0;
-  output chld_out;
-
-  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)
-    usage_va(_("Could not parse arguments"));
-
-  result = STATE_OK;
-
-  /* create the command line to execute */
-  xasprintf (&command_line, "%s -raw %s -%s %s",
-            PATH_TO_QSTAT, QSTAT_DATA_DELIMITER, game_type, server_ip);
-
-  if (port)
-    xasprintf (&command_line, "%s:%-d", command_line, port);
-
-  if (verbose)
-    printf ("%s\n", command_line);
-
-  /* run the command. historically, this plugin ignores output on stderr,
-   * as well as return status of the qstat program */
-  (void)np_runcmd(command_line, &chld_out, NULL, 0);
-
-  /* sanity check */
-  /* was thinking about running qstat without any options, capturing the
-     -default line, parsing it & making an array of all know server types
-     but thought this would be too much hassle considering this is a tool
-     for intelligent sysadmins (ha). Could put a static array of known
-     server types in a header file but then we'd be limiting ourselves
-
-     In the end, I figured I'd simply let an error occur & then trap it
-   */
-
-  if (!strncmp (chld_out.line[0], "unknown option", 14)) {
-    printf (_("CRITICAL - Host type parameter incorrect!\n"));
-    result = STATE_CRITICAL;
-    return result;
-  }
-
-  p = (char *) strtok (chld_out.line[0], QSTAT_DATA_DELIMITER);
-  while (p != NULL) {
-    ret[i] = p;
-    p = (char *) strtok (NULL, QSTAT_DATA_DELIMITER);
-    i++;
-    if (i >= QSTAT_MAX_RETURN_ARGS)
-      break;
-  }
-
-  if (strstr (ret[2], QSTAT_HOST_ERROR)) {
-    printf (_("CRITICAL - Host not found\n"));
-    result = STATE_CRITICAL;
-  }
-  else if (strstr (ret[2], QSTAT_HOST_DOWN)) {
-    printf (_("CRITICAL - Game server down or unavailable\n"));
-    result = STATE_CRITICAL;
-  }
-  else if (strstr (ret[2], QSTAT_HOST_TIMEOUT)) {
-    printf (_("CRITICAL - Game server timeout\n"));
-    result = STATE_CRITICAL;
-  }
-  else {
-    printf ("OK: %s/%s %s (%s), Ping: %s ms|%s %s\n",
-            ret[qstat_game_players],
-            ret[qstat_game_players_max],
-            ret[qstat_game_field],
-            ret[qstat_map_field],
-            ret[qstat_ping_field],
-            perfdata ("players", atol(ret[qstat_game_players]), "",
-                      false, 0, false, 0,
-                      true, 0, true, atol(ret[qstat_game_players_max])),
-            fperfdata ("ping", strtod(ret[qstat_ping_field], NULL), "",
-                      false, 0, false, 0,
-                      true, 0, false, 0));
-  }
-
-  return result;
-}
+#define QSTAT_DATA_DELIMITER ","
 
+#define QSTAT_HOST_ERROR      "ERROR"
+#define QSTAT_HOST_DOWN       "DOWN"
+#define QSTAT_HOST_TIMEOUT    "TIMEOUT"
+#define QSTAT_MAX_RETURN_ARGS 12
 
-int
-process_arguments (int argc, char **argv)
-{
-  int c;
-
-  int opt_index = 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, 129},
-    {"max-players-field", required_argument, 0, 130},
-    {0, 0, 0, 0}
-  };
-
-  if (argc < 2)
-    return ERROR;
-
-  for (c = 1; c < argc; c++) {
-    if (strcmp ("-mf", argv[c]) == 0)
-      strcpy (argv[c], "-m");
-    else if (strcmp ("-pf", argv[c]) == 0)
-      strcpy (argv[c], "-p");
-    else if (strcmp ("-gf", argv[c]) == 0)
-      strcpy (argv[c], "-g");
-  }
-
-  while (1) {
-    c = getopt_long (argc, argv, "hVvt:H:P:G:g:p:m:", long_opts, &opt_index);
-
-    if (c == -1 || c == EOF)
-      break;
-
-    switch (c) {
-    case 'h': /* help */
-      print_help ();
-      exit (STATE_UNKNOWN);
-    case 'V': /* version */
-      print_revision (progname, NP_VERSION);
-      exit (STATE_UNKNOWN);
-    case 'v': /* version */
-      verbose = true;
-      break;
-    case 't': /* timeout period */
-      timeout_interval = atoi (optarg);
-      break;
-    case 'H': /* hostname */
-      if (strlen (optarg) >= MAX_HOST_ADDRESS_LENGTH)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      server_ip = optarg;
-      break;
-    case 'P': /* port */
-      port = atoi (optarg);
-      break;
-    case 'G': /* hostname */
-      if (strlen (optarg) >= MAX_INPUT_BUFFER)
-        die (STATE_UNKNOWN, _("Input buffer overflow\n"));
-      game_type = optarg;
-      break;
-    case 'p': /* index of ping field */
-      qstat_ping_field = atoi (optarg);
-      if (qstat_ping_field < 0 || qstat_ping_field > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    case 'm': /* index on map field */
-      qstat_map_field = atoi (optarg);
-      if (qstat_map_field < 0 || qstat_map_field > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    case 'g': /* index of game field */
-      qstat_game_field = atoi (optarg);
-      if (qstat_game_field < 0 || qstat_game_field > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    case 129: /* index of player count field */
-      qstat_game_players = atoi (optarg);
-      if (qstat_game_players_max == 0)
-        qstat_game_players_max = qstat_game_players - 1;
-      if (qstat_game_players < 0 || qstat_game_players > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    case 130: /* index of max players field */
-      qstat_game_players_max = atoi (optarg);
-      if (qstat_game_players_max < 0 || qstat_game_players_max > QSTAT_MAX_RETURN_ARGS)
-        return ERROR;
-      break;
-    default: /* args not parsable */
-      usage5();
-    }
-  }
-
-  c = optind;
-  /* first option is the game type */
-  if (!game_type && c<argc)
-    game_type = strdup (argv[c++]);
-
-  /* Second option is the server name */
-  if (!server_ip && c<argc)
-    server_ip = strdup (argv[c++]);
-
-  return validate_arguments ();
+static bool verbose = false;
+
+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_game_config_wrapper tmp = process_arguments(argc, argv);
+
+        if (tmp.errorcode == ERROR) {
+                usage_va(_("Could not parse arguments"));
+        }
+
+        check_game_config config = tmp.config;
+
+        mp_state_enum result = STATE_OK;
+
+        /* 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);
+
+        if (config.port) {
+                xasprintf(&command_line, "%s:%-d", command_line, config.port);
+        }
+
+        if (verbose) {
+                printf("%s\n", command_line);
+        }
+
+        /* run the command. historically, this plugin ignores output on stderr,
+         * as well as return status of the qstat program */
+        output chld_out = {};
+        (void)np_runcmd(command_line, &chld_out, NULL, 0);
+
+        /* sanity check */
+        /* was thinking about running qstat without any options, capturing the
+           -default line, parsing it & making an array of all know server types
+           but thought this would be too much hassle considering this is a tool
+           for intelligent sysadmins (ha). Could put a static array of known
+           server types in a header file but then we'd be limiting ourselves
+
+           In the end, I figured I'd simply let an error occur & then trap it
+         */
+
+        if (!strncmp(chld_out.line[0], "unknown option", strlen("unknown option"))) {
+                printf(_("CRITICAL - Host type parameter incorrect!\n"));
+                result = STATE_CRITICAL;
+                exit(result);
+        }
+
+        char *ret[QSTAT_MAX_RETURN_ARGS];
+        size_t i = 0;
+        char *sequence = strtok(chld_out.line[0], QSTAT_DATA_DELIMITER);
+        while (sequence != NULL) {
+                ret[i] = sequence;
+                sequence = strtok(NULL, QSTAT_DATA_DELIMITER);
+                i++;
+                if (i >= QSTAT_MAX_RETURN_ARGS) {
+                        break;
+                }
+        }
+
+        if (strstr(ret[2], QSTAT_HOST_ERROR)) {
+                printf(_("CRITICAL - Host not found\n"));
+                result = STATE_CRITICAL;
+        } else if (strstr(ret[2], QSTAT_HOST_DOWN)) {
+                printf(_("CRITICAL - Game server down or unavailable\n"));
+                result = STATE_CRITICAL;
+        } else if (strstr(ret[2], QSTAT_HOST_TIMEOUT)) {
+                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));
+        }
+
+        exit(result);
 }
 
-
-int
-validate_arguments (void)
-{
-  if (qstat_game_players_max < 0)
-    qstat_game_players_max = 4;
-
-  if (qstat_game_players < 0)
-    qstat_game_players = 5;
-
-  if (qstat_game_field < 0)
-    qstat_game_field = 2;
-
-  if (qstat_map_field < 0)
-    qstat_map_field = 3;
-
-  if (qstat_ping_field < 0)
-    qstat_ping_field = 5;
-
-  return OK;
+#define players_field_index     129
+#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}};
+
+        check_game_config_wrapper result = {
+                .config = check_game_config_init(),
+                .errorcode = OK,
+        };
+
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
+
+        for (int option_counter = 1; option_counter < argc; option_counter++) {
+                if (strcmp("-mf", argv[option_counter]) == 0) {
+                        strcpy(argv[option_counter], "-m");
+                } else if (strcmp("-pf", argv[option_counter]) == 0) {
+                        strcpy(argv[option_counter], "-p");
+                } else if (strcmp("-gf", argv[option_counter]) == 0) {
+                        strcpy(argv[option_counter], "-g");
+                }
+        }
+
+        int opt_index = 0;
+        while (true) {
+                int option_index = getopt_long(argc, argv, "hVvt:H:P:G:g:p:m:", long_opts, &opt_index);
+
+                if (option_index == -1 || option_index == EOF) {
+                        break;
+                }
+
+                switch (option_index) {
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'v': /* version */
+                        verbose = true;
+                        break;
+                case 't': /* timeout period */
+                        timeout_interval = atoi(optarg);
+                        break;
+                case 'H': /* hostname */
+                        if (strlen(optarg) >= MAX_HOST_ADDRESS_LENGTH) {
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        }
+                        result.config.server_ip = optarg;
+                        break;
+                case 'P': /* port */
+                        result.config.port = atoi(optarg);
+                        break;
+                case 'G': /* hostname */
+                        if (strlen(optarg) >= MAX_INPUT_BUFFER) {
+                                die(STATE_UNKNOWN, _("Input buffer overflow\n"));
+                        }
+                        result.config.game_type = optarg;
+                        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) {
+                                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) {
+                                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) {
+                                result.errorcode = ERROR;
+                                return result;
+                        }
+                        break;
+                case players_field_index: /* index of player count field */
+                        result.config.qstat_game_players = atoi(optarg);
+                        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) {
+                                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) {
+                                result.errorcode = ERROR;
+                                return result;
+                        }
+                        break;
+                default: /* args not parsable */
+                        usage5();
+                }
+        }
+
+        int option_counter = optind;
+        /* first option is the game type */
+        if (!result.config.game_type && option_counter < argc) {
+                result.config.game_type = strdup(argv[option_counter++]);
+        }
+
+        /* Second option is the server name */
+        if (!result.config.server_ip && option_counter < argc) {
+                result.config.server_ip = strdup(argv[option_counter++]);
+        }
+
+        return result;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-void
-print_help (void)
-{
-  print_revision (progname, NP_VERSION);
-
-  printf ("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
-  printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ian Cass, Knowledge Matters Limited\n");
+        printf(COPYRIGHT, copyright, email);
 
-  printf (_("This plugin tests game server connections with the specified host."));
+        printf(_("This plugin tests game server connections with the specified host."));
 
-  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(" -H, --hostname=ADDRESS\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");
+        printf("    %s\n", _("Field number in raw qstat output that contains game name"));
+        printf(" %s\n", "-m");
+        printf("    %s\n", _("Field number in raw qstat output that contains map name"));
+        printf(" %s\n", "-p");
+        printf("    %s\n", _("Field number in raw qstat output that contains ping time"));
 
-  printf (" %s\n", "-p");
-  printf ("    %s\n", _("Optional port of which to connect"));
-  printf (" %s\n", "gf");
-  printf ("    %s\n", _("Field number in raw qstat output that contains game name"));
-  printf (" %s\n", "-mf");
-  printf ("    %s\n", _("Field number in raw qstat output that contains map name"));
-  printf (" %s\n", "-pf");
-  printf ("    %s\n", _("Field number in raw qstat output that contains ping time"));
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-  printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        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", _("https://github.com/multiplay/qstat before you can use this plugin."));
 
-  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", _("https://github.com/multiplay/qstat before you can use this plugin."));
-
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-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> <ip_address>\n", progname);
+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> "
+                   "<ip_address>\n",
+                   progname);
 }
 
 /******************************************************************************
diff --git a/plugins/check_game.d/config.h b/plugins/check_game.d/config.h
new file mode 100644
index 00000000..c95a1ced
--- /dev/null
+++ b/plugins/check_game.d/config.h
@@ -0,0 +1,30 @@
+#pragma once
+#include "../../config.h"
+#include <stddef.h>
+
+typedef struct {
+        char *server_ip;
+        char *game_type;
+        int port;
+
+        int qstat_game_players_max;
+        int qstat_game_players;
+        int qstat_game_field;
+        int qstat_map_field;
+        int qstat_ping_field;
+} check_game_config;
+
+check_game_config check_game_config_init() {
+        check_game_config tmp = {
+                .server_ip = NULL,
+                .game_type = NULL,
+                .port = 0,
+
+                .qstat_game_players_max = 4,
+                .qstat_game_players = 5,
+                .qstat_map_field = 3,
+                .qstat_game_field = 2,
+                .qstat_ping_field = 5,
+        };
+        return tmp;
+}
diff --git a/plugins/check_hpjd.c b/plugins/check_hpjd.c
index c34bb082..62417fd6 100644
--- a/plugins/check_hpjd.c
+++ b/plugins/check_hpjd.c
@@ -1,47 +1,46 @@
 /*****************************************************************************
-* 
-* Monitoring check_hpjd plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_hpjd plugin
-* 
-* This plugin tests the STATUS of an HP printer with a JetDirect card.
-* Net-SNMP must be installed on the computer running the plugin.
-* 
-* 
-* 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_hpjd plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_hpjd plugin
+ *
+ * This plugin tests the STATUS of an HP printer with a JetDirect card.
+ * Net-SNMP must be installed on the computer running the plugin.
+ *
+ *
+ * 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_hpjd";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "popen.h"
 #include "utils.h"
 #include "netutils.h"
+#include "states.h"
+#include "check_hpjd.d/config.h"
 
 #define DEFAULT_COMMUNITY "public"
-#define DEFAULT_PORT "161"
-
-const char *option_summary = "-H host [-C community]\n";
 
 #define HPJD_LINE_STATUS           ".1.3.6.1.4.1.11.2.3.9.1.1.2.1"
 #define HPJD_PAPER_STATUS          ".1.3.6.1.4.1.11.2.3.9.1.1.2.2"
@@ -56,185 +55,161 @@ const char *option_summary = "-H host [-C community]\n";
 #define HPJD_GD_PAPER_OUTPUT       ".1.3.6.1.4.1.11.2.3.9.1.1.2.19"
 #define HPJD_GD_STATUS_DISPLAY     ".1.3.6.1.4.1.11.2.3.9.1.1.3"
 
-#define ONLINE          0
-#define OFFLINE         1
-
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
+#define ONLINE  0
+#define OFFLINE 1
 
-char *community = NULL;
-char *address = NULL;
-unsigned int port = 0;
-int  check_paper_out = 1;
+typedef struct {
+        int errorcode;
+        check_hpjd_config config;
+} check_hpjd_config_wrapper;
+static check_hpjd_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
+void print_usage(void);
 
-int
-main (int argc, char **argv)
-{
-        char command_line[1024];
-        int result = STATE_UNKNOWN;
-        int line;
-        char input_buffer[MAX_INPUT_BUFFER];
-        char query_string[512];
-        char *errmsg;
-        char *temp_buffer;
-        int line_status = ONLINE;
-        int paper_status = 0;
-        int intervention_required = 0;
-        int peripheral_error = 0;
-        int paper_jam = 0;
-        int paper_out = 0;
-        int toner_low = 0;
-        int page_punt = 0;
-        int memory_out = 0;
-        int door_open = 0;
-        int paper_output = 0;
-        char display_message[MAX_INPUT_BUFFER];
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
-        errmsg = malloc(MAX_INPUT_BUFFER);
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        check_hpjd_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        const check_hpjd_config config = tmp_config.config;
 
+        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 */
-        sprintf (command_line, "%s -OQa -m : -v 1 -c %s %s:%u %s",
-                        PATH_TO_SNMPGET,
-                        community,
-                        address,
-                        port,
-                        query_string);
+        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);
 
         /* run the command */
-        child_process = spopen (command_line);
+        child_process = spopen(command_line);
         if (child_process == NULL) {
-                printf (_("Could not open pipe: %s\n"), command_line);
+                printf(_("Could not open pipe: %s\n"), command_line);
                 return STATE_UNKNOWN;
         }
 
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
         if (child_stderr == NULL) {
-                printf (_("Could not open stderr for %s\n"), command_line);
+                printf(_("Could not open stderr for %s\n"), command_line);
         }
 
-        result = STATE_OK;
+        mp_state_enum result = STATE_OK;
 
-        line = 0;
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+        int line_status = ONLINE;
+        int paper_status = 0;
+        int intervention_required = 0;
+        int peripheral_error = 0;
+        int paper_jam = 0;
+        int paper_out = 0;
+        int toner_low = 0;
+        int page_punt = 0;
+        int memory_out = 0;
+        int door_open = 0;
+        int paper_output = 0;
+        char display_message[MAX_INPUT_BUFFER];
+
+        char input_buffer[MAX_INPUT_BUFFER];
+        char *errmsg = malloc(MAX_INPUT_BUFFER);
+        int line = 0;
 
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
                 /* strip the newline character from the end of the input */
-                if (input_buffer[strlen (input_buffer) - 1] == '\n')
-                        input_buffer[strlen (input_buffer) - 1] = 0;
+                if (input_buffer[strlen(input_buffer) - 1] == '\n') {
+                        input_buffer[strlen(input_buffer) - 1] = 0;
+                }
 
                 line++;
 
-                temp_buffer = strtok (input_buffer, "=");
-                temp_buffer = strtok (NULL, "=");
+                char *temp_buffer = strtok(input_buffer, "=");
+                temp_buffer = strtok(NULL, "=");
 
                 if (temp_buffer == NULL && line < 13) {
-
-                                result = STATE_UNKNOWN;
-                                strcpy (errmsg, input_buffer);
-
+                        result = STATE_UNKNOWN;
+                        strcpy(errmsg, input_buffer);
                 } else {
-
                         switch (line) {
-
-                        case 1:                                                                         /* 1st line should contain the line status */
-                                line_status = atoi (temp_buffer);
+                        case 1: /* 1st line should contain the line status */
+                                line_status = atoi(temp_buffer);
                                 break;
-                        case 2:                                                                         /* 2nd line should contain the paper status */
-                                paper_status = atoi (temp_buffer);
+                        case 2: /* 2nd line should contain the paper status */
+                                paper_status = atoi(temp_buffer);
                                 break;
-                        case 3:                                                                         /* 3rd line should be intervention required */
-                                intervention_required = atoi (temp_buffer);
+                        case 3: /* 3rd line should be intervention required */
+                                intervention_required = atoi(temp_buffer);
                                 break;
-                        case 4:                                                                         /* 4th line should be peripheral error */
-                                peripheral_error = atoi (temp_buffer);
+                        case 4: /* 4th line should be peripheral error */
+                                peripheral_error = atoi(temp_buffer);
                                 break;
-                        case 5:                                                                         /* 5th line should contain the paper jam status */
-                                paper_jam = atoi (temp_buffer);
+                        case 5: /* 5th line should contain the paper jam status */
+                                paper_jam = atoi(temp_buffer);
                                 break;
-                        case 6:                                                                         /* 6th line should contain the paper out status */
-                                paper_out = atoi (temp_buffer);
+                        case 6: /* 6th line should contain the paper out status */
+                                paper_out = atoi(temp_buffer);
                                 break;
-                        case 7:                                                                         /* 7th line should contain the toner low status */
-                                toner_low = atoi (temp_buffer);
+                        case 7: /* 7th line should contain the toner low status */
+                                toner_low = atoi(temp_buffer);
                                 break;
-                        case 8:                                                                         /* did data come too slow for engine */
-                                page_punt = atoi (temp_buffer);
+                        case 8: /* did data come too slow for engine */
+                                page_punt = atoi(temp_buffer);
                                 break;
-                        case 9:                                                                         /* did we run out of memory */
-                                memory_out = atoi (temp_buffer);
+                        case 9: /* did we run out of memory */
+                                memory_out = atoi(temp_buffer);
                                 break;
-                        case 10:                                                                                /* is there a door open */
-                                door_open = atoi (temp_buffer);
+                        case 10: /* is there a door open */
+                                door_open = atoi(temp_buffer);
                                 break;
-                        case 11:                                                                                /* is output tray full */
-                                paper_output = atoi (temp_buffer);
+                        case 11: /* is output tray full */
+                                paper_output = atoi(temp_buffer);
                                 break;
-                        case 12:                                                                                /* display panel message */
-                                strcpy (display_message, temp_buffer + 1);
+                        case 12: /* display panel message */
+                                strcpy(display_message, temp_buffer + 1);
                                 break;
-                        default:                                                                                /* fold multiline message */
-                                strncat (display_message, input_buffer,
-                                                sizeof (display_message) - strlen (display_message) - 1);
+                        default: /* fold multiline message */
+                                strncat(display_message, input_buffer, sizeof(display_message) - strlen(display_message) - 1);
                         }
-
                 }
 
                 /* break out of the read loop if we encounter an error */
-                if (result != STATE_OK)
+                if (result != STATE_OK) {
                         break;
+                }
         }
 
         /* WARNING if output found on stderr */
-        if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
-                result = max_state (result, STATE_WARNING);
+        if (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+                result = max_state(result, STATE_WARNING);
                 /* remove CRLF */
-                if (input_buffer[strlen (input_buffer) - 1] == '\n')
-                        input_buffer[strlen (input_buffer) - 1] = 0;
-                sprintf (errmsg, "%s", input_buffer );
-
+                if (input_buffer[strlen(input_buffer) - 1] == '\n') {
+                        input_buffer[strlen(input_buffer) - 1] = 0;
+                }
+                sprintf(errmsg, "%s", input_buffer);
         }
 
         /* close stderr */
-        (void) fclose (child_stderr);
+        (void)fclose(child_stderr);
 
         /* close the pipe */
-        if (spclose (child_process))
-                result = max_state (result, STATE_WARNING);
+        if (spclose(child_process)) {
+                result = max_state(result, STATE_WARNING);
+        }
 
         /* if there wasn't any output, display an error */
         if (line == 0) {
-
                 /* might not be the problem, but most likely is. */
-                result = STATE_UNKNOWN ;
-                xasprintf (&errmsg, "%s : Timeout from host %s\n", errmsg, address );
-
+                result = STATE_UNKNOWN;
+                xasprintf(&errmsg, "%s : Timeout from host %s\n", errmsg, config.address);
         }
 
         /* if we had no read errors, check the printer status results... */
@@ -242,201 +217,171 @@ main (int argc, char **argv)
 
                 if (paper_jam) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Paper Jam"));
-                }
-                else if (paper_out) {
-                        if (check_paper_out)
+                        strcpy(errmsg, _("Paper Jam"));
+                } else if (paper_out) {
+                        if (config.check_paper_out) {
                                 result = STATE_WARNING;
-                        strcpy (errmsg, _("Out of Paper"));
-                }
-                else if (line_status == OFFLINE) {
-                        if (strcmp (errmsg, "POWERSAVE ON") != 0) {
+                        }
+                        strcpy(errmsg, _("Out of Paper"));
+                } else if (line_status == OFFLINE) {
+                        if (strcmp(errmsg, "POWERSAVE ON") != 0) {
                                 result = STATE_WARNING;
-                                strcpy (errmsg, _("Printer Offline"));
+                                strcpy(errmsg, _("Printer Offline"));
                         }
-                }
-                else if (peripheral_error) {
+                } else if (peripheral_error) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Peripheral Error"));
-                }
-                else if (intervention_required) {
+                        strcpy(errmsg, _("Peripheral Error"));
+                } else if (intervention_required) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Intervention Required"));
-                }
-                else if (toner_low) {
+                        strcpy(errmsg, _("Intervention Required"));
+                } else if (toner_low) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Toner Low"));
-                }
-                else if (memory_out) {
+                        strcpy(errmsg, _("Toner Low"));
+                } else if (memory_out) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Insufficient Memory"));
-                }
-                else if (door_open) {
+                        strcpy(errmsg, _("Insufficient Memory"));
+                } else if (door_open) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("A Door is Open"));
-                }
-                else if (paper_output) {
+                        strcpy(errmsg, _("A Door is Open"));
+                } else if (paper_output) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Output Tray is Full"));
-                }
-                else if (page_punt) {
+                        strcpy(errmsg, _("Output Tray is Full"));
+                } else if (page_punt) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Data too Slow for Engine"));
-                }
-                else if (paper_status) {
+                        strcpy(errmsg, _("Data too Slow for Engine"));
+                } else if (paper_status) {
                         result = STATE_WARNING;
-                        strcpy (errmsg, _("Unknown Paper Error"));
+                        strcpy(errmsg, _("Unknown Paper Error"));
                 }
         }
 
-        if (result == STATE_OK)
-                printf (_("Printer ok - (%s)\n"), display_message);
-
-        else if (result == STATE_UNKNOWN) {
-
-                printf ("%s\n", errmsg);
-
+        if (result == STATE_OK) {
+                printf(_("Printer ok - (%s)\n"), display_message);
+        } else if (result == STATE_UNKNOWN) {
+                printf("%s\n", errmsg);
                 /* if printer could not be reached, escalate to critical */
-                if (strstr (errmsg, "Timeout"))
+                if (strstr(errmsg, "Timeout")) {
                         result = STATE_CRITICAL;
+                }
+        } else if (result == STATE_WARNING) {
+                printf("%s (%s)\n", errmsg, display_message);
         }
 
-        else if (result == STATE_WARNING)
-                printf ("%s (%s)\n", errmsg, display_message);
-
-        return result;
+        exit(result);
 }
 
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"community", required_argument, 0, 'C'},
-/*              {"critical",       required_argument,0,'c'}, */
-/*              {"warning",        required_argument,0,'w'}, */
-                {"port", required_argument,0,'p'}, 
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
+check_hpjd_config_wrapper process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"hostname", required_argument, 0, 'H'},
+                                                                           {"community", required_argument, 0, 'C'},
+                                                                           /*           {"critical",       required_argument,0,'c'}, */
+                                                                           /*           {"warning",        required_argument,0,'w'}, */
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
+
+        check_hpjd_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_hpjd_config_init(),
         };
 
-        if (argc < 2)
-                return ERROR;
-
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hVH:C:p:D", longopts, &option);
+        int option = 0;
+        while (true) {
+                int option_index = getopt_long(argc, argv, "+hVH:C:p:D", longopts, &option);
 
-                if (c == -1 || c == EOF || c == 1)
+                if (option_index == -1 || option_index == EOF || option_index == 1) {
                         break;
+                }
 
-                switch (c) {
-                case 'H':                                                                       /* hostname */
-                        if (is_host (optarg)) {
-                                address = strscpy(address, optarg) ;
-                        }
-                        else {
-                                usage2 (_("Invalid hostname/address"), optarg);
+                switch (option_index) {
+                case 'H': /* hostname */
+                        if (is_host(optarg)) {
+                                result.config.address = strscpy(result.config.address, optarg);
+                        } else {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
                         break;
-                case 'C':                                                                       /* community */
-                        community = strscpy (community, optarg);
+                case 'C': /* community */
+                        result.config.community = strscpy(result.config.community, optarg);
                         break;
                 case 'p':
-                        if (!is_intpos(optarg))
-                                usage2 (_("Port must be a positive short integer"), optarg);
-                        else
-                                port = atoi(optarg);
+                        if (!is_intpos(optarg)) {
+                                usage2(_("Port must be a positive short integer"), optarg);
+                        } else {
+                                result.config.port = atoi(optarg);
+                        }
                         break;
-                case 'D':                                                                       /* disable paper out check*/
-                        check_paper_out = 0;
+                case 'D': /* disable paper out check*/
+                        result.config.check_paper_out = false;
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (address == NULL) {
-                if (is_host (argv[c])) {
-                        address = argv[c++];
-                }
-                else {
-                        usage2 (_("Invalid hostname/address"), argv[c]);
+        int c = optind;
+        if (result.config.address == NULL) {
+                if (is_host(argv[c])) {
+                        result.config.address = argv[c++];
+                } else {
+                        usage2(_("Invalid hostname/address"), argv[c]);
                 }
         }
 
-        if (community == NULL) {
-                if (argv[c] != NULL )
-                        community = argv[c];
-                else
-                        community = strdup (DEFAULT_COMMUNITY);
-        }
-
-        if (port == 0) {
-                port = atoi(DEFAULT_PORT);
+        if (result.config.community == NULL) {
+                if (argv[c] != NULL) {
+                        result.config.community = argv[c];
+                } else {
+                        result.config.community = strdup(DEFAULT_COMMUNITY);
+                }
         }
 
-        return validate_arguments ();
-}
-
-
-int
-validate_arguments (void)
-{
-        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 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 STATUS of an HP printer with a JetDirect card."));
-        printf ("%s\n", _("Net-snmp must be installed on the computer running the plugin."));
+        printf("%s\n", _("This plugin tests the STATUS of an HP printer with a JetDirect card."));
+        printf("%s\n", _("Net-snmp must be installed on the computer running the plugin."));
 
-        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", "-C, --community=STRING");
-        printf ("    %s", _("The SNMP community name "));
-        printf (_("(default=%s)"), DEFAULT_COMMUNITY);
-        printf ("\n");
-        printf (" %s\n", "-p, --port=STRING");
-        printf ("    %s", _("Specify the port to check "));
-        printf (_("(default=%s)"), DEFAULT_PORT);
-        printf ("\n");
-        printf (" %s\n", "-D");
-        printf ("    %s", _("Disable paper check "));
+        printf(" %s\n", "-C, --community=STRING");
+        printf("    %s", _("The SNMP community name "));
+        printf(_("(default=%s)"), DEFAULT_COMMUNITY);
+        printf("\n");
+        printf(" %s\n", "-p, --port=STRING");
+        printf("    %s", _("Specify the port to check "));
+        printf(_("(default=%s)"), DEFAULT_PORT);
+        printf("\n");
+        printf(" %s\n", "-D");
+        printf("    %s", _("Disable paper check "));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H host [-C community] [-p port] [-D]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host [-C community] [-p port] [-D]\n", progname);
 }
diff --git a/plugins/check_hpjd.d/config.h b/plugins/check_hpjd.d/config.h
new file mode 100644
index 00000000..e36b7972
--- /dev/null
+++ b/plugins/check_hpjd.d/config.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+#include <stdlib.h>
+
+#define DEFAULT_PORT "161"
+
+typedef struct {
+        char *address;
+        char *community;
+        unsigned int port;
+        bool check_paper_out;
+
+} check_hpjd_config;
+
+check_hpjd_config check_hpjd_config_init() {
+        check_hpjd_config tmp = {
+                .address = NULL,
+                .community = NULL,
+                .port = (unsigned int)atoi(DEFAULT_PORT),
+                .check_paper_out = true,
+        };
+        return tmp;
+}
diff --git a/plugins/check_http.c b/plugins/check_http.c
index cdf768c9..8e0c15ec 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -3,7 +3,7 @@
 * Monitoring check_http plugin
 *
 * License: GPL
-* Copyright (c) 1999-2013 Monitoring Plugins Development Team
+* Copyright (c) 1999-2024 Monitoring Plugins Development Team
 *
 * Description:
 *
@@ -32,7 +32,7 @@
 *****************************************************************************/
 
 const char *progname = "check_http";
-const char *copyright = "1999-2022";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 // Do NOT sort those headers, it will break the build
@@ -1724,6 +1724,16 @@ 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", _("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"));
+
   printf ("\n\n");
 
   print_usage ();
@@ -1805,7 +1815,7 @@ print_help (void)
   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", "--regex-state=STATE");
+  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");
diff --git a/plugins/check_ide_smart.c b/plugins/check_ide_smart.c
index 3872e341..16fe3d01 100644
--- a/plugins/check_ide_smart.c
+++ b/plugins/check_ide_smart.c
@@ -1,240 +1,211 @@
 /*****************************************************************************
-* 
-* Monitoring check_ide_smart plugin
-* ide-smart 1.3 - IDE S.M.A.R.T. checking tool
-* 
-* License: GPL
-* Copyright (C) 1998-1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>
-*               1998      Gadi Oxman <gadio@netvision.net.il>
-* Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ide_smart plugin
-* 
-* This plugin checks a local hard drive with the (Linux specific) SMART
-* interface
-* 
-* 
-* 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_ide_smart plugin
+ * ide-smart 1.3 - IDE S.M.A.R.T. checking tool
+ *
+ * License: GPL
+ * Copyright (C) 1998-1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>
+ *               1998      Gadi Oxman <gadio@netvision.net.il>
+ * Copyright (c) 2000 Robert Dale <rdale@digital-mission.com>
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_ide_smart plugin
+ *
+ * This plugin checks a local hard drive with the (Linux specific) SMART
+ * interface
+ *
+ *
+ * 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_ide_smart";
-const char *copyright = "1998-2007";
+const char *copyright = "1998-2024";
 const char *email = "devel@monitoring-plugins.org";
-        
+
 #include "common.h"
 #include "utils.h"
 
-void print_help (void);
-void print_usage (void);
+static void print_help(void);
+void print_usage(void);
 
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <fcntl.h>
 #ifdef __linux__
-#include <linux/hdreg.h>
-#include <linux/types.h>
+#       include <linux/hdreg.h>
+#       include <linux/types.h>
 
-#define OPEN_MODE O_RDONLY
+#       define OPEN_MODE O_RDONLY
 #endif /* __linux__ */
 #ifdef __NetBSD__
-#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>
-#include <dev/ic/wdcreg.h>
-
-#define SMART_ENABLE WDSM_ENABLE_OPS
-#define SMART_DISABLE WDSM_DISABLE_OPS
-#define SMART_IMMEDIATE_OFFLINE WDSM_EXEC_OFFL_IMM
-#define SMART_AUTO_OFFLINE 0xdb /* undefined in NetBSD headers */
-
-#define OPEN_MODE O_RDWR
+#       include <sys/device.h>
+#       include <sys/param.h>
+#       include <sys/sysctl.h>
+#       include <sys/scsiio.h>
+#       include <sys/ataio.h>
+#       include <dev/ata/atareg.h>
+#       include <dev/ic/wdcreg.h>
+
+#       define SMART_ENABLE            WDSM_ENABLE_OPS
+#       define SMART_DISABLE           WDSM_DISABLE_OPS
+#       define SMART_IMMEDIATE_OFFLINE WDSM_EXEC_OFFL_IMM
+#       define SMART_AUTO_OFFLINE      0xdb /* undefined in NetBSD headers */
+
+#       define OPEN_MODE O_RDWR
 #endif /* __NetBSD__ */
 #include <errno.h>
-        
-#define NR_ATTRIBUTES   30
-        
-#define PREFAILURE 2
-#define ADVISORY 1
+
+#define NR_ATTRIBUTES 30
+
+#define PREFAILURE  2
+#define ADVISORY    1
 #define OPERATIONAL 0
-#define UNKNOWN -1
+#define UNKNOWN     -1
 
-typedef struct threshold_s
-{
-        __u8 id;
-        __u8 threshold;
-        __u8 reserved[10];
-}
-__attribute__ ((packed)) threshold_t;
+typedef struct threshold_s {
+        uint8_t id;
+        uint8_t threshold;
+        uint8_t reserved[10];
+} __attribute__((packed)) threshold_t;
 
-typedef struct thresholds_s
-{
-        __u16 revision;
+typedef struct thresholds_s {
+        uint16_t revision;
         threshold_t thresholds[NR_ATTRIBUTES];
-        __u8 reserved[18];
-        __u8 vendor[131];
-        __u8 checksum;
-}
-__attribute__ ((packed)) thresholds_t;
-
-typedef struct value_s
-{
-        __u8 id;
-        __u16 status;
-        __u8 value;
-        __u8 vendor[8];
-}
-__attribute__ ((packed)) value_t;
-
-typedef struct values_s
-{
-        __u16 revision;
+        uint8_t reserved[18];
+        uint8_t vendor[131];
+        uint8_t checksum;
+} __attribute__((packed)) thresholds_t;
+
+typedef struct value_s {
+        uint8_t id;
+        uint16_t status;
+        uint8_t value;
+        uint8_t vendor[8];
+} __attribute__((packed)) value_t;
+
+typedef struct values_s {
+        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;
-}
-__attribute__ ((packed)) values_t;
-
-struct
-{
-        __u8 value;
+        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 {
+        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}
-        };
-
-struct
-{
-        __u8 value;
+static struct {
+        uint8_t value;
         char *text;
-}
-
-smart_command[] =
-        {
-                {SMART_ENABLE, "SMART_ENABLE"},
-                {SMART_DISABLE, "SMART_DISABLE"},
-                {SMART_IMMEDIATE_OFFLINE, "SMART_IMMEDIATE_OFFLINE"},
-                {SMART_AUTO_OFFLINE, "SMART_AUTO_OFFLINE"}
-        };
-
-
-/* Index to smart_command table, keep in order */ 
-enum SmartCommand 
-        { SMART_CMD_ENABLE,
-                SMART_CMD_DISABLE,
-                SMART_CMD_IMMEDIATE_OFFLINE,
-                SMART_CMD_AUTO_OFFLINE 
-        };
-
-char *get_offline_text (int);
-int smart_read_values (int, values_t *);
-int nagios (values_t *, thresholds_t *);
-void print_value (value_t *, threshold_t *);
-void print_values (values_t *, thresholds_t *);
-int smart_cmd_simple (int, enum SmartCommand, __u8, bool);
-int smart_read_thresholds (int, thresholds_t *);
-bool verbose = false;
-
-int
-main (int argc, char *argv[]) 
-{
+} smart_command[] = {{SMART_ENABLE, "SMART_ENABLE"},
+                                         {SMART_DISABLE, "SMART_DISABLE"},
+                                         {SMART_IMMEDIATE_OFFLINE, "SMART_IMMEDIATE_OFFLINE"},
+                                         {SMART_AUTO_OFFLINE, "SMART_AUTO_OFFLINE"}};
+
+/* Index to smart_command table, keep in order */
+enum SmartCommand {
+        SMART_CMD_ENABLE,
+        SMART_CMD_DISABLE,
+        SMART_CMD_IMMEDIATE_OFFLINE,
+        SMART_CMD_AUTO_OFFLINE
+};
+
+static char *get_offline_text(int);
+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, uint8_t, bool);
+static int smart_read_thresholds(int, thresholds_t *);
+static bool verbose = false;
+
+int main(int argc, char *argv[]) {
         char *device = NULL;
-        int o, longindex;
+        int o;
+        int longindex;
         int retval = 0;
 
         thresholds_t thresholds;
         values_t values;
         int fd;
 
-        static struct option longopts[] = { 
-                {"device", required_argument, 0, 'd'}, 
-                {"immediate", no_argument, 0, 'i'}, 
-                {"quiet-check", no_argument, 0, 'q'}, 
-                {"auto-on", no_argument, 0, '1'}, 
-                {"auto-off", no_argument, 0, '0'}, 
-                {"nagios", no_argument, 0, 'n'}, /* DEPRECATED, but we still accept it */
-                {"help", no_argument, 0, 'h'}, 
-                {"version", no_argument, 0, 'V'},
-                {0, 0, 0, 0}
-        };
+        static struct option longopts[] = {{"device", required_argument, 0, 'd'},
+                                                                           {"immediate", no_argument, 0, 'i'},
+                                                                           {"quiet-check", no_argument, 0, 'q'},
+                                                                           {"auto-on", no_argument, 0, '1'},
+                                                                           {"auto-off", no_argument, 0, '0'},
+                                                                           {"nagios", no_argument, 0, 'n'}, /* DEPRECATED, but we still accept it */
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {0, 0, 0, 0}};
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         while (true) {
-                
-                o = getopt_long (argc, argv, "+d:iq10nhVv", longopts, &longindex);
 
-                if (o == -1 || o == EOF || o == 1)
+                o = getopt_long(argc, argv, "+d:iq10nhVv", longopts, &longindex);
+
+                if (o == -1 || o == EOF || o == 1) {
                         break;
+                }
 
                 switch (o) {
                 case 'd':
                         device = optarg;
                         break;
                 case 'q':
-                        fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."));
-                        fprintf (stderr, "%s\n", _("Nagios-compatible output is now always returned."));
+                        fprintf(stderr, "%s\n", _("DEPRECATION WARNING: the -q switch (quiet output) is no longer \"quiet\"."));
+                        fprintf(stderr, "%s\n", _("Nagios-compatible output is now always returned."));
                         break;
                 case 'i':
                 case '1':
                 case '0':
-                        printf ("%s\n", _("SMART commands are broken and have been disabled (See Notes in --help)."));
+                        printf("%s\n", _("SMART commands are broken and have been disabled (See Notes in --help)."));
                         return STATE_CRITICAL;
                         break;
                 case 'n':
-                        fprintf (stderr, "%s\n", _("DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"));
-                        fprintf (stderr, "%s\n", _("default and will be removed from future releases."));
+                        fprintf(stderr, "%s\n", _("DEPRECATION WARNING: the -n switch (Nagios-compatible output) is now the"));
+                        fprintf(stderr, "%s\n", _("default and will be removed from future releases."));
                         break;
                 case 'v': /* verbose */
                         verbose = true;
                         break;
                 case 'h':
-                        print_help ();
+                        print_help();
                         return STATE_UNKNOWN;
                 case 'V':
-                        print_revision (progname, NP_VERSION);
+                        print_revision(progname, NP_VERSION);
                         return STATE_UNKNOWN;
                 default:
-                        usage5 ();
+                        usage5();
                 }
         }
 
@@ -243,36 +214,34 @@ main (int argc, char *argv[])
         }
 
         if (!device) {
-                print_help ();
+                print_help();
                 return STATE_UNKNOWN;
         }
 
-        fd = open (device, OPEN_MODE);
+        fd = open(device, OPEN_MODE);
 
         if (fd < 0) {
-                printf (_("CRITICAL - Couldn't open device %s: %s\n"), device, strerror (errno));
+                printf(_("CRITICAL - Couldn't open device %s: %s\n"), device, strerror(errno));
                 return STATE_CRITICAL;
         }
 
-        if (smart_cmd_simple (fd, SMART_CMD_ENABLE, 0, false)) {
-                printf (_("CRITICAL - SMART_CMD_ENABLE\n"));
+        if (smart_cmd_simple(fd, SMART_CMD_ENABLE, 0, false)) {
+                printf(_("CRITICAL - SMART_CMD_ENABLE\n"));
                 return STATE_CRITICAL;
         }
 
-        smart_read_values (fd, &values);
-        smart_read_thresholds (fd, &thresholds);
-        retval = nagios (&values, &thresholds);
-        if (verbose) print_values (&values, &thresholds);
+        smart_read_values(fd, &values);
+        smart_read_thresholds(fd, &thresholds);
+        retval = nagios(&values, &thresholds);
+        if (verbose) {
+                print_values(&values, &thresholds);
+        }
 
-        close (fd);
+        close(fd);
         return retval;
 }
 
-
-
-char *
-get_offline_text (int status) 
-{
+char *get_offline_text(int status) {
         int i;
         for (i = 0; offline_status_text[i].text; i++) {
                 if (offline_status_text[i].value == status) {
@@ -282,24 +251,20 @@ get_offline_text (int status)
         return "UNKNOWN";
 }
 
-
-
-int
-smart_read_values (int fd, values_t * values) 
-{
+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;
         args[3] = 1;
-        if (ioctl (fd, HDIO_DRIVE_CMD, &args)) {
+        if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
                 e = errno;
-                printf (_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror (errno));
+                printf(_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror(errno));
                 return e;
         }
-        memcpy (values, args + 4, 512);
+        memcpy(values, args + 4, 512);
 #endif /* __linux__ */
 #ifdef __NetBSD__
         struct atareq req;
@@ -317,13 +282,14 @@ 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) {
                 int e = errno;
-                printf (_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror (errno));
+                printf(_("CRITICAL - SMART_READ_VALUES: %s\n"), strerror(errno));
                 return e;
         }
 
@@ -332,13 +298,9 @@ smart_read_values (int fd, values_t * values)
         return 0;
 }
 
-
-
-int
-nagios (values_t * p, thresholds_t * t) 
-{
-        value_t * value = p->values;
-        threshold_t * threshold = t->thresholds;
+int nagios(values_t *p, thresholds_t *t) {
+        value_t *value = p->values;
+        threshold_t *threshold = t->thresholds;
         int status = OPERATIONAL;
         int prefailure = 0;
         int advisory = 0;
@@ -353,13 +315,11 @@ nagios (values_t * p, thresholds_t * t)
                                 if (value->status & 1) {
                                         status = PREFAILURE;
                                         ++prefailure;
-                                }
-                                else {
+                                } else {
                                         status = ADVISORY;
                                         ++advisory;
                                 }
-                        }
-                        else {
+                        } else {
                                 ++passed;
                         }
                         ++total;
@@ -369,96 +329,66 @@ nagios (values_t * p, thresholds_t * t)
         }
         switch (status) {
         case PREFAILURE:
-                printf (_("CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"),
-                        prefailure,
-                        prefailure > 1 ? 's' : ' ',
-                        failed,
-                  total);
-                status=STATE_CRITICAL;
+                printf(_("CRITICAL - %d Harddrive PreFailure%cDetected! %d/%d tests failed.\n"), prefailure, prefailure > 1 ? 's' : ' ', failed,
+                           total);
+                status = STATE_CRITICAL;
                 break;
         case ADVISORY:
-                printf (_("WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"),
-                        advisory,
-                        advisory > 1 ? "ies" : "y",
-                        failed,
-                        total);
-                status=STATE_WARNING;
+                printf(_("WARNING - %d Harddrive Advisor%s Detected. %d/%d tests failed.\n"), advisory, advisory > 1 ? "ies" : "y", failed, total);
+                status = STATE_WARNING;
                 break;
         case OPERATIONAL:
-                printf (_("OK - Operational (%d/%d tests passed)\n"), passed, total);
-                status=STATE_OK;
+                printf(_("OK - Operational (%d/%d tests passed)\n"), passed, total);
+                status = STATE_OK;
                 break;
         default:
-                printf (_("ERROR - Status '%d' unknown. %d/%d tests passed\n"), status,
-                                                passed, total);
+                printf(_("ERROR - Status '%d' unknown. %d/%d tests passed\n"), status, passed, total);
                 status = STATE_UNKNOWN;
                 break;
         }
         return status;
 }
 
-
-
-void
-print_value (value_t * p, threshold_t * t) 
-{
-        printf ("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n",
-                                        p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory   ",
-                                        p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold,
-                                        p->value >= t->threshold ? "Passed" : "Failed");
+void print_value(value_t *p, threshold_t *t) {
+        printf("Id=%3d, Status=%2d {%s , %s}, Value=%3d, Threshold=%3d, %s\n", p->id, p->status, p->status & 1 ? "PreFailure" : "Advisory   ",
+                   p->status & 2 ? "OnLine " : "OffLine", p->value, t->threshold, p->value >= t->threshold ? "Passed" : "Failed");
 }
 
-
-
-void
-print_values (values_t * p, thresholds_t * t)
-{
-        value_t * value = p->values;
-        threshold_t * threshold = t->thresholds;
+void print_values(values_t *p, thresholds_t *t) {
+        value_t *value = p->values;
+        threshold_t *threshold = t->thresholds;
         int i;
         for (i = 0; i < NR_ATTRIBUTES; i++) {
                 if (value->id && threshold->id && value->id == threshold->id) {
-                        print_value (value++, threshold++);
+                        print_value(value++, threshold++);
                 }
         }
-        printf
-                (_("OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"),
-                 p->offline_status,
-                 get_offline_text (p->offline_status & 0x7f),
-                 (p->offline_status & 0x80 ? "Yes" : "No"),
-                 p->offline_timeout / 60);
-        printf
-                (_("OffLineCapability=%d {%s %s %s}\n"),
-                 p->offline_capability,
-                 p->offline_capability & 1 ? "Immediate" : "",
-                 p->offline_capability & 2 ? "Auto" : "",
-                 p->offline_capability & 4 ? "AbortOnCmd" : "SuspendOnCmd");
-        printf
-                (_("SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"),
-                 p->revision,
-                 p->checksum,
-                 p->smart_capability,
-                 p->smart_capability & 1 ? "SaveOnStandBy" : "",
-                 p->smart_capability & 2 ? "AutoSave" : "");
+        printf(_("OffLineStatus=%d {%s}, AutoOffLine=%s, OffLineTimeout=%d minutes\n"), p->offline_status,
+                   get_offline_text(p->offline_status & 0x7f), (p->offline_status & 0x80 ? "Yes" : "No"), p->offline_timeout / 60);
+        printf(_("OffLineCapability=%d {%s %s %s}\n"), p->offline_capability, p->offline_capability & 1 ? "Immediate" : "",
+                   p->offline_capability & 2 ? "Auto" : "", p->offline_capability & 4 ? "AbortOnCmd" : "SuspendOnCmd");
+        printf(_("SmartRevision=%d, CheckSum=%d, SmartCapability=%d {%s %s}\n"), p->revision, p->checksum, p->smart_capability,
+                   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)) {
+        if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
                 e = STATE_CRITICAL;
-                if (show_error)
-                        printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
+                if (show_error) {
+                        printf(_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror(errno));
+                }
         } else {
                 e = STATE_OK;
-                if (show_error)
-                        printf (_("OK - Command sent (%s)\n"), smart_command[command].text);
+                if (show_error) {
+                        printf(_("OK - Command sent (%s)\n"), smart_command[command].text);
+                }
         }
 
 #endif /* __linux__ */
@@ -474,44 +404,44 @@ int smart_cmd_simple (int fd, enum SmartCommand command, __u8 val0, bool show_er
         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)
-                        printf (_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror (errno));
+                if (show_error) {
+                        printf(_("CRITICAL - %s: %s\n"), smart_command[command].text, strerror(errno));
+                }
         } else {
                 e = STATE_OK;
-                if (show_error)
-                        printf (_("OK - Command sent (%s)\n"), smart_command[command].text);
+                if (show_error) {
+                        printf(_("OK - Command sent (%s)\n"), smart_command[command].text);
+                }
         }
 
 #endif /* __NetBSD__ */
         return e;
 }
 
-
-
-int
-smart_read_thresholds (int fd, thresholds_t * thresholds) 
-{
+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;
-  args[3] = 1;
-        if (ioctl (fd, HDIO_DRIVE_CMD, &args)) {
+        args[1] = 0;
+        args[2] = SMART_READ_THRESHOLDS;
+        args[3] = 1;
+        if (ioctl(fd, HDIO_DRIVE_CMD, &args)) {
                 e = errno;
-                printf (_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror (errno));
+                printf(_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror(errno));
                 return e;
         }
-        memcpy (thresholds, args + 4, 512);
+        memcpy(thresholds, args + 4, 512);
 #endif /* __linux__ */
 #ifdef __NetBSD__
         struct atareq req;
@@ -529,13 +459,14 @@ 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) {
                 int e = errno;
-                printf (_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror (errno));
+                printf(_("CRITICAL - SMART_READ_THRESHOLDS: %s\n"), strerror(errno));
                 return e;
         }
 
@@ -544,45 +475,43 @@ smart_read_thresholds (int fd, thresholds_t * thresholds)
         return 0;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
-        printf ("Plugin implementation - 1999 Robert Dale <rdale@digital-mission.com>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("(C) 1999 Ragnar Hojland Espinosa <ragnar@lightside.dhis.org>\n");
+        printf("Plugin implementation - 1999 Robert Dale <rdale@digital-mission.com>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf (_("This plugin checks a local hard drive with the (Linux specific) SMART interface [http://smartlinux.sourceforge.net/smart/index.php]."));
+        printf(_("This plugin checks a local hard drive with the (Linux specific) SMART interface "
+                         "[http://smartlinux.sourceforge.net/smart/index.php]."));
 
-  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", "-d, --device=DEVICE");
-  printf ("    %s\n", _("Select device DEVICE"));
-  printf ("    %s\n", _("Note: if the device is specified without this option, any further option will"));
-  printf ("          %s\n", _("be ignored."));
+        printf(" %s\n", "-d, --device=DEVICE");
+        printf("    %s\n", _("Select device DEVICE"));
+        printf("    %s\n", _("Note: if the device is specified without this option, any further option will"));
+        printf("          %s\n", _("be ignored."));
 
-  printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"));
-  printf (" %s\n", _("broken in an underhand manner and have been disabled. You can use smartctl"));
-  printf (" %s\n", _("instead:"));
-  printf ("  %s\n", _("-0/--auto-off:  use \"smartctl --offlineauto=off\""));
-  printf ("  %s\n", _("-1/--auto-on:   use \"smartctl --offlineauto=on\""));
-  printf ("  %s\n", _("-i/--immediate: use \"smartctl --test=offline\""));
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("The SMART command modes (-i/--immediate, -0/--auto-off and -1/--auto-on) were"));
+        printf(" %s\n", _("broken in an underhand manner and have been disabled. You can use smartctl"));
+        printf(" %s\n", _("instead:"));
+        printf("  %s\n", _("-0/--auto-off:  use \"smartctl --offlineauto=off\""));
+        printf("  %s\n", _("-1/--auto-on:   use \"smartctl --offlineauto=on\""));
+        printf("  %s\n", _("-i/--immediate: use \"smartctl --test=offline\""));
 
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
- /* todo : add to the long nanual as example
+/* todo : add to the long nanual as example
  *
  *     Run with:  check_ide-smart --nagios [-d] <DRIVE>
  *     Where DRIVE is an IDE drive, ie. /dev/hda, /dev/hdb, /dev/hdc
@@ -593,10 +522,7 @@ print_help (void)
  *       - Returns -1 not too often
  */
 
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf ("%s [-d <device>] [-v]", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s [-d <device>] [-v]", progname);
 }
diff --git a/plugins/check_ldap.c b/plugins/check_ldap.c
index 868ffc1e..597644bd 100644
--- a/plugins/check_ldap.c
+++ b/plugins/check_ldap.c
@@ -1,242 +1,211 @@
 /*****************************************************************************
-*
-* Monitoring check_ldap plugin
-*
-* License: GPL
-* Copyright (c) 2000-2008 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_ldap plugin
-*
-*
-* 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_ldap plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_ldap plugin
+ *
+ *
+ * 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/>.
+ *
+ *
+ *****************************************************************************/
 
 /* progname may be check_ldaps */
 char *progname = "check_ldap";
-const char *copyright = "2000-2008";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
+#include "check_ldap.d/config.h"
 
+#include "states.h"
 #include <lber.h>
 #define LDAP_DEPRECATED 1
 #include <ldap.h>
 
 enum {
-        UNDEFINED = 0,
-#ifdef HAVE_LDAP_SET_OPTION
-        DEFAULT_PROTOCOL = 2,
-#endif
         DEFAULT_PORT = 389
 };
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-
-char ld_defattr[] = "(objectclass=*)";
-char *ld_attr = ld_defattr;
-char *ld_host = NULL;
-char *ld_base = NULL;
-char *ld_passwd = NULL;
-char *ld_binddn = NULL;
-int ld_port = -1;
-#ifdef HAVE_LDAP_SET_OPTION
-int ld_protocol = DEFAULT_PROTOCOL;
-#endif
-#ifndef LDAP_OPT_SUCCESS
-# define LDAP_OPT_SUCCESS LDAP_SUCCESS
-#endif
-double warn_time = UNDEFINED;
-double crit_time = UNDEFINED;
-thresholds *entries_thresholds = NULL;
-struct timeval tv;
-char* warn_entries = NULL;
-char* crit_entries = NULL;
-bool starttls = false;
-bool ssl_on_connect = false;
-bool verbose = false;
-
-/* for ldap tls */
-
-char *SERVICE = "LDAP";
-
-int
-main (int argc, char *argv[])
-{
-
-        LDAP *ld;
-        LDAPMessage *result;
-
-        /* should be    int result = STATE_UNKNOWN; */
-
-        int status = STATE_UNKNOWN;
-        long microsec;
-        double elapsed_time;
-
-        /* for ldap tls */
+typedef struct {
+        int errorcode;
+        check_ldap_config config;
+} check_ldap_config_wrapper;
+static check_ldap_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_ldap_config_wrapper validate_arguments(check_ldap_config_wrapper /*config_wrapper*/);
 
-        int tls;
-        int version=3;
+static void print_help(void);
+void print_usage(void);
 
-        int status_entries = STATE_OK;
-        int num_entries = 0;
+#ifndef LDAP_OPT_SUCCESS
+#       define LDAP_OPT_SUCCESS LDAP_SUCCESS
+#endif
+static int verbose = 0;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+int main(int argc, char *argv[]) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
-        if (strstr(argv[0],"check_ldaps")) {
-                xasprintf (&progname, "check_ldaps");
-        }
+        if (strstr(argv[0], "check_ldaps")) {
+                xasprintf(&progname, "check_ldaps");
+        }
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        check_ldap_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
-        if (strstr(argv[0],"check_ldaps") && ! starttls && ! ssl_on_connect)
-                starttls = true;
+        const check_ldap_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
+        alarm(socket_timeout);
 
         /* get the start time */
-        gettimeofday (&tv, NULL);
+        struct timeval start_time;
+        gettimeofday(&start_time, NULL);
 
+        LDAP *ldap_connection;
         /* initialize ldap */
 #ifdef HAVE_LDAP_INIT
-        if (!(ld = ldap_init (ld_host, ld_port))) {
-                printf ("Could not connect to the server at port %i\n", ld_port);
+        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;
         }
 #else
-        if (!(ld = ldap_open (ld_host, ld_port))) {
-                if (verbose)
-                        ldap_perror(ld, "ldap_open");
-                printf (_("Could not connect to the server at port %i\n"), ld_port);
+        if (!(ld = ldap_open(config.ld_host, config.ld_port))) {
+                if (verbose) {
+                        ldap_perror(ldap_connection, "ldap_open");
+                }
+                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 (ld, LDAP_OPT_PROTOCOL_VERSION, &ld_protocol) !=
-                        LDAP_OPT_SUCCESS ) {
-                printf(_("Could not set protocol version %d\n"), ld_protocol);
+        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;
         }
 #endif
 
-        if (ld_port == LDAPS_PORT || ssl_on_connect) {
-                xasprintf (&SERVICE, "LDAPS");
+        int version = 3;
+        int tls;
+        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;
 
-                if (ldap_set_option (ld, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS)
-                {
-                        if (verbose)
-                                ldap_perror(ld, "ldaps_option");
-                        printf (_("Could not init TLS at port %i!\n"), ld_port);
+                if (ldap_set_option(ldap_connection, LDAP_OPT_X_TLS, &tls) != LDAP_SUCCESS) {
+                        if (verbose) {
+                                ldap_perror(ldap_connection, "ldaps_option");
+                        }
+                        printf(_("Could not init TLS at port %i!\n"), config.ld_port);
                         return STATE_CRITICAL;
                 }
 #else
-                printf (_("TLS not supported by the libraries!\n"));
+                printf(_("TLS not supported by the libraries!\n"));
                 return STATE_CRITICAL;
 #endif /* LDAP_OPT_X_TLS */
-        } else if (starttls) {
-                xasprintf (&SERVICE, "LDAP-TLS");
+        } 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(ld,LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS )
-                {
-                        if (version < LDAP_VERSION3)
-                        {
+                if (ldap_get_option(ldap_connection, LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS) {
+                        if (version < LDAP_VERSION3) {
                                 version = LDAP_VERSION3;
-                                ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version);
+                                ldap_set_option(ldap_connection, LDAP_OPT_PROTOCOL_VERSION, &version);
                         }
                 }
                 /* call start_tls */
-                if (ldap_start_tls_s(ld, NULL, NULL) != LDAP_SUCCESS)
-                {
-                        if (verbose)
-                                ldap_perror(ld, "ldap_start_tls");
-                        printf (_("Could not init startTLS at port %i!\n"), ld_port);
+                if (ldap_start_tls_s(ldap_connection, NULL, NULL) != LDAP_SUCCESS) {
+                        if (verbose) {
+                                ldap_perror(ldap_connection, "ldap_start_tls");
+                        }
+                        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"));
+                printf(_("startTLS not supported by the library, needs LDAPv3!\n"));
                 return STATE_CRITICAL;
 #endif /* HAVE_LDAP_START_TLS_S */
         }
 
         /* bind to the ldap server */
-        if (ldap_bind_s (ld, ld_binddn, ld_passwd, LDAP_AUTH_SIMPLE) !=
-                        LDAP_SUCCESS) {
-                if (verbose)
-                        ldap_perror(ld, "ldap_bind");
-                printf (_("Could not bind to the LDAP server\n"));
+        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");
+                }
+                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 (ld, ld_base, (crit_entries!=NULL || warn_entries!=NULL) ? LDAP_SCOPE_SUBTREE : LDAP_SCOPE_BASE, ld_attr, NULL, 0, &result)
-                        != LDAP_SUCCESS) {
-                if (verbose)
-                        ldap_perror(ld, "ldap_search");
-                printf (_("Could not search/find objectclasses in %s\n"), ld_base);
+        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");
+                }
+                printf(_("Could not search/find objectclasses in %s\n"), config.ld_base);
                 return STATE_CRITICAL;
-        } else if (crit_entries!=NULL || warn_entries!=NULL) {
-                num_entries = ldap_count_entries(ld, result);
+        }
+
+        if (config.crit_entries != NULL || config.warn_entries != NULL) {
+                num_entries = ldap_count_entries(ldap_connection, result);
         }
 
         /* unbind from the ldap server */
-        ldap_unbind (ld);
+        ldap_unbind(ldap_connection);
 
         /* reset the alarm handler */
-        alarm (0);
+        alarm(0);
 
         /* calculate the elapsed time and compare to thresholds */
 
-        microsec = deltime (tv);
-        elapsed_time = (double)microsec / 1.0e6;
-
-        if (crit_time!=UNDEFINED && elapsed_time>crit_time)
+        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 (warn_time!=UNDEFINED && elapsed_time>warn_time)
+        } else if (config.warn_time_set && elapsed_time > config.warn_time) {
                 status = STATE_WARNING;
-        else
+        } else {
                 status = STATE_OK;
+        }
 
-        if(entries_thresholds != NULL) {
+        if (config.entries_thresholds != NULL) {
                 if (verbose) {
-                        printf ("entries found: %d\n", num_entries);
-                        print_thresholds("entry thresholds", entries_thresholds);
+                        printf("entries found: %d\n", num_entries);
+                        print_thresholds("entry thresholds", config.entries_thresholds);
                 }
-                status_entries = get_status(num_entries, 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) {
@@ -245,273 +214,272 @@ main (int argc, char *argv[])
         }
 
         /* print out the result */
-        if (crit_entries!=NULL || 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",
-                                (int)warn_time, warn_time,
-                                (int)crit_time, crit_time,
-                                true, 0, false, 0),
-                        sperfdata ("entries", (double)num_entries, "",
-                                warn_entries,
-                                crit_entries,
-                                true, 0.0, false, 0.0));
+        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));
         } else {
-                printf (_("LDAP %s - %.3f seconds response time|%s\n"),
-                        state_text (status),
-                        elapsed_time,
-                        fperfdata ("time", elapsed_time, "s",
-                                (int)warn_time, warn_time,
-                                (int)crit_time, crit_time,
-                                true, 0, false, 0));
+                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));
         }
 
-        return status;
+        exit(status);
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
+check_ldap_config_wrapper process_arguments(int argc, char **argv) {
         /* initialize the long option struct */
-        static struct option longopts[] = {
-                {"help", no_argument, 0, 'h'},
-                {"version", no_argument, 0, 'V'},
-                {"timeout", required_argument, 0, 't'},
-                {"hostname", required_argument, 0, 'H'},
-                {"base", required_argument, 0, 'b'},
-                {"attr", required_argument, 0, 'a'},
-                {"bind", required_argument, 0, 'D'},
-                {"pass", required_argument, 0, 'P'},
+        static struct option longopts[] = {{"help", no_argument, 0, 'h'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"hostname", required_argument, 0, 'H'},
+                                                                           {"base", required_argument, 0, 'b'},
+                                                                           {"attr", required_argument, 0, 'a'},
+                                                                           {"bind", required_argument, 0, 'D'},
+                                                                           {"pass", required_argument, 0, 'P'},
 #ifdef HAVE_LDAP_SET_OPTION
-                {"ver2", no_argument, 0, '2'},
-                {"ver3", no_argument, 0, '3'},
+                                                                           {"ver2", no_argument, 0, '2'},
+                                                                           {"ver3", no_argument, 0, '3'},
 #endif
-                {"starttls", no_argument, 0, 'T'},
-                {"ssl", no_argument, 0, 'S'},
-                {"use-ipv4", no_argument, 0, '4'},
-                {"use-ipv6", no_argument, 0, '6'},
-                {"port", required_argument, 0, 'p'},
-                {"warn", required_argument, 0, 'w'},
-                {"crit", required_argument, 0, 'c'},
-                {"warn-entries", required_argument, 0, 'W'},
-                {"crit-entries", required_argument, 0, 'C'},
-                {"verbose", no_argument, 0, 'v'},
-                {0, 0, 0, 0}
+                                                                           {"starttls", no_argument, 0, 'T'},
+                                                                           {"ssl", no_argument, 0, 'S'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"warn", required_argument, 0, 'w'},
+                                                                           {"crit", required_argument, 0, 'c'},
+                                                                           {"warn-entries", required_argument, 0, 'W'},
+                                                                           {"crit-entries", required_argument, 0, 'C'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {0, 0, 0, 0}};
+
+        check_ldap_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_ldap_config_init(),
         };
 
-        if (argc < 2)
-                return ERROR;
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
+        for (int index = 1; index < argc; index++) {
+                if (strcmp("-to", argv[index]) == 0) {
+                        strcpy(argv[index], "-t");
+                }
         }
 
+        int option = 0;
         while (true) {
-                c = 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 (c == -1 || c == EOF)
+                if (option_index == -1 || option_index == EOF) {
                         break;
+                }
 
-                switch (c) {
-                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_intnonneg (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
-                        else
-                                socket_timeout = atoi (optarg);
+                switch (option_index) {
+                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_intnonneg(optarg)) {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        } else {
+                                socket_timeout = atoi(optarg);
+                        }
                         break;
                 case 'H':
-                        ld_host = optarg;
+                        result.config.ld_host = optarg;
                         break;
                 case 'b':
-                        ld_base = optarg;
+                        result.config.ld_base = optarg;
                         break;
                 case 'p':
-                        ld_port = atoi (optarg);
+                        result.config.ld_port = atoi(optarg);
                         break;
                 case 'a':
-                        ld_attr = optarg;
+                        result.config.ld_attr = optarg;
                         break;
                 case 'D':
-                        ld_binddn = optarg;
+                        result.config.ld_binddn = optarg;
                         break;
                 case 'P':
-                        ld_passwd = optarg;
+                        result.config.ld_passwd = optarg;
                         break;
                 case 'w':
-                        warn_time = strtod (optarg, NULL);
+                        result.config.warn_time_set = true;
+                        result.config.warn_time = strtod(optarg, NULL);
                         break;
                 case 'c':
-                        crit_time = strtod (optarg, NULL);
+                        result.config.crit_time_set = true;
+                        result.config.crit_time = strtod(optarg, NULL);
                         break;
                 case 'W':
-                        warn_entries = optarg;
+                        result.config.warn_entries = optarg;
                         break;
                 case 'C':
-                        crit_entries = optarg;
+                        result.config.crit_entries = optarg;
                         break;
 #ifdef HAVE_LDAP_SET_OPTION
                 case '2':
-                        ld_protocol = 2;
+                        result.config.ld_protocol = 2;
                         break;
                 case '3':
-                        ld_protocol = 3;
+                        result.config.ld_protocol = 3;
                         break;
-#endif
+#endif // HAVE_LDAP_SET_OPTION
                 case '4':
                         address_family = AF_INET;
                         break;
                 case 'v':
-                        verbose = true;
+                        verbose++;
                         break;
                 case 'T':
-                        if (! ssl_on_connect)
-                                starttls = true;
-                        else
+                        if (!result.config.ssl_on_connect) {
+                                result.config.starttls = true;
+                        } else {
                                 usage_va(_("%s cannot be combined with %s"), "-T/--starttls", "-S/--ssl");
+                        }
                         break;
                 case 'S':
-                        if (! starttls) {
-                                ssl_on_connect = true;
-                                if (ld_port == -1)
-                                        ld_port = LDAPS_PORT;
-                        } else
+                        if (!result.config.starttls) {
+                                result.config.ssl_on_connect = true;
+                                if (result.config.ld_port == -1) {
+                                        result.config.ld_port = LDAPS_PORT;
+                                }
+                        } else {
                                 usage_va(_("%s cannot be combined with %s"), "-S/--ssl", "-T/--starttls");
+                        }
                         break;
                 case '6':
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage (_("IPv6 support not available\n"));
+                        usage(_("IPv6 support not available\n"));
 #endif
                         break;
                 default:
-                        usage5 ();
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (ld_host == NULL && is_host(argv[c]))
-                ld_host = strdup (argv[c++]);
+        int index = optind;
+        if ((result.config.ld_host == NULL) && is_host(argv[index])) {
+                result.config.ld_host = strdup(argv[index++]);
+        }
 
-        if (ld_base == NULL && argv[c])
-                ld_base = strdup (argv[c++]);
+        if ((result.config.ld_base == NULL) && argv[index]) {
+                result.config.ld_base = strdup(argv[index++]);
+        }
 
-        if (ld_port == -1)
-                ld_port = DEFAULT_PORT;
+        if (result.config.ld_port == -1) {
+                result.config.ld_port = DEFAULT_PORT;
+        }
 
-        return validate_arguments ();
+        if (strstr(argv[0], "check_ldaps") && !result.config.starttls && !result.config.ssl_on_connect) {
+                result.config.starttls = true;
+        }
+
+        return validate_arguments(result);
 }
 
+check_ldap_config_wrapper validate_arguments(check_ldap_config_wrapper config_wrapper) {
+        if (config_wrapper.config.ld_host == NULL || strlen(config_wrapper.config.ld_host) == 0) {
+                usage4(_("Please specify the host name\n"));
+        }
 
-int
-validate_arguments ()
-{
-        if (ld_host==NULL || strlen(ld_host)==0)
-                usage4 (_("Please specify the host name\n"));
+        if (config_wrapper.config.ld_base == NULL) {
+                usage4(_("Please specify the LDAP base\n"));
+        }
 
-        if (ld_base==NULL)
-                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 (crit_entries!=NULL || warn_entries!=NULL) {
-                set_thresholds(&entries_thresholds,
-                        warn_entries, crit_entries);
+        if (config_wrapper.config.ld_passwd == NULL) {
+                config_wrapper.config.ld_passwd = getenv("LDAP_PASSWORD");
         }
-        if (ld_passwd==NULL)
-                ld_passwd = getenv("LDAP_PASSWORD");
 
-        return OK;
+        return config_wrapper;
 }
 
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", DEFAULT_PORT);
+        xasprintf(&myport, "%d", DEFAULT_PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)\n");
+        printf(COPYRIGHT, copyright, email);
 
-        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 (UT_HOST_PORT, 'p', myport);
+        printf(UT_HOST_PORT, 'p', myport);
 
-        printf (UT_IPv46);
+        printf(UT_IPv46);
 
-        printf (" %s\n", "-a [--attr]");
-  printf ("    %s\n", _("ldap attribute to search (default: \"(objectclass=*)\""));
-  printf (" %s\n", "-b [--base]");
-  printf ("    %s\n", _("ldap base (eg. ou=my unit, o=my org, c=at"));
-  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", "-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\n", "-a [--attr]");
+        printf("    %s\n", _("ldap attribute to search (default: \"(objectclass=*)\""));
+        printf(" %s\n", "-b [--base]");
+        printf("    %s\n", _("ldap base (eg. ou=my unit, o=my org, c=at"));
+        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", "-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);
 
 #ifdef HAVE_LDAP_SET_OPTION
-        printf (" %s\n", "-2 [--ver2]");
-  printf ("    %s\n", _("use ldap protocol version 2"));
-  printf (" %s\n", "-3 [--ver3]");
-  printf ("    %s\n", _("use ldap protocol version 3"));
-  printf ("    (%s %d)\n", _("default protocol version:"), DEFAULT_PROTOCOL);
+        printf(" %s\n", "-2 [--ver2]");
+        printf("    %s\n", _("use ldap protocol version 2"));
+        printf(" %s\n", "-3 [--ver3]");
+        printf("    %s\n", _("use ldap protocol version 3"));
+        printf("    (%s %d)\n", _("default protocol version:"), DEFAULT_PROTOCOL);
 #endif
 
-        printf (UT_WARN_CRIT);
+        printf(UT_WARN_CRIT);
 
-  printf (" %s\n", "-W [--warn-entries]");
-  printf ("    %s\n", _("Number of found entries to result in warning status"));
-  printf (" %s\n", "-C [--crit-entries]");
-  printf ("    %s\n", _("Number of found entries to result in critical status"));
+        printf(" %s\n", "-W [--warn-entries]");
+        printf("    %s\n", _("Number of found entries to result in warning status"));
+        printf(" %s\n", "-C [--crit-entries]");
+        printf("    %s\n", _("Number of found entries to result in critical status"));
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-        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 (" %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", _("to define the behaviour explicitly instead."));
-        printf (" %s\n", _("The parameters --warn-entries and --crit-entries are optional."));
+        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(" %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", _("to define the behaviour explicitly instead."));
+        printf(" %s\n", _("The parameters --warn-entries and --crit-entries are optional."));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf (" %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]",progname);
-  printf ("\n       [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s -H <host> -b <base_dn> [-p <port>] [-a <attr>] [-D <binddn>]", progname);
+        printf("\n       [-P <password>] [-w <warn_time>] [-c <crit_time>] [-t timeout]%s\n",
 #ifdef HAVE_LDAP_SET_OPTION
-                        "\n       [-2|-3] [-4|-6]"
+                   "\n       [-2|-3] [-4|-6]"
 #else
-                        ""
+                   ""
 #endif
-                        );
+        );
 }
diff --git a/plugins/check_ldap.d/config.h b/plugins/check_ldap.d/config.h
new file mode 100644
index 00000000..c8a40610
--- /dev/null
+++ b/plugins/check_ldap.d/config.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "../../config.h"
+#include "thresholds.h"
+#include <stddef.h>
+
+static char ld_defattr[] = "(objectclass=*)";
+
+enum {
+#ifdef HAVE_LDAP_SET_OPTION
+        DEFAULT_PROTOCOL = 2,
+#endif
+};
+
+typedef struct {
+        char *ld_host;
+        char *ld_base;
+        char *ld_passwd;
+        char *ld_binddn;
+        char *ld_attr;
+        int ld_port;
+        bool starttls;
+        bool ssl_on_connect;
+#ifdef HAVE_LDAP_SET_OPTION
+        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;
+} check_ldap_config;
+
+check_ldap_config check_ldap_config_init() {
+        check_ldap_config tmp = {
+                .ld_host = NULL,
+                .ld_base = NULL,
+                .ld_passwd = NULL,
+                .ld_binddn = NULL,
+                .ld_attr = ld_defattr,
+                .ld_port = -1,
+                .starttls = false,
+                .ssl_on_connect = false,
+#ifdef HAVE_LDAP_SET_OPTION
+                .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,
+        };
+        return tmp;
+}
diff --git a/plugins/check_load.c b/plugins/check_load.c
index 1431d130..2925bff3 100644
--- a/plugins/check_load.c
+++ b/plugins/check_load.c
@@ -1,350 +1,423 @@
 /*****************************************************************************
-*
-* 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;
+        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"));
         }
-        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);
+
+        const check_load_config config = tmp_config.config;
+
+        double load_values[3] = {0, 0, 0};
+
+        // 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"));
         }
-        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;
+
+        mp_check overall = mp_check_init();
+        if (config.output_format_set) {
+                mp_set_format(config.output_format);
         }
-#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;
+
+        bool is_using_scaled_load_values = false;
+        long numcpus;
+        if (config.take_into_account_cpus && ((numcpus = GET_NUMBER_OF_CPUS()) > 0)) {
+                is_using_scaled_load_values = true;
+
+                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);
         }
 
-        /* we got this far, so assume OK until we've measured */
-        result = STATE_OK;
+        mp_subcheck load_sc = mp_subcheck_init();
+        load_sc = mp_set_subcheck_default_state(load_sc, STATE_OK);
+        load_sc.output = "Total Load";
 
-        xasprintf(&status_line, _("load average: %.2f, %.2f, %.2f"), la1, la5, la15);
-        xasprintf(&status_line, ("total %s"), 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]);
+        }
 
+        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]);
+        }
 
-        double scaled_la[3] = { 0.0, 0.0, 0.0 };
-        bool is_using_scaled_load_values = false;
+        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]);
+        }
 
-        if (take_into_account_cpus == true && (numcpus = GET_NUMBER_OF_CPUS()) > 0) {
-                is_using_scaled_load_values = true;
+        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);
 
-                scaled_la[0] = la[0] / numcpus;
-                scaled_la[1] = la[1] / numcpus;
-                scaled_la[2] = la[2] / numcpus;
+        mp_add_subcheck_to_check(&overall, load_sc);
 
-                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);
-        }
+        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);
 
-        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;
+                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]);
                         }
-                        else if(la[i] > wload[i]) result = STATE_WARNING;
                 }
-        }
 
-        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_add_subcheck_to_check(&overall, top_proc_sc);
         }
 
-        putchar('\n');
-        if (n_procs_to_show > 0) {
-                print_top_consuming_processes();
-        }
-        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);
+        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 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]);
-        }
-
-        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 +429,51 @@ 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,
+        };
+        struct output chld_out;
+        struct 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 826b77e9..5bd276dc 100644
--- a/plugins/check_mrtg.c
+++ b/plugins/check_mrtg.c
@@ -1,385 +1,368 @@
 /*****************************************************************************
-* 
-* Monitoring check_mrtg plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_mrtg plugin
-* 
-* This plugin will check either the average or maximum value of one of the
-* two variables recorded in an MRTG log file.
-* 
-* 
-* 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_mrtg plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_mrtg plugin
+ *
+ * This plugin will check either the average or maximum value of one of the
+ * two variables recorded in an MRTG log file.
+ *
+ *
+ * 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_mrtg";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
+#include "check_mrtg.d/config.h"
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-
-char *log_file = NULL;
-int expire_minutes = 0;
-bool use_average = true;
-int variable_number = -1;
-unsigned long value_warning_threshold = 0L;
-unsigned long value_critical_threshold = 0L;
-char *label;
-char *units;
-
-int
-main (int argc, char **argv)
-{
-        int result = STATE_OK;
-        FILE *fp;
-        int line;
-        char input_buffer[MAX_INPUT_BUFFER];
-        char *temp_buffer;
-        time_t current_time;
-        time_t timestamp = 0L;
-        unsigned long average_value_rate = 0L;
-        unsigned long maximum_value_rate = 0L;
-        unsigned long rate = 0L;
+typedef struct {
+        int errorcode;
+        check_mrtg_config config;
+} check_mrtg_config_wrapper;
+static check_mrtg_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_mrtg_config_wrapper validate_arguments(check_mrtg_config_wrapper /*config_wrapper*/);
+
+static void print_help(void);
+void print_usage(void);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments\n"));
+        check_mrtg_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments\n"));
+        }
+
+        const check_mrtg_config config = tmp_config.config;
 
         /* open the MRTG log file for reading */
-        fp = fopen (log_file, "r");
-        if (fp == NULL) {
-                printf (_("Unable to open MRTG log file\n"));
+        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;
         }
 
-        line = 0;
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-
+        time_t timestamp = 0;
+        unsigned long average_value_rate = 0;
+        unsigned long maximum_value_rate = 0;
+        char input_buffer[MAX_INPUT_BUFFER];
+        int line = 0;
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, mtrg_log_file)) {
                 line++;
 
                 /* skip the first line of the log file */
-                if (line == 1)
+                if (line == 1) {
                         continue;
+                }
 
                 /* break out of read loop if we've passed the number of entries we want to read */
-                if (line > 2)
+                if (line > 2) {
                         break;
+                }
 
                 /* grab the timestamp */
-                temp_buffer = strtok (input_buffer, " ");
-                timestamp = strtoul (temp_buffer, NULL, 10);
+                char *temp_buffer = strtok(input_buffer, " ");
+                timestamp = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the average value 1 rate */
-                temp_buffer = strtok (NULL, " ");
-                if (variable_number == 1)
-                        average_value_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                if (config.variable_number == 1) {
+                        average_value_rate = strtoul(temp_buffer, NULL, 10);
+                }
 
                 /* grab the average value 2 rate */
-                temp_buffer = strtok (NULL, " ");
-                if (variable_number == 2)
-                        average_value_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                if (config.variable_number == 2) {
+                        average_value_rate = strtoul(temp_buffer, NULL, 10);
+                }
 
                 /* grab the maximum value 1 rate */
-                temp_buffer = strtok (NULL, " ");
-                if (variable_number == 1)
-                        maximum_value_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                if (config.variable_number == 1) {
+                        maximum_value_rate = strtoul(temp_buffer, NULL, 10);
+                }
 
                 /* grab the maximum value 2 rate */
-                temp_buffer = strtok (NULL, " ");
-                if (variable_number == 2)
-                        maximum_value_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                if (config.variable_number == 2) {
+                        maximum_value_rate = strtoul(temp_buffer, NULL, 10);
+                }
         }
 
         /* close the log file */
-        fclose (fp);
+        fclose(mtrg_log_file);
 
         /* if we couldn't read enough data, return an unknown error */
         if (line <= 2) {
-                printf (_("Unable to process MRTG log file\n"));
+                printf(_("Unable to process MRTG log file\n"));
                 return STATE_UNKNOWN;
         }
 
         /* make sure the MRTG data isn't too old */
-        time (&current_time);
-        if (expire_minutes > 0
-                        && (current_time - timestamp) > (expire_minutes * 60)) {
-                printf (_("MRTG data has expired (%d minutes old)\n"),
-                        (int) ((current_time - timestamp) / 60));
+        time_t current_time;
+        time(&current_time);
+        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;
         }
 
+        unsigned long rate = 0L;
         /* else check the incoming/outgoing rates */
-        if (use_average)
+        if (config.use_average) {
                 rate = average_value_rate;
-        else
+        } else {
                 rate = maximum_value_rate;
+        }
 
-        if (rate > value_critical_threshold)
+        int result = STATE_OK;
+        if (config.value_critical_threshold_set && rate > config.value_critical_threshold) {
                 result = STATE_CRITICAL;
-        else if (rate > value_warning_threshold)
+        } else if (config.value_warning_threshold_set && rate > config.value_warning_threshold) {
                 result = STATE_WARNING;
+        }
 
-        printf("%s. %s = %lu %s|%s\n",
-               (use_average) ? _("Avg") : _("Max"),
-               label, rate, units,
-               perfdata(label, (long) rate, units,
-                        (int) value_warning_threshold, (long) value_warning_threshold,
-                        (int) value_critical_threshold, (long) value_critical_threshold,
-                        0, 0, 0, 0));
+        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));
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
+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}
+                {"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}};
+
+        check_mrtg_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_mrtg_config_init(),
         };
 
-        if (argc < 2)
-                return ERROR;
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0) {
+                        strcpy(argv[i], "-t");
+                } else if (strcmp("-wt", argv[i]) == 0) {
+                        strcpy(argv[i], "-w");
+                } else if (strcmp("-ct", argv[i]) == 0) {
+                        strcpy(argv[i], "-c");
+                }
         }
 
+        int option_char;
+        int option = 0;
         while (1) {
-                c = getopt_long (argc, argv, "hVF:e:a:v:c:w:l:u:", longopts,
-                                                                         &option);
+                option_char = getopt_long(argc, argv, "hVF:e:a:v:c:w:l:u:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case 'F':                                                                       /* input file */
-                        log_file = optarg;
+                switch (option_char) {
+                case 'F': /* input file */
+                        result.config.log_file = optarg;
                         break;
-                case 'e':                                                                       /* ups name */
-                        expire_minutes = atoi (optarg);
+                case 'e': /* ups name */
+                        result.config.expire_minutes = atoi(optarg);
                         break;
-                case 'a':                                                                       /* port */
-                        if (!strcmp (optarg, "MAX"))
-                                use_average = false;
-                        else
-                                use_average = true;
+                case 'a': /* port */
+                        result.config.use_average = (bool)(strcmp(optarg, "MAX"));
                         break;
                 case 'v':
-                        variable_number = atoi (optarg);
-                        if (variable_number < 1 || variable_number > 2)
-                                usage4 (_("Invalid variable number"));
+                        result.config.variable_number = atoi(optarg);
+                        if (result.config.variable_number < 1 || result.config.variable_number > 2) {
+                                usage4(_("Invalid variable number"));
+                        }
                         break;
-                case 'w':                                                                       /* critical time threshold */
-                        value_warning_threshold = strtoul (optarg, NULL, 10);
+                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 */
-                        value_critical_threshold = strtoul (optarg, NULL, 10);
+                case 'c': /* warning time threshold */
+                        result.config.value_critical_threshold_set = true;
+                        result.config.value_critical_threshold = strtoul(optarg, NULL, 10);
                         break;
-                case 'l':                                                                       /* label */
-                        label = optarg;
+                case 'l': /* label */
+                        result.config.label = optarg;
                         break;
-                case 'u':                                                                       /* timeout */
-                        units = optarg;
+                case 'u': /* timeout */
+                        result.config.units = optarg;
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (log_file == NULL && argc > c) {
-                log_file = argv[c++];
+        option_char = optind;
+        if (result.config.log_file == NULL && argc > option_char) {
+                result.config.log_file = argv[option_char++];
         }
 
-        if (expire_minutes <= 0 && argc > c) {
-                if (is_intpos (argv[c]))
-                        expire_minutes = atoi (argv[c++]);
-                else
-                        die (STATE_UNKNOWN,
-                                   _("%s is not a valid expiration time\nUse '%s -h' for additional help\n"),
-                                   argv[c], progname);
+        if (result.config.expire_minutes <= 0 && argc > option_char) {
+                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);
+                }
         }
 
-        if (argc > c && strcmp (argv[c], "MAX") == 0) {
-                use_average = false;
-                c++;
-        }
-        else if (argc > c && strcmp (argv[c], "AVG") == 0) {
-                use_average = true;
-                c++;
+        if (argc > option_char && strcmp(argv[option_char], "MAX") == 0) {
+                result.config.use_average = false;
+                option_char++;
+        } else if (argc > option_char && strcmp(argv[option_char], "AVG") == 0) {
+                result.config.use_average = true;
+                option_char++;
         }
 
-        if (argc > c && variable_number == -1) {
-                variable_number = atoi (argv[c++]);
-                if (variable_number < 1 || variable_number > 2) {
-                        printf ("%s :", argv[c]);
-                        usage (_("Invalid variable number\n"));
+        if (argc > option_char && result.config.variable_number == -1) {
+                result.config.variable_number = atoi(argv[option_char++]);
+                if (result.config.variable_number < 1 || result.config.variable_number > 2) {
+                        printf("%s :", argv[option_char]);
+                        usage(_("Invalid variable number\n"));
                 }
         }
 
-        if (argc > c && value_warning_threshold == 0) {
-                value_warning_threshold = strtoul (argv[c++], NULL, 10);
+        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 > c && value_critical_threshold == 0) {
-                value_critical_threshold = strtoul (argv[c++], NULL, 10);
+        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 > c && strlen (label) == 0) {
-                label = argv[c++];
+        if (argc > option_char && strlen(result.config.label) == 0) {
+                result.config.label = argv[option_char++];
         }
 
-        if (argc > c && strlen (units) == 0) {
-                units = argv[c++];
+        if (argc > option_char && strlen(result.config.units) == 0) {
+                result.config.units = argv[option_char++];
         }
 
-        return validate_arguments ();
+        return validate_arguments(result);
 }
 
-int
-validate_arguments (void)
-{
-        if (variable_number == -1)
-                usage4 (_("You must supply the variable number"));
+check_mrtg_config_wrapper validate_arguments(check_mrtg_config_wrapper config_wrapper) {
+        if (config_wrapper.config.variable_number == -1) {
+                usage4(_("You must supply the variable number"));
+        }
 
-        if (label == NULL)
-                label = strdup ("value");
+        if (config_wrapper.config.label == NULL) {
+                config_wrapper.config.label = strdup("value");
+        }
 
-        if (units == NULL)
-                units = strdup ("");
+        if (config_wrapper.config.units == NULL) {
+                config_wrapper.config.units = strdup("");
+        }
 
-        return OK;
+        return config_wrapper;
 }
 
-
-
-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", _("This plugin will check either the average or maximum value of one of the"));
-  printf ("%s\n", _("two variables recorded in an MRTG log file."));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (" %s\n", "-F, --logfile=FILE");
-  printf ("   %s\n", _("The MRTG log file containing the data you want to monitor"));
-  printf (" %s\n", "-e, --expires=MINUTES");
-  printf ("   %s\n", _("Minutes before MRTG data is considered to be too old"));
-  printf (" %s\n", "-a, --aggregation=AVG|MAX");
-  printf ("   %s\n", _("Should we check average or maximum values?"));
-  printf (" %s\n", "-v, --variable=INTEGER");
-  printf ("   %s\n", _("Which variable set should we inspect? (1 or 2)"));
-  printf (" %s\n", "-w, --warning=INTEGER");
-  printf ("   %s\n", _("Threshold value for data to result in WARNING status"));
-  printf (" %s\n", "-c, --critical=INTEGER");
-  printf ("   %s\n", _("Threshold value for data to result in CRITICAL status"));
-        printf (" %s\n", "-l, --label=STRING");
-  printf ("   %s\n", _("Type label for data (Examples: Conns, \"Processor Load\", In, Out)"));
-  printf (" %s\n", "-u, --units=STRING");
-  printf ("   %s\n", _("Option units label for data (Example: Packets/Sec, Errors/Sec,"));
-  printf ("   %s\n", _("\"Bytes Per Second\", \"%% Utilization\")"));
-
-  printf ("\n");
-        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", _("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", _("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", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
-
-        printf (UT_SUPPORT);
+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", _("This plugin will check either the average or maximum value of one of the"));
+        printf("%s\n", _("two variables recorded in an MRTG log file."));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" %s\n", "-F, --logfile=FILE");
+        printf("   %s\n", _("The MRTG log file containing the data you want to monitor"));
+        printf(" %s\n", "-e, --expires=MINUTES");
+        printf("   %s\n", _("Minutes before MRTG data is considered to be too old"));
+        printf(" %s\n", "-a, --aggregation=AVG|MAX");
+        printf("   %s\n", _("Should we check average or maximum values?"));
+        printf(" %s\n", "-v, --variable=INTEGER");
+        printf("   %s\n", _("Which variable set should we inspect? (1 or 2)"));
+        printf(" %s\n", "-w, --warning=INTEGER");
+        printf("   %s\n", _("Threshold value for data to result in WARNING status"));
+        printf(" %s\n", "-c, --critical=INTEGER");
+        printf("   %s\n", _("Threshold value for data to result in CRITICAL status"));
+        printf(" %s\n", "-l, --label=STRING");
+        printf("   %s\n", _("Type label for data (Examples: Conns, \"Processor Load\", In, Out)"));
+        printf(" %s\n", "-u, --units=STRING");
+        printf("   %s\n", _("Option units label for data (Example: Packets/Sec, Errors/Sec,"));
+        printf("   %s\n", _("\"Bytes Per Second\", \"%% Utilization\")"));
+
+        printf("\n");
+        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", _("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", _("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", "http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
+
+        printf(UT_SUPPORT);
 }
 
-
-
 /* original command line:
          <log_file> <expire_minutes> <AVG|MAX> <variable> <vwl> <vcl> <label> [units] */
 
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n",progname);
-  printf ("[-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -F log_file -a <AVG | MAX> -v variable -w warning -c critical\n", progname);
+        printf("[-l label] [-u units] [-e expire_minutes] [-t timeout] [-v]\n");
 }
diff --git a/plugins/check_mrtg.d/config.h b/plugins/check_mrtg.d/config.h
new file mode 100644
index 00000000..96b849a2
--- /dev/null
+++ b/plugins/check_mrtg.d/config.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+#include <stdlib.h>
+
+typedef struct {
+        bool use_average;
+        int variable_number;
+        int expire_minutes;
+        char *label;
+        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;
+} check_mrtg_config;
+
+check_mrtg_config check_mrtg_config_init() {
+        check_mrtg_config tmp = {
+                .use_average = true,
+                .variable_number = -1,
+                .expire_minutes = 0,
+                .label = NULL,
+                .units = NULL,
+                .log_file = NULL,
+
+                .value_warning_threshold_set = false,
+                .value_warning_threshold = 0,
+                .value_critical_threshold_set = false,
+                .value_critical_threshold = 0,
+        };
+        return tmp;
+}
diff --git a/plugins/check_mrtgtraf.c b/plugins/check_mrtgtraf.c
index bd25d47d..8c7cf8aa 100644
--- a/plugins/check_mrtgtraf.c
+++ b/plugins/check_mrtgtraf.c
@@ -1,381 +1,352 @@
 /*****************************************************************************
-* 
-* Monitoring check_mrtgtraf plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_mtrgtraf plugin
-* 
-* This plugin will check the incoming/outgoing transfer rates of a router
-* switch, etc recorded in an MRTG log.
-* 
-* 
-* 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_mrtgtraf plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_mtrgtraf plugin
+ *
+ * This plugin will check the incoming/outgoing transfer rates of a router
+ * switch, etc recorded in an MRTG log.
+ *
+ *
+ * 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_mrtgtraf";
+const char *copyright = "1999-2024";
+const char *email = "devel@monitoring-plugins.org";
+
+#include "check_mrtgtraf.d/config.h"
 #include "common.h"
 #include "utils.h"
 
-const char *progname = "check_mrtgtraf";
-const char *copyright = "1999-2007";
-const char *email = "devel@monitoring-plugins.org";
+typedef struct {
+        int errorcode;
+        check_mrtgtraf_config config;
+} check_mrtgtraf_config_wrapper;
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help(void);
+static check_mrtgtraf_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
 void print_usage(void);
 
-char *log_file = NULL;
-int expire_minutes = -1;
-bool use_average = true;
-unsigned long incoming_warning_threshold = 0L;
-unsigned long incoming_critical_threshold = 0L;
-unsigned long outgoing_warning_threshold = 0L;
-unsigned long outgoing_critical_threshold = 0L;
+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_mrtgtraf_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        const check_mrtgtraf_config config = tmp_config.config;
+
+        /* 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"));
+        }
 
-int
-main (int argc, char **argv)
-{
-        int result = STATE_OK;
-        FILE *fp;
-        int line;
-        char input_buffer[MAX_INPUT_BUFFER];
-        char *temp_buffer;
-        time_t current_time;
-        char *error_message;
         time_t timestamp = 0L;
+        char input_buffer[MAX_INPUT_BUFFER];
         unsigned long average_incoming_rate = 0L;
         unsigned long average_outgoing_rate = 0L;
         unsigned long maximum_incoming_rate = 0L;
         unsigned long maximum_outgoing_rate = 0L;
-        unsigned long incoming_rate = 0L;
-        unsigned long outgoing_rate = 0L;
-        double adjusted_incoming_rate = 0.0;
-        double adjusted_outgoing_rate = 0.0;
-        char incoming_speed_rating[8];
-        char outgoing_speed_rating[8];
-
-        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"));
-
-        /* open the MRTG log file for reading */
-        fp = fopen (log_file, "r");
-        if (fp == NULL)
-                usage4 (_("Unable to open MRTG log file"));
-
-        line = 0;
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
+        int line = 0;
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, mrtg_log_file_ptr)) {
 
                 line++;
 
                 /* skip the first line of the log file */
-                if (line == 1)
+                if (line == 1) {
                         continue;
+                }
 
                 /* break out of read loop */
                 /* if we've passed the number of entries we want to read */
-                if (line > 2)
+                if (line > 2) {
                         break;
+                }
 
                 /* grab the timestamp */
-                temp_buffer = strtok (input_buffer, " ");
-                timestamp = strtoul (temp_buffer, NULL, 10);
+                char *temp_buffer = strtok(input_buffer, " ");
+                timestamp = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the average incoming transfer rate */
-                temp_buffer = strtok (NULL, " ");
-                average_incoming_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                average_incoming_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the average outgoing transfer rate */
-                temp_buffer = strtok (NULL, " ");
-                average_outgoing_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                average_outgoing_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the maximum incoming transfer rate */
-                temp_buffer = strtok (NULL, " ");
-                maximum_incoming_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                maximum_incoming_rate = strtoul(temp_buffer, NULL, 10);
 
                 /* grab the maximum outgoing transfer rate */
-                temp_buffer = strtok (NULL, " ");
-                maximum_outgoing_rate = strtoul (temp_buffer, NULL, 10);
+                temp_buffer = strtok(NULL, " ");
+                maximum_outgoing_rate = strtoul(temp_buffer, NULL, 10);
         }
 
         /* close the log file */
-        fclose (fp);
+        fclose(mrtg_log_file_ptr);
 
         /* if we couldn't read enough data, return an unknown error */
-        if (line <= 2)
-                usage4 (_("Unable to process MRTG log file"));
+        if (line <= 2) {
+                usage4(_("Unable to process MRTG log file"));
+        }
 
         /* make sure the MRTG data isn't too old */
-        time (&current_time);
-        if ((expire_minutes > 0) &&
-            (current_time - timestamp) > (expire_minutes * 60))
-                die (STATE_WARNING,     _("MRTG data has expired (%d minutes old)\n"),
-                     (int) ((current_time - timestamp) / 60));
+        time_t current_time;
+        time(&current_time);
+        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));
+        }
 
+        unsigned long incoming_rate = 0L;
+        unsigned long outgoing_rate = 0L;
         /* else check the incoming/outgoing rates */
-        if (use_average) {
+        if (config.use_average) {
                 incoming_rate = average_incoming_rate;
                 outgoing_rate = average_outgoing_rate;
-        }
-        else {
+        } else {
                 incoming_rate = maximum_incoming_rate;
                 outgoing_rate = maximum_outgoing_rate;
         }
 
+        double adjusted_incoming_rate = 0.0;
+        char incoming_speed_rating[8];
         /* report incoming traffic in Bytes/sec */
         if (incoming_rate < 1024) {
-                strcpy (incoming_speed_rating, "B");
-                adjusted_incoming_rate = (double) incoming_rate;
+                strcpy(incoming_speed_rating, "B");
+                adjusted_incoming_rate = (double)incoming_rate;
         }
 
         /* 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);
+                strcpy(incoming_speed_rating, "KB");
+                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);
+                strcpy(incoming_speed_rating, "MB");
+                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) {
-                strcpy (outgoing_speed_rating, "B");
-                adjusted_outgoing_rate = (double) outgoing_rate;
+                strcpy(outgoing_speed_rating, "B");
+                adjusted_outgoing_rate = (double)outgoing_rate;
         }
 
         /* report outgoing traffic in KBytes/sec */
         else if (outgoing_rate < (1024 * 1024)) {
-                strcpy (outgoing_speed_rating, "KB");
-                adjusted_outgoing_rate = (double) (outgoing_rate / 1024.0);
+                strcpy(outgoing_speed_rating, "KB");
+                adjusted_outgoing_rate = (double)(outgoing_rate / 1024.0);
         }
 
         /* report outgoing traffic in MBytes/sec */
         else {
-                strcpy (outgoing_speed_rating, "MB");
-                adjusted_outgoing_rate = (double) (outgoing_rate / 1024.0 / 1024.0);
+                strcpy(outgoing_speed_rating, "MB");
+                adjusted_outgoing_rate = (outgoing_rate / 1024.0 / 1024.0);
         }
 
-        if (incoming_rate > incoming_critical_threshold
-                        || outgoing_rate > outgoing_critical_threshold) {
+        int result = STATE_OK;
+        if (incoming_rate > config.incoming_critical_threshold || outgoing_rate > config.outgoing_critical_threshold) {
                 result = STATE_CRITICAL;
-        }
-        else if (incoming_rate > incoming_warning_threshold
-                                         || outgoing_rate > outgoing_warning_threshold) {
+        } else if (incoming_rate > config.incoming_warning_threshold || outgoing_rate > config.outgoing_warning_threshold) {
                 result = STATE_WARNING;
         }
 
-        xasprintf (&error_message, _("%s. In = %0.1f %s/s, %s. Out = %0.1f %s/s|%s %s\n"),
-                  (use_average) ? _("Avg") : _("Max"), adjusted_incoming_rate,
-                  incoming_speed_rating, (use_average) ? _("Avg") : _("Max"),
-                  adjusted_outgoing_rate, outgoing_speed_rating,
-                  fperfdata("in", adjusted_incoming_rate, incoming_speed_rating,
-                           (int)incoming_warning_threshold, incoming_warning_threshold,
-                           (int)incoming_critical_threshold, incoming_critical_threshold,
-                           true, 0, false, 0),
-                  fperfdata("out", adjusted_outgoing_rate, outgoing_speed_rating,
-                           (int)outgoing_warning_threshold, outgoing_warning_threshold,
-                           (int)outgoing_critical_threshold, outgoing_critical_threshold,
-                           true, 0, false, 0));
-
-        printf (_("Traffic %s - %s\n"), state_text(result), error_message);
+        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;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"filename", required_argument, 0, 'F'},
-                {"expires", required_argument, 0, 'e'},
-                {"aggregation", required_argument, 0, 'a'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
+check_mrtgtraf_config_wrapper process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"filename", required_argument, 0, 'F'},
+                                                                           {"expires", required_argument, 0, 'e'},
+                                                                           {"aggregation", required_argument, 0, 'a'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
+
+        check_mrtgtraf_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_mrtgtraf_config_init(),
         };
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        if (argc < 2)
-                return ERROR;
-
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0) {
+                        strcpy(argv[i], "-t");
+                } else if (strcmp("-wt", argv[i]) == 0) {
+                        strcpy(argv[i], "-w");
+                } else if (strcmp("-ct", argv[i]) == 0) {
+                        strcpy(argv[i], "-c");
+                }
         }
 
-        while (1) {
-                c = getopt_long (argc, argv, "hVF:e:a:c:w:", longopts, &option);
+        int option_char;
+        int option = 0;
+        while (true) {
+                option_char = getopt_long(argc, argv, "hVF:e:a:c:w:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case 'F':                                                                       /* input file */
-                        log_file = optarg;
+                switch (option_char) {
+                case 'F': /* input file */
+                        result.config.log_file = optarg;
                         break;
-                case 'e':                                                                       /* expiration time */
-                        expire_minutes = atoi (optarg);
+                case 'e': /* expiration time */
+                        result.config.expire_minutes = atoi(optarg);
                         break;
-                case 'a':                                                                       /* aggregation (AVE or MAX) */
-                        if (!strcmp (optarg, "MAX"))
-                                use_average = false;
-                        else
-                                use_average = true;
+                case 'a': /* aggregation (AVE or MAX) */
+                        result.config.use_average = (bool)(strcmp(optarg, "MAX"));
                         break;
-                case 'c':                                                                       /* warning threshold */
-                        sscanf (optarg, "%lu,%lu", &incoming_critical_threshold,
-                                                        &outgoing_critical_threshold);
+                case 'c': /* warning threshold */
+                        sscanf(optarg, "%lu,%lu", &result.config.incoming_critical_threshold, &result.config.outgoing_critical_threshold);
                         break;
-                case 'w':                                                                       /* critical threshold */
-                        sscanf (optarg, "%lu,%lu", &incoming_warning_threshold,
-                                                        &outgoing_warning_threshold);
+                case 'w': /* critical threshold */
+                        sscanf(optarg, "%lu,%lu", &result.config.incoming_warning_threshold, &result.config.outgoing_warning_threshold);
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (argc > c && log_file == NULL) {
-                log_file = argv[c++];
+        option_char = optind;
+        if (argc > option_char && result.config.log_file == NULL) {
+                result.config.log_file = argv[option_char++];
         }
 
-        if (argc > c && expire_minutes == -1) {
-                expire_minutes = atoi (argv[c++]);
+        if (argc > option_char && result.config.expire_minutes == -1) {
+                result.config.expire_minutes = atoi(argv[option_char++]);
         }
 
-        if (argc > c && strcmp (argv[c], "MAX") == 0) {
-                use_average = false;
-                c++;
-        }
-        else if (argc > c && strcmp (argv[c], "AVG") == 0) {
-                use_average = true;
-                c++;
+        if (argc > option_char && strcmp(argv[option_char], "MAX") == 0) {
+                result.config.use_average = false;
+                option_char++;
+        } else if (argc > option_char && strcmp(argv[option_char], "AVG") == 0) {
+                result.config.use_average = true;
+                option_char++;
         }
 
-        if (argc > c && incoming_warning_threshold == 0) {
-                incoming_warning_threshold = strtoul (argv[c++], NULL, 10);
+        if (argc > option_char && result.config.incoming_warning_threshold == 0) {
+                result.config.incoming_warning_threshold = strtoul(argv[option_char++], NULL, 10);
         }
 
-        if (argc > c && incoming_critical_threshold == 0) {
-                incoming_critical_threshold = strtoul (argv[c++], NULL, 10);
+        if (argc > option_char && result.config.incoming_critical_threshold == 0) {
+                result.config.incoming_critical_threshold = strtoul(argv[option_char++], NULL, 10);
         }
 
-        if (argc > c && outgoing_warning_threshold == 0) {
-                outgoing_warning_threshold = strtoul (argv[c++], NULL, 10);
+        if (argc > option_char && result.config.outgoing_warning_threshold == 0) {
+                result.config.outgoing_warning_threshold = strtoul(argv[option_char++], NULL, 10);
         }
-        
-        if (argc > c && outgoing_critical_threshold == 0) {
-                outgoing_critical_threshold = strtoul (argv[c++], NULL, 10);
-        }
-
-        return validate_arguments ();
-}
 
+        if (argc > option_char && result.config.outgoing_critical_threshold == 0) {
+                result.config.outgoing_critical_threshold = strtoul(argv[option_char++], NULL, 10);
+        }
 
-int
-validate_arguments (void)
-{
-        return OK;
+        return result;
 }
 
-
-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", _("This plugin will check the incoming/outgoing transfer rates of a router,"));
-  printf ("%s\n", _("switch, etc recorded in an MRTG log.  If the newest log entry is older"));
-  printf ("%s\n", _("than <expire_minutes>, a WARNING status is returned. If either the"));
-  printf ("%s\n", _("incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in"));
-  printf ("%s\n", _("Bytes/sec), a CRITICAL status results.  If either of the rates exceed"));
-  printf ("%s\n", _("the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results."));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (" %s\n", "-F, --filename=STRING");
-  printf ("    %s\n", _("File to read log from"));
-  printf (" %s\n", "-e, --expires=INTEGER");
-  printf ("    %s\n", _("Minutes after which log expires"));
-  printf (" %s\n", "-a, --aggregation=(AVG|MAX)");
-  printf ("    %s\n", _("Test average or maximum"));
-  printf (" %s\n", "-w, --warning");
-  printf ("    %s\n", _("Warning threshold pair <incoming>,<outgoing>"));
-  printf (" %s\n", "-c, --critical");
-  printf ("    %s\n", _("Critical threshold pair <incoming>,<outgoing>"));
-
-  printf ("\n");
-        printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from"));
-  printf (" %s\n", "  http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
-  printf (" %s\n", _("- While MRTG can monitor things other than traffic rates, this"));
-  printf (" %s\n", _("  plugin probably won't work with much else without modification."));
-  printf (" %s\n", _("- The calculated i/o rates are a little off from what MRTG actually"));
-  printf (" %s\n", _("  reports.  I'm not sure why this is right now, but will look into it"));
-  printf (" %s\n", _("  for future enhancements of this plugin."));
-
-        printf (UT_SUPPORT);
+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", _("This plugin will check the incoming/outgoing transfer rates of a router,"));
+        printf("%s\n", _("switch, etc recorded in an MRTG log.  If the newest log entry is older"));
+        printf("%s\n", _("than <expire_minutes>, a WARNING status is returned. If either the"));
+        printf("%s\n", _("incoming or outgoing rates exceed the <icl> or <ocl> thresholds (in"));
+        printf("%s\n", _("Bytes/sec), a CRITICAL status results.  If either of the rates exceed"));
+        printf("%s\n", _("the <iwl> or <owl> thresholds (in Bytes/sec), a WARNING status results."));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" %s\n", "-F, --filename=STRING");
+        printf("    %s\n", _("File to read log from"));
+        printf(" %s\n", "-e, --expires=INTEGER");
+        printf("    %s\n", _("Minutes after which log expires"));
+        printf(" %s\n", "-a, --aggregation=(AVG|MAX)");
+        printf("    %s\n", _("Test average or maximum"));
+        printf(" %s\n", "-w, --warning");
+        printf("    %s\n", _("Warning threshold pair <incoming>,<outgoing>"));
+        printf(" %s\n", "-c, --critical");
+        printf("    %s\n", _("Critical threshold pair <incoming>,<outgoing>"));
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("- MRTG stands for Multi Router Traffic Grapher. It can be downloaded from"));
+        printf(" %s\n", "  http://ee-staff.ethz.ch/~oetiker/webtools/mrtg/mrtg.html");
+        printf(" %s\n", _("- While MRTG can monitor things other than traffic rates, this"));
+        printf(" %s\n", _("  plugin probably won't work with much else without modification."));
+        printf(" %s\n", _("- The calculated i/o rates are a little off from what MRTG actually"));
+        printf(" %s\n", _("  reports.  I'm not sure why this is right now, but will look into it"));
+        printf(" %s\n", _("  for future enhancements of this plugin."));
+
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf (_("Usage"));
-  printf (" %s -F <log_file> -a <AVG | MAX> -w <warning_pair>\n",progname);
-  printf ("-c <critical_pair> [-e expire_minutes]\n");
+void print_usage(void) {
+        printf(_("Usage"));
+        printf(" %s -F <log_file> -a <AVG | MAX> -w <warning_pair>\n", progname);
+        printf("-c <critical_pair> [-e expire_minutes]\n");
 }
diff --git a/plugins/check_mrtgtraf.d/config.h b/plugins/check_mrtgtraf.d/config.h
new file mode 100644
index 00000000..94929ff7
--- /dev/null
+++ b/plugins/check_mrtgtraf.d/config.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+#include <stdlib.h>
+
+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;
+
+} check_mrtgtraf_config;
+
+check_mrtgtraf_config check_mrtgtraf_config_init() {
+        check_mrtgtraf_config tmp = {
+                .log_file = NULL,
+                .expire_minutes = -1,
+                .use_average = true,
+
+                .incoming_warning_threshold = 0,
+                .incoming_critical_threshold = 0,
+                .outgoing_warning_threshold = 0,
+                .outgoing_critical_threshold = 0,
+        };
+        return tmp;
+}
diff --git a/plugins/check_mysql.c b/plugins/check_mysql.c
index 15ec04c0..ca3422b5 100644
--- a/plugins/check_mysql.c
+++ b/plugins/check_mysql.c
@@ -1,267 +1,281 @@
 /*****************************************************************************
-* 
-* Monitoring check_mysql plugin
-* 
-* License: GPL
-* Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
-* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 1999-2011 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_mysql plugin
-* 
-* This program tests connections to a mysql server
-* 
-* 
-* 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_mysql plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999 Didi Rieder (adrieder@sbox.tu-graz.ac.at)
+ * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_mysql plugin
+ *
+ * This program tests connections to a mysql server
+ *
+ *
+ * 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_mysql";
-const char *copyright = "1999-2011";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
-#define SLAVERESULTSIZE 96
+#define REPLICA_RESULTSIZE 96
 
 #include "common.h"
 #include "utils.h"
 #include "utils_base.h"
 #include "netutils.h"
+#include "check_mysql.d/config.h"
 
 #include <mysql.h>
 #include <mysqld_error.h>
 #include <errmsg.h>
 
-char *db_user = NULL;
-char *db_host = NULL;
-char *db_socket = NULL;
-char *db_pass = NULL;
-char *db = NULL;
-char *ca_cert = NULL;
-char *ca_dir = NULL;
-char *cert = NULL;
-char *key = NULL;
-char *ciphers = NULL;
-bool ssl = false;
-char *opt_file = NULL;
-char *opt_group = NULL;
-unsigned int db_port = MYSQL_PORT;
-bool check_slave = false;
-bool ignore_auth = false;
-int verbose = 0;
-
-static double warning_time = 0;
-static double critical_time = 0;
+static int verbose = 0;
 
 #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 */%'"
-
-thresholds *my_threshold = NULL;
-
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-
-int
-main (int argc, char **argv)
-{
+        "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;
+        check_mysql_config config;
+} check_mysql_config_wrapper;
+static check_mysql_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static check_mysql_config_wrapper validate_arguments(check_mysql_config_wrapper /*config_wrapper*/);
+static void print_help(void);
+void print_usage(void);
+
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
-        MYSQL mysql;
-        MYSQL_RES *res;
-        MYSQL_ROW row;
-
-        /* should be status */
+        /* Parse extra opts if any */
+        argv = np_extra_opts(&argc, argv, progname);
 
-        char *result = NULL;
-        char *error = NULL;
-        char slaveresult[SLAVERESULTSIZE] = { 0 };
-        char* perf;
+        check_mysql_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
-        perf = strdup ("");
+        const check_mysql_config config = tmp_config.config;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        MYSQL mysql;
+        /* initialize mysql  */
+        mysql_init(&mysql);
 
-        /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        if (config.opt_file != NULL) {
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_FILE, config.opt_file);
+        }
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (config.opt_group != NULL) {
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, config.opt_group);
+        } else {
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "client");
+        }
 
-        /* initialize mysql  */
-        mysql_init (&mysql);
-        
-        if (opt_file != NULL)
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,opt_file);
-
-        if (opt_group != NULL)
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,opt_group);
-        else
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
-
-        if (ssl)
-                mysql_ssl_set(&mysql,key,cert,ca_cert,ca_dir,ciphers);
+        if (config.ssl) {
+                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,db_host,db_user,db_pass,db,db_port,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)) {
                 /* 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 (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);
+                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;
                 }
-                else 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));
-                else
-                        die (STATE_CRITICAL, "%s\n", mysql_error (&mysql));
+
+                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));
+                } else {
+                        die(STATE_CRITICAL, "%s\n", mysql_error(&mysql));
+                }
         }
 
         /* get the server stats */
-        result = strdup (mysql_stat (&mysql));
+        char *result = strdup(mysql_stat(&mysql));
 
         /* 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_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));
+                }
         }
 
+        char *perf = strdup("");
+        char *error = NULL;
+        MYSQL_RES *res;
+        MYSQL_ROW row;
         /* try to fetch some perf data */
-        if (mysql_query (&mysql, "show global status") == 0) {
-                if ( (res = mysql_store_result (&mysql)) == NULL) {
+        if (mysql_query(&mysql, "show global status") == 0) {
+                if ((res = mysql_store_result(&mysql)) == NULL) {
                         error = strdup(mysql_error(&mysql));
-                        mysql_close (&mysql);
-                        die (STATE_CRITICAL, _("status store_result error: %s\n"), error);
+                        mysql_close(&mysql);
+                        die(STATE_CRITICAL, _("status store_result error: %s\n"), error);
                 }
 
-                while ( (row = mysql_fetch_row (res)) != NULL) {
-                        int i;
-
-                        for(i = 0; i < LENGTH_METRIC_UNIT; i++) {
+                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));
+                                        xasprintf(&perf, "%s%s ", perf, perfdata(metric_unit[i], atol(row[1]), "", false, 0, false, 0, false, 0, false, 0));
                                         continue;
                                 }
                         }
-                        for(i = 0; i < LENGTH_METRIC_COUNTER; i++) {
+                        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));
+                                        xasprintf(&perf, "%s%s ", perf, perfdata(metric_counter[i], atol(row[1]), "c", false, 0, false, 0, false, 0, false, 0));
                                         continue;
                                 }
                         }
                 }
                 /* remove trailing space */
-                if (strlen(perf) > 0)
-                    perf[strlen(perf) - 1] = '\0';
+                if (strlen(perf) > 0) {
+                        perf[strlen(perf) - 1] = '\0';
+                }
         }
 
-        if(check_slave) {
-                /* check the slave status */
-                if (mysql_query (&mysql, "show slave status") != 0) {
+        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
+                // "show replica status"
+                // But first we have to find out whether this is
+                // MySQL or MariaDB since the version numbering scheme
+                // is different
+                bool use_deprecated_slave_status = false;
+                const char *server_version = mysql_get_server_info(&mysql);
+                unsigned long server_verion_int = mysql_get_server_version(&mysql);
+                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);
+                }
+
+                if (strstr(server_version, "MariaDB") != NULL) {
+                        // Looks like MariaDB, new commands should be available after 10.5.1
+                        if (major_version < 10) {
+                                use_deprecated_slave_status = true;
+                        } else if (major_version == 10) {
+                                if (minor_version < 5) {
+                                        use_deprecated_slave_status = true;
+                                } else if (minor_version == 5 && patch_version < 1) {
+                                        use_deprecated_slave_status = true;
+                                }
+                        }
+                } else if (strstr(server_version, "MySQL") != NULL) {
+                        // Looks like MySQL
+                        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;
+                if (use_deprecated_slave_status) {
+                        replica_query = "show slave status";
+                } else {
+                        replica_query = "show replica status";
+                }
+
+                /* check the replica status */
+                if (mysql_query(&mysql, replica_query) != 0) {
                         error = strdup(mysql_error(&mysql));
-                        mysql_close (&mysql);
-                        die (STATE_CRITICAL, _("slave query error: %s\n"), error);
+                        mysql_close(&mysql);
+                        die(STATE_CRITICAL, _("replica query error: %s\n"), error);
                 }
 
                 /* store the result */
-                if ( (res = mysql_store_result (&mysql)) == NULL) {
+                if ((res = mysql_store_result(&mysql)) == NULL) {
                         error = strdup(mysql_error(&mysql));
-                        mysql_close (&mysql);
-                        die (STATE_CRITICAL, _("slave store_result error: %s\n"), error);
+                        mysql_close(&mysql);
+                        die(STATE_CRITICAL, _("replica store_result error: %s\n"), error);
                 }
 
                 /* Check there is some data */
                 if (mysql_num_rows(res) == 0) {
                         mysql_close(&mysql);
-                        die (STATE_WARNING, "%s\n", _("No slaves defined"));
+                        die(STATE_WARNING, "%s\n", _("No replicas defined"));
                 }
 
                 /* fetch the first row */
-                if ( (row = mysql_fetch_row (res)) == NULL) {
+                if ((row = mysql_fetch_row(res)) == NULL) {
                         error = strdup(mysql_error(&mysql));
-                        mysql_free_result (res);
-                        mysql_close (&mysql);
-                        die (STATE_CRITICAL, _("slave fetch row error: %s\n"), error);
+                        mysql_free_result(res);
+                        mysql_close(&mysql);
+                        die(STATE_CRITICAL, _("replica fetch row error: %s\n"), error);
                 }
 
-                if (mysql_field_count (&mysql) == 12) {
+                if (mysql_field_count(&mysql) == 12) {
                         /* mysql 3.23.x */
-                        snprintf (slaveresult, SLAVERESULTSIZE, _("Slave running: %s"), row[6]);
-                        if (strcmp (row[6], "Yes") != 0) {
-                                mysql_free_result (res);
-                                mysql_close (&mysql);
-                                die (STATE_CRITICAL, "%s\n", slaveresult);
+                        snprintf(replica_result, REPLICA_RESULTSIZE, _("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);
                         }
 
                 } else {
                         /* mysql 4.x.x and mysql 5.x.x */
-                        int slave_io_field = -1 , slave_sql_field = -1, seconds_behind_field = -1, i, num_fields;
-                        MYSQL_FIELD* fields;
-
+                        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(i = 0; i < num_fields; i++) {
+                        for (int i = 0; i < num_fields; i++) {
                                 if (strcmp(fields[i].name, "Slave_IO_Running") == 0) {
-                                        slave_io_field = i;
+                                        replica_io_field = i;
                                         continue;
                                 }
                                 if (strcmp(fields[i].name, "Slave_SQL_Running") == 0) {
-                                        slave_sql_field = i;
+                                        replica_sql_field = i;
                                         continue;
                                 }
                                 if (strcmp(fields[i].name, "Seconds_Behind_Master") == 0) {
@@ -270,175 +284,177 @@ main (int argc, char **argv)
                                 }
                         }
 
-                        /* Check if slave status is available */
-                        if ((slave_io_field < 0) || (slave_sql_field < 0) || (num_fields == 0)) {
-                                mysql_free_result (res);
-                                mysql_close (&mysql);
-                                die (STATE_CRITICAL, "Slave status unavailable\n");
+                        /* Check if replica status is available */
+                        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");
                         }
 
-                        /* Save slave status in slaveresult */
-                        snprintf (slaveresult, SLAVERESULTSIZE, "Slave IO: %s Slave SQL: %s Seconds Behind Master: %s", row[slave_io_field], row[slave_sql_field], seconds_behind_field!=-1?row[seconds_behind_field]:"Unknown");
+                        /* 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[slave_io_field], "Yes") != 0 || strcmp (row[slave_sql_field], "Yes") != 0) {
+                        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;
 
-                                if (mysql_query (&mysql, MYSQLDUMP_THREADS_QUERY) == 0) {
+                                if (mysql_query(&mysql, MYSQLDUMP_THREADS_QUERY) == 0) {
                                         /* store the result */
-                                        if ( (res_mysqldump = mysql_store_result (&mysql)) != NULL) {
+                                        if ((res_mysqldump = mysql_store_result(&mysql)) != NULL) {
                                                 if (mysql_num_rows(res_mysqldump) == 1) {
-                                                        if ( (row_mysqldump = mysql_fetch_row (res_mysqldump)) != NULL) {
+                                                        if ((row_mysqldump = mysql_fetch_row(res_mysqldump)) != NULL) {
                                                                 mysqldump_threads = atoi(row_mysqldump[0]);
                                                         }
                                                 }
                                                 /* free the result */
-                                                mysql_free_result (res_mysqldump);
+                                                mysql_free_result(res_mysqldump);
                                         }
-                                        mysql_close (&mysql);
+                                        mysql_close(&mysql);
                                 }
                                 if (mysqldump_threads == 0) {
-                                        die (STATE_CRITICAL, "%s\n", slaveresult);
+                                        die(STATE_CRITICAL, "%s\n", replica_result);
                                 } else {
-                                        strncat(slaveresult, " Mysqldump: in progress", SLAVERESULTSIZE-1);
+                                        strncat(replica_result, " Mysqldump: in progress", REPLICA_RESULTSIZE - 1);
                                 }
                         }
 
-                        if (verbose >=3) {
+                        if (verbose >= 3) {
                                 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)) {
+                        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, my_threshold);
+                                status = get_status(value, config.my_threshold);
 
-                                xasprintf (&perf, "%s %s", perf, fperfdata ("seconds behind master", value, "s",
-                                                        true, (double) warning_time,
-                                                        true, (double) critical_time,
-                                                        false, 0,
-                                                        false, 0));
+                                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_SLAVE %s: %s|%s\n", _("WARNING"), slaveresult, perf);
+                                        printf("SLOW_REPLICA %s: %s|%s\n", _("WARNING"), replica_result, perf);
                                         exit(STATE_WARNING);
                                 } else if (status == STATE_CRITICAL) {
-                                        printf("SLOW_SLAVE %s: %s|%s\n", _("CRITICAL"), slaveresult, perf);
+                                        printf("SLOW_REPLICA %s: %s|%s\n", _("CRITICAL"), replica_result, perf);
                                         exit(STATE_CRITICAL);
                                 }
                         }
                 }
 
                 /* free the result */
-                mysql_free_result (res);
+                mysql_free_result(res);
         }
 
         /* close the connection */
-        mysql_close (&mysql);
+        mysql_close(&mysql);
 
         /* print out the result of stats */
-        if (check_slave) {
-                printf ("%s %s|%s\n", result, slaveresult, perf);
+        if (config.check_replica) {
+                printf("%s %s|%s\n", result, replica_result, perf);
         } else {
-                printf ("%s|%s\n", result, perf);
+                printf("%s|%s\n", result, perf);
         }
 
         return STATE_OK;
 }
 
+#define CHECK_REPLICA_OPT CHAR_MAX + 1
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
+check_mysql_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'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"check-slave", no_argument, 0, 'S'},
+                                                                           {"check-replica", no_argument, 0, CHECK_REPLICA_OPT},
+                                                                           {"ignore-auth", no_argument, 0, 'n'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {"ssl", no_argument, 0, 'l'},
+                                                                           {"ca-cert", optional_argument, 0, 'C'},
+                                                                           {"key", required_argument, 0, 'k'},
+                                                                           {"cert", required_argument, 0, 'a'},
+                                                                           {"ca-dir", required_argument, 0, 'D'},
+                                                                           {"ciphers", required_argument, 0, 'L'},
+                                                                           {0, 0, 0, 0}};
+
+        check_mysql_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_mysql_config_init(),
+        };
+
+        if (argc < 1) {
+                result.errorcode = ERROR;
+                return result;
+        }
+
         char *warning = NULL;
         char *critical = NULL;
 
         int option = 0;
-        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'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"check-slave", no_argument, 0, 'S'},
-                {"ignore-auth", no_argument, 0, 'n'},
-                {"verbose", no_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"ssl", no_argument, 0, 'l'},
-                {"ca-cert", optional_argument, 0, 'C'},
-                {"key", required_argument,0,'k'},
-                {"cert", required_argument,0,'a'},
-                {"ca-dir", required_argument, 0, 'D'},
-                {"ciphers", required_argument, 0, 'L'},
-                {0, 0, 0, 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);
 
-        if (argc < 1)
-                return ERROR;
-
-        while (1) {
-                c = getopt_long (argc, argv, "hlvVnSP:p:u:d:H:s:c:w:a:k:C:D:L:f:g:", longopts, &option);
-
-                if (c == -1 || c == EOF)
+                if (option_index == -1 || option_index == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case 'H':                                                                       /* hostname */
-                        if (is_host (optarg)) {
-                                db_host = optarg;
-                        }
-                        else if (*optarg == '/') {
-                                db_socket = optarg;
-                        }
-                        else {
-                                usage2 (_("Invalid hostname/address"), optarg);
+                switch (option_index) {
+                case 'H': /* hostname */
+                        if (is_host(optarg)) {
+                                result.config.db_host = optarg;
+                        } else if (*optarg == '/') {
+                                result.config.db_socket = optarg;
+                        } else {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
                         break;
-                case 's':                                                                       /* socket */
-                        db_socket = optarg;
+                case 's': /* socket */
+                        result.config.db_socket = optarg;
                         break;
-                case 'd':                                                                       /* database */
-                        db = optarg;
+                case 'd': /* database */
+                        result.config.db = optarg;
                         break;
                 case 'l':
-                        ssl = true;
+                        result.config.ssl = true;
                         break;
                 case 'C':
-                        ca_cert = optarg;
+                        result.config.ca_cert = optarg;
                         break;
                 case 'a':
-                        cert = optarg;
+                        result.config.cert = optarg;
                         break;
                 case 'k':
-                        key = optarg;
+                        result.config.key = optarg;
                         break;
                 case 'D':
-                        ca_dir = optarg;
+                        result.config.ca_dir = optarg;
                         break;
                 case 'L':
-                        ciphers = optarg;
+                        result.config.ciphers = optarg;
                         break;
-                case 'u':                                                                       /* username */
-                        db_user = optarg;
+                case 'u': /* username */
+                        result.config.db_user = optarg;
                         break;
-                case 'p':                                                                       /* authentication information: password */
-                        db_pass = strdup(optarg);
+                case 'p': /* authentication information: password */
+                        result.config.db_pass = strdup(optarg);
 
                         /* Delete the password from process list */
                         while (*optarg != '\0') {
@@ -446,167 +462,163 @@ process_arguments (int argc, char **argv)
                                 optarg++;
                         }
                         break;
-                case 'f':                                                                       /* client options file */
-                        opt_file = optarg;
+                case 'f': /* client options file */
+                        result.config.opt_file = optarg;
                         break;
-                case 'g':                                                                       /* client options group */
-                        opt_group = optarg;
+                case 'g': /* client options group */
+                        result.config.opt_group = optarg;
                         break;
-                case 'P':                                                                       /* critical time threshold */
-                        db_port = atoi (optarg);
+                case 'P': /* critical time threshold */
+                        result.config.db_port = atoi(optarg);
                         break;
                 case 'S':
-                        check_slave = true;                                                     /* check-slave */
+                case CHECK_REPLICA_OPT:
+                        result.config.check_replica = true; /* check-slave */
                         break;
                 case 'n':
-                        ignore_auth = true;                                                     /* ignore-auth */
+                        result.config.ignore_auth = true; /* ignore-auth */
                         break;
                 case 'w':
                         warning = optarg;
-                        warning_time = strtod (warning, NULL);
+                        result.config.warning_time = strtod(warning, NULL);
                         break;
                 case 'c':
                         critical = optarg;
-                        critical_time = strtod (critical, NULL);
+                        result.config.critical_time = strtod(critical, NULL);
                         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 'v':
                         verbose++;
                         break;
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-
-        set_thresholds(&my_threshold, warning, critical);
+        int index = optind;
 
-        while ( argc > c ) {
+        set_thresholds(&result.config.my_threshold, warning, critical);
 
-                if (db_host == NULL)
-                        if (is_host (argv[c])) {
-                                db_host = argv[c++];
+        while (argc > index) {
+                if (result.config.db_host == NULL) {
+                        if (is_host(argv[index])) {
+                                result.config.db_host = argv[index++];
+                        } else {
+                                usage2(_("Invalid hostname/address"), argv[index]);
                         }
-                        else {
-                                usage2 (_("Invalid hostname/address"), argv[c]);
-                        }
-                else if (db_user == NULL)
-                        db_user = argv[c++];
-                else if (db_pass == NULL)
-                        db_pass = argv[c++];
-                else if (db == NULL)
-                        db = argv[c++];
-                else if (is_intnonneg (argv[c]))
-                        db_port = atoi (argv[c++]);
-                else
+                } else if (result.config.db_user == NULL) {
+                        result.config.db_user = argv[index++];
+                } else if (result.config.db_pass == NULL) {
+                        result.config.db_pass = argv[index++];
+                } else if (result.config.db == NULL) {
+                        result.config.db = argv[index++];
+                } else if (is_intnonneg(argv[index])) {
+                        result.config.db_port = atoi(argv[index++]);
+                } else {
                         break;
+                }
         }
 
-        return validate_arguments ();
+        return validate_arguments(result);
 }
 
+check_mysql_config_wrapper validate_arguments(check_mysql_config_wrapper config_wrapper) {
+        if (config_wrapper.config.db_user == NULL) {
+                config_wrapper.config.db_user = strdup("");
+        }
 
-int
-validate_arguments (void)
-{
-        if (db_user == NULL)
-                db_user = strdup("");
-
-        if (db_host == NULL)
-                db_host = strdup("");
+        if (config_wrapper.config.db_host == NULL) {
+                config_wrapper.config.db_host = strdup("");
+        }
 
-        if (db == NULL)
-                db = strdup("");
+        if (config_wrapper.config.db == NULL) {
+                config_wrapper.config.db = strdup("");
+        }
 
-        return OK;
+        return config_wrapper;
 }
 
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", MYSQL_PORT);
-
-        print_revision (progname, NP_VERSION);
-
-        printf (_(COPYRIGHT), copyright, email);
-
-        printf ("%s\n", _("This program tests connections to a MySQL server"));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-  printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-  printf (UT_HOST_PORT, 'P', myport);
-  printf (" %s\n", "-n, --ignore-auth");
-  printf ("    %s\n", _("Ignore authentication failure and check for mysql connectivity only"));
-
-  printf (" %s\n", "-s, --socket=STRING");
-  printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
-
-  printf (" %s\n", "-d, --database=STRING");
-  printf ("    %s\n", _("Check database with indicated name"));
-  printf (" %s\n", "-f, --file=STRING");
-  printf ("    %s\n", _("Read from the specified client options file"));
-  printf (" %s\n", "-g, --group=STRING");
-  printf ("    %s\n", _("Use a client options group"));
-  printf (" %s\n", "-u, --username=STRING");
-  printf ("    %s\n", _("Connect using the indicated username"));
-  printf (" %s\n", "-p, --password=STRING");
-  printf ("    %s\n", _("Use the indicated password to authenticate the connection"));
-  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."));
-  printf (" %s\n", "-w, --warning");
-  printf ("    %s\n", _("Exit with WARNING status if slave server is more than INTEGER seconds"));
-  printf ("    %s\n", _("behind master"));
-  printf (" %s\n", "-c, --critical");
-  printf ("    %s\n", _("Exit with CRITICAL status if slave server is more then INTEGER seconds"));
-  printf ("    %s\n", _("behind master"));
-  printf (" %s\n", "-l, --ssl");
-  printf ("    %s\n", _("Use ssl encryption"));
-  printf (" %s\n", "-C, --ca-cert=STRING");
-  printf ("    %s\n", _("Path to CA signing the cert"));
-  printf (" %s\n", "-a, --cert=STRING");
-  printf ("    %s\n", _("Path to SSL certificate"));
-  printf (" %s\n", "-k, --key=STRING");
-  printf ("    %s\n", _("Path to private SSL key"));
-  printf (" %s\n", "-D, --ca-dir=STRING");
-  printf ("    %s\n", _("Path to CA directory"));
-  printf (" %s\n", "-L, --ciphers=STRING");
-  printf ("    %s\n", _("List of valid SSL ciphers"));
-
-
-  printf ("\n");
-  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)."));
-
-        printf ("\n");
-        printf ("%s\n", _("Notes:"));
-        printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
-        printf (" %s\n", _("overriding any my.cnf settings."));
-
-        printf (UT_SUPPORT);
+        xasprintf(&myport, "%d", MYSQL_PORT);
+
+        print_revision(progname, NP_VERSION);
+
+        printf(_(COPYRIGHT), copyright, email);
+
+        printf("%s\n", _("This program tests connections to a MySQL server"));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_HOST_PORT, 'P', myport);
+        printf(" %s\n", "-n, --ignore-auth");
+        printf("    %s\n", _("Ignore authentication failure and check for mysql connectivity only"));
+
+        printf(" %s\n", "-s, --socket=STRING");
+        printf("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
+
+        printf(" %s\n", "-d, --database=STRING");
+        printf("    %s\n", _("Check database with indicated name"));
+        printf(" %s\n", "-f, --file=STRING");
+        printf("    %s\n", _("Read from the specified client options file"));
+        printf(" %s\n", "-g, --group=STRING");
+        printf("    %s\n", _("Use a client options group"));
+        printf(" %s\n", "-u, --username=STRING");
+        printf("    %s\n", _("Connect using the indicated username"));
+        printf(" %s\n", "-p, --password=STRING");
+        printf("    %s\n", _("Use the indicated password to authenticate the connection"));
+        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-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", _("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", _("behind master"));
+        printf(" %s\n", "-l, --ssl");
+        printf("    %s\n", _("Use ssl encryption"));
+        printf(" %s\n", "-C, --ca-cert=STRING");
+        printf("    %s\n", _("Path to CA signing the cert"));
+        printf(" %s\n", "-a, --cert=STRING");
+        printf("    %s\n", _("Path to SSL certificate"));
+        printf(" %s\n", "-k, --key=STRING");
+        printf("    %s\n", _("Path to private SSL key"));
+        printf(" %s\n", "-D, --ca-dir=STRING");
+        printf("    %s\n", _("Path to CA directory"));
+        printf(" %s\n", "-L, --ciphers=STRING");
+        printf("    %s\n", _("List of valid SSL ciphers"));
+
+        printf("\n");
+        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)."));
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("You must specify -p with an empty string to force an empty password,"));
+        printf(" %s\n", _("overriding any my.cnf settings."));
+
+        printf(UT_SUPPORT);
 }
 
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-  printf (" %s [-d database] [-H host] [-P port] [-s socket]\n",progname);
-  printf ("       [-u user] [-p password] [-S] [-l] [-a cert] [-k key]\n");
-  printf ("       [-C ca-cert] [-D ca-dir] [-L ciphers] [-f optfile] [-g group]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s [-d database] [-H host] [-P port] [-s socket]\n", progname);
+        printf("       [-u user] [-p password] [-S] [-l] [-a cert] [-k key]\n");
+        printf("       [-C ca-cert] [-D ca-dir] [-L ciphers] [-f optfile] [-g group]\n");
 }
diff --git a/plugins/check_mysql.d/config.h b/plugins/check_mysql.d/config.h
new file mode 100644
index 00000000..71ddbe8d
--- /dev/null
+++ b/plugins/check_mysql.d/config.h
@@ -0,0 +1,58 @@
+#pragma once
+
+#include "../../config.h"
+#include "thresholds.h"
+#include <stddef.h>
+#include <mysql.h>
+
+typedef struct {
+        char *db_host;
+        unsigned int db_port;
+        char *db_user;
+        char *db_socket;
+        char *db_pass;
+        char *db;
+        char *ca_cert;
+        char *ca_dir;
+        char *cert;
+        char *key;
+        char *ciphers;
+        bool ssl;
+        char *opt_file;
+        char *opt_group;
+
+        bool check_replica;
+        bool ignore_auth;
+
+        double warning_time;
+        double critical_time;
+        thresholds *my_threshold;
+
+} check_mysql_config;
+
+check_mysql_config check_mysql_config_init() {
+        check_mysql_config tmp = {
+                .db_host = NULL,
+                .db_port = MYSQL_PORT,
+                .db = NULL,
+                .db_pass = NULL,
+                .db_socket = NULL,
+                .db_user = NULL,
+                .ca_cert = NULL,
+                .ca_dir = NULL,
+                .cert = NULL,
+                .key = NULL,
+                .ciphers = NULL,
+                .ssl = false,
+                .opt_file = NULL,
+                .opt_group = NULL,
+
+                .check_replica = false,
+                .ignore_auth = false,
+
+                .warning_time = 0,
+                .critical_time = 0,
+                .my_threshold = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_mysql_query.c b/plugins/check_mysql_query.c
index 842b7a2f..5e04a94b 100644
--- a/plugins/check_mysql_query.c
+++ b/plugins/check_mysql_query.c
@@ -1,157 +1,151 @@
 /*****************************************************************************
-* 
-* Monitoring check_mysql_query plugin
-* 
-* License: GPL
-* Copyright (c) 2006-2009 Monitoring Plugins Development Team
-* Original code from check_mysql, copyright 1999 Didi Rieder
-* 
-* Description:
-* 
-* This file contains the check_mysql_query plugin
-* 
-* This plugin is for running arbitrary SQL and checking the results
-* 
-* 
-* 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_mysql_query plugin
+ *
+ * License: GPL
+ * Copyright (c) 2006-2024 Monitoring Plugins Development Team
+ * Original code from check_mysql, copyright 1999 Didi Rieder
+ *
+ * Description:
+ *
+ * This file contains the check_mysql_query plugin
+ *
+ * This plugin is for running arbitrary SQL and checking the results
+ *
+ *
+ * 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_mysql_query";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 #include "utils_base.h"
 #include "netutils.h"
+#include "check_mysql_query.d/config.h"
 
 #include <mysql.h>
 #include <errmsg.h>
 
-char *db_user = NULL;
-char *db_host = NULL;
-char *db_socket = NULL;
-char *db_pass = NULL;
-char *db = NULL;
-char *opt_file = NULL;
-char *opt_group = NULL;
-unsigned int db_port = MYSQL_PORT;
+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 void print_help(void);
+void print_usage(void);
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
+static int verbose = 0;
 
-char *sql_query = NULL;
-int verbose = 0;
-thresholds *my_thresholds = NULL;
-
-
-int
-main (int argc, char **argv)
-{
-
-        MYSQL mysql;
-        MYSQL_RES *res;
-        MYSQL_ROW row;
-        
-        double value;
-        char *error = NULL;
-        int status;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        check_mysql_query_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
+        const check_mysql_query_config config = tmp_config.config;
+
+        MYSQL mysql;
         /* initialize mysql  */
-        mysql_init (&mysql);
+        mysql_init(&mysql);
 
-        if (opt_file != NULL)
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_FILE,opt_file);
+        if (config.opt_file != NULL) {
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_FILE, config.opt_file);
+        }
 
-        if (opt_group != NULL)
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,opt_group);
-        else
-                mysql_options(&mysql,MYSQL_READ_DEFAULT_GROUP,"client");
+        if (config.opt_group != NULL) {
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, config.opt_group);
+        } else {
+                mysql_options(&mysql, MYSQL_READ_DEFAULT_GROUP, "client");
+        }
 
         /* establish a connection to the server and error checking */
-        if (!mysql_real_connect(&mysql,db_host,db_user,db_pass,db,db_port,db_socket,0)) {
-                if (mysql_errno (&mysql) == CR_UNKNOWN_HOST)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else if (mysql_errno (&mysql) == CR_VERSION_ERROR)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else if (mysql_errno (&mysql) == CR_OUT_OF_MEMORY)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else if (mysql_errno (&mysql) == CR_IPSOCK_ERROR)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else if (mysql_errno (&mysql) == CR_SOCKET_CREATE_ERROR)
-                        die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error (&mysql));
-                else
-                        die (STATE_CRITICAL, "QUERY %s: %s\n", _("CRITICAL"), mysql_error (&mysql));
+        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_errno(&mysql) == CR_UNKNOWN_HOST) {
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                } else if (mysql_errno(&mysql) == CR_VERSION_ERROR) {
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                } else if (mysql_errno(&mysql) == CR_OUT_OF_MEMORY) {
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                } else if (mysql_errno(&mysql) == CR_IPSOCK_ERROR) {
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                } else if (mysql_errno(&mysql) == CR_SOCKET_CREATE_ERROR) {
+                        die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), mysql_error(&mysql));
+                } else {
+                        die(STATE_CRITICAL, "QUERY %s: %s\n", _("CRITICAL"), mysql_error(&mysql));
+                }
         }
 
-        if (mysql_query (&mysql, sql_query) != 0) {
+        char *error = NULL;
+        if (mysql_query(&mysql, config.sql_query) != 0) {
                 error = strdup(mysql_error(&mysql));
-                mysql_close (&mysql);
-                die (STATE_CRITICAL, "QUERY %s: %s - %s\n", _("CRITICAL"), _("Error with query"), error);
+                mysql_close(&mysql);
+                die(STATE_CRITICAL, "QUERY %s: %s - %s\n", _("CRITICAL"), _("Error with query"), error);
         }
 
+        MYSQL_RES *res;
         /* store the result */
-        if ( (res = mysql_store_result (&mysql)) == NULL) {
+        if ((res = mysql_store_result(&mysql)) == NULL) {
                 error = strdup(mysql_error(&mysql));
-                mysql_close (&mysql);
-                die (STATE_CRITICAL, "QUERY %s: Error with store_result - %s\n", _("CRITICAL"), error);
+                mysql_close(&mysql);
+                die(STATE_CRITICAL, "QUERY %s: Error with store_result - %s\n", _("CRITICAL"), error);
         }
 
         /* Check there is some data */
         if (mysql_num_rows(res) == 0) {
                 mysql_close(&mysql);
-                die (STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), _("No rows returned"));
+                die(STATE_WARNING, "QUERY %s: %s\n", _("WARNING"), _("No rows returned"));
         }
 
+        MYSQL_ROW row;
         /* fetch the first row */
-        if ( (row = mysql_fetch_row (res)) == NULL) {
+        if ((row = mysql_fetch_row(res)) == NULL) {
                 error = strdup(mysql_error(&mysql));
-                mysql_free_result (res);
-                mysql_close (&mysql);
-                die (STATE_CRITICAL, "QUERY %s: Fetch row error - %s\n", _("CRITICAL"), error);
+                mysql_free_result(res);
+                mysql_close(&mysql);
+                die(STATE_CRITICAL, "QUERY %s: Fetch row error - %s\n", _("CRITICAL"), error);
         }
 
-        if (! is_numeric(row[0])) {
-                die (STATE_CRITICAL, "QUERY %s: %s - '%s'\n", _("CRITICAL"), _("Is not a numeric"), row[0]);
+        if (!is_numeric(row[0])) {
+                die(STATE_CRITICAL, "QUERY %s: %s - '%s'\n", _("CRITICAL"), _("Is not a numeric"), row[0]);
         }
 
-        value = strtod(row[0], NULL);
+        double value = strtod(row[0], NULL);
 
         /* free the result */
-        mysql_free_result (res);
+        mysql_free_result(res);
 
         /* close the connection */
-        mysql_close (&mysql);
+        mysql_close(&mysql);
 
-        if (verbose >= 3)
+        if (verbose >= 3) {
                 printf("mysql result: %f\n", value);
+        }
 
-        status = get_status(value, my_thresholds);
+        int status = get_status(value, config.my_thresholds);
 
         if (status == STATE_OK) {
                 printf("QUERY %s: ", _("OK"));
@@ -160,75 +154,63 @@ main (int argc, char **argv)
         } else if (status == STATE_CRITICAL) {
                 printf("QUERY %s: ", _("CRITICAL"));
         }
-        printf(_("'%s' returned %f | %s"), sql_query, value,
-                fperfdata("result", value, "",
-                my_thresholds->warning?true:false, my_thresholds->warning?my_thresholds->warning->end:0,
-                my_thresholds->critical?true:false, my_thresholds->critical?my_thresholds->critical->end:0,
-                false, 0,
-                false, 0)
-        );
+        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");
 
         return status;
 }
 
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-        char *warning = NULL;
-        char *critical = NULL;
-
-        int option = 0;
+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}
+                {"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}};
+
+        check_mysql_query_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_mysql_query_config_init(),
         };
 
-        if (argc < 1)
-                return ERROR;
+        if (argc < 1) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        while (1) {
-                c = getopt_long (argc, argv, "hvVP:p:u:d:H:s:q:w:c:f:g:", longopts, &option);
+        char *warning = NULL;
+        char *critical = NULL;
 
-                if (c == -1 || c == EOF)
+        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);
+
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case 'H':                                                                       /* hostname */
-                        if (is_host (optarg)) {
-                                db_host = optarg;
-                        }
-                        else {
-                                usage2 (_("Invalid hostname/address"), optarg);
+                switch (option_char) {
+                case 'H': /* hostname */
+                        if (is_host(optarg)) {
+                                result.config.db_host = optarg;
+                        } else {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
                         break;
-                case 's':                                                                       /* socket */
-                        db_socket = optarg;
+                case 's': /* socket */
+                        result.config.db_socket = optarg;
                         break;
-                case 'd':                                                                       /* database */
-                        db = optarg;
+                case 'd': /* database */
+                        result.config.db = optarg;
                         break;
-                case 'u':                                                                       /* username */
-                        db_user = optarg;
+                case 'u': /* username */
+                        result.config.db_user = optarg;
                         break;
-                case 'p':                                                                       /* authentication information: password */
-                        db_pass = strdup(optarg);
+                case 'p': /* authentication information: password */
+                        result.config.db_pass = strdup(optarg);
 
                         /* Delete the password from process list */
                         while (*optarg != '\0') {
@@ -236,26 +218,26 @@ process_arguments (int argc, char **argv)
                                 optarg++;
                         }
                         break;
-                case 'f':                                                                       /* client options file */
-                        opt_file = optarg;
+                case 'f': /* client options file */
+                        result.config.opt_file = optarg;
                         break;
-                case 'g':                                                                       /* client options group */
-                        opt_group = optarg;
+                case 'g': /* client options group */
+                        result.config.opt_group = optarg;
                         break;
-                case 'P':                                                                       /* critical time threshold */
-                        db_port = atoi (optarg);
+                case 'P': /* critical time threshold */
+                        result.config.db_port = atoi(optarg);
                         break;
                 case 'v':
                         verbose++;
                         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 'q':
-                        xasprintf(&sql_query, "%s", optarg);
+                        xasprintf(&result.config.sql_query, "%s", optarg);
                         break;
                 case 'w':
                         warning = optarg;
@@ -263,92 +245,85 @@ process_arguments (int argc, char **argv)
                 case 'c':
                         critical = optarg;
                         break;
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
+        set_thresholds(&result.config.my_thresholds, warning, critical);
 
-        set_thresholds(&my_thresholds, warning, critical);
-
-        return validate_arguments ();
+        return validate_arguments(result);
 }
 
-
-int
-validate_arguments (void)
-{
-        if (sql_query == NULL)
+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");
+        }
 
-        if (db_user == NULL)
-                db_user = strdup("");
+        if (config_wrapper.config.db_user == NULL) {
+                config_wrapper.config.db_user = strdup("");
+        }
 
-        if (db_host == NULL)
-                db_host = strdup("");
+        if (config_wrapper.config.db_host == NULL) {
+                config_wrapper.config.db_host = strdup("");
+        }
 
-        if (db == NULL)
-                db = strdup("");
+        if (config_wrapper.config.db == NULL) {
+                config_wrapper.config.db = strdup("");
+        }
 
-        return OK;
+        return config_wrapper;
 }
 
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", MYSQL_PORT);
-
-        print_revision (progname, NP_VERSION);
-
-        printf (_(COPYRIGHT), copyright, email);
-
-        printf ("%s\n", _("This program checks a query result against threshold levels"));
-
-  printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        printf (" -q, --query=STRING\n");
-        printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
-        printf (UT_WARN_CRIT_RANGE);
-        printf (UT_HOST_PORT, 'P', myport);
-        printf (" %s\n", "-s, --socket=STRING");
-        printf ("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
-        printf (" -d, --database=STRING\n");
-        printf ("    %s\n", _("Database to check"));
-        printf (" %s\n", "-f, --file=STRING");
-        printf ("    %s\n", _("Read from the specified client options file"));
-        printf (" %s\n", "-g, --group=STRING");
-        printf ("    %s\n", _("Use a client options group"));
-        printf (" -u, --username=STRING\n");
-        printf ("    %s\n", _("Username to login with"));
-        printf (" -p, --password=STRING\n");
-        printf ("    %s\n", _("Password to login with"));
-        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 ("\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."));
-
-        printf ("\n");
-        printf ("%s\n", _("Notes:"));
-        printf (" %s\n", _("You must specify -p with an empty string to force an empty password,"));
-        printf (" %s\n", _("overriding any my.cnf settings."));
-
-        printf (UT_SUPPORT);
-}
+        xasprintf(&myport, "%d", MYSQL_PORT);
+
+        print_revision(progname, NP_VERSION);
+
+        printf(_(COPYRIGHT), copyright, email);
+
+        printf("%s\n", _("This program checks a query result against threshold levels"));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        printf(" -q, --query=STRING\n");
+        printf("    %s\n", _("SQL query to run. Only first column in first row will be read"));
+        printf(UT_WARN_CRIT_RANGE);
+        printf(UT_HOST_PORT, 'P', myport);
+        printf(" %s\n", "-s, --socket=STRING");
+        printf("    %s\n", _("Use the specified socket (has no effect if -H is used)"));
+        printf(" -d, --database=STRING\n");
+        printf("    %s\n", _("Database to check"));
+        printf(" %s\n", "-f, --file=STRING");
+        printf("    %s\n", _("Read from the specified client options file"));
+        printf(" %s\n", "-g, --group=STRING");
+        printf("    %s\n", _("Use a client options group"));
+        printf(" -u, --username=STRING\n");
+        printf("    %s\n", _("Username to login with"));
+        printf(" -p, --password=STRING\n");
+        printf("    %s\n", _("Password to login with"));
+        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("\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."));
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("You must specify -p with an empty string to force an empty password,"));
+        printf(" %s\n", _("overriding any my.cnf settings."));
+
+        printf(UT_SUPPORT);
+}
 
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-  printf (" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n",progname);
-  printf ("       [-d database] [-u user] [-p password] [-f optfile] [-g group]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s -q SQL_query [-w warn] [-c crit] [-H host] [-P port] [-s socket]\n", progname);
+        printf("       [-d database] [-u user] [-p password] [-f optfile] [-g group]\n");
 }
diff --git a/plugins/check_mysql_query.d/config.h b/plugins/check_mysql_query.d/config.h
new file mode 100644
index 00000000..be019160
--- /dev/null
+++ b/plugins/check_mysql_query.d/config.h
@@ -0,0 +1,36 @@
+#pragma once
+
+#include "../../config.h"
+#include "thresholds.h"
+#include <mysql.h>
+
+typedef struct {
+        char *db_host;
+        char *db_socket;
+        char *db;
+        char *db_user;
+        char *db_pass;
+        char *opt_file;
+        char *opt_group;
+        unsigned int db_port;
+
+        char *sql_query;
+        thresholds *my_thresholds;
+} check_mysql_query_config;
+
+check_mysql_query_config check_mysql_query_config_init() {
+        check_mysql_query_config tmp = {
+                .db_host = NULL,
+                .db_socket = NULL,
+                .db = NULL,
+                .db_user = NULL,
+                .db_pass = NULL,
+                .opt_file = NULL,
+                .opt_group = NULL,
+                .db_port = MYSQL_PORT,
+
+                .sql_query = NULL,
+                .my_thresholds = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_nagios.c b/plugins/check_nagios.c
index 40d68f03..a46dc1ed 100644
--- a/plugins/check_nagios.c
+++ b/plugins/check_nagios.c
@@ -1,325 +1,317 @@
 /*****************************************************************************
-* 
-* Monitoring check_nagios plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_nagios plugin
-* 
-* This plugin checks the status of the Nagios process on the local machine.
-* The plugin will check to make sure the Nagios status log is no older than
-* the number of minutes specified by the expires option.
-* It also checks the process table for a process matching the command
-* argument.
-* 
-* 
-* 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_nagios plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_nagios plugin
+ *
+ * This plugin checks the status of the Nagios process on the local machine.
+ * The plugin will check to make sure the Nagios status log is no older than
+ * the number of minutes specified by the expires option.
+ * It also checks the process table for a process matching the command
+ * argument.
+ *
+ *
+ * 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_nagios";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "runcmd.h"
 #include "utils.h"
+#include "states.h"
+#include "check_nagios.d/config.h"
 
-int process_arguments (int, char **);
-void print_help (void);
-void print_usage (void);
+typedef struct {
+        int errorcode;
+        check_nagios_config config;
+} check_nagios_config_wrapper;
+static check_nagios_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+static void print_help(void);
+void print_usage(void);
 
-char *status_log = NULL;
-char *process_string = NULL;
-int expire_minutes = 0;
+static int verbose = 0;
 
-int verbose = 0;
-
-int
-main (int argc, char **argv)
-{
-        int result = STATE_UNKNOWN;
-        char input_buffer[MAX_INPUT_BUFFER];
-        unsigned long latest_entry_time = 0L;
-        unsigned long temp_entry_time = 0L;
-        int proc_entries = 0;
-        time_t current_time;
-        char *temp_ptr;
-        FILE *fp;
-        int procuid = 0;
-        int procpid = 0;
-        int procppid = 0;
-        int procvsz = 0;
-        int procrss = 0;
-        float procpcpu = 0;
-        char procstat[8];
-#ifdef PS_USES_PROCETIME
-        char procetime[MAX_INPUT_BUFFER];
-#endif /* PS_USES_PROCETIME */
-        char procprog[MAX_INPUT_BUFFER];
-        char *procargs;
-        int pos, cols;
-        int expected_cols = PS_COLS - 1;
-        const char *zombie = "Z";
-        char *temp_string;
-        output chld_out, chld_err;
-        size_t i;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_nagios_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        if (process_arguments (argc, argv) == ERROR)
+        if (tmp_config.errorcode == ERROR) {
                 usage_va(_("Could not parse arguments"));
+        }
+
+        const check_nagios_config config = tmp_config.config;
 
         /* Set signal handling and alarm timeout */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
                 usage_va(_("Cannot catch SIGALRM"));
         }
 
         /* handle timeouts gracefully... */
-        alarm (timeout_interval);
+        alarm(timeout_interval);
 
         /* open the status log */
-        fp = fopen (status_log, "r");
-        if (fp == NULL) {
-                die (STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Cannot open status log for reading!"));
+        FILE *log_file = fopen(config.status_log, "r");
+        if (log_file == NULL) {
+                die(STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Cannot open status log for reading!"));
         }
 
+        unsigned long latest_entry_time = 0L;
+        unsigned long temp_entry_time = 0L;
+        char input_buffer[MAX_INPUT_BUFFER];
+        char *temp_ptr;
         /* get the date/time of the last item updated in the log */
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-                if ((temp_ptr = strstr (input_buffer, "created=")) != NULL) {
-                        temp_entry_time = strtoul (temp_ptr + 8, NULL, 10);
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, log_file)) {
+                if ((temp_ptr = strstr(input_buffer, "created=")) != NULL) {
+                        temp_entry_time = strtoul(temp_ptr + 8, NULL, 10);
                         latest_entry_time = temp_entry_time;
                         break;
-                } else if ((temp_ptr = strtok (input_buffer, "]")) != NULL) {
-                        temp_entry_time = strtoul (temp_ptr + 1, NULL, 10);
-                        if (temp_entry_time > latest_entry_time)
+                }
+                if ((temp_ptr = strtok(input_buffer, "]")) != NULL) {
+                        temp_entry_time = strtoul(temp_ptr + 1, NULL, 10);
+                        if (temp_entry_time > latest_entry_time) {
                                 latest_entry_time = temp_entry_time;
+                        }
                 }
         }
-        fclose (fp);
+        fclose(log_file);
 
-        if (verbose >= 2)
+        if (verbose >= 2) {
                 printf("command: %s\n", PS_COMMAND);
+        }
 
         /* run the command to check for the Nagios process.. */
-        if((result = np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0)) != 0)
+        mp_state_enum result = STATE_UNKNOWN;
+        output chld_out;
+        output chld_err;
+        if ((result = np_runcmd(PS_COMMAND, &chld_out, &chld_err, 0)) != 0) {
                 result = STATE_WARNING;
+        }
 
+        int procuid = 0;
+        int procpid = 0;
+        int procppid = 0;
+        int procvsz = 0;
+        int procrss = 0;
+        int proc_entries = 0;
+        float procpcpu = 0;
+        char procstat[8];
+        char procprog[MAX_INPUT_BUFFER];
+        char *procargs;
+#ifdef PS_USES_PROCETIME
+        char procetime[MAX_INPUT_BUFFER];
+#endif /* PS_USES_PROCETIME */
+        int pos;
+        int expected_cols = PS_COLS - 1;
+        const char *zombie = "Z";
         /* count the number of matching Nagios processes... */
-        for(i = 0; i < chld_out.lines; i++) {
-                cols = sscanf (chld_out.line[i], PS_FORMAT, PS_VARLIST);
+        for (size_t i = 0; i < chld_out.lines; i++) {
+                int cols = sscanf(chld_out.line[i], PS_FORMAT, PS_VARLIST);
                 /* Zombie processes do not give a procprog command */
-                if ( cols == (expected_cols - 1) && strstr(procstat, zombie) ) {
+                if (cols == (expected_cols - 1) && strstr(procstat, zombie)) {
                         cols = expected_cols;
                         /* Set some value for procargs for the strip command further below
                          * Seen to be a problem on some Solaris 7 and 8 systems */
                         chld_out.line[i][pos] = '\n';
-                        chld_out.line[i][pos+1] = 0x0;
+                        chld_out.line[i][pos + 1] = 0x0;
                 }
-                if ( cols >= expected_cols ) {
-                        xasprintf (&procargs, "%s", chld_out.line[i] + pos);
-                        strip (procargs);
+                if (cols >= expected_cols) {
+                        xasprintf(&procargs, "%s", chld_out.line[i] + pos);
+                        strip(procargs);
 
                         /* Some ps return full pathname for command. This removes path */
-                        temp_string = strtok ((char *)procprog, "/");
+                        char *temp_string = strtok((char *)procprog, "/");
                         while (temp_string) {
                                 strcpy(procprog, temp_string);
-                                temp_string = strtok (NULL, "/");
+                                temp_string = strtok(NULL, "/");
                         }
 
                         /* May get empty procargs */
-                        if (!strstr(procargs, argv[0]) && strstr(procargs, process_string) && strcmp(procargs,"")) {
+                        if (!strstr(procargs, argv[0]) && strstr(procargs, config.process_string) && strcmp(procargs, "")) {
                                 proc_entries++;
                                 if (verbose >= 2) {
-                                        printf (_("Found process: %s %s\n"), procprog, procargs);
+                                        printf(_("Found process: %s %s\n"), procprog, procargs);
                                 }
                         }
                 }
         }
 
         /* If we get anything on stderr, at least set warning */
-        if(chld_err.buflen)
-                result = max_state (result, STATE_WARNING);
+        if (chld_err.buflen) {
+                result = max_state(result, STATE_WARNING);
+        }
 
         /* reset the alarm handler */
-        alarm (0);
+        alarm(0);
 
         if (proc_entries == 0) {
-                die (STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Could not locate a running Nagios process!"));
+                die(STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Could not locate a running Nagios process!"));
         }
 
         if (latest_entry_time == 0L) {
-                die (STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Cannot parse Nagios log file for valid time"));
+                die(STATE_CRITICAL, "NAGIOS %s: %s\n", _("CRITICAL"), _("Cannot parse Nagios log file for valid time"));
         }
 
-        time (&current_time);
-        if ((int)(current_time - latest_entry_time) > (expire_minutes * 60)) {
+        time_t current_time;
+        time(&current_time);
+        if ((int)(current_time - latest_entry_time) > (config.expire_minutes * 60)) {
                 result = STATE_WARNING;
         } else {
                 result = STATE_OK;
         }
 
-        printf ("NAGIOS %s: ", (result == STATE_OK) ? _("OK") : _("WARNING"));
-        printf (ngettext ("%d process", "%d processes", proc_entries), proc_entries);
-        printf (", ");
-        printf (
-          ngettext ("status log updated %d second ago",
-            "status log updated %d seconds ago",
-            (int) (current_time - latest_entry_time) ),
-            (int) (current_time - latest_entry_time) );
-        printf ("\n");
+        printf("NAGIOS %s: ", (result == STATE_OK) ? _("OK") : _("WARNING"));
+        printf(ngettext("%d process", "%d processes", proc_entries), proc_entries);
+        printf(", ");
+        printf(ngettext("status log updated %d second ago", "status log updated %d seconds ago", (int)(current_time - latest_entry_time)),
+                   (int)(current_time - latest_entry_time));
+        printf("\n");
 
-        return result;
+        exit(result);
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"filename", required_argument, 0, 'F'},
-                {"expires", required_argument, 0, 'e'},
-                {"command", required_argument, 0, 'C'},
-                {"timeout", optional_argument, 0, 't'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {"verbose", no_argument, 0, 'v'},
-                {0, 0, 0, 0}
+check_nagios_config_wrapper process_arguments(int argc, char **argv) {
+        static struct option longopts[] = {{"filename", required_argument, 0, 'F'}, {"expires", required_argument, 0, 'e'},
+                                                                           {"command", required_argument, 0, 'C'},  {"timeout", optional_argument, 0, 't'},
+                                                                           {"version", no_argument, 0, 'V'},        {"help", no_argument, 0, 'h'},
+                                                                           {"verbose", no_argument, 0, 'v'},        {0, 0, 0, 0}};
+
+        check_nagios_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_nagios_config_init(),
         };
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        if (argc < 2)
-                return ERROR;
-
-        if (!is_option (argv[1])) {
-                status_log = argv[1];
-                if (is_intnonneg (argv[2]))
-                        expire_minutes = atoi (argv[2]);
-                else
-                        die (STATE_UNKNOWN,
-                                                                 _("Expiration time must be an integer (seconds)\n"));
-                process_string = argv[3];
-                return OK;
+        if (!is_option(argv[1])) {
+                result.config.status_log = argv[1];
+                if (is_intnonneg(argv[2])) {
+                        result.config.expire_minutes = atoi(argv[2]);
+                } else {
+                        die(STATE_UNKNOWN, _("Expiration time must be an integer (seconds)\n"));
+                }
+                result.config.process_string = argv[3];
+                return result;
         }
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hVvF:C:e:t:", longopts, &option);
+        int option = 0;
+        while (true) {
+                int option_index = getopt_long(argc, argv, "+hVvF:C:e:t:", longopts, &option);
 
-                if (c == -1 || c == EOF || c == 1)
+                if (option_index == -1 || option_index == EOF || option_index == 1) {
                         break;
+                }
 
-                switch (c) {
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'F':                                                                       /* status log */
-                        status_log = optarg;
+                switch (option_index) {
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'F': /* status log */
+                        result.config.status_log = optarg;
                         break;
-                case 'C':                                                                       /* command */
-                        process_string = optarg;
+                case 'C': /* command */
+                        result.config.process_string = optarg;
                         break;
-                case 'e':                                                                       /* expiry time */
-                        if (is_intnonneg (optarg))
-                                expire_minutes = atoi (optarg);
-                        else
-                                die (STATE_UNKNOWN,
-                                     _("Expiration time must be an integer (seconds)\n"));
+                case 'e': /* expiry time */
+                        if (is_intnonneg(optarg)) {
+                                result.config.expire_minutes = atoi(optarg);
+                        } else {
+                                die(STATE_UNKNOWN, _("Expiration time must be an integer (seconds)\n"));
+                        }
                         break;
-                case 't':                                                                       /* timeout */
-                        if (is_intnonneg (optarg))
-                                timeout_interval = atoi (optarg);
-                        else
-                                die (STATE_UNKNOWN,
-                                     _("Timeout must be an integer (seconds)\n"));
+                case 't': /* timeout */
+                        if (is_intnonneg(optarg)) {
+                                timeout_interval = atoi(optarg);
+                        } else {
+                                die(STATE_UNKNOWN, _("Timeout must be an integer (seconds)\n"));
+                        }
                         break;
                 case 'v':
                         verbose++;
                         break;
-                default:                                                                        /* print short usage_va statement if args not parsable */
+                default: /* print short usage_va statement if args not parsable */
                         usage5();
                 }
         }
 
+        if (result.config.status_log == NULL) {
+                die(STATE_UNKNOWN, _("You must provide the status_log\n"));
+        }
 
-        if (status_log == NULL)
-                die (STATE_UNKNOWN, _("You must provide the status_log\n"));
-
-        if (process_string == NULL)
-                die (STATE_UNKNOWN, _("You must provide a process string\n"));
+        if (result.config.process_string == NULL) {
+                die(STATE_UNKNOWN, _("You must provide a process string\n"));
+        }
 
-        return OK;
+        return result;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
+        printf(_(COPYRIGHT), copyright, email);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+        printf("%s\n", _("This plugin checks the status of the Nagios process on the local machine"));
+        printf("%s\n", _("The plugin will check to make sure the Nagios status log is no older than"));
+        printf("%s\n", _("the number of minutes specified by the expires option."));
+        printf("%s\n", _("It also checks the process table for a process matching the command argument."));
 
-        printf (_(COPYRIGHT), copyright, email);
+        printf("\n\n");
 
-        printf ("%s\n", _("This plugin checks the status of the Nagios process on the local machine"));
-  printf ("%s\n", _("The plugin will check to make sure the Nagios status log is no older than"));
-  printf ("%s\n", _("the number of minutes specified by the expires option."));
-  printf ("%s\n", _("It also checks the process table for a process matching the command argument."));
+        print_usage();
 
-  printf ("\n\n");
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
 
-        print_usage ();
+        printf(" %s\n", "-F, --filename=FILE");
+        printf("    %s\n", _("Name of the log file to check"));
+        printf(" %s\n", "-e, --expires=INTEGER");
+        printf("    %s\n", _("Minutes aging after which logfile is considered stale"));
+        printf(" %s\n", "-C, --command=STRING");
+        printf("    %s\n", _("Substring to search for in process arguments"));
+        printf(" %s\n", "-t, --timeout=INTEGER");
+        printf("    %s\n", _("Timeout for the plugin in seconds"));
+        printf(UT_VERBOSE);
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
+        printf("\n");
+        printf("%s\n", _("Examples:"));
+        printf(" %s\n", "check_nagios -t 20 -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
 
-        printf (" %s\n", "-F, --filename=FILE");
-  printf ("    %s\n", _("Name of the log file to check"));
-  printf (" %s\n", "-e, --expires=INTEGER");
-  printf ("    %s\n", _("Minutes aging after which logfile is considered stale"));
-  printf (" %s\n", "-C, --command=STRING");
-  printf ("    %s\n", _("Substring to search for in process arguments"));
-  printf (" %s\n", "-t, --timeout=INTEGER");
-  printf ("    %s\n", _("Timeout for the plugin in seconds"));
-  printf (UT_VERBOSE);
-
-  printf ("\n");
-  printf ("%s\n", _("Examples:"));
-  printf (" %s\n", "check_nagios -t 20 -e 5 -F /usr/local/nagios/var/status.log -C /usr/local/nagios/bin/nagios");
-
-  printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -F <status log file> -t <timeout_seconds> -e <expire_minutes> -C <process_string>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -F <status log file> -t <timeout_seconds> -e <expire_minutes> -C <process_string>\n", progname);
 }
diff --git a/plugins/check_nagios.d/config.h b/plugins/check_nagios.d/config.h
new file mode 100644
index 00000000..efe139f9
--- /dev/null
+++ b/plugins/check_nagios.d/config.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+
+typedef struct {
+        char *status_log;
+        char *process_string;
+        int expire_minutes;
+} check_nagios_config;
+
+check_nagios_config check_nagios_config_init() {
+        check_nagios_config tmp = {
+                .status_log = NULL,
+                .process_string = NULL,
+                .expire_minutes = 0,
+        };
+        return tmp;
+}
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 19c050de..7dd23e5c 100644
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
@@ -1,336 +1,291 @@
 /*****************************************************************************
-* 
-* Monitoring check_nt plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
-* Copyright (c) 2003-2007 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
-* (http://nsclient.ready2run.nl/)
-* 
-* 
-* 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_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-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
-
-enum checkvars {
-        CHECK_NONE,
-        CHECK_CLIENTVERSION,
-        CHECK_CPULOAD,
-        CHECK_UPTIME,
-        CHECK_USEDDISKSPACE,
-        CHECK_SERVICESTATE,
-        CHECK_PROCSTATE,
-        CHECK_MEMUSE,
-        CHECK_COUNTER,
-        CHECK_FILEAGE,
-        CHECK_INSTANCES
-};
+#include "check_nt.d/config.h"
 
 enum {
         MAX_VALUE_LIST = 30,
-        PORT = 1248
 };
 
-char *server_address=NULL;
-char *volume_name=NULL;
-int server_port=PORT;
-char *value_list=NULL;
-char *req_password=NULL;
-unsigned long lvalue_list[MAX_VALUE_LIST];
-unsigned long warning_value=0L;
-unsigned long critical_value=0L;
-bool check_warning_value=false;
-bool check_critical_value=false;
-enum checkvars vars_to_check = CHECK_NONE;
-bool show_all = false;
-
-char recv_buffer[MAX_INPUT_BUFFER];
-
-void fetch_data (const char* address, int port, const char* sendb);
-int process_arguments(int, char **);
-void preparelist(char *string);
-bool strtoularray(unsigned long *array, char *string, const char *delim);
-void print_help(void);
-void print_usage(void);
+static char recv_buffer[MAX_INPUT_BUFFER];
 
-int main(int argc, char **argv){
+static void fetch_data(const char *address, int port, const char *sendb);
 
-/* should be    int result = STATE_UNKNOWN; */
+typedef struct {
+        int errorcode;
+        check_nt_config config;
+} check_nt_config_wrapper;
+static check_nt_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 
-        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,*counter_unit = NULL;
-        char *minval = NULL, *maxval = NULL, *errcvt = NULL;
-        char *fds=NULL, *tds=NULL;
-        char *numstr;
-
-        double total_disk_space=0;
-        double free_disk_space=0;
-        double percent_used_space=0;
-        double warning_used_space=0;
-        double critical_used_space=0;
-        double mem_commitLimit=0;
-        double mem_commitByte=0;
-        double fminval = 0, fmaxval = 0;
-        unsigned long utilization;
-        unsigned long uptime;
-        unsigned long age_in_minutes;
-        double counter_value = 0.0;
-        int offset=0;
-        int updays=0;
-        int uphours=0;
-        int upminutes=0;
-
-        bool isPercent = false;
-        bool allRight = false;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        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"));
+        }
 
-        if(process_arguments(argc,argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        const check_nt_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
-        signal(SIGALRM,socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
         alarm(socket_timeout);
 
-        switch (vars_to_check) {
-
+        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", req_password);
-                fetch_data (server_address, server_port, send_buffer);
-                if (value_list != NULL && strcmp(recv_buffer, value_list) != 0) {
-                        xasprintf (&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list);
+                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);
+                        xasprintf(&output_message, "%s", recv_buffer);
                         return_code = STATE_OK;
                 }
                 break;
-
         case CHECK_CPULOAD:
-
-                if (value_list==NULL)
-                        output_message = strdup (_("missing -l parameters"));
-                else if (! strtoularray(lvalue_list,value_list,","))
-                        output_message = strdup (_("wrong -l parameter."));
-                else {
+                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 (" ");
+                        return_code = STATE_OK;
+                        temp_string = strdup(_("CPU Load"));
+                        temp_string_perf = strdup(" ");
 
                         /* loop until one of the parameters is wrong or not present */
-                        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) {
+                        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",req_password,lvalue_list[0+offset]);
-                                fetch_data (server_address, server_port, send_buffer);
+                                xasprintf(&send_buffer, "%s&2&%lu", config.req_password, lvalue_list[0 + offset]);
+                                fetch_data(config.server_address, config.server_port, send_buffer);
 
-                                utilization=strtoul(recv_buffer,NULL,10);
+                                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 (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);
+                        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"));
+                        } else {
+                                output_message = strdup(_("not enough values for -l parameters"));
+                        }
                 }
                 break;
-
-        case CHECK_UPTIME:
-
-                if (value_list == NULL) {
-                        value_list = "minutes";
+        case CHECK_UPTIME: {
+                char *tmp_value_list = config.value_list;
+                if (config.value_list == NULL) {
+                        tmp_value_list = "minutes";
                 }
-                if (strncmp(value_list, "seconds", strlen("seconds") + 1 ) &&
-                        strncmp(value_list, "minutes", strlen("minutes") + 1) &&
-                        strncmp(value_list, "hours", strlen("hours") + 1) &&
-                        strncmp(value_list, "days", strlen("days") + 1)) {
+                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"));
+                        output_message = strdup(_("wrong -l argument"));
                 } else {
-                        xasprintf(&send_buffer, "%s&3", req_password);
-                        fetch_data (server_address, server_port, send_buffer);
-                        uptime=strtoul(recv_buffer,NULL,10);
-                        updays = uptime / 86400;
-                        uphours = (uptime % 86400) / 3600;
-                        upminutes = ((uptime % 86400) % 3600) / 60;
-
-                        if (!strncmp(value_list, "minutes", strlen("minutes")))
+                        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(value_list, "hours", strlen("hours")))
+                        } else if (!strncmp(tmp_value_list, "hours", strlen("hours"))) {
                                 uptime = uptime / 3600;
-                        else if (!strncmp(value_list, "days", strlen("days")))
+                        } 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);
+                        xasprintf(&output_message, _("System Uptime - %u day(s) %u hour(s) %u minute(s) |uptime=%lu"), updays, uphours, upminutes,
+                                          uptime);
 
-                        if (check_critical_value && uptime <= critical_value)
-                                return_code=STATE_CRITICAL;
-                        else if (check_warning_value && uptime <= warning_value)
-                                return_code=STATE_WARNING;
-                        else
-                                return_code=STATE_OK;
+                        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;
-
+        } 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 (value_list==NULL)
-                        output_message = strdup (_("missing -l parameters"));
-                else if (strlen(value_list)!=1)
-                        output_message = strdup (_("wrong -l argument"));
-                else {
-                        xasprintf(&send_buffer,"%s&4&%s", req_password, value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        fds=strtok(recv_buffer,"&");
-                        tds=strtok(NULL,"&");
-                        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) {
-                                percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
-                                warning_used_space = ((float)warning_value / 100) * total_disk_space;
-                                critical_used_space = ((float)critical_value / 100) * total_disk_space;
-
-                                xasprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
-                                  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"), value_list,
-                                  (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
-                                  critical_used_space / 1073741824, total_disk_space / 1073741824);
-
-                                if(check_critical_value && percent_used_space >= critical_value)
-                                        return_code=STATE_CRITICAL;
-                                else if (check_warning_value && percent_used_space >= warning_value)
-                                        return_code=STATE_WARNING;
-                                else
-                                        return_code=STATE_OK;
-
-                                output_message = strdup (temp_string);
+                        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;
+                                output_message = strdup(_("Free disk space : Invalid drive"));
+                                return_code = STATE_UNKNOWN;
                         }
                 }
                 break;
-
         case CHECK_SERVICESTATE:
         case CHECK_PROCSTATE:
-
-                if (value_list==NULL)
-                        output_message = strdup (_("No service/process specified"));
-                else {
-                        preparelist(value_list);                /* replace , between services with & to send the request */
-                        xasprintf(&send_buffer,"%s&%u&%s&%s", req_password,(vars_to_check==CHECK_SERVICESTATE)?5:6,
-                                                         (show_all) ? "ShowAll" : "ShowFail",value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        numstr = strtok(recv_buffer,"&");
-                        if (numstr == NULL)
+                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);
+                        }
+                        return_code = atoi(numstr);
+                        temp_string = strtok(NULL, "&");
+                        output_message = strdup(temp_string);
                 }
                 break;
-
         case CHECK_MEMUSE:
-
-                xasprintf(&send_buffer,"%s&7", req_password);
-                fetch_data (server_address, server_port, send_buffer);
-                numstr = strtok(recv_buffer,"&");
-                if (numstr == NULL)
+                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"));
-                mem_commitLimit=atof(numstr);
-                numstr = strtok(NULL,"&");
-                if (numstr == NULL)
+                }
+                double mem_commitLimit = atof(numstr);
+                numstr = strtok(NULL, "&");
+                if (numstr == NULL) {
                         die(STATE_UNKNOWN, _("could not fetch information from server\n"));
-                mem_commitByte=atof(numstr);
-                percent_used_space = (mem_commitByte / mem_commitLimit) * 100;
-                warning_used_space = ((float)warning_value / 100) * mem_commitLimit;
-                critical_used_space = ((float)critical_value / 100) * mem_commitLimit;
+                }
+                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(check_critical_value && percent_used_space >= critical_value)
-                        return_code=STATE_CRITICAL;
-                else if (check_warning_value && percent_used_space >= warning_value)
-                        return_code=STATE_WARNING;
+                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:
-
-
+        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
@@ -352,450 +307,450 @@ int main(int argc, char **argv){
                  strange things will happen when you make graphs of your data.
                 */
 
-                if (value_list == NULL)
-                        output_message = strdup (_("No counter specified"));
-                else
-                {
-                        preparelist (value_list);       /* replace , between services with & to send the request */
-                        isPercent = (strchr (value_list, '%') != NULL);
-
-                        strtok (value_list, "&");       /* burn the first parameters */
-                        description = strtok (NULL, "&");
-                        counter_unit = strtok (NULL, "&");
-                        xasprintf (&send_buffer, "%s&8&%s", req_password, value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        counter_value = atof (recv_buffer);
-
-                        if (description == NULL)
-                        xasprintf (&output_message, "%.f", counter_value);
-                        else if (isPercent)
-                        {
-                                counter_unit = strdup ("%");
+                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;
                         }
 
-                        if ((counter_unit != NULL) && (!allRight))
-                        {
-                                minval = strtok (NULL, "&");
-                                maxval = strtok (NULL, "&");
+                        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. */
+                                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"));
                         }
-                        else if ((counter_unit == NULL) && (description != NULL))
-                                output_message = strdup (_("No unit counter specified"));
 
-                        if (allRight)
-                        {
+                        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, warning_value, 1, critical_value,
-                                                        (!(isPercent) && (minval != NULL)), fminval,
-                                                        (!(isPercent) && (minval != NULL)), fmaxval));
+                                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 (critical_value > warning_value)
-                {                       /* Normal thresholds */
-                        if (check_critical_value && counter_value >= critical_value)
+                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 (check_warning_value  && counter_value >= warning_value)
+                        } else if (config.check_warning_value && counter_value >= config.warning_value) {
                                 return_code = STATE_WARNING;
-                        else
+                        } else {
                                 return_code = STATE_OK;
-                }
-                else
-                {                       /* inverse thresholds */
+                        }
+                } else { /* inverse thresholds */
                         return_code = STATE_OK;
-                        if (check_critical_value && counter_value <= critical_value)
+                        if (config.check_critical_value && counter_value <= config.critical_value) {
                                 return_code = STATE_CRITICAL;
-                        else if (check_warning_value && counter_value <= warning_value)
+                        } else if (config.check_warning_value && counter_value <= config.warning_value) {
                                 return_code = STATE_WARNING;
+                        }
                 }
-        break;
-
+        } break;
         case CHECK_FILEAGE:
-
-                if (value_list==NULL)
-                        output_message = strdup (_("No counter specified"));
-                else {
-                        preparelist(value_list);                /* replace , between services with & to send the request */
-                        xasprintf(&send_buffer,"%s&9&%s", req_password,value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        age_in_minutes = atoi(strtok(recv_buffer,"&"));
-                        description = strtok(NULL,"&");
-                        output_message = strdup (description);
-
-                        if (critical_value > warning_value) {        /* Normal thresholds */
-                                if(check_critical_value && age_in_minutes >= critical_value)
-                                        return_code=STATE_CRITICAL;
-                                else if (check_warning_value && age_in_minutes >= warning_value)
-                                        return_code=STATE_WARNING;
-                                else
-                                        return_code=STATE_OK;
-                        }
-                        else {                                       /* inverse thresholds */
-                                if(check_critical_value && age_in_minutes <= critical_value)
-                                        return_code=STATE_CRITICAL;
-                                else if (check_warning_value && age_in_minutes <= warning_value)
-                                        return_code=STATE_WARNING;
-                                else
-                                        return_code=STATE_OK;
+                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 (value_list==NULL)
-                        output_message = strdup (_("No counter specified"));
-                else {
-                        xasprintf(&send_buffer,"%s&10&%s", req_password,value_list);
-                        fetch_data (server_address, server_port, send_buffer);
-                        if (!strncmp(recv_buffer,"ERROR",5)) {
-                                printf("NSClient - %s\n",recv_buffer);
+                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;
+                        xasprintf(&output_message, "%s", recv_buffer);
+                        return_code = STATE_OK;
                 }
                 break;
 
         case CHECK_NONE:
         default:
-                usage4 (_("Please specify a variable to check"));
+                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);
+        if (perfdata == NULL) {
+                printf("%s\n", output_message);
+        } else {
+                printf("%s | %s\n", output_message, perfdata);
+        }
         return return_code;
 }
 
-
-
 /* 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'},
-                {"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 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) return ERROR;
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
         /* backwards compatibility */
-        if (! is_option(argv[1])) {
-                server_address = strdup(argv[1]);
-                argv[1]=argv[0];
-                argv=&argv[1];
+        if (!is_option(argv[1])) {
+                result.config.server_address = strdup(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");
+        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");
+                }
         }
 
-        while (1) {
-                c = getopt_long(argc,argv,"+hVH:t:c:w:p:v:l:s:d:u",longopts,&option);
+        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 (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 'H': /* hostname */
-                                server_address = optarg;
-                                break;
-                        case 's': /* password */
-                                req_password = optarg;
-                                break;
-                        case 'p': /* port */
-                                if (is_intnonneg(optarg))
-                                        server_port=atoi(optarg);
-                                else
-                                        die(STATE_UNKNOWN,_("Server port must be an integer\n"));
-                                break;
-                        case 'v':
-                                if(strlen(optarg)<4)
-                                        return ERROR;
-                                if(!strcmp(optarg,"CLIENTVERSION"))
-                                        vars_to_check=CHECK_CLIENTVERSION;
-                                else if(!strcmp(optarg,"CPULOAD"))
-                                        vars_to_check=CHECK_CPULOAD;
-                                else if(!strcmp(optarg,"UPTIME"))
-                                        vars_to_check=CHECK_UPTIME;
-                                else if(!strcmp(optarg,"USEDDISKSPACE"))
-                                        vars_to_check=CHECK_USEDDISKSPACE;
-                                else if(!strcmp(optarg,"SERVICESTATE"))
-                                        vars_to_check=CHECK_SERVICESTATE;
-                                else if(!strcmp(optarg,"PROCSTATE"))
-                                        vars_to_check=CHECK_PROCSTATE;
-                                else if(!strcmp(optarg,"MEMUSE"))
-                                        vars_to_check=CHECK_MEMUSE;
-                                else if(!strcmp(optarg,"COUNTER"))
-                                        vars_to_check=CHECK_COUNTER;
-                                else if(!strcmp(optarg,"FILEAGE"))
-                                        vars_to_check=CHECK_FILEAGE;
-                                else if(!strcmp(optarg,"INSTANCES"))
-                                        vars_to_check=CHECK_INSTANCES;
-                                else
-                                        return ERROR;
-                                break;
-                        case 'l': /* value list */
-                                value_list = optarg;
-                                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 'd': /* Display select for services */
-                                if (!strcmp(optarg,"SHOWALL"))
-                                        show_all = true;
-                                break;
-                        case 'u':
-                                socket_timeout_state=STATE_UNKNOWN;
-                                break;
-                        case 't': /* timeout */
-                                socket_timeout=atoi(optarg);
-                                if(socket_timeout<=0)
-                                        return ERROR;
+                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 (server_address == NULL)
-                usage4 (_("You must provide a server address or host name"));
 
-        if (vars_to_check==CHECK_NONE)
-                return ERROR;
+        if (result.config.vars_to_check == CHECK_NONE) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        if (req_password == NULL)
-                req_password = strdup (_("None"));
+        if (result.config.req_password == NULL) {
+                result.config.req_password = strdup(_("None"));
+        }
 
-        return OK;
+        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"));
+        }
 
-void fetch_data (const char *address, int port, const char *sendb) {
-        int result;
-
-        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);
+        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 */
-        int idx=0;
-        char *t1;
-
-        for (idx=0;idx<MAX_VALUE_LIST;idx++)
-                array[idx]=0;
+        for (int idx = 0; idx < MAX_VALUE_LIST; idx++) {
+                array[idx] = 0;
+        }
 
-        idx=0;
-        for(t1 = strtok(string,delim);t1 != NULL; t1 = strtok(NULL, delim)) {
-                if (is_numeric(t1) && idx<MAX_VALUE_LIST) {
-                        array[idx]=strtoul(t1,NULL,10);
+        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
+                } else {
                         return false;
+                }
         }
         return true;
 }
 
 void preparelist(char *string) {
         /* Replace all , with & which is the delimiter for the request */
-        int i;
-
-        for (i = 0; (size_t)i < strlen(string); i++)
+        for (int i = 0; (size_t)i < strlen(string); i++) {
                 if (string[i] == ',') {
-                        string[i]='&';
+                        string[i] = '&';
                 }
+        }
 }
 
-
-
-void print_help(void)
-{
+void print_help(void) {
         print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 2000 Yves Rubin (rubiyz@yahoo.com)\n");
-        printf (COPYRIGHT, copyright, email);
+        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("%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");
+        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);
+        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");
+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
new file mode 100644
index 00000000..431889cb
--- /dev/null
+++ b/plugins/check_nt.d/config.h
@@ -0,0 +1,53 @@
+#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
index 61b2d699..d33f8786 100644
--- a/plugins/check_ntp.c
+++ b/plugins/check_ntp.c
@@ -4,7 +4,7 @@
 * 
 * License: GPL
 * Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Monitoring Plugins Development Team
+* Copyright (c) 2006-2024 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -31,7 +31,7 @@
 *****************************************************************************/
 
 const char *progname = "check_ntp";
-const char *copyright = "2006-2008";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -47,10 +47,10 @@ static bool do_jitter = false;
 static char *jwarn="5000";
 static char *jcrit="10000";
 
-int process_arguments (int, char **);
-thresholds *offset_thresholds = NULL;
-thresholds *jitter_thresholds = NULL;
-void print_help (void);
+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. */
diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c
index 464a9e10..6e76bf23 100644
--- a/plugins/check_ntp_peer.c
+++ b/plugins/check_ntp_peer.c
@@ -1,88 +1,77 @@
 /*****************************************************************************
-* 
-* Monitoring check_ntp_peer plugin
-* 
-* License: GPL
-* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ntp_peer plugin
-* 
-* This plugin checks an NTP server independent of any commandline
-* programs or external libraries.
-* 
-* Use this plugin to check the health of an NTP server. It supports
-* checking the offset with the sync peer, the jitter and stratum. This
-* plugin will not check the clock offset between the local host and NTP
-* server; please use check_ntp_time for that purpose.
-* 
-* 
-* 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_ntp_peer 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_peer plugin
+ *
+ * This plugin checks an NTP server independent of any commandline
+ * programs or external libraries.
+ *
+ * Use this plugin to check the health of an NTP server. It supports
+ * checking the offset with the sync peer, the jitter and stratum. This
+ * plugin will not check the clock offset between the local host and NTP
+ * server; please use check_ntp_time for that purpose.
+ *
+ *
+ * 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 "thresholds.h"
 const char *progname = "check_ntp_peer";
-const char *copyright = "2006-2008";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #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 int verbose = 0;
 static bool syncsource_found = false;
 static bool li_alarm = false;
 
-int process_arguments (int, char **);
-thresholds *offset_thresholds = NULL;
-thresholds *jitter_thresholds = NULL;
-thresholds *stratum_thresholds = NULL;
-thresholds *truechimer_thresholds = NULL;
-void print_help (void);
-void print_usage (void);
+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);
 
 /* max size of control message data */
 #define MAX_CM_SIZE 468
 
 /* 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 */
+        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! */
+                                                        /* NB: not necessarily NULL terminated! */
 } ntp_control_message;
 
 /* this is an association/status-word pair found in control packet responses */
@@ -93,82 +82,96 @@ 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); }while(0)
+#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_NOWARNING  0x00
+#define LI_EXTRASEC   0x01
 #define LI_MISSINGSEC 0x02
-#define LI_ALARM 0x03
+#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(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)
+#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_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_MASK  0xe0
+#define REM_RESP  0x80
 #define REM_ERROR 0x40
-#define REM_MORE 0x20
+#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_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_SEL(x)     ((ntohs(x) >> 8) & 0x07)
 #define PEER_TRUECHIMER 0x02
-#define PEER_INCLUDED 0x04
+#define PEER_INCLUDED   0x04
 #define PEER_SYNCSOURCE 0x06
 
 /* 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; }}while(0);
-#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){
-        int i=0, numpeers=0;
-        const ntp_assoc_status_pair *peer=NULL;
-
+#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);
+
+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));
-        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_SYNCSOURCE){
+        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) {
                                 printf(" <-- current sync source");
-                        } else if(PEER_SEL(peer[i].status) >= PEER_INCLUDED){
+                        } else if (PEER_SEL(peer[i].status) >= PEER_INCLUDED) {
                                 printf(" <-- current sync candidate");
-                        } else if(PEER_SEL(peer[i].status) >= PEER_TRUECHIMER){
+                        } else if (PEER_SEL(peer[i].status) >= PEER_TRUECHIMER) {
                                 printf(" <-- outlyer, but truechimer");
                         }
                         printf("\n");
@@ -176,14 +179,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 */
 }
 
@@ -198,22 +200,23 @@ setup_control_request(ntp_control_message *p, uint8_t opcode, uint16_t seq){
  *  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){
-        int conn=-1, i, npeers=0, num_candidates=0;
-        double tmp_offset = 0;
-        int min_peer_sel=PEER_INCLUDED;
-        int peers_size=0, peer_offset=0;
-        int status;
-        ntp_assoc_status_pair *peers=NULL;
-        ntp_control_message req;
-        const char *getvar = "stratum,offset,jitter";
-        char *data, *value, *nptr;
-        void *tmp;
-
-        status = STATE_OK;
-        *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;
+} 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,
+        };
 
         /* Long-winded explanation:
          * Getting the sync peer offset, jitter and stratum requires a number of
@@ -231,11 +234,20 @@ 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)
          */
-        my_udp_connect(server_address, port, &conn);
+        int min_peer_sel = PEER_INCLUDED;
+        int num_candidates = 0;
+        void *tmp;
+        ntp_assoc_status_pair *peers = NULL;
+        int peer_offset = 0;
+        size_t peers_size = 0;
+        size_t npeers = 0;
+        int conn = -1;
+        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. */
-        do{
+        ntp_control_message req;
+        do {
                 setup_control_request(&req, OP_READSTAT, 1);
                 DBG(printf("sending READSTAT request"));
                 write(conn, &req, SIZEOF_NTPCM(req));
@@ -243,63 +255,81 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
 
                 do {
                         /* Attempt to read the largest size packet possible */
-                        req.count=htons(MAX_CM_SIZE);
+                        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));
+                        }
+                } while (!(req.op & OP_READSTAT && ntohs(req.seq) == 1));
 
-                if (LI(req.flags) == LI_ALARM) li_alarm = true;
+                if (LI(req.flags) == LI_ALARM) {
+                        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)
+                 * 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);
+                }
+                peers = tmp;
+                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);
 
         /* 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 (i = 0; i < npeers; i++){
-                if(PEER_SEL(peers[i].status) >= PEER_TRUECHIMER){
-                        (*num_truechimers)++;
-                        if(PEER_SEL(peers[i].status) >= PEER_INCLUDED){
+        for (size_t i = 0; i < npeers; i++) {
+                if (PEER_SEL(peers[i].status) >= PEER_TRUECHIMER) {
+                        result.num_truechimers++;
+                        if (PEER_SEL(peers[i].status) >= PEER_INCLUDED) {
                                 num_candidates++;
-                                if(PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE){
+                                if (PEER_SEL(peers[i].status) >= PEER_SYNCSOURCE) {
                                         syncsource_found = true;
-                                        min_peer_sel=PEER_SYNCSOURCE;
+                                        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_WARNING;
-                if(verbose) printf("warning: no synchronization source found\n");
+
+        if (verbose) {
+                printf("%d candidate peers available\n", num_candidates);
         }
-        if(li_alarm){
-                status = STATE_WARNING;
-                if(verbose) printf("warning: LI_ALARM bit is set\n");
+        if (verbose && syncsource_found) {
+                printf("synchronization source found\n");
         }
 
+        if (!syncsource_found) {
+                result.state = STATE_WARNING;
+                if (verbose) {
+                        printf("warning: no synchronization source found\n");
+                }
+        }
+        if (li_alarm) {
+                result.state = STATE_WARNING;
+                if (verbose) {
+                        printf("warning: LI_ALARM bit is set\n");
+                }
+        }
 
-        for (i = 0; i < npeers; i++){
+        const char *getvar = "stratum,offset,jitter";
+        char *data;
+        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) printf("Getting offset, jitter and stratum for peer %.2x\n", ntohs(peers[i].assoc));
+                if (PEER_SEL(peers[i].status) >= min_peer_sel) {
+                        if (verbose) {
+                                printf("Getting offset, jitter and stratum for peer %.2x\n", ntohs(peers[i].assoc));
+                        }
                         xasprintf(&data, "");
-                        do{
+                        do {
                                 setup_control_request(&req, OP_READVAR, 2);
                                 req.assoc = peers[i].assoc;
                                 /* Putting the wanted variable names in the request
@@ -309,7 +339,7 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                                  */
                                 /* 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);
+                                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));
@@ -320,131 +350,151 @@ int ntp_request(double *offset, int *offset_result, double *jitter, int *stratum
                                         DBG(printf("receiving READVAR response...\n"));
                                         read(conn, &req, SIZEOF_NTPCM(req));
                                         DBG(print_ntp_control_message(&req));
-                                } while (!(req.op&OP_READVAR && ntohs(req.seq) == 2));
+                                } 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 'dispersion'...\n");
+                                }
+                        } 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 "
+                                                           "'dispersion'...\n");
+                                        }
                                         getvar = "stratum,offset,dispersion";
                                         i--;
                                         continue;
-                                } else if(strlen(getvar)) {
-                                        if(verbose) printf("Server didn't like dispersion either; will retrieve everything\n");
+                                }
+                                if (strlen(getvar)) {
+                                        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;
+                        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) printf("error: unable to read server offset response.\n");
+                        if (value == NULL || value == nptr) {
+                                if (verbose) {
+                                        printf("error: unable to read server offset response.\n");
+                                }
                         } else {
-                                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 (verbose) {
+                                        printf("%.10g\n", tmp_offset);
+                                }
+                                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", ntohs(peers[i].assoc));
+                                if (verbose) {
+                                        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");
-                                nptr=NULL;
+                                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) printf("error: unable to read server jitter/dispersion response.\n");
-                                        *jitter = -1;
-                                } else if(verbose) {
-                                        printf("%.10g\n", *jitter);
+                                if (value == NULL || value == nptr) {
+                                        if (verbose) {
+                                                printf("error: unable to read server jitter/dispersion response.\n");
+                                        }
+                                        result.jitter = -1;
+                                } else if (verbose) {
+                                        printf("%.10g\n", result.jitter);
                                 }
                         }
 
-                        if(do_stratum) {
+                        if (config.do_stratum) {
                                 /* get the stratum */
-                                if(verbose) {
+                                if (verbose) {
                                         printf("parsing stratum from peer %.2x: ", ntohs(peers[i].assoc));
                                 }
                                 value = np_extract_ntpvar(data, "stratum");
-                                nptr=NULL;
+                                nptr = NULL;
                                 /* Convert the value if we have one */
-                                if(value != NULL)
-                                        *stratum = strtol(value, &nptr, 10);
-                                if(value == NULL || value==nptr) {
-                                        if(verbose) printf("error: unable to read server stratum response.\n");
-                                        *stratum = -1;
+                                if (value != NULL) {
+                                        result.stratum = strtol(value, &nptr, 10);
+                                }
+                                if (value == NULL || value == nptr) {
+                                        if (verbose) {
+                                                printf("error: unable to read server stratum response.\n");
+                                        }
+                                        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++) */
 
         close(conn);
-        if(peers!=NULL) free(peers);
+        if (peers != NULL) {
+                free(peers);
+        }
 
-        return status;
+        return result;
 }
 
-int process_arguments(int argc, char **argv){
-        int c;
-        int option=0;
+check_ntp_peer_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'},
-                {"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}
-        };
-
+                {"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) {
+                usage("\n");
+        }
 
-        if (argc < 2)
-                usage ("\n");
+        check_ntp_peer_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_ntp_peer_config_init(),
+        };
 
         while (true) {
-                c = getopt_long (argc, argv, "Vhv46qw:c:W:C:j:k:m:n:t:H:p:", longopts, &option);
-                if (c == -1 || c == EOF || c == 1)
+                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) {
                         break;
+                }
 
-                switch (c) {
+                switch (option_char) {
                 case 'h':
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -457,48 +507,49 @@ int process_arguments(int argc, char **argv){
                         verbose++;
                         break;
                 case 'q':
-                        quiet = true;
+                        result.config.quiet = true;
                         break;
                 case 'w':
-                        owarn = optarg;
+                        result.config.owarn = optarg;
                         break;
                 case 'c':
-                        ocrit = optarg;
+                        result.config.ocrit = optarg;
                         break;
                 case 'W':
-                        do_stratum = true;
-                        swarn = optarg;
+                        result.config.do_stratum = true;
+                        result.config.swarn = optarg;
                         break;
                 case 'C':
-                        do_stratum = true;
-                        scrit = optarg;
+                        result.config.do_stratum = true;
+                        result.config.scrit = optarg;
                         break;
                 case 'j':
-                        do_jitter = true;
-                        jwarn = optarg;
+                        result.config.do_jitter = true;
+                        result.config.jwarn = optarg;
                         break;
                 case 'k':
-                        do_jitter = true;
-                        jcrit = optarg;
+                        result.config.do_jitter = true;
+                        result.config.jcrit = optarg;
                         break;
                 case 'm':
-                        do_truechimers = true;
-                        twarn = optarg;
+                        result.config.do_truechimers = true;
+                        result.config.twarn = optarg;
                         break;
                 case 'n':
-                        do_truechimers = true;
-                        tcrit = optarg;
+                        result.config.do_truechimers = true;
+                        result.config.tcrit = optarg;
                         break;
                 case 'H':
-                        if(!is_host(optarg))
+                        if (!is_host(optarg)) {
                                 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);
+                        socket_timeout = atoi(optarg);
                         break;
                 case '4':
                         address_family = AF_INET;
@@ -507,222 +558,220 @@ int process_arguments(int argc, char **argv){
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
                         break;
                 case '?':
                         /* print short usage statement if args not parsable */
-                        usage5 ();
+                        usage5();
                         break;
                 }
         }
 
-        if(server_address == NULL){
+        if (result.config.server_address == NULL) {
                 usage4(_("Hostname was not supplied"));
         }
 
-        return 0;
-}
+        set_thresholds(&result.config.offset_thresholds, result.config.owarn, result.config.ocrit);
+        set_thresholds(&result.config.jitter_thresholds, result.config.jwarn, result.config.jcrit);
+        set_thresholds(&result.config.stratum_thresholds, result.config.swarn, result.config.scrit);
+        set_thresholds(&result.config.truechimer_thresholds, result.config.twarn, result.config.tcrit);
 
-char *perfd_offset (double offset)
-{
-        return fperfdata ("offset", offset, "s",
-                true, offset_thresholds->warning->end,
-                true, offset_thresholds->critical->end,
-                false, 0, false, 0);
+        return result;
 }
 
-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_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_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_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_truechimers (int num_truechimers)
-{
-        return perfdata ("truechimers", num_truechimers, "",
-                do_truechimers, (int)truechimer_thresholds->warning->end,
-                do_truechimers, (int)truechimer_thresholds->critical->end,
-                true, 0, false, 0);
+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);
 }
 
-int main(int argc, char *argv[]){
-        int result, offset_result, stratum, num_truechimers;
-        double offset=0, jitter=0;
-        char *result_line, *perfdata_line;
+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);
+}
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        check_ntp_peer_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        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 (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        const check_ntp_peer_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
+        alarm(socket_timeout);
 
         /* This returns either OK or WARNING (See comment preceding ntp_request) */
-        result = ntp_request(&offset, &offset_result, &jitter, &stratum, &num_truechimers);
+        ntp_request_result ntp_res = ntp_request(config);
+        mp_state_enum result = STATE_UNKNOWN;
 
-        if(offset_result == STATE_UNKNOWN) {
+        if (ntp_res.offset_result == STATE_UNKNOWN) {
                 /* if there's no sync peer (this overrides ntp_request output): */
-                result = (quiet ? STATE_UNKNOWN : STATE_CRITICAL);
+                result = (config.quiet ? STATE_UNKNOWN : STATE_CRITICAL);
         } else {
                 /* Be quiet if there's no candidates either */
-                if (quiet && result == STATE_WARNING)
+                if (config.quiet && result == STATE_WARNING) {
                         result = STATE_UNKNOWN;
-                result = max_state_alt(result, get_status(fabs(offset), offset_thresholds));
+                }
+                result = max_state_alt(result, get_status(fabs(ntp_res.offset), config.offset_thresholds));
         }
 
-        int oresult = result;
-
+        mp_state_enum oresult = result;
+        mp_state_enum tresult = STATE_UNKNOWN;
 
-        int tresult = STATE_UNKNOWN;
-        
-        if(do_truechimers) {
-                tresult = get_status(num_truechimers, truechimer_thresholds);
+        if (config.do_truechimers) {
+                tresult = get_status(ntp_res.num_truechimers, config.truechimer_thresholds);
                 result = max_state_alt(result, tresult);
         }
 
+        mp_state_enum sresult = STATE_UNKNOWN;
 
-        int sresult = STATE_UNKNOWN;
-
-        if(do_stratum) {
-                sresult = get_status(stratum, stratum_thresholds);
+        if (config.do_stratum) {
+                sresult = get_status((double)ntp_res.stratum, config.stratum_thresholds);
                 result = max_state_alt(result, sresult);
         }
 
+        mp_state_enum jresult = STATE_UNKNOWN;
 
-        int jresult = STATE_UNKNOWN;
-
-        if(do_jitter) {
-                jresult = get_status(jitter, jitter_thresholds);
+        if (config.do_jitter) {
+                jresult = get_status(ntp_res.jitter, config.jitter_thresholds);
                 result = max_state_alt(result, jresult);
         }
 
+        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;
+        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(!syncsource_found)
+
+        if (!syncsource_found) {
                 xasprintf(&result_line, "%s %s,", result_line, _("Server not synchronized"));
-        else if(li_alarm)
+        } else if (li_alarm) {
                 xasprintf(&result_line, "%s %s,", result_line, _("Server has the LI_ALARM bit set"));
+        }
 
-        if(offset_result == STATE_UNKNOWN){
+        char *perfdata_line;
+        if (ntp_res.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);
+                xasprintf(&result_line, "%s %s %.10g secs (WARNING)", result_line, _("Offset"), ntp_res.offset);
         } else if (oresult == STATE_CRITICAL) {
-                xasprintf(&result_line, "%s %s %.10g secs (CRITICAL)", result_line, _("Offset"), offset);
+                xasprintf(&result_line, "%s %s %.10g secs (CRITICAL)", result_line, _("Offset"), ntp_res.offset);
         } 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 %s %.10g secs", result_line, _("Offset"), ntp_res.offset);
+        }
+        xasprintf(&perfdata_line, "%s", perfd_offset(ntp_res.offset, config.offset_thresholds));
+
+        if (config.do_jitter) {
                 if (jresult == STATE_WARNING) {
-                        xasprintf(&result_line, "%s, jitter=%f (WARNING)", result_line, jitter);
+                        xasprintf(&result_line, "%s, jitter=%f (WARNING)", result_line, ntp_res.jitter);
                 } else if (jresult == STATE_CRITICAL) {
-                        xasprintf(&result_line, "%s, jitter=%f (CRITICAL)", result_line, jitter);
+                        xasprintf(&result_line, "%s, jitter=%f (CRITICAL)", result_line, ntp_res.jitter);
                 } else {
-                        xasprintf(&result_line, "%s, jitter=%f", result_line, jitter);
+                        xasprintf(&result_line, "%s, jitter=%f", result_line, ntp_res.jitter);
                 }
-                xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_jitter(jitter));
+                xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_jitter(ntp_res.jitter, config.do_jitter, config.jitter_thresholds));
         }
-        if (do_stratum) {
+
+        if (config.do_stratum) {
                 if (sresult == STATE_WARNING) {
-                        xasprintf(&result_line, "%s, stratum=%i (WARNING)", result_line, stratum);
+                        xasprintf(&result_line, "%s, stratum=%l (WARNING)", result_line, ntp_res.stratum);
                 } else if (sresult == STATE_CRITICAL) {
-                        xasprintf(&result_line, "%s, stratum=%i (CRITICAL)", result_line, stratum);
+                        xasprintf(&result_line, "%s, stratum=%l (CRITICAL)", result_line, ntp_res.stratum);
                 } else {
-                        xasprintf(&result_line, "%s, stratum=%i", result_line, stratum);
+                        xasprintf(&result_line, "%s, stratum=%l", result_line, ntp_res.stratum);
                 }
-                xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_stratum(stratum));
+                xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_stratum(ntp_res.stratum, config.do_stratum, config.stratum_thresholds));
         }
-        if (do_truechimers) {
+
+        if (config.do_truechimers) {
                 if (tresult == STATE_WARNING) {
-                        xasprintf(&result_line, "%s, truechimers=%i (WARNING)", result_line, num_truechimers);
+                        xasprintf(&result_line, "%s, truechimers=%i (WARNING)", result_line, ntp_res.num_truechimers);
                 } else if (tresult == STATE_CRITICAL) {
-                        xasprintf(&result_line, "%s, truechimers=%i (CRITICAL)", result_line, num_truechimers);
+                        xasprintf(&result_line, "%s, truechimers=%i (CRITICAL)", result_line, ntp_res.num_truechimers);
                 } else {
-                        xasprintf(&result_line, "%s, truechimers=%i", result_line, num_truechimers);
+                        xasprintf(&result_line, "%s, truechimers=%i", result_line, ntp_res.num_truechimers);
                 }
-                xasprintf(&perfdata_line, "%s %s", perfdata_line, perfd_truechimers(num_truechimers));
+                xasprintf(&perfdata_line, "%s %s", perfdata_line,
+                                  perfd_truechimers(ntp_res.num_truechimers, config.do_truechimers, config.truechimer_thresholds));
         }
+
         printf("%s|%s\n", result_line, perfdata_line);
 
-        if(server_address!=NULL) free(server_address);
-        return result;
+        if (config.server_address != NULL) {
+                free(config.server_address);
+        }
+
+        exit(result);
 }
 
-void print_help(void){
+void print_help(void) {
         print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 2006 Sean Finney\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 2006 Sean Finney\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin checks the selected ntp server"));
+        printf("%s\n", _("This plugin checks the selected ntp server"));
 
-        printf ("\n\n");
+        printf("\n\n");
 
         print_usage();
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        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", "-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", "-W, --swarn=THRESHOLD");
-        printf ("    %s\n", _("Warning threshold for stratum of server's synchronization peer"));
-        printf (" %s\n", "-C, --scrit=THRESHOLD");
-        printf ("    %s\n", _("Critical threshold for stratum of server's synchronization peer"));
-        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 (" %s\n", "-m, --twarn=THRESHOLD");
-        printf ("    %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")"));
-        printf (" %s\n", "-n, --tcrit=THRESHOLD");
-        printf ("    %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")"));
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-        printf (UT_VERBOSE);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        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", "-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", "-W, --swarn=THRESHOLD");
+        printf("    %s\n", _("Warning threshold for stratum of server's synchronization peer"));
+        printf(" %s\n", "-C, --scrit=THRESHOLD");
+        printf("    %s\n", _("Critical threshold for stratum of server's synchronization peer"));
+        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(" %s\n", "-m, --twarn=THRESHOLD");
+        printf("    %s\n", _("Warning threshold for number of usable time sources (\"truechimers\")"));
+        printf(" %s\n", "-n, --tcrit=THRESHOLD");
+        printf("    %s\n", _("Critical threshold for number of usable time sources (\"truechimers\")"));
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_VERBOSE);
 
         printf("\n");
         printf("%s\n", _("This plugin checks an NTP server independent of any commandline"));
@@ -751,13 +800,11 @@ void print_help(void){
         printf(" %s\n", _("Check only stratum:"));
         printf("  %s\n", ("./check_ntp_peer -H ntpserv -W 4 -C 6"));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage(void)
-{
-        printf ("%s\n", _("Usage:"));
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
         printf(" %s -H <host> [-4|-6] [-w <warn>] [-c <crit>] [-W <warn>] [-C <crit>]\n", progname);
         printf("       [-j <warn>] [-k <crit>] [-v verbose]\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..00e6b05d
--- /dev/null
+++ b/plugins/check_ntp_peer.d/config.h
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "../../config.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;
+        char *twarn;
+        char *tcrit;
+        thresholds *truechimer_thresholds;
+
+        char *owarn;
+        char *ocrit;
+        thresholds *offset_thresholds;
+
+        // stratum stuff
+        bool do_stratum;
+        char *swarn;
+        char *scrit;
+        thresholds *stratum_thresholds;
+
+        // jitter stuff
+        bool do_jitter;
+        char *jwarn;
+        char *jcrit;
+        thresholds *jitter_thresholds;
+
+} 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,
+                .twarn = "0:",
+                .tcrit = "0:",
+                .truechimer_thresholds = NULL,
+
+                .owarn = "60",
+                .ocrit = "120",
+                .offset_thresholds = NULL,
+
+                .do_stratum = false,
+                .swarn = "-1:16",
+                .scrit = "-1:16",
+                .stratum_thresholds = NULL,
+
+                .do_jitter = false,
+                .jwarn = "-1:5000",
+                .jcrit = "-1:10000",
+                .jitter_thresholds = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_ntp_time.c b/plugins/check_ntp_time.c
index b2e16556..31162883 100644
--- a/plugins/check_ntp_time.c
+++ b/plugins/check_ntp_time.c
@@ -1,63 +1,64 @@
 /*****************************************************************************
-* 
-* Monitoring check_ntp_time plugin
-* 
-* License: GPL
-* Copyright (c) 2006 Sean Finney <seanius@seanius.net>
-* Copyright (c) 2006-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ntp_time plugin
-* 
-* This plugin checks the clock offset between the local host and a
-* remote NTP server. It is independent of any commandline programs or
-* external libraries.
-* 
-* If you'd rather want to monitor an NTP server, please use
-* check_ntp_peer.
-* 
-* 
-* 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_ntp_time 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_time plugin
+ *
+ * This plugin checks the clock offset between the local host and a
+ * remote NTP server. It is independent of any commandline programs or
+ * external libraries.
+ *
+ * If you'd rather want to monitor an NTP server, please use
+ * check_ntp_peer.
+ *
+ *
+ * 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_time";
-const char *copyright = "2006-2008";
+const char *copyright = "2006-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
+#include "states.h"
+#include "thresholds.h"
+#include "check_ntp_time.d/config.h"
 
-static char *server_address=NULL;
-static char *port="123";
-static int verbose=0;
-static bool quiet = false;
-static char *owarn="60";
-static char *ocrit="120";
-static int time_offset=0;
+static int verbose = 0;
 
-int process_arguments (int, char **);
-thresholds *offset_thresholds = NULL;
-void print_help (void);
-void print_usage (void);
+typedef struct {
+        int errorcode;
+        check_ntp_time_config config;
+} check_ntp_time_config_wrapper;
+static check_ntp_time_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
+
+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
+#       define AVG_NUM 4
 #endif
 
 /* max size of control message data */
@@ -65,17 +66,17 @@ void print_usage (void);
 
 /* 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 */
+        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 */
@@ -86,43 +87,55 @@ typedef struct {
         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 */
+        uint8_t flags;          /* byte with leapindicator,vers,mode. see macros */
 } ntp_server_results;
 
 /* 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)
+#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_NOWARNING  0x00
+#define LI_EXTRASEC   0x01
 #define LI_MISSINGSEC 0x02
-#define LI_ALARM 0x03
+#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(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)
+#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_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_MASK  0xe0
+#define REM_RESP  0x80
 #define REM_ERROR 0x40
-#define REM_MORE 0x20
+#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_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_SEL(x)     ((ntohs(x) >> 8) & 0x07)
+#define PEER_INCLUDED   0x04
 #define PEER_SYNCSOURCE 0x06
 
 /**
@@ -136,129 +149,137 @@ typedef struct {
 
 /* 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])
+#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])
+#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)
+#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))
+#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)
+#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)
+#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)+((m.count)?4-(ntohs(m.count)%4):0))
+#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; }}while(0);
-#define PRINTSOCKADDR(x) \
-        do{ \
-                printf("%u.%u.%u.%u", (x>>24)&0xff, (x>>16)&0xff, (x>>8)&0xff, x&0xff);\
-        }while(0);
+#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)));
+static inline double calc_offset(const ntp_message *message, const struct timeval *time_value) {
+        double client_tx = NTP64asDOUBLE(message->origts);
+        double peer_rx = NTP64asDOUBLE(message->rxts);
+        double peer_tx = NTP64asDOUBLE(message->txts);
+        double client_rx = TVasDOUBLE((*time_value));
+        return (((peer_tx - client_rx) + (peer_rx - client_tx)) / 2);
 }
 
 /* print out a ntp packet in human readable/debuggable format */
-void print_ntp_message(const ntp_message *p){
-        struct timeval ref, orig, rx, tx;
+void print_ntp_message(const ntp_message *message) {
+        struct timeval ref;
+        struct timeval orig;
 
-        NTP64toTV(p->refts,ref);
-        NTP64toTV(p->origts,orig);
-        NTP64toTV(p->rxts,rx);
-        NTP64toTV(p->txts,tx);
+        NTP64toTV(message->refts, ref);
+        NTP64toTV(message->origts, orig);
 
         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));
+        printf("\tflags: 0x%.2x\n", message->flags);
+        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("\tstratum = %d\n", message->stratum);
+        printf("\tpoll = %g\n", pow(2, message->poll));
+        printf("\tprecision = %g\n", pow(2, message->precision));
+        printf("\trtdelay = %-.16g\n", NTP32asDOUBLE(message->rtdelay));
+        printf("\trtdisp = %-.16g\n", NTP32asDOUBLE(message->rtdisp));
+        printf("\trefid = %x\n", message->refid);
+        printf("\trefts = %-.16g\n", NTP64asDOUBLE(message->refts));
+        printf("\torigts = %-.16g\n", NTP64asDOUBLE(message->origts));
+        printf("\trxts = %-.16g\n", NTP64asDOUBLE(message->rxts));
+        printf("\ttxts = %-.16g\n", NTP64asDOUBLE(message->txts));
 }
 
-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);
+void setup_request(ntp_message *message) {
+        memset(message, 0, sizeof(ntp_message));
+        LI_SET(message->flags, LI_ALARM);
+        VN_SET(message->flags, 4);
+        MODE_SET(message->flags, MODE_CLIENT);
+        message->poll = 4;
+        message->precision = (int8_t)0xfa;
+        L16(message->rtdelay) = htons(1);
+        L16(message->rtdisp) = htons(1);
 
+        struct timeval t;
         gettimeofday(&t, NULL);
-        TVtoNTP64(t,p->txts);
+        TVtoNTP64(t, message->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;
+int best_offset_server(const ntp_server_results *slist, int nservers) {
+        int best_server = -1;
 
         /* for each server */
-        for(cserver=0; cserver<nservers; cserver++){
+        for (int 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);
+                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));
+                if (LI(slist[cserver].flags) == LI_ALARM) {
+                        if (verbose) {
+                                printf("discarding peer %d: flags=%d\n", cserver, LI(slist[cserver].flags));
+                        }
                         continue;
                 }
 
@@ -272,13 +293,13 @@ int best_offset_server(const ntp_server_results *slist, int nservers){
                 /* 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){
+                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){
+                        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){
+                                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));
@@ -287,13 +308,12 @@ int best_offset_server(const ntp_server_results *slist, int nservers){
                 }
         }
 
-        if(best_server >= 0) {
+        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;
         }
+        DBG(printf("no peers meeting synchronization criteria :(\n"));
+        return -1;
 }
 
 /* do everything we need to get the total average offset
@@ -301,178 +321,208 @@ 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, int *status){
-        int i=0, j=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;
-
+double offset_request(const char *host, const char *port, mp_state_enum *status, int time_offset) {
         /* setup hints to only return results from getaddrinfo that we'd like */
+        struct addrinfo hints;
         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, port, &hints, &ai);
-        if(ga_result!=0){
-                die(STATE_UNKNOWN, "error getting address for %s: %s\n",
-                    host, gai_strerror(ga_result));
+        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 */
-        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));
+        size_t num_hosts = 0;
+        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);
+
+        if (req == NULL) {
+                die(STATE_UNKNOWN, "can not allocate ntp message array");
+        }
+        int *socklist = (int *)malloc(sizeof(int) * num_hosts);
+
+        if (socklist == NULL) {
+                die(STATE_UNKNOWN, "can not allocate socket array");
+        }
+
+        struct pollfd *ufds = (struct pollfd *)malloc(sizeof(struct pollfd) * num_hosts);
+        if (ufds == NULL) {
+                die(STATE_UNKNOWN, "can not allocate socket array");
+        }
+
+        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");
+        }
+        memset(servers, 0, sizeof(ntp_server_results) * num_hosts);
+        DBG(printf("Found %zu 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) {
+        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)){
+                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;
+                        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){
+        time_t start_ts = 0;
+        time_t now_time = 0;
+        now_time = start_ts = time(NULL);
+        size_t servers_completed = 0;
+        bool one_read = false;
+        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);
+                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);
+                for (size_t 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 %zu\n", i);
+                                }
                                 setup_request(&req[i]);
                                 write(socklist[i], &req[i], sizeof(ntp_message));
-                                servers[i].waiting=now_time;
+                                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){
+                int 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);
+                for (size_t 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 %zu: ", i);
                                 }
 
                                 read(ufds[i].fd, &req[i], sizeof(ntp_message));
+
+                                struct timeval recv_time;
                                 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)+time_offset;
-                                if(verbose) {
+                                int respnum = servers[i].num_responses++;
+                                servers[i].offset[respnum] = calc_offset(&req[i], &recv_time) + time_offset;
+                                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[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++;
+                                one_read = true;
+                                if (servers[i].num_responses == AVG_NUM) {
+                                        servers_completed++;
+                                }
                         }
                 }
                 /* lather, rinse, repeat. */
         }
 
-        if (one_read == 0) {
+        if (!one_read) {
                 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;
+        double avg_offset = 0.;
+        int 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];
+                for (int i = 0; i < servers[best_index].num_responses; i++) {
+                        avg_offset += servers[best_index].offset[i];
                 }
-                avg_offset/=servers[best_index].num_responses;
+                avg_offset /= servers[best_index].num_responses;
         }
 
         /* cleanup */
-        for(j=0; j<num_hosts; j++){ close(socklist[j]); }
+        for (size_t j = 0; j < num_hosts; j++) {
+                close(socklist[j]);
+        }
         free(socklist);
         free(ufds);
         free(servers);
         free(req);
-        freeaddrinfo(ai);
+        freeaddrinfo(addresses);
 
-        if(verbose) printf("overall average offset: %.10g\n", avg_offset);
+        if (verbose) {
+                printf("overall average offset: %.10g\n", avg_offset);
+        }
         return avg_offset;
 }
 
-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'},
-                {"quiet", no_argument, 0, 'q'},
-                {"time-offset", optional_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'},
-                {0, 0, 0, 0}
-        };
+check_ntp_time_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'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {"quiet", no_argument, 0, 'q'},
+                                                                           {"time-offset", optional_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'},
+                                                                           {0, 0, 0, 0}};
+
+        if (argc < 2) {
+                usage("\n");
+        }
 
+        check_ntp_time_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_ntp_time_config_init(),
+        };
 
-        if (argc < 2)
-                usage ("\n");
+        char *owarn = "60";
+        char *ocrit = "120";
 
-        while (1) {
-                c = getopt_long (argc, argv, "Vhv46qw:c:t:H:p:o:", longopts, &option);
-                if (c == -1 || c == EOF || c == 1)
+        while (true) {
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "Vhv46qw:c:t:H:p:o:", longopts, &option);
+                if (option_char == -1 || option_char == EOF || option_char == 1) {
                         break;
+                }
 
-                switch (c) {
+                switch (option_char) {
                 case 'h':
                         print_help();
                         exit(STATE_UNKNOWN);
@@ -485,7 +535,7 @@ int process_arguments(int argc, char **argv){
                         verbose++;
                         break;
                 case 'q':
-                        quiet = true;
+                        result.config.quiet = true;
                         break;
                 case 'w':
                         owarn = optarg;
@@ -494,19 +544,20 @@ int process_arguments(int argc, char **argv){
                         ocrit = optarg;
                         break;
                 case 'H':
-                        if(!is_host(optarg))
+                        if (!is_host(optarg)) {
                                 usage2(_("Invalid hostname/address"), optarg);
-                        server_address = strdup(optarg);
+                        }
+                        result.config.server_address = strdup(optarg);
                         break;
                 case 'p':
-                        port = strdup(optarg);
+                        result.config.port = strdup(optarg);
                         break;
                 case 't':
-                        socket_timeout=atoi(optarg);
+                        socket_timeout = atoi(optarg);
                         break;
                 case 'o':
-                        time_offset=atoi(optarg);
-                        break;
+                        result.config.time_offset = atoi(optarg);
+                        break;
                 case '4':
                         address_family = AF_INET;
                         break;
@@ -514,114 +565,118 @@ int process_arguments(int argc, char **argv){
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
                         break;
                 case '?':
                         /* print short usage statement if args not parsable */
-                        usage5 ();
+                        usage5();
                         break;
                 }
         }
 
-        if(server_address == NULL){
+        if (result.config.server_address == NULL) {
                 usage4(_("Hostname was not supplied"));
         }
 
-        return 0;
-}
+        set_thresholds(&result.config.offset_thresholds, owarn, ocrit);
 
-char *perfd_offset (double offset) {
-        return fperfdata ("offset", offset, "s",
-                true, offset_thresholds->warning->end,
-                true, offset_thresholds->critical->end,
-                false, 0, false, 0);
+        return result;
 }
 
-int main(int argc, char *argv[]){
-        int result, offset_result;
-        double offset=0;
-        char *result_line, *perfdata_line;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+}
 
-        result = offset_result = STATE_OK;
+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);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        check_ntp_time_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        set_thresholds(&offset_thresholds, owarn, ocrit);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        const check_ntp_time_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
+        alarm(socket_timeout);
 
-        offset = offset_request(server_address, &offset_result);
+        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 = ( (!quiet) ? STATE_UNKNOWN : STATE_CRITICAL);
+                result = ((!config.quiet) ? STATE_UNKNOWN : STATE_CRITICAL);
         } else {
-                result = get_status(fabs(offset), offset_thresholds);
+                result = get_status(fabs(offset), config.offset_thresholds);
         }
 
+        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;
+        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){
+
+        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));
+                xasprintf(&perfdata_line, "%s", perfd_offset(offset, config.offset_thresholds));
         }
         printf("%s|%s\n", result_line, perfdata_line);
 
-        if(server_address!=NULL) free(server_address);
-        return result;
+        if (config.server_address != NULL) {
+                free(config.server_address);
+        }
+        exit(result);
 }
 
-void print_help(void){
+void print_help(void) {
         print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 2006 Sean Finney\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 2006 Sean Finney\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin checks the clock offset with the ntp server"));
+        printf("%s\n", _("This plugin checks the clock offset with the ntp server"));
 
-        printf ("\n\n");
+        printf("\n\n");
 
         print_usage();
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        printf (UT_IPv46);
-        printf (UT_HOST_PORT, 'p', "123");
-        printf (" %s\n", "-q, --quiet");
-        printf ("    %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
-        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", "-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_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        printf(UT_IPv46);
+        printf(UT_HOST_PORT, 'p', "123");
+        printf(" %s\n", "-q, --quiet");
+        printf("    %s\n", _("Returns UNKNOWN instead of CRITICAL if offset cannot be found"));
+        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", "-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("\n");
         printf("%s\n", _("This plugin checks the clock offset between the local host and a"));
@@ -641,13 +696,10 @@ void print_help(void){
         printf("%s\n", _("Examples:"));
         printf("  %s\n", ("./check_ntp_time -H ntpserv -w 0.5 -c 1"));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage(void)
-{
-        printf ("%s\n", _("Usage:"));
+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);
 }
-
diff --git a/plugins/check_ntp_time.d/config.h b/plugins/check_ntp_time.d/config.h
new file mode 100644
index 00000000..99dabbbd
--- /dev/null
+++ b/plugins/check_ntp_time.d/config.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include "../../config.h"
+#include "thresholds.h"
+#include <stddef.h>
+
+typedef struct {
+        char *server_address;
+        char *port;
+
+        bool quiet;
+        int time_offset;
+
+        thresholds *offset_thresholds;
+} check_ntp_time_config;
+
+check_ntp_time_config check_ntp_time_config_init() {
+        check_ntp_time_config tmp = {
+                .server_address = NULL,
+                .port = "123",
+
+                .quiet = false,
+                .time_offset = 0,
+
+                .offset_thresholds = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_nwstat.c b/plugins/check_nwstat.c
deleted file mode 100644
index 10c493b6..00000000
--- a/plugins/check_nwstat.c
+++ /dev/null
@@ -1,1740 +0,0 @@
-/*****************************************************************************
-* 
-* Monitoring check_nwstat plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 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-2007";
-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
-};
-
-char *server_address=NULL;
-char *volume_name=NULL;
-char *nlm_name=NULL;
-char *nrmp_name=NULL;
-char *nrmm_name=NULL;
-char *nrms_name=NULL;
-char *nss1_name=NULL;
-char *nss2_name=NULL;
-char *nss3_name=NULL;
-char *nss4_name=NULL;
-char *nss5_name=NULL;
-char *nss6_name=NULL;
-char *nss7_name=NULL;
-int server_port=PORT;
-unsigned long warning_value=0L;
-unsigned long critical_value=0L;
-bool check_warning_value = false;
-bool check_critical_value = false;
-bool check_netware_version = false;
-enum checkvar vars_to_check = NONE;
-int sap_number=-1;
-
-int process_arguments(int, char **);
-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_overcr.c b/plugins/check_overcr.c
deleted file mode 100644
index 5165c828..00000000
--- a/plugins/check_overcr.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/*****************************************************************************
-* 
-* Monitoring check_overcr plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_overcr plugin
-* 
-* This plugin attempts to contact the Over-CR collector daemon running on the
-* remote UNIX server in order 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_overcr";
-const char *copyright = "2000-2007";
-const char *email = "devel@monitoring-plugins.org";
-
-#include "common.h"
-#include "netutils.h"
-#include "utils.h"
-
-enum checkvar {
-        NONE,
-        LOAD1,
-        LOAD5,
-        LOAD15,
-        DPU,
-        PROCS,
-        NETSTAT,
-        UPTIME
-};
-
-enum {
-        PORT = 2000
-};
-
-char *server_address = NULL;
-int server_port = PORT;
-double warning_value = 0L;
-double critical_value = 0L;
-bool check_warning_value = false;
-bool check_critical_value = false;
-enum checkvar vars_to_check = NONE;
-int cmd_timeout = 1;
-
-int netstat_port = 0;
-char *disk_name = NULL;
-char *process_name = NULL;
-char send_buffer[MAX_INPUT_BUFFER];
-
-int process_arguments (int, char **);
-void print_usage (void);
-void print_help (void);
-
-int
-main (int argc, char **argv)
-{
-        int result = STATE_UNKNOWN;
-        char recv_buffer[MAX_INPUT_BUFFER];
-        char temp_buffer[MAX_INPUT_BUFFER];
-        char *temp_ptr = NULL;
-        bool found_disk = false;
-        unsigned long percent_used_disk_space = 100;
-        double load;
-        double load_1min;
-        double load_5min;
-        double load_15min;
-        int port_connections = 0;
-        int processes = 0;
-        double uptime_raw_hours;
-        int uptime_raw_minutes = 0;
-        int uptime_days = 0;
-        int uptime_hours = 0;
-        int uptime_minutes = 0;
-
-        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);
-
-        result = process_tcp_request2 (server_address,
-                                       server_port,
-                                       send_buffer,
-                                       recv_buffer,
-                                       sizeof (recv_buffer));
-
-        switch (vars_to_check) {
-
-        case LOAD1:
-        case LOAD5:
-        case LOAD15:
-        
-                if (result != STATE_OK)
-                        die (result, _("Unknown error fetching load data\n"));
-
-                temp_ptr = (char *) strtok (recv_buffer, "\r\n");
-                if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server - no load information\n"));
-                else
-                        load_1min = strtod (temp_ptr, NULL);
-
-                temp_ptr = (char *) strtok (NULL, "\r\n");
-                if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server after load 1\n"));
-                else
-                        load_5min = strtod (temp_ptr, NULL);
-
-                temp_ptr = (char *) strtok (NULL, "\r\n");
-                if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server after load 5\n"));
-                else
-                        load_15min = strtod (temp_ptr, NULL);
-
-                switch (vars_to_check) {
-                case LOAD1:
-                        strcpy (temp_buffer, "1");
-                        load = load_1min;
-                        break;
-                case LOAD5:
-                        strcpy (temp_buffer, "5");
-                        load = load_5min;
-                        break;
-                default:
-                        strcpy (temp_buffer, "15");
-                        load = load_15min;
-                        break;
-                }
-
-                if (check_critical_value && (load >= critical_value))
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && (load >= warning_value))
-                        result = STATE_WARNING;
-
-                die (result,
-                          _("Load %s - %s-min load average = %0.2f"),
-                                                         state_text(result),
-                          temp_buffer,
-                          load);
-
-                        break;
-
-        case DPU:
-
-                if (result != STATE_OK)
-                        die (result, _("Unknown error fetching disk data\n"));
-
-                for (temp_ptr = (char *) strtok (recv_buffer, " ");
-                     temp_ptr != NULL;
-                     temp_ptr = (char *) strtok (NULL, " ")) {
-
-                        if (!strcmp (temp_ptr, disk_name)) {
-                                found_disk = true;
-                                temp_ptr = (char *) strtok (NULL, "%");
-                                if (temp_ptr == NULL)
-                                        die (STATE_CRITICAL, _("Invalid response from server\n"));
-                                else
-                                        percent_used_disk_space = strtoul (temp_ptr, NULL, 10);
-                                break;
-                        }
-
-                        temp_ptr = (char *) strtok (NULL, "\r\n");
-                }
-
-                /* error if we couldn't find the info for the disk */
-                if (!found_disk)
-                        die (STATE_CRITICAL,
-                                   "CRITICAL - Disk '%s' non-existent or not mounted",
-                                   disk_name);
-
-                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;
-
-                die (result, "Disk %s - %lu%% used on %s", state_text(result), percent_used_disk_space, disk_name);
-
-                break;
-
-        case NETSTAT:
-
-                if (result != STATE_OK)
-                        die (result, _("Unknown error fetching network status\n"));
-                else
-                        port_connections = strtod (recv_buffer, NULL);
-
-                if (check_critical_value && (port_connections >= critical_value))
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && (port_connections >= warning_value))
-                        result = STATE_WARNING;
-
-                die (result,
-                           _("Net %s - %d connection%s on port %d"),
-                           state_text(result),
-                           port_connections,
-                           (port_connections == 1) ? "" : "s",
-                           netstat_port);
-
-                break;
-
-        case PROCS:
-
-                if (result != STATE_OK)
-                        die (result, _("Unknown error fetching process status\n"));
-
-                temp_ptr = (char *) strtok (recv_buffer, "(");
-                if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server\n"));
-
-                temp_ptr = (char *) strtok (NULL, ")");
-                if (temp_ptr == NULL)
-                        die (STATE_CRITICAL, _("Invalid response from server\n"));
-                else
-                        processes = strtod (temp_ptr, NULL);
-
-                if (check_critical_value && (processes >= critical_value))
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && (processes >= warning_value))
-                        result = STATE_WARNING;
-
-                die (result,
-                           _("Process %s - %d instance%s of %s running"),
-                           state_text(result),
-                           processes,
-                           (processes == 1) ? "" : "s",
-                           process_name);
-                break;
-
-        case UPTIME:
-
-                if (result != STATE_OK)
-                        return result;
-
-                uptime_raw_hours = strtod (recv_buffer, NULL);
-                uptime_raw_minutes = (unsigned long) (uptime_raw_hours * 60.0);
-
-                if (check_critical_value && (uptime_raw_minutes <= critical_value))
-                        result = STATE_CRITICAL;
-                else if (check_warning_value && (uptime_raw_minutes <= warning_value))
-                        result = STATE_WARNING;
-
-                uptime_days = uptime_raw_minutes / 1440;
-                uptime_raw_minutes %= 1440;
-                uptime_hours = uptime_raw_minutes / 60;
-                uptime_raw_minutes %= 60;
-                uptime_minutes = uptime_raw_minutes;
-
-                die (result,
-                           _("Uptime %s - Up %d days %d hours %d minutes"),
-                           state_text(result),
-                           uptime_days,
-                           uptime_hours,
-                           uptime_minutes);
-                break;
-
-        default:
-                die (STATE_UNKNOWN, _("Nothing to check!\n"));
-                break;
-        }
-}
-
-
-/* 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'},
-                {"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, "+hVH: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 'p':                                                                       /* port */
-                        if (is_intnonneg (optarg))
-                                server_port = atoi (optarg);
-                        else
-                                die (STATE_UNKNOWN,
-                                                                         _("Server port an integer\n"));
-                        break;
-                case 'v':                                                                       /* variable */
-                        if (strcmp (optarg, "LOAD") == 0) {
-                                strcpy (send_buffer, "LOAD\r\nQUIT\r\n");
-                                if (strcmp (optarg, "LOAD1") == 0)
-                                        vars_to_check = LOAD1;
-                                else if (strcmp (optarg, "LOAD5") == 0)
-                                        vars_to_check = LOAD5;
-                                else if (strcmp (optarg, "LOAD15") == 0)
-                                        vars_to_check = LOAD15;
-                        }
-                        else if (strcmp (optarg, "UPTIME") == 0) {
-                                vars_to_check = UPTIME;
-                                strcpy (send_buffer, "UPTIME\r\n");
-                        }
-                        else if (strstr (optarg, "PROC") == optarg) {
-                                vars_to_check = PROCS;
-                                process_name = strscpy (process_name, optarg + 4);
-                                sprintf (send_buffer, "PROCESS %s\r\n", process_name);
-                        }
-                        else if (strstr (optarg, "NET") == optarg) {
-                                vars_to_check = NETSTAT;
-                                netstat_port = atoi (optarg + 3);
-                                sprintf (send_buffer, "NETSTAT %d\r\n", netstat_port);
-                        }
-                        else if (strstr (optarg, "DPU") == optarg) {
-                                vars_to_check = DPU;
-                                strcpy (send_buffer, "DISKSPACE\r\n");
-                                disk_name = strscpy (disk_name, optarg + 3);
-                        }
-                        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 Over-CR collector daemon running on the"));
-  printf ("%s\n", _("remote UNIX server in order 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", "-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", "-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", _("DPU<filesys>  = percent used disk space on filesystem <filesys>"));
-  printf ("    %s\n", _("PROC<process> = number of running processes with name <process>"));
-  printf ("    %s\n", _("NET<port>     = number of active connections on TCP port <port>"));
-  printf ("    %s\n", _("UPTIME        = system uptime in seconds"));
-
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
-
-  printf (UT_VERBOSE);
-
-  printf ("\n");
-  printf ("%s\n", _("This plugin requires that Eric Molitors' Over-CR collector daemon be"));
-  printf ("%s\n", _("running on the remote server."));
-  printf ("%s\n", _("Over-CR can be downloaded from http://www.molitor.org/overcr"));
-  printf ("%s\n", _("This plugin was tested with version 0.99.53 of the Over-CR collector"));
-
-  printf ("\n");
-  printf ("%s\n", _("Notes:"));
-  printf (" %s\n", _("For the available options, the critical threshold value should always be"));
-  printf (" %s\n", _("higher than the warning threshold value, EXCEPT with the uptime variable"));
-
-  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 94d589e1..84305adb 100644
--- a/plugins/check_pgsql.c
+++ b/plugins/check_pgsql.c
@@ -1,95 +1,75 @@
 /*****************************************************************************
-* 
-* Monitoring check_pgsql plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2011 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_pgsql plugin
-* 
-* Test whether a PostgreSQL Database 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_pgsql plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_pgsql plugin
+ *
+ * Test whether a PostgreSQL Database 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/>.
+ *
+ *
+ *****************************************************************************/
+
+#include "states.h"
 const char *progname = "check_pgsql";
-const char *copyright = "1999-2011";
+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>
 
-#define DEFAULT_DB "template1"
 #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)))
+#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
-
-enum {
-        DEFAULT_PORT = 5432,
-        DEFAULT_WARN = 2,
-        DEFAULT_CRIT = 8
-};
-
-
-
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_usage (void);
-void print_help (void);
-bool is_pg_logname (char *);
-int do_query (PGconn *, char *);
-
-char *pghost = NULL;                                            /* host name of the backend server */
-char *pgport = NULL;                                            /* port of the backend server */
-int default_port = DEFAULT_PORT;
-char *pgoptions = NULL;
-char *pgtty = NULL;
-char dbName[NAMEDATALEN] = DEFAULT_DB;
-char *pguser = NULL;
-char *pgpasswd = NULL;
-char *pgparams = NULL;
-double twarn = (double)DEFAULT_WARN;
-double tcrit = (double)DEFAULT_CRIT;
-char *pgquery = NULL;
+#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;
+        check_pgsql_config config;
+} check_pgsql_config_wrapper;
+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*/);
+void print_usage(void);
+
+static int verbose = 0;
+
 #define OPTID_QUERYNAME -1000
-char *pgqueryname = NULL;
-char *query_warning = NULL;
-char *query_critical = NULL;
-thresholds *qthresholds = NULL;
-int verbose = 0;
 
 /******************************************************************************
 
@@ -141,237 +121,235 @@ 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);
 
-int
-main (int argc, char **argv)
-{
-        PGconn *conn;
-        char *conninfo = NULL;
-
-        struct timeval start_timeval;
-        struct timeval end_timeval;
-        double elapsed_time;
-        int status = STATE_UNKNOWN;
-        int query_status = STATE_UNKNOWN;
-
-        /* begin, by setting the parameters for a backend connection if the
-         * parameters are null, then the system will try to use reasonable
-         * defaults by looking up environment variables or, failing that,
-         * using hardwired constants */
-
-        pgoptions = NULL;  /* special options to start up the backend server */
-        pgtty = NULL;      /* debugging tty for the backend server */
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        check_pgsql_config_wrapper tmp_config = process_arguments(argc, argv);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
-        /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        const check_pgsql_config config = tmp_config.config;
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
-        if (verbose > 2)
+        if (verbose > 2) {
                 printf("Arguments initialized\n");
+        }
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, timeout_alarm_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGALRM"));
+        }
+        alarm(timeout_interval);
+
+        char *conninfo = NULL;
+        if (config.pgparams) {
+                asprintf(&conninfo, "%s ", config.pgparams);
+        }
+
+        asprintf(&conninfo, "%sdbname = '%s'", conninfo ? conninfo : "", config.dbName);
+        if (config.pghost) {
+                asprintf(&conninfo, "%s host = '%s'", conninfo, config.pghost);
+        }
+        if (config.pgport) {
+                asprintf(&conninfo, "%s port = '%s'", conninfo, config.pgport);
+        }
+        if (config.pgoptions) {
+                asprintf(&conninfo, "%s options = '%s'", conninfo, config.pgoptions);
         }
-        alarm (timeout_interval);
-
-        if (pgparams)
-                asprintf (&conninfo, "%s ", pgparams);
-
-        asprintf (&conninfo, "%sdbname = '%s'", conninfo ? conninfo : "", dbName);
-        if (pghost)
-                asprintf (&conninfo, "%s host = '%s'", conninfo, pghost);
-        if (pgport)
-                asprintf (&conninfo, "%s port = '%s'", conninfo, pgport);
-        if (pgoptions)
-                asprintf (&conninfo, "%s options = '%s'", conninfo, pgoptions);
         /* if (pgtty) -- ignored by PQconnectdb */
-        if (pguser)
-                asprintf (&conninfo, "%s user = '%s'", conninfo, pguser);
+        if (config.pguser) {
+                asprintf(&conninfo, "%s user = '%s'", conninfo, config.pguser);
+        }
 
-        if (verbose) /* do not include password (see right below) in output */
-                printf ("Connecting to PostgreSQL using conninfo: %s%s\n", conninfo,
-                                pgpasswd ? " password = <hidden>" : "");
+        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>" : "");
+        }
 
-        if (pgpasswd)
-                asprintf (&conninfo, "%s password = '%s'", conninfo, pgpasswd);
+        if (config.pgpasswd) {
+                asprintf(&conninfo, "%s password = '%s'", conninfo, config.pgpasswd);
+        }
 
         /* make a connection to the database */
-        gettimeofday (&start_timeval, NULL);
-        conn = PQconnectdb (conninfo);
-        gettimeofday (&end_timeval, NULL);
+        struct timeval start_timeval;
+        gettimeofday(&start_timeval, NULL);
+        PGconn *conn = PQconnectdb(conninfo);
+        struct timeval end_timeval;
+        gettimeofday(&end_timeval, NULL);
 
         while (start_timeval.tv_usec > end_timeval.tv_usec) {
                 --end_timeval.tv_sec;
                 end_timeval.tv_usec += 1000000;
         }
-        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)
+        if (verbose) {
                 printf("Time elapsed: %f\n", elapsed_time);
+        }
 
         /* check to see that the backend connection was successfully made */
-        if (verbose)
+        if (verbose) {
                 printf("Verifying connection\n");
-        if (PQstatus (conn) == CONNECTION_BAD) {
-                printf (_("CRITICAL - no connection to '%s' (%s).\n"),
-                        dbName, PQerrorMessage (conn));
-                PQfinish (conn);
+        }
+        if (PQstatus(conn) == CONNECTION_BAD) {
+                printf(_("CRITICAL - no connection to '%s' (%s).\n"), config.dbName, PQerrorMessage(conn));
+                PQfinish(conn);
                 return STATE_CRITICAL;
         }
-        else if (elapsed_time > tcrit) {
+
+        mp_state_enum status = STATE_UNKNOWN;
+        if (elapsed_time > config.tcrit) {
                 status = STATE_CRITICAL;
-        }
-        else if (elapsed_time > twarn) {
+        } else if (elapsed_time > config.twarn) {
                 status = STATE_WARNING;
-        }
-        else {
+        } else {
                 status = STATE_OK;
         }
 
         if (verbose) {
-                char *server_host = PQhost (conn);
-                int server_version = PQserverVersion (conn);
-
-                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));
+                char *server_host = PQhost(conn);
+                int server_version = PQserverVersion(conn);
+
+                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));
         }
 
-        printf (_(" %s - database %s (%f sec.)|%s\n"),
-                state_text(status), dbName, elapsed_time,
-                fperfdata("time", elapsed_time, "s",
-                         !!(twarn > 0.0), twarn, !!(tcrit > 0.0), tcrit, true, 0, false,0));
+        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));
 
-        if (pgquery)
-                query_status = do_query (conn, pgquery);
+        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);
+        }
 
-        if (verbose)
+        if (verbose) {
                 printf("Closing connection\n");
-        PQfinish (conn);
-        return (pgquery && query_status > status) ? query_status : status;
+        }
+        PQfinish(conn);
+        return (config.pgquery && query_status > status) ? query_status : status;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"help", no_argument, 0, 'h'},
-                {"version", no_argument, 0, 'V'},
-                {"timeout", required_argument, 0, 't'},
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"hostname", required_argument, 0, 'H'},
-                {"logname", required_argument, 0, 'l'},
-                {"password", required_argument, 0, 'p'},
-                {"authorization", required_argument, 0, 'a'},
-                {"port", required_argument, 0, 'P'},
-                {"database", required_argument, 0, 'd'},
-                {"option", required_argument, 0, 'o'},
-                {"query", required_argument, 0, 'q'},
-                {"queryname", required_argument, 0, OPTID_QUERYNAME},
-                {"query_critical", required_argument, 0, 'C'},
-                {"query_warning", required_argument, 0, 'W'},
-                {"verbose", no_argument, 0, 'v'},
-                {0, 0, 0, 0}
+check_pgsql_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'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"warning", required_argument, 0, 'w'},
+                                                                           {"hostname", required_argument, 0, 'H'},
+                                                                           {"logname", required_argument, 0, 'l'},
+                                                                           {"password", required_argument, 0, 'p'},
+                                                                           {"authorization", required_argument, 0, 'a'},
+                                                                           {"port", required_argument, 0, 'P'},
+                                                                           {"database", required_argument, 0, 'd'},
+                                                                           {"option", required_argument, 0, 'o'},
+                                                                           {"query", required_argument, 0, 'q'},
+                                                                           {"queryname", required_argument, 0, OPTID_QUERYNAME},
+                                                                           {"query_critical", required_argument, 0, 'C'},
+                                                                           {"query_warning", required_argument, 0, 'W'},
+                                                                           {"verbose", no_argument, 0, 'v'},
+                                                                           {0, 0, 0, 0}};
+
+        check_pgsql_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_pgsql_config_init(),
         };
 
-        while (1) {
-                c = getopt_long (argc, argv, "hVt:c:w:H:P:d:l:p:a:o:q:C:W:v",
-                                 longopts, &option);
+        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);
 
-                if (c == EOF)
+                if (option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case '?':     /* usage */
-                        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_char) {
+                case '?': /* usage */
+                        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 time threshold */
-                        if (!is_nonnegative (optarg))
-                                usage2 (_("Critical threshold must be a positive integer"), optarg);
-                        else
-                                tcrit = strtod (optarg, NULL);
+                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);
+                        }
                         break;
-                case 'w':     /* warning time threshold */
-                        if (!is_nonnegative (optarg))
-                                usage2 (_("Warning threshold must be a positive integer"), optarg);
-                        else
-                                twarn = strtod (optarg, NULL);
+                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);
+                        }
                         break;
-                case 'C':     /* critical query threshold */
-                        query_critical = optarg;
+                case 'C': /* critical query threshold */
+                        result.config.query_critical = optarg;
                         break;
-                case 'W':     /* warning query threshold */
-                        query_warning = optarg;
+                case 'W': /* warning query threshold */
+                        result.config.query_warning = optarg;
                         break;
-                case 'H':     /* host */
-                        if ((*optarg != '/') && (!is_host (optarg)))
-                                usage2 (_("Invalid hostname/address"), optarg);
-                        else
-                                pghost = optarg;
+                case 'H': /* host */
+                        if ((*optarg != '/') && (!is_host(optarg))) {
+                                usage2(_("Invalid hostname/address"), optarg);
+                        } else {
+                                result.config.pghost = optarg;
+                        }
                         break;
-                case 'P':     /* port */
-                        if (!is_integer (optarg))
-                                usage2 (_("Port must be a positive integer"), optarg);
-                        else
-                                pgport = optarg;
+                case 'P': /* port */
+                        if (!is_integer(optarg)) {
+                                usage2(_("Port must be a positive integer"), optarg);
+                        } else {
+                                result.config.pgport = optarg;
+                        }
                         break;
-                case 'd':     /* database name */
+                case 'd': /* database name */
                         if (strlen(optarg) >= NAMEDATALEN) {
-                                usage2 (_("Database name exceeds the maximum length"), optarg);
+                                usage2(_("Database name exceeds the maximum length"), optarg);
                         }
-                        snprintf(dbName, NAMEDATALEN, "%s", optarg);
+                        snprintf(result.config.dbName, NAMEDATALEN, "%s", optarg);
                         break;
-                case 'l':     /* login name */
-                        if (!is_pg_logname (optarg))
-                                usage2 (_("User name is not valid"), optarg);
-                        else
-                                pguser = optarg;
+                case 'l': /* login name */
+                        if (!is_pg_logname(optarg)) {
+                                usage2(_("User name is not valid"), optarg);
+                        } else {
+                                result.config.pguser = optarg;
+                        }
                         break;
-                case 'p':     /* authentication password */
+                case 'p': /* authentication password */
                 case 'a':
-                        pgpasswd = optarg;
+                        result.config.pgpasswd = optarg;
                         break;
                 case 'o':
-                        if (pgparams)
-                                asprintf (&pgparams, "%s %s", pgparams, optarg);
-                        else
-                                asprintf (&pgparams, "%s", optarg);
+                        if (result.config.pgparams) {
+                                asprintf(&result.config.pgparams, "%s %s", result.config.pgparams, optarg);
+                        } else {
+                                asprintf(&result.config.pgparams, "%s", optarg);
+                        }
                         break;
                 case 'q':
-                        pgquery = optarg;
+                        result.config.pgquery = optarg;
                         break;
                 case OPTID_QUERYNAME:
-                        pgqueryname = optarg;
+                        result.config.pgqueryname = optarg;
                         break;
                 case 'v':
                         verbose++;
@@ -379,38 +357,9 @@ process_arguments (int argc, char **argv)
                 }
         }
 
-        set_thresholds (&qthresholds, query_warning, query_critical);
-
-        return validate_arguments ();
-}
-
-
-/******************************************************************************
-
-@@-
-<sect3>
-<title>validate_arguments</title>
-
-<para>&PROTO_validate_arguments;</para>
-
-<para>Given a database name, this function returns true if the string
-is a valid PostgreSQL database name, and returns false if it is
-not.</para>
-
-<para>Valid PostgreSQL database names are less than &NAMEDATALEN;
-characters long and consist of letters, numbers, and underscores. The
-first character cannot be a number, however.</para>
-
-</sect3>
--@@
-******************************************************************************/
-
-
+        set_thresholds(&result.config.qthresholds, result.config.query_warning, result.config.query_critical);
 
-int
-validate_arguments ()
-{
-        return OK;
+        return result;
 }
 
 /**
@@ -437,11 +386,10 @@ should be added.</para>
 -@@
 ******************************************************************************/
 
-
-
-bool is_pg_logname (char *username) {
-        if (strlen (username) > NAMEDATALEN - 1)
+bool is_pg_logname(char *username) {
+        if (strlen(username) > NAMEDATALEN - 1) {
                 return (false);
+        }
         return (true);
 }
 
@@ -453,182 +401,159 @@ bool is_pg_logname (char *username) {
 -@@
 ******************************************************************************/
 
-
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
 
-        xasprintf (&myport, "%d", DEFAULT_PORT);
+        xasprintf(&myport, "%d", 5432);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf (COPYRIGHT, copyright, email);
+        printf(COPYRIGHT, copyright, email);
 
-        printf (_("Test whether a PostgreSQL Database is accepting connections."));
+        printf(_("Test whether a PostgreSQL Database is accepting connections."));
 
-        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 (UT_HOST_PORT, 'P', myport);
+        printf(UT_HOST_PORT, 'P', myport);
 
-        printf (" %s\n", "-d, --database=STRING");
-        printf ("    %s", _("Database to check "));
-        printf (_("(default: %s)\n"), DEFAULT_DB);
-        printf (" %s\n", "-l, --logname = STRING");
-        printf ("    %s\n", _("Login name of user"));
-        printf (" %s\n", "-p, --password = STRING");
-        printf ("    %s\n", _("Password (BIG SECURITY ISSUE)"));
-        printf (" %s\n", "-o, --option = STRING");
-        printf ("    %s\n", _("Connection parameters (keyword = value), see below"));
+        printf(" %s\n", "-d, --database=STRING");
+        printf("    %s", _("Database to check "));
+        printf(_("(default: %s)\n"), DEFAULT_DB);
+        printf(" %s\n", "-l, --logname = STRING");
+        printf("    %s\n", _("Login name of user"));
+        printf(" %s\n", "-p, --password = STRING");
+        printf("    %s\n", _("Password (BIG SECURITY ISSUE)"));
+        printf(" %s\n", "-o, --option = STRING");
+        printf("    %s\n", _("Connection parameters (keyword = value), see below"));
 
-        printf (UT_WARN_CRIT);
+        printf(UT_WARN_CRIT);
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (" %s\n", "-q, --query=STRING");
-        printf ("    %s\n", _("SQL query to run. Only first column in first row will be read"));
-        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", _("SQL query value to result in warning status (double)"));
-        printf (" %s\n", "-C, --query-critical=RANGE");
-        printf ("    %s\n", _("SQL query value to result in critical status (double)"));
+        printf(" %s\n", "-q, --query=STRING");
+        printf("    %s\n", _("SQL query to run. Only first column in first row will be read"));
+        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", _("SQL query value to result in warning status (double)"));
+        printf(" %s\n", "-C, --query-critical=RANGE");
+        printf("    %s\n", _("SQL query value to result in critical status (double)"));
 
-        printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-        printf ("\n");
-        printf (" %s\n", _("All parameters are optional."));
-        printf (" %s\n", _("This plugin tests a PostgreSQL DBMS to determine whether it is active and"));
-        printf (" %s\n", _("accepting queries. In its current operation, it simply connects to the"));
-        printf (" %s\n", _("specified database, and then disconnects. If no database is specified, it"));
-        printf (" %s\n", _("connects to the template1 database, which is present in every functioning"));
-        printf (" %s\n\n", _("PostgreSQL DBMS."));
+        printf("\n");
+        printf(" %s\n", _("All parameters are optional."));
+        printf(" %s\n", _("This plugin tests a PostgreSQL DBMS to determine whether it is active and"));
+        printf(" %s\n", _("accepting queries. In its current operation, it simply connects to the"));
+        printf(" %s\n", _("specified database, and then disconnects. If no database is specified, it"));
+        printf(" %s\n", _("connects to the template1 database, which is present in every functioning"));
+        printf(" %s\n\n", _("PostgreSQL DBMS."));
 
-        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", _("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", _("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\n", _("executing the plugin."));
+        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", _("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", _("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\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", _("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", _("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", _("connection parameters: -o 'service=<name>' or to specify the SSL mode:"));
-        printf (" %s\n\n", _("-o 'sslmode=require'."));
+        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", _("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\n", _("connections (start the postmaster with the -i option)."));
+        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\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", _("a password, but no effort is made to obscure or encrypt the password."));
+        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);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
-        printf (" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n"
-                        "[-q <query>] [-C <critical query range>] [-W <warning query range>]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s [-H <host>] [-P <port>] [-c <critical time>] [-w <warning time>]\n", progname);
+        printf(" [-t <timeout>] [-d <database>] [-l <logname>] [-p <password>]\n"
+                   "[-q <query>] [-C <critical query range>] [-W <warning query range>]\n");
 }
 
-int
-do_query (PGconn *conn, char *query)
-{
-        PGresult *res;
-
-        char *val_str;
-        char *extra_info;
-        double value;
-
-        char *endptr = NULL;
-
-        int my_status = STATE_UNKNOWN;
-
-        if (verbose)
-                printf ("Executing SQL query \"%s\".\n", query);
-        res = PQexec (conn, query);
+mp_state_enum do_query(PGconn *conn, char *query, const char pgqueryname[], thresholds *qthresholds, char *query_warning,
+                                           char *query_critical) {
+        if (verbose) {
+                printf("Executing SQL query \"%s\".\n", query);
+        }
+        PGresult *res = PQexec(conn, query);
 
-        if (PGRES_TUPLES_OK != PQresultStatus (res)) {
-                printf (_("QUERY %s - %s: %s.\n"), _("CRITICAL"), _("Error with query"),
-                                        PQerrorMessage (conn));
+        if (PGRES_TUPLES_OK != PQresultStatus(res)) {
+                printf(_("QUERY %s - %s: %s.\n"), _("CRITICAL"), _("Error with query"), PQerrorMessage(conn));
                 return STATE_CRITICAL;
         }
 
-        if (PQntuples (res) < 1) {
-                printf ("QUERY %s - %s.\n", _("WARNING"), _("No rows returned"));
+        if (PQntuples(res) < 1) {
+                printf("QUERY %s - %s.\n", _("WARNING"), _("No rows returned"));
                 return STATE_WARNING;
         }
 
-        if (PQnfields (res) < 1) {
-                printf ("QUERY %s - %s.\n", _("WARNING"), _("No columns returned"));
+        if (PQnfields(res) < 1) {
+                printf("QUERY %s - %s.\n", _("WARNING"), _("No columns returned"));
                 return STATE_WARNING;
         }
 
-        val_str = PQgetvalue (res, 0, 0);
-        if (! val_str) {
-                printf ("QUERY %s - %s.\n", _("CRITICAL"), _("No data returned"));
+        char *val_str = PQgetvalue(res, 0, 0);
+        if (!val_str) {
+                printf("QUERY %s - %s.\n", _("CRITICAL"), _("No data returned"));
                 return STATE_CRITICAL;
         }
 
-        value = strtod (val_str, &endptr);
-        if (verbose)
-                printf ("Query result: %f\n", value);
+        char *endptr = NULL;
+        double value = strtod(val_str, &endptr);
+        if (verbose) {
+                printf("Query result: %f\n", value);
+        }
 
         if (endptr == val_str) {
-                printf ("QUERY %s - %s: %s\n", _("CRITICAL"), _("Is not a numeric"), val_str);
+                printf("QUERY %s - %s: %s\n", _("CRITICAL"), _("Is not a numeric"), val_str);
                 return STATE_CRITICAL;
         }
-        else if ((endptr != NULL) && (*endptr != '\0')) {
-                if (verbose)
-                        printf ("Garbage after value: %s.\n", endptr);
-        }
 
-        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);
+        if ((endptr != NULL) && (*endptr != '\0')) {
+                if (verbose) {
+                        printf("Garbage after value: %s.\n", endptr);
+                }
         }
-        else {
-                printf (_("'%s' returned %f"), query, value);
+
+        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);
         }
 
-        printf ("|query=%f;%s;%s;;\n", value,
-                        query_warning ? query_warning : "",
-                        query_critical ? query_critical : "");
-        if (PQnfields (res) > 1) {
-                extra_info = PQgetvalue (res, 0, 1);
+        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);
+                        printf("Extra Info: %s\n", extra_info);
                 }
         }
         return my_status;
 }
-
diff --git a/plugins/check_pgsql.d/config.h b/plugins/check_pgsql.d/config.h
new file mode 100644
index 00000000..2d4b8b89
--- /dev/null
+++ b/plugins/check_pgsql.d/config.h
@@ -0,0 +1,61 @@
+#pragma once
+
+#include "../../config.h"
+#include "thresholds.h"
+#include <stddef.h>
+#include <pg_config_manual.h>
+
+#define DEFAULT_DB "template1"
+
+enum {
+        DEFAULT_WARN = 2,
+        DEFAULT_CRIT = 8,
+};
+
+typedef struct {
+        char *pghost;    /* host name of the backend server */
+        char *pgport;    /* port of the backend server */
+        char *pgoptions; /* special options to start up the backend server */
+        char *pgtty;     /* debugging tty for the backend server */
+        char dbName[NAMEDATALEN];
+        char *pguser;
+        char *pgpasswd;
+        char *pgparams;
+        char *pgquery;
+        char *pgqueryname;
+
+        double twarn;
+        double tcrit;
+        thresholds *qthresholds;
+        char *query_warning;
+        char *query_critical;
+} check_pgsql_config;
+
+/* begin, by setting the parameters for a backend connection if the
+ * parameters are null, then the system will try to use reasonable
+ * defaults by looking up environment variables or, failing that,
+ * using hardwired constants
+ * this targets  .pgoptions and .pgtty
+ */
+
+check_pgsql_config check_pgsql_config_init() {
+        check_pgsql_config tmp = {
+                .pghost = NULL,
+                .pgport = NULL,
+                .pgoptions = NULL,
+                .pgtty = NULL,
+                .dbName = DEFAULT_DB,
+                .pguser = NULL,
+                .pgpasswd = NULL,
+                .pgparams = NULL,
+                .pgquery = NULL,
+                .pgqueryname = NULL,
+
+                .twarn = (double)DEFAULT_WARN,
+                .tcrit = (double)DEFAULT_CRIT,
+                .qthresholds = NULL,
+                .query_warning = NULL,
+                .query_critical = NULL,
+        };
+        return tmp;
+}
diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 6e162e6a..6bcdeaad 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -1,506 +1,526 @@
 /*****************************************************************************
-* 
-* Monitoring check_ping plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_ping plugin
-* 
-* Use the ping program to check connection statistics for a remote host.
-* 
-* 
-* 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_ping plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_ping plugin
+ *
+ * Use the ping program to check connection statistics for a remote host.
+ *
+ *
+ * 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_ping";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #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 */
-
-enum {
-        UNKNOWN_PACKET_LOSS = 200,    /* 200% */
-        DEFAULT_MAX_PACKETS = 5       /* default no. of ICMP ECHO packets */
-};
-
-int process_arguments (int, char **);
-int get_threshold (char *, float *, int *);
-int validate_arguments (void);
-int run_ping (const char *cmd, const char *addr);
-int error_scan (char buf[MAX_INPUT_BUFFER], const char *addr);
-void print_usage (void);
-void print_help (void);
-
-bool display_html = false;
-int wpl = UNKNOWN_PACKET_LOSS;
-int cpl = UNKNOWN_PACKET_LOSS;
-float wrta = UNKNOWN_TRIP_TIME;
-float crta = UNKNOWN_TRIP_TIME;
-char **addresses = NULL;
-int n_addresses = 0;
-int max_addr = 1;
-int max_packets = -1;
-int verbose = 0;
-
-float rta = UNKNOWN_TRIP_TIME;
-int pl = UNKNOWN_PACKET_LOSS;
-
-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);
+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 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 int verbose = 0;
 
-        addresses = malloc (sizeof(char*) * max_addr);
-        addresses[0] = NULL;
+static char *warn_text;
+
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        setlocale(LC_NUMERIC, "C");
+        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_ping_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"));
+        const check_ping_config config = tmp_config.config;
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGALRM"));
+        if (signal(SIGALRM, popen_timeout_alarm_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGALRM"));
         }
 
         /* If ./configure finds ping has timeout values, set plugin alarm slightly
          * higher so that we can use response from command line ping */
 #if defined(PING_PACKETS_FIRST) && defined(PING_HAS_TIMEOUT)
-        alarm (timeout_interval + 1);
+        alarm(timeout_interval + 1);
 #else
-        alarm (timeout_interval);
+        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
 
+                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]);
-# else
-                xasprintf (&cmd, rawcmd, max_packets, addresses[i]);
-# endif
+#       ifdef PING_HAS_TIMEOUT
+                xasprintf(&cmd, rawcmd, timeout_interval, config.max_packets, config.addresses[i]);
+#       else
+                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)
-                        printf ("CMD: %s\n", cmd);
+                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) {
-                        printf ("%s\n", cmd);
-                        die (STATE_UNKNOWN,
-                                _("CRITICAL - Could not interpret output from ping command\n"));
+                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 (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 (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)
-                        printf ("</A>");
+                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) {
-                        printf("|%s", fperfdata ("rta", (double) rta, "ms",
-                                                                          wrta>0?true:false, wrta,
-                                                                          crta>0?true:false, crta,
-                                                                          true, 0, false, 0));
+                if (pinged.packet_loss != 100) {
+                        printf("|%s", 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);
-                free (rawcmd);
-                free (cmd);
+                result = max_state(result, pinged.state);
+                free(rawcmd);
+                free(cmd);
         }
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c = 1;
-        char *ptr;
-
-        int option = 0;
-        static struct option longopts[] = {
-                STD_LONG_OPTS,
-                {"packets", required_argument, 0, 'p'},
-                {"nohtml", no_argument, 0, 'n'},
-                {"link", no_argument, 0, 'L'},
-                {"use-ipv4", no_argument, 0, '4'},
-                {"use-ipv6", no_argument, 0, '6'},
-                {0, 0, 0, 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'},
+                                                                           {"link", no_argument, 0, 'L'},
+                                                                           {"use-ipv4", no_argument, 0, '4'},
+                                                                           {"use-ipv6", no_argument, 0, '6'},
+                                                                           {0, 0, 0, 0}};
+
+        check_ping_config_wrapper result = {
+                .errorcode = OK,
+                .config = check_ping_config_init(),
         };
 
-        if (argc < 2)
-                return ERROR;
+        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) {
-                case '?':       /* usage */
-                        usage5 ();
-                case 'h':       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
+                switch (option_index) {
+                case '?': /* usage */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
                         break;
-                case 'V':       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
                         break;
-                case 't':       /* timeout period */
-                        timeout_interval = atoi (optarg);
+                case 't': /* timeout period */
+                        timeout_interval = atoi(optarg);
                         break;
-                case 'v':       /* verbose mode */
+                case 'v': /* verbose mode */
                         verbose++;
                         break;
-                case '4':       /* IPv4 only */
+                case '4': /* IPv4 only */
                         address_family = AF_INET;
                         break;
-                case '6':       /* IPv6 only */
+                case '6': /* IPv6 only */
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage (_("IPv6 support not available\n"));
+                        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)
-                                                die (STATE_UNKNOWN, _("Could not realloc() addresses\n"));
+                                        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;
-                                if ((ptr = index (ptr, ','))) {
-                                        strcpy (ptr, "");
+                                result.config.addresses[result.config.n_addresses - 1] = ptr;
+                                if ((ptr = index(ptr, ','))) {
+                                        strcpy(ptr, "");
                                         ptr += sizeof(char);
                                 } else {
                                         break;
                                 }
                         }
+                } break;
+                case 'p': /* number of packets to send */
+                        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 'p':       /* number of packets to send */
-                        if (is_intnonneg (optarg))
-                                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;
+                case 'n': /* no HTML */
+                        result.config.display_html = false;
                         break;
-                case 'L':       /* show HTML */
-                        display_html = true;
+                case 'L': /* show HTML */
+                        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);
+        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) {
-                printf (_("<wrta> was not set\n"));
-                return ERROR;
+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"));
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
         }
-        else if (crta < 0.0) {
-                printf (_("<crta> was not set\n"));
-                return ERROR;
+
+        if (config_wrapper.config.crta < 0.0) {
+                printf(_("<crta> was not set\n"));
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
         }
-        else if (wpl == UNKNOWN_PACKET_LOSS) {
-                printf (_("<wpl> was not set\n"));
-                return ERROR;
+
+        if (config_wrapper.config.wpl == UNKNOWN_PACKET_LOSS) {
+                printf(_("<wpl> was not set\n"));
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
         }
-        else if (cpl == UNKNOWN_PACKET_LOSS) {
-                printf (_("<cpl> was not set\n"));
-                return ERROR;
+
+        if (config_wrapper.config.cpl == UNKNOWN_PACKET_LOSS) {
+                printf(_("<cpl> was not set\n"));
+                config_wrapper.errorcode = ERROR;
+                return config_wrapper;
         }
-        else if (wrta > crta) {
-                printf (_("<wrta> (%f) cannot be larger than <crta> (%f)\n"), wrta, crta);
-                return ERROR;
+
+        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;
         }
-        else if (wpl > cpl) {
-                printf (_("<wpl> (%d) cannot be larger than <cpl> (%d)\n"), wpl, cpl);
-                return ERROR;
+
+        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;
         }
 
-        if (max_packets == -1)
-                max_packets = DEFAULT_MAX_PACKETS;
+        if (config_wrapper.config.max_packets == -1) {
+                config_wrapper.config.max_packets = DEFAULT_MAX_PACKETS;
+        }
 
-        max_seconds = crta / 1000.0 * max_packets + max_packets;
-        if (max_seconds > timeout_interval)
-                timeout_interval = (int)max_seconds;
+        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 (i=0; i<n_addresses; i++) {
-                if (!is_host(addresses[i]))
-                        usage2 (_("Invalid hostname/address"), addresses[i]);
+        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) {
-                usage (_("You must specify a server address or host name"));
+        if (config_wrapper.config.n_addresses == 0) {
+                usage(_("You must specify a server address or host name"));
         }
 
-        return OK;
+        return config_wrapper;
 }
 
+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) {
+                printf(_("Cannot open stderr for %s\n"), cmd);
+        }
 
-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)
-                die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
-
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
-        if (child_stderr == NULL)
-                printf (_("Cannot open stderr for %s\n"), cmd);
-
-        while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {
+        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")
+        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 (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 {
@@ -510,111 +530,97 @@ run_ping (const char *cmd, const char *addr)
                 }
         }
 
-        (void) fclose (child_stderr);
+        (void)fclose(child_stderr);
 
+        spclose(child_process);
 
-        spclose (child_process);
-
-        if (warn_text == NULL)
+        if (warn_text == NULL) {
                 warn_text = strdup("");
+        }
 
         return result;
 }
 
+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")) {
+                die(STATE_CRITICAL, _("CRITICAL - Host Unreachable (%s)\n"), addr);
+        } 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")) {
+                die(STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Protocol Unreachable (%s)\n"), addr);
+        } else if (strstr(buf, "Destination Net Prohibited")) {
+                die(STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr);
+        } 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")) {
+                die(STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr);
+        } 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")) {
+                die(STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)\n"), addr);
+        } 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) {
+                        warn_text = strdup(_(WARN_DUPLICATES));
+                } 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;
+        }
 
-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")
-                )
-                die (STATE_CRITICAL, _("CRITICAL - Network Unreachable (%s)\n"), addr);
-        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"))
-                die (STATE_CRITICAL, _("CRITICAL - Bogus ICMP: Port Unreachable (%s)\n"), addr);
-        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"))
-                die (STATE_CRITICAL, _("CRITICAL - Network Prohibited (%s)\n"), addr);
-        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"))
-                die (STATE_CRITICAL, _("CRITICAL - Packet Filtered (%s)\n"), addr);
-        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"))
-                die (STATE_CRITICAL, _("CRITICAL - Time to live exceeded (%s)\n"), addr);
-        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)
-                        warn_text = strdup (_(WARN_DUPLICATES));
-                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_OK);
+        return STATE_OK;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
+        printf("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
-
-        printf (_("Use ping to check connection statistics for a remote host."));
+        printf(_("Use ping to check connection statistics for a remote host."));
 
-        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 (UT_IPv46);
+        printf(UT_IPv46);
 
-        printf (" %s\n", "-H, --hostname=HOST");
-        printf ("    %s\n", _("host to ping"));
-        printf (" %s\n", "-w, --warning=THRESHOLD");
-        printf ("    %s\n", _("warning threshold pair"));
-        printf (" %s\n", "-c, --critical=THRESHOLD");
-        printf ("    %s\n", _("critical threshold pair"));
-        printf (" %s\n", "-p, --packets=INTEGER");
-        printf ("    %s ", _("number of ICMP ECHO packets to send"));
-        printf (_("(Default: %d)\n"), DEFAULT_MAX_PACKETS);
-        printf (" %s\n", "-L, --link");
-        printf ("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
+        printf(" %s\n", "-H, --hostname=HOST");
+        printf("    %s\n", _("host to ping"));
+        printf(" %s\n", "-w, --warning=THRESHOLD");
+        printf("    %s\n", _("warning threshold pair"));
+        printf(" %s\n", "-c, --critical=THRESHOLD");
+        printf("    %s\n", _("critical threshold pair"));
+        printf(" %s\n", "-p, --packets=INTEGER");
+        printf("    %s ", _("number of ICMP ECHO packets to send"));
+        printf(_("(Default: %d)\n"), DEFAULT_MAX_PACKETS);
+        printf(" %s\n", "-L, --link");
+        printf("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf ("\n");
-        printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));
-        printf ("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"));
-        printf ("%s\n", _("percentage of packet loss to trigger an alarm state."));
+        printf("\n");
+        printf("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));
+        printf("%s\n", _("time (ms) which triggers a WARNING or CRITICAL state, and <pl> is the"));
+        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("\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 (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname);
-        printf (" [-p packets] [-t timeout] [-4|-6]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H <host_address> -w <wrta>,<wpl>%% -c <crta>,<cpl>%%\n", progname);
+        printf(" [-p packets] [-t timeout] [-4|-6]\n");
 }
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 1fcbd981..83e6864e 100644
--- a/plugins/check_procs.c
+++ b/plugins/check_procs.c
@@ -1,357 +1,330 @@
 /*****************************************************************************
-*
-* Monitoring check_procs plugin
-*
-* License: GPL
-* Copyright (c) 2000-2008 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 *copyright = "2000-2008";
+const char *program_name = "check_procs"; /* Required for coreutils libs */
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #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
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-int convert_to_seconds (char *);
-void print_help (void);
-void print_usage (void);
-
-char *warning_range = NULL;
-char *critical_range = NULL;
-thresholds *procs_thresholds = NULL;
-
-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;
-
-int verbose = 0;
-int uid;
-pid_t ppid;
-int vsz;
-int rss;
-float pcpu;
-char *statopts;
-char *prog;
-char *exclude_progs;
-char **exclude_progs_arr = NULL;
-char exclude_progs_counter = 0;
-char *args;
-char *input_filename = NULL;
-regex_t re_args;
-char *fmt;
-char *fails;
-char tmp[MAX_INPUT_BUFFER];
-int kthread_filter = 0;
-int usepid = 0; /* whether to test for pid or /proc/pid/exe */
-
-FILE *ps_input = NULL;
-
-static int
-stat_exe (const pid_t pid, struct stat *buf) {
+#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 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);
                                 }
                         }
                 }
@@ -361,339 +334,350 @@ 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++;
@@ -705,9 +689,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) {
@@ -715,135 +702,125 @@ 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);
 
-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", _("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("%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("\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("%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");
+        printf("\n\n");
 
-  print_usage ();
+        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"));
+        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 6b32710a..cc846709 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -1,99 +1,92 @@
 /*****************************************************************************
-* 
-* Monitoring check_radius plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2008 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-2008";
+const char *copyright = "2000-2024";
 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
 
-int process_arguments (int, char **);
-void print_help (void);
-void print_usage (void);
+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)
+#       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_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
 
-int my_rc_read_config(char *);
-
-#if defined(HAVE_LIBFREERADIUS_CLIENT) || defined(HAVE_LIBRADIUSCLIENT_NG) || defined(HAVE_LIBRADCLI)
-rc_handle *rch = NULL;
-#endif
+static int my_rc_read_config(char * /*a*/, rc_handle ** /*rch*/);
 
-char *server = NULL;
-char *username = NULL;
-char *password = NULL;
-char *nasid = NULL;
-char *nasipaddress = NULL;
-char *expect = NULL;
-char *config_file = NULL;
-unsigned short port = PW_AUTH_UDP_PORT;
-int retries = 1;
-bool verbose = false;
+static bool verbose = false;
 
 /******************************************************************************
 
@@ -148,149 +141,167 @@ 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;
-        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}
+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}};
+
+        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 +309,115 @@ 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)
-{
+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(a);
+        *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 15e035b6..ec0928ed 100644
--- a/plugins/check_real.c
+++ b/plugins/check_real.c
@@ -1,454 +1,439 @@
 /*****************************************************************************
-* 
-* Monitoring check_real plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_real plugin
-* 
-* This plugin tests the REAL service on the specified host.
-* 
-* 
-* 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_real plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_real plugin
+ *
+ * This plugin tests the REAL service on the specified host.
+ *
+ *
+ * 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 "states.h"
+#include <stdio.h>
 const char *progname = "check_real";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
+#include "check_real.d/config.h"
 
-enum {
-        PORT    = 554
-};
-
-#define EXPECT  "RTSP/1."
-#define URL     ""
+#define EXPECT "RTSP/1."
+#define URL    ""
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
+typedef struct {
+        int errorcode;
+        check_real_config config;
+} check_real_config_wrapper;
+static check_real_config_wrapper process_arguments(int /*argc*/, char ** /*argv*/);
 
-int server_port = PORT;
-char *server_address;
-char *host_name;
-char *server_url = NULL;
-char *server_expect;
-int warning_time = 0;
-bool check_warning_time = false;
-int critical_time = 0;
-bool check_critical_time = false;
-bool verbose = false;
+static void print_help(void);
+void print_usage(void);
 
+static bool verbose = false;
 
-
-int
-main (int argc, char **argv)
-{
-        int sd;
-        int result = STATE_UNKNOWN;
-        char buffer[MAX_INPUT_BUFFER];
-        char *status_line = NULL;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_real_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"));
+        const check_real_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
-        time (&start_time);
+        alarm(socket_timeout);
+        time(&start_time);
 
         /* try to connect to the host at the given port number */
-        if (my_tcp_connect (server_address, server_port, &sd) != STATE_OK)
-                die (STATE_CRITICAL, _("Unable to connect to %s on port %d\n"),
-                                                         server_address, server_port);
+        int socket;
+        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 */
-        sprintf (buffer, "OPTIONS rtsp://%s:%d RTSP/1.0\r\n", host_name, server_port);
-        result = send (sd, buffer, strlen (buffer), 0);
+        char buffer[MAX_INPUT_BUFFER];
+        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 (sd, buffer, strlen (buffer), 0);
+        sprintf(buffer, "CSeq: 1\r\n");
+        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 (sd, buffer, strlen (buffer), 0);
+        sprintf(buffer, "\r\n");
+        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 (sd, 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)
-                        printf ("%s\n", _("Invalid REAL response received from host"));
-                else
-                        printf (_("Invalid REAL response received from host on port %d\n"),
-                                                        server_port);
-        }
-        else {
+        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"), config.server_port);
+                }
+        } else {
                 /* else we got the REAL string, so check the return code */
 
-                time (&end_time);
+                time(&end_time);
 
                 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 (sd, 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 (sd, buffer, strlen (buffer), 0);
+                sprintf(buffer, "CSeq: 2\r\n");
+                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 (sd, buffer, strlen (buffer), 0);
+                sprintf(buffer, "\r\n");
+                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 (sd, 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) {
-                        printf (_("No data received from host\n"));
+                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 {
+                } 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)
-                                        printf ("%s\n", _("Invalid REAL response received from host"));
-                                else
-                                        printf (_("Invalid REAL response received from host on port %d\n"),
-                                                                        server_port);
-                        }
-                        else {
+                        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"), config.server_port);
+                                }
+                        } else {
 
                                 /* else we got the REAL string, so check the return code */
 
-                                time (&end_time);
+                                time(&end_time);
 
                                 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) result = STATE_CRITICAL;
-                else if (check_warning_time
-                                                 && (end_time - start_time) > warning_time) result =
-                                STATE_WARNING;
+                if (config.check_critical_time && (end_time - start_time) > config.critical_time) {
+                        result = STATE_CRITICAL;
+                } 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));
+                printf(_("REAL %s - %d second response time\n"), state_text(result), (int)(end_time - start_time));
+        } else {
+                printf("%s\n", status_line);
         }
-        else
-                printf ("%s\n", status_line);
 
         /* close the connection */
-        close (sd);
+        close(socket);
 
         /* reset the alarm */
-        alarm (0);
+        alarm(0);
 
-        return result;
+        exit(result);
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 0;
-        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 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)
-                return ERROR;
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0) {
+                        strcpy(argv[i], "-t");
+                } else if (strcmp("-wt", argv[i]) == 0) {
+                        strcpy(argv[i], "-w");
+                } else if (strcmp("-ct", argv[i]) == 0) {
+                        strcpy(argv[i], "-c");
+                }
         }
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hvVI:H:e:u:p:w:c:t:", longopts,
-                                                                         &option);
+        while (true) {
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "+hvVI:H:e:u:p:w:c:t:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case 'I':                                                                       /* hostname */
-                case 'H':                                                                       /* hostname */
-                        if (server_address)
+                switch (option_char) {
+                case 'I': /* hostname */
+                case 'H': /* hostname */
+                        if (result.config.server_address) {
                                 break;
-                        else if (is_host (optarg))
-                                server_address = optarg;
-                        else
-                                usage2 (_("Invalid hostname/address"), optarg);
+                        } 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;
+                case 'e': /* string to expect in response header */
+                        result.config.server_expect = optarg;
                         break;
-                case 'u':                                                                       /* server URL */
-                        server_url = optarg;
+                case 'u': /* server URL */
+                        result.config.server_url = optarg;
                         break;
-                case 'p':                                                                       /* port */
-                        if (is_intpos (optarg)) {
-                                server_port = atoi (optarg);
-                        }
-                        else {
-                                usage4 (_("Port must be a positive integer"));
+                case 'p': /* port */
+                        if (is_intpos(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;
-                        }
-                        else {
-                                usage4 (_("Warning time must be a positive integer"));
+                case 'w': /* warning time threshold */
+                        if (is_intnonneg(optarg)) {
+                                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;
-                        }
-                        else {
-                                usage4 (_("Critical time must be a positive integer"));
+                case 'c': /* critical time threshold */
+                        if (is_intnonneg(optarg)) {
+                                result.config.critical_time = atoi(optarg);
+                                result.config.check_critical_time = true;
+                        } else {
+                                usage4(_("Critical time must be a positive integer"));
                         }
                         break;
-                case 'v':                                                                       /* verbose */
+                case 'v': /* verbose */
                         verbose = true;
                         break;
-                case 't':                                                                       /* timeout */
-                        if (is_intnonneg (optarg)) {
-                                socket_timeout = atoi (optarg);
-                        }
-                        else {
-                                usage4 (_("Timeout interval must be a positive integer"));
+                case 't': /* timeout */
+                        if (is_intnonneg(optarg)) {
+                                socket_timeout = atoi(optarg);
+                        } else {
+                                usage4(_("Timeout interval must be a positive integer"));
                         }
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* usage */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* usage */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (server_address==NULL && argc>c) {
-                if (is_host (argv[c])) {
-                        server_address = argv[c++];
-                }
-                else {
-                        usage2 (_("Invalid hostname/address"), argv[c]);
+        int option_char = optind;
+        if (result.config.server_address == NULL && argc > option_char) {
+                if (is_host(argv[option_char])) {
+                        result.config.server_address = argv[option_char++];
+                } else {
+                        usage2(_("Invalid hostname/address"), argv[option_char]);
                 }
         }
 
-        if (server_address==NULL)
-                usage4 (_("You must provide a server to check"));
-
-        if (host_name==NULL)
-                host_name = strdup (server_address);
-
-        if (server_expect == NULL)
-                server_expect = strdup(EXPECT);
-
-        return validate_arguments ();
-}
+        if (result.config.server_address == NULL) {
+                usage4(_("You must provide a server to check"));
+        }
 
+        if (result.config.host_name == NULL) {
+                result.config.host_name = strdup(result.config.server_address);
+        }
 
+        if (result.config.server_expect == NULL) {
+                result.config.server_expect = strdup(EXPECT);
+        }
 
-int
-validate_arguments (void)
-{
-        return OK;
+        return result;
 }
 
-
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", PORT);
+        xasprintf(&myport, "%d", PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Pedro Leite <leite@cic.ua.pt>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin tests the REAL service on the specified host."));
+        printf("%s\n", _("This plugin tests the REAL service on the specified host."));
 
-  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 (UT_HOST_PORT, 'p', myport);
+        printf(UT_HOST_PORT, 'p', myport);
 
-        printf (" %s\n", "-u, --url=STRING");
-  printf ("    %s\n", _("Connect to this url"));
-  printf (" %s\n", "-e, --expect=STRING");
-  printf (_("String to expect in first line of server response (default: %s)\n"),
-               EXPECT);
+        printf(" %s\n", "-u, --url=STRING");
+        printf("    %s\n", _("Connect to this url"));
+        printf(" %s\n", "-e, --expect=STRING");
+        printf(_("String to expect in first line of server response (default: %s)\n"), EXPECT);
 
-        printf (UT_WARN_CRIT);
+        printf(UT_WARN_CRIT);
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-  printf ("\n");
-        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", _("values."));
+        printf("\n");
+        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", _("values."));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H host [-e expect] [-p port] [-w warn] [-c crit] [-t timeout] [-v]\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H host [-e expect] [-p port] [-w warn] [-c crit] [-t timeout] [-v]\n", progname);
 }
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 986c3e18..44b735f9 100644
--- a/plugins/check_smtp.c
+++ b/plugins/check_smtp.c
@@ -1,437 +1,429 @@
 /*****************************************************************************
-* 
-* Monitoring check_smtp plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2023 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_smtp plugin
-* 
-* This plugin will attempt to open an SMTP connection with the host.
-* 
-* 
-* 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_smtp plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_smtp plugin
+ *
+ * This plugin will attempt to open an SMTP connection with the host.
+ *
+ *
+ * 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_smtp";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
 #include "base64.h"
+#include "regex.h"
 
 #include <ctype.h>
+#include "check_smtp.d/config.h"
+#include "../lib/states.h"
+
+#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 "
+#define SMTP_LHLO       "LHLO "
+#define SMTP_QUIT       "QUIT\r\n"
+#define SMTP_STARTTLS   "STARTTLS\r\n"
+#define SMTP_AUTH_LOGIN "AUTH LOGIN\r\n"
 
+#define EHLO_SUPPORTS_STARTTLS 1
+
+typedef struct {
+        int errorcode;
+        check_smtp_config config;
+} 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) {
 #ifdef HAVE_SSL
-bool check_cert = false;
-int days_till_exp_warn, days_till_exp_crit;
-#  define my_recv(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_read(buf, len) : read(sd, buf, len))
-#  define my_send(buf, len) (((use_starttls || use_ssl) && ssl_established) ? np_net_ssl_write(buf, len) : send(sd, buf, len, 0))
+        if ((config.use_starttls || config.use_ssl) && ssl_established) {
+                return np_net_ssl_read(buf, num);
+        }
+        return (int)read(socket_descriptor, buf, (size_t)num);
 #else /* ifndef HAVE_SSL */
-#  define my_recv(buf, len) read(sd, buf, len)
-#  define my_send(buf, len) send(sd, buf, len, 0)
+        return read(socket_descriptor, buf, len)
 #endif
+}
 
-enum {
-        SMTP_PORT       = 25,
-        SMTPS_PORT      = 465
-};
-#define PROXY_PREFIX "PROXY TCP4 0.0.0.0 0.0.0.0 25 25\r\n"
-#define SMTP_EXPECT "220"
-#define SMTP_HELO "HELO "
-#define SMTP_EHLO "EHLO "
-#define SMTP_LHLO "LHLO "
-#define SMTP_QUIT "QUIT\r\n"
-#define SMTP_STARTTLS "STARTTLS\r\n"
-#define SMTP_AUTH_LOGIN "AUTH LOGIN\r\n"
-
-#define EHLO_SUPPORTS_STARTTLS 1
+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) {
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
-void smtp_quit(void);
-int recvline(char *, size_t);
-int recvlines(char *, size_t);
-int my_close(void);
+                return np_net_ssl_write(buf, num);
+        }
+        return (int)send(socket_descriptor, buf, (size_t)num, 0);
+#else /* ifndef HAVE_SSL */
+        return send(socket_descriptor, buf, len, 0);
+#endif
+}
 
-#include "regex.h"
-char regex_expect[MAX_INPUT_BUFFER] = "";
-regex_t preg;
-regmatch_t pmatch[10];
-char timestamp[20] = "";
-char errbuf[MAX_INPUT_BUFFER];
-int cflags = REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-int eflags = 0;
-int errcode, excode;
-
-int server_port = SMTP_PORT;
-int server_port_option = 0;
-char *server_address = NULL;
-char *server_expect = NULL;
-char *mail_command = NULL;
-char *from_arg = NULL;
-int send_mail_from=0;
-int ncommands=0;
-int command_size=0;
-int nresponses=0;
-int response_size=0;
-char **commands = NULL;
-char **responses = NULL;
-char *authtype = NULL;
-char *authuser = NULL;
-char *authpass = NULL;
-double warning_time = 0;
-bool check_warning_time = false;
-double critical_time = 0;
-bool check_critical_time = false;
-int verbose = 0;
-bool use_ssl = false;
-bool use_starttls = false;
-bool use_sni = false;
-bool use_proxy_prefix = false;
-bool use_ehlo = false;
-bool use_lhlo = false;
-bool ssl_established = false;
-char *localhostname = NULL;
-int sd;
-char buffer[MAX_INPUT_BUFFER];
-enum {
-  TCP_PROTOCOL = 1,
-  UDP_PROTOCOL = 2,
-};
-bool ignore_send_quit_failure = false;
-
-
-int
-main (int argc, char **argv)
-{
-        bool supports_tls = false;
-        int n = 0;
-        double elapsed_time;
-        long microsec;
-        int result = STATE_UNKNOWN;
-        char *cmd_str = NULL;
-        char *helocmd = NULL;
-        char *error_msg = "";
-        char *server_response = NULL;
-        struct timeval tv;
+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 int my_close(int /*socket_descriptor*/);
 
-        /* Catch pipe errors in read/write - sometimes occurs when writing QUIT */
-        (void) signal (SIGPIPE, SIG_IGN);
+static int verbose = 0;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        check_smtp_config_wrapper tmp_config = process_arguments(argc, argv);
+
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        const check_smtp_config config = tmp_config.config;
 
         /* If localhostname not set on command line, use gethostname to set */
-        if(! localhostname){
-                localhostname = malloc (HOST_MAX_BYTES);
-                if(!localhostname){
+        char *localhostname = config.localhostname;
+        if (!localhostname) {
+                localhostname = malloc(HOST_MAX_BYTES);
+                if (!localhostname) {
                         printf(_("malloc() failed!\n"));
-                        return STATE_CRITICAL;
+                        exit(STATE_CRITICAL);
                 }
-                if(gethostname(localhostname, HOST_MAX_BYTES)){
+                if (gethostname(localhostname, HOST_MAX_BYTES)) {
                         printf(_("gethostname() failed!\n"));
-                        return STATE_CRITICAL;
+                        exit(STATE_CRITICAL);
                 }
         }
-        if(use_lhlo)
-                xasprintf (&helocmd, "%s%s%s", SMTP_LHLO, localhostname, "\r\n");
-        else if(use_ehlo)
-                xasprintf (&helocmd, "%s%s%s", SMTP_EHLO, localhostname, "\r\n");
-        else
-                xasprintf (&helocmd, "%s%s%s", SMTP_HELO, localhostname, "\r\n");
-
-        if (verbose)
+
+        char *helocmd = NULL;
+        if (config.use_lhlo) {
+                xasprintf(&helocmd, "%s%s%s", SMTP_LHLO, localhostname, "\r\n");
+        } else if (config.use_ehlo) {
+                xasprintf(&helocmd, "%s%s%s", SMTP_EHLO, localhostname, "\r\n");
+        } else {
+                xasprintf(&helocmd, "%s%s%s", SMTP_HELO, localhostname, "\r\n");
+        }
+
+        if (verbose) {
                 printf("HELOCMD: %s", helocmd);
+        }
 
+        char *mail_command = strdup("MAIL ");
+        char *cmd_str = NULL;
         /* initialize the MAIL command with optional FROM command  */
-        xasprintf (&cmd_str, "%sFROM:<%s>%s", mail_command, from_arg, "\r\n");
+        xasprintf(&cmd_str, "%sFROM:<%s>%s", mail_command, config.from_arg, "\r\n");
 
-        if (verbose && send_mail_from)
-                printf ("FROM CMD: %s", cmd_str);
+        if (verbose && config.send_mail_from) {
+                printf("FROM CMD: %s", cmd_str);
+        }
+
+        /* Catch pipe errors in read/write - sometimes occurs when writing QUIT */
+        (void)signal(SIGPIPE, SIG_IGN);
 
         /* initialize alarm signal handling */
-        (void) signal (SIGALRM, socket_timeout_alarm_handler);
+        (void)signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        (void) alarm (socket_timeout);
+        (void)alarm(socket_timeout);
 
+        struct timeval start_time;
         /* start timer */
-        gettimeofday (&tv, NULL);
+        gettimeofday(&start_time, NULL);
 
+        int socket_descriptor = 0;
         /* try to connect to the host at the given port number */
-        result = my_tcp_connect (server_address, server_port, &sd);
+        mp_state_enum result = my_tcp_connect(config.server_address, config.server_port, &socket_descriptor);
 
+        char *error_msg = "";
+        char buffer[MAX_INPUT_BUFFER];
+        bool ssl_established = false;
         if (result == STATE_OK) { /* we connected */
                 /* If requested, send PROXY header */
-                if (use_proxy_prefix) {
-                        if (verbose)
-                                printf ("Sending header %s\n", PROXY_PREFIX);
-                        my_send(PROXY_PREFIX, strlen(PROXY_PREFIX));
+                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 (use_ssl) {
-                        result = np_net_ssl_init_with_hostname(sd, (use_sni ? server_address : NULL));
+                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(sd);
+                                printf(_("CRITICAL - Cannot create SSL context.\n"));
+                                close(socket_descriptor);
                                 np_net_ssl_cleanup();
-                                return STATE_CRITICAL;
-                        } else {
-                                ssl_established = 1;
+                                exit(STATE_CRITICAL);
                         }
+                        ssl_established = true;
                 }
 #endif
 
                 /* watch for the SMTP connection string and */
                 /* return a WARNING status if we couldn't read any data */
-                if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) {
-                        printf (_("recv() failed\n"));
-                        return STATE_WARNING;
+                if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) <= 0) {
+                        printf(_("recv() failed\n"));
+                        exit(STATE_WARNING);
                 }
 
+                char *server_response = NULL;
                 /* save connect return (220 hostname ..) for later use */
                 xasprintf(&server_response, "%s", buffer);
 
                 /* send the HELO/EHLO command */
-                my_send(helocmd, strlen(helocmd));
+                my_send(config, helocmd, (int)strlen(helocmd), socket_descriptor, ssl_established);
 
                 /* allow for response to helo command to reach us */
-                if (recvlines(buffer, MAX_INPUT_BUFFER) <= 0) {
-                        printf (_("recv() failed\n"));
-                        return STATE_WARNING;
-                } else if(use_ehlo || use_lhlo){
-                        if(strstr(buffer, "250 STARTTLS") != NULL ||
-                           strstr(buffer, "250-STARTTLS") != NULL){
-                                supports_tls=true;
+                if (recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established) <= 0) {
+                        printf(_("recv() failed\n"));
+                        exit(STATE_WARNING);
+                }
+
+                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(use_starttls && ! supports_tls){
+                if (config.use_starttls && !supports_tls) {
                         printf(_("WARNING - TLS not supported by server\n"));
-                        smtp_quit();
-                        return STATE_WARNING;
+                        smtp_quit(config, buffer, socket_descriptor, ssl_established);
+                        exit(STATE_WARNING);
                 }
 
 #ifdef HAVE_SSL
-                if(use_starttls) {
-                  /* send the STARTTLS command */
-                  send(sd, SMTP_STARTTLS, strlen(SMTP_STARTTLS), 0);
-
-                  recvlines(buffer, MAX_INPUT_BUFFER); /* wait for it */
-                  if (!strstr (buffer, SMTP_EXPECT)) {
-                    printf (_("Server does not support STARTTLS\n"));
-                    smtp_quit();
-                    return STATE_UNKNOWN;
-                  }
-                  result = np_net_ssl_init_with_hostname(sd, (use_sni ? server_address : NULL));
-                  if(result != STATE_OK) {
-                    printf (_("CRITICAL - Cannot create SSL context.\n"));
-                    close(sd);
-                    np_net_ssl_cleanup();
-                    return STATE_CRITICAL;
-                  } else {
-                        ssl_established = 1;
-                  }
-
-                /*
-                 * 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(helocmd, strlen(helocmd)) <= 0) {
-                        printf("%s\n", _("SMTP UNKNOWN - Cannot send EHLO command via TLS."));
-                        my_close();
-                        return STATE_UNKNOWN;
-                }
-                if (verbose)
-                        printf(_("sent %s"), helocmd);
-                if ((n = recvlines(buffer, MAX_INPUT_BUFFER)) <= 0) {
-                        printf("%s\n", _("SMTP UNKNOWN - Cannot read EHLO response via TLS."));
-                        my_close();
-                        return STATE_UNKNOWN;
-                }
-                if (verbose) {
-                        printf("%s", buffer);
-                }
+                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);
+                        }
+
+                        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;
+
+                        /*
+                         * 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);
+                        }
 
-#  ifdef USE_OPENSSL
-                  if ( check_cert ) {
-                    result = np_net_ssl_check_cert(days_till_exp_warn, days_till_exp_crit);
-                    smtp_quit();
-                    my_close();
-                    return result;
-                  }
-#  endif /* USE_OPENSSL */
+                        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);
+                        }
+
+                        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);
+                        }
+#       endif /* USE_OPENSSL */
                 }
 #endif
 
-                if (verbose)
-                        printf ("%s", buffer);
+                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);
+                strip(server_response);
 
                 /* make sure we find the droids we are looking for */
-                if (!strstr (server_response, server_expect)) {
-                        if (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"),
-                                                                                server_port, server_response);
-                        return STATE_WARNING;
+                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);
+                        }
+                        exit(STATE_WARNING);
                 }
 
-                if (send_mail_from) {
-                  my_send(cmd_str, strlen(cmd_str));
-                  if (recvlines(buffer, MAX_INPUT_BUFFER) >= 1 && verbose)
-                    printf("%s", buffer);
+                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);
+                        }
                 }
 
-                n = 0;
-                while (n < ncommands) {
-                        xasprintf (&cmd_str, "%s%s", commands[n], "\r\n");
-                        my_send(cmd_str, strlen(cmd_str));
-                        if (recvlines(buffer, MAX_INPUT_BUFFER) >= 1 && verbose)
+                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 (n < nresponses) {
-                                cflags |= REG_EXTENDED | REG_NOSUB | REG_NEWLINE;
-                                errcode = regcomp (&preg, responses[n], cflags);
+                        }
+                        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"));
-                                        return ERROR;
+                                        regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                        printf(_("Could Not Compile Regular Expression"));
+                                        exit(STATE_UNKNOWN);
                                 }
-                                excode = regexec (&preg, buffer, 10, pmatch, eflags);
+
+                                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) {
+                                } else if (excode == REG_NOMATCH) {
                                         result = STATE_WARNING;
-                                        printf (_("SMTP %s - Invalid response '%s' to command '%s'\n"), state_text (result), buffer, commands[n]);
-                                }
-                                else {
-                                        regerror (excode, &preg, errbuf, MAX_INPUT_BUFFER);
-                                        printf (_("Execute Error: %s\n"), errbuf);
+                                        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;
                                 }
                         }
-                        n++;
+                        counter++;
                 }
 
-                if (authtype != NULL) {
-                        if (strcmp (authtype, "LOGIN") == 0) {
+                if (config.authtype != NULL) {
+                        if (strcmp(config.authtype, "LOGIN") == 0) {
                                 char *abuf;
                                 int ret;
                                 do {
-                                        if (authuser == NULL) {
+                                        if (config.authuser == NULL) {
                                                 result = STATE_CRITICAL;
                                                 xasprintf(&error_msg, _("no authuser specified, "));
                                                 break;
                                         }
-                                        if (authpass == NULL) {
+                                        if (config.authpass == NULL) {
                                                 result = STATE_CRITICAL;
                                                 xasprintf(&error_msg, _("no authpass specified, "));
                                                 break;
                                         }
 
                                         /* send AUTH LOGIN */
-                                        my_send(SMTP_AUTH_LOGIN, strlen(SMTP_AUTH_LOGIN));
-                                        if (verbose)
-                                                printf (_("sent %s\n"), "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(buffer, MAX_INPUT_BUFFER)) <= 0) {
+                                        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 (verbose) {
+                                                printf(_("received %s\n"), buffer);
+                                        }
 
-                                        if (strncmp (buffer, "334", 3) != 0) {
+                                        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 (authuser, strlen(authuser), &abuf);
+                                        base64_encode_alloc(config.authuser, strlen(config.authuser), &abuf);
                                         xasprintf(&abuf, "%s\r\n", abuf);
-                                        my_send(abuf, strlen(abuf));
-                                        if (verbose)
-                                                printf (_("sent %s\n"), abuf);
+                                        my_send(config, abuf, (int)strlen(abuf), socket_descriptor, ssl_established);
+                                        if (verbose) {
+                                                printf(_("sent %s\n"), abuf);
+                                        }
 
-                                        if ((ret = recvlines(buffer, MAX_INPUT_BUFFER)) <= 0) {
+                                        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);
+                                                printf(_("received %s\n"), buffer);
                                         }
-                                        if (strncmp (buffer, "334", 3) != 0) {
+                                        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 (authpass, strlen(authpass), &abuf);
+                                        base64_encode_alloc(config.authpass, strlen(config.authpass), &abuf);
                                         xasprintf(&abuf, "%s\r\n", abuf);
-                                        my_send(abuf, strlen(abuf));
+                                        my_send(config, abuf, (int)strlen(abuf), socket_descriptor, ssl_established);
                                         if (verbose) {
-                                                printf (_("sent %s\n"), abuf);
+                                                printf(_("sent %s\n"), abuf);
                                         }
-                                        if ((ret = recvlines(buffer, MAX_INPUT_BUFFER)) <= 0) {
+                                        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);
+                                                printf(_("received %s\n"), buffer);
                                         }
-                                        if (strncmp (buffer, "235", 3) != 0) {
+                                        if (strncmp(buffer, "235", 3) != 0) {
                                                 result = STATE_CRITICAL;
                                                 xasprintf(&error_msg, _("invalid response received after authpass, "));
                                                 break;
                                         }
                                         break;
-                                } while (0);
+                                } while (false);
                         } else {
                                 result = STATE_CRITICAL;
                                 xasprintf(&error_msg, _("only authtype LOGIN is supported, "));
@@ -439,243 +431,243 @@ main (int argc, char **argv)
                 }
 
                 /* tell the server we're done */
-                smtp_quit();
+                smtp_quit(config, buffer, socket_descriptor, ssl_established);
 
                 /* finally close the connection */
-                close (sd);
+                close(socket_descriptor);
         }
 
         /* reset the alarm */
-        alarm (0);
+        alarm(0);
 
-        microsec = deltime (tv);
-        elapsed_time = (double)microsec / 1.0e6;
+        long microsec = deltime(start_time);
+        double elapsed_time = (double)microsec / 1.0e6;
 
         if (result == STATE_OK) {
-                if (check_critical_time && elapsed_time > critical_time)
+                if (config.check_critical_time && elapsed_time > config.critical_time) {
                         result = STATE_CRITICAL;
-                else if (check_warning_time && elapsed_time > warning_time)
+                } else if (config.check_warning_time && elapsed_time > config.warning_time) {
                         result = STATE_WARNING;
+                }
         }
 
-        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",
-                                (int)check_warning_time, warning_time,
-                                (int)check_critical_time, critical_time,
-                                true, 0, false, 0));
+        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));
 
-        return result;
+        exit(result);
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-        char* temp;
-
-        bool implicit_tls = false;
-
+check_smtp_config_wrapper process_arguments(int argc, char **argv) {
         enum {
-          SNI_OPTION
+                SNI_OPTION = CHAR_MAX + 1
         };
 
         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'},
+                                                                           {0, 0, 0, 0}};
+
+        check_smtp_config_wrapper result = {
+                .config = check_smtp_config_init(),
+                .errorcode = OK,
         };
 
-        if (argc < 2)
-                return ERROR;
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int index = 1; index < argc; index++) {
+                if (strcmp("-to", argv[index]) == 0) {
+                        strcpy(argv[index], "-t");
+                } else if (strcmp("-wt", argv[index]) == 0) {
+                        strcpy(argv[index], "-w");
+                } else if (strcmp("-ct", argv[index]) == 0) {
+                        strcpy(argv[index], "-c");
+                }
         }
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hVv46Lrt:p:f:e:c:w:H:C:R:sSD:F:A:U:P:q",
-                                 longopts, &option);
+        int command_size = 0;
+        int 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);
 
-                if (c == -1 || c == EOF)
+                if (opt_index == -1 || opt_index == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case 'H':                                                                       /* hostname */
-                        if (is_host (optarg)) {
-                                server_address = optarg;
-                        }
-                        else {
-                                usage2 (_("Invalid hostname/address"), optarg);
+                switch (opt_index) {
+                case 'H': /* hostname */
+                        if (is_host(optarg)) {
+                                result.config.server_address = optarg;
+                        } else {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
                         break;
-                case 'p':                                                                       /* port */
-                        if (is_intpos (optarg))
-                                server_port_option = atoi (optarg);
-                        else
-                                usage4 (_("Port must be a positive integer"));
+                case 'p': /* port */
+                        if (is_intpos(optarg)) {
+                                server_port_option = atoi(optarg);
+                        } else {
+                                usage4(_("Port must be a positive integer"));
+                        }
                         break;
                 case 'F':
-                /* localhostname */
-                        localhostname = strdup(optarg);
+                        /* localhostname */
+                        result.config.localhostname = strdup(optarg);
                         break;
-                case 'f':                                                                       /* from argument */
-                        from_arg = optarg + strspn(optarg, "<");
-                        from_arg = strndup(from_arg, strcspn(from_arg, ">"));
-                        send_mail_from = 1;
+                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.send_mail_from = true;
                         break;
                 case 'A':
-                        authtype = optarg;
-                        use_ehlo = true;
+                        result.config.authtype = optarg;
+                        result.config.use_ehlo = true;
                         break;
                 case 'U':
-                        authuser = optarg;
+                        result.config.authuser = optarg;
                         break;
                 case 'P':
-                        authpass = optarg;
+                        result.config.authpass = optarg;
                         break;
-                case 'e':                                                                       /* server expect string on 220  */
-                        server_expect = optarg;
+                case 'e': /* server expect string on 220  */
+                        result.config.server_expect = optarg;
                         break;
-                case 'C':                                                                       /* commands  */
-                        if (ncommands >= command_size) {
-                                command_size+=8;
-                                commands = realloc (commands, sizeof(char *) * command_size);
-                                if (commands == NULL)
-                                        die (STATE_UNKNOWN,
-                                             _("Could not realloc() units [%d]\n"), ncommands);
+                case 'C': /* commands  */
+                        if (result.config.ncommands >= command_size) {
+                                command_size += 8;
+                                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);
+                                }
                         }
-                        commands[ncommands] = (char *) malloc (sizeof(char) * 255);
-                        strncpy (commands[ncommands], optarg, 255);
-                        ncommands++;
+                        result.config.commands[result.config.ncommands] = (char *)malloc(sizeof(char) * 255);
+                        strncpy(result.config.commands[result.config.ncommands], optarg, 255);
+                        result.config.ncommands++;
                         break;
-                case 'R':                                                                       /* server responses */
-                        if (nresponses >= response_size) {
+                case 'R': /* server responses */
+                        if (result.config.nresponses >= response_size) {
                                 response_size += 8;
-                                responses = realloc (responses, sizeof(char *) * response_size);
-                                if (responses == NULL)
-                                        die (STATE_UNKNOWN,
-                                             _("Could not realloc() units [%d]\n"), nresponses);
+                                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);
+                                }
                         }
-                        responses[nresponses] = (char *) malloc (sizeof(char) * 255);
-                        strncpy (responses[nresponses], optarg, 255);
-                        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 {
-                                critical_time = strtod (optarg, NULL);
-                                check_critical_time = true;
+                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;
                         }
                         break;
-                case 'w':                                                                       /* warning time threshold */
-                        if (!is_nonnegative (optarg))
-                                usage4 (_("Warning time must be a positive"));
-                        else {
-                                warning_time = strtod (optarg, NULL);
-                                check_warning_time = true;
+                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;
                         }
                         break;
-                case 'v':                                                                       /* verbose */
+                case 'v': /* verbose */
                         verbose++;
                         break;
                 case 'q':
-                        ignore_send_quit_failure = true;             /* ignore problem sending QUIT */
+                        result.config.ignore_send_quit_failure = true; /* ignore problem sending QUIT */
                         break;
-                case 't':                                                                       /* timeout */
-                        if (is_intnonneg (optarg)) {
-                                socket_timeout = atoi (optarg);
-                        }
-                        else {
-                                usage4 (_("Timeout interval must be a positive integer"));
+                case 't': /* timeout */
+                        if (is_intnonneg(optarg)) {
+                                socket_timeout = atoi(optarg);
+                        } else {
+                                usage4(_("Timeout interval must be a positive integer"));
                         }
                         break;
-                case 'D':
-                /* Check SSL cert validity */
+                case 'D': {
+                        /* Check SSL cert validity */
 #ifdef USE_OPENSSL
-                        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;
-                        ignore_send_quit_failure = true;
+                        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;
+                        result.config.ignore_send_quit_failure = true;
 #else
-                        usage (_("SSL support not available - install OpenSSL and recompile"));
+                        usage(_("SSL support not available - install OpenSSL and recompile"));
 #endif
                         implicit_tls = true;
                         // fallthrough
                 case 's':
-                /* ssl */
-                        use_ssl = true;
-                        server_port = SMTPS_PORT;
+                        /* ssl */
+                        result.config.use_ssl = true;
+                        result.config.server_port = SMTPS_PORT;
                         break;
                 case 'S':
-                /* starttls */
-                        use_starttls = true;
-                        use_ehlo = true;
+                        /* starttls */
+                        result.config.use_starttls = true;
+                        result.config.use_ehlo = true;
                         break;
+                }
                 case SNI_OPTION:
 #ifdef HAVE_SSL
-                        use_sni = true;
+                        result.config.use_sni = true;
 #else
-                        usage (_("SSL support not available - install OpenSSL and recompile"));
+                        usage(_("SSL support not available - install OpenSSL and recompile"));
 #endif
                         break;
                 case 'r':
-                        use_proxy_prefix = true;
+                        result.config.use_proxy_prefix = true;
                         break;
                 case 'L':
-                        use_lhlo = true;
+                        result.config.use_lhlo = true;
                         break;
                 case '4':
                         address_family = AF_INET;
@@ -684,102 +676,79 @@ process_arguments (int argc, char **argv)
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* help */
-                        usage5 ();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case '?': /* help */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (server_address == NULL) {
+        int c = optind;
+        if (result.config.server_address == NULL) {
                 if (argv[c]) {
-                        if (is_host (argv[c]))
-                                server_address = argv[c];
-                        else
-                                usage2 (_("Invalid hostname/address"), argv[c]);
-                }
-                else {
-                        xasprintf (&server_address, "127.0.0.1");
+                        if (is_host(argv[c])) {
+                                result.config.server_address = argv[c];
+                        } else {
+                                usage2(_("Invalid hostname/address"), argv[c]);
+                        }
+                } else {
+                        result.config.server_address = strdup("localhost");
                 }
         }
 
-        if (server_expect == NULL)
-                server_expect = strdup (SMTP_EXPECT);
-
-        if (mail_command == NULL)
-                mail_command = strdup("MAIL ");
-
-        if (from_arg==NULL)
-                from_arg = strdup(" ");
-
-        if (use_starttls && use_ssl) {
+        if (result.config.use_starttls && result.config.use_ssl) {
                 if (implicit_tls) {
-                        use_ssl = false;
-                        server_port = SMTP_PORT;
+                        result.config.use_ssl = false;
                 } else {
-                        usage4 (_("Set either -s/--ssl/--tls or -S/--starttls"));
+                        usage4(_("Set either -s/--ssl/--tls or -S/--starttls"));
                 }
         }
 
         if (server_port_option != 0) {
-                server_port = server_port_option;
+                result.config.server_port = server_port_option;
         }
 
-        return validate_arguments ();
-}
-
-
-
-int
-validate_arguments (void)
-{
-        return OK;
+        return result;
 }
 
-
-void
-smtp_quit(void)
-{
-        int bytes;
-        int n;
-
-        n = my_send(SMTP_QUIT, strlen(SMTP_QUIT));
-        if(n < 0) {
-                if(ignore_send_quit_failure) {
-                        if(verbose) {
+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) {
                                 printf(_("Connection closed by server before sending QUIT command\n"));
                         }
-                        return;
+                        return buffer;
                 }
-                die (STATE_UNKNOWN,
-                        _("Connection closed by server before sending QUIT command\n"));
+                die(STATE_UNKNOWN, _("Connection closed by server before sending QUIT command\n"));
         }
 
-        if (verbose)
+        if (verbose) {
                 printf(_("sent %s\n"), "QUIT");
+        }
 
         /* read the response but don't care about problems */
-        bytes = recvlines(buffer, MAX_INPUT_BUFFER);
+        int bytes = recvlines(config, buffer, MAX_INPUT_BUFFER, socket_descriptor, ssl_established);
         if (verbose) {
-                if (bytes < 0)
+                if (bytes < 0) {
                         printf(_("recv() failed after QUIT."));
-                else if (bytes == 0)
+                } else if (bytes == 0) {
                         printf(_("Connection reset by peer."));
-                else {
+                } else {
                         buffer[bytes] = '\0';
                         printf(_("received %s\n"), buffer);
                 }
         }
-}
 
+        return buffer;
+}
 
 /*
  * Receive one line, copy it into buf and nul-terminate it.  Returns the
@@ -790,24 +759,22 @@ smtp_quit(void)
  * 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)
-{
+int recvline(char *buf, size_t bufsize, check_smtp_config config, int socket_descriptor, bool ssl_established) {
         int result;
-        unsigned i;
+        int counter;
 
-        for (i = result = 0; i < bufsize - 1; i++) {
-                if ((result = my_recv(&buf[i], 1)) != 1)
+        for (counter = result = 0; counter < bufsize - 1; counter++) {
+                if ((result = my_recv(config, &buf[counter], 1, socket_descriptor, ssl_established)) != 1) {
                         break;
-                if (buf[i] == '\n') {
-                        buf[++i] = '\0';
-                        return i;
+                }
+                if (buf[counter] == '\n') {
+                        buf[++counter] = '\0';
+                        return counter;
                 }
         }
-        return (result == 1 || i == 0) ? -2 : result;   /* -2 if out of space */
+        return (result == 1 || counter == 0) ? -2 : result; /* -2 if out of space */
 }
 
-
 /*
  * Receive one or more lines, copy them into buf and nul-terminate it.  Returns
  * the number of bytes written to buf (excluding the '\0') or 0 on EOF or <0 on
@@ -822,117 +789,103 @@ recvline(char *buf, size_t bufsize)
  *
  * TODO: Move this to netutils.c.  Also, remove \r and possibly the final \n.
  */
-int
-recvlines(char *buf, size_t bufsize)
-{
-        int result, i;
-
-        for (i = 0; /* forever */; i += result)
-                if (!((result = recvline(buf + i, bufsize - i)) > 3 &&
-                    isdigit((int)buf[i]) &&
-                    isdigit((int)buf[i + 1]) &&
-                    isdigit((int)buf[i + 2]) &&
-                    buf[i + 3] == '-'))
+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] == '-')) {
                         break;
+                }
+        }
 
-        return (result <= 0) ? result : result + i;
+        return (result <= 0) ? result : result + counter;
 }
 
-
-int
-my_close (void)
-{
+int my_close(int socket_descriptor) {
         int result;
-        result = close(sd);
+        result = close(socket_descriptor);
 #ifdef HAVE_SSL
         np_net_ssl_cleanup();
 #endif
         return result;
 }
 
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", SMTP_PORT);
+        xasprintf(&myport, "%d", SMTP_PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999-2001 Ethan Galstad <nagios@nagios.org>\n");
+        printf(COPYRIGHT, copyright, email);
 
         printf("%s\n", _("This plugin will attempt to open an SMTP connection with the host."));
 
-  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 (UT_HOST_PORT, 'p', myport);
+        printf(UT_HOST_PORT, 'p', myport);
 
-        printf (UT_IPv46);
+        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 (" %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", _("FQDN used for HELO"));
-  printf (" %s\n", "-r, --proxy");
-  printf ("    %s\n", _("Use PROXY protocol prefix for the connection."));
+        printf(" %s\n", "-e, --expect=STRING");
+        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", _("FQDN used for HELO"));
+        printf(" %s\n", "-r, --proxy");
+        printf("    %s\n", _("Use PROXY protocol prefix for the connection."));
 #ifdef HAVE_SSL
-  printf (" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
-  printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
-  printf (" %s\n", "-s, --ssl, --tls");
-  printf ("    %s\n", _("Use SSL/TLS for the connection."));
-  printf (_("    Sets default port to %d.\n"), SMTPS_PORT);
-  printf (" %s\n", "-S, --starttls");
-  printf ("    %s\n", _("Use STARTTLS for the connection."));
-  printf (" %s\n", "--sni");
-  printf ("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
+        printf(" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
+        printf("    %s\n", _("Minimum number of days a certificate has to be valid."));
+        printf(" %s\n", "-s, --ssl, --tls");
+        printf("    %s\n", _("Use SSL/TLS for the connection."));
+        printf(_("    Sets default port to %d.\n"), SMTPS_PORT);
+        printf(" %s\n", "-S, --starttls");
+        printf("    %s\n", _("Use STARTTLS for the connection."));
+        printf(" %s\n", "--sni");
+        printf("    %s\n", _("Enable SSL/TLS hostname extension support (SNI)"));
 #endif
 
-        printf (" %s\n", "-A, --authtype=STRING");
-  printf ("    %s\n", _("SMTP AUTH type to check (default none, only LOGIN supported)"));
-  printf (" %s\n", "-U, --authuser=STRING");
-  printf ("    %s\n", _("SMTP AUTH username"));
-  printf (" %s\n", "-P, --authpass=STRING");
-  printf ("    %s\n", _("SMTP AUTH password"));
-  printf (" %s\n", "-L, --lmtp");
-  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 (UT_WARN_CRIT);
+        printf(" %s\n", "-A, --authtype=STRING");
+        printf("    %s\n", _("SMTP AUTH type to check (default none, only LOGIN supported)"));
+        printf(" %s\n", "-U, --authuser=STRING");
+        printf("    %s\n", _("SMTP AUTH username"));
+        printf(" %s\n", "-P, --authpass=STRING");
+        printf("    %s\n", _("SMTP AUTH password"));
+        printf(" %s\n", "-L, --lmtp");
+        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 (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_WARN_CRIT);
 
-        printf (UT_VERBOSE);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+
+        printf(UT_VERBOSE);
 
         printf("\n");
-        printf ("%s\n", _("Successful connects return STATE_OK, refusals and timeouts return"));
-  printf ("%s\n", _("STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"));
-  printf ("%s\n", _("connects, but incorrect response messages from the host result in"));
-  printf ("%s\n", _("STATE_WARNING return values."));
+        printf("%s\n", _("Successful connects return STATE_OK, refusals and timeouts return"));
+        printf("%s\n", _("STATE_CRITICAL, other errors return STATE_UNKNOWN.  Successful"));
+        printf("%s\n", _("connects, but incorrect response messages from the host result in"));
+        printf("%s\n", _("STATE_WARNING return values."));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-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 ("[-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");
+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("[-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");
 }
-
diff --git a/plugins/check_smtp.d/config.h b/plugins/check_smtp.d/config.h
new file mode 100644
index 00000000..0a6511ef
--- /dev/null
+++ b/plugins/check_smtp.d/config.h
@@ -0,0 +1,92 @@
+#pragma once
+
+#include "../../config.h"
+#include <stddef.h>
+#include <string.h>
+
+enum {
+        SMTP_PORT = 25,
+        SMTPS_PORT = 465
+};
+
+#define SMTP_EXPECT "220"
+
+typedef struct {
+        int server_port;
+        char *server_address;
+        char *localhostname;
+        char *server_expect;
+        bool ignore_send_quit_failure;
+
+        double warning_time;
+        bool check_warning_time;
+        double critical_time;
+        bool check_critical_time;
+        bool use_ehlo;
+        bool use_lhlo;
+
+        char *from_arg;
+        bool send_mail_from;
+
+        int ncommands;
+        char **commands;
+
+        int nresponses;
+        char **responses;
+
+        char *authtype;
+        char *authuser;
+        char *authpass;
+
+        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;
+#endif
+} check_smtp_config;
+
+check_smtp_config check_smtp_config_init() {
+        check_smtp_config tmp = {
+                .server_port = SMTP_PORT,
+                .server_address = NULL,
+                .localhostname = NULL,
+
+                .server_expect = SMTP_EXPECT,
+                .ignore_send_quit_failure = false,
+
+                .warning_time = 0,
+                .check_warning_time = false,
+                .critical_time = 0,
+                .check_critical_time = false,
+                .use_ehlo = false,
+                .use_lhlo = false,
+
+                .from_arg = strdup(" "),
+                .send_mail_from = false,
+
+                .ncommands = 0,
+                .commands = NULL,
+
+                .nresponses = 0,
+                .responses = NULL,
+
+                .authtype = NULL,
+                .authuser = NULL,
+                .authpass = NULL,
+
+                .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,
+#endif
+        };
+        return tmp;
+}
diff --git a/plugins/check_snmp.c b/plugins/check_snmp.c
index 90a04027..c1d8e2dd 100644
--- a/plugins/check_snmp.c
+++ b/plugins/check_snmp.c
@@ -1,35 +1,35 @@
 /*****************************************************************************
-*
-* Monitoring check_snmp plugin
-*
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_snmp plugin
-*
-* Check status of remote machines and obtain system information via SNMP
-*
-*
-* 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_snmp plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_snmp plugin
+ *
+ * Check status of remote machines and obtain system information via SNMP
+ *
+ *
+ * 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_snmp";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
@@ -37,60 +37,68 @@ const char *email = "devel@monitoring-plugins.org";
 #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_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 DEFAULT_BUFFER_SIZE      100
 
-#define mark(a) ((a)!=0?"*":"")
+#define mark(a) ((a) != 0 ? "*" : "")
 
-#define CHECK_UNDEF 0
+#define CHECK_UNDEF  0
 #define CRIT_PRESENT 1
-#define CRIT_STRING 2
-#define CRIT_REGEX 4
+#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
+#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++; }
+#define GOBBLE_TOS(c, s)                                                                                                                   \
+        while (c[0] != '\0' && strchr(s, c[0]) == NULL) {                                                                                      \
+                c++;                                                                                                                               \
+        }
 /* 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; \
+#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;                                                                                                                             \
         }
 
-
-
-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);
+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] = "";
@@ -122,7 +130,7 @@ static char *units;
 static char *port;
 static char *snmpcmd;
 static char string_value[MAX_INPUT_BUFFER] = "";
-static int  invert_search=0;
+static int invert_search = 0;
 static char **labels = NULL;
 static char **unitv = NULL;
 static size_t nlabels = 0;
@@ -154,17 +162,18 @@ 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 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, right;
-        char *colon, *ret;
+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;
@@ -182,12 +191,12 @@ static char *fix_snmp_range(char *th)
         return ret;
 }
 
-int
-main (int argc, char **argv)
-{
-        int len, total_oids;
+int main(int argc, char **argv) {
+        int len;
+        int total_oids;
         size_t line;
-        unsigned int bk_count = 0, dq_count = 0;
+        unsigned int bk_count = 0;
+        unsigned int dq_count = 0;
         int iresult = STATE_UNKNOWN;
         int result = STATE_UNKNOWN;
         int return_code = 0;
@@ -200,80 +209,83 @@ main (int argc, char **argv)
         char *outbuff;
         char *ptr = NULL;
         char *show = NULL;
-        char *th_warn=NULL;
-        char *th_crit=NULL;
+        char *th_warn = NULL;
+        char *th_crit = NULL;
         char type[8] = "";
-        output chld_out, chld_err;
-        char *previous_string=NULL;
-        char *ap=NULL;
-        char *state_string=NULL;
-        size_t response_length, current_length, string_length;
-        char *temp_string=NULL;
-        char *quote_string=NULL;
+        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);
+        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 );
+        np_init((char *)progname, argc, argv);
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
         np_set_args(argc, argv);
 
         time(&current_time);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        if (process_arguments(argc, argv) == ERROR)
+                usage4(_("Could not parse arguments"));
 
-        if(calculate_rate) {
+        if (calculate_rate) {
                 if (!strcmp(label, "SNMP"))
                         label = strdup("SNMP RATE");
 
                 size_t i = 0;
 
                 previous_state = np_state_read();
-                if(previous_state!=NULL) {
+                if (previous_state != NULL) {
                         /* Split colon separated values */
-                        previous_string = strdup((char *) previous_state->data);
-                        while((ap = strsep(&previous_string, ":")) != NULL) {
-                                if(verbose>2)
+                        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);
+                                previous_value[i++] = strtod(ap, NULL);
                         }
                 }
         }
 
         /* Populate the thresholds */
-        th_warn=warning_thresholds;
-        th_crit=critical_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;
@@ -287,53 +299,52 @@ main (int argc, char **argv)
                 }
 
                 /* Skip empty thresholds, while avoiding segfault */
-                set_thresholds(&thlds[i],
-                               w ? strpbrk(w, NP_THRESHOLDS_CHARS) : NULL,
-                               c ? strpbrk(c, NP_THRESHOLDS_CHARS) : NULL);
+                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++;
+                        th_warn = strchr(th_warn, ',');
+                        if (th_warn)
+                                th_warn++;
                         free(w);
                 }
                 if (c) {
-                        th_crit=strchr(th_crit, ',');
-                        if (th_crit) th_crit++;
+                        th_crit = strchr(th_crit, ',');
+                        if (th_crit)
+                                th_crit++;
                         free(c);
                 }
         }
 
         /* Create the command array to execute */
-        if(usesnmpgetnext) {
-                snmpcmd = strdup (PATH_TO_SNMPGETNEXT);
-        }else{
-                snmpcmd = strdup (PATH_TO_SNMPGET);
+        if (usesnmpgetnext) {
+                snmpcmd = strdup(PATH_TO_SNMPGETNEXT);
+        } else {
+                snmpcmd = strdup(PATH_TO_SNMPGET);
         }
 
         /* 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 = 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++] = 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);
+        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);
+        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);
         }
 
-
         for (int i = 0; i < numcontext; i++) {
                 command_line[index++] = contextargs[i];
         }
@@ -342,12 +353,9 @@ main (int argc, char **argv)
                 command_line[index++] = authpriv[i];
         }
 
-        xasprintf (&command_line[index++], "%s:%s", server_address, port);
+        xasprintf(&command_line[index++], "%s:%s", server_address, port);
 
-        xasprintf(&cl_hidden_auth, "%s [context] [authpriv] %s:%s",
-         cl_hidden_auth,
-         server_address,
-         port);
+        xasprintf(&cl_hidden_auth, "%s [context] [authpriv] %s:%s", cl_hidden_auth, server_address, port);
 
         for (size_t i = 0; i < numoids; i++) {
                 command_line[index++] = oids[i];
@@ -357,17 +365,17 @@ main (int argc, char **argv)
         command_line[index++] = NULL;
 
         if (verbose) {
-                printf ("%s\n", cl_hidden_auth);
+                printf("%s\n", cl_hidden_auth);
         }
 
         /* Set signal handling and alarm */
-        if (signal (SIGALRM, runcmd_timeout_alarm_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGALRM"));
+        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);
+        return_code = cmd_run_array(command_line, &chld_out, &chld_err, 0);
 
         /* disable alarm again */
         alarm(0);
@@ -377,80 +385,74 @@ main (int argc, char **argv)
            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;
+                external_error = 1;
         if (chld_out.lines == 0)
-                external_error=1;
+                external_error = 1;
         if (external_error) {
                 if (chld_err.lines > 0) {
-                        printf (_("External command error: %s\n"), chld_err.line[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]);
+                                printf("%s\n", chld_err.line[i]);
                         }
                 } else {
                         printf(_("External command error with no output (return code: %d)\n"), return_code);
                 }
-                exit (STATE_UNKNOWN);
+                exit(STATE_UNKNOWN);
         }
 
         if (verbose) {
                 for (size_t i = 0; i < chld_out.lines; i++) {
-                        printf ("%s\n", chld_out.line[i]);
+                        printf("%s\n", chld_out.line[i]);
                 }
         }
 
         line = 0;
         total_oids = 0;
-        for (size_t i = 0; line < chld_out.lines && i < numoids ; line++, i++, total_oids++) {
-                if(calculate_rate)
+        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);
+                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);
+                        printf("Processing oid %zi (line %zi)\n  oidname: %s\n  response: %s\n", i + 1, line + 1, oidname, response);
                 }
 
                 /* Clean up type array - Sol10 does not necessarily zero it out */
                 bzero(type, sizeof(type));
 
-                is_counter=0;
+                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)
+                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)
+                } 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);
+                } 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;
+                } 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 */
@@ -464,15 +466,17 @@ main (int argc, char **argv)
 
                         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);
+                                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++;
+                                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);
+                                        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') {
@@ -481,15 +485,14 @@ main (int argc, char **argv)
                                                 COUNT_SEQ(ptr, bk_count, dq_count)
                                         }
                                         /* Break for loop before next line increment when done */
-                                        if (!dq_count) break;
+                                        if (!dq_count)
+                                                break;
                                 }
                         }
 
-                }
-                else if (strstr (response, "Timeticks: ")) {
-                        show = strstr (response, "Timeticks: ");
-                }
-                else
+                } else if (strstr(response, "Timeticks: ")) {
+                        show = strstr(response, "Timeticks: ");
+                } else
                         show = response + 3;
 
                 iresult = STATE_DEPENDENT;
@@ -500,68 +503,67 @@ main (int argc, char **argv)
                         if (verbose > 2) {
                                 print_thresholds("  thresholds", thlds[i]);
                         }
-                        ptr = strpbrk (show, "-0123456789");
-                        if (ptr == NULL){
+                        ptr = strpbrk(show, "-0123456789");
+                        if (ptr == NULL) {
                                 if (nulloid == 3)
-                                        die (STATE_UNKNOWN,_("No valid data returned (%s)\n"), show);
+                                        die(STATE_UNKNOWN, _("No valid data returned (%s)\n"), show);
                                 else if (nulloid == 0)
-                                        die (STATE_OK,_("No valid data returned (%s)\n"), show);
+                                        die(STATE_OK, _("No valid data returned (%s)\n"), show);
                                 else if (nulloid == 1)
-                                        die (STATE_WARNING,_("No valid data returned (%s)\n"), show);
+                                        die(STATE_WARNING, _("No valid data returned (%s)\n"), show);
                                 else if (nulloid == 2)
-                                        die (STATE_CRITICAL,_("No valid data returned (%s)\n"), show);
+                                        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];
+                        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 */;
+                                        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;
+                                        temp_double = temp_double / duration * rate_multiplier;
                                         iresult = get_status(temp_double, thlds[i]);
-                                        xasprintf (&show, conv, temp_double);
+                                        xasprintf(&show, conv, temp_double);
                                 }
                         } else {
                                 iresult = get_status(response_value[i], thlds[i]);
-                                xasprintf (&show, conv, response_value[i]);
+                                xasprintf(&show, conv, response_value[i]);
                         }
                 }
 
                 /* 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;
+                        if (strcmp(show, string_value))
+                                iresult = (invert_search == 0) ? STATE_CRITICAL : STATE_OK;
                         else
-                                iresult = (invert_search==0) ? STATE_OK : STATE_CRITICAL;
+                                iresult = (invert_search == 0) ? STATE_OK : STATE_CRITICAL;
                 }
 
                 /* Process this block for regex matching */
                 else if (eval_size > i && eval_method[i] & CRIT_REGEX) {
-                        excode = regexec (&preg, response, 10, pmatch, eflags);
+                        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;
+                                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;
                         }
                 }
 
@@ -577,294 +579,283 @@ main (int argc, char **argv)
                 }
 
                 /* Result is the worst outcome of all the OIDs tested */
-                result = max_state (result, iresult);
+                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));
+                        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));
+                        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]);
+                        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];
+                                temp_string = labels[i];
                         else
-                                temp_string=oidname;
-                        if (strpbrk (temp_string, " ='\"") == NULL) {
-                                strncat(perfstr, temp_string, sizeof(perfstr)-strlen(perfstr)-1);
+                                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="'";
+                                if (strpbrk(temp_string, "'") == NULL) {
+                                        quote_string = "'";
                                 } else {
-                                        quote_string="\"";
+                                        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, 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);
+                        strncat(perfstr, "=", sizeof(perfstr) - strlen(perfstr) - 1);
+                        len = sizeof(perfstr) - strlen(perfstr) - 1;
+                        strncat(perfstr, show, len > ptr - show ? ptr - show : len);
 
                         if (strcmp(type, "") != 0) {
-                                strncat(perfstr, type, sizeof(perfstr)-strlen(perfstr)-1);
+                                strncat(perfstr, type, sizeof(perfstr) - strlen(perfstr) - 1);
                         }
 
                         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);
+                                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 (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);
+                                        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);
                         }
 
-                        strncat(perfstr, " ", sizeof(perfstr)-strlen(perfstr)-1);
+                        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)
+        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()"));
+                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)
+                        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()"));
                         }
-                        strcpy(&state_string[current_length],temp_string);
-                        current_length=current_length+response_length;
-                        state_string[current_length]=':';
+                        strcpy(&state_string[current_length], temp_string);
+                        current_length = current_length + response_length;
+                        state_string[current_length] = ':';
                         current_length++;
                         free(temp_string);
                 }
-                state_string[--current_length]='\0';
+                state_string[--current_length] = '\0';
                 if (verbose > 2)
-                        printf("State string=%s\n",state_string);
+                        printf("State string=%s\n", state_string);
 
                 /* 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) {
+                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" ) );
+                        die(STATE_OK, _("No previous data to calculate rate - assume okay"));
                 }
         }
 
-        printf ("%s %s -%s %s\n", label, state_text (result), outbuff, perfstr);
-        if (mult_resp) printf ("%s", mult_resp);
+        printf("%s %s -%s %s\n", label, state_text(result), outbuff, perfstr);
+        if (mult_resp)
+                printf("%s", mult_resp);
 
         return result;
 }
 
-
-
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        char *ptr;
-        int c = 1;
-        size_t j = 0, jj = 0;
-
-        int option = 0;
-        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}
-        };
+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 (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 (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");
         }
 
-        while (1) {
-                c = 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);
+        size_t j = 0;
+        size_t jj = 0;
+        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);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF)
                         break;
 
-                switch (c) {
-                case '?':       /* usage */
-                        usage5 ();
-                case 'h':       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'V':       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
+                switch (option_char) {
+                case '?': /* usage */
+                        usage5();
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
                 case 'v': /* verbose */
                         verbose++;
                         break;
 
-        /* Connection info */
-                case 'C':                                                                       /* group or community */
+                        /* Connection info */
+                case 'C': /* group or community */
                         community = optarg;
                         break;
-                case 'H':                                                                       /* Host or server */
+                case 'H': /* Host or server */
                         server_address = optarg;
                         break;
-                case 'p':       /* TCP port number */
+                case 'p': /* TCP port number */
                         port = optarg;
                         break;
-                case 'm':       /* List of MIBS */
+                case 'm': /* List of MIBS */
                         miblist = optarg;
                         break;
-                case 'n':       /* usesnmpgetnext */
+                case 'n': /* usesnmpgetnext */
                         usesnmpgetnext = true;
                         break;
-                case 'P':       /* SNMP protocol version */
+                case 'P': /* SNMP protocol version */
                         proto = optarg;
                         break;
-                case 'N':       /* SNMPv3 context */
+                case 'N': /* SNMPv3 context */
                         context = optarg;
                         break;
-                case 'L':       /* security level */
+                case 'L': /* security level */
                         seclevel = optarg;
                         break;
-                case 'U':       /* security username */
+                case 'U': /* security username */
                         secname = optarg;
                         break;
-                case 'a':       /* auth protocol */
+                case 'a': /* auth protocol */
                         authproto = optarg;
                         break;
-                case 'x':       /* priv protocol */
+                case 'x': /* priv protocol */
                         privproto = optarg;
                         break;
-                case 'A':       /* auth passwd */
+                case 'A': /* auth passwd */
                         authpasswd = optarg;
                         break;
-                case 'X':       /* priv passwd */
+                case 'X': /* priv passwd */
                         privpasswd = optarg;
                         break;
-                case 't':       /* timeout period */
-                        if (!is_integer (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
+                case 't': /* timeout period */
+                        if (!is_integer(optarg))
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
                         else
-                                timeout_interval = atoi (optarg);
+                                timeout_interval = atoi(optarg);
                         break;
 
-        /* Test parameters */
-                case 'c':                                                                       /* critical threshold */
+                        /* Test parameters */
+                case 'c': /* critical threshold */
                         critical_thresholds = optarg;
                         break;
-                case 'w':                                                                       /* warning threshold */
+                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);
+                        if (!is_integer(optarg))
+                                usage2(_("Retries interval must be a positive integer"), optarg);
                         else
                                 retries = atoi(optarg);
                         break;
-                case 'o':                                                                       /* object identifier */
-                        if ( strspn( optarg, "0123456789.," ) != strlen( optarg ) ) {
-                                        /*
-                                         * we have something other than digits, periods and comas,
-                                         * so we have a mib variable, rather than just an SNMP OID,
-                                         * so we have to actually read the mib files
-                                         */
-                                        needmibs = true;
+                case 'o': /* object identifier */
+                        if (strspn(optarg, "0123456789.,") != strlen(optarg)) {
+                                /*
+                                 * we have something other than digits, periods and comas,
+                                 * so we have a mib variable, rather than just an SNMP OID,
+                                 * so we have to actually read the mib files
+                                 */
+                                needmibs = true;
                         }
-                        for (ptr = strtok(optarg, ", "); ptr != NULL; ptr = strtok(NULL, ", "), j++) {
+                        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 = realloc(oids, oids_size * sizeof(*oids));
                                 }
                                 oids[j] = strdup(ptr);
                         }
                         numoids = j;
-                        if (c == 'E' || c == 'e') {
+                        if (option_char == 'E' || option_char == 'e') {
                                 jj++;
-                                while (j+1 >= eval_size) {
+                                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 (c == 'E')
-                                        eval_method[j+1] |= WARN_PRESENT;
-                                else if (c == 'e')
-                                        eval_method[j+1] |= CRIT_PRESENT;
+                                if (option_char == 'E')
+                                        eval_method[j + 1] |= WARN_PRESENT;
+                                else if (option_char == 'e')
+                                        eval_method[j + 1] |= CRIT_PRESENT;
                         }
                         break;
-                case 'z':       /* Null OID Return Check */
-                        if (!is_integer (optarg))
-                                usage2 (_("Exit status must be a positive integer"), optarg);
+                case 'z': /* Null OID Return Check */
+                        if (!is_integer(optarg))
+                                usage2(_("Exit status must be a positive integer"), optarg);
                         else
                                 nulloid = atoi(optarg);
                         break;
-                case 's':                                                                       /* string or substring */
-                        strncpy (string_value, optarg, sizeof (string_value) - 1);
-                        string_value[sizeof (string_value) - 1] = 0;
+                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));
@@ -872,17 +863,17 @@ process_arguments (int argc, char **argv)
                         }
                         eval_method[jj++] = CRIT_STRING;
                         break;
-                case 'R':                                                                       /* regex */
+                case 'R': /* regex */
                         cflags = REG_ICASE;
                         // fall through
-                case 'r':                                                                       /* regex */
+                case 'r': /* regex */
                         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);
+                        strncpy(regex_expect, optarg, sizeof(regex_expect) - 1);
+                        regex_expect[sizeof(regex_expect) - 1] = 0;
+                        errcode = regcomp(&preg, regex_expect, cflags);
                         if (errcode != 0) {
-                                regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
-                                printf (_("Could Not Compile Regular Expression"));
+                                regerror(errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+                                printf(_("Could Not Compile Regular Expression"));
                                 return ERROR;
                         }
                         while (jj >= eval_size) {
@@ -893,64 +884,64 @@ process_arguments (int argc, char **argv)
                         eval_method[jj++] = CRIT_REGEX;
                         break;
 
-        /* Format */
-                case 'd':                                                                       /* delimiter */
-                        delimiter = strscpy (delimiter, optarg);
+                        /* Format */
+                case 'd': /* delimiter */
+                        delimiter = strscpy(delimiter, optarg);
                         break;
-                case 'D':                                                                       /* output-delimiter */
-                        output_delim = strscpy (output_delim, optarg);
+                case 'D': /* output-delimiter */
+                        output_delim = strscpy(output_delim, optarg);
                         break;
-                case 'l':                                                                       /* label */
+                case 'l': /* label */
                         nlabels++;
                         if (nlabels > labels_size) {
                                 labels_size += 8;
-                                labels = realloc (labels, labels_size * sizeof(*labels));
+                                labels = realloc(labels, labels_size * sizeof(*labels));
                                 if (labels == NULL)
-                                        die (STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
+                                        die(STATE_UNKNOWN, _("Could not reallocate labels[%d]"), (int)nlabels);
                         }
                         labels[nlabels - 1] = optarg;
-                        ptr = thisarg (optarg);
+                        char *ptr = thisarg(optarg);
                         labels[nlabels - 1] = ptr;
                         if (ptr[0] == '\'')
                                 labels[nlabels - 1] = ptr + 1;
-                        while (ptr && (ptr = nextarg (ptr))) {
+                        while (ptr && (ptr = nextarg(ptr))) {
                                 nlabels++;
                                 if (nlabels > labels_size) {
                                         labels_size += 8;
-                                        labels = realloc (labels, labels_size * sizeof(*labels));
+                                        labels = realloc(labels, labels_size * sizeof(*labels));
                                         if (labels == NULL)
-                                                die (STATE_UNKNOWN, _("Could not reallocate labels\n"));
+                                                die(STATE_UNKNOWN, _("Could not reallocate labels\n"));
                                 }
-                                ptr = thisarg (ptr);
+                                ptr = thisarg(ptr);
                                 if (ptr[0] == '\'')
                                         labels[nlabels - 1] = ptr + 1;
                                 else
                                         labels[nlabels - 1] = ptr;
                         }
                         break;
-                case 'u':                                                                       /* units */
+                case 'u': /* units */
                         units = optarg;
                         nunits++;
                         if (nunits > unitv_size) {
                                 unitv_size += 8;
-                                unitv = realloc (unitv, unitv_size * sizeof(*unitv));
+                                unitv = realloc(unitv, unitv_size * sizeof(*unitv));
                                 if (unitv == NULL)
-                                        die (STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
+                                        die(STATE_UNKNOWN, _("Could not reallocate units [%d]\n"), (int)nunits);
                         }
                         unitv[nunits - 1] = optarg;
-                        ptr = thisarg (optarg);
+                        ptr = thisarg(optarg);
                         unitv[nunits - 1] = ptr;
                         if (ptr[0] == '\'')
                                 unitv[nunits - 1] = ptr + 1;
-                        while (ptr && (ptr = nextarg (ptr))) {
+                        while (ptr && (ptr = nextarg(ptr))) {
                                 if (nunits > unitv_size) {
                                         unitv_size += 8;
-                                        unitv = realloc (unitv, unitv_size * sizeof(*unitv));
+                                        unitv = realloc(unitv, unitv_size * sizeof(*unitv));
                                         if (units == NULL)
-                                                die (STATE_UNKNOWN, _("Could not realloc() units\n"));
+                                                die(STATE_UNKNOWN, _("Could not realloc() units\n"));
                                 }
                                 nunits++;
-                                ptr = thisarg (ptr);
+                                ptr = thisarg(ptr);
                                 if (ptr[0] == '\'')
                                         unitv[nunits - 1] = ptr + 1;
                                 else
@@ -958,38 +949,38 @@ process_arguments (int argc, char **argv)
                         }
                         break;
                 case L_CALCULATE_RATE:
-                        if(calculate_rate==0)
+                        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);
+                        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);
+                        offset = strtod(optarg, NULL);
                         break;
                 case L_INVERT_SEARCH:
-                        invert_search=1;
+                        invert_search = 1;
                         break;
                 case 'O':
-                        perf_labels=0;
+                        perf_labels = 0;
                         break;
                 case '4':
                         break;
                 case '6':
                         xasprintf(&ip_version, "udp6:");
-                        if(verbose>2)
+                        if (verbose > 2)
                                 printf("IPv6 detected! Will pass \"udp6:\" to snmpget.\n");
                         break;
                 case 'M':
-                        if ( strspn( optarg, "0123456789.," ) == strlen( optarg ) ) {
-                                multiplier=strtod(optarg,NULL);
+                        if (strspn(optarg, "0123456789.,") == strlen(optarg)) {
+                                multiplier = strtod(optarg, NULL);
                         }
                         break;
                 case 'f':
                         if (multiplier != 1.0) {
-                                fmtstr=optarg;
+                                fmtstr = optarg;
                                 fmtstr_set = true;
                         }
                         break;
@@ -1002,12 +993,11 @@ process_arguments (int argc, char **argv)
                 server_address = argv[optind];
 
         if (community == NULL)
-                community = strdup (DEFAULT_COMMUNITY);
+                community = strdup(DEFAULT_COMMUNITY);
 
-        return validate_arguments ();
+        return validate_arguments();
 }
 
-
 /******************************************************************************
 
 @@-
@@ -1026,17 +1016,13 @@ selected.</para>
 -@@
 ******************************************************************************/
 
-
-
-static int
-validate_arguments ()
-{
+static int validate_arguments() {
         /* check whether to load locally installed MIBS (CPU/disk intensive) */
         if (miblist == NULL) {
                 if (needmibs) {
-                        miblist = strdup (DEFAULT_MIBLIST);
-                }else{
-                        miblist = "";                   /* don't read any mib files for numeric oids */
+                        miblist = strdup(DEFAULT_MIBLIST);
+                } else {
+                        miblist = ""; /* don't read any mib files for numeric oids */
                 }
         }
 
@@ -1051,18 +1037,17 @@ validate_arguments ()
         if (proto == NULL)
                 xasprintf(&proto, DEFAULT_PROTOCOL);
 
-        if ((strcmp(proto,"1") == 0) || (strcmp(proto, "2c")==0)) {     /* snmpv1 or snmpv2c */
+        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 */
+                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);
+                        contextargs = calloc(numcontext, sizeof(char *));
+                        contextargs[0] = strdup("-n");
+                        contextargs[1] = strdup(context);
                 }
 
                 if (seclevel == NULL)
@@ -1073,284 +1058,266 @@ validate_arguments ()
 
                 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);
+                        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);
+                        if (!((strcmp(seclevel, "authNoPriv") == 0) || (strcmp(seclevel, "authPriv") == 0))) {
+                                usage2(_("Invalid seclevel"), seclevel);
                         }
 
-                        if (authproto == NULL )
+                        if (authproto == NULL)
                                 xasprintf(&authproto, DEFAULT_AUTH_PROTOCOL);
 
                         if (authpasswd == NULL)
                                 die(STATE_UNKNOWN, _("Required parameter: %s\n"), "authpasswd");
 
-                        if ( strcmp(seclevel, "authNoPriv") == 0 ) {
+                        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 )
+                                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);
+                                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);
                         }
                 }
 
-        }
-        else {
-                usage2 (_("Invalid SNMP version"), proto);
+        } else {
+                usage2(_("Invalid SNMP version"), proto);
         }
 
         return OK;
 }
 
-
-
 /* trim leading whitespace
          if there is a leading quote, make sure it balances */
 
-static char *
-thisarg (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, "'"))
-                        die (STATE_UNKNOWN, _("Unbalanced quotes\n"));
+static char *thisarg(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, "'"))
+                        die(STATE_UNKNOWN, _("Unbalanced quotes\n"));
         }
         return str;
 }
 
-
-
 /* if there's a leading quote, advance to the trailing quote
          set the trailing quote to '\x0'
          if the string continues, advance beyond the comma */
 
-static char *
-nextarg (char *str)
-{
+static char *nextarg(char *str) {
         if (str[0] == '\'') {
                 str[0] = 0;
-                if (strlen (str) > 1) {
-                        str = strstr (str + 1, "'");
+                if (strlen(str) > 1) {
+                        str = strstr(str + 1, "'");
                         return (++str);
-                }
-                else {
+                } else {
                         return NULL;
                 }
         }
         if (str[0] == ',') {
                 str[0] = 0;
-                if (strlen (str) > 1) {
+                if (strlen(str) > 1) {
                         return (++str);
-                }
-                else {
+                } else {
                         return NULL;
                 }
         }
-        if ((str = strstr (str, ",")) && strlen (str) > 1) {
+        if ((str = strstr(str, ",")) && strlen(str) > 1) {
                 str[0] = 0;
                 return (++str);
         }
         return NULL;
 }
 
-
-
 /* multiply result (values 0 < n < 1 work as divider) */
-static char *
-multiply (char *str)
-{
-        char *endptr;
-        double val;
-        char *conv = "%f";
-
-        if(multiplier == 1)
-                return(str);
+static char *multiply(char *str) {
+        if (multiplier == 1)
+                return (str);
 
-        if(verbose>2)
+        if (verbose > 2)
                 printf("    multiply input: %s\n", str);
 
-        val = strtod (str, &endptr);
+        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)
+        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)
+                if (verbose > 2)
                         printf("    multiply using format: %s\n", conv);
                 snprintf(buffer, DEFAULT_BUFFER_SIZE, conv, val);
         }
-        if(verbose>2)
+        if (verbose > 2)
                 printf("    multiply result: %s\n", buffer);
         return buffer;
 }
 
+static void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-static void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf (COPYRIGHT, copyright, email);
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("Check status of remote machines and obtain system information via SNMP"));
+        printf("%s\n", _("Check status of remote machines and obtain system information via SNMP"));
 
-        printf ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-        printf (UT_IPv46);
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+        printf(UT_IPv46);
 
-        printf (UT_HOST_PORT, 'p', DEFAULT_PORT);
+        printf(UT_HOST_PORT, 'p', DEFAULT_PORT);
 
         /* SNMP and Authentication Protocol */
-        printf (" %s\n", "-n, --next");
-        printf ("    %s\n", _("Use SNMP GETNEXT instead of SNMP GET"));
-        printf (" %s\n", "-P, --protocol=[1|2c|3]");
-        printf ("    %s\n", _("SNMP protocol version"));
-        printf (" %s\n", "-N, --context=CONTEXT");
-        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", "-n, --next");
+        printf("    %s\n", _("Use SNMP GETNEXT instead of SNMP GET"));
+        printf(" %s\n", "-P, --protocol=[1|2c|3]");
+        printf("    %s\n", _("SNMP protocol version"));
+        printf(" %s\n", "-N, --context=CONTEXT");
+        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"));
 
         /* Authentication Tokens*/
-        printf (" %s\n", "-C, --community=STRING");
-        printf ("    %s ", _("Optional community string for SNMP communication"));
-        printf ("(%s \"%s\")\n", _("default is") ,DEFAULT_COMMUNITY);
-        printf (" %s\n", "-U, --secname=USERNAME");
-        printf ("    %s\n", _("SNMPv3 username"));
-        printf (" %s\n", "-A, --authpasswd=PASSWORD");
-        printf ("    %s\n", _("SNMPv3 authentication password"));
-        printf (" %s\n", "-X, --privpasswd=PASSWORD");
-        printf ("    %s\n", _("SNMPv3 privacy password"));
+        printf(" %s\n", "-C, --community=STRING");
+        printf("    %s ", _("Optional community string for SNMP communication"));
+        printf("(%s \"%s\")\n", _("default is"), DEFAULT_COMMUNITY);
+        printf(" %s\n", "-U, --secname=USERNAME");
+        printf("    %s\n", _("SNMPv3 username"));
+        printf(" %s\n", "-A, --authpasswd=PASSWORD");
+        printf("    %s\n", _("SNMPv3 authentication password"));
+        printf(" %s\n", "-X, --privpasswd=PASSWORD");
+        printf("    %s\n", _("SNMPv3 privacy password"));
 
         /* 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", _("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=#");
-        printf ("    %s\n", _("If the check returns a 0 length string or NULL value"));
-        printf ("    %s\n", _("This option allows you to choose what status you want it to exit"));
-        printf ("    %s\n", _("Excluding this option renders the default exit of 3(STATE_UNKNOWN)"));
-        printf ("    %s\n", _("0 = OK"));
-        printf ("    %s\n", _("1 = WARNING"));
-        printf ("    %s\n", _("2 = CRITICAL"));
-        printf ("    %s\n", _("3 = UNKNOWN"));
+        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", _("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=#");
+        printf("    %s\n", _("If the check returns a 0 length string or NULL value"));
+        printf("    %s\n", _("This option allows you to choose what status you want it to exit"));
+        printf("    %s\n", _("Excluding this option renders the default exit of 3(STATE_UNKNOWN)"));
+        printf("    %s\n", _("0 = OK"));
+        printf("    %s\n", _("1 = WARNING"));
+        printf("    %s\n", _("2 = CRITICAL"));
+        printf("    %s\n", _("3 = UNKNOWN"));
 
         /* Tests Against Integers */
-        printf (" %s\n", "-w, --warning=THRESHOLD(s)");
-        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"));
+        printf(" %s\n", "-w, --warning=THRESHOLD(s)");
+        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"));
 
         /* Tests Against Strings */
-        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", "-R, --eregi=REGEX");
-        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)"));
+        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", "-R, --eregi=REGEX");
+        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)"));
 
         /* Output Formatting */
-        printf (" %s\n", "-l, --label=STRING");
-        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_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", "-e, --retries=INTEGER");
-        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 (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", _("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", _("list (lists with internal spaces must be quoted)."));
+        printf(" %s\n", "-l, --label=STRING");
+        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_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", "-e, --retries=INTEGER");
+        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(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", _("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", _("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", _("- 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", _("returned from the SNMP query is an unsigned integer."));
+        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", _("returned from the SNMP query is an unsigned integer."));
 
         printf("\n");
         printf("%s\n", _("Rate Calculation:"));
@@ -1362,19 +1329,15 @@ print_help (void)
         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);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range]\n",progname);
-        printf ("[-C community] [-s string] [-r regex] [-R regexi] [-t timeout] [-e retries]\n");
-        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");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H <ip_address> -o <OID> [-w warn_range] [-c crit_range]\n", progname);
+        printf("[-C community] [-s string] [-r regex] [-R regexi] [-t timeout] [-e retries]\n");
+        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");
 }
diff --git a/plugins/check_ssh.c b/plugins/check_ssh.c
index 34ef37b7..9d0d7cde 100644
--- a/plugins/check_ssh.c
+++ b/plugins/check_ssh.c
@@ -1,144 +1,158 @@
 /*****************************************************************************
-*
-* Monitoring check_ssh plugin
-*
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_ssh plugin
-*
-* Try to connect to an SSH server at specified server and port
-*
-*
-* 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_ssh plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_ssh plugin
+ *
+ * Try to connect to an SSH server at specified server and port
+ *
+ *
+ * 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 "output.h"
+#include "perfdata.h"
+#include "states.h"
 const char *progname = "check_ssh";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "./common.h"
 #include "./netutils.h"
 #include "utils.h"
+#include "./check_ssh.d/config.h"
 
 #ifndef MSG_DONTWAIT
-#define MSG_DONTWAIT 0
+#       define MSG_DONTWAIT 0
 #endif
 
-#define SSH_DFL_PORT    22
-#define BUFF_SZ         256
-
-int port = -1;
-char *server_name = NULL;
-char *remote_version = NULL;
-char *remote_protocol = NULL;
-bool verbose = false;
+#define BUFF_SZ 256
 
-int process_arguments (int, char **);
-int validate_arguments (void);
-void print_help (void);
-void print_usage (void);
+static bool verbose = false;
 
-int ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol);
+typedef struct process_arguments_wrapper {
+        int errorcode;
+        check_ssh_config config;
+} process_arguments_wrapper;
 
+static process_arguments_wrapper 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;
+static int ssh_connect(mp_check *overall, char *haddr, int hport, char *remote_version, char *remote_protocol);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        process_arguments_wrapper tmp_config = process_arguments(argc, argv);
 
-        /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        if (tmp_config.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
+
+        check_ssh_config config = tmp_config.config;
+
+        mp_check overall = mp_check_init();
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
+        }
 
-        alarm (socket_timeout);
+        /* initialize alarm signal handling */
+        signal(SIGALRM, socket_timeout_alarm_handler);
+        alarm(socket_timeout);
 
         /* ssh_connect exits if error is found */
-        result = ssh_connect (server_name, port, remote_version, remote_protocol);
+        ssh_connect(&overall, config.server_name, config.port, config.remote_version, config.remote_protocol);
 
-        alarm (0);
+        alarm(0);
 
-        return (result);
+        mp_exit(overall);
 }
 
-
+#define output_format_index CHAR_MAX + 1
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-
-        int option = 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'},
-                {0, 0, 0, 0}
+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}};
+
+        process_arguments_wrapper result = {
+                .config = check_ssh_config_init(),
+                .errorcode = OK,
         };
 
-        if (argc < 2)
-                return ERROR;
+        if (argc < 2) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-        for (c = 1; c < argc; c++)
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0) {
+                        strcpy(argv[i], "-t");
+                }
+        }
 
-        while (1) {
-                c = getopt_long (argc, argv, "+Vhv46t:r:H:p:P:", longopts, &option);
+        int option_char;
+        while (true) {
+                int option = 0;
+                option_char = getopt_long(argc, argv, "+Vhv46t:r:H:p:P:", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case '?':                                                                       /* help */
-                        usage5 ();
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case 'v':                                                                       /* verbose */
+                switch (option_char) {
+                case '?': /* help */
+                        usage5();
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
+                case 'v': /* verbose */
                         verbose = true;
                         break;
-                case 't':                                                                       /* timeout period */
-                        if (!is_integer (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
-                        else
-                                socket_timeout = atoi (optarg);
+                case 't': /* timeout period */
+                        if (!is_intpos(optarg)) {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        } else {
+                                socket_timeout = (unsigned int)atoi(optarg);
+                        }
                         break;
                 case '4':
                         address_family = AF_INET;
@@ -147,121 +161,121 @@ process_arguments (int argc, char **argv)
 #ifdef USE_IPV6
                         address_family = AF_INET6;
 #else
-                        usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
                         break;
-                case 'r':                                                                       /* remote version */
-                        remote_version = optarg;
+                case 'r': /* remote version */
+                        result.config.remote_version = optarg;
                         break;
-                case 'P':                                                                       /* remote version */
-                        remote_protocol = optarg;
+                case 'P': /* remote version */
+                        result.config.remote_protocol = optarg;
                         break;
-                case 'H':                                                                       /* host */
-                        if (!is_host (optarg))
-                                usage2 (_("Invalid hostname/address"), optarg);
-                        server_name = optarg;
+                case 'H': /* host */
+                        if (!is_host(optarg)) {
+                                usage2(_("Invalid hostname/address"), optarg);
+                        }
+                        result.config.server_name = optarg;
                         break;
-                case 'p':                                                                       /* port */
-                        if (is_intpos (optarg)) {
-                                port = atoi (optarg);
+                case 'p': /* port */
+                        if (is_intpos(optarg)) {
+                                result.config.port = atoi(optarg);
+                        } else {
+                                usage2(_("Port number must be a positive integer"), optarg);
                         }
-                        else {
-                                usage2 (_("Port number must be a positive integer"), 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;
+                }
                 }
         }
 
-        c = optind;
-        if (server_name == NULL && c < argc) {
-                if (is_host (argv[c])) {
-                        server_name = argv[c++];
+        option_char = optind;
+        if (result.config.server_name == NULL && option_char < argc) {
+                if (is_host(argv[option_char])) {
+                        result.config.server_name = argv[option_char++];
                 }
         }
 
-        if (port == -1 && c < argc) {
-                if (is_intpos (argv[c])) {
-                        port = atoi (argv[c++]);
-                }
-                else {
-                        print_usage ();
-                        exit (STATE_UNKNOWN);
+        if (result.config.port == -1 && option_char < argc) {
+                if (is_intpos(argv[option_char])) {
+                        result.config.port = atoi(argv[option_char++]);
+                } else {
+                        print_usage();
+                        exit(STATE_UNKNOWN);
                 }
         }
 
-        return validate_arguments ();
-}
+        if (result.config.server_name == NULL) {
+                result.errorcode = ERROR;
+                return result;
+        }
 
-int
-validate_arguments (void)
-{
-        if (server_name == NULL)
-                return ERROR;
-        if (port == -1)                                                         /* funky, but allows -p to override stray integer in args */
-                port = SSH_DFL_PORT;
-        return OK;
+        return result;
 }
 
-
 /************************************************************************
-*
-* Try to connect to SSH server at specified server and port
-*
-*-----------------------------------------------------------------------*/
-
-
-int
-ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol)
-{
-        int sd;
-        int result;
-        int len = 0;
-        ssize_t recv_ret = 0;
-        char *version_control_string = NULL;
-        char *buffer = NULL;
-        char *ssh_proto = NULL;
-        char *ssh_server = NULL;
-        static char *rev_no = VERSION;
-        struct timeval tv;
-        double elapsed_time;
+ *
+ * Try to connect to SSH server at specified server and port
+ *
+ *-----------------------------------------------------------------------*/
 
+int ssh_connect(mp_check *overall, char *haddr, int hport, char *desired_remote_version, char *desired_remote_protocol) {
+        struct timeval tv;
         gettimeofday(&tv, NULL);
 
-        result = my_tcp_connect (haddr, hport, &sd);
+        int socket;
+        int result = my_tcp_connect(haddr, hport, &socket);
 
-        if (result != STATE_OK)
+        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);
+                mp_add_subcheck_to_check(overall, connection_sc);
                 return result;
+        }
 
-        char *output = (char *) calloc (BUFF_SZ + 1, sizeof(char));
-
-        unsigned int iteration = 0;
-        ssize_t byte_offset = 0;
-
-        while ((version_control_string == NULL) && (recv_ret = recv(sd, output+byte_offset, BUFF_SZ - byte_offset, 0) > 0)) {
+        char *output = (char *)calloc(BUFF_SZ + 1, sizeof(char));
+        char *buffer = NULL;
+        size_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)) {
 
                 if (strchr(output, '\n')) { /* we've got at least one full line, start parsing*/
                         byte_offset = 0;
 
                         char *index = NULL;
-                        while ((index = strchr(output+byte_offset, '\n')) != 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);
 
-                                if ((len >= 4) && (strncmp (output+byte_offset, "SSH-", 4) == 0)) {
+                                if ((len >= 4) && (strncmp(output + byte_offset, "SSH-", 4) == 0)) {
                                         /*if the string starts with SSH-, this _should_ be a valid version control string*/
-                                                version_control_string = output+byte_offset;
-                                                break;
+                                        version_control_string = output + byte_offset;
+                                        break;
                                 }
 
                                 /*the start of the next line (if one exists) will be after the current one (+ NUL)*/
                                 byte_offset += (len + 1);
                         }
 
-                        if(version_control_string == NULL) {
+                        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);
+                                memmove((void *)output, (void *)(output + byte_offset + 1), BUFF_SZ - len + 1);
+                                memset(output + byte_offset + 1, 0, BUFF_SZ - byte_offset + 1);
 
                                 /*start reading from end of current line chunk on next recv*/
                                 byte_offset = strlen(output);
@@ -272,14 +286,23 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol
         }
 
         if (recv_ret < 0) {
-                printf("SSH CRITICAL - %s", strerror(errno));
-                exit(STATE_CRITICAL);
+                connection_sc = mp_set_subcheck_state(connection_sc, STATE_CRITICAL);
+                xasprintf(&connection_sc.output, "%s", "SSH CRITICAL - %s", strerror(errno));
+                mp_add_subcheck_to_check(overall, connection_sc);
+                return OK;
         }
 
         if (version_control_string == NULL) {
-                printf("SSH CRITICAL - No version control string received");
-                exit(STATE_CRITICAL);
+                connection_sc = mp_set_subcheck_state(connection_sc, STATE_CRITICAL);
+                xasprintf(&connection_sc.output, "%s", "SSH CRITICAL - No version control string received");
+                mp_add_subcheck_to_check(overall, connection_sc);
+                return OK;
         }
+
+        connection_sc = mp_set_subcheck_state(connection_sc, STATE_OK);
+        xasprintf(&connection_sc.output, "%s", "Initial connection succeeded");
+        mp_add_subcheck_to_check(overall, connection_sc);
+
         /*
          * "When the connection has been established, both sides MUST send an
          * identification string.  This identification string MUST be
@@ -287,10 +310,12 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol
          * SSH-protoversion-softwareversion SP comments CR LF"
          *              - RFC 4253:4.2
          */
-        strip (version_control_string);
-        if (verbose)
-                printf ("%s\n", version_control_string);
-        ssh_proto = version_control_string + 4;
+        strip(version_control_string);
+        if (verbose) {
+                printf("%s\n", version_control_string);
+        }
+
+        char *ssh_proto = version_control_string + 4;
 
         /*
          * We assume the protoversion is of the form Major.Minor, although
@@ -308,7 +333,7 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol
          * "1.x" (e.g., "1.5" or "1.3")."
          *              - RFC 4253:5
          */
-        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)*/
@@ -316,88 +341,99 @@ ssh_connect (char *haddr, int hport, char *remote_version, char *remote_protocol
         if (tmp) {
                 ssh_server[tmp - ssh_server] = '\0';
         }
+
+        mp_subcheck protocol_validity_sc = mp_subcheck_init();
         if (strlen(ssh_proto) == 0 || strlen(ssh_server) == 0) {
-                printf(_("SSH CRITICAL - Invalid protocol version control string %s\n"), version_control_string);
-                exit (STATE_CRITICAL);
+                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);
+                mp_add_subcheck_to_check(overall, protocol_validity_sc);
+                return OK;
         }
-        ssh_proto[strspn (ssh_proto, "0123456789. ")] = 0;
-
-        xasprintf (&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no);
-        send (sd, buffer, strlen (buffer), MSG_DONTWAIT);
-        if (verbose)
-                printf ("%s\n", buffer);
-
-        if (remote_version && strcmp(remote_version, ssh_server)) {
-                printf
-                        (_("SSH CRITICAL - %s (protocol %s) version mismatch, expected '%s'\n"),
-                         ssh_server, ssh_proto, remote_version);
-                close(sd);
-                exit (STATE_CRITICAL);
+
+        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);
+        mp_add_subcheck_to_check(overall, protocol_validity_sc);
+
+        ssh_proto[strspn(ssh_proto, "0123456789. ")] = 0;
+
+        static char *rev_no = VERSION;
+        xasprintf(&buffer, "SSH-%s-check_ssh_%s\r\n", ssh_proto, rev_no);
+        send(socket, buffer, strlen(buffer), MSG_DONTWAIT);
+        if (verbose) {
+                printf("%s\n", buffer);
         }
 
-        if (remote_protocol && strcmp(remote_protocol, ssh_proto)) {
-                printf
-                        (_("SSH CRITICAL - %s (protocol %s) protocol version mismatch, expected '%s' | %s\n"),
-                         ssh_server, ssh_proto, remote_protocol, fperfdata("time", elapsed_time, "s",
-                         false, 0, false, 0, true, 0, true, (int)socket_timeout));
-                close(sd);
-                exit (STATE_CRITICAL);
+        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);
+                close(socket);
+                mp_add_subcheck_to_check(overall, remote_version_sc);
+                return OK;
         }
-        elapsed_time = (double)deltime(tv) / 1.0e6;
-
-        printf
-                (_("SSH OK - %s (protocol %s) | %s\n"),
-                 ssh_server, ssh_proto, fperfdata("time", elapsed_time, "s",
-                         false, 0, false, 0, true, 0, true, (int)socket_timeout));
-        close(sd);
-        exit (STATE_OK);
-}
 
+        double elapsed_time = (double)deltime(tv) / 1.0e6;
+        mp_perfdata time_pd = perfdata_init();
+        time_pd.value = mp_create_pd_value(elapsed_time);
+        time_pd.label = "time";
+        time_pd.max_present = true;
+        time_pd.max = mp_create_pd_value(socket_timeout);
+
+        mp_subcheck protocol_version_sc = mp_subcheck_init();
+        mp_add_perfdata_to_subcheck(&protocol_version_sc, time_pd);
+
+        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);
+        } 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);
+        }
 
+        mp_add_subcheck_to_check(overall, protocol_version_sc);
+        close(socket);
+        return OK;
+}
 
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", SSH_DFL_PORT);
+        xasprintf(&myport, "%d", default_ssh_port);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Remi Paulmier <remi@sinfomic.fr>\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("Try to connect to an SSH server at specified server and port"));
+        printf("%s\n", _("Try to connect to an SSH server at specified server and port"));
 
-        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 (UT_HOST_PORT, 'p', myport);
+        printf(UT_HOST_PORT, 'p', myport);
 
-        printf (UT_IPv46);
+        printf(UT_IPv46);
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        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", "-r, --remote-version=STRING");
+        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)"));
+        printf(" %s\n", "-P, --remote-protocol=STRING");
+        printf("    %s\n", _("Alert if protocol doesn't match expected protocol version (ex: 2.0)"));
+        printf(UT_OUTPUT_FORMAT);
 
-        printf (UT_VERBOSE);
+        printf(UT_VERBOSE);
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s  [-4|-6] [-t <timeout>] [-r <remote version>] [-p <port>] <host>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s  [-4|-6] [-t <timeout>] [-r <remote version>] [-p <port>] --hostname <host>\n", progname);
 }
-
diff --git a/plugins/check_ssh.d/config.h b/plugins/check_ssh.d/config.h
new file mode 100644
index 00000000..c150fd30
--- /dev/null
+++ b/plugins/check_ssh.d/config.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <stddef.h>
+#include "../../lib/monitoringplug.h"
+
+const int default_ssh_port = 22;
+
+typedef struct check_ssh_config {
+        int port;
+        char *server_name;
+        char *remote_version;
+        char *remote_protocol;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
+} check_ssh_config;
+
+check_ssh_config check_ssh_config_init(void) {
+        check_ssh_config tmp = {
+                .port = default_ssh_port,
+                .server_name = NULL,
+                .remote_version = NULL,
+                .remote_protocol = NULL,
+
+                .output_format_is_set = false,
+        };
+
+        return tmp;
+}
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index e7ee785d..435a104e 100644
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
@@ -1,607 +1,408 @@
 /*****************************************************************************
-*
-* Monitoring check_swap plugin
-*
-* License: GPL
-* Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
-* Copyright (c) 2000-2024 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_swap plugin
-*
-*
-* 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_swap";
-const char *copyright = "2000-2024";
-const char *email = "devel@monitoring-plugins.org";
+ *
+ * Monitoring check_swap plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000 Karl DeBisschop (kdebisschop@users.sourceforge.net)
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_swap plugin
+ *
+ *
+ * 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 "popen.h"
-#include "utils.h"
-
+#include "output.h"
+#include "states.h"
+#include <limits.h>
 #ifdef HAVE_DECL_SWAPCTL
-# ifdef HAVE_SYS_PARAM_H
-#  include <sys/param.h>
-# endif
-# ifdef HAVE_SYS_SWAP_H
-#  include <sys/swap.h>
-# endif
-# ifdef HAVE_SYS_STAT_H
-#  include <sys/stat.h>
-# endif
+#       ifdef HAVE_SYS_PARAM_H
+#               include <sys/param.h>
+#       endif
+#       ifdef HAVE_SYS_SWAP_H
+#               include <sys/swap.h>
+#       endif
+#       ifdef HAVE_SYS_STAT_H
+#               include <sys/stat.h>
+#       endif
 #endif
 
-#ifndef SWAP_CONVERSION
-# define SWAP_CONVERSION 1
-#endif
+#include <stdint.h>
+#include "./check_swap.d/check_swap.h"
+#include "./utils.h"
 
 typedef struct {
-        bool is_percentage;
-        uint64_t value;
-} threshold;
-
-int check_swap (float free_swap_mb, float total_swap_mb);
-int process_arguments (int argc, char **argv);
-int validate_arguments (void);
-void print_usage (void);
-void print_help (void);
-
-threshold warn;
-threshold crit;
+        int errorcode;
+        swap_config config;
+} swap_config_wrapper;
+
+static swap_config_wrapper process_arguments(int argc, char **argv);
+void print_usage(void);
+static void print_help(swap_config /*config*/);
+
 int verbose;
-bool allswaps = false;
-int no_swap_state = STATE_CRITICAL;
-
-int
-main (int argc, char **argv)
-{
-        unsigned int percent_used, percent;
-        uint64_t total_swap_mb = 0, used_swap_mb = 0, free_swap_mb = 0;
-        uint64_t dsktotal_mb = 0, dskused_mb = 0, dskfree_mb = 0;
-        uint64_t tmp_KB = 0;
-        int result = STATE_UNKNOWN;
-        char input_buffer[MAX_INPUT_BUFFER];
-#ifdef HAVE_PROC_MEMINFO
-        FILE *fp;
-#else
-        int conv_factor = SWAP_CONVERSION;
-# ifdef HAVE_SWAP
-        char *temp_buffer;
-        char *swap_command;
-        char *swap_format;
-# else
-#  ifdef HAVE_DECL_SWAPCTL
-        int i=0, nswaps=0, swapctl_res=0;
-#   ifdef CHECK_SWAP_SWAPCTL_SVR4
-        swaptbl_t *tbl=NULL;
-        swapent_t *ent=NULL;
-#   else
-#    ifdef CHECK_SWAP_SWAPCTL_BSD
-        struct swapent *ent;
-#    endif /* CHECK_SWAP_SWAPCTL_BSD */
-#   endif /* CHECK_SWAP_SWAPCTL_SVR4 */
-#  endif /* HAVE_DECL_SWAPCTL */
-# endif
-#endif
-        char str[32];
-        char *status;
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+#define HUNDRED_PERCENT 100
+
+#define BYTES_TO_KiB(number) (number / 1024)
+#define BYTES_TO_MiB(number) (BYTES_TO_KiB(number) / 1024)
+
+const char *progname = "check_swap";
+const char *copyright = "2000-2024";
+const char *email = "devel@monitoring-plugins.org";
 
-        status = strdup ("");
+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);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        swap_config_wrapper tmp = process_arguments(argc, argv);
 
-#ifdef HAVE_PROC_MEMINFO
-        if (verbose >= 3) {
-                printf("Reading PROC_MEMINFO at %s\n", PROC_MEMINFO);
+        if (tmp.errorcode != OK) {
+                usage4(_("Could not parse arguments"));
         }
-        fp = fopen (PROC_MEMINFO, "r");
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
-                /*
-                 * 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
-                 */
-                if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%*[:] %lu %lu %lu", &dsktotal_mb, &dskused_mb, &dskfree_mb) == 3) {
-                        dsktotal_mb = dsktotal_mb / (1024 * 1024);      /* Apply conversion */
-                        dskused_mb = dskused_mb / (1024 * 1024);
-                        dskfree_mb = dskfree_mb / (1024 * 1024);
-                        total_swap_mb += dsktotal_mb;
-                        used_swap_mb += dskused_mb;
-                        free_swap_mb += dskfree_mb;
-                        if (allswaps) {
-                                if (dsktotal_mb == 0)
-                                        percent=100.0;
-                                else
-                                        percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
-                                result = max_state (result, check_swap (dskfree_mb, dsktotal_mb));
-                                if (verbose)
-                                        xasprintf (&status, "%s [%lu (%d%%)]", status, dskfree_mb, 100 - percent);
-                        }
-                }
 
-                /*
-                 * 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 if (sscanf (input_buffer, "%*[S]%*[w]%*[a]%*[p]%[TotalFreCchd]%*[:] %lu %*[k]%*[B]", str, &tmp_KB)) {
-                        if (verbose >= 3) {
-                                printf("Got %s with %lu\n", str, tmp_KB);
-                        }
-                        /* I think this part is always in Kb, so convert to mb */
-                        if (strcmp ("Total", str) == 0) {
-                                dsktotal_mb = tmp_KB / 1024;
-                        }
-                        else if (strcmp ("Free", str) == 0) {
-                                dskfree_mb = dskfree_mb + tmp_KB / 1024;
-                        }
-                        else if (strcmp ("Cached", str) == 0) {
-                                dskfree_mb = dskfree_mb + tmp_KB / 1024;
-                        }
-                }
-        }
-        fclose(fp);
-        dskused_mb = dsktotal_mb - dskfree_mb;
-        total_swap_mb = dsktotal_mb;
-        used_swap_mb = dskused_mb;
-        free_swap_mb = dskfree_mb;
-#else
-# ifdef HAVE_SWAP
-        xasprintf(&swap_command, "%s", SWAP_COMMAND);
-        xasprintf(&swap_format, "%s", SWAP_FORMAT);
-
-/* These override the command used if a summary (and thus ! allswaps) is required */
-/* The summary flag returns more accurate information about swap usage on these OSes */
-#  ifdef _AIX
-        if (!allswaps) {
-                xasprintf(&swap_command, "%s", "/usr/sbin/lsps -s");
-                xasprintf(&swap_format, "%s", "%lu%*s %lu");
-                conv_factor = 1;
-        }
-#  endif
+        swap_config config = tmp.config;
 
-        if (verbose >= 2)
-                printf (_("Command: %s\n"), swap_command);
-        if (verbose >= 3)
-                printf (_("Format: %s\n"), swap_format);
+        swap_result data = get_swap_data(config);
 
-        child_process = spopen (swap_command);
-        if (child_process == NULL) {
-                printf (_("Could not open pipe: %s\n"), swap_command);
-                return STATE_UNKNOWN;
+        if (data.errorcode != STATE_OK) {
+                puts("SWAP UNKNOWN - Failed to retrieve Swap usage");
+                exit(STATE_UNKNOWN);
         }
 
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
-        if (child_stderr == NULL)
-                printf (_("Could not open stderr for %s\n"), swap_command);
-
-        sprintf (str, "%s", "");
-        /* read 1st line */
-        fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process);
-        if (strcmp (swap_format, "") == 0) {
-                temp_buffer = strtok (input_buffer, " \n");
-                while (temp_buffer) {
-                        if (strstr (temp_buffer, "blocks"))
-                                sprintf (str, "%s %s", str, "%lu");
-                        else if (strstr (temp_buffer, "dskfree"))
-                                sprintf (str, "%s %s", str, "%lu");
-                        else
-                                sprintf (str, "%s %s", str, "%*s");
-                        temp_buffer = strtok (NULL, " \n");
-                }
+        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);
         }
 
-/* If different swap command is used for summary switch, need to read format differently */
-#  ifdef _AIX
-        if (!allswaps) {
-                fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process);       /* Ignore first line */
-                sscanf (input_buffer, swap_format, &total_swap_mb, &used_swap_mb);
-                free_swap_mb = total_swap_mb * (100 - used_swap_mb) /100;
-                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);
-        } else {
-#  endif
-                while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
-                        sscanf (input_buffer, swap_format, &dsktotal_mb, &dskfree_mb);
-
-                        dsktotal_mb = dsktotal_mb / conv_factor;
-                        /* AIX lists percent used, so this converts to dskfree in MBs */
-#  ifdef _AIX
-                        dskfree_mb = dsktotal_mb * (100 - dskfree_mb) / 100;
-#  else
-                        dskfree_mb = dskfree_mb / conv_factor;
-#  endif
-                        if (verbose >= 3)
-                                printf (_("total=%.0f, free=%.0f\n"), dsktotal_mb, dskfree_mb);
-
-                        dskused_mb = dsktotal_mb - dskfree_mb;
-                        total_swap_mb += dsktotal_mb;
-                        used_swap_mb += dskused_mb;
-                        free_swap_mb += dskfree_mb;
-                        if (allswaps) {
-                                percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
-                                result = max_state (result, check_swap (dskfree_mb, dsktotal_mb));
-                                if (verbose)
-                                        xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
-                        }
-                }
-#  ifdef _AIX
+        double percent_used;
+        mp_check overall = mp_check_init();
+        if (config.output_format_is_set) {
+                mp_set_format(config.output_format);
         }
-#  endif
-
-        /* If we get anything on STDERR, at least set warning */
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
-                result = max_state (result, STATE_WARNING);
-
-        /* close stderr */
-        (void) fclose (child_stderr);
+        mp_subcheck sc1 = mp_subcheck_init();
+        sc1 = mp_set_subcheck_default_state(sc1, STATE_OK);
 
-        /* close the pipe */
-        if (spclose (child_process))
-                result = max_state (result, STATE_WARNING);
-# else
-#  ifdef CHECK_SWAP_SWAPCTL_SVR4
+        /* if total_swap_mb == 0, let's not divide by 0 */
+        if (data.metrics.total != 0) {
+                percent_used = HUNDRED_PERCENT * ((double)data.metrics.used) / ((double)data.metrics.total);
+        } else {
+                sc1 = mp_set_subcheck_state(sc1, config.no_swap_state);
+                sc1.output = (char *)_("Swap is either disabled, not present, or of zero size.");
 
-        /* get the number of active swap devices */
-        if((nswaps=swapctl(SC_GETNSWP, NULL))== -1)
-                die(STATE_UNKNOWN, _("Error getting swap devices\n") );
+                mp_add_subcheck_to_check(&overall, sc1);
+                mp_exit(overall);
+        }
 
-        if(nswaps == 0)
-                die(STATE_OK, _("SWAP OK: No swap devices defined\n"));
+        if (verbose) {
+                printf("Computed usage percentage: %g\n", percent_used);
+        }
 
-        if(verbose >= 3)
-                printf("Found %d swap device(s)\n", nswaps);
+        mp_perfdata pd = perfdata_init();
+        pd.label = "swap";
+        pd = mp_set_pd_value(pd, data.metrics.free);
+        pd.uom = "B";
 
-        /* initialize swap table + entries */
-        tbl=(swaptbl_t*)malloc(sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
+        if (config.warn_is_set) {
+                uint64_t warn_print = config.warn.value;
+                if (config.warn.is_percentage) {
+                        warn_print = config.warn.value * (data.metrics.total / HUNDRED_PERCENT);
+                }
 
-        if(tbl==NULL)
-                die(STATE_UNKNOWN, _("malloc() failed!\n"));
+                mp_perfdata_value warn_pd = mp_create_pd_value(warn_print);
 
-        memset(tbl, 0, sizeof(swaptbl_t)+(sizeof(swapent_t)*nswaps));
-        tbl->swt_n=nswaps;
-        for(i=0;i<nswaps;i++){
-                if((tbl->swt_ent[i].ste_path=(char*)malloc(sizeof(char)*MAXPATHLEN)) == NULL)
-                        die(STATE_UNKNOWN, _("malloc() failed!\n"));
-        }
+                mp_range warn_range = mp_range_init();
+                warn_range.end_infinity = false;
+                warn_range.end = warn_pd;
 
-        /* and now, tally 'em up */
-        swapctl_res=swapctl(SC_LIST, tbl);
-        if(swapctl_res < 0){
-                perror(_("swapctl failed: "));
-                die(STATE_UNKNOWN, _("Error in swapctl call\n"));
+                pd.warn = warn_range;
+                pd.warn_present = true;
         }
 
-        for(i=0;i<nswaps;i++){
-                dsktotal_mb = (float) tbl->swt_ent[i].ste_pages / SWAP_CONVERSION;
-                dskfree_mb = (float) tbl->swt_ent[i].ste_free /  SWAP_CONVERSION;
-                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);
-
-                if(allswaps && dsktotal_mb > 0){
-                        percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
-                        result = max_state (result, check_swap (dskfree_mb, dsktotal_mb));
-                        if (verbose) {
-                                xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
-                        }
+        if (config.crit_is_set) {
+                uint64_t crit_print = config.crit.value;
+                if (config.crit.is_percentage) {
+                        crit_print = config.crit.value * (data.metrics.total / HUNDRED_PERCENT);
                 }
 
-                total_swap_mb += dsktotal_mb;
-                free_swap_mb += dskfree_mb;
-                used_swap_mb += dskused_mb;
-        }
+                mp_perfdata_value crit_pd = mp_create_pd_value(crit_print);
 
-        /* and clean up after ourselves */
-        for(i=0;i<nswaps;i++){
-                free(tbl->swt_ent[i].ste_path);
+                mp_range crit_range = mp_range_init();
+                crit_range.end_infinity = false;
+                crit_range.end = crit_pd;
+
+                pd.crit = crit_range;
+                pd.crit_present = true;
         }
-        free(tbl);
-#  else
-#   ifdef CHECK_SWAP_SWAPCTL_BSD
 
-        /* get the number of active swap devices */
-        nswaps=swapctl(SWAP_NSWAP, NULL, 0);
+        mp_perfdata_value max = mp_create_pd_value(data.metrics.total);
+        pd.max = max;
+        pd.max_present = true;
 
-        /* initialize swap table + entries */
-        ent=(struct swapent*)malloc(sizeof(struct swapent)*nswaps);
+        mp_perfdata_value min = mp_create_pd_value(0);
+        pd.min = min;
+        pd.min_present = true;
 
-        /* and now, tally 'em up */
-        swapctl_res=swapctl(SWAP_STATS, ent, nswaps);
-        if(swapctl_res < 0){
-                perror(_("swapctl failed: "));
-                die(STATE_UNKNOWN, _("Error in swapctl call\n"));
+        mp_add_perfdata_to_subcheck(&sc1, pd);
+        if (verbose > 1) {
+                printf("Warn threshold value: %" PRIu64 "\n", config.warn.value);
         }
 
-        for(i=0;i<nswaps;i++){
-                dsktotal_mb = (float) ent[i].se_nblks / conv_factor;
-                dskused_mb = (float) ent[i].se_inuse / conv_factor;
-                dskfree_mb = ( dsktotal_mb - dskused_mb );
-
-                if(allswaps && dsktotal_mb > 0){
-                        percent = 100 * (((double) dskused_mb) / ((double) dsktotal_mb));
-                        result = max_state (result, check_swap(dskfree_mb, dsktotal_mb));
-                        if (verbose) {
-                                xasprintf (&status, "%s [%.0f (%d%%)]", status, dskfree_mb, 100 - percent);
-                        }
+        if (config.warn_is_set) {
+                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);
                 }
-
-                total_swap_mb += dsktotal_mb;
-                free_swap_mb += dskfree_mb;
-                used_swap_mb += dskused_mb;
         }
 
-        /* and clean up after ourselves */
-        free(ent);
-
-#   endif /* CHECK_SWAP_SWAPCTL_BSD */
-#  endif /* CHECK_SWAP_SWAPCTL_SVR4 */
-# endif /* HAVE_SWAP */
-#endif /* HAVE_PROC_MEMINFO */
-
-        /* if total_swap_mb == 0, let's not divide by 0 */
-        if(total_swap_mb) {
-                percent_used = 100 * ((double) used_swap_mb) / ((double) total_swap_mb);
-        } else {
-                percent_used = 100;
-                status = "- Swap is either disabled, not present, or of zero size. ";
+        if (verbose > 1) {
+                printf("Crit threshold value: %" PRIu64 "\n", config.crit.value);
         }
 
-        result = max_state (result, check_swap(free_swap_mb, total_swap_mb));
-        printf (_("SWAP %s - %d%% free (%dMB out of %dMB) %s|"),
-                        state_text (result),
-                        (100 - percent_used), (int) free_swap_mb, (int) total_swap_mb, status);
+        if (config.crit_is_set) {
+                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);
+                }
+        }
 
-        uint64_t warn_print = warn.value;
-        if (warn.is_percentage) warn_print = warn.value * (total_swap_mb *1024 *1024/100);
-        uint64_t crit_print = crit.value;
-        if (crit.is_percentage) crit_print = crit.value * (total_swap_mb *1024 *1024/100);
+        xasprintf(&sc1.output, _("%g%% free (%lluMiB out of %lluMiB)"), (100 - percent_used), data.metrics.free >> 20,
+                          data.metrics.total >> 20);
 
-        puts (perfdata_uint64 ("swap", free_swap_mb *1024 *1024, "B",
-                        true, warn_print,
-                        true, crit_print,
-                        true, 0,
-                        true, (long) total_swap_mb * 1024 * 1024));
+        overall.summary = "Swap";
+        mp_add_subcheck_to_check(&overall, sc1);
 
-        return result;
+        mp_exit(overall);
 }
 
+int check_swap(float free_swap_mb, float total_swap_mb, swap_config config) {
+        if (total_swap_mb == 0) {
+                return config.no_swap_state;
+        }
 
-int
-check_swap(float free_swap_mb, float total_swap_mb)
-{
-
-        if (!total_swap_mb) return 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 = free_swap_mb * (1024 * 1024);              /* Convert back to bytes as warn and crit specified in bytes */
-        uint64_t usage_percentage = ((total_swap_mb - free_swap_mb) / total_swap_mb) * 100;
+        if (!config.crit.is_percentage && config.crit.value >= free_swap) {
+                return STATE_CRITICAL;
+        }
+        if (!config.warn.is_percentage && config.warn.value >= free_swap) {
+                return STATE_WARNING;
+        }
 
-        if (warn.value || crit.value) {                                 /* Thresholds defined */
-                if (!crit.is_percentage && crit.value >= free_swap) return STATE_CRITICAL;
-                if (!warn.is_percentage && warn.value >= free_swap) return STATE_WARNING;
+        uint64_t usage_percentage = (uint64_t)((total_swap_mb - free_swap_mb) / total_swap_mb) * HUNDRED_PERCENT;
 
-                if (crit.is_percentage &&
-                                crit.value != 0 &&
-                                usage_percentage >= (100 - crit.value))
-                {
-                                return STATE_CRITICAL;
-                }
+        if (config.crit.is_percentage && config.crit.value != 0 && usage_percentage >= (HUNDRED_PERCENT - config.crit.value)) {
+                return STATE_CRITICAL;
+        }
 
-                if (warn.is_percentage &&
-                                warn.value != 0 &&
-                                usage_percentage >= (100 - warn.value))
-                {
-                                return STATE_WARNING;
-                }
+        if (config.warn.is_percentage && config.warn.value != 0 && usage_percentage >= (HUNDRED_PERCENT - config.warn.value)) {
+                return STATE_WARNING;
+        }
 
-                return STATE_OK;
-        } else {                                                        /* Without thresholds */
-                return STATE_OK;
-        }
+        return STATE_OK;
 }
 
-
+#define output_format_index CHAR_MAX + 1
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c = 0;  /* option character */
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"warning", required_argument, 0, 'w'},
-                {"critical", required_argument, 0, 'c'},
-                {"allswaps", no_argument, 0, 'a'},
-                {"no-swap", required_argument, 0, 'n'},
-                {"verbose", no_argument, 0, 'v'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
-
-        while (1) {
-                c = getopt_long (argc, argv, "+?Vvhac:w:n:", longopts, &option);
-
-                if (c == -1 || c == EOF)
+swap_config_wrapper process_arguments(int argc, char **argv) {
+        swap_config_wrapper conf_wrapper = {.errorcode = OK};
+        conf_wrapper.config = swap_config_init();
+
+        static struct option longopts[] = {{"warning", required_argument, 0, 'w'},
+                                                                           {"critical", required_argument, 0, 'c'},
+                                                                           {"allswaps", no_argument, 0, 'a'},
+                                                                           {"no-swap", required_argument, 0, 'n'},
+                                                                           {"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}};
+
+        while (true) {
+                int option = 0;
+                int option_char = getopt_long(argc, argv, "+?Vvhac:w:n:", longopts, &option);
+
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
+                switch (option_char) {
                 case 'w': /* warning size threshold */
-                        {
-                                /*
-                                 * We expect either a positive integer value without a unit, which means
-                                 * the unit is Bytes or a positive integer value and a percentage sign (%),
-                                 * which means the value must be with 0 and 100 and is relative to the total swap
-                                 */
-                                size_t length;
-                                length = strlen(optarg);
-
-                                if (optarg[length - 1] == '%') {
-                                        /* It's percentage */
-                                        warn.is_percentage = true;
-                                        optarg[length - 1] = '\0';
-                                        if (is_uint64(optarg, &warn.value)) {
-                                                if (warn.value > 100) {
-                                                        usage4 (_("Warning threshold percentage must be <= 100!"));
-                                                }
-                                        }
-                                        break;
-                                } else {
-                                        /* It's Bytes */
-                                        warn.is_percentage = false;
-                                        if (is_uint64(optarg, &warn.value)) {
-                                                break;
-                                        } else {
-                                                usage4 (_("Warning threshold be positive integer or percentage!"));
+                {
+                        /*
+                         * We expect either a positive integer value without a unit, which
+                         * means the unit is Bytes or a positive integer value and a
+                         * percentage sign (%), which means the value must be with 0 and 100
+                         * and is relative to the total swap
+                         */
+                        size_t length;
+                        length = strlen(optarg);
+                        conf_wrapper.config.warn_is_set = true;
+
+                        if (optarg[length - 1] == '%') {
+                                /* It's percentage */
+                                conf_wrapper.config.warn.is_percentage = true;
+                                optarg[length - 1] = '\0';
+                                if (is_uint64(optarg, &conf_wrapper.config.warn.value)) {
+                                        if (conf_wrapper.config.warn.value > HUNDRED_PERCENT) {
+                                                usage4(_("Warning threshold percentage must be <= 100!"));
                                         }
                                 }
+                                break;
+                        } /* It's Bytes */
+                        conf_wrapper.config.warn.is_percentage = false;
+                        if (is_uint64(optarg, &conf_wrapper.config.warn.value)) {
+                                break;
                         }
+                        usage4(_("Warning threshold be positive integer or "
+                                         "percentage!"));
+                }
                 case 'c': /* critical size threshold */
-                        {
-                                /*
-                                 * We expect either a positive integer value without a unit, which means
-                                 * the unit is Bytes or a positive integer value and a percentage sign (%),
-                                 * which means the value must be with 0 and 100 and is relative to the total swap
-                                 */
-                                size_t length;
-                                length = strlen(optarg);
-
-                                if (optarg[length - 1] == '%') {
-                                        /* It's percentage */
-                                        crit.is_percentage = true;
-                                        optarg[length - 1] = '\0';
-                                        if (is_uint64(optarg, &crit.value)) {
-                                                if (crit.value> 100) {
-                                                        usage4 (_("Critical threshold percentage must be <= 100!"));
-                                                }
-                                        }
-                                        break;
-                                } else {
-                                        /* It's Bytes */
-                                        crit.is_percentage = false;
-                                        if (is_uint64(optarg, &crit.value)) {
-                                                break;
-                                        } else {
-                                                usage4 (_("Critical threshold be positive integer or percentage!"));
+                {
+                        /*
+                         * We expect either a positive integer value without a unit, which
+                         * means the unit is Bytes or a positive integer value and a
+                         * percentage sign (%), which means the value must be with 0 and 100
+                         * and is relative to the total swap
+                         */
+                        size_t length;
+                        length = strlen(optarg);
+                        conf_wrapper.config.crit_is_set = true;
+
+                        if (optarg[length - 1] == '%') {
+                                /* It's percentage */
+                                conf_wrapper.config.crit.is_percentage = true;
+                                optarg[length - 1] = '\0';
+                                if (is_uint64(optarg, &conf_wrapper.config.crit.value)) {
+                                        if (conf_wrapper.config.crit.value > HUNDRED_PERCENT) {
+                                                usage4(_("Critical threshold percentage must be <= 100!"));
                                         }
                                 }
-                          }
-                case 'a':                                                                       /* all swap */
-                        allswaps = true;
+                                break;
+                        } /* It's Bytes */
+                        conf_wrapper.config.crit.is_percentage = false;
+                        if (is_uint64(optarg, &conf_wrapper.config.crit.value)) {
+                                break;
+                        }
+                        usage4(_("Critical threshold be positive integer or "
+                                         "percentage!"));
+                }
+                case 'a': /* all swap */
+                        conf_wrapper.config.allswaps = true;
                         break;
                 case 'n':
-                        if ((no_swap_state = mp_translate_state(optarg)) == ERROR) {
-                                usage4 (_("no-swap result must be a valid state name (OK, WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
+                        if ((conf_wrapper.config.no_swap_state = mp_translate_state(optarg)) == ERROR) {
+                                usage4(_("no-swap result must be a valid state name (OK, "
+                                                 "WARNING, CRITICAL, UNKNOWN) or integer (0-3)."));
                         }
                         break;
-                case 'v':                                                                       /* verbose */
+                case 'v': /* verbose */
                         verbose++;
                         break;
-                case 'V':                                                                       /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (STATE_UNKNOWN);
-                case 'h':                                                                       /* help */
-                        print_help ();
-                        exit (STATE_UNKNOWN);
-                case '?':                                                                       /* error */
-                        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);
+                        }
+
+                        conf_wrapper.config.output_format_is_set = true;
+                        conf_wrapper.config.output_format = parser.output_format;
+                        break;
+                }
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'h': /* help */
+                        print_help(conf_wrapper.config);
+                        exit(STATE_UNKNOWN);
+                case '?': /* error */
+                        usage5();
                 }
         }
 
-        c = optind;
-        if (c == argc)
-                return validate_arguments ();
-
-        return validate_arguments ();
-}
-
-
-
-int
-validate_arguments (void)
-{
-        if ((warn.is_percentage == crit.is_percentage) && (warn.value < crit.value)) {
-                /* This is NOT triggered if warn and crit are different units, e.g warn is percentage
-                 * and crit is absolute. We cannot determine the condition at this point since we
-                 * dont know the value of total swap yet
+        if ((conf_wrapper.config.warn.is_percentage == conf_wrapper.config.crit.is_percentage) &&
+                (conf_wrapper.config.warn.value < conf_wrapper.config.crit.value)) {
+                /* This is NOT triggered if warn and crit are different units, e.g warn
+                 * is percentage and crit is absolute. We cannot determine the condition
+                 * at this point since we dont know the value of total swap yet
                  */
                 usage4(_("Warning should be more than critical"));
         }
-        return OK;
-}
-
 
-
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf (_(COPYRIGHT), copyright, email);
-
-        printf ("%s\n", _("Check swap space on local machine."));
-
-        printf ("\n\n");
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (" %s\n", "-w, --warning=INTEGER");
-        printf ("    %s\n", _("Exit with WARNING status if less than INTEGER bytes of swap space are free"));
-        printf (" %s\n", "-w, --warning=PERCENT%");
-        printf ("    %s\n", _("Exit with WARNING status if less than PERCENT of swap space is free"));
-        printf (" %s\n", "-c, --critical=INTEGER");
-        printf ("    %s\n", _("Exit with CRITICAL status if less than INTEGER bytes of swap space are free"));
-        printf (" %s\n", "-c, --critical=PERCENT%");
-        printf ("    %s\n", _("Exit with CRITICAL status if less than PERCENT of swap space is free"));
-        printf (" %s\n", "-a, --allswaps");
-        printf ("    %s\n", _("Conduct comparisons for all swap partitions, one by one"));
-        printf (" %s\n", "-n, --no-swap=<ok|warning|critical|unknown>");
-        printf ("    %s %s\n", _("Resulting state when there is no swap regardless of thresholds. Default:"), state_text(no_swap_state));
-        printf (UT_VERBOSE);
-
-        printf ("\n");
-        printf ("%s\n", _("Notes:"));
-        printf (" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, they are all checked."));
-        printf (" %s\n", _("Without thresholds, the plugin shows free swap space and performance data, but always returns OK."));
-        printf (" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
-
-        printf (UT_SUPPORT);
+        return conf_wrapper;
 }
 
+void print_help(swap_config config) {
+        print_revision(progname, NP_VERSION);
+
+        printf(_(COPYRIGHT), copyright, email);
+
+        printf("%s\n", _("Check swap space on local machine."));
+
+        printf("\n\n");
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(" %s\n", "-w, --warning=INTEGER");
+        printf("    %s\n", _("Exit with WARNING status if less than INTEGER bytes "
+                                                 "of swap space are free"));
+        printf(" %s\n", "-w, --warning=PERCENT%");
+        printf("    %s\n", _("Exit with WARNING status if less than PERCENT of "
+                                                 "swap space is free"));
+        printf(" %s\n", "-c, --critical=INTEGER");
+        printf("    %s\n", _("Exit with CRITICAL status if less than INTEGER bytes "
+                                                 "of swap space are free"));
+        printf(" %s\n", "-c, --critical=PERCENT%");
+        printf("    %s\n", _("Exit with CRITICAL status if less than PERCENT of "
+                                                 "swap space is free"));
+        printf(" %s\n", "-a, --allswaps");
+        printf("    %s\n", _("Conduct comparisons for all swap partitions, one by one"));
+        printf(" %s\n", "-n, --no-swap=<ok|warning|critical|unknown>");
+        printf("    %s %s\n",
+                   _("Resulting state when there is no swap regardless of thresholds. "
+                         "Default:"),
+                   state_text(config.no_swap_state));
+        printf(UT_OUTPUT_FORMAT);
+        printf(UT_VERBOSE);
+
+        printf("\n");
+        printf("%s\n", _("Notes:"));
+        printf(" %s\n", _("Both INTEGER and PERCENT thresholds can be specified, "
+                                          "they are all checked."));
+        printf(" %s\n", _("On AIX, if -a is specified, uses lsps -a, otherwise uses lsps -s."));
+
+        printf(UT_SUPPORT);
+}
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf (" %s [-av] [-w <percent_free>%%] [-c <percent_free>%%]\n",progname);
-        printf ("  [-w <bytes_free>] [-c <bytes_free>] [-n <state>]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf(" %s [-av] -w <percent_free>%% -c <percent_free>%%\n", progname);
+        printf("  -w <bytes_free> -c <bytes_free> [-n <state>]\n");
 }
diff --git a/plugins/check_swap.d/check_swap.h b/plugins/check_swap.d/check_swap.h
new file mode 100644
index 00000000..da08d65a
--- /dev/null
+++ b/plugins/check_swap.d/check_swap.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "../common.h"
+#include "../../lib/output.h"
+#include "../../lib/states.h"
+
+#ifndef SWAP_CONVERSION
+#       define SWAP_CONVERSION 1
+#endif
+
+typedef struct {
+        bool is_percentage;
+        uint64_t value;
+} check_swap_threshold;
+
+typedef struct {
+        unsigned long long free;  // Free swap in Bytes!
+        unsigned long long used;  // Used swap in Bytes!
+        unsigned long long total; // Total swap size, you guessed it, in Bytes!
+} swap_metrics;
+
+typedef struct {
+        int errorcode;
+        int statusCode;
+        swap_metrics metrics;
+} swap_result;
+
+typedef struct {
+        bool allswaps;
+        mp_state_enum no_swap_state;
+        bool warn_is_set;
+        check_swap_threshold warn;
+        bool crit_is_set;
+        check_swap_threshold crit;
+        bool on_aix;
+        int conversion_factor;
+
+        bool output_format_is_set;
+        mp_output_format output_format;
+} swap_config;
+
+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 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
new file mode 100644
index 00000000..634f80d9
--- /dev/null
+++ b/plugins/check_swap.d/swap.c
@@ -0,0 +1,465 @@
+#include "./check_swap.d/check_swap.h"
+#include "../popen.h"
+#include "../utils.h"
+#include "common.h"
+
+extern int verbose;
+
+swap_config swap_config_init(void) {
+        swap_config tmp = {0};
+        tmp.allswaps = false;
+        tmp.no_swap_state = STATE_CRITICAL;
+        tmp.conversion_factor = SWAP_CONVERSION;
+
+        tmp.warn_is_set = false;
+        tmp.crit_is_set = false;
+
+        tmp.output_format_is_set = false;
+
+#ifdef _AIX
+        tmp.on_aix = true;
+#else
+        tmp.on_aix = false;
+#endif
+
+        return tmp;
+}
+
+swap_result get_swap_data(swap_config config) {
+#ifdef HAVE_PROC_MEMINFO
+        if (verbose >= 3) {
+                printf("Reading PROC_MEMINFO at %s\n", PROC_MEMINFO);
+        }
+
+        return getSwapFromProcMeminfo(PROC_MEMINFO);
+#else // HAVE_PROC_MEMINFO
+#       ifdef HAVE_SWAP
+        if (verbose >= 3) {
+                printf("Using swap command %s with format: %s\n", SWAP_COMMAND, SWAP_FORMAT);
+        }
+
+        /* These override the command used if a summary (and thus ! allswaps) is
+         * required
+         * The summary flag returns more accurate information about swap usage on these
+         * OSes */
+        if (config.on_aix && !config.allswaps) {
+
+                config.conversion_factor = 1;
+
+                return getSwapFromSwapCommand(config, "/usr/sbin/lsps -s", "%lu%*s %lu");
+        } else {
+                return getSwapFromSwapCommand(config, SWAP_COMMAND, SWAP_FORMAT);
+        }
+#       else // HAVE_SWAP
+#               ifdef CHECK_SWAP_SWAPCTL_SVR4
+        return getSwapFromSwapctl_SRV4();
+#               else // CHECK_SWAP_SWAPCTL_SVR4
+#                       ifdef CHECK_SWAP_SWAPCTL_BSD
+        return getSwapFromSwapctl_BSD();
+#                       else // CHECK_SWAP_SWAPCTL_BSD
+#                               error No way found to retrieve swap
+#                       endif /* CHECK_SWAP_SWAPCTL_BSD */
+#               endif     /* CHECK_SWAP_SWAPCTL_SVR4 */
+#       endif         /* HAVE_SWAP */
+#endif             /* HAVE_PROC_MEMINFO */
+}
+
+swap_result getSwapFromProcMeminfo(char proc_meminfo[]) {
+        FILE *meminfo_file_ptr;
+        meminfo_file_ptr = fopen(proc_meminfo, "r");
+
+        swap_result result = {};
+        result.errorcode = STATE_UNKNOWN;
+
+        if (meminfo_file_ptr == NULL) {
+                // failed to open meminfo file
+                // errno should contain an error
+                result.errorcode = STATE_UNKNOWN;
+                return result;
+        }
+
+        unsigned long swap_total = 0;
+        unsigned long swap_used = 0;
+        unsigned long swap_free = 0;
+
+        bool found_total = 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)) {
+
+                /*
+                 * The following sscanf call looks for a line looking like: "Swap: 123
+                 * 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) {
+                        found_total = true;
+                        found_free = 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);
+                        }
+
+                        /* 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.free = swap_free;
+        result.metrics.used = swap_total - swap_free;
+
+        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 result = {0};
+
+        char *temp_buffer;
+
+        if (verbose >= 2) {
+                printf(_("Command: %s\n"), swap_command);
+        }
+        if (verbose >= 3) {
+                printf(_("Format: %s\n"), swap_format);
+        }
+
+        child_process = spopen(swap_command);
+        if (child_process == NULL) {
+                printf(_("Could not open pipe: %s\n"), swap_command);
+                swap_result tmp = {
+                        .errorcode = STATE_UNKNOWN,
+                };
+                return tmp;
+        }
+
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
+        if (child_stderr == NULL) {
+                printf(_("Could not open stderr for %s\n"), swap_command);
+        }
+
+        char str[32] = {0};
+        char input_buffer[MAX_INPUT_BUFFER];
+
+        /* read 1st line */
+        fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process);
+        if (strcmp(swap_format, "") == 0) {
+                temp_buffer = strtok(input_buffer, " \n");
+                while (temp_buffer) {
+                        if (strstr(temp_buffer, "blocks")) {
+                                sprintf(str, "%s %s", str, "%lu");
+                        } else if (strstr(temp_buffer, "dskfree")) {
+                                sprintf(str, "%s %s", str, "%lu");
+                        } else {
+                                sprintf(str, "%s %s", str, "%*s");
+                        }
+                        temp_buffer = strtok(NULL, " \n");
+                }
+        }
+
+        double total_swap_mb = 0;
+        double free_swap_mb = 0;
+        double used_swap_mb = 0;
+        double dsktotal_mb = 0;
+        double dskused_mb = 0;
+        double dskfree_mb = 0;
+
+        /*
+         * If different swap command is used for summary switch, need to read format
+         * differently
+         */
+        if (config.on_aix && !config.allswaps) {
+                fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process); /* Ignore first line */
+                sscanf(input_buffer, swap_format, &total_swap_mb, &used_swap_mb);
+                free_swap_mb = total_swap_mb * (100 - used_swap_mb) / 100;
+                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);
+                }
+        } else {
+                while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+                        sscanf(input_buffer, swap_format, &dsktotal_mb, &dskfree_mb);
+
+                        dsktotal_mb = dsktotal_mb / config.conversion_factor;
+                        /* AIX lists percent used, so this converts to dskfree in MBs */
+
+                        if (config.on_aix) {
+                                dskfree_mb = dsktotal_mb * (100 - dskfree_mb) / 100;
+                        } else {
+                                dskfree_mb = dskfree_mb / config.conversion_factor;
+                        }
+
+                        if (verbose >= 3) {
+                                printf(_("total=%.0f, free=%.0f\n"), dsktotal_mb, dskfree_mb);
+                        }
+
+                        dskused_mb = dsktotal_mb - dskfree_mb;
+                        total_swap_mb += dsktotal_mb;
+                        used_swap_mb += dskused_mb;
+                        free_swap_mb += dskfree_mb;
+                }
+        }
+
+        result.metrics.free = free_swap_mb * 1024 * 1024;
+        result.metrics.used = used_swap_mb * 1024 * 1024;
+        result.metrics.total = free_swap_mb * 1024 * 1024;
+
+        /* If we get anything on STDERR, at least set warning */
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_stderr)) {
+                result.statusCode = max_state(result.statusCode, STATE_WARNING);
+                // TODO Set error here
+        }
+
+        /* close stderr */
+        (void)fclose(child_stderr);
+
+        /* close the pipe */
+        if (spclose(child_process)) {
+                result.statusCode = max_state(result.statusCode, STATE_WARNING);
+                // TODO set error here
+        }
+
+        return result;
+}
+
+#ifndef CHECK_SWAP_SWAPCTL_BSD
+#       define CHECK_SWAP_SWAPCTL_BSD
+
+// Stub functionality for BSD stuff, so the compiler always sees the following BSD code
+
+#       define SWAP_NSWAP 0
+#       define SWAP_STATS 1
+
+int bsd_swapctl(int cmd, const void *arg, int misc) {
+        (void)cmd;
+        (void)arg;
+        (void)misc;
+        return 512;
+}
+
+struct swapent {
+        dev_t se_dev;           /* device id */
+        int se_flags;           /* entry flags */
+        int se_nblks;           /* total blocks */
+        int se_inuse;           /* blocks in use */
+        int se_priority;        /* priority */
+        char se_path[PATH_MAX]; /* path to entry */
+};
+
+#else
+
+// Includes for NetBSD
+#       include <unistd.h>
+#       include <sys/swap.h>
+
+#       define bsd_swapctl swapctl
+
+#endif // CHECK_SWAP_SWAPCTL_BSD
+
+swap_result getSwapFromSwapctl_BSD(swap_config config) {
+        /* get the number of active swap devices */
+        int nswaps = bsd_swapctl(SWAP_NSWAP, NULL, 0);
+
+        /* initialize swap table + entries */
+        struct swapent *ent = (struct swapent *)malloc(sizeof(struct swapent) * (unsigned long)nswaps);
+
+        /* and now, tally 'em up */
+        int swapctl_res = bsd_swapctl(SWAP_STATS, ent, nswaps);
+        if (swapctl_res < 0) {
+                perror(_("swapctl failed: "));
+                die(STATE_UNKNOWN, _("Error in swapctl call\n"));
+        }
+
+        double dsktotal_mb = 0.0;
+        double dskfree_mb = 0.0;
+        double dskused_mb = 0.0;
+        unsigned long long total_swap_mb = 0;
+        unsigned long long free_swap_mb = 0;
+        unsigned long long used_swap_mb = 0;
+
+        for (int i = 0; i < nswaps; i++) {
+                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) {
+                        double percent = 100 * (((double)dskused_mb) / ((double)dsktotal_mb));
+
+                        if (verbose) {
+                                printf("[%.0f (%g%%)]", dskfree_mb, 100 - percent);
+                        }
+                }
+
+                total_swap_mb += (unsigned long long)dsktotal_mb;
+                free_swap_mb += (unsigned long long)dskfree_mb;
+                used_swap_mb += (unsigned long long)dskused_mb;
+        }
+
+        /* and clean up after ourselves */
+        free(ent);
+
+        swap_result result = {0};
+
+        result.statusCode = OK;
+        result.errorcode = OK;
+
+        result.metrics.total = total_swap_mb * 1024 * 1024;
+        result.metrics.free = free_swap_mb * 1024 * 1024;
+        result.metrics.used = used_swap_mb * 1024 * 1024;
+
+        return result;
+}
+
+#ifndef CHECK_SWAP_SWAPCTL_SVR4
+int srv4_swapctl(int cmd, void *arg) {
+        (void)cmd;
+        (void)arg;
+        return 512;
+}
+
+typedef struct srv4_swapent {
+        char *ste_path;   /* name of the swap   file */
+        off_t ste_start;  /* starting   block for swapping */
+        off_t ste_length; /* length of swap area */
+        long ste_pages;   /* number of pages for swapping */
+        long ste_free;    /* number of ste_pages free   */
+        long ste_flags;   /* ST_INDEL   bit set if swap file */
+                                          /* is now being deleted */
+} swapent_t;
+
+typedef struct swaptbl {
+        int swt_n;                     /* number of swapents following */
+        struct srv4_swapent swt_ent[]; /* array of swt_n swapents */
+} swaptbl_t;
+
+#       define SC_LIST    2
+#       define SC_GETNSWP 3
+
+#       ifndef MAXPATHLEN
+#               define MAXPATHLEN 2048
+#       endif
+
+#else
+#       define srv4_swapctl swapctl
+#endif
+
+swap_result getSwapFromSwap_SRV4(swap_config config) {
+        int nswaps = 0;
+
+        /* get the number of active swap devices */
+        if ((nswaps = srv4_swapctl(SC_GETNSWP, NULL)) == -1) {
+                die(STATE_UNKNOWN, _("Error getting swap devices\n"));
+        }
+
+        if (nswaps == 0) {
+                die(STATE_OK, _("SWAP OK: No swap devices defined\n"));
+        }
+
+        if (verbose >= 3) {
+                printf("Found %d swap device(s)\n", nswaps);
+        }
+
+        /* initialize swap table + entries */
+        swaptbl_t *tbl = (swaptbl_t *)malloc(sizeof(swaptbl_t) + (sizeof(swapent_t) * (unsigned long)nswaps));
+
+        if (tbl == NULL) {
+                die(STATE_UNKNOWN, _("malloc() failed!\n"));
+        }
+
+        memset(tbl, 0, sizeof(swaptbl_t) + (sizeof(swapent_t) * (unsigned long)nswaps));
+        tbl->swt_n = nswaps;
+
+        for (int i = 0; i < nswaps; i++) {
+                if ((tbl->swt_ent[i].ste_path = (char *)malloc(sizeof(char) * MAXPATHLEN)) == NULL) {
+                        die(STATE_UNKNOWN, _("malloc() failed!\n"));
+                }
+        }
+
+        /* and now, tally 'em up */
+        int swapctl_res = srv4_swapctl(SC_LIST, tbl);
+        if (swapctl_res < 0) {
+                perror(_("swapctl failed: "));
+                die(STATE_UNKNOWN, _("Error in swapctl call\n"));
+        }
+
+        double dsktotal_mb = 0.0;
+        double dskfree_mb = 0.0;
+        double dskused_mb = 0.0;
+        unsigned long long total_swap_mb = 0;
+        unsigned long long free_swap_mb = 0;
+        unsigned long long used_swap_mb = 0;
+
+        for (int i = 0; i < nswaps; i++) {
+                dsktotal_mb = (float)tbl->swt_ent[i].ste_pages / SWAP_CONVERSION;
+                dskfree_mb = (float)tbl->swt_ent[i].ste_free / SWAP_CONVERSION;
+                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);
+                }
+
+                if (config.allswaps && dsktotal_mb > 0) {
+                        double percent = 100 * (((double)dskused_mb) / ((double)dsktotal_mb));
+
+                        if (verbose) {
+                                printf("[%.0f (%g%%)]", dskfree_mb, 100 - percent);
+                        }
+                }
+
+                total_swap_mb += (unsigned long long)dsktotal_mb;
+                free_swap_mb += (unsigned long long)dskfree_mb;
+                used_swap_mb += (unsigned long long)dskused_mb;
+        }
+
+        /* and clean up after ourselves */
+        for (int i = 0; i < nswaps; i++) {
+                free(tbl->swt_ent[i].ste_path);
+        }
+        free(tbl);
+
+        swap_result result = {0};
+        result.errorcode = OK;
+        result.metrics.total = total_swap_mb * 1024 * 1024;
+        result.metrics.free = free_swap_mb * 1024 * 1024;
+        result.metrics.used = used_swap_mb * 1024 * 1024;
+
+        return result;
+}
diff --git a/plugins/check_tcp.c b/plugins/check_tcp.c
index 01dd35eb..22dcc74e 100644
--- a/plugins/check_tcp.c
+++ b/plugins/check_tcp.c
@@ -1,714 +1,797 @@
 /*****************************************************************************
-*
-* Monitoring check_tcp plugin
-*
-* License: GPL
-* Copyright (c) 1999-2013 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_tcp plugin
-*
-*
-* 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/>.
-*
-* $Id$
-*
-*****************************************************************************/
+ *
+ * Monitoring check_tcp plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2025 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_tcp plugin
+ *
+ *
+ * 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/>.
+ *
+ * $Id$
+ *
+ *****************************************************************************/
 
 /* progname "check_tcp" changes depending on symlink called */
 char *progname;
-const char *copyright = "1999-2008";
+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);
+}
 
-/* int my_recv(char *, size_t); */
-static int process_arguments (int, char **);
-void print_help (void);
-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;
-
+ssize_t my_send(int socket_descriptor, char *buf, size_t len, bool use_tls) {
 #ifdef HAVE_SSL
-static char *sni = NULL;
-static bool sni_specified = false;
+        if (use_tls) {
+                return np_net_ssl_write(buf, (int)len);
+        }
 #endif
+        return write(socket_descriptor, buf, len);
+}
 
-#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;
-
-int
-main (int argc, char **argv)
-{
-        int result = STATE_UNKNOWN;
-        char *status = NULL;
-        struct timeval tv;
-        struct timeval timeout;
-        int match = -1;
-        fd_set rfds;
-
-        FD_ZERO(&rfds);
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+
+int verbosity = 0;
+
+static const int READ_TIMEOUT = 2;
+
+const int MAXBUF = 1024;
+
+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, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* determine program- and service-name quickly */
         progname = strrchr(argv[0], '/');
-        if(progname != NULL) progname++;
-        else progname = argv[0];
+        if (progname != NULL) {
+                progname++;
+        } 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(sizeof(char *), 2);
+        config.server_expect = calloc(2, sizeof(char *));
 
-        /* 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;
+        if (config.server_expect == NULL) {
+                die(STATE_UNKNOWN, _("Allocation failed"));
         }
-        else if (!strncmp(SERVICE, "IMAP", 4)) {
-                EXPECT = "* OK";
-                QUIT = "a1 LOGOUT\r\n";
-                PORT = 143;
+
+        /* determine defaults for this service's protocol */
+        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"))
-                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;
-        status = NULL;
+        else if (strcmp(config.service, "TCP")) {
+                usage(_("CRITICAL - Generic check_tcp called with unknown service\n"));
+        }
 
         /* Parse extra opts if any */
-        argv=np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_tcp_config_wrapper paw = process_arguments(argc, argv, config);
+        if (paw.errorcode == ERROR) {
+                usage4(_("Could not parse arguments"));
+        }
 
-        if (process_arguments (argc, argv) == 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);
+        signal(SIGALRM, socket_timeout_alarm_handler);
+        alarm(socket_timeout);
 
         /* try to connect to the host at the given port number */
-        gettimeofday (&tv, NULL);
-
-        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();
 
-        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);
-                        timeout.tv_sec  = READ_TIMEOUT;
+                        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 (config.quit != NULL) {
+                my_send(socket_descriptor, config.quit, strlen(config.quit), config.use_tls);
         }
 
-        if (server_quit != NULL) {
-                my_send(server_quit, strlen(server_quit));
+        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;
 
-        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_subcheck elapsed_time_result = mp_subcheck_init();
 
-        /* did we get the response we hoped? */
-        if(match == NP_MATCH_FAILURE && result != STATE_CRITICAL)
-                result = expect_mismatch_state;
+        mp_perfdata time_pd = perfdata_init();
+        time_pd = mp_set_pd_value(time_pd, elapsed_time);
+        time_pd.label = "time";
+        time_pd.uom = "s";
 
-        /* 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 (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 (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_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) {
+                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);
 
-/* process command-line arguments */
-static int process_arguments (int argc, char **argv) {
-        int c;
-        bool escape = false;
-        char *temp;
+        mp_exit(overall);
+}
 
+/* process command-line arguments */
+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,
         };
 
-        int option = 0;
-        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)
-                usage4 (_("No arguments found"));
+        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 (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0) {
+                        strcpy(argv[i], "-t");
+                } else if (strcmp("-wt", argv[i]) == 0) {
+                        strcpy(argv[i], "-w");
+                } else if (strcmp("-ct", argv[i]) == 0) {
+                        strcpy(argv[i], "-c");
+                }
         }
 
-        if (!is_option (argv[1])) {
-                server_address = argv[1];
+        if (!is_option(argv[1])) {
+                config.server_address = argv[1];
                 argv[1] = argv[0];
                 argv = &argv[1];
                 argc--;
         }
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hVv46EAH:s:e:q:m:c:w:t:p:C:W:d:Sr:jD:M:",
-                                 longopts, &option);
+        bool escape = false;
+
+        while (true) {
+                int option = 0;
+                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 (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 */
-                        flags |= FLAG_VERBOSE;
-                        match_flags |= NP_MATCH_VERBOSE;
+                switch (option_index) {
+                case '?': /* print short usage statement if args not parsable */
+                        usage5();
+                case 'h': /* help */
+                        print_help(config.service);
+                        exit(STATE_UNKNOWN);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(STATE_UNKNOWN);
+                case 'v': /* verbose mode */
+                        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
-                        usage4 (_("IPv6 support not available"));
+                        usage4(_("IPv6 support not available"));
 #endif
                         break;
-                case 'H':                 /* hostname */
-                        host_specified = true;
-                        server_address = optarg;
-                        break;
-                case 'c':                 /* critical */
-                        critical_time = strtod (optarg, NULL);
-                        flags |= FLAG_TIME_CRIT;
+                case 'H': /* hostname */
+                        config.host_specified = true;
+                        config.server_address = optarg;
                         break;
-                case 'j':                 /* hide output */
-                        flags |= FLAG_HIDE_OUTPUT;
+                case 'c': /* critical */
+                        config.critical_time = strtod(optarg, NULL);
+                        config.critical_time_set = true;
                         break;
-                case 'w':                 /* warning */
-                        warning_time = strtod (optarg, NULL);
-                        flags |= FLAG_TIME_WARN;
+                case 'j': /* hide output */
+                        config.hide_output = true;
                         break;
-                case 'C':
-                        crit_codes = realloc (crit_codes, ++crit_codes_count);
-                        crit_codes[crit_codes_count - 1] = optarg;
+                case 'w': /* warning */
+                        config.warning_time = strtod(optarg, NULL);
+                        config.warning_time_set = true;
                         break;
-                case 'W':
-                        warn_codes = realloc (warn_codes, ++warn_codes_count);
-                        warn_codes[warn_codes_count - 1] = optarg;
-                        break;
-                case 't':                 /* timeout */
-                        if (!is_intpos (optarg))
-                                usage4 (_("Timeout interval must be a positive integer"));
-                        else
-                                socket_timeout = atoi (optarg);
+                case 't': /* timeout */
+                        if (!is_intpos(optarg)) {
+                                usage4(_("Timeout interval must be a positive integer"));
+                        } else {
+                                socket_timeout = atoi(optarg);
+                        }
                         break;
-                case 'p':                 /* port */
-                        if (!is_intpos (optarg))
-                                usage4 (_("Port must be a positive integer"));
-                        else
-                                server_port = atoi (optarg);
+                case 'p': /* port */
+                        if (!is_intpos(optarg)) {
+                                usage4(_("Port must be a positive integer"));
+                        } 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))
-                                usage4 (_("Maxbytes must be a positive integer"));
-                        else
-                                maxbytes = strtol (optarg, NULL, 0);
+                        if (!is_intpos(optarg)) {
+                                usage4(_("Maxbytes must be a positive integer"));
+                        } 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
-                                usage4 (_("Refuse must be one of ok, warn, crit"));
+                        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
-                                usage4 (_("Mismatch must be one of ok, warn, crit"));
+                        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
-                                usage4 (_("Delay must be a positive integer"));
+                        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 */
 #ifdef HAVE_SSL
-#  ifdef USE_OPENSSL /* XXX */
-                        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);
+#       ifdef USE_OPENSSL /* XXX */
+                {
+                        char *temp;
+                        if ((temp = strchr(optarg, ',')) != NULL) {
+                                *temp = '\0';
+                                if (!is_intnonneg(optarg)) {
+                                        usage2(_("Invalid certificate expiration period"), optarg);
+                                }
+                                config.days_till_exp_warn = atoi(optarg);
+                                *temp = ',';
+                                temp++;
+                                if (!is_intnonneg(temp)) {
+                                        usage2(_("Invalid certificate expiration period"), temp);
+                                }
+                                config.days_till_exp_crit = atoi(temp);
+                        } else {
+                                config.days_till_exp_crit = 0;
+                                if (!is_intnonneg(optarg)) {
+                                        usage2(_("Invalid certificate expiration period"), optarg);
+                                }
+                                config.days_till_exp_warn = atoi(optarg);
                         }
-                        check_cert = true;
-                        flags |= FLAG_SSL;
-                        break;
-#  endif /* USE_OPENSSL */
+                        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"));
+                        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"));
+                        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;
+                }
                 }
         }
 
-        c = optind;
-        if(!host_specified && c < argc)
-                server_address = strdup (argv[c++]);
+        int index = optind;
+        if (!config.host_specified && index < argc) {
+                config.server_address = strdup(argv[index++]);
+        }
 
-        if (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);
+        if (config.server_address == NULL) {
+                usage4(_("You must provide a 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)
-{
-        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);
-
-        print_usage ();
-
-        printf (UT_HELP_VRSN);
-        printf (UT_EXTRA_OPTS);
-
-        printf (UT_HOST_PORT, 'p', "none");
-
-        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", _("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"));
-  printf (" %s\n", "-e, --expect=STRING");
-  printf ("    %s %s\n", _("String to expect in server response"), _("(may be repeated)"));
-  printf (" %s\n", "-A, --all");
-  printf ("    %s\n", _("All expect strings need to occur in server response. Default is any"));
-  printf (" %s\n", "-q, --quit=STRING");
-  printf ("    %s\n", _("String to send server to initiate a clean close of the connection"));
-  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", "-j, --jail");
-  printf ("    %s\n", _("Hide output from TCP socket"));
-  printf (" %s\n", "-m, --maxbytes=INTEGER");
-  printf ("    %s\n", _("Close connection once more than this number of bytes are received"));
-  printf (" %s\n", "-d, --delay=INTEGER");
-  printf ("    %s\n", _("Seconds to wait between sending string and polling for response"));
+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);
+
+        print_usage();
+
+        printf(UT_HELP_VRSN);
+        printf(UT_EXTRA_OPTS);
+
+        printf(UT_HOST_PORT, 'p', "none");
+
+        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", _("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"));
+        printf(" %s\n", "-e, --expect=STRING");
+        printf("    %s %s\n", _("String to expect in server response"), _("(may be repeated)"));
+        printf(" %s\n", "-A, --all");
+        printf("    %s\n", _("All expect strings need to occur in server response. Default is any"));
+        printf(" %s\n", "-q, --quit=STRING");
+        printf("    %s\n", _("String to send server to initiate a clean close of the connection"));
+        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", "-j, --jail");
+        printf("    %s\n", _("Hide output from TCP socket"));
+        printf(" %s\n", "-m, --maxbytes=INTEGER");
+        printf("    %s\n", _("Close connection once more than this number of bytes are received"));
+        printf(" %s\n", "-d, --delay=INTEGER");
+        printf("    %s\n", _("Seconds to wait between sending string and polling for response"));
 
 #ifdef HAVE_SSL
-        printf (" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
-  printf ("    %s\n", _("Minimum number of days a certificate has to be valid."));
-  printf ("    %s\n", _("1st is #days for warning, 2nd is critical (if not specified - 0)."));
-  printf (" %s\n", "-S, --ssl");
-  printf ("    %s\n", _("Use SSL for the connection."));
-  printf (" %s\n", "--sni=STRING");
-  printf ("    %s\n", _("SSL server_name"));
+        printf(" %s\n", "-D, --certificate=INTEGER[,INTEGER]");
+        printf("    %s\n", _("Minimum number of days a certificate has to be valid."));
+        printf("    %s\n", _("1st is #days for warning, 2nd is critical (if not specified - 0)."));
+        printf(" %s\n", "-S, --ssl");
+        printf("    %s\n", _("Use SSL for the connection."));
+        printf(" %s\n", "--sni=STRING");
+        printf("    %s\n", _("SSL server_name"));
 #endif
 
-        printf (UT_WARN_CRIT);
+        printf(UT_WARN_CRIT);
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (UT_VERBOSE);
+        printf(UT_OUTPUT_FORMAT);
+        printf(UT_VERBOSE);
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-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 ("[-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");
+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("[-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 f50ea427..debf59f3 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -1,374 +1,348 @@
 /*****************************************************************************
-* 
-* Monitoring check_time plugin
-* 
-* License: GPL
-* Copyright (c) 1999-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the check_time plugin
-* 
-* This plugin will check the time difference with the specified host.
-* 
-* 
-* 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_time plugin
+ *
+ * License: GPL
+ * Copyright (c) 1999-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_time plugin
+ *
+ * This plugin will check the time difference with the specified host.
+ *
+ *
+ * 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 "states.h"
 const char *progname = "check_time";
-const char *copyright = "1999-2007";
+const char *copyright = "1999-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
+#include "check_time.d/config.h"
+
+#define UNIX_EPOCH 2208988800UL
+
+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);
 
-enum {
-        TIME_PORT = 37
-};
-
-#define UNIX_EPOCH 2208988800UL
-
-uint32_t raw_server_time;
-unsigned long server_time, diff_time;
-int warning_time = 0;
-bool check_warning_time = false;
-int critical_time = 0;
-bool check_critical_time = false;
-unsigned long warning_diff = 0;
-bool check_warning_diff = false;
-unsigned long critical_diff = 0;
-bool check_critical_diff = false;
-int server_port = TIME_PORT;
-char *server_address = NULL;
-bool use_udp = false;
-
-int process_arguments (int, char **);
-void print_help (void);
-void print_usage (void);
-
-int
-main (int argc, char **argv)
-{
-        int sd;
-        int result = STATE_UNKNOWN;
-        time_t conntime;
-
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+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);
+        argv = np_extra_opts(&argc, argv, progname);
+
+        check_time_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"));
+        const check_time_config config = tmp_config.config;
 
         /* initialize alarm signal handling */
-        signal (SIGALRM, socket_timeout_alarm_handler);
+        signal(SIGALRM, socket_timeout_alarm_handler);
 
         /* set socket timeout */
-        alarm (socket_timeout);
-        time (&start_time);
+        alarm(socket_timeout);
+        time(&start_time);
 
+        int socket;
+        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, &sd);
+        if (config.use_udp) {
+                result = my_udp_connect(config.server_address, config.server_port, &socket);
         } else {
-                result = my_tcp_connect (server_address, server_port, &sd);
+                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 (send (sd, "", 0, 0) < 0) {
-                        if (check_critical_time)
+        if (config.use_udp) {
+                if (send(socket, "", 0, 0) < 0) {
+                        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 */
-        result = recv (sd, (void *)&raw_server_time, sizeof (raw_server_time), 0);
+        uint32_t raw_server_time;
+        result = recv(socket, (void *)&raw_server_time, sizeof(raw_server_time), 0);
 
         /* close the connection */
-        close (sd);
+        close(socket);
 
         /* reset the alarm */
-        time (&end_time);
-        alarm (0);
+        time(&end_time);
+        alarm(0);
 
         /* 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;
 
-        conntime = (end_time - start_time);
-        if (check_critical_time&& conntime > critical_time)
+        time_t conntime = (end_time - start_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)
-                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));
+        if (result != STATE_OK) {
+                die(result, _("TIME %s - %d second response time|%s\n"), state_text(result), (int)conntime,
+                        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));
+        }
 
-        server_time = ntohl (raw_server_time) - UNIX_EPOCH;
-        if (server_time > (unsigned long)end_time)
+        unsigned long server_time;
+        unsigned long diff_time;
+        server_time = ntohl(raw_server_time) - UNIX_EPOCH;
+        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));
+        printf(_("TIME %s - %lu second time difference|%s %s\n"), state_text(result), diff_time,
+                   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)
-{
-        int c;
-
-        int option = 0;
-        static struct option longopts[] = {
-                {"hostname", required_argument, 0, 'H'},
-                {"warning-variance", required_argument, 0, 'w'},
-                {"critical-variance", required_argument, 0, 'c'},
-                {"warning-connect", required_argument, 0, 'W'},
-                {"critical-connect", required_argument, 0, 'C'},
-                {"port", required_argument, 0, 'p'},
-                {"udp", no_argument, 0, 'u'},
-                {"timeout", required_argument, 0, 't'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+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'},
+                                                                           {"warning-connect", required_argument, 0, 'W'},
+                                                                           {"critical-connect", required_argument, 0, 'C'},
+                                                                           {"port", required_argument, 0, 'p'},
+                                                                           {"udp", no_argument, 0, 'u'},
+                                                                           {"timeout", required_argument, 0, 't'},
+                                                                           {"version", no_argument, 0, 'V'},
+                                                                           {"help", no_argument, 0, 'h'},
+                                                                           {0, 0, 0, 0}};
+
+        if (argc < 2) {
+                usage("\n");
+        }
 
-        if (argc < 2)
-                usage ("\n");
-
-        for (c = 1; c < argc; c++) {
-                if (strcmp ("-to", argv[c]) == 0)
-                        strcpy (argv[c], "-t");
-                else if (strcmp ("-wd", argv[c]) == 0)
-                        strcpy (argv[c], "-w");
-                else if (strcmp ("-cd", argv[c]) == 0)
-                        strcpy (argv[c], "-c");
-                else if (strcmp ("-wt", argv[c]) == 0)
-                        strcpy (argv[c], "-W");
-                else if (strcmp ("-ct", argv[c]) == 0)
-                        strcpy (argv[c], "-C");
+        for (int i = 1; i < argc; i++) {
+                if (strcmp("-to", argv[i]) == 0) {
+                        strcpy(argv[i], "-t");
+                } else if (strcmp("-wd", argv[i]) == 0) {
+                        strcpy(argv[i], "-w");
+                } else if (strcmp("-cd", argv[i]) == 0) {
+                        strcpy(argv[i], "-c");
+                } else if (strcmp("-wt", argv[i]) == 0) {
+                        strcpy(argv[i], "-W");
+                } 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) {
-                c = getopt_long (argc, argv, "hVH:w:c:W:C:p:t:u", longopts,
-                                                                         &option);
+                int option = 0;
+                option_char = getopt_long(argc, argv, "hVH:w:c:W:C:p:t:u", longopts, &option);
 
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         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 */
-                        if (!is_host (optarg))
-                                usage2 (_("Invalid hostname/address"), optarg);
-                        server_address = optarg;
-                        break;
-                case 'w':                                                                       /* warning-variance */
-                        if (is_intnonneg (optarg)) {
-                                warning_diff = strtoul (optarg, NULL, 10);
-                                check_warning_diff = true;
+                switch (option_char) {
+                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 */
+                        if (!is_host(optarg)) {
+                                usage2(_("Invalid hostname/address"), optarg);
                         }
-                        else if (strspn (optarg, "0123456789:,") > 0) {
-                                if (sscanf (optarg, "%lu%*[:,]%d", &warning_diff, &warning_time) == 2) {
-                                        check_warning_diff = true;
-                                        check_warning_time = true;
-                                }
-                                else {
-                                        usage4 (_("Warning thresholds must be a positive integer"));
+                        result.config.server_address = optarg;
+                        break;
+                case 'w': /* warning-variance */
+                        if (is_intnonneg(optarg)) {
+                                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", &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"));
                                 }
-                        }
-                        else {
-                                usage4 (_("Warning threshold must be a positive integer"));
+                        } else {
+                                usage4(_("Warning threshold must be a positive integer"));
                         }
                         break;
-                case 'c':                                                                       /* critical-variance */
-                        if (is_intnonneg (optarg)) {
-                                critical_diff = strtoul (optarg, NULL, 10);
-                                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;
-                                }
-                                else {
-                                        usage4 (_("Critical thresholds must be a positive integer"));
+                case 'c': /* critical-variance */
+                        if (is_intnonneg(optarg)) {
+                                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", &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"));
                                 }
-                        }
-                        else {
-                                usage4 (_("Critical threshold must be a positive integer"));
+                        } else {
+                                usage4(_("Critical threshold must be a positive integer"));
                         }
                         break;
-                case 'W':                                                                       /* warning-connect */
-                        if (!is_intnonneg (optarg))
-                                usage4 (_("Warning threshold must be a positive integer"));
-                        else
-                                warning_time = atoi (optarg);
-                        check_warning_time = true;
+                case 'W': /* warning-connect */
+                        if (!is_intnonneg(optarg)) {
+                                usage4(_("Warning threshold must be a positive integer"));
+                        } else {
+                                result.config.warning_time = atoi(optarg);
+                        }
+                        result.config.check_warning_time = true;
                         break;
-                case 'C':                                                                       /* critical-connect */
-                        if (!is_intnonneg (optarg))
-                                usage4 (_("Critical threshold must be a positive integer"));
-                        else
-                                critical_time = atoi (optarg);
-                        check_critical_time = true;
+                case 'C': /* critical-connect */
+                        if (!is_intnonneg(optarg)) {
+                                usage4(_("Critical threshold must be a positive integer"));
+                        } else {
+                                result.config.critical_time = atoi(optarg);
+                        }
+                        result.config.check_critical_time = true;
                         break;
-                case 'p':                                                                       /* port */
-                        if (!is_intnonneg (optarg))
-                                usage4 (_("Port must be a positive integer"));
-                        else
-                                server_port = atoi (optarg);
+                case 'p': /* port */
+                        if (!is_intnonneg(optarg)) {
+                                usage4(_("Port must be a positive integer"));
+                        } else {
+                                result.config.server_port = atoi(optarg);
+                        }
                         break;
-                case 't':                                                                       /* timeout */
-                        if (!is_intnonneg (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
-                        else
-                                socket_timeout = atoi (optarg);
+                case 't': /* timeout */
+                        if (!is_intnonneg(optarg)) {
+                                usage2(_("Timeout interval must be a positive integer"), optarg);
+                        } else {
+                                socket_timeout = atoi(optarg);
+                        }
                         break;
-                case 'u':                                                                       /* udp */
-                        use_udp = true;
+                case 'u': /* udp */
+                        result.config.use_udp = true;
                 }
         }
 
-        c = optind;
-        if (server_address == NULL) {
-                if (argc > c) {
-                        if (!is_host (argv[c]))
-                                usage2 (_("Invalid hostname/address"), optarg);
-                        server_address = argv[c];
-                }
-                else {
-                        usage4 (_("Hostname was not supplied"));
+        option_char = optind;
+        if (result.config.server_address == NULL) {
+                if (argc > option_char) {
+                        if (!is_host(argv[option_char])) {
+                                usage2(_("Invalid hostname/address"), optarg);
+                        }
+                        result.config.server_address = argv[option_char];
+                } else {
+                        usage4(_("Hostname was not supplied"));
                 }
         }
 
-        return OK;
+        return result;
 }
 
-
-
-void
-print_help (void)
-{
+void print_help(void) {
         char *myport;
-        xasprintf (&myport, "%d", TIME_PORT);
+        xasprintf(&myport, "%d", TIME_PORT);
 
-        print_revision (progname, NP_VERSION);
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Ethan Galstad\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad\n");
+        printf(COPYRIGHT, copyright, email);
 
-        printf ("%s\n", _("This plugin will check the time on the specified host."));
+        printf("%s\n", _("This plugin will check the time on the specified host."));
 
-  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 (UT_HOST_PORT, 'p', myport);
+        printf(UT_HOST_PORT, 'p', myport);
 
-        printf (" %s\n", "-u, --udp");
-  printf ("   %s\n", _("Use UDP to connect, not TCP"));
-  printf (" %s\n", "-w, --warning-variance=INTEGER");
-  printf ("   %s\n", _("Time difference (sec.) necessary to result in a warning status"));
-  printf (" %s\n", "-c, --critical-variance=INTEGER");
-  printf ("   %s\n", _("Time difference (sec.) necessary to result in a critical status"));
-  printf (" %s\n", "-W, --warning-connect=INTEGER");
-  printf ("   %s\n", _("Response time (sec.) necessary to result in warning status"));
-  printf (" %s\n", "-C, --critical-connect=INTEGER");
-  printf ("   %s\n", _("Response time (sec.) necessary to result in critical status"));
+        printf(" %s\n", "-u, --udp");
+        printf("   %s\n", _("Use UDP to connect, not TCP"));
+        printf(" %s\n", "-w, --warning-variance=INTEGER");
+        printf("   %s\n", _("Time difference (sec.) necessary to result in a warning status"));
+        printf(" %s\n", "-c, --critical-variance=INTEGER");
+        printf("   %s\n", _("Time difference (sec.) necessary to result in a critical status"));
+        printf(" %s\n", "-W, --warning-connect=INTEGER");
+        printf("   %s\n", _("Response time (sec.) necessary to result in warning status"));
+        printf(" %s\n", "-C, --critical-connect=INTEGER");
+        printf("   %s\n", _("Response time (sec.) necessary to result in critical status"));
 
-        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s -H <host_address> [-p port] [-u] [-w variance] [-c variance]\n",progname);
-  printf (" [-W connect_time] [-C connect_time] [-t timeout]\n");
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -H <host_address> [-p port] [-u] [-w variance] [-c variance]\n", progname);
+        printf(" [-W connect_time] [-C connect_time] [-t timeout]\n");
 }
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 380ff3bc..ecc0760f 100644
--- a/plugins/check_ups.c
+++ b/plugins/check_ups.c
@@ -6,7 +6,7 @@
  * Copyright (c) 2000 Tom Shields
  *               2004 Alain Richard <alain.richard@equation.fr>
  *               2004 Arnaud Quette <arnaud.quette@mgeups.com>
- * Copyright (c) 2002-2023 Monitoring Plugins Development Team
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
  *
  * Description:
  *
@@ -33,100 +33,52 @@
  *****************************************************************************/
 
 const char *progname = "check_ups";
-const char *copyright = "2000-2023";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
 #include "utils.h"
+#include "check_ups.d/config.h"
+#include "states.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
-
-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;
-}
+enum {
+        NOSUCHVAR = ERROR - 1
+};
 
 // Forward declarations
-int determine_status(ups_config *, int *supported_options);
-int get_ups_variable(const char *, char *, const ups_config config);
-
-int process_arguments(int, char **, ups_config *);
-int validate_arguments(ups_config);
-void print_help(void);
+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 void print_help(void);
 void print_usage(void);
 
 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);
@@ -134,74 +86,75 @@ 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;
         }
 
+        int ups_status_flags = query_result.ups_status;
+        int supported_options = query_result.supported_options;
 
-        if (supported_options & UPS_STATUS) {
-
-                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) {
-                                xasprintf(&ups_status, "%s%s", ups_status,
-                                                  _(", Replace Battery"));
+                        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"));
                         }
                 }
@@ -210,7 +163,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) {
@@ -233,24 +186,17 @@ int main(int argc, char **argv) {
                 }
 
                 if (config.check_variable == UPS_UTILITY) {
-                        if (config.check_crit &&
-                                ups_utility_deviation >= config.critical_value) {
+                        if (config.check_crit && ups_utility_deviation >= config.critical_value) {
                                 result = STATE_CRITICAL;
-                        } else if (config.check_warn &&
-                                           ups_utility_deviation >= config.warning_value) {
+                        } 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));
                 }
         }
 
@@ -268,22 +214,17 @@ int main(int argc, char **argv) {
                 xasprintf(&message, "%sBatt=%3.1f%% ", message, ups_battery_percent);
 
                 if (config.check_variable == UPS_BATTPCT) {
-                        if (config.check_crit &&
-                                ups_battery_percent <= config.critical_value) {
+                        if (config.check_crit && ups_battery_percent <= config.critical_value) {
                                 result = STATE_CRITICAL;
-                        } else if (config.check_warn &&
-                                           ups_battery_percent <= config.warning_value) {
+                        } 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));
                 }
         }
 
@@ -301,22 +242,17 @@ int main(int argc, char **argv) {
                 xasprintf(&message, "%sLoad=%3.1f%% ", message, ups_load_percent);
 
                 if (config.check_variable == UPS_LOADPCT) {
-                        if (config.check_crit &&
-                                ups_load_percent >= config.critical_value) {
+                        if (config.check_crit && ups_load_percent >= config.critical_value) {
                                 result = STATE_CRITICAL;
-                        } else if (config.check_warn &&
-                                           ups_load_percent >= config.warning_value) {
+                        } 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, (long)(config.critical_value),
-                                                           true, 0, true, 100));
+                        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));
                 }
         }
 
@@ -345,19 +281,15 @@ int main(int argc, char **argv) {
                 if (config.check_variable == UPS_TEMP) {
                         if (config.check_crit && ups_temperature >= config.critical_value) {
                                 result = STATE_CRITICAL;
-                        } else if (config.check_warn &&
-                                           ups_temperature >= config.warning_value) {
+                        } 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, (long)(config.critical_value),
-                                                           true, 0, false, 0));
+                        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));
                 }
         }
 
@@ -376,19 +308,15 @@ int main(int argc, char **argv) {
                 if (config.check_variable == UPS_REALPOWER) {
                         if (config.check_crit && ups_realpower >= config.critical_value) {
                                 result = STATE_CRITICAL;
-                        } else if (config.check_warn &&
-                                           ups_realpower >= config.warning_value) {
+                        } 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, (long)(config.critical_value),
-                                                           true, 0, false, 0));
+                        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));
                 }
         }
 
@@ -402,73 +330,78 @@ 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;
@@ -477,9 +410,7 @@ 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;
         }
@@ -496,8 +427,7 @@ int get_ups_variable(const char *varname, char *buf, const ups_config config) {
                 ptr[len - 1] = 0;
         }
         if (strcmp(ptr, "ERR UNKNOWN-UPS") == 0) {
-                printf(_("CRITICAL - no such UPS '%s' on that host\n"),
-                           config.ups_name);
+                printf(_("CRITICAL - no such UPS '%s' on that host\n"), config.ups_name);
                 return ERROR;
         }
 
@@ -534,7 +464,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'},
@@ -548,8 +478,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;
@@ -576,52 +512,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);
                         }
@@ -642,27 +578,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) {
@@ -694,8 +630,7 @@ 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);
 
@@ -731,8 +666,7 @@ void print_help(void) {
                                           "with Russell Kroll's"));
         printf(" %s\n", _("Network UPS Tools be installed on the remote host. If "
                                           "you do not have the"));
-        printf(" %s\n",
-                   _("package installed on your system, you can download it from"));
+        printf(" %s\n", _("package installed on your system, you can download it from"));
         printf(" %s\n", _("http://www.networkupstools.org"));
 
         printf(UT_SUPPORT);
diff --git a/plugins/check_ups.d/config.h b/plugins/check_ups.d/config.h
new file mode 100644
index 00000000..353104f2
--- /dev/null
+++ b/plugins/check_ups.d/config.h
@@ -0,0 +1,55 @@
+#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 89b95369..f1e1c39d 100644
--- a/plugins/check_users.c
+++ b/plugins/check_users.c
@@ -1,71 +1,69 @@
 /*****************************************************************************
-*
-* Monitoring check_users plugin
-*
-* License: GPL
-* Copyright (c) 2000-2012 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains the check_users plugin
-*
-* This plugin checks the number of users currently logged in on the local
-* system and generates an error if the number exceeds the thresholds
-* specified.
-*
-*
-* 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_users plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the check_users plugin
+ *
+ * This plugin checks the number of users currently logged in on the local
+ * system and generates an error if the number exceeds the thresholds
+ * specified.
+ *
+ *
+ * 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_users";
-const char *copyright = "2000-2007";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 
 #if HAVE_WTSAPI32_H
-# include <windows.h>
-# include <wtsapi32.h>
-# undef ERROR
-# define ERROR -1
+#       include <windows.h>
+#       include <wtsapi32.h>
+#       undef ERROR
+#       define ERROR -1
 #elif HAVE_UTMPX_H
-# include <utmpx.h>
+#       include <utmpx.h>
 #else
-# include "popen.h"
+#       include "popen.h"
 #endif
 
 #ifdef HAVE_LIBSYSTEMD
-#include <systemd/sd-daemon.h>
-#include <systemd/sd-login.h>
+#       include <systemd/sd-daemon.h>
+#       include <systemd/sd-login.h>
 #endif
 
-#define possibly_set(a,b) ((a) == 0 ? (b) : 0)
+#define possibly_set(a, b) ((a) == 0 ? (b) : 0)
 
-int process_arguments (int, char **);
-void print_help (void);
-void print_usage (void);
+static int process_arguments(int, char **);
+static void print_help(void);
+void print_usage(void);
 
-char *warning_range = NULL;
-char *critical_range = NULL;
-thresholds *thlds = NULL;
+static char *warning_range = NULL;
+static char *critical_range = NULL;
+static thresholds *thlds = NULL;
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         int users = -1;
         int result = STATE_UNKNOWN;
 #if HAVE_WTSAPI32_H
@@ -78,74 +76,71 @@ main (int argc, char **argv)
         char input_buffer[MAX_INPUT_BUFFER];
 #endif
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Parse extra opts if any */
-        argv = np_extra_opts (&argc, argv, progname);
+        argv = np_extra_opts(&argc, argv, progname);
 
-        if (process_arguments (argc, argv) == ERROR)
-                usage4 (_("Could not parse arguments"));
+        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);
+        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;
-        }
+                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;
+                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;
+                        if (!WTSQuerySessionInformation(WTS_CURRENT_SERVER_HANDLE, wtsinfo[index].SessionId, WTSUserName, &username, &size))
+                                continue;
 
-                len = lstrlen(username);
+                        len = lstrlen(username);
 
-                WTSFreeMemory(username);
+                        WTSFreeMemory(username);
 
-                if (len == 0)
-                        continue;
+                        if (len == 0)
+                                continue;
 
-                if (wtsinfo[index].State == WTSActive ||
-                  wtsinfo[index].State == WTSDisconnected)
-                        users++;
-        }
+                        if (wtsinfo[index].State == WTSActive || wtsinfo[index].State == WTSDisconnected)
+                                users++;
+                }
 
-        WTSFreeMemory(wtsinfo);
+                WTSFreeMemory(wtsinfo);
 #elif HAVE_UTMPX_H
         /* get currently logged users from utmpx */
-        setutxent ();
+        setutxent();
 
-        while ((putmpx = getutxent ()) != NULL)
+        while ((putmpx = getutxent()) != NULL)
                 if (putmpx->ut_type == USER_PROCESS)
                         users++;
 
-        endutxent ();
+        endutxent();
 #else
         /* run the command */
-        child_process = spopen (WHO_COMMAND);
+        child_process = spopen(WHO_COMMAND);
         if (child_process == NULL) {
-                printf (_("Could not open pipe: %s\n"), WHO_COMMAND);
+                printf(_("Could not open pipe: %s\n"), WHO_COMMAND);
                 return STATE_UNKNOWN;
         }
 
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
         if (child_stderr == NULL)
-                printf (_("Could not open stderr for %s\n"), WHO_COMMAND);
+                printf(_("Could not open stderr for %s\n"), WHO_COMMAND);
 
-        while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
+        while (fgets(input_buffer, MAX_INPUT_BUFFER - 1, child_process)) {
                 /* increment 'users' on all lines except total user count */
                 if (input_buffer[0] != '#') {
                         users++;
@@ -153,18 +148,18 @@ main (int argc, char **argv)
                 }
 
                 /* get total logged in users */
-                if (sscanf (input_buffer, _("# users=%d"), &users) == 1)
+                if (sscanf(input_buffer, _("# users=%d"), &users) == 1)
                         break;
         }
 
         /* check STDERR */
-        if (fgets (input_buffer, MAX_INPUT_BUFFER - 1, child_stderr))
-                result = possibly_set (result, STATE_UNKNOWN);
-        (void) fclose (child_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);
+        if (spclose(child_process))
+                result = possibly_set(result, STATE_UNKNOWN);
 #endif
 #ifdef HAVE_LIBSYSTEMD
         }
@@ -174,109 +169,99 @@ main (int argc, char **argv)
         result = get_status((double)users, thlds);
 
         if (result == STATE_UNKNOWN)
-                printf ("%s\n", _("Unable to read output"));
+                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));
+                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));
         }
 
         return result;
 }
 
 /* process command-line arguments */
-int
-process_arguments (int argc, char **argv)
-{
-        int c;
-        int option = 0;
-        static struct option longopts[] = {
-                {"critical", required_argument, 0, 'c'},
-                {"warning", required_argument, 0, 'w'},
-                {"version", no_argument, 0, 'V'},
-                {"help", no_argument, 0, 'h'},
-                {0, 0, 0, 0}
-        };
+int 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'},
+                                                                           {0, 0, 0, 0}};
 
         if (argc < 2)
-                usage ("\n");
+                usage("\n");
 
+        int option_char;
         while (true) {
-                c = getopt_long (argc, argv, "+hVvc:w:", longopts, &option);
+                int option = 0;
+                option_char = getopt_long(argc, argv, "+hVvc:w:", longopts, &option);
 
-                if (c == -1 || c == EOF || c == 1)
+                if (option_char == -1 || option_char == EOF || option_char == 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 'c':                                                                       /* critical */
+                switch (option_char) {
+                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 'c': /* critical */
                         critical_range = optarg;
                         break;
-                case 'w':                                                                       /* warning */
+                case 'w': /* warning */
                         warning_range = optarg;
                         break;
                 }
         }
 
-        c = optind;
+        option_char = optind;
 
-        if (warning_range == NULL && argc > c)
-                warning_range = argv[c++];
+        if (warning_range == NULL && argc > option_char)
+                warning_range = argv[option_char++];
 
-        if (critical_range == NULL && argc > c)
-                critical_range = argv[c++];
+        if (critical_range == NULL && argc > option_char)
+                critical_range = argv[option_char++];
 
         /* this will abort in case of invalid ranges */
-        set_thresholds (&thlds, warning_range, critical_range);
+        set_thresholds(&thlds, warning_range, critical_range);
 
         if (!thlds->warning) {
-                usage4 (_("Warning threshold must be a valid range expression"));
+                usage4(_("Warning threshold must be a valid range expression"));
         }
 
         if (!thlds->critical) {
-                usage4 (_("Critical threshold must be a valid range expression"));
+                usage4(_("Critical threshold must be a valid range expression"));
         }
 
         return OK;
 }
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-        printf ("Copyright (c) 1999 Ethan Galstad\n");
-        printf (COPYRIGHT, copyright, email);
+        printf("Copyright (c) 1999 Ethan Galstad\n");
+        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", _("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 ("\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=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", "-w, --warning=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 (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s -w <users> -c <users>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s -w <users> -c <users>\n", progname);
 }
diff --git a/plugins/common.h b/plugins/common.h
index 833479ce..35d1e549 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -31,7 +31,8 @@
 #ifndef _COMMON_H_
 #define _COMMON_H_
 
-#include "config.h"
+#include "../config.h"
+#include "../lib/monitoringplug.h"
 
 #ifdef HAVE_FEATURES_H
 #include <features.h>
@@ -90,16 +91,10 @@
 # define GET_NUMBER_OF_CPUS() -1
 #endif
 
-#ifdef TIME_WITH_SYS_TIME
+#ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
+#include <time.h>
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -115,7 +110,7 @@
 
 /* GNU Libraries */
 #include <getopt.h>
-#include "dirname.h"
+#include "../gl/dirname.h"
 
 #include <locale.h>
 
@@ -185,14 +180,6 @@ enum {
 };
 
 enum {
-        STATE_OK,
-        STATE_WARNING,
-        STATE_CRITICAL,
-        STATE_UNKNOWN,
-        STATE_DEPENDENT
-};
-
-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 */
@@ -203,7 +190,7 @@ enum {
  * Internationalization
  *
  */
-#include "gettext.h"
+#include "../gl/gettext.h"
 #define _(String) gettext (String)
 #if ! ENABLE_NLS
 # undef textdomain
diff --git a/plugins/negate.c b/plugins/negate.c
index c5fe7e13..0520d298 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -1,36 +1,36 @@
 /*****************************************************************************
-* 
-* Monitoring negate plugin
-* 
-* License: GPL
-* Copyright (c) 2002-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the negate plugin
-* 
-* Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).
-* Can also perform custom state switching.
-* 
-* 
-* 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 negate plugin
+ *
+ * License: GPL
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the negate plugin
+ *
+ * Negates the status of a plugin (returns OK for CRITICAL, and vice-versa).
+ * Can also perform custom state switching.
+ *
+ *
+ * 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 = "negate";
-const char *copyright = "2002-2008";
+const char *copyright = "2002-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #define DEFAULT_TIMEOUT 11
@@ -38,203 +38,203 @@ 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*/);
 
-/* char *command_line; */
+static void print_help(void);
+void print_usage(void);
 
-static const char **process_arguments (int, char **);
-void validate_arguments (char **);
-void print_help (void);
-void print_usage (void);
-bool subst_text = false;
+int main(int argc, char **argv) {
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
-static int state[4] = {
-        STATE_OK,
-        STATE_WARNING,
-        STATE_CRITICAL,
-        STATE_UNKNOWN,
-};
+        timeout_interval = DEFAULT_TIMEOUT;
 
-int
-main (int argc, char **argv)
-{
-        int result = STATE_UNKNOWN;
-        char *sub;
-        char **command_line;
-        output chld_out, chld_err;
+        negate_config_wrapper tmp_config = process_arguments(argc, argv);
 
-        setlocale (LC_ALL, "");
-        bindtextdomain (PACKAGE, LOCALEDIR);
-        textdomain (PACKAGE);
+        if (tmp_config.errorcode == ERROR) {
+                die(STATE_UNKNOWN, _("negate: Failed to parse input"));
+        }
 
-        timeout_interval = DEFAULT_TIMEOUT;
+        negate_config config = tmp_config.config;
 
-        command_line = (char **) process_arguments (argc, argv);
+        char **command_line = config.command_line;
 
         /* Set signal handling and alarm */
-        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(timeout_interval);
 
-        (void) alarm ((unsigned) timeout_interval);
+        mp_state_enum result = STATE_UNKNOWN;
+        output chld_out;
+        output chld_err;
 
         /* catch when the command is quoted */
-        if(command_line[1] == NULL) {
-                result = cmd_run (command_line[0], &chld_out, &chld_err, 0);
+        if (command_line[1] == NULL) {
+                result = cmd_run(command_line[0], &chld_out, &chld_err, 0);
         } else {
-                result = cmd_run_array (command_line, &chld_out, &chld_err, 0);
+                result = cmd_run_array(command_line, &chld_out, &chld_err, 0);
         }
         if (chld_err.lines > 0) {
                 for (size_t i = 0; i < chld_err.lines; i++) {
-                        fprintf (stderr, "%s\n", chld_err.line[i]);
+                        fprintf(stderr, "%s\n", chld_err.line[i]);
                 }
         }
 
         /* Return UNKNOWN or worse if no output is returned */
-        if (chld_out.lines == 0)
-                die (max_state_alt (result, STATE_UNKNOWN), _("No data returned from command\n"));
+        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)))) {
+                        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));
+                                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]);
+                printf("%s\n", chld_out.line[i]);
         }
 
         if (result >= 0 && result <= 4) {
-                exit (state[result]);
+                exit(config.state[result]);
         } else {
-                exit (result);
+                exit(result);
         }
 }
 
-
 /* process command-line arguments */
-static const char **
-process_arguments (int argc, char **argv)
-{
-        int c;
-        bool permute = true;
-
-        int option = 0;
-        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);
 
-        while (1) {
-                c = getopt_long (argc, argv, "+hVt:T:o:w:c:u:s", longopts, &option);
-
-                if (c == -1 || c == EOF)
+                if (option_char == -1 || option_char == EOF) {
                         break;
+                }
 
-                switch (c) {
-                case '?':     /* help */
-                        usage5 ();
+                switch (option_char) {
+                case '?': /* help */
+                        usage5();
                         break;
-                case 'h':     /* help */
-                        print_help ();
-                        exit (EXIT_SUCCESS);
+                case 'h': /* help */
+                        print_help();
+                        exit(STATE_UNKNOWN);
                         break;
-                case 'V':     /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (EXIT_SUCCESS);
-                case 't':     /* timeout period */
-                        if (!is_integer (optarg))
-                                usage2 (_("Timeout interval must be a positive integer"), optarg);
-                        else
-                                timeout_interval = atoi (optarg);
+                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 '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)."));
+                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)."));
+                        }
                         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)."));
+                case 'o': /* replacement for OK */
+                        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)."));
+                case 'w': /* replacement for WARNING */
+                        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)."));
+                case 'c': /* replacement for CRITICAL */
+                        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)."));
+                case 'u': /* replacement for UNKNOWN */
+                        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;
+                case 's': /* Substitute status text */
+                        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);
 }
 
+negate_config_wrapper validate_arguments(negate_config_wrapper config_wrapper) {
+        if (config_wrapper.config.command_line[0] == NULL) {
+                usage4(_("Could not parse arguments"));
+        }
 
-void
-validate_arguments (char **command_line)
-{
-        if (command_line[0] == NULL)
-                usage4 (_("Could not parse arguments"));
+        if (strncmp(config_wrapper.config.command_line[0], "/", 1) != 0 && strncmp(config_wrapper.config.command_line[0], "./", 2) != 0) {
+                usage4(_("Require path to command"));
+        }
 
-        if (strncmp(command_line[0],"/",1) != 0 && strncmp(command_line[0],"./",2) != 0)
-                usage4 (_("Require path to command"));
+        return config_wrapper;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
+        printf(COPYRIGHT, copyright, email);
 
-        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", _("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");
 
-        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");
+        printf("\n\n");
 
-        printf ("\n\n");
+        print_usage();
 
-        print_usage ();
+        printf(UT_HELP_VRSN);
 
-        printf (UT_HELP_VRSN);
-
-        printf (UT_PLUG_TIMEOUT, timeout_interval);
-        printf ("    %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status."));
-        printf (" -T, --timeout-result=STATUS\n");
-        printf ("    %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n"));
+        printf(UT_PLUG_TIMEOUT, timeout_interval);
+        printf("    %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status."));
+        printf(" -T, --timeout-result=STATUS\n");
+        printf("    %s\n", _("Custom result on Negate timeouts; see below for STATUS definition\n"));
 
         printf(" -o, --ok=STATUS\n");
         printf(" -w, --warning=STATUS\n");
@@ -246,31 +246,27 @@ print_help (void)
         printf(" -s, --substitute\n");
         printf(_("    Substitute output text as well. Will only substitute text in CAPITALS\n"));
 
-        printf ("\n");
-        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", _("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", _("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", _("plugin by setting the negate timeout a bit lower."));
-
-        printf (UT_SUPPORT);
+        printf("\n");
+        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", _("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", _("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", _("plugin by setting the negate timeout a bit lower."));
+
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-        printf ("%s\n", _("Usage:"));
-        printf ("%s [-t timeout] [-Towcu STATE] [-s] <definition of wrapped plugin>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s [-t timeout] [-Towcu STATE] [-s] <definition of wrapped plugin>\n", progname);
 }
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 c6af248e..e2916c65 100644
--- a/plugins/netutils.c
+++ b/plugins/netutils.c
@@ -1,33 +1,35 @@
 /*****************************************************************************
-* 
-* Monitoring Plugins network utilities
-* 
-* License: GPL
-* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-* Copyright (c) 2003-2008 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains commons functions 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 network utilities
+ *
+ * License: GPL
+ * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 2003-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains commons functions 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/>.
+ *
+ *
+ *****************************************************************************/
 
 #include "common.h"
+#include "output.h"
+#include "states.h"
 #include "netutils.h"
 
 unsigned int socket_timeout = DEFAULT_SOCKET_TIMEOUT;
@@ -42,25 +44,26 @@ int address_family = AF_INET;
 #endif
 
 /* handles socket timeouts */
-void
-socket_timeout_alarm_handler (int sig)
-{
-        if (sig == SIGALRM)
-                printf (_("%s - Socket timeout after %d seconds\n"), state_text(socket_timeout_state),  socket_timeout);
-        else
-                printf (_("%s - Abnormal timeout after %d seconds\n"), state_text(socket_timeout_state), socket_timeout);
-
-        exit (socket_timeout_state);
-}
+void socket_timeout_alarm_handler(int sig) {
+        mp_subcheck timeout_sc = mp_subcheck_init();
+        timeout_sc = mp_set_subcheck_state(timeout_sc, socket_timeout_state);
+
+        if (sig == SIGALRM) {
+                xasprintf(&timeout_sc.output, _("Socket timeout after %d seconds\n"), socket_timeout);
+        } else {
+                xasprintf(&timeout_sc.output, _("Abnormal timeout after %d seconds\n"), socket_timeout);
+        }
 
+        mp_check overall = mp_check_init();
+        mp_add_subcheck_to_check(&overall, timeout_sc);
+
+        mp_exit(overall);
+}
 
 /* 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)
-{
+int process_tcp_request2(const char *server_address, int server_port, const char *send_buffer, char *recv_buffer, int recv_size) {
 
         int result;
         int send_result;
@@ -70,13 +73,14 @@ process_tcp_request2 (const char *server_address, int server_port,
         fd_set readfds;
         int recv_length = 0;
 
-        result = np_net_connect (server_address, server_port, &sd, IPPROTO_TCP);
-        if (result != STATE_OK)
+        result = np_net_connect(server_address, server_port, &sd, IPPROTO_TCP);
+        if (result != STATE_OK) {
                 return STATE_CRITICAL;
+        }
 
-        send_result = send (sd, send_buffer, strlen (send_buffer), 0);
-        if (send_result<0 || (size_t)send_result!=strlen(send_buffer)) {
-                printf ("%s\n", _("Send failed"));
+        send_result = send(sd, 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;
         }
 
@@ -85,38 +89,32 @@ process_tcp_request2 (const char *server_address, int server_port,
                    minus one for data from the host */
                 tv.tv_sec = socket_timeout - 1;
                 tv.tv_usec = 0;
-                FD_ZERO (&readfds);
-                FD_SET (sd, &readfds);
-                select (sd + 1, &readfds, NULL, NULL, &tv);
+                FD_ZERO(&readfds);
+                FD_SET(sd, &readfds);
+                select(sd + 1, &readfds, NULL, NULL, &tv);
 
                 /* make sure some data has arrived */
-                if (!FD_ISSET (sd, &readfds)) { /* it hasn't */
+                if (!FD_ISSET(sd, &readfds)) { /* it hasn't */
                         if (!recv_length) {
-                                strcpy (recv_buffer, "");
-                                printf ("%s\n", _("No data was received from host!"));
+                                strcpy(recv_buffer, "");
+                                // printf("%s\n", _("No data was received from host!"));
                                 result = STATE_WARNING;
-                        }
-                        else {                                                                          /* this one failed, but previous ones worked */
+                        } else { /* this one failed, but previous ones worked */
                                 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);
+                } 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, "");
+                                strcpy(recv_buffer + recv_length, "");
                                 result = STATE_WARNING;
                                 break;
-                        }
-                        else if (recv_result == 0) {
+                        } else if (recv_result == 0) {
                                 /* end of file ? */
                                 recv_buffer[recv_length] = 0;
                                 break;
-                        }
-                        else {                                                                          /* we got data! */
+                        } else { /* we got data! */
                                 recv_length += recv_result;
                                 if (recv_length >= recv_size - 1) {
                                         /* buffer full, we're done */
@@ -129,42 +127,36 @@ process_tcp_request2 (const char *server_address, int server_port,
         }
         /* end while(1) */
 
-        close (sd);
+        close(sd);
         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 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;
 
         result = STATE_OK;
 
-        result = np_net_connect (server_address, server_port, &sd, proto);
-        if (result != STATE_OK)
+        result = np_net_connect(server_address, server_port, &sd, proto);
+        if (result != STATE_OK) {
                 return STATE_CRITICAL;
+        }
 
-        result = send_request (sd, proto, send_buffer, recv_buffer, recv_size);
+        result = send_request(sd, proto, send_buffer, recv_buffer, recv_size);
 
-        close (sd);
+        close(sd);
 
         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)
-{
-        /* 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. */
+int np_net_connect(const char *host_name, int port, int *sd, 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;
@@ -176,43 +168,44 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
         socktype = (proto == IPPROTO_UDP) ? SOCK_DGRAM : SOCK_STREAM;
 
         /* as long as it doesn't start with a '/', it's assumed a host or ip */
-        if (!is_socket){
-                memset (&hints, 0, sizeof (hints));
+        if (!is_socket) {
+                memset(&hints, 0, sizeof(hints));
                 hints.ai_family = address_family;
                 hints.ai_protocol = proto;
                 hints.ai_socktype = socktype;
 
-                len = strlen (host_name);
+                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;
                 }
-                if (len >= sizeof(host))
+                if (len >= sizeof(host)) {
                         return STATE_UNKNOWN;
-                memcpy (host, host_name, len);
+                }
+                memcpy(host, host_name, len);
                 host[len] = '\0';
-                snprintf (port_str, sizeof (port_str), "%d", port);
-                result = getaddrinfo (host, port_str, &hints, &res);
+                snprintf(port_str, sizeof(port_str), "%d", port);
+                result = getaddrinfo(host, port_str, &hints, &res);
 
                 if (result != 0) {
-                        printf ("%s\n", gai_strerror (result));
+                        // printf("%s\n", gai_strerror(result));
                         return STATE_UNKNOWN;
                 }
 
                 r = res;
                 while (r) {
                         /* attempt to create a socket */
-                        *sd = socket (r->ai_family, socktype, r->ai_protocol);
+                        *sd = socket(r->ai_family, socktype, r->ai_protocol);
 
                         if (*sd < 0) {
-                                printf ("%s\n", _("Socket creation failed"));
-                                freeaddrinfo (r);
+                                // printf("%s\n", _("Socket creation failed"));
+                                freeaddrinfo(r);
                                 return STATE_UNKNOWN;
                         }
 
                         /* attempt to open a connection */
-                        result = connect (*sd, r->ai_addr, r->ai_addrlen);
+                        result = connect(*sd, r->ai_addr, r->ai_addrlen);
 
                         if (result == 0) {
                                 was_refused = false;
@@ -227,69 +220,67 @@ np_net_connect (const char *host_name, int port, int *sd, int proto)
                                 }
                         }
 
-                        close (*sd);
+                        close(*sd);
                         r = r->ai_next;
                 }
-                freeaddrinfo (res);
+                freeaddrinfo(res);
         }
         /* else the hostname is interpreted as a path to a unix socket */
         else {
-                if(strlen(host_name) >= UNIX_PATH_MAX){
+                if (strlen(host_name) >= UNIX_PATH_MAX) {
                         die(STATE_UNKNOWN, _("Supplied path too long unix domain socket"));
                 }
                 memset(&su, 0, sizeof(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){
+                if (*sd < 0) {
                         die(STATE_UNKNOWN, _("Socket creation failed"));
                 }
                 result = connect(*sd, (struct sockaddr *)&su, sizeof(su));
-                if (result < 0 && errno == ECONNREFUSED)
+                if (result < 0 && errno == ECONNREFUSED) {
                         was_refused = true;
+                }
         }
 
-        if (result == 0)
+        if (result == 0) {
                 return STATE_OK;
-        else if (was_refused) {
+        } else 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... */
                 case STATE_CRITICAL: /* user did not set econn_refuse_state, or wanted critical */
-                        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));
+                        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));
+                        }
                         return STATE_CRITICAL;
                         break;
                 default: /* it's a logic error if we do not end up in STATE_(OK|WARNING|CRITICAL) */
                         return STATE_UNKNOWN;
                         break;
                 }
-        }
-        else {
-                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));
+        } else {
+                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));
+                }
                 return STATE_CRITICAL;
         }
 }
 
-int
-send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int recv_size)
-{
+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;
 
-        send_result = send (sd, send_buffer, strlen (send_buffer), 0);
-        if (send_result<0 || (size_t)send_result!=strlen(send_buffer)) {
-                printf ("%s\n", _("Send failed"));
+        send_result = send(sd, 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;
         }
 
@@ -297,27 +288,28 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
            for data from the host */
         tv.tv_sec = socket_timeout - 1;
         tv.tv_usec = 0;
-        FD_ZERO (&readfds);
-        FD_SET (sd, &readfds);
-        select (sd + 1, &readfds, NULL, NULL, &tv);
+        FD_ZERO(&readfds);
+        FD_SET(sd, &readfds);
+        select(sd + 1, &readfds, NULL, NULL, &tv);
 
         /* make sure some data has arrived */
-        if (!FD_ISSET (sd, &readfds)) {
-                strcpy (recv_buffer, "");
-                printf ("%s\n", _("No data was received from host!"));
+        if (!FD_ISSET(sd, &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);
+                recv_result = recv(sd, recv_buffer, (size_t)recv_size - 1, 0);
                 if (recv_result == -1) {
-                        strcpy (recv_buffer, "");
-                        if (proto != IPPROTO_TCP)
-                                printf ("%s\n", _("Receive failed"));
+                        strcpy(recv_buffer, "");
+                        if (proto != IPPROTO_TCP) {
+                                // printf("%s\n", _("Receive failed"));
+                        }
                         result = STATE_WARNING;
-                }
-                else
+                } else {
                         recv_buffer[recv_result] = 0;
+                }
 
                 /* die returned string */
                 recv_buffer[recv_size - 1] = 0;
@@ -325,51 +317,52 @@ send_request (int sd, int proto, const char *send_buffer, char *recv_buffer, int
         return result;
 }
 
-
-bool is_host (const char *address) {
-        if (is_addr (address) || is_hostname (address))
+bool is_host(const char *address) {
+        if (is_addr(address) || is_hostname(address)) {
                 return (true);
+        }
 
         return (false);
 }
 
-void
-host_or_die(const char *str)
-{
-        if(!str || (!is_addr(str) && !is_hostname(str)))
+void host_or_die(const char *str) {
+        if (!str || (!is_addr(str) && !is_hostname(str))) {
                 usage_va(_("Invalid hostname/address - %s"), str);
+        }
 }
 
-bool is_addr (const char *address) {
+bool is_addr(const char *address) {
 #ifdef USE_IPV6
-        if (address_family == AF_INET && is_inet_addr (address))
+        if (address_family == AF_INET && is_inet_addr(address)) {
                 return true;
-        else if (address_family == AF_INET6 && is_inet6_addr (address))
+        } else if (address_family == AF_INET6 && is_inet6_addr(address)) {
                 return true;
+        }
 #else
-        if (is_inet_addr (address))
+        if (is_inet_addr(address)) {
                 return (true);
+        }
 #endif
 
         return (false);
 }
 
-int
-dns_lookup (const char *in, struct sockaddr_storage *ss, int family)
-{
+int dns_lookup(const char *in, struct sockaddr_storage *ss, int family) {
         struct addrinfo hints;
         struct addrinfo *res;
         int retval;
 
-        memset (&hints, 0, sizeof(struct addrinfo));
+        memset(&hints, 0, sizeof(struct addrinfo));
         hints.ai_family = family;
 
-        retval = getaddrinfo (in, NULL, &hints, &res);
-        if (retval != 0)
+        retval = getaddrinfo(in, NULL, &hints, &res);
+        if (retval != 0) {
                 return false;
+        }
 
-        if (ss != NULL)
-                memcpy (ss, res->ai_addr, res->ai_addrlen);
-        freeaddrinfo (res);
+        if (ss != NULL) {
+                memcpy(ss, res->ai_addr, res->ai_addrlen);
+        }
+        freeaddrinfo(res);
         return true;
 }
diff --git a/plugins/picohttpparser/picohttpparser.c b/plugins/picohttpparser/picohttpparser.c
index d0bfac62..2ae92d66 100644
--- a/plugins/picohttpparser/picohttpparser.c
+++ b/plugins/picohttpparser/picohttpparser.c
@@ -28,623 +28,610 @@
 #include <stddef.h>
 #include <string.h>
 #ifdef __SSE4_2__
-#ifdef _MSC_VER
-#include <nmmintrin.h>
-#else
-#include <x86intrin.h>
-#endif
+#       ifdef _MSC_VER
+#               include <nmmintrin.h>
+#       else
+#               include <x86intrin.h>
+#       endif
 #endif
 #include "picohttpparser.h"
 
 #if __GNUC__ >= 3
-#define likely(x) __builtin_expect(!!(x), 1)
-#define unlikely(x) __builtin_expect(!!(x), 0)
+#       define likely(x)   __builtin_expect(!!(x), 1)
+#       define unlikely(x) __builtin_expect(!!(x), 0)
 #else
-#define likely(x) (x)
-#define unlikely(x) (x)
+#       define likely(x)   (x)
+#       define unlikely(x) (x)
 #endif
 
 #ifdef _MSC_VER
-#define ALIGNED(n) _declspec(align(n))
+#       define ALIGNED(n) _declspec(align(n))
 #else
-#define ALIGNED(n) __attribute__((aligned(n)))
+#       define ALIGNED(n) __attribute__((aligned(n)))
 #endif
 
 #define IS_PRINTABLE_ASCII(c) ((unsigned char)(c)-040u < 0137u)
 
-#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(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;                                                                                                  \
-    } while (0)
+#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(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;                                                                                                          \
+        } 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)
-{
-    *found = 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)) {
-        __m128i ranges16 = _mm_loadu_si128((const __m128i *)ranges);
-
-        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);
-            if (unlikely(r != 16)) {
-                buf += r;
-                *found = 1;
-                break;
-            }
-            buf += 16;
-            left -= 16;
-        } while (likely(left != 0));
-    }
+        if (likely(buf_end - buf >= 16)) {
+                __m128i ranges16 = _mm_loadu_si128((const __m128i *)ranges);
+
+                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);
+                        if (unlikely(r != 16)) {
+                                buf += r;
+                                *found = 1;
+                                break;
+                        }
+                        buf += 16;
+                        left -= 16;
+                } while (likely(left != 0));
+        }
 #else
-    /* suppress unused parameter warning */
-    (void)buf_end;
-    (void)ranges;
-    (void)ranges_size;
+        /* suppress unused parameter warning */
+        (void)buf_end;
+        (void)ranges;
+        (void)ranges_size;
 #endif
-    return buf;
+        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)
-{
-    const char *token_start = buf;
+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 */
-    int found;
-    buf = findchar_fast(buf, buf_end, ranges1, 6, &found);
-    if (found)
-        goto FOUND_CTL;
+        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)
+                goto FOUND_CTL;
 #else
-    /* 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;                                                                                                                     \
-    } while (0)
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-        DOIT();
-#undef DOIT
-        continue;
-    NonPrintable:
-        if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
-            goto FOUND_CTL;
-        }
-        ++buf;
-    }
+        /* 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;                                                                                                                         \
+                } while (0)
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+                DOIT();
+#       undef DOIT
+                continue;
+        NonPrintable:
+                if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
+                        goto FOUND_CTL;
+                }
+                ++buf;
+        }
 #endif
-    for (;; ++buf) {
-        CHECK_EOF();
-        if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {
-            if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
-                goto FOUND_CTL;
-            }
-        }
-    }
+        for (;; ++buf) {
+                CHECK_EOF();
+                if (unlikely(!IS_PRINTABLE_ASCII(*buf))) {
+                        if ((likely((unsigned char)*buf < '\040') && likely(*buf != '\011')) || unlikely(*buf == '\177')) {
+                                goto FOUND_CTL;
+                        }
+                }
+        }
 FOUND_CTL:
-    if (likely(*buf == '\015')) {
-        ++buf;
-        EXPECT_CHAR('\012');
-        *token_len = buf - 2 - token_start;
-    } else if (*buf == '\012') {
-        *token_len = buf - token_start;
-        ++buf;
-    } else {
-        *ret = -1;
-        return NULL;
-    }
-    *token = token_start;
-
-    return buf;
+        if (likely(*buf == '\015')) {
+                ++buf;
+                EXPECT_CHAR('\012');
+                *token_len = buf - 2 - token_start;
+        } else if (*buf == '\012') {
+                *token_len = buf - token_start;
+                ++buf;
+        } else {
+                *ret = -1;
+                return NULL;
+        }
+        *token = token_start;
+
+        return buf;
 }
 
-static const char *is_complete(const char *buf, const char *buf_end, size_t last_len, int *ret)
-{
-    int ret_cnt = 0;
-    buf = last_len < 3 ? buf : buf + last_len - 3;
-
-    while (1) {
-        CHECK_EOF();
-        if (*buf == '\015') {
-            ++buf;
-            CHECK_EOF();
-            EXPECT_CHAR('\012');
-            ++ret_cnt;
-        } else if (*buf == '\012') {
-            ++buf;
-            ++ret_cnt;
-        } else {
-            ++buf;
-            ret_cnt = 0;
-        }
-        if (ret_cnt == 2) {
-            return buf;
-        }
-    }
-
-    *ret = -2;
-    return NULL;
+static const char *is_complete(const char *buf, const char *buf_end, size_t last_len, int *ret) {
+        int ret_cnt = 0;
+        buf = last_len < 3 ? buf : buf + last_len - 3;
+
+        while (1) {
+                CHECK_EOF();
+                if (*buf == '\015') {
+                        ++buf;
+                        CHECK_EOF();
+                        EXPECT_CHAR('\012');
+                        ++ret_cnt;
+                } else if (*buf == '\012') {
+                        ++buf;
+                        ++ret_cnt;
+                } else {
+                        ++buf;
+                        ret_cnt = 0;
+                }
+                if (ret_cnt == 2) {
+                        return buf;
+                }
+        }
+
+        *ret = -2;
+        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_;                                                                                                            \
-    } while (0)
+#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_;                                                                                                                    \
+        } 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)
-{
-    /* we want at least [HTTP/1.<two chars>] to try to parse */
-    if (buf_end - buf < 9) {
-        *ret = -2;
-        return NULL;
-    }
-    EXPECT_CHAR_NO_CHECK('H');
-    EXPECT_CHAR_NO_CHECK('T');
-    EXPECT_CHAR_NO_CHECK('T');
-    EXPECT_CHAR_NO_CHECK('P');
-    EXPECT_CHAR_NO_CHECK('/');
-    PARSE_INT(major_version, 1);
-    if (*major_version == 1) {
-        EXPECT_CHAR_NO_CHECK('.');
-        PARSE_INT(minor_version, 1);
-    } else {
-        *minor_version = 0;
-    }
-    return buf;
+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;
+                return NULL;
+        }
+        EXPECT_CHAR_NO_CHECK('H');
+        EXPECT_CHAR_NO_CHECK('T');
+        EXPECT_CHAR_NO_CHECK('T');
+        EXPECT_CHAR_NO_CHECK('P');
+        EXPECT_CHAR_NO_CHECK('/');
+        PARSE_INT(major_version, 1);
+        if (*major_version == 1) {
+                EXPECT_CHAR_NO_CHECK('.');
+                PARSE_INT(minor_version, 1);
+        } else {
+                *minor_version = 0;
+        }
+        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)
-{
-    for (;; ++*num_headers) {
-        CHECK_EOF();
-        if (*buf == '\015') {
-            ++buf;
-            EXPECT_CHAR('\012');
-            break;
-        } else if (*buf == '\012') {
-            ++buf;
-            break;
-        }
-        if (*num_headers == max_headers) {
-            *ret = -1;
-            return NULL;
-        }
-        if (!(*num_headers != 0 && (*buf == ' ' || *buf == '\t'))) {
-            /* parsing name, but do not discard SP before colon, see
-             * http://www.mozilla.org/security/announce/2006/mfsa2006-33.html */
-            headers[*num_headers].name = buf;
-            static const char ALIGNED(16) ranges1[] = "\x00 "  /* control chars and up to SP */
-                                                      "\"\""   /* 0x22 */
-                                                      "()"     /* 0x28,0x29 */
-                                                      ",,"     /* 0x2c */
-                                                      "//"     /* 0x2f */
-                                                      ":@"     /* 0x3a-0x40 */
-                                                      "[]"     /* 0x5b-0x5d */
-                                                      "{\377"; /* 0x7b-0xff */
-            int found;
-            buf = findchar_fast(buf, buf_end, ranges1, sizeof(ranges1) - 1, &found);
-            if (!found) {
-                CHECK_EOF();
-            }
-            while (1) {
-                if (*buf == ':') {
-                    break;
-                } else if (!token_char_map[(unsigned char)*buf]) {
-                    *ret = -1;
-                    return NULL;
-                }
-                ++buf;
-                CHECK_EOF();
-            }
-            if ((headers[*num_headers].name_len = buf - headers[*num_headers].name) == 0) {
-                *ret = -1;
-                return NULL;
-            }
-            ++buf;
-            for (;; ++buf) {
-                CHECK_EOF();
-                if (!(*buf == ' ' || *buf == '\t')) {
-                    break;
-                }
-            }
-        } else {
-            headers[*num_headers].name = NULL;
-            headers[*num_headers].name_len = 0;
-        }
-        const char *value;
-        size_t value_len;
-        if ((buf = get_token_to_eol(buf, buf_end, &value, &value_len, ret)) == NULL) {
-            return NULL;
-        }
-        /* remove trailing SPs and HTABs */
-        const char *value_end = value + value_len;
-        for (; value_end != value; --value_end) {
-            const char c = *(value_end - 1);
-            if (!(c == ' ' || c == '\t')) {
-                break;
-            }
-        }
-        headers[*num_headers].value = value;
-        headers[*num_headers].value_len = value_end - value;
-    }
-    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) {
+        for (;; ++*num_headers) {
+                CHECK_EOF();
+                if (*buf == '\015') {
+                        ++buf;
+                        EXPECT_CHAR('\012');
+                        break;
+                } else if (*buf == '\012') {
+                        ++buf;
+                        break;
+                }
+                if (*num_headers == max_headers) {
+                        *ret = -1;
+                        return NULL;
+                }
+                if (!(*num_headers != 0 && (*buf == ' ' || *buf == '\t'))) {
+                        /* parsing name, but do not discard SP before colon, see
+                         * http://www.mozilla.org/security/announce/2006/mfsa2006-33.html */
+                        headers[*num_headers].name = buf;
+                        static const char ALIGNED(16) ranges1[] = "\x00 "  /* control chars and up to SP */
+                                                                                                          "\"\""   /* 0x22 */
+                                                                                                          "()"     /* 0x28,0x29 */
+                                                                                                          ",,"     /* 0x2c */
+                                                                                                          "//"     /* 0x2f */
+                                                                                                          ":@"     /* 0x3a-0x40 */
+                                                                                                          "[]"     /* 0x5b-0x5d */
+                                                                                                          "{\377"; /* 0x7b-0xff */
+                        int found;
+                        buf = findchar_fast(buf, buf_end, ranges1, sizeof(ranges1) - 1, &found);
+                        if (!found) {
+                                CHECK_EOF();
+                        }
+                        while (1) {
+                                if (*buf == ':') {
+                                        break;
+                                } else if (!token_char_map[(unsigned char)*buf]) {
+                                        *ret = -1;
+                                        return NULL;
+                                }
+                                ++buf;
+                                CHECK_EOF();
+                        }
+                        if ((headers[*num_headers].name_len = buf - headers[*num_headers].name) == 0) {
+                                *ret = -1;
+                                return NULL;
+                        }
+                        ++buf;
+                        for (;; ++buf) {
+                                CHECK_EOF();
+                                if (!(*buf == ' ' || *buf == '\t')) {
+                                        break;
+                                }
+                        }
+                } else {
+                        headers[*num_headers].name = NULL;
+                        headers[*num_headers].name_len = 0;
+                }
+                const char *value;
+                size_t value_len;
+                if ((buf = get_token_to_eol(buf, buf_end, &value, &value_len, ret)) == NULL) {
+                        return NULL;
+                }
+                /* remove trailing SPs and HTABs */
+                const char *value_end = value + value_len;
+                for (; value_end != value; --value_end) {
+                        const char c = *(value_end - 1);
+                        if (!(c == ' ' || c == '\t')) {
+                                break;
+                        }
+                }
+                headers[*num_headers].value = value;
+                headers[*num_headers].value_len = value_end - value;
+        }
+        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)
-{
-    /* skip first empty line (some clients add CRLF after POST content) */
-    CHECK_EOF();
-    if (*buf == '\015') {
-        ++buf;
-        EXPECT_CHAR('\012');
-    } else if (*buf == '\012') {
-        ++buf;
-    }
-
-    /* parse request line */
-    ADVANCE_TOKEN(*method, *method_len);
-    do {
-        ++buf;
-    } while (*buf == ' ');
-    ADVANCE_TOKEN(*path, *path_len);
-    do {
-        ++buf;
-    } while (*buf == ' ');
-    if (*method_len == 0 || *path_len == 0) {
-        *ret = -1;
-        return NULL;
-    }
-    if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) {
-        return NULL;
-    }
-    if (*buf == '\015') {
-        ++buf;
-        EXPECT_CHAR('\012');
-    } else if (*buf == '\012') {
-        ++buf;
-    } else {
-        *ret = -1;
-        return NULL;
-    }
-
-    return parse_headers(buf, buf_end, headers, num_headers, max_headers, ret);
+                                                                 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') {
+                ++buf;
+                EXPECT_CHAR('\012');
+        } else if (*buf == '\012') {
+                ++buf;
+        }
+
+        /* parse request line */
+        ADVANCE_TOKEN(*method, *method_len);
+        do {
+                ++buf;
+        } while (*buf == ' ');
+        ADVANCE_TOKEN(*path, *path_len);
+        do {
+                ++buf;
+        } while (*buf == ' ');
+        if (*method_len == 0 || *path_len == 0) {
+                *ret = -1;
+                return NULL;
+        }
+        if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) {
+                return NULL;
+        }
+        if (*buf == '\015') {
+                ++buf;
+                EXPECT_CHAR('\012');
+        } else if (*buf == '\012') {
+                ++buf;
+        } else {
+                *ret = -1;
+                return NULL;
+        }
+
+        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)
-{
-    const char *buf = buf_start, *buf_end = buf_start + len;
-    size_t max_headers = *num_headers;
-    int r;
-
-    *method = NULL;
-    *method_len = 0;
-    *path = NULL;
-    *path_len = 0;
-    *major_version = -1;
-    *minor_version = -1;
-    *num_headers = 0;
-
-    /* if last_len != 0, check if the request is complete (a fast countermeasure
-       against slowloris */
-    if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
-        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) {
-        return r;
-    }
-
-    return (int)(buf - buf_start);
+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;
+
+        *method = NULL;
+        *method_len = 0;
+        *path = NULL;
+        *path_len = 0;
+        *major_version = -1;
+        *minor_version = -1;
+        *num_headers = 0;
+
+        /* if last_len != 0, check if the request is complete (a fast countermeasure
+           against slowloris */
+        if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
+                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) {
+                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)
-{
-    /* parse "HTTP/1.x" */
-    if ((buf = parse_http_version(buf, buf_end, major_version, minor_version, ret)) == NULL) {
-        return NULL;
-    }
-    /* skip space */
-    if (*buf != ' ') {
-        *ret = -1;
-        return NULL;
-    }
-    do {
-        ++buf;
-    } while (*buf == ' ');
-    /* 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;
-    }
-    PARSE_INT_3(status);
-
-    /* get message including preceding space */
-    if ((buf = get_token_to_eol(buf, buf_end, msg, msg_len, ret)) == NULL) {
-        return NULL;
-    }
-    if (*msg_len == 0) {
-        /* ok */
-    } else if (**msg == ' ') {
-        /* remove preceding space */
-        do {
-            ++*msg;
-            --*msg_len;
-        } while (**msg == ' ');
-    } else {
-        /* garbage found after status code */
-        *ret = -1;
-        return NULL;
-    }
-
-    return parse_headers(buf, buf_end, headers, num_headers, max_headers, 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;
+        }
+        /* skip space */
+        if (*buf != ' ') {
+                *ret = -1;
+                return NULL;
+        }
+        do {
+                ++buf;
+        } while (*buf == ' ');
+        /* 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;
+        }
+        PARSE_INT_3(status);
+
+        /* get message including preceding space */
+        if ((buf = get_token_to_eol(buf, buf_end, msg, msg_len, ret)) == NULL) {
+                return NULL;
+        }
+        if (*msg_len == 0) {
+                /* ok */
+        } else if (**msg == ' ') {
+                /* remove preceding space */
+                do {
+                        ++*msg;
+                        --*msg_len;
+                } while (**msg == ' ');
+        } else {
+                /* garbage found after status code */
+                *ret = -1;
+                return NULL;
+        }
+
+        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)
-{
-    const char *buf = buf_start, *buf_end = buf + len;
-    size_t max_headers = *num_headers;
-    int r;
-
-    *major_version = -1;
-    *minor_version = -1;
-    *status = 0;
-    *msg = NULL;
-    *msg_len = 0;
-    *num_headers = 0;
-
-    /* if last_len != 0, check if the response is complete (a fast countermeasure
-       against slowloris */
-    if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
-        return r;
-    }
-
-    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_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;
+
+        *major_version = -1;
+        *minor_version = -1;
+        *status = 0;
+        *msg = NULL;
+        *msg_len = 0;
+        *num_headers = 0;
+
+        /* if last_len != 0, check if the response is complete (a fast countermeasure
+           against slowloris */
+        if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
+                return r;
+        }
+
+        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)
-{
-    const char *buf = buf_start, *buf_end = buf + len;
-    size_t max_headers = *num_headers;
-    int r;
+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;
 
-    *num_headers = 0;
+        *num_headers = 0;
 
-    /* if last_len != 0, check if the response is complete (a fast countermeasure
-       against slowloris */
-    if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
-        return r;
-    }
+        /* if last_len != 0, check if the response is complete (a fast countermeasure
+           against slowloris */
+        if (last_len != 0 && is_complete(buf, buf_end, last_len, &r) == NULL) {
+                return r;
+        }
 
-    if ((buf = parse_headers(buf, buf_end, headers, num_headers, max_headers, &r)) == NULL) {
-        return r;
-    }
+        if ((buf = parse_headers(buf, buf_end, headers, num_headers, max_headers, &r)) == NULL) {
+                return r;
+        }
 
-    return (int)(buf - buf_start);
+        return (int)(buf - buf_start);
 }
 
 enum {
-    CHUNKED_IN_CHUNK_SIZE,
-    CHUNKED_IN_CHUNK_EXT,
-    CHUNKED_IN_CHUNK_DATA,
-    CHUNKED_IN_CHUNK_CRLF,
-    CHUNKED_IN_TRAILERS_LINE_HEAD,
-    CHUNKED_IN_TRAILERS_LINE_MIDDLE
+        CHUNKED_IN_CHUNK_SIZE,
+        CHUNKED_IN_CHUNK_EXT,
+        CHUNKED_IN_CHUNK_DATA,
+        CHUNKED_IN_CHUNK_CRLF,
+        CHUNKED_IN_TRAILERS_LINE_HEAD,
+        CHUNKED_IN_TRAILERS_LINE_MIDDLE
 };
 
-static int decode_hex(int ch)
-{
-    if ('0' <= ch && ch <= '9') {
-        return ch - '0';
-    } else if ('A' <= ch && ch <= 'F') {
-        return ch - 'A' + 0xa;
-    } else if ('a' <= ch && ch <= 'f') {
-        return ch - 'a' + 0xa;
-    } else {
-        return -1;
-    }
+static int decode_hex(int ch) {
+        if ('0' <= ch && ch <= '9') {
+                return ch - '0';
+        } else if ('A' <= ch && ch <= 'F') {
+                return ch - 'A' + 0xa;
+        } else if ('a' <= ch && ch <= 'f') {
+                return ch - 'a' + 0xa;
+        } else {
+                return -1;
+        }
 }
 
-ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_t *_bufsz)
-{
-    size_t dst = 0, src = 0, bufsz = *_bufsz;
-    ssize_t ret = -2; /* incomplete */
-
-    while (1) {
-        switch (decoder->_state) {
-        case CHUNKED_IN_CHUNK_SIZE:
-            for (;; ++src) {
-                int v;
-                if (src == bufsz)
-                    goto Exit;
-                if ((v = decode_hex(buf[src])) == -1) {
-                    if (decoder->_hex_count == 0) {
-                        ret = -1;
-                        goto Exit;
-                    }
-                    break;
-                }
-                if (decoder->_hex_count == sizeof(size_t) * 2) {
-                    ret = -1;
-                    goto Exit;
-                }
-                decoder->bytes_left_in_chunk = decoder->bytes_left_in_chunk * 16 + v;
-                ++decoder->_hex_count;
-            }
-            decoder->_hex_count = 0;
-            decoder->_state = CHUNKED_IN_CHUNK_EXT;
-        /* fallthru */
-        case CHUNKED_IN_CHUNK_EXT:
-            /* RFC 7230 A.2 "Line folding in chunk extensions is disallowed" */
-            for (;; ++src) {
-                if (src == bufsz)
-                    goto Exit;
-                if (buf[src] == '\012')
-                    break;
-            }
-            ++src;
-            if (decoder->bytes_left_in_chunk == 0) {
-                if (decoder->consume_trailer) {
-                    decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
-                    break;
-                } else {
-                    goto Complete;
-                }
-            }
-            decoder->_state = CHUNKED_IN_CHUNK_DATA;
-        /* fallthru */
-        case CHUNKED_IN_CHUNK_DATA: {
-            size_t avail = bufsz - src;
-            if (avail < decoder->bytes_left_in_chunk) {
-                if (dst != src)
-                    memmove(buf + dst, buf + src, avail);
-                src += avail;
-                dst += avail;
-                decoder->bytes_left_in_chunk -= avail;
-                goto Exit;
-            }
-            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;
-            decoder->_state = CHUNKED_IN_CHUNK_CRLF;
-        }
-        /* fallthru */
-        case CHUNKED_IN_CHUNK_CRLF:
-            for (;; ++src) {
-                if (src == bufsz)
-                    goto Exit;
-                if (buf[src] != '\015')
-                    break;
-            }
-            if (buf[src] != '\012') {
-                ret = -1;
-                goto Exit;
-            }
-            ++src;
-            decoder->_state = CHUNKED_IN_CHUNK_SIZE;
-            break;
-        case CHUNKED_IN_TRAILERS_LINE_HEAD:
-            for (;; ++src) {
-                if (src == bufsz)
-                    goto Exit;
-                if (buf[src] != '\015')
-                    break;
-            }
-            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)
-                    goto Exit;
-                if (buf[src] == '\012')
-                    break;
-            }
-            ++src;
-            decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
-            break;
-        default:
-            assert(!"decoder is corrupt");
-        }
-    }
+ssize_t phr_decode_chunked(struct phr_chunked_decoder *decoder, char *buf, size_t *_bufsz) {
+        size_t dst = 0, src = 0, bufsz = *_bufsz;
+        ssize_t ret = -2; /* incomplete */
+
+        while (1) {
+                switch (decoder->_state) {
+                case CHUNKED_IN_CHUNK_SIZE:
+                        for (;; ++src) {
+                                int v;
+                                if (src == bufsz)
+                                        goto Exit;
+                                if ((v = decode_hex(buf[src])) == -1) {
+                                        if (decoder->_hex_count == 0) {
+                                                ret = -1;
+                                                goto Exit;
+                                        }
+                                        break;
+                                }
+                                if (decoder->_hex_count == sizeof(size_t) * 2) {
+                                        ret = -1;
+                                        goto Exit;
+                                }
+                                decoder->bytes_left_in_chunk = decoder->bytes_left_in_chunk * 16 + v;
+                                ++decoder->_hex_count;
+                        }
+                        decoder->_hex_count = 0;
+                        decoder->_state = CHUNKED_IN_CHUNK_EXT;
+                /* fallthru */
+                case CHUNKED_IN_CHUNK_EXT:
+                        /* RFC 7230 A.2 "Line folding in chunk extensions is disallowed" */
+                        for (;; ++src) {
+                                if (src == bufsz)
+                                        goto Exit;
+                                if (buf[src] == '\012')
+                                        break;
+                        }
+                        ++src;
+                        if (decoder->bytes_left_in_chunk == 0) {
+                                if (decoder->consume_trailer) {
+                                        decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
+                                        break;
+                                } else {
+                                        goto Complete;
+                                }
+                        }
+                        decoder->_state = CHUNKED_IN_CHUNK_DATA;
+                /* fallthru */
+                case CHUNKED_IN_CHUNK_DATA: {
+                        size_t avail = bufsz - src;
+                        if (avail < decoder->bytes_left_in_chunk) {
+                                if (dst != src)
+                                        memmove(buf + dst, buf + src, avail);
+                                src += avail;
+                                dst += avail;
+                                decoder->bytes_left_in_chunk -= avail;
+                                goto Exit;
+                        }
+                        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;
+                        decoder->_state = CHUNKED_IN_CHUNK_CRLF;
+                }
+                /* fallthru */
+                case CHUNKED_IN_CHUNK_CRLF:
+                        for (;; ++src) {
+                                if (src == bufsz)
+                                        goto Exit;
+                                if (buf[src] != '\015')
+                                        break;
+                        }
+                        if (buf[src] != '\012') {
+                                ret = -1;
+                                goto Exit;
+                        }
+                        ++src;
+                        decoder->_state = CHUNKED_IN_CHUNK_SIZE;
+                        break;
+                case CHUNKED_IN_TRAILERS_LINE_HEAD:
+                        for (;; ++src) {
+                                if (src == bufsz)
+                                        goto Exit;
+                                if (buf[src] != '\015')
+                                        break;
+                        }
+                        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)
+                                        goto Exit;
+                                if (buf[src] == '\012')
+                                        break;
+                        }
+                        ++src;
+                        decoder->_state = CHUNKED_IN_TRAILERS_LINE_HEAD;
+                        break;
+                default:
+                        assert(!"decoder is corrupt");
+                }
+        }
 
 Complete:
-    ret = bufsz - src;
+        ret = bufsz - src;
 Exit:
-    if (dst != src)
-        memmove(buf + dst, buf + src, bufsz - src);
-    *_bufsz = dst;
-    return ret;
+        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/popen.c b/plugins/popen.c
index 54e63bc5..cfe930b6 100644
--- a/plugins/popen.c
+++ b/plugins/popen.c
@@ -1,109 +1,97 @@
 /*****************************************************************************
-* 
-* Monitoring Plugins popen
-* 
-* License: GPL
-* Copyright (c) 2005-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* A safe alternative to popen
-* 
-* Provides spopen and spclose
-* 
-* FILE * spopen(const char *);
-* int spclose(FILE *);
-* 
-* Code taken with little modification from "Advanced Programming for the Unix
-* Environment" by W. Richard Stevens
-* 
-* This is considered safe in that no shell is spawned, and the environment
-* and path passed to the exec'd program are essentially empty. (popen create
-* a shell and passes the environment to it).
-* 
-* 
-* 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 popen
+ *
+ * License: GPL
+ * Copyright (c) 2005-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * A safe alternative to popen
+ *
+ * Provides spopen and spclose
+ *
+ * FILE * spopen(const char *);
+ * int spclose(FILE *);
+ *
+ * Code taken with little modification from "Advanced Programming for the Unix
+ * Environment" by W. Richard Stevens
+ *
+ * This is considered safe in that no shell is spawned, and the environment
+ * and path passed to the exec'd program are essentially empty. (popen create
+ * a shell and passes the environment to it).
+ *
+ *
+ * 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.h"
-#include "../lib/maxfd.h"
 
 /* extern so plugin has pid to kill exec'd process on timeouts */
 extern pid_t *childpid;
 extern int *child_stderr_array;
 extern FILE *child_process;
 
-FILE *spopen (const char *);
-int spclose (FILE *);
+FILE *spopen(const char * /*cmdstring*/);
+int spclose(FILE * /*fp*/);
 #ifdef REDHAT_SPOPEN_ERROR
-void popen_sigchld_handler (int);
+void popen_sigchld_handler(int);
 #endif
-void popen_timeout_alarm_handler (int);
+void popen_timeout_alarm_handler(int /*signo*/);
 
-#include <stdarg.h>                                                     /* ANSI C header file */
+#include <stdarg.h> /* ANSI C header file */
 #include <fcntl.h>
 
 #include <limits.h>
 #include <sys/resource.h>
 
 #ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
+#       include <sys/wait.h>
 #endif
 
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#       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 */
 #if defined(SIG_IGN) && !defined(SIG_ERR)
-#define SIG_ERR ((Sigfunc *)-1)
+#       define SIG_ERR ((Sigfunc *)-1)
 #endif
 
-
-char *pname = NULL;                                                     /* caller can set this from argv[0] */
+char *pname = NULL; /* caller can set this from argv[0] */
 
 #ifdef REDHAT_SPOPEN_ERROR
 static volatile int childtermd = 0;
 #endif
 
-FILE *
-spopen (const char *cmdstring)
-{
-        char *env[2];
-        char *cmd = NULL;
-        char **argv = NULL;
-        char *str, *tmp;
-        int argc;
-
-        int i = 0, pfd[2], pfderr[2];
-        pid_t pid;
-
-#ifdef  RLIMIT_CORE
+FILE *spopen(const char *cmdstring) {
+#ifdef RLIMIT_CORE
         /* do not leave core files */
         struct rlimit limit;
-        getrlimit (RLIMIT_CORE, &limit);
+        getrlimit(RLIMIT_CORE, &limit);
         limit.rlim_cur = 0;
-        setrlimit (RLIMIT_CORE, &limit);
+        setrlimit(RLIMIT_CORE, &limit);
 #endif
 
+        char *env[2];
         env[0] = strdup("LC_ALL=C");
         env[1] = NULL;
 
@@ -111,184 +99,182 @@ spopen (const char *cmdstring)
         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);
+        cmd = malloc(strlen(cmdstring) + 1);
         if (cmd == NULL)
                 return NULL;
-        strcpy (cmd, cmdstring);
+        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;
         /* there cannot be more args than characters */
-        argc = strlen (cmdstring) + 1;  /* add 1 for NULL termination */
-        argv = malloc (sizeof(char*)*argc);
+        argc = strlen(cmdstring) + 1; /* add 1 for NULL termination */
+        argv = malloc(sizeof(char *) * argc);
 
         if (argv == NULL) {
-                printf ("%s\n", _("Could not malloc argv array in popen()"));
+                printf("%s\n", _("Could not malloc argv array in popen()"));
                 return NULL;
         }
 
+        int i = 0;
+        char *str;
         /* loop to get arguments to command */
         while (cmd) {
                 str = cmd;
-                str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
+                str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
 
                 if (i >= argc - 2) {
-                        printf ("%s\n",_("CRITICAL - You need more args!!!"));
+                        printf("%s\n", _("CRITICAL - You need more args!!!"));
                         return (NULL);
                 }
 
-                if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
+                if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
                         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 */
-                        tmp = str + strcspn(str, "'") + 1;
-                        if (!strstr (tmp, "'"))
-                                return NULL;                                            /* balanced? */
-                        tmp += strcspn(tmp,"'") + 1;
+                        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, "'"))
+                                return NULL; /* balanced? */
+                        tmp += strcspn(tmp, "'") + 1;
                         *tmp = 0;
                         cmd = tmp + 1;
                 } else {
-                        if (strpbrk (str, " \t\r\n")) {
-                                cmd = 1 + strpbrk (str, " \t\r\n");
-                                str[strcspn (str, " \t\r\n")] = 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"))
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n"))
                         cmd = NULL;
 
                 argv[i++] = str;
-
         }
         argv[i] = NULL;
 
         long maxfd = mp_open_max();
 
-        if (childpid == NULL) {                         /* first time through */
-                if ((childpid = calloc ((size_t)maxfd, sizeof (pid_t))) == NULL)
+        if (childpid == NULL) { /* first time through */
+                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 == NULL) { /* first time through */
+                if ((child_stderr_array = calloc((size_t)maxfd, sizeof(int))) == NULL)
                         return (NULL);
         }
 
-        if (pipe (pfd) < 0)
-                return (NULL);                                                  /* errno set by pipe() */
+        int pfd[2];
+        if (pipe(pfd) < 0)
+                return (NULL); /* errno set by pipe() */
 
-        if (pipe (pfderr) < 0)
-                return (NULL);                                                  /* errno set by pipe() */
+        int pfderr[2];
+        if (pipe(pfderr) < 0)
+                return (NULL); /* errno set by pipe() */
 
 #ifdef REDHAT_SPOPEN_ERROR
-        if (signal (SIGCHLD, popen_sigchld_handler) == SIG_ERR) {
-                usage4 (_("Cannot catch SIGCHLD"));
+        if (signal(SIGCHLD, popen_sigchld_handler) == SIG_ERR) {
+                usage4(_("Cannot catch SIGCHLD"));
         }
 #endif
 
-        if ((pid = fork ()) < 0)
-                return (NULL);                                                  /* errno set by fork() */
-        else if (pid == 0) {                                    /* child */
-                close (pfd[0]);
+        pid_t pid;
+        if ((pid = fork()) < 0)
+                return (NULL); /* errno set by fork() */
+
+        if (pid == 0) { /* child */
+                close(pfd[0]);
                 if (pfd[1] != STDOUT_FILENO) {
-                        dup2 (pfd[1], STDOUT_FILENO);
-                        close (pfd[1]);
+                        dup2(pfd[1], STDOUT_FILENO);
+                        close(pfd[1]);
                 }
-                close (pfderr[0]);
+                close(pfderr[0]);
                 if (pfderr[1] != STDERR_FILENO) {
-                        dup2 (pfderr[1], STDERR_FILENO);
-                        close (pfderr[1]);
+                        dup2(pfderr[1], STDERR_FILENO);
+                        close(pfderr[1]);
                 }
                 /* close all descriptors in childpid[] */
                 for (i = 0; i < maxfd; i++)
                         if (childpid[i] > 0)
-                                close (i);
+                                close(i);
 
-                execve (argv[0], argv, env);
-                _exit (0);
+                execve(argv[0], argv, env);
+                _exit(0);
         }
 
-        close (pfd[1]);                                                         /* parent */
-        if ((child_process = fdopen (pfd[0], "r")) == NULL)
+        close(pfd[1]); /* parent */
+        if ((child_process = fdopen(pfd[0], "r")) == NULL)
                 return (NULL);
-        close (pfderr[1]);
+        close(pfderr[1]);
 
-        childpid[fileno (child_process)] = pid; /* remember child pid for this fd */
-        child_stderr_array[fileno (child_process)] = pfderr[0]; /* remember STDERR */
+        childpid[fileno(child_process)] = pid;                 /* remember child pid for this fd */
+        child_stderr_array[fileno(child_process)] = pfderr[0]; /* remember STDERR */
         return (child_process);
 }
 
-int
-spclose (FILE * fp)
-{
-        int fd, status;
-        pid_t pid;
-
+int spclose(FILE *fp) {
         if (childpid == NULL)
-                return (1);                                                             /* popen() has never been called */
+                return (1); /* popen() has never been called */
 
-        fd = fileno (fp);
+        pid_t pid;
+        int fd = fileno(fp);
         if ((pid = childpid[fd]) == 0)
-                return (1);                                                             /* fp wasn't opened by popen() */
+                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);                                                            /* wait until SIGCHLD */
+        while (!childtermd)
+                ; /* wait until SIGCHLD */
 #endif
 
-        while (waitpid (pid, &status, 0) < 0)
+        int status;
+        while (waitpid(pid, &status, 0) < 0)
                 if (errno != EINTR)
-                        return (1);                                                     /* error other than EINTR from waitpid() */
+                        return (1); /* error other than EINTR from waitpid() */
 
-        if (WIFEXITED (status))
-                return (WEXITSTATUS (status));  /* return child's termination status */
+        if (WIFEXITED(status))
+                return (WEXITSTATUS(status)); /* return child's termination status */
 
         return (1);
 }
 
 #ifdef REDHAT_SPOPEN_ERROR
-void
-popen_sigchld_handler (int signo)
-{
+void popen_sigchld_handler(int signo) {
         if (signo == SIGCHLD)
                 childtermd = 1;
 }
 #endif
 
-void
-popen_timeout_alarm_handler (int signo)
-{
-        int fh;
+void popen_timeout_alarm_handler(int signo) {
         if (signo == SIGALRM) {
                 if (child_process != NULL) {
-                        fh=fileno (child_process);
-                        if(fh >= 0){
-                                kill (childpid[fh], SIGKILL);
+                        int fh = fileno(child_process);
+                        if (fh >= 0) {
+                                kill(childpid[fh], SIGKILL);
                         }
-                        printf (_("CRITICAL - Plugin timed out after %d seconds\n"),
-                                                timeout_interval);
+                        printf(_("CRITICAL - Plugin timed out after %d seconds\n"), timeout_interval);
                 } else {
-                        printf ("%s\n", _("CRITICAL - popen timeout received, but no child process"));
+                        printf("%s\n", _("CRITICAL - popen timeout received, but no child process"));
                 }
-                exit (STATE_CRITICAL);
+                exit(STATE_CRITICAL);
         }
 }
diff --git a/plugins/runcmd.c b/plugins/runcmd.c
index ed49bb99..4429ceb0 100644
--- a/plugins/runcmd.c
+++ b/plugins/runcmd.c
@@ -1,63 +1,64 @@
 /*****************************************************************************
-* 
-* Monitoring run command utilities
-* 
-* License: GPL
-* Copyright (c) 2005-2006 Monitoring Plugins Development Team
-* 
-* Description :
-* 
-* A simple interface to executing programs from other programs, using an
-* optimized and safe popen()-like implementation. It is considered safe
-* in that no shell needs to be spawned and the environment passed to the
-* execve()'d program is essentially empty.
-* 
-* The code in this file is a derivative of popen.c which in turn was taken
-* from "Advanced Programming for the Unix Environment" by W. Richard Stevens.
-* 
-* Care has been taken to make sure the functions are async-safe. The one
-* function which isn't is np_runcmd_init() which it doesn't make sense to
-* call twice anyway, so the api as a whole should be considered async-safe.
-* 
-* 
-* 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 run command utilities
+ *
+ * License: GPL
+ * Copyright (c) 2005-2024 Monitoring Plugins Development Team
+ *
+ * Description :
+ *
+ * A simple interface to executing programs from other programs, using an
+ * optimized and safe popen()-like implementation. It is considered safe
+ * in that no shell needs to be spawned and the environment passed to the
+ * execve()'d program is essentially empty.
+ *
+ * The code in this file is a derivative of popen.c which in turn was taken
+ * from "Advanced Programming for the Unix Environment" by W. Richard Stevens.
+ *
+ * Care has been taken to make sure the functions are async-safe. The one
+ * function which isn't is np_runcmd_init() which it doesn't make sense to
+ * call twice anyway, so the api as a whole should be considered async-safe.
+ *
+ *
+ * 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/>.
+ *
+ *
+ *****************************************************************************/
 
 #define NAGIOSPLUG_API_C 1
 
 /** includes **/
 #include "runcmd.h"
+#include "../lib/monitoringplug.h"
 #ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
+#       include <sys/wait.h>
 #endif
 
 #include "./utils.h"
 
 /** macros **/
 #ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#       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 */
 #if defined(SIG_IGN) && !defined(SIG_ERR)
-# define SIG_ERR ((Sigfunc *)-1)
+#       define SIG_ERR ((Sigfunc *)-1)
 #endif
 
 #include "../lib/maxfd.h"
@@ -72,33 +73,26 @@
 static pid_t *np_pids = NULL;
 
 /** prototypes **/
-static int np_runcmd_open(const char *, int *, int *)
-        __attribute__((__nonnull__(1, 2, 3)));
+static int np_runcmd_open(const char *, int *, int *) __attribute__((__nonnull__(1, 2, 3)));
 
-static int np_fetch_output(int, output *, int)
-        __attribute__((__nonnull__(2)));
+static int np_fetch_output(int, output *, int) __attribute__((__nonnull__(2)));
 
 static int np_runcmd_close(int);
 
 /* prototype imported from utils.h */
-extern void die (int, const char *, ...)
-        __attribute__((__noreturn__,__format__(__printf__, 2, 3)));
-
+extern void die(int, const char *, ...) __attribute__((__noreturn__, __format__(__printf__, 2, 3)));
 
 /* this function is NOT async-safe. It is exported so multithreaded
  * plugins (or other apps) can call it prior to running any commands
  * through this api and thus achieve async-safeness throughout the api */
-void np_runcmd_init(void)
-{
-  long maxfd = mp_open_max();
-        if(!np_pids) np_pids = calloc(maxfd, sizeof(pid_t));
+void np_runcmd_init(void) {
+        long maxfd = mp_open_max();
+        if (!np_pids)
+                np_pids = calloc(maxfd, sizeof(pid_t));
 }
 
-
 /* Start running a command */
-static int
-np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
-{
+static int np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr) {
         char *env[2];
         char *cmd = NULL;
         char **argv = NULL;
@@ -112,7 +106,8 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
 
         int i = 0;
 
-        if(!np_pids) NP_RUNCMD_INIT;
+        if (!np_pids)
+                NP_RUNCMD_INIT;
 
         env[0] = strdup("LC_ALL=C");
         env[1] = NULL;
@@ -120,49 +115,50 @@ 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) return -1;
+        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, "\"")) return -1;
+        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(sizeof(char *), argc);
+        argv = calloc(argc, sizeof(char *));
 
         if (argv == NULL) {
-                printf ("%s\n", _("Could not malloc argv array in popen()"));
+                printf("%s\n", _("Could not malloc argv array in popen()"));
                 return -1;
         }
 
         /* get command arguments (stupidly, but fairly quickly) */
         while (cmd) {
                 str = cmd;
-                str += strspn (str, " \t\r\n"); /* trim any leading whitespace */
+                str += strspn(str, " \t\r\n"); /* trim any leading whitespace */
 
-                if (strstr (str, "'") == str) { /* handle SIMPLE quoted strings */
+                if (strstr(str, "'") == str) { /* handle SIMPLE quoted strings */
                         str++;
-                        if (!strstr (str, "'")) return -1;      /* 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 {
+                        if (!strstr(str, "'"))
+                                return -1; /* 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"))
+                if (cmd && strlen(cmd) == strspn(cmd, " \t\r\n"))
                         cmd = NULL;
 
                 argv[i++] = str;
@@ -173,33 +169,33 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
 
         /* child runs exceve() and _exit. */
         if (pid == 0) {
-#ifdef  RLIMIT_CORE
+#ifdef RLIMIT_CORE
                 /* the program we execve shouldn't leave core files */
-                getrlimit (RLIMIT_CORE, &limit);
+                getrlimit(RLIMIT_CORE, &limit);
                 limit.rlim_cur = 0;
-                setrlimit (RLIMIT_CORE, &limit);
+                setrlimit(RLIMIT_CORE, &limit);
 #endif
-                close (pfd[0]);
+                close(pfd[0]);
                 if (pfd[1] != STDOUT_FILENO) {
-                        dup2 (pfd[1], STDOUT_FILENO);
-                        close (pfd[1]);
+                        dup2(pfd[1], STDOUT_FILENO);
+                        close(pfd[1]);
                 }
-                close (pfderr[0]);
+                close(pfderr[0]);
                 if (pfderr[1] != STDERR_FILENO) {
-                        dup2 (pfderr[1], STDERR_FILENO);
-                        close (pfderr[1]);
+                        dup2(pfderr[1], STDERR_FILENO);
+                        close(pfderr[1]);
                 }
 
                 /* close all descriptors in np_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();
+                long maxfd = mp_open_max();
                 for (i = 0; i < maxfd; i++)
-                        if(np_pids[i] > 0)
-                                close (i);
+                        if (np_pids[i] > 0)
+                                close(i);
 
-                execve (argv[0], argv, env);
-                _exit (STATE_UNKNOWN);
+                execve(argv[0], argv, env);
+                _exit(STATE_UNKNOWN);
         }
 
         /* parent picks up execution here */
@@ -213,49 +209,44 @@ np_runcmd_open(const char *cmdstring, int *pfd, int *pfderr)
         return pfd[0];
 }
 
-
-static int
-np_runcmd_close(int fd)
-{
+static int np_runcmd_close(int fd) {
         int status;
         pid_t pid;
 
         /* 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)
+        long maxfd = mp_open_max();
+        if (fd < 0 || fd > maxfd || !np_pids || (pid = np_pids[fd]) == 0)
                 return -1;
 
         np_pids[fd] = 0;
-        if (close (fd) == -1) return -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) return -1;
+        while (waitpid(pid, &status, 0) < 0)
+                if (errno != EINTR)
+                        return -1;
 
         /* return child's termination status */
         return (WIFEXITED(status)) ? WEXITSTATUS(status) : -1;
 }
 
-
-void
-runcmd_timeout_alarm_handler (int signo)
-{
+void runcmd_timeout_alarm_handler(int signo) {
 
         if (signo == SIGALRM)
                 puts(_("CRITICAL - Plugin timed out while executing system call"));
 
-  long maxfd = mp_open_max();
-        if(np_pids) for(long int i = 0; i < maxfd; i++) {
-                if(np_pids[i] != 0) kill(np_pids[i], SIGKILL);
-        }
+        long maxfd = mp_open_max();
+        if (np_pids)
+                for (long int i = 0; i < maxfd; i++) {
+                        if (np_pids[i] != 0)
+                                kill(np_pids[i], SIGKILL);
+                }
 
-        exit (STATE_CRITICAL);
+        exit(STATE_CRITICAL);
 }
 
-
-static int
-np_fetch_output(int fd, output *op, int flags)
-{
+static int np_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;
@@ -264,7 +255,7 @@ np_fetch_output(int fd, output *op, int flags)
 
         op->buf = NULL;
         op->buflen = 0;
-        while((ret = read(fd, tmpbuf, sizeof(tmpbuf))) > 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);
@@ -272,33 +263,33 @@ np_fetch_output(int fd, output *op, int flags)
                 i++;
         }
 
-        if(ret < 0) {
+        if (ret < 0) {
                 printf("read() returned %d: %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 & 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) {
+        if (flags & RUNCMD_NO_ASSOC) {
                 buf = malloc(op->buflen);
                 memcpy(buf, op->buf, op->buflen);
-        }
-        else buf = op->buf;
+        } else
+                buf = op->buf;
 
         op->line = NULL;
         op->lens = NULL;
         i = 0;
-        while(i < op->buflen) {
+        while (i < op->buflen) {
                 /* make sure we have enough memory */
-                if(lineno >= ary_size) {
+                if (lineno >= ary_size) {
                         /* ary_size must never be zero */
                         do {
                                 ary_size = op->buflen >> --rsf;
-                        } while(!ary_size);
+                        } while (!ary_size);
 
                         op->line = realloc(op->line, ary_size * sizeof(char *));
                         op->lens = realloc(op->lens, ary_size * sizeof(size_t));
@@ -308,7 +299,8 @@ np_fetch_output(int fd, output *op, int flags)
                 op->line[lineno] = &buf[i];
 
                 /* hop to next newline or end of buffer */
-                while(buf[i] != '\n' && i < op->buflen) i++;
+                while (buf[i] != '\n' && i < op->buflen)
+                        i++;
                 buf[i] = '\0';
 
                 /* calculate the string length using pointer difference */
@@ -321,21 +313,22 @@ np_fetch_output(int fd, output *op, int flags)
         return lineno;
 }
 
-
-int
-np_runcmd(const char *cmd, output *out, output *err, int flags)
-{
+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) memset(out, 0, sizeof(output));
-        if(err) memset(err, 0, sizeof(output));
-
-        if((fd = np_runcmd_open(cmd, pfd_out, pfd_err)) == -1)
-                die (STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
-
-        if(out) out->lines = np_fetch_output(pfd_out[0], out, flags);
-        if(err) err->lines = np_fetch_output(pfd_err[0], err, flags);
+        if (out)
+                memset(out, 0, sizeof(output));
+        if (err)
+                memset(err, 0, sizeof(output));
+
+        if ((fd = np_runcmd_open(cmd, pfd_out, pfd_err)) == -1)
+                die(STATE_UNKNOWN, _("Could not open pipe: %s\n"), cmd);
+
+        if (out)
+                out->lines = np_fetch_output(pfd_out[0], out, flags);
+        if (err)
+                err->lines = np_fetch_output(pfd_err[0], err, flags);
 
         return np_runcmd_close(fd);
 }
diff --git a/plugins/sslutils.c b/plugins/sslutils.c
index 6bc0ba81..96740b3a 100644
--- a/plugins/sslutils.c
+++ b/plugins/sslutils.c
@@ -1,46 +1,43 @@
 /*****************************************************************************
-*
-* Monitoring Plugins SSL utilities
-*
-* License: GPL
-* Copyright (c) 2005-2010 Monitoring Plugins Development Team
-*
-* Description:
-*
-* This file contains common functions for plugins that require SSL.
-*
-*
-* 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 SSL utilities
+ *
+ * License: GPL
+ * Copyright (c) 2005-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains common functions for plugins that require SSL.
+ *
+ *
+ * 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/>.
+ *
+ *
+ *****************************************************************************/
 
 #define MAX_CN_LENGTH 256
 #include "common.h"
 #include "netutils.h"
+#include "../lib/monitoringplug.h"
 
 #ifdef HAVE_SSL
-static SSL_CTX *ctx=NULL;
-static SSL *s=NULL;
+static SSL_CTX *ctx = NULL;
+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(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);
@@ -59,145 +56,141 @@ int np_net_ssl_init_with_hostname_version_and_cert(int sd, char *host_name, int
                 printf("%s\n", _("UNKNOWN - SSL protocol version 2 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
         case MP_SSLv3: /* SSLv3 protocol */
-#if defined(OPENSSL_NO_SSL3)
+#       if defined(OPENSSL_NO_SSL3)
                 printf("%s\n", _("UNKNOWN - SSL protocol version 3 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
                 SSL_CTX_set_max_proto_version(ctx, SSL3_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1: /* TLSv1 protocol */
-#if defined(OPENSSL_NO_TLS1)
+#       if defined(OPENSSL_NO_TLS1)
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
                 SSL_CTX_set_max_proto_version(ctx, TLS1_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_1: /* TLSv1.1 protocol */
-#if !defined(SSL_OP_NO_TLSv1_1)
+#       if !defined(SSL_OP_NO_TLSv1_1)
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1.1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
                 SSL_CTX_set_max_proto_version(ctx, TLS1_1_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_2: /* TLSv1.2 protocol */
-#if !defined(SSL_OP_NO_TLSv1_2)
+#       if !defined(SSL_OP_NO_TLSv1_2)
                 printf("%s\n", _("UNKNOWN - TLS protocol version 1.2 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
                 SSL_CTX_set_max_proto_version(ctx, TLS1_2_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_2_OR_NEWER:
-#if !defined(SSL_OP_NO_TLSv1_1)
+#       if !defined(SSL_OP_NO_TLSv1_1)
                 printf("%s\n", _("UNKNOWN - Disabling TLSv1.1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_1_OR_NEWER:
-#if !defined(SSL_OP_NO_TLSv1)
+#       if !defined(SSL_OP_NO_TLSv1)
                 printf("%s\n", _("UNKNOWN - Disabling TLSv1 is not supported by your SSL library."));
                 return STATE_UNKNOWN;
-#else
+#       else
                 SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
                 break;
-#endif
+#       endif
         case MP_TLSv1_OR_NEWER:
-#if defined(SSL_OP_NO_SSLv3)
+#       if defined(SSL_OP_NO_SSLv3)
                 SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
                 break;
-#endif
+#       endif
         case MP_SSLv3_OR_NEWER:
-#if defined(SSL_OP_NO_SSLv2)
+#       if defined(SSL_OP_NO_SSLv2)
                 SSL_CTX_set_min_proto_version(ctx, SSL3_VERSION);
                 break;
-#endif
+#       endif
         }
 
         if (cert && privkey) {
-#ifdef USE_OPENSSL
+#       ifdef USE_OPENSSL
                 if (!SSL_CTX_use_certificate_chain_file(ctx, cert)) {
-#elif  USE_GNUTLS
+#       elif USE_GNUTLS
                 if (!SSL_CTX_use_certificate_file(ctx, cert, SSL_FILETYPE_PEM)) {
-#else
-#error Unported for unknown SSL library
-#endif
-                        printf ("%s\n", _("CRITICAL - Unable to open certificate chain file!\n"));
+#       else
+#               error Unported for unknown SSL library
+#       endif
+                        printf("%s\n", _("CRITICAL - Unable to open certificate chain file!\n"));
                         return STATE_CRITICAL;
                 }
                 SSL_CTX_use_PrivateKey_file(ctx, privkey, SSL_FILETYPE_PEM);
-#ifdef USE_OPENSSL
+#       ifdef USE_OPENSSL
                 if (!SSL_CTX_check_private_key(ctx)) {
-                        printf ("%s\n", _("CRITICAL - Private key does not seem to match certificate!\n"));
+                        printf("%s\n", _("CRITICAL - Private key does not seem to match certificate!\n"));
                         return STATE_CRITICAL;
                 }
-#endif
+#       endif
         }
-#ifdef SSL_OP_NO_TICKET
+#       ifdef SSL_OP_NO_TICKET
         options |= SSL_OP_NO_TICKET;
-#endif
+#       endif
         SSL_CTX_set_options(ctx, options);
         SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
         if ((s = SSL_new(ctx)) != NULL) {
-#ifdef SSL_set_tlsext_host_name
+#       ifdef SSL_set_tlsext_host_name
                 if (host_name != NULL)
                         SSL_set_tlsext_host_name(s, host_name);
-#endif
+#       endif
                 SSL_set_fd(s, sd);
                 if (SSL_connect(s) == 1) {
                         return OK;
                 } else {
                         printf("%s\n", _("CRITICAL - Cannot make SSL connection."));
-#  ifdef USE_OPENSSL /* XXX look into ERR_error_string */
+#       ifdef USE_OPENSSL /* XXX look into ERR_error_string */
                         ERR_print_errors_fp(stdout);
-#  endif /* USE_OPENSSL */
+#       endif /* USE_OPENSSL */
                 }
         } else {
-                        printf("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
+                printf("%s\n", _("CRITICAL - Cannot initiate SSL handshake."));
         }
         return STATE_CRITICAL;
 }
 
 void np_net_ssl_cleanup() {
         if (s) {
-#ifdef SSL_set_tlsext_host_name
+#       ifdef SSL_set_tlsext_host_name
                 SSL_set_tlsext_host_name(s, NULL);
-#endif
+#       endif
                 SSL_shutdown(s);
                 SSL_free(s);
                 if (ctx) {
                         SSL_CTX_free(ctx);
-                        ctx=NULL;
+                        ctx = NULL;
                 }
-                s=NULL;
+                s = NULL;
         }
 }
 
-int np_net_ssl_write(const void *buf, int num) {
-        return SSL_write(s, buf, num);
-}
+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_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){
-#  ifdef USE_OPENSSL
-        X509_NAME *subj=NULL;
+int 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 cn[MAX_CN_LENGTH] = "";
         char *tz;
 
-        int cnlen =-1;
-        int status=STATE_UNKNOWN;
+        int cnlen = -1;
+        int status = STATE_UNKNOWN;
 
         ASN1_STRING *tm;
         int offset;
@@ -208,15 +201,15 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
         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);
+        subj = X509_get_subject_name(certificate);
 
         if (!subj) {
-                printf("%s\n",_("CRITICAL - Cannot retrieve certificate subject."));
+                printf("%s\n", _("CRITICAL - Cannot retrieve certificate subject."));
                 return STATE_CRITICAL;
         }
         cnlen = X509_NAME_get_text_by_NID(subj, NID_commonName, cn, sizeof(cn));
@@ -242,23 +235,16 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
                         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 = (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');
-        stamp.tm_hour =
-                (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
-        stamp.tm_min =
-                (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
-        stamp.tm_sec =
-                (tm->data[10 + offset] - '0') * 10 + (tm->data[11 + offset] - '0');
+        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');
+        stamp.tm_hour = (tm->data[6 + offset] - '0') * 10 + (tm->data[7 + offset] - '0');
+        stamp.tm_min = (tm->data[8 + offset] - '0') * 10 + (tm->data[9 + offset] - '0');
+        stamp.tm_sec = (tm->data[10 + offset] - '0') * 10 + (tm->data[11 + offset] - '0');
         stamp.tm_isdst = -1;
 
         tm_t = timegm(&stamp);
@@ -275,30 +261,30 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
         tzset();
 
         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);
+                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
                         status = STATE_CRITICAL;
         } else if (days_left == 0 && time_left > 0) {
                 if (time_left >= 3600)
-                        time_remaining = (int) time_left / 3600;
+                        time_remaining = (int)time_left / 3600;
                 else
-                        time_remaining = (int) time_left / 60;
+                        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
                         status = STATE_CRITICAL;
         } else if (time_left < 0) {
                 printf(_("CRITICAL - Certificate '%s' expired on %s.\n"), cn, timestamp);
-                status=STATE_CRITICAL;
+                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);
+                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
@@ -309,22 +295,21 @@ int np_net_ssl_check_certificate(X509 *certificate, int days_till_exp_warn, int
         }
         X509_free(certificate);
         return status;
-#  else /* ifndef USE_OPENSSL */
+#       else  /* ifndef USE_OPENSSL */
         printf("%s\n", _("WARNING - Plugin does not support checking certificates."));
         return STATE_WARNING;
-#  endif /* USE_OPENSSL */
+#       endif /* USE_OPENSSL */
 }
 
-int np_net_ssl_check_cert(int days_till_exp_warn, int days_till_exp_crit){
-#  ifdef USE_OPENSSL
+int 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);
-        return(np_net_ssl_check_certificate(certificate, days_till_exp_warn, days_till_exp_crit));
-#  else /* ifndef USE_OPENSSL */
+        certificate = SSL_get_peer_certificate(s);
+        return (np_net_ssl_check_certificate(certificate, days_till_exp_warn, days_till_exp_crit));
+#       else  /* ifndef USE_OPENSSL */
         printf("%s\n", _("WARNING - Plugin does not support checking certificates."));
         return STATE_WARNING;
-#  endif /* USE_OPENSSL */
+#       endif /* USE_OPENSSL */
 }
 
-
 #endif /* HAVE_SSL */
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_http.t b/plugins/t/check_http.t
index 6ab4a5b6..bb1fd27d 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -45,7 +45,7 @@ $res = NPTest->testCmd(
         "./$plugin $host_nonresponsive -wt 1 -ct 2 -t 3"
         );
 cmp_ok( $res->return_code, '==', 2, "Webserver $host_nonresponsive not responding" );
-cmp_ok( $res->output, 'eq', "CRITICAL - Socket timeout after 3 seconds", "Output OK");
+like( $res->output, "/Socket timeout after/", "Output OK");
 
 $res = NPTest->testCmd(
         "./$plugin $hostname_invalid -wt 1 -ct 2"
diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t
index fcdae179..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 = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/';
+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 b8a4a766..fcba0393 100644
--- a/plugins/t/check_ldap.t
+++ b/plugins/t/check_ldap.t
@@ -24,7 +24,7 @@ SKIP: {
 
     $result = NPTest->testCmd("$command -H $host_nonresponsive -b ou=blah -t 2 -w 1 -c 1");
     is( $result->return_code, 2, "$command -H $host_nonresponsive -b ou=blah -t 5 -w 2 -c 3" );
-    is( $result->output, 'CRITICAL - Socket timeout after 2 seconds', "output ok" );
+    like($result->output, '/Socket timeout after \d+ seconds/', "output ok" );
 };
 
 SKIP: {
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 baf3acc6..a383bc99 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -21,11 +21,11 @@ plan skip_all => "check_mysql not compiled" unless (-x "check_mysql");
 plan tests => 15;
 
 my $bad_login_output = '/Access denied for user /';
-my $mysqlserver         = getTestParameter("NP_MYSQL_SERVER", "A MySQL Server hostname or IP with no slaves setup");
-my $mysqlsocket         = getTestParameter("NP_MYSQL_SOCKET", "Full path to a MySQL Server socket with no slaves setup");
+my $mysqlserver         = getTestParameter("NP_MYSQL_SERVER", "A MySQL Server hostname or IP with no replica setup");
+my $mysqlsocket         = getTestParameter("NP_MYSQL_SOCKET", "Full path to a MySQL Server socket with no replica setup");
 my $mysql_login_details = getTestParameter("NP_MYSQL_LOGIN_DETAILS", "Command line parameters to specify login access (requires REPLICATION CLIENT privileges)", "-u test -ptest");
-my $with_slave          = getTestParameter("NP_MYSQL_WITH_SLAVE", "MySQL server with slaves setup");
-my $with_slave_login    = getTestParameter("NP_MYSQL_WITH_SLAVE_LOGIN", "Login details for server with slave (requires REPLICATION CLIENT privileges)", $mysql_login_details || "-u test -ptest");
+my $with_replica          = getTestParameter("NP_MYSQL_WITH_REPLICA", "MySQL server with replica setup");
+my $with_replica_login    = getTestParameter("NP_MYSQL_WITH_REPLICA_LOGIN", "Login details for server with replica (requires REPLICATION CLIENT privileges)", $mysql_login_details || "-u test -ptest");
 
 my $result;
 
@@ -39,8 +39,8 @@ SKIP: {
         like( $result->output, $bad_login_output, "Expected login failure message");
 
         $result = NPTest->testCmd("./check_mysql -S -H $mysqlserver $mysql_login_details");
-        cmp_ok( $result->return_code, "==", 1, "No slaves defined" );
-        like( $result->output, "/No slaves defined/", "Correct error message");
+        cmp_ok( $result->return_code, "==", 1, "No replicas defined" );
+        like( $result->output, "/No replicas defined/", "Correct error message");
 }
 
 SKIP: {
@@ -53,22 +53,22 @@ SKIP: {
         like( $result->output, $bad_login_output, "Expected login failure message");
 
         $result = NPTest->testCmd("./check_mysql -S -s $mysqlsocket $mysql_login_details");
-        cmp_ok( $result->return_code, "==", 1, "No slaves defined" );
-        like( $result->output, "/No slaves defined/", "Correct error message");
+        cmp_ok( $result->return_code, "==", 1, "No replicas defined" );
+        like( $result->output, "/No replicas defined/", "Correct error message");
 }
 
 SKIP: {
-        skip "No mysql server with slaves defined", 5 unless $with_slave;
-        $result = NPTest->testCmd("./check_mysql -H $with_slave $with_slave_login");
+        skip "No mysql server with replicas defined", 5 unless $with_replica;
+        $result = NPTest->testCmd("./check_mysql -H $with_replica $with_replica_login");
         cmp_ok( $result->return_code, '==', 0, "Login okay");
 
-        $result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login");
-        cmp_ok( $result->return_code, "==", 0, "Slaves okay" );
+        $result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login");
+        cmp_ok( $result->return_code, "==", 0, "Replicas okay" );
 
-        $result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login -w 60");
-        cmp_ok( $result->return_code, '==', 0, 'Slaves are not > 60 seconds behind');
+        $result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login -w 60");
+        cmp_ok( $result->return_code, '==', 0, 'Replicas are not > 60 seconds behind');
 
-        $result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login -w 60:");
+        $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_SLAVE WARNING:/", "Output okay");
+        like( $result->output, "/^SLOW_REPLICA WARNING:/", "Output okay");
 }
diff --git a/plugins/t/check_ntp.t b/plugins/t/check_ntp.t
index b8fc8fdf..a8ac7bb8 100644
--- a/plugins/t/check_ntp.t
+++ b/plugins/t/check_ntp.t
@@ -37,7 +37,7 @@ my $ntp_critmatch1 = '/^NTP\sCRITICAL:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?
 my $ntp_okmatch2 = '/^NTP\sOK:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs,\sjitter=[0-9]+\.[0-9]+,\sstratum=[0-9]{1,2},\struechimers=[0-9]+/';
 my $ntp_warnmatch2 = '/^NTP\sWARNING:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs,\sjitter=[0-9]+\.[0-9]+,\sstratum=[0-9]{1,2}\s\(WARNING\),\struechimers=[0-9]+/';
 my $ntp_critmatch2 = '/^NTP\sCRITICAL:\sOffset\s-?[0-9]+(\.[0-9]+)?(e-[0-9]{2})?\ssecs,\sjitter=[0-9]+\.[0-9]+\s\(CRITICAL\),\sstratum=[0-9]{1,2},\struechimers=[0-9]+/';
-my $ntp_noresponse = '/^(CRITICAL - Socket timeout after 3 seconds)|(NTP CRITICAL: No response from NTP server)$/';
+my $ntp_noresponse = '/(.*Socket timeout after \d+ seconds.*)|(.*No response from NTP server.*)/';
 my $ntp_nosuchhost = '/^check_ntp.*: Invalid hostname/address - ' . $hostname_invalid . '/';
 
 
diff --git a/plugins/t/check_smtp.t b/plugins/t/check_smtp.t
index 1a1ebe3e..73b4a1fd 100644
--- a/plugins/t/check_smtp.t
+++ b/plugins/t/check_smtp.t
@@ -24,7 +24,7 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
                                            "An invalid (not known to DNS) hostname", "nosuchhost" );
 my $res;
 
-plan tests => 16;
+plan tests => 15;
 
 SKIP: {
         skip "No SMTP server defined", 4 unless $host_tcp_smtp;
@@ -73,7 +73,6 @@ SKIP: {
         my $unused_port = 4465;
         $res = NPTest->testCmd( "./check_smtp -H $host_tcp_smtp_tls -p $unused_port --ssl" );
         is ($res->return_code, 2, "Check rc of connecting to $host_tcp_smtp_tls with TLS on unused port $unused_port" );
-        like ($res->output, qr/^connect to address $host_tcp_smtp_tls and port $unused_port: Connection refused/, "Check output of connecting to $host_tcp_smtp_tls with TLS on unused port $unused_port");
 }
 
 $res = NPTest->testCmd( "./check_smtp $host_nonresponsive" );
diff --git a/plugins/t/check_ssh.t b/plugins/t/check_ssh.t
index 907d33a8..8a20782e 100644
--- a/plugins/t/check_ssh.t
+++ b/plugins/t/check_ssh.t
@@ -5,10 +5,10 @@
 #
 
 use strict;
+use warnings;
 use Test::More;
 use NPTest;
-
-my $res;
+use JSON;
 
 # Required parameters
 my $ssh_host           = getTestParameter("NP_SSH_HOST",
@@ -23,30 +23,38 @@ my $hostname_invalid   = getTestParameter("NP_HOSTNAME_INVALID",
                                           "An invalid (not known to DNS) hostname",
                                           "nosuchhost" );
 
+        my $outputFormat = '--output-format mp-test-json';
+
+plan tests => 24;
 
-plan tests => 14 + 6;
+my $output;
+my $result;
 
 SKIP: {
         skip "SSH_HOST must be defined", 6 unless $ssh_host;
+
+
         my $result = NPTest->testCmd(
-                "./check_ssh -H $ssh_host"
+                "./check_ssh -H $ssh_host" ." ". $outputFormat
                 );
         cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
-        like($result->output, '/^SSH OK - /', "Status text if command returned none (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "OK", "State was correct");
 
 
         $result = NPTest->testCmd(
-                "./check_ssh -H $host_nonresponsive -t 2"
+                "./check_ssh -H $host_nonresponsive -t 2" ." ". $outputFormat
                 );
-        cmp_ok($result->return_code, '==', 2, "Exit with return code 0 (OK)");
-        like($result->output, '/^CRITICAL - Socket timeout after 2 seconds/', "Status text if command returned none (OK)");
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "CRITICAL", "State was correct");
 
 
 
         $result = NPTest->testCmd(
-                "./check_ssh -H $hostname_invalid -t 2"
+                "./check_ssh -H $hostname_invalid -t 2" ." ". $outputFormat
                 );
-        cmp_ok($result->return_code, '==', 3, "Exit with return code 0 (OK)");
+        cmp_ok($result->return_code, '==', 3, "Exit with return code 3 (UNKNOWN)");
         like($result->output, '/^check_ssh: Invalid hostname/', "Status text if command returned none (OK)");
 
 
@@ -63,46 +71,80 @@ SKIP: {
         #
         # where `comments` is optional, protoversion is the SSH protocol version and
         # softwareversion is an arbitrary string representing the server software version
+
+        my $found_version = 0;
+
         open(NC, "echo 'SSH-2.0-nagiosplug.ssh.0.1' | nc ${nc_flags}|");
         sleep 0.1;
-        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-        cmp_ok( $res->return_code, '==', 0, "Got SSH protocol version control string");
-        like( $res->output, '/^SSH OK - nagiosplug.ssh.0.1 \(protocol 2.0\)/', "Output OK");
+        $result = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ." ". $outputFormat);
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "OK", "State was correct");
+
+        # looking for the version
+        for my $subcheck (@{$output->{'checks'}}) {
+                if ($subcheck->{'output'} =~ /.*nagiosplug.ssh.0.1 \(protocol version: 2.0\).*/ ){
+                        $found_version = 1;
+                }
+        }
+        cmp_ok($found_version, '==', 1, "Output OK");
         close NC;
 
         open(NC, "echo 'SSH-2.0-3.2.9.1' | nc ${nc_flags}|");
         sleep 0.1;
-        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-        cmp_ok( $res->return_code, "==", 0, "Got SSH protocol version control string with non-alpha softwareversion string");
-        like( $res->output, '/^SSH OK - 3.2.9.1 \(protocol 2.0\)/', "Output OK for non-alpha softwareversion string");
+        $result = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ." ". $outputFormat);
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "OK", "State was correct");
+
+        $found_version = 0;
+        for my $subcheck (@{$output->{'checks'}}) {
+                if ($subcheck->{'output'} =~ /3.2.9.1 \(protocol version: 2.0\)/ ){
+                        $found_version = 1;
+                }
+        }
+        cmp_ok($found_version, '==', 1, "Output OK");
         close NC;
 
         open(NC, "echo 'SSH-2.0-nagiosplug.ssh.0.1 this is a comment' | nc ${nc_flags} |");
         sleep 0.1;
-        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003 -r nagiosplug.ssh.0.1" );
-        cmp_ok( $res->return_code, '==', 0, "Got SSH protocol version control string, and parsed comment appropriately");
-        like( $res->output, '/^SSH OK - nagiosplug.ssh.0.1 \(protocol 2.0\)/', "Output OK");
+        $result = NPTest->testCmd( "./check_ssh -H localhost -p 5003 -r nagiosplug.ssh.0.1" ." ". $outputFormat);
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "OK", "State was correct");
+
+        # looking for the version
+        $found_version = 0;
+        for my $subcheck (@{$output->{'checks'}}) {
+                if ($subcheck->{'output'} =~ /nagiosplug.ssh.0.1 \(protocol version: 2.0\)/ ){
+                        $found_version = 1;
+                }
+        }
+        cmp_ok($found_version, '==', 1, "Output OK");
         close NC;
 
         open(NC, "echo 'SSH-' | nc ${nc_flags}|");
         sleep 0.1;
-        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-        cmp_ok( $res->return_code, '==', 2, "Got invalid SSH protocol version control string");
-        like( $res->output, '/^SSH CRITICAL/', "Output OK");
+        $result = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ." ". $outputFormat);
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "CRITICAL", "Got invalid SSH protocol version control string");
         close NC;
 
         open(NC, "echo '' | nc ${nc_flags}|");
         sleep 0.1;
-        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-        cmp_ok( $res->return_code, '==', 2, "No version control string received");
-        like( $res->output, '/^SSH CRITICAL - No version control string received/', "Output OK");
+        $result = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ." ". $outputFormat);
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "CRITICAL", "No version control string received");
         close NC;
 
         open(NC, "echo 'Not a version control string' | nc ${nc_flags}|");
         sleep 0.1;
-        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-        cmp_ok( $res->return_code, '==', 2, "No version control string received");
-        like( $res->output, '/^SSH CRITICAL - No version control string received/', "Output OK");
+        $result = NPTest->testCmd( "./check_ssh -H localhost -p 5003"  ." ". $outputFormat);
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "CRITICAL", "No version control string received");
         close NC;
 
 
@@ -116,8 +158,18 @@ SKIP: {
                 echo 'Some\nPrepended\nData\nLines\n'; sleep 0.2;
                 echo 'SSH-2.0-nagiosplug.ssh.0.2';} | nc ${nc_flags}|");
         sleep 0.1;
-        $res = NPTest->testCmd( "./check_ssh -H localhost -p 5003" );
-        cmp_ok( $res->return_code, '==', 0, "Got delayed SSH protocol version control string");
-        like( $res->output, '/^SSH OK - nagiosplug.ssh.0.2 \(protocol 2.0\)/', "Output OK");
+        $result = NPTest->testCmd( "./check_ssh -H localhost -p 5003" ." ". $outputFormat);
+        cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+        $output = decode_json($result->output);
+        is($output->{'state'}, "OK", "State was correct");
+
+        # looking for the version
+        $found_version = 0;
+        for my $subcheck (@{$output->{'checks'}}) {
+                if ($subcheck->{'output'} =~ /nagiosplug.ssh.0.2 \(protocol version: 2.0\)/ ){
+                        $found_version = 1;
+                }
+        }
+        cmp_ok($found_version, '==', 1, "Output OK");
         close NC;
 }
diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t
index 18780386..68946f6d 100644
--- a/plugins/t/check_swap.t
+++ b/plugins/t/check_swap.t
@@ -5,39 +5,47 @@
 #
 
 use strict;
-use Test::More tests => 14;
+use warnings;
+use Test::More tests => 21;
 use NPTest;
-
-my $successOutput = '/^SWAP OK - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)/';
-my $failureOutput = '/^SWAP CRITICAL - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)/';
-my $warnOutput    = '/^SWAP WARNING - [0-9]+\% free \([0-9]+MB out of [0-9]+MB\)/';
+use JSON;
 
 my $result;
+my $outputFormat = '--output-format mp-test-json';
+my $output;
+my $message = '/^[0-9]+\% free \([0-9]+MiB out of [0-9]+MiB\)/';
 
-$result = NPTest->testCmd( "./check_swap" );                                    # Always OK
+$result = NPTest->testCmd( "./check_swap $outputFormat" );                                      # Always OK
 cmp_ok( $result->return_code, "==", 0, "Always OK" );
-like( $result->output, $successOutput, "Right output" );
+is($result->{'mp_test_result'}->{'state'}, "OK", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
-$result = NPTest->testCmd( "./check_swap -w 1048576 -c 1048576" );              # 1 MB free
-cmp_ok( $result->return_code, "==", 0, "At least 1MB free" );
-like( $result->output, $successOutput, "Right output" );
+$result = NPTest->testCmd( "./check_swap -w 1048576 -c 1048576 $outputFormat" );                # 1 MB free
+cmp_ok( $result->return_code, "==", 0, "Always OK" );
+is($result->{'mp_test_result'}->{'state'}, "OK", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
-$result = NPTest->testCmd( "./check_swap -w 1% -c 1%" );                        # 1% free
-cmp_ok( $result->return_code, "==", 0, 'At least 1% free' );
-like( $result->output, $successOutput, "Right output" );
+$result = NPTest->testCmd( "./check_swap -w 1% -c 1% $outputFormat" );                  # 1% free
+cmp_ok( $result->return_code, "==", 0, "Always OK" );
+is($result->{'mp_test_result'}->{'state'}, "OK", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
-$result = NPTest->testCmd( "./check_swap -w 100% -c 100%" );                    # 100% (always critical)
-cmp_ok( $result->return_code, "==", 2, 'Get critical because not 100% free' );
-like( $result->output, $failureOutput, "Right output" );
+$result = NPTest->testCmd( "./check_swap -w 100% -c 100% $outputFormat" );                      # 100% (always critical)
+cmp_ok( $result->return_code, "==", 0, "Always OK" );
+is($result->{'mp_test_result'}->{'state'}, "CRITICAL", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
-$result = NPTest->testCmd( "./check_swap -w 100% -c 1%" );                      # 100% (always warn)
-cmp_ok( $result->return_code, "==", 1, 'Get warning because not 100% free' );
-like( $result->output, $warnOutput, "Right output" );
+$result = NPTest->testCmd( "./check_swap -w 100% -c 1% $outputFormat" );                        # 100% (always warn)
+cmp_ok( $result->return_code, "==", 0, "Always OK" );
+is($result->{'mp_test_result'}->{'state'}, "WARNING", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
-$result = NPTest->testCmd( "./check_swap -w 100%" );                            # 100% (single threshold, always warn)
-cmp_ok( $result->return_code, "==", 1, 'Get warning because not 100% free' );
-like( $result->output, $warnOutput, "Right output" );
+$result = NPTest->testCmd( "./check_swap -w 100% $outputFormat" );                              # 100% (single threshold, always warn)
+cmp_ok( $result->return_code, "==", 0, "Always OK" );
+is($result->{'mp_test_result'}->{'state'}, "WARNING", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
-$result = NPTest->testCmd( "./check_swap -c 100%" );                            # 100% (single threshold, always critical)
-cmp_ok( $result->return_code, "==", 2, 'Get critical because not 100% free' );
-like( $result->output, $failureOutput, "Right output" );
+$result = NPTest->testCmd( "./check_swap -c 100% $outputFormat" );                              # 100% (single threshold, always critical)
+cmp_ok( $result->return_code, "==", 0, "Always OK" );
+is($result->{'mp_test_result'}->{'state'}, "CRITICAL", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
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/tests/test_check_disk.c b/plugins/tests/test_check_disk.c
new file mode 100644
index 00000000..35c57bce
--- /dev/null
+++ b/plugins/tests/test_check_disk.c
@@ -0,0 +1,197 @@
+/*****************************************************************************
+ *
+ * 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 "../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);
+
+int main(int argc, char **argv) {
+        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");
+        ok(np_find_name(exclude_filesystem, "/home") == false, "/home not in list");
+        np_add_name(&exclude_filesystem, "/home");
+        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");
+
+        ok(np_find_name(exclude_filesystem, "iso9660") == false, "Make sure no clashing in variables");
+
+        /*
+        for (temp_name = exclude_filesystem; temp_name; temp_name = temp_name->next) {
+                printf("Name: %s\n", temp_name->name);
+        }
+        */
+
+        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;
+        mtail = &me->me_next;
+
+        me = (struct mount_entry *)malloc(sizeof *me);
+        me->me_devname = strdup("/dev/c1t0d1s0");
+        me->me_mountdir = strdup("/var");
+        *mtail = me;
+        mtail = &me->me_next;
+
+        me = (struct mount_entry *)malloc(sizeof *me);
+        me->me_devname = strdup("/dev/c2t0d0s0");
+        me->me_mountdir = strdup("/home");
+        *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:"));
+
+        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");
+                } 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");
+                } 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");
+                }
+        }
+
+        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");
+
+        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")) {
+                        ok(p->best_match, "/var found");
+                } else if (!strcmp(p->name, "/tmp")) {
+                        ok(!p->best_match, "/tmp correctly not found");
+                } else if (!strcmp(p->name, "/home/tonvoon")) {
+                        ok(!p->best_match, "/home/tonvoon not found");
+                } else if (!strcmp(p->name, "/home")) {
+                        ok(p->best_match, "/home found");
+                }
+        }
+
+        bool found = false;
+        /* test deleting first element in paths */
+        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, "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;
+        }
+
+        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, "/tmp element successfully deleted");
+
+        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, "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) {
+        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);
+
+        } 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_swap.c b/plugins/tests/test_check_swap.c
new file mode 100644
index 00000000..b85fb4ad
--- /dev/null
+++ b/plugins/tests/test_check_swap.c
@@ -0,0 +1,23 @@
+
+#include "../check_swap.d/check_swap.h"
+#include "../../tap/tap.h"
+
+int verbose = 0;
+
+void print_usage(void) {}
+void print_help(swap_config config) {
+        (void) config;
+}
+
+const char *progname = "test_check_swap";
+
+int main(void) {
+        swap_result test_data = getSwapFromProcMeminfo("./var/proc_meminfo");
+
+        plan_tests(4);
+
+        ok(test_data.errorcode == 0, "Test whether we manage to retrieve swap data");
+        ok(test_data.metrics.total == 34233905152, "Is the total Swap correct");
+        ok(test_data.metrics.free == 34233905152, "Is the free Swap correct");
+        ok(test_data.metrics.used == 0, "Is the used Swap correct");
+}
diff --git a/plugins/tests/test_check_swap.t b/plugins/tests/test_check_swap.t
new file mode 100755
index 00000000..826fae01
--- /dev/null
+++ b/plugins/tests/test_check_swap.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_check_swap") {
+    plan skip_all => "./test_check_swap not compiled - please enable libtap library to test";
+}
+exec "./test_check_swap";
diff --git a/plugins/tests/var/proc_meminfo b/plugins/tests/var/proc_meminfo
new file mode 100644
index 00000000..6c5a618d
--- /dev/null
+++ b/plugins/tests/var/proc_meminfo
@@ -0,0 +1,55 @@
+MemTotal:       32767776 kB
+MemFree:         1693508 kB
+MemAvailable:   23807480 kB
+Buffers:          438456 kB
+Cached:         19124976 kB
+SwapCached:            0 kB
+Active:          7860680 kB
+Inactive:       18886776 kB
+Active(anon):    6108756 kB
+Inactive(anon):  1364500 kB
+Active(file):    1751924 kB
+Inactive(file): 17522276 kB
+Unevictable:        8548 kB
+Mlocked:            8548 kB
+SwapTotal:      33431548 kB
+SwapFree:       33431548 kB
+Zswap:                 0 kB
+Zswapped:              0 kB
+Dirty:               784 kB
+Writeback:             0 kB
+AnonPages:       7139968 kB
+Mapped:          1094916 kB
+Shmem:            284160 kB
+KReclaimable:    3303788 kB
+Slab:            3801908 kB
+SReclaimable:    3303788 kB
+SUnreclaim:       498120 kB
+KernelStack:       32992 kB
+PageTables:        68160 kB
+SecPageTables:         0 kB
+NFS_Unstable:          0 kB
+Bounce:                0 kB
+WritebackTmp:          0 kB
+CommitLimit:    49815436 kB
+Committed_AS:   16888536 kB
+VmallocTotal:   34359738367 kB
+VmallocUsed:       91200 kB
+VmallocChunk:          0 kB
+Percpu:            41472 kB
+HardwareCorrupted:     0 kB
+AnonHugePages:   1708032 kB
+ShmemHugePages:        0 kB
+ShmemPmdMapped:        0 kB
+FileHugePages:         0 kB
+FilePmdMapped:         0 kB
+Unaccepted:            0 kB
+HugePages_Total:       0
+HugePages_Free:        0
+HugePages_Rsvd:        0
+HugePages_Surp:        0
+Hugepagesize:       2048 kB
+Hugetlb:               0 kB
+DirectMap4k:      860468 kB
+DirectMap2M:    20023296 kB
+DirectMap1G:    12582912 kB
diff --git a/plugins/urlize.c b/plugins/urlize.c
index 6fda72d1..1aa4e425 100644
--- a/plugins/urlize.c
+++ b/plugins/urlize.c
@@ -1,51 +1,49 @@
 /*****************************************************************************
-* 
-* Monitoring urlize plugin
-* 
-* License: GPL
-* Copyright (c) 2000-2007 Monitoring Plugins Development Team
-* 
-* Description:
-* 
-* This file contains the urlize plugin
-* 
-* This plugin wraps the text output of another command (plugin) in HTML <A>
-* tags.  This plugin returns the status of the invoked plugin.
-* 
-* 
-* 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 urlize plugin
+ *
+ * License: GPL
+ * Copyright (c) 2000-2024 Monitoring Plugins Development Team
+ *
+ * Description:
+ *
+ * This file contains the urlize plugin
+ *
+ * This plugin wraps the text output of another command (plugin) in HTML <A>
+ * tags.  This plugin returns the status of the invoked plugin.
+ *
+ *
+ * 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 = "urlize";
-const char *copyright = "2000-2006";
+const char *copyright = "2000-2024";
 const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "utils.h"
 #include "popen.h"
 
-#define PERF_CHARACTER "|"
+#define PERF_CHARACTER    "|"
 #define NEWLINE_CHARACTER '\n'
 
-void print_help (void);
-void print_usage (void);
+void print_help(void);
+void print_usage(void);
 
-int
-main (int argc, char **argv)
-{
+int main(int argc, char **argv) {
         int found = 0, result = STATE_UNKNOWN;
         char *url = NULL;
         char *cmd;
@@ -56,79 +54,72 @@ 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}
-        };
+                {"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);
-        textdomain (PACKAGE);
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
 
         /* Need at least 2 args */
         if (argc < 3) {
                 print_help();
-                exit (STATE_UNKNOWN);
+                exit(STATE_UNKNOWN);
         }
 
         while (1) {
-                c = getopt_long (argc, argv, "+hVu:", longopts, &option);
+                c = getopt_long(argc, argv, "+hVu:", longopts, &option);
 
                 if (c == -1 || c == EOF)
                         break;
 
                 switch (c) {
-                case 'h':     /* help */
-                        print_help ();
-                        exit (EXIT_SUCCESS);
+                case 'h': /* help */
+                        print_help();
+                        exit(EXIT_SUCCESS);
                         break;
-                case 'V':     /* version */
-                        print_revision (progname, NP_VERSION);
-                        exit (EXIT_SUCCESS);
+                case 'V': /* version */
+                        print_revision(progname, NP_VERSION);
+                        exit(EXIT_SUCCESS);
                         break;
                 case 'u':
-                        url = strdup (argv[optind]);
+                        url = strdup(argv[optind]);
                         break;
                 case '?':
                 default:
-                        usage5 ();
+                        usage5();
                 }
         }
 
         if (url == NULL)
-                url = strdup (argv[optind++]);
+                url = strdup(argv[optind++]);
 
-        cmd = strdup (argv[optind++]);
+        cmd = strdup(argv[optind++]);
         for (c = optind; c < argc; c++) {
-                xasprintf (&cmd, "%s %s", cmd, argv[c]);
+                xasprintf(&cmd, "%s %s", cmd, argv[c]);
         }
 
-        child_process = spopen (cmd);
+        child_process = spopen(cmd);
         if (child_process == NULL) {
-                printf (_("Could not open pipe: %s\n"), cmd);
-                exit (STATE_UNKNOWN);
+                printf(_("Could not open pipe: %s\n"), cmd);
+                exit(STATE_UNKNOWN);
         }
 
-        child_stderr = fdopen (child_stderr_array[fileno (child_process)], "r");
+        child_stderr = fdopen(child_stderr_array[fileno(child_process)], "r");
         if (child_stderr == NULL) {
-                printf (_("Could not open stderr for %s\n"), cmd);
+                printf(_("Could not open stderr for %s\n"), cmd);
         }
 
         bzero(tstr, sizeof(tstr));
         buf = malloc(MAX_INPUT_BUFFER);
-        printf ("<A href=\"%s\">", argv[1]);
-        while (fgets (buf, MAX_INPUT_BUFFER - 1, child_process)) {
+        printf("<A href=\"%s\">", argv[1]);
+        while (fgets(buf, MAX_INPUT_BUFFER - 1, child_process)) {
                 found++;
                 /* Collect the string in temp str so we can tokenize */
                 strcat(tstr, buf);
         }
 
         if (!found)
-                die (STATE_UNKNOWN,
-                     _("%s UNKNOWN - No data received from host\nCMD: %s</A>\n"),
-                     argv[0], cmd);
-
+                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)
@@ -136,63 +127,55 @@ main (int argc, char **argv)
 
         /* tokenize the string for Perfdata if there is some */
         nstr = strtok(tstr, PERF_CHARACTER);
-        printf ("%s", nstr);
-        printf ("</A>");
+        printf("%s", nstr);
+        printf("</A>");
         nstr = strtok(NULL, PERF_CHARACTER);
         if (nstr != NULL)
-                printf (" | %s", nstr);
+                printf(" | %s", nstr);
 
         /* close the pipe */
-        result = spclose (child_process);
+        result = spclose(child_process);
 
         /* WARNING if output found on stderr */
-        if (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr))
-                result = max_state (result, STATE_WARNING);
+        if (fgets(buf, MAX_INPUT_BUFFER - 1, child_stderr))
+                result = max_state(result, STATE_WARNING);
 
         /* close stderr */
-        (void) fclose (child_stderr);
+        (void)fclose(child_stderr);
 
         return result;
 }
 
+void print_help(void) {
+        print_revision(progname, NP_VERSION);
 
+        printf("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
+        printf(COPYRIGHT, copyright, email);
 
-void
-print_help (void)
-{
-        print_revision (progname, NP_VERSION);
-
-        printf ("Copyright (c) 2000 Karl DeBisschop <kdebisschop@users.sourceforge.net>\n");
-        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", _("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 ("\n\n");
+        printf("\n\n");
 
-        print_usage ();
+        print_usage();
 
-  printf (UT_HELP_VRSN);
+        printf(UT_HELP_VRSN);
 
-  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\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:"));
-  printf (" %s\n\n", _("urlize http://example.com/ check_http -H example.com -r two words"));
-  printf ("    %s\n\n", _("You probably want:"));
-  printf (" %s\n", _("urlize http://example.com/ \"check_http -H example.com -r 'two words'\""));
+        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\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:"));
+        printf(" %s\n\n", _("urlize http://example.com/ check_http -H example.com -r two words"));
+        printf("    %s\n\n", _("You probably want:"));
+        printf(" %s\n", _("urlize http://example.com/ \"check_http -H example.com -r 'two words'\""));
 
-        printf (UT_SUPPORT);
+        printf(UT_SUPPORT);
 }
 
-
-
-void
-print_usage (void)
-{
-  printf ("%s\n", _("Usage:"));
-        printf ("%s <url> <plugin> <arg1> ... <argN>\n", progname);
+void print_usage(void) {
+        printf("%s\n", _("Usage:"));
+        printf("%s <url> <plugin> <arg1> ... <argN>\n", progname);
 }
diff --git a/plugins/utils.c b/plugins/utils.c
index 77d6a6f9..34335c89 100644
--- a/plugins/utils.c
+++ b/plugins/utils.c
@@ -1,26 +1,26 @@
 /*****************************************************************************
-* 
-* Library of useful functions for plugins
-* 
-* License: GPL
-* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
-* Copyright (c) 2002-2007 Monitoring Plugins Development Team
-* 
-* 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/>.
-* 
-* 
-*****************************************************************************/
+ *
+ * Library of useful functions for plugins
+ *
+ * License: GPL
+ * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net)
+ * Copyright (c) 2002-2024 Monitoring Plugins Development Team
+ *
+ * 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.h"
@@ -34,7 +34,7 @@
 
 #include <arpa/inet.h>
 
-extern void print_usage (void);
+extern void print_usage(void);
 extern const char *progname;
 
 #define STRLEN 64
@@ -42,173 +42,114 @@ extern const char *progname;
 
 time_t start_time, end_time;
 
-/* **************************************************************************
- * max_state(STATE_x, STATE_y)
- * compares STATE_x to  STATE_y and returns result based on the following
- * STATE_UNKNOWN < STATE_OK < STATE_WARNING < STATE_CRITICAL
- *
- * Note that numerically the above does not hold
- ****************************************************************************/
-
-int
-max_state (int a, int b)
-{
-        if (a == STATE_CRITICAL || b == STATE_CRITICAL)
-                return STATE_CRITICAL;
-        else if (a == STATE_WARNING || b == STATE_WARNING)
-                return STATE_WARNING;
-        else if (a == STATE_OK || b == STATE_OK)
-                return STATE_OK;
-        else if (a == STATE_UNKNOWN || b == STATE_UNKNOWN)
-                return STATE_UNKNOWN;
-        else if (a == STATE_DEPENDENT || b == STATE_DEPENDENT)
-                return STATE_DEPENDENT;
-        else
-                return max (a, b);
-}
-
-/* **************************************************************************
- * max_state_alt(STATE_x, STATE_y)
- * compares STATE_x to  STATE_y and returns result based on the following
- * STATE_OK < STATE_DEPENDENT < STATE_UNKNOWN < STATE_WARNING < STATE_CRITICAL
- *
- * The main difference between max_state_alt and max_state it that it doesn't
- * allow setting a default to UNKNOWN. It will instead prioritixe any valid
- * non-OK state.
- ****************************************************************************/
-
-int
-max_state_alt (int a, int b)
-{
-        if (a == STATE_CRITICAL || b == STATE_CRITICAL)
-                return STATE_CRITICAL;
-        else if (a == STATE_WARNING || b == STATE_WARNING)
-                return STATE_WARNING;
-        else if (a == STATE_UNKNOWN || b == STATE_UNKNOWN)
-                return STATE_UNKNOWN;
-        else if (a == STATE_DEPENDENT || b == STATE_DEPENDENT)
-                return STATE_DEPENDENT;
-        else if (a == STATE_OK || b == STATE_OK)
-                return STATE_OK;
-        else
-                return max (a, b);
-}
-
-void usage (const char *msg)
-{
-        printf ("%s\n", msg);
-        print_usage ();
-        exit (STATE_UNKNOWN);
-}
-
-void usage_va (const char *fmt, ...)
-{
+void usage(const char *msg) {
+        printf("%s\n", msg);
+        print_usage();
+        exit(STATE_UNKNOWN);
+}
+
+void usage_va(const char *fmt, ...) {
         va_list ap;
         printf("%s: ", progname);
         va_start(ap, fmt);
         vprintf(fmt, ap);
         va_end(ap);
         printf("\n");
-        exit (STATE_UNKNOWN);
+        exit(STATE_UNKNOWN);
 }
 
-void usage2(const char *msg, const char *arg)
-{
-        printf ("%s: %s - %s\n", progname, msg, arg?arg:"(null)" );
-        print_usage ();
-        exit (STATE_UNKNOWN);
+void usage2(const char *msg, const char *arg) {
+        printf("%s: %s - %s\n", progname, msg, arg ? arg : "(null)");
+        print_usage();
+        exit(STATE_UNKNOWN);
 }
 
-void
-usage3 (const char *msg, int arg)
-{
-        printf ("%s: %s - %c\n", progname, msg, arg);
+void usage3(const char *msg, int arg) {
+        printf("%s: %s - %c\n", progname, msg, arg);
         print_usage();
-        exit (STATE_UNKNOWN);
+        exit(STATE_UNKNOWN);
 }
 
-void
-usage4 (const char *msg)
-{
-        printf ("%s: %s\n", progname, msg);
+void usage4(const char *msg) {
+        printf("%s: %s\n", progname, msg);
         print_usage();
-        exit (STATE_UNKNOWN);
+        exit(STATE_UNKNOWN);
 }
 
-void
-usage5 (void)
-{
+void usage5(void) {
         print_usage();
-        exit (STATE_UNKNOWN);
+        exit(STATE_UNKNOWN);
 }
 
-void
-print_revision (const char *command_name, const char *revision)
-{
-        printf ("%s v%s (%s %s)\n",
-                 command_name, revision, PACKAGE, VERSION);
+void print_revision(const char *command_name, const char *revision) {
+        printf("%s v%s (%s %s)\n", command_name, revision, PACKAGE, VERSION);
 }
 
-bool is_numeric (char *number) {
+bool is_numeric(char *number) {
         char tmp[1];
         float x;
 
-        if (!number)
+        if (!number) {
                 return false;
-        else if (sscanf (number, "%f%c", &x, tmp) == 1)
+        } else if (sscanf(number, "%f%c", &x, tmp) == 1) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_positive (char *number) {
-        if (is_numeric (number) && atof (number) > 0.0)
+bool is_positive(char *number) {
+        if (is_numeric(number) && atof(number) > 0.0) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_negative (char *number) {
-        if (is_numeric (number) && atof (number) < 0.0)
+bool is_negative(char *number) {
+        if (is_numeric(number) && atof(number) < 0.0) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_nonnegative (char *number) {
-        if (is_numeric (number) && atof (number) >= 0.0)
+bool is_nonnegative(char *number) {
+        if (is_numeric(number) && atof(number) >= 0.0) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_percentage (char *number) {
+bool is_percentage(char *number) {
         int x;
-        if (is_numeric (number) && (x = atof (number)) >= 0 && x <= 100)
+        if (is_numeric(number) && (x = atof(number)) >= 0 && x <= 100) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_percentage_expression (const char str[]) {
+bool is_percentage_expression(const char str[]) {
         if (!str) {
                 return false;
         }
 
         size_t len = strlen(str);
 
-        if (str[len-1] != '%') {
+        if (str[len - 1] != '%') {
                 return false;
         }
 
-        char *foo = calloc(sizeof(char), len + 1);
+        char *foo = calloc(len + 1, sizeof(char));
 
         if (!foo) {
-                die (STATE_UNKNOWN, _("calloc failed \n"));
+                die(STATE_UNKNOWN, _("calloc failed \n"));
         }
 
         strcpy(foo, str);
-        foo[len-1] = '\0';
+        foo[len - 1] = '\0';
 
         bool result = is_numeric(foo);
 
@@ -217,39 +158,44 @@ bool is_percentage_expression (const char str[]) {
         return result;
 }
 
-bool is_integer (char *number) {
+bool is_integer(char *number) {
         long int n;
 
-        if (!number || (strspn (number, "-0123456789 ") != strlen (number)))
+        if (!number || (strspn(number, "-0123456789 ") != strlen(number))) {
                 return false;
+        }
 
-        n = strtol (number, NULL, 10);
+        n = strtol(number, NULL, 10);
 
-        if (errno != ERANGE && n >= INT_MIN && n <= INT_MAX)
+        if (errno != ERANGE && n >= INT_MIN && n <= INT_MAX) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_intpos (char *number) {
-        if (is_integer (number) && atoi (number) > 0)
+bool is_intpos(char *number) {
+        if (is_integer(number) && atoi(number) > 0) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_intneg (char *number) {
-        if (is_integer (number) && atoi (number) < 0)
+bool is_intneg(char *number) {
+        if (is_integer(number) && atoi(number) < 0) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_intnonneg (char *number) {
-        if (is_integer (number) && atoi (number) >= 0)
+bool is_intnonneg(char *number) {
+        if (is_integer(number) && atoi(number) >= 0) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
 /*
@@ -259,7 +205,7 @@ bool is_intnonneg (char *number) {
  */
 bool is_int64(char *number, int64_t *target) {
         errno = 0;
-        char *endptr = { 0 };
+        char *endptr = {0};
 
         int64_t tmp = strtoll(number, &endptr, 10);
         if (errno != 0) {
@@ -287,7 +233,7 @@ bool is_int64(char *number, int64_t *target) {
  */
 bool is_uint64(char *number, uint64_t *target) {
         errno = 0;
-        char *endptr = { 0 };
+        char *endptr = {0};
         unsigned long long tmp = strtoull(number, &endptr, 10);
 
         if (errno != 0) {
@@ -309,74 +255,60 @@ bool is_uint64(char *number, uint64_t *target) {
         return true;
 }
 
-bool is_intpercent (char *number) {
+bool is_intpercent(char *number) {
         int i;
-        if (is_integer (number) && (i = atoi (number)) >= 0 && i <= 100)
+        if (is_integer(number) && (i = atoi(number)) >= 0 && i <= 100) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
-bool is_option (char *str) {
-        if (!str)
+bool is_option(char *str) {
+        if (!str) {
                 return false;
-        else if (strspn (str, "-") == 1 || strspn (str, "-") == 2)
+        } else if (strspn(str, "-") == 1 || strspn(str, "-") == 2) {
                 return true;
-        else
+        } else {
                 return false;
+        }
 }
 
 #ifdef NEED_GETTIMEOFDAY
-int
-gettimeofday (struct timeval *tv, struct timezone *tz)
-{
+int gettimeofday(struct timeval *tv, struct timezone *tz) {
         tv->tv_usec = 0;
-        tv->tv_sec = (long) time ((time_t) 0);
+        tv->tv_sec = (long)time((time_t)0);
 }
 #endif
 
-
-
-double
-delta_time (struct timeval tv)
-{
+double delta_time(struct timeval tv) {
         struct timeval now;
 
-        gettimeofday (&now, NULL);
+        gettimeofday(&now, NULL);
         return ((double)(now.tv_sec - tv.tv_sec) + (double)(now.tv_usec - tv.tv_usec) / (double)1000000);
 }
 
-
-
-long
-deltime (struct timeval tv)
-{
+long deltime(struct timeval tv) {
         struct timeval now;
-        gettimeofday (&now, NULL);
-        return (now.tv_sec - tv.tv_sec)*1000000 + now.tv_usec - tv.tv_usec;
+        gettimeofday(&now, NULL);
+        return (now.tv_sec - tv.tv_sec) * 1000000 + now.tv_usec - tv.tv_usec;
 }
 
-
-
-
-void
-strip (char *buffer)
-{
+void strip(char *buffer) {
         size_t x;
         int i;
 
-        for (x = strlen (buffer); x >= 1; x--) {
+        for (x = strlen(buffer); x >= 1; x--) {
                 i = x - 1;
-                if (buffer[i] == ' ' ||
-                                buffer[i] == '\r' || buffer[i] == '\n' || buffer[i] == '\t')
+                if (buffer[i] == ' ' || buffer[i] == '\r' || buffer[i] == '\n' || buffer[i] == '\t') {
                         buffer[i] = '\0';
-                else
+                } else {
                         break;
+                }
         }
         return;
 }
 
-
 /******************************************************************************
  *
  * Copies one string to another. Any previously existing data in
@@ -389,19 +321,16 @@ strip (char *buffer)
  *
  *****************************************************************************/
 
-char *
-strscpy (char *dest, const char *src)
-{
-        if (src == NULL)
+char *strscpy(char *dest, const char *src) {
+        if (src == NULL) {
                 return NULL;
+        }
 
-        xasprintf (&dest, "%s", src);
+        xasprintf(&dest, "%s", src);
 
         return dest;
 }
 
-
-
 /******************************************************************************
  *
  * Returns a pointer to the next line of a multiline string buffer
@@ -418,7 +347,7 @@ strscpy (char *dest, const char *src)
  * This
  * is
  * a
- * 
+ *
  * multiline string buffer
  * ==============================
  *
@@ -431,7 +360,7 @@ strscpy (char *dest, const char *src)
  *   printf("%d %s",i++,firstword(ptr));
  *   ptr = strnl(ptr);
  * }
- * 
+ *
  * Produces the following:
  *
  * 1 This
@@ -452,25 +381,26 @@ strscpy (char *dest, const char *src)
  *
  *****************************************************************************/
 
-char *
-strnl (char *str)
-{
+char *strnl(char *str) {
         size_t len;
-        if (str == NULL)
+        if (str == NULL) {
                 return NULL;
-        str = strpbrk (str, "\r\n");
-        if (str == NULL)
+        }
+        str = strpbrk(str, "\r\n");
+        if (str == NULL) {
                 return NULL;
-        len = strspn (str, "\r\n");
-        if (str[len] == '\0')
+        }
+        len = strspn(str, "\r\n");
+        if (str[len] == '\0') {
                 return NULL;
+        }
         str += len;
-        if (strlen (str) == 0)
+        if (strlen(str) == 0) {
                 return NULL;
+        }
         return str;
 }
 
-
 /******************************************************************************
  *
  * Like strscpy, except only the portion of the source string up to
@@ -487,29 +417,28 @@ strnl (char *str)
  *
  *****************************************************************************/
 
-char *
-strpcpy (char *dest, const char *src, const char *str)
-{
+char *strpcpy(char *dest, const char *src, const char *str) {
         size_t len;
 
-        if (src)
-                len = strcspn (src, str);
-        else
+        if (src) {
+                len = strcspn(src, str);
+        } else {
                 return NULL;
+        }
 
-        if (dest == NULL || strlen (dest) < len)
-                dest = realloc (dest, len + 1);
-        if (dest == NULL)
-                die (STATE_UNKNOWN, _("failed realloc in strpcpy\n"));
+        if (dest == NULL || strlen(dest) < len) {
+                dest = realloc(dest, len + 1);
+        }
+        if (dest == NULL) {
+                die(STATE_UNKNOWN, _("failed realloc in strpcpy\n"));
+        }
 
-        strncpy (dest, src, len);
+        strncpy(dest, src, len);
         dest[len] = '\0';
 
         return dest;
 }
 
-
-
 /******************************************************************************
  *
  * Like strscat, except only the portion of the source string up to
@@ -518,62 +447,57 @@ strpcpy (char *dest, const char *src, const char *str)
  * str = strpcpy(str,"This is a line of text with no trailing newline","x");
  * str = strpcat(str,"This is a line of text with no trailing newline","x");
  * printf("%s\n",str);
- * 
+ *
  *This is a line of texThis is a line of tex
  *
  *****************************************************************************/
 
-char *
-strpcat (char *dest, const char *src, const char *str)
-{
+char *strpcat(char *dest, const char *src, const char *str) {
         size_t len, l2;
 
-        if (dest)
-                len = strlen (dest);
-        else
+        if (dest) {
+                len = strlen(dest);
+        } else {
                 len = 0;
+        }
 
         if (src) {
-                l2 = strcspn (src, str);
-        }
-        else {
+                l2 = strcspn(src, str);
+        } else {
                 return dest;
         }
 
-        dest = realloc (dest, len + l2 + 1);
-        if (dest == NULL)
-                die (STATE_UNKNOWN, _("failed malloc in strscat\n"));
+        dest = realloc(dest, len + l2 + 1);
+        if (dest == NULL) {
+                die(STATE_UNKNOWN, _("failed malloc in strscat\n"));
+        }
 
-        strncpy (dest + len, src, l2);
+        strncpy(dest + len, src, l2);
         dest[len + l2] = '\0';
 
         return dest;
 }
 
-
 /******************************************************************************
  *
  * asprintf, but die on failure
  *
  ******************************************************************************/
 
-int
-xvasprintf (char **strp, const char *fmt, va_list ap)
-{
-        int result = vasprintf (strp, fmt, ap);
-        if (result == -1 || *strp == NULL)
-                die (STATE_UNKNOWN, _("failed malloc in xvasprintf\n"));
+int xvasprintf(char **strp, const char *fmt, va_list ap) {
+        int result = vasprintf(strp, fmt, ap);
+        if (result == -1 || *strp == NULL) {
+                die(STATE_UNKNOWN, _("failed malloc in xvasprintf\n"));
+        }
         return result;
 }
 
-int
-xasprintf (char **strp, const char *fmt, ...)
-{
+int xasprintf(char **strp, const char *fmt, ...) {
         va_list ap;
         int result;
-        va_start (ap, fmt);
-        result = xvasprintf (strp, fmt, ap);
-        va_end (ap);
+        va_start(ap, fmt);
+        result = xvasprintf(strp, fmt, ap);
+        va_end(ap);
         return result;
 }
 
@@ -583,247 +507,219 @@ xasprintf (char **strp, const char *fmt, ...)
  *
  ******************************************************************************/
 
-char *perfdata (const char *label,
- long int val,
- const char *uom,
- int warnp,
- long int warn,
- int critp,
- long int crit,
- int minp,
- long int minv,
- int 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, "'= "))
-                xasprintf (&data, "'%s'=%ld%s;", label, val, uom);
-        else
-                xasprintf (&data, "%s=%ld%s;", label, val, uom);
+        if (strpbrk(label, "'= ")) {
+                xasprintf(&data, "'%s'=%ld%s;", label, val, uom);
+        } else {
+                xasprintf(&data, "%s=%ld%s;", label, val, uom);
+        }
 
-        if (warnp)
-                xasprintf (&data, "%s%ld;", data, warn);
-        else
-                xasprintf (&data, "%s;", data);
+        if (warnp) {
+                xasprintf(&data, "%s%ld;", data, warn);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (critp)
-                xasprintf (&data, "%s%ld;", data, crit);
-        else
-                xasprintf (&data, "%s;", data);
+        if (critp) {
+                xasprintf(&data, "%s%ld;", data, crit);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (minp)
-                xasprintf (&data, "%s%ld;", data, minv);
-        else
-                xasprintf (&data, "%s;", data);
+        if (minp) {
+                xasprintf(&data, "%s%ld;", data, minv);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (maxp)
-                xasprintf (&data, "%s%ld", data, maxv);
+        if (maxp) {
+                xasprintf(&data, "%s%ld", data, maxv);
+        }
 
         return data;
 }
 
-
-char *perfdata_uint64 (const char *label,
- uint64_t val,
- const char *uom,
- int warnp, /* Warning present */
- uint64_t warn,
- int critp, /* Critical present */
- uint64_t crit,
- int minp, /* Minimum present */
- uint64_t minv,
- int maxp, /* Maximum present */
- uint64_t maxv)
-{
+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;
 
-        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=%" PRIu64 "%s;", label, val, uom);
-        else
-                xasprintf (&data, "%s=%" PRIu64 "%s;", label, val, uom);
+        if (strpbrk(label, "'= ")) {
+                xasprintf(&data, "'%s'=%" PRIu64 "%s;", label, val, uom);
+        } else {
+                xasprintf(&data, "%s=%" PRIu64 "%s;", label, val, uom);
+        }
 
-        if (warnp)
-                xasprintf (&data, "%s%" PRIu64 ";", data, warn);
-        else
-                xasprintf (&data, "%s;", data);
+        if (warnp) {
+                xasprintf(&data, "%s%" PRIu64 ";", data, warn);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (critp)
-                xasprintf (&data, "%s%" PRIu64 ";", data, crit);
-        else
-                xasprintf (&data, "%s;", data);
+        if (critp) {
+                xasprintf(&data, "%s%" PRIu64 ";", data, crit);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (minp)
-                xasprintf (&data, "%s%" PRIu64 ";", data, minv);
-        else
-                xasprintf (&data, "%s;", data);
+        if (minp) {
+                xasprintf(&data, "%s%" PRIu64 ";", data, minv);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (maxp)
-                xasprintf (&data, "%s%" PRIu64, data, maxv);
+        if (maxp) {
+                xasprintf(&data, "%s%" PRIu64, data, maxv);
+        }
 
         return data;
 }
 
-
-char *perfdata_int64 (const char *label,
- int64_t val,
- const char *uom,
- int warnp, /* Warning present */
- int64_t warn,
- int critp, /* Critical present */
- int64_t crit,
- int minp, /* Minimum present */
- int64_t minv,
- int maxp, /* Maximum present */
- int64_t maxv)
-{
+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;
 
-        if (strpbrk (label, "'= "))
-                xasprintf (&data, "'%s'=%" PRId64 "%s;", label, val, uom);
-        else
-                xasprintf (&data, "%s=%" PRId64 "%s;", label, val, uom);
+        if (strpbrk(label, "'= ")) {
+                xasprintf(&data, "'%s'=%" PRId64 "%s;", label, val, uom);
+        } else {
+                xasprintf(&data, "%s=%" PRId64 "%s;", label, val, uom);
+        }
 
-        if (warnp)
-                xasprintf (&data, "%s%" PRId64 ";", data, warn);
-        else
-                xasprintf (&data, "%s;", data);
+        if (warnp) {
+                xasprintf(&data, "%s%" PRId64 ";", data, warn);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (critp)
-                xasprintf (&data, "%s%" PRId64 ";", data, crit);
-        else
-                xasprintf (&data, "%s;", data);
+        if (critp) {
+                xasprintf(&data, "%s%" PRId64 ";", data, crit);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (minp)
-                xasprintf (&data, "%s%" PRId64 ";", data, minv);
-        else
-                xasprintf (&data, "%s;", data);
+        if (minp) {
+                xasprintf(&data, "%s%" PRId64 ";", data, minv);
+        } else {
+                xasprintf(&data, "%s;", data);
+        }
 
-        if (maxp)
-                xasprintf (&data, "%s%" PRId64, data, maxv);
+        if (maxp) {
+                xasprintf(&data, "%s%" PRId64, data, maxv);
+        }
 
         return data;
 }
 
-
-char *fperfdata (const char *label,
- double val,
- const char *uom,
- int warnp,
- double warn,
- int critp,
- double crit,
- int minp,
- double minv,
- int 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, "'= "))
-                xasprintf (&data, "'%s'=", label);
-        else
-                xasprintf (&data, "%s=", label);
+        if (strpbrk(label, "'= ")) {
+                xasprintf(&data, "'%s'=", label);
+        } else {
+                xasprintf(&data, "%s=", label);
+        }
 
-        xasprintf (&data, "%s%f", data, val);
-        xasprintf (&data, "%s%s;", data, uom);
+        xasprintf(&data, "%s%f", data, val);
+        xasprintf(&data, "%s%s;", data, uom);
 
-        if (warnp)
-                xasprintf (&data, "%s%f", data, warn);
+        if (warnp) {
+                xasprintf(&data, "%s%f", data, warn);
+        }
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
-        if (critp)
-                xasprintf (&data, "%s%f", data, crit);
+        if (critp) {
+                xasprintf(&data, "%s%f", data, crit);
+        }
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
-        if (minp)
-                xasprintf (&data, "%s%f", data, minv);
+        if (minp) {
+                xasprintf(&data, "%s%f", data, minv);
+        }
 
         if (maxp) {
-                xasprintf (&data, "%s;", data);
-                xasprintf (&data, "%s%f", data, maxv);
+                xasprintf(&data, "%s;", data);
+                xasprintf(&data, "%s%f", data, maxv);
         }
 
         return data;
 }
 
-char *sperfdata (const char *label,
- double val,
- const char *uom,
- char *warn,
- char *crit,
- int minp,
- double minv,
- int 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);
-        else
-                xasprintf (&data, "%s=", label);
+        if (strpbrk(label, "'= ")) {
+                xasprintf(&data, "'%s'=", label);
+        } else {
+                xasprintf(&data, "%s=", label);
+        }
 
-        xasprintf (&data, "%s%f", data, val);
-        xasprintf (&data, "%s%s;", data, uom);
+        xasprintf(&data, "%s%f", data, val);
+        xasprintf(&data, "%s%s;", data, uom);
 
-        if (warn!=NULL)
-                xasprintf (&data, "%s%s", data, warn);
+        if (warn != NULL) {
+                xasprintf(&data, "%s%s", data, warn);
+        }
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
-        if (crit!=NULL)
-                xasprintf (&data, "%s%s", data, crit);
+        if (crit != NULL) {
+                xasprintf(&data, "%s%s", data, crit);
+        }
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
-        if (minp)
-                xasprintf (&data, "%s%f", data, minv);
+        if (minp) {
+                xasprintf(&data, "%s%f", data, minv);
+        }
 
         if (maxp) {
-                xasprintf (&data, "%s;", data);
-                xasprintf (&data, "%s%f", data, maxv);
+                xasprintf(&data, "%s;", data);
+                xasprintf(&data, "%s%f", data, maxv);
         }
 
         return data;
 }
 
-char *sperfdata_int (const char *label,
- int val,
- const char *uom,
- char *warn,
- char *crit,
- int minp,
- int minv,
- int 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);
-        else
-                xasprintf (&data, "%s=", label);
+        if (strpbrk(label, "'= ")) {
+                xasprintf(&data, "'%s'=", label);
+        } else {
+                xasprintf(&data, "%s=", label);
+        }
 
-        xasprintf (&data, "%s%d", data, val);
-        xasprintf (&data, "%s%s;", data, uom);
+        xasprintf(&data, "%s%d", data, val);
+        xasprintf(&data, "%s%s;", data, uom);
 
-        if (warn!=NULL)
-                xasprintf (&data, "%s%s", data, warn);
+        if (warn != NULL) {
+                xasprintf(&data, "%s%s", data, warn);
+        }
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
-        if (crit!=NULL)
-                xasprintf (&data, "%s%s", data, crit);
+        if (crit != NULL) {
+                xasprintf(&data, "%s%s", data, crit);
+        }
 
-        xasprintf (&data, "%s;", data);
+        xasprintf(&data, "%s;", data);
 
-        if (minp)
-                xasprintf (&data, "%s%d", data, minv);
+        if (minp) {
+                xasprintf(&data, "%s%d", data, minv);
+        }
 
         if (maxp) {
-                xasprintf (&data, "%s;", data);
-                xasprintf (&data, "%s%d", data, maxv);
+                xasprintf(&data, "%s;", data);
+                xasprintf(&data, "%s%d", data, maxv);
         }
 
         return data;
diff --git a/plugins/utils.h b/plugins/utils.h
index f939e337..1d3c153c 100644
--- a/plugins/utils.h
+++ b/plugins/utils.h
@@ -13,51 +13,51 @@ in order to resist overflow attacks. In addition, a few functions are
 provided to standardize version and error reporting across the entire
 suite of plugins. */
 
-/* now some functions etc are being defined in ../lib/utils_base.c */
-#include "utils_base.h"
-
+#include "../config.h"
 #include <stdbool.h>
-
+#include <stdint.h>
+#include <stdio.h>
+#include <time.h>
 
 #ifdef NP_EXTRA_OPTS
 /* Include extra-opts functions if compiled in */
-#include "extra_opts.h"
+#       include "extra_opts.h"
 #else
 /* else, fake np_extra_opts */
-#define np_extra_opts(acptr,av,pr) av
+#       define np_extra_opts(acptr, av, pr) av
 #endif
 
 /* Standardize version information, termination */
 
-void support (void);
-void print_revision (const char *, const char *);
+void support(void);
+void print_revision(const char *, const char *);
 
 extern time_t start_time, end_time;
 
 /* Test input types */
 
-bool is_integer (char *);
-bool is_intpos (char *);
-bool is_intneg (char *);
-bool is_intnonneg (char *);
-bool is_intpercent (char *);
+bool is_integer(char *);
+bool is_intpos(char *);
+bool is_intneg(char *);
+bool is_intnonneg(char *);
+bool is_intpercent(char *);
 bool is_uint64(char *number, uint64_t *target);
 bool is_int64(char *number, int64_t *target);
 
-bool is_numeric (char *);
-bool is_positive (char *);
-bool is_negative (char *);
-bool is_nonnegative (char *);
-bool is_percentage (char *);
-bool is_percentage_expression (const char[]);
+bool is_numeric(char *);
+bool is_positive(char *);
+bool is_negative(char *);
+bool is_nonnegative(char *);
+bool is_percentage(char *);
+bool is_percentage_expression(const char[]);
 
-bool is_option (char *);
+bool is_option(char *);
 
 /* Generalized timer that will do milliseconds if available */
 #ifndef HAVE_STRUCT_TIMEVAL
 struct timeval {
-        long tv_sec;        /* seconds */
-        long tv_usec;  /* microseconds */
+        long tv_sec;  /* seconds */
+        long tv_usec; /* microseconds */
 };
 #endif
 
@@ -65,137 +65,143 @@ struct timeval {
 int gettimeofday(struct timeval *, struct timezone *);
 #endif
 
-double delta_time (struct timeval tv);
-long deltime (struct timeval tv);
+double delta_time(struct timeval tv);
+long deltime(struct timeval tv);
 
 /* Handle strings safely */
 
-void strip (char *);
-char *strscpy (char *, const char *);
-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, ...);
+void strip(char *);
+char *strscpy(char *, const char *);
+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, ...)__attribute__ ((format (printf, 2, 3)));
 
-int max_state (int a, int b);
-int max_state_alt (int a, int b);
-
-void usage (const char *) __attribute__((noreturn));
+void usage(const char *) __attribute__((noreturn));
 void usage2(const char *, const char *) __attribute__((noreturn));
 void usage3(const char *, int) __attribute__((noreturn));
 void usage4(const char *) __attribute__((noreturn));
 void usage5(void) __attribute__((noreturn));
 void usage_va(const char *fmt, ...) __attribute__((noreturn));
 
-#define max(a,b) (((a)>(b))?(a):(b))
-#define min(a,b) (((a)<(b))?(a):(b))
+#define max(a, b) (((a) > (b)) ? (a) : (b))
+#define min(a, b) (((a) < (b)) ? (a) : (b))
 
-char *perfdata (const char *, long int, const char *, int, long int,
-                int, long int, int, long int, int, 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 *, int, uint64_t,
-                int, uint64_t, int, uint64_t, int, 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 *, int, int64_t,
-                int, int64_t, int, int64_t, int, 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 *, int, double,
-                 int, double, int, double, int, 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 *,
-                 int, double, int, double);
+char *sperfdata(const char *, double, const char *, char *, char *, bool, double, bool, double);
 
-char *sperfdata_int (const char *, int, const char *, char *, char *,
-                     int, int, int, int);
+char *sperfdata_int(const char *, int, const char *, char *, char *, bool, int, bool, int);
 
-/* The idea here is that, although not every plugin will use all of these, 
-   most will or should.  Therefore, for consistency, these very common 
+/* The idea here is that, although not every plugin will use all of these,
+   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'},\
-{"hostname",required_argument,0,'H'}
+#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 "Copyright (c) %s Monitoring Plugins Development Team\n\
+#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\
     Print detailed help screen\n\
  -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\
     https://www.monitoring-plugins.org/doc/extra-opts.html\n\
     for usage and examples.\n")
 #else
-#define UT_EXTRA_OPTS " \b"
+#       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 _("\n\
+#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 _("\n\
+#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                                                                                                                   \
+        _("\
+ --output-format=OUTPUT_FORMAT\n\
+    Select output format. Valid values: \"multi-line\", \"mp-test-json\"\n")
+
 #endif /* NP_UTILS_H */
diff --git a/tap/tap.c b/tap/tap.c
index 97c20e96..00ceab27 100644
--- a/tap/tap.c
+++ b/tap/tap.c
@@ -35,8 +35,8 @@ static int no_plan = 0;
 static int skip_all = 0;
 static int have_plan = 0;
 static unsigned int test_count = 0; /* Number of tests that have been run */
-static unsigned int e_tests = 0; /* Expected number of tests to run */
-static unsigned int failures = 0; /* Number of tests that failed */
+static unsigned int e_tests = 0;    /* Expected number of tests to run */
+static unsigned int failures = 0;   /* Number of tests that failed */
 static char *todo_msg = NULL;
 static char *todo_msg_fixed = "libtap malloc issue";
 static int todo = 0;
@@ -45,13 +45,13 @@ static int test_died = 0;
 /* Encapsulate the pthread code in a conditional.  In the absence of
    libpthread the code does nothing */
 #ifdef HAVE_LIBPTHREAD
-#include <pthread.h>
+#       include <pthread.h>
 static pthread_mutex_t M = PTHREAD_MUTEX_INITIALIZER;
-# define LOCK pthread_mutex_lock(&M);
-# define UNLOCK pthread_mutex_unlock(&M);
+#       define LOCK   pthread_mutex_lock(&M);
+#       define UNLOCK pthread_mutex_unlock(&M);
 #else
-# define LOCK
-# define UNLOCK
+#       define LOCK
+#       define UNLOCK
 #endif
 
 static void _expected_tests(unsigned int);
@@ -65,10 +65,7 @@ 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;
@@ -80,7 +77,7 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
 
         /* Start by taking the test name and performing any printf()
            expansions on it */
-        if(test_name != NULL) {
+        if (test_name != NULL) {
                 va_start(ap, test_name);
                 vasprintf(&local_test_name, test_name, ap);
                 va_end(ap);
@@ -88,43 +85,43 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
                 /* Make sure the test name contains more than digits
                    and spaces.  Emit an error message and exit if it
                    does */
-                if(local_test_name) {
+                if (local_test_name) {
                         name_is_digits = 1;
-                        for(c = local_test_name; *c != '\0'; c++) {
-                                if(!isdigit(*c) && !isspace(*c)) {
+                        for (c = local_test_name; *c != '\0'; c++) {
+                                if (!isdigit(*c) && !isspace(*c)) {
                                         name_is_digits = 0;
                                         break;
                                 }
                         }
 
-                        if(name_is_digits) {
+                        if (name_is_digits) {
                                 diag("    You named your test '%s'.  You shouldn't use numbers for your test names.", local_test_name);
                                 diag("    Very confusing.");
                         }
                 }
         }
 
-        if(!ok) {
+        if (!ok) {
                 printf("not ");
                 failures++;
         }
 
         printf("ok %d", test_count);
 
-        if(test_name != NULL) {
+        if (test_name != NULL) {
                 printf(" - ");
 
                 /* Print the test name, escaping any '#' characters it
                    might contain */
-                if(local_test_name != NULL) {
+                if (local_test_name != NULL) {
                         flockfile(stdout);
-                        for(c = local_test_name; *c != '\0'; c++) {
-                                if(*c == '#')
+                        for (c = local_test_name; *c != '\0'; c++) {
+                                if (*c == '#')
                                         fputc('\\', stdout);
                                 fputc((int)*c, stdout);
                         }
                         funlockfile(stdout);
-                } else {        /* vasprintf() failed, use a fixed message */
+                } else { /* vasprintf() failed, use a fixed message */
                         printf("%s", todo_msg_fixed);
                 }
         }
@@ -136,17 +133,16 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
 
            This is not counted as a failure, so decrement the counter if
            the test failed. */
-        if(todo) {
+        if (todo) {
                 printf(" # TODO %s", todo_msg ? todo_msg : todo_msg_fixed);
-                if(!ok)
+                if (!ok)
                         failures--;
         }
 
         printf("\n");
 
-        if(!ok)
-                diag("    Failed %stest (%s:%s() at line %d)", 
-                     todo ? "(TODO) " : "", file, func, line);
+        if (!ok)
+                diag("    Failed %stest (%s:%s() at line %d)", todo ? "(TODO) " : "", file, func, line);
 
         free(local_test_name);
 
@@ -161,18 +157,16 @@ _gen_result(int ok, const char *func, char *file, unsigned int line,
  * Initialise the TAP library.  Will only do so once, however many times it's
  * called.
  */
-void
-_tap_init(void)
-{
+void _tap_init(void) {
         static int run_once = 0;
 
         LOCK;
 
-        if(!run_once) {
+        if (!run_once) {
                 atexit(_cleanup);
 
                 /* stdout needs to be unbuffered so that the output appears
-                   in the same place relative to stderr output as it does 
+                   in the same place relative to stderr output as it does
                    with Test::Harness */
                 setbuf(stdout, 0);
                 run_once = 1;
@@ -184,15 +178,13 @@ _tap_init(void)
 /*
  * Note that there's no plan.
  */
-int
-plan_no_plan(void)
-{
+int plan_no_plan(void) {
 
         LOCK;
 
         _tap_init();
 
-        if(have_plan != 0) {
+        if (have_plan != 0) {
                 fprintf(stderr, "You tried to plan twice!\n");
                 test_died = 1;
                 UNLOCK;
@@ -210,9 +202,7 @@ plan_no_plan(void)
 /*
  * Note that the plan is to skip all tests
  */
-int
-plan_skip_all(char *reason)
-{
+int plan_skip_all(char *reason) {
 
         LOCK;
 
@@ -222,7 +212,7 @@ plan_skip_all(char *reason)
 
         printf("1..0");
 
-        if(reason != NULL)
+        if (reason != NULL)
                 printf(" # Skip %s", reason);
 
         printf("\n");
@@ -235,22 +225,20 @@ plan_skip_all(char *reason)
 /*
  * Note the number of tests that will be run.
  */
-int
-plan_tests(unsigned int tests)
-{
+int plan_tests(unsigned int tests) {
 
         LOCK;
 
         _tap_init();
 
-        if(have_plan != 0) {
+        if (have_plan != 0) {
                 fprintf(stderr, "You tried to plan twice!\n");
                 test_died = 1;
                 UNLOCK;
                 exit(255);
         }
 
-        if(tests == 0) {
+        if (tests == 0) {
                 fprintf(stderr, "You said to run 0 tests!  You've got to run something.\n");
                 test_died = 1;
                 UNLOCK;
@@ -266,9 +254,7 @@ plan_tests(unsigned int tests)
         return 0;
 }
 
-unsigned int
-diag(char *fmt, ...)
-{
+unsigned int diag(char *fmt, ...) {
         va_list ap;
 
         LOCK;
@@ -286,9 +272,7 @@ diag(char *fmt, ...)
         return 0;
 }
 
-void
-_expected_tests(unsigned int tests)
-{
+void _expected_tests(unsigned int tests) {
 
         LOCK;
 
@@ -298,9 +282,7 @@ _expected_tests(unsigned int tests)
         UNLOCK;
 }
 
-int
-skip(unsigned int n, char *fmt, ...)
-{
+int skip(unsigned int n, char *fmt, ...) {
         va_list ap;
         char *skip_msg;
 
@@ -310,11 +292,9 @@ skip(unsigned int n, char *fmt, ...)
         asprintf(&skip_msg, fmt, ap);
         va_end(ap);
 
-        while(n-- > 0) {
+        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);
@@ -324,9 +304,7 @@ skip(unsigned int n, char *fmt, ...)
         return 1;
 }
 
-void
-todo_start(char *fmt, ...)
-{
+void todo_start(char *fmt, ...) {
         va_list ap;
 
         LOCK;
@@ -340,9 +318,7 @@ todo_start(char *fmt, ...)
         UNLOCK;
 }
 
-void
-todo_end(void)
-{
+void todo_end(void) {
 
         LOCK;
 
@@ -352,28 +328,26 @@ todo_end(void)
         UNLOCK;
 }
 
-int
-exit_status(void)
-{
+int exit_status(void) {
         int r;
 
         LOCK;
 
         /* If there's no plan, just return the number of failures */
-        if(no_plan || !have_plan) {
+        if (no_plan || !have_plan) {
                 UNLOCK;
                 return failures;
         }
 
         /* Ran too many tests?  Return the number of tests that were run
            that shouldn't have been */
-        if(e_tests < test_count) {
+        if (e_tests < test_count) {
                 r = test_count - e_tests;
                 UNLOCK;
                 return r;
         }
 
-        /* Return the number of tests that failed + the number of tests 
+        /* Return the number of tests that failed + the number of tests
            that weren't run */
         r = failures + e_tests - test_count;
         UNLOCK;
@@ -385,51 +359,45 @@ exit_status(void)
  * Cleanup at the end of the run, produce any final output that might be
  * required.
  */
-void
-_cleanup(void)
-{
+void _cleanup(void) {
 
         LOCK;
 
         /* If plan_no_plan() wasn't called, and we don't have a plan,
            and we're not skipping everything, then something happened
            before we could produce any output */
-        if(!no_plan && !have_plan && !skip_all) {
+        if (!no_plan && !have_plan && !skip_all) {
                 diag("Looks like your test died before it could output anything.");
                 UNLOCK;
                 return;
         }
 
-        if(test_died) {
+        if (test_died) {
                 diag("Looks like your test died just after %d.", test_count);
                 UNLOCK;
                 return;
         }
 
-
         /* No plan provided, but now we know how many tests were run, and can
            print the header at the end */
-        if(!skip_all && (no_plan || !have_plan)) {
+        if (!skip_all && (no_plan || !have_plan)) {
                 printf("1..%d\n", test_count);
         }
 
-        if((have_plan && !no_plan) && e_tests < test_count) {
-                diag("Looks like you planned %d tests but ran %d extra.",
-                     e_tests, test_count - e_tests);
+        if ((have_plan && !no_plan) && e_tests < test_count) {
+                diag("Looks like you planned %d tests but ran %d extra.", e_tests, test_count - e_tests);
                 UNLOCK;
                 return;
         }
 
-        if((have_plan || !no_plan) && e_tests > test_count) {
-                diag("Looks like you planned %d tests but only ran %d.",
-                     e_tests, test_count);
+        if ((have_plan || !no_plan) && e_tests > test_count) {
+                diag("Looks like you planned %d tests but only ran %d.", e_tests, test_count);
                 UNLOCK;
                 return;
         }
 
-        if(failures)
-                diag("Looks like you failed %d tests of %d.", 
-                     failures, test_count);
+        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 8ee525c8..5abbd76a 100644
--- a/tap/tap.h
+++ b/tap/tap.h
@@ -28,52 +28,46 @@
    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__) :          \
-                           _gen_result(0, __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 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 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/tap/tests/diag/test.c b/tap/tests/diag/test.c
index 401db647..b0a5a4f5 100644
--- a/tap/tests/diag/test.c
+++ b/tap/tests/diag/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         plan_tests(2);
diff --git a/tap/tests/fail/test.c b/tap/tests/fail/test.c
index 621b6c29..18e16954 100644
--- a/tap/tests/fail/test.c
+++ b/tap/tests/fail/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(2);
diff --git a/tap/tests/ok/ok-hash/test.c b/tap/tests/ok/ok-hash/test.c
index 16be137a..82f65b08 100644
--- a/tap/tests/ok/ok-hash/test.c
+++ b/tap/tests/ok/ok-hash/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(4);
@@ -42,11 +40,11 @@ main(int argc, char *argv[])
         rc = ok(1, "Test with one # hash");
         diag("Returned: %d", rc);
 
-        rc = ok(1, "Test with # two # hashes");
+        rc = ok(1, "Test with # two # hashes");
         diag("Returned: %d", rc);
 
         rc = ok(1, "Test with ## back to back hashes");
         diag("Returned: %d", rc);
-        
+
         return exit_status();
 }
diff --git a/tap/tests/ok/ok-numeric/test.c b/tap/tests/ok/ok-numeric/test.c
index 0e33a748..46113f49 100644
--- a/tap/tests/ok/ok-numeric/test.c
+++ b/tap/tests/ok/ok-numeric/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(3);
diff --git a/tap/tests/ok/ok/test.c b/tap/tests/ok/ok/test.c
index ae04f2e4..8ef0bcd8 100644
--- a/tap/tests/ok/ok/test.c
+++ b/tap/tests/ok/ok/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(5);
diff --git a/tap/tests/pass/test.c b/tap/tests/pass/test.c
index 39d8a7c1..73df20cb 100644
--- a/tap/tests/pass/test.c
+++ b/tap/tests/pass/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(2);
diff --git a/tap/tests/plan/no-tests/test.c b/tap/tests/plan/no-tests/test.c
index 78c5d371..f70ec8d3 100644
--- a/tap/tests/plan/no-tests/test.c
+++ b/tap/tests/plan/no-tests/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(0);
diff --git a/tap/tests/plan/no_plan/test.c b/tap/tests/plan/no_plan/test.c
index 5cffbdc2..4c25d5f2 100644
--- a/tap/tests/plan/no_plan/test.c
+++ b/tap/tests/plan/no_plan/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_no_plan();
diff --git a/tap/tests/plan/not-enough-tests/test.c b/tap/tests/plan/not-enough-tests/test.c
index a9ec64f2..eacc07eb 100644
--- a/tap/tests/plan/not-enough-tests/test.c
+++ b/tap/tests/plan/not-enough-tests/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(1);
diff --git a/tap/tests/plan/sane/test.c b/tap/tests/plan/sane/test.c
index 0843d3af..17bf8d16 100644
--- a/tap/tests/plan/sane/test.c
+++ b/tap/tests/plan/sane/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(1);
diff --git a/tap/tests/plan/skip_all/test.c b/tap/tests/plan/skip_all/test.c
index 31722da9..4e37e1ae 100644
--- a/tap/tests/plan/skip_all/test.c
+++ b/tap/tests/plan/skip_all/test.c
@@ -26,9 +26,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_skip_all("No good reason");
diff --git a/tap/tests/plan/too-many-plans/test.c b/tap/tests/plan/too-many-plans/test.c
index b189cb72..5f45bc48 100644
--- a/tap/tests/plan/too-many-plans/test.c
+++ b/tap/tests/plan/too-many-plans/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(1);
diff --git a/tap/tests/plan/too-many-tests/test.c b/tap/tests/plan/too-many-tests/test.c
index 0f724104..0b2ee161 100644
--- a/tap/tests/plan/too-many-tests/test.c
+++ b/tap/tests/plan/too-many-tests/test.c
@@ -28,9 +28,7 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
 
         rc = plan_tests(5);
diff --git a/tap/tests/skip/test.c b/tap/tests/skip/test.c
index d8f3eafd..789812e2 100644
--- a/tap/tests/skip/test.c
+++ b/tap/tests/skip/test.c
@@ -28,29 +28,27 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
         unsigned int side_effect = 0;
 
         rc = plan_tests(4);
         diag("Returned: %d", rc);
 
-        rc = ok(1 == 1, "1 equals 1");  /* Should always work */
+        rc = ok(1 == 1, "1 equals 1"); /* Should always work */
         diag("Returned: %d", rc);
 
         do {
-                if(1) {
+                if (1) {
                         rc = skip(1, "Testing skipping");
                         continue;
                 }
-                
+
                 side_effect++;
 
                 ok(side_effect == 1, "side_effect checked out");
 
-        } while(0);
+        } while (0);
 
         diag("Returned: %d", rc);
 
diff --git a/tap/tests/todo/test.c b/tap/tests/todo/test.c
index ac6339a7..0cd2fb3f 100644
--- a/tap/tests/todo/test.c
+++ b/tap/tests/todo/test.c
@@ -28,16 +28,14 @@
 
 #include "tap.h"
 
-int
-main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
         unsigned int rc = 0;
         unsigned int side_effect = 0;
 
         rc = plan_tests(5);
         diag("Returned: %d", rc);
 
-        rc = ok(1 == 1, "1 equals 1");  /* Should always work */
+        rc = ok(1 == 1, "1 equals 1"); /* Should always work */
         diag("Returned: %d", rc);
 
         todo_start("For testing purposes");
diff --git a/tools/opttest.pl b/tools/opttest.pl
new file mode 100755
index 00000000..98213082
--- /dev/null
+++ b/tools/opttest.pl
@@ -0,0 +1,74 @@
+#!/usr/bin/perl -w
+use strict;
+use warnings;
+use Test;
+
+# This script (when executed from the monitoring plugins top level directory)
+# executes all the plugins with -h, --help, -V and --version to verify that
+# all of them exit properly with the state UNKNOWN (3)
+
+use vars qw($dir $file $prog $idx $state $output %progs @dirs);
+
+my $tests = 0;
+
+@dirs = qw(plugins plugins-scripts);
+
+foreach my $dir (@dirs) {
+        opendir(DIR, $dir) || die "can't opendir $dir: $!";
+        while ($file = readdir(DIR)) {
+                if (-x "$dir/$file" && -f "$dir/$file") {
+                        $tests++;
+                        $progs{"$dir/$file"} = $file;
+                }
+        }
+        closedir DIR;
+}
+
+plan tests => $tests;
+
+for my $prog (keys %progs) {
+        $state = 0;
+        $file = `basename $prog`;
+
+        $idx = 1;
+        $output = `$prog -h 2>&1`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (help exit code (short form))\n";
+                exit(1);
+        }
+
+        unless ($output =~ m/$progs{$prog}/ms) {
+                $idx++;
+                $state++;
+                print "$output\n$prog failed test $idx\n";
+        }
+
+        $idx++;
+        `$prog --help 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (help exit code (long form))\n";
+                exit(1);
+        }
+
+        $idx++;
+        `$prog -V 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (version exit code (short form))\n";
+                exit(1);
+        }
+
+        $idx++;
+        `$prog --version 2>&1 > /dev/null`;
+        if(($? >> 8) != 3) {
+                $state++;
+                print "$prog failed test $idx (version exit code (long form))\n";
+                exit(1);
+        }
+
+        print "$prog ($idx tests) ";
+        ok $state,0;
+}
+
diff --git a/tools/tinderbox_build b/tools/tinderbox_build
deleted file mode 100755
index 1a41f577..00000000
--- a/tools/tinderbox_build
+++ /dev/null
@@ -1,290 +0,0 @@
-#!/usr/bin/perl
-# tinderbox_build.pl
-# This script builds the monitoringplugins and then sends
-# logs back to the master tinderbox server
-#
-# This script is based on mozilla-unix.pl which comes with tinderbox2
-#
-# See http://tinderbox.altinity.org for more details
-
-require 5.000;
-
-use strict;
-use Sys::Hostname;
-use Cwd;
-use Time::Local;
-
-my $Version = `git describe --abbrev=4 HEAD`;
-
-my $myhost = hostname;
-chomp($myhost);
-my ($host, $junk) = split(/\./, $myhost);
-        
-my $BuildAdministrator = $ENV{TINDERBOX_BUILD_ADMIN} || "$ENV{'USER'}\@$myhost";
-my $TmpDir = $ENV{TMPDIR} || "/tmp";
-
-#Default values of cmdline opts
-my $ReportStatus = 0;  # Do not send results to server
-
-# Set these to what makes sense for your system
-
-# Set these proper values for your tinderbox server
-# Have the StrictHostKeyChecking=no so that a new host will automatically add hostkey without
-# prompting. If host key changes, then will get error, so this should still be secure
-my $Tinderbox_server = '-p 1022 -o StrictHostKeyChecking=no tinderbox2@tinderbox.opsera.com';
-
-# These shouldn't really need to be changed
-my $BuildTree = 'monitoringplug';
-my $BuildName = '';
-my $ConfigureArgs = $ENV{CONFIGURE_ARGS};
-
-my $OS = `uname -s`;
-my $OSVer = `uname -r`;
-    
-chop($OS, $OSVer);
-    
-if ( $OS eq 'AIX' ) {
-        $OSVer = `uname -v`;
-        chop($OSVer);
-        $OSVer = $OSVer . "." . `uname -r`;
-        chop($OSVer);
-}
-        
-if ( $OS eq 'IRIX64' ) {
-        $OS = 'IRIX';
-}
-    
-if ( $OS eq 'SCO_SV' ) {
-        $OS = 'SCOOS';
-        $OSVer = '5.0';
-}
-    
-if ( "$host" ne "" ) {
-        $BuildName = $host . ' ';
-}
-$BuildName .= $OS . ' ' . $OSVer;
-$_ = $BuildName;
-s/ /_/g;
-
-my $logfile = "$_.log";
-
-sub BuildIt {
-        my ($fe, @felist, $EarlyExit, $LastTime);
-
-        my $StartDir = getcwd();
-        $LastTime = 0;
-
-        print "Starting dir is : $StartDir\n";
-
-        my $EarlyExit = 0;
-
-        chdir("$StartDir");
-
-        my $StartTime = time;
-        if (-e (my $file = "monitoring-plugins.spec")) {
-                open F, $file;
-                while (<F>) {
-                        if (/^Version: trunk-(\d\d\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/) {
-                                $StartTime = timegm(0, $5, $4, $3, ($2 - 1), ($1 - 1900));
-                                last;
-                        }
-                }
-        }
-
-        print "Start time is $StartTime",$/;
-
-        my $CurrentDir = getcwd();
-        if ( $CurrentDir ne $StartDir ) {
-                print "startdir: $StartDir, curdir $CurrentDir\n";
-                die "curdir != startdir";
-        }
-
-        unlink( "$logfile" );
-        
-        print "opening $logfile\n";
-        open( LOG, ">$logfile" ) || print "can't open $?\n";
-        print LOG "current dir is -- $host:$CurrentDir\n";
-        print LOG "Build Administrator is $BuildAdministrator\n";
-        &PrintEnv;
-        
-        my $BuildStatus;
-        if (&configure) {
-                if (&make) {
-                        if (&maketest) {
-                                $BuildStatus = "success";
-                        } else {        
-                                $BuildStatus = "test_failed";
-                        }
-                } else {
-                        $BuildStatus = "build_failed";
-                }
-        } else {
-                $BuildStatus = "busted";
-        }
-
-        print LOG "\nBuild Status = $BuildStatus\n";
-
-        close(LOG);
-        chdir("$StartDir");
-        
-# TV: Leaving this in, because process mail program probably has some
-# limitation retained
-
-# this fun line added on 2/5/98. do not remove. Translated to english,
-# that's "take any line longer than 1000 characters, and split it into less
-# than 1000 char lines.  If any of the resulting lines is
-# a dot on a line by itself, replace that with a blank line."  
-# This is to prevent cases where a <cr>.<cr> occurs in the log file.  Sendmail
-# interprets that as the end of the mail, and truncates the log before
-# it gets to Tinderbox.  (terry weismann, chris yeh)
-#
-# This was replaced by a perl 'port' of the above, written by 
-# preed@netscape.com; good things: no need for system() call, and now it's
-# all in perl, so we don't have to do OS checking like before.
-
-        open(LOG, "$logfile") || die "Couldn't open logfile: $!\n";
-        open(OUTLOG, ">${logfile}.last") || die "Couldn't open logfile: $!\n";
-            
-        print OUTLOG $/;
-        print OUTLOG "tinderbox: tree: $BuildTree\n";
-        print OUTLOG "tinderbox: builddate: $StartTime\n";
-        print OUTLOG "tinderbox: status: $BuildStatus\n";
-        print OUTLOG "tinderbox: build: $BuildName $fe\n";
-        print OUTLOG "tinderbox: errorparser: unix\n";
-        print OUTLOG "tinderbox: buildfamily: unix\n";
-        print OUTLOG "tinderbox: END\n";            
-        print OUTLOG $/;
-
-        while (<LOG>) {
-            my $q = 0;
-            
-            for (;;) {
-                my $val = $q * 1000;
-                my $Output = substr($_, $val, 1000);
-                
-                last if $Output eq undef;
-                
-                $Output =~ s/^\.$//g;
-                $Output =~ s/\n//g;
-                print OUTLOG "$Output\n";
-                $q++;
-            } #EndFor
-                
-        } #EndWhile
-            
-        close(LOG);
-        close(OUTLOG);
-
-        if ($ReportStatus) {
-                system( "ssh $Tinderbox_server tinderbox_receive < ${logfile}.last" )
-        } else {
-                print <<"EOF"
-Not sending logs to http://tinderbox.altinity.org
-If you have SSH keys setup on the tinderbox server, you can manually send
-with 'ssh $Tinderbox_server tinderbox_receive < ${logfile}.last'
-EOF
-        }
-        
-        unlink("$logfile");
-        print "Finished building for tinderbox",$/;
-
-} #EndSub-BuildIt
-
-sub ParseArgs {
-    my($i);
-
-    $i = 0;
-    while( $i < @ARGV ) {
-        if ($ARGV[$i] eq '--version' || $ARGV[$i] eq '-v') {
-            die "$0: version $Version\n";
-        } elsif ($ARGV[$i] eq '-y') {
-                $ReportStatus = 1;
-        } else {
-            &PrintUsage;
-        }
-
-        $i++;
-    } #EndWhile
-
-} #EndSub-ParseArgs
-
-sub PrintUsage {
-    die "usage: $0 [-v | --version ] [-t do not send report to tinderbox server]\n";
-}
-
-sub PrintEnv {
-    my ($key);
-    foreach $key (keys %ENV) {
-        print LOG "$key = $ENV{$key}\n";
-        print "$key = $ENV{$key}\n";
-    }
-
-        # Print the NPTest variables
-        if (-e "/var/tmp/NPTest.cache") {
-                open F, "/var/tmp/NPTest.cache";
-                print LOG "NPTest variables:\n";
-                print LOG <F>;
-                close F;
-        }
-                
-} #EndSub-PrintEnv
-
-sub SetupPath {
-    my($Path);
-    $Path = $ENV{PATH};
-    print "Path before: $Path\n";
-
-    # Don't alter path if we're building off a repository tree;
-    # SunOS make will be used only for snapshots and releases.
-    if ( $OS eq 'SunOS' && !( -e '.svn' || -e '.git' )) {
-        $ENV{'PATH'} = '/usr/ccs/bin:' . $ENV{'PATH'};
-    }
-
-    $Path = $ENV{PATH};
-    print "Path After: $Path\n";
-} #EndSub-SetupPath
-
-sub configure {
-        # Configure
-        print LOG "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1\n";
-        open (CONFIGURE, "./configure --enable-extra-opts --enable-libtap $ConfigureArgs 2>&1 |") || die "../configure: $!\n";
-        while (<CONFIGURE>) {
-            print $_;
-            print LOG $_;
-        }
-        close(CONFIGURE);
-        return ! $?;
-}
-        
-sub make {
-        # Building
-        print LOG "make 2>&1\n";
-        open( MAKE, "make 2>&1 |");
-        while ( <MAKE> ) {
-                print $_;
-                print LOG $_;
-        }
-        close( MAKE);
-        return ! $?;
-}
-
-sub maketest {
-        # Tests
-        print LOG "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1\n";
-        open( MAKE, "LANG=C make test 2>&1 && make install DESTDIR=$TmpDir/tinderbox_build.$$ 2>&1 && make install-strip DESTDIR=$TmpDir/tinderbox_build2.$$ 2>&1 |");
-        while ( <MAKE> ) {
-                print $_;
-                print LOG $_;
-        }
-        close( MAKE);
-        my $rc = $?;
-        system("rm -fr $TmpDir/tinderbox_build.$$ $TmpDir/tinderbox_build2.$$");
-        return ! $rc;
-}
-
-# Main function
-&ParseArgs;
-&SetupPath;
-&BuildIt;
-
-1;