Refactor uses of HAVE_PRINTF_STRING_NULL vs. REQUIRE_NUT_STRARG for p…

…rintf("%s", NULL) support [#2109] Signed-off-by: Jim Klimov <[email protected]>
networkupstools · Oct 16, 2023 · 304d41e · 304d41e
1 parent f3b11a6
commit 304d41e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/include/str.h b/include/str.h
@@ -31,9 +31,10 @@ extern "C" {
 
 /* Some compilers and/or C libraries do not handle printf("%s", NULL) correctly */
 #ifndef NUT_STRARG
-# ifdef HAVE_PRINTF_STRING_NULL
+# if (defined REQUIRE_NUT_STRARG) && (REQUIRE_NUT_STRARG == 0)
 #  define NUT_STRARG(x) x
 # else
+/* Is required, or not defined => err on safe side */
 #  define NUT_STRARG(x) (x?x:"(null)")
 # endif
 #endif

diff --git a/m4/ax_c_pragmas.m4 b/m4/ax_c_pragmas.m4
@@ -1017,21 +1017,23 @@ if (res < 0) {
 return 0;
             ]])],
         [ax_cv__printf_string_null=yes
-         AM_CONDITIONAL([REQUIRE_NUT_STRARG], [false])
         ],
         [ax_cv__printf_string_null=no
-         AC_DEFINE([REQUIRE_NUT_STRARG], [1],
-            [Define to 1 if your libc requires workarounds to print NULL values.])
-         AC_MSG_WARN([Your C library requires workarounds to print NULL values; if something crashes with a segmentation fault (especially during verbose debug) - that may be why])
-         AM_CONDITIONAL([REQUIRE_NUT_STRARG], [true])
         ],
         [${myWARN_CFLAGS}]
     )]
   )
   unset myWARN_CFLAGS
 
   AS_IF([test "$ax_cv__printf_string_null" = "yes"],[
-    AC_DEFINE([HAVE_PRINTF_STRING_NULL], 1, [define if your libc can printf("%s", NULL) sanely])
+    AM_CONDITIONAL([REQUIRE_NUT_STRARG], [false])
+    AC_DEFINE([REQUIRE_NUT_STRARG], [0],
+      [Define to 0 if your libc can printf("%s", NULL) sanely, or to 1 if your libc requires workarounds to print NULL values.])
+  ],[
+    AM_CONDITIONAL([REQUIRE_NUT_STRARG], [true])
+    AC_DEFINE([REQUIRE_NUT_STRARG], [1],
+      [Define to 0 if your libc can printf("%s", NULL) sanely, or to 1 if your libc requires workarounds to print NULL values.])
+    AC_MSG_WARN([Your C library requires workarounds to print NULL values; if something crashes with a segmentation fault (especially during verbose debug) - that may be why])
   ])
 
   AC_LANG_POP([C])

diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -30,7 +30,7 @@ nutlogtest-nofail.sh: nutlogtest$(EXEEXT)
 	@echo '#!/bin/sh' > $@
 	@echo 'echo "WARNING: Your C library requires workarounds to print NULL values!" >&2' >> $@
 	@echo 'echo "If nutlogtest below, or generally some NUT program, crashes with" >&2' >> $@
-	@echo 'echo "a segmentation fault (especially with verbose debug) - that may be why" >&2' >> $@
+	@echo 'echo "a segmentation fault (especially during verbose debug) - that may be why" >&2' >> $@
 	@echo 'SCRIPT_DIR="`dirname "$$0"`"' >> $@
 	@echo '"$${SCRIPT_DIR}/nutlogtest" "$$@" || echo "nutlogtest FAILED but it was expected"' >> $@
 	@chmod +x $@