fix valgrind t_vfprintf_s

Author: rurban

CMakeLists.txt

@@ -224,6 +224,7 @@ check_include_file("altivec.h" HAVE_ALTIVEC_H)
 check_include_file("spe.h" HAVE_SPE_H)
 check_include_file("mbarrier.h" HAVE_MBARRIER_H)
 check_include_file("stdbool.h" HAVE_STDBOOL_H)
+check_include_file("valgrind/valgrind.h" HAVE_VALGRIND_VALGRIND_H)
 
 # Check types
 set(CMAKE_EXTRA_INCLUDE_FILES "stddef.h")

cmakeconfig.h.in

@@ -91,6 +91,9 @@
 /* Define to 1 if you have the <stdbool.h> header file. */
 #cmakedefine HAVE_STDBOOL_H 1
 
+/* Define to 1 if you have the <valgrind/valgrind.h> header file. */
+#cmakedefine HAVE_VALGRIND_VALGRIND_H 1
+
 /* Define to 1 if the compiler supports C99 */
 #cmakedefine SAFECLIB_HAVE_C99 1
 

configure.ac

@@ -833,6 +833,7 @@ AC_CHECK_HEADERS([stdlib.h	\
                   altivec.h     \
                   spe.h         \
                   mbarrier.h    \
+                  valgrind/valgrind.h \
                   ])
 
 INSERT_SYS_TYPES_H=""

tests/test_vfprintf_s.c

@@ -12,6 +12,9 @@
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
+#ifdef HAVE_VALGRIND_VALGRIND_H
+#include <valgrind/valgrind.h>
+#endif
 
 #include "test_msvcrt.h"
 
@@ -222,6 +225,13 @@ int test_vfprintf_s(void) {
 
     fclose(out);
 
+#ifdef HAVE_VALGRIND_VALGRIND_H
+    if (RUNNING_ON_VALGRIND) {
+        unlink(TMP);
+        return errs;
+    }
+#endif
+
     /* print to closed stream: across libc's unportable, and not valgrind-safe */
     rc = vtfprintf_s(out, "%s", str1);
     ANYERR(); // Windows may produce EOF, most others EBADF