Fix build with Bionic libc
Add generic tests for fopen64 and fputs_unlocked functions to fix build
with Bionic libc that does not provide them.
* configure.ac (AC_CHECK_FUNCS): Add fopen64 and fputs_unlocked.
* strace.c [_LARGEFILE64_SOURCE]: Use fopen instead of fopen64
if !HAVE_FOPEN64.
Use fputs instead of fputs_unlocked if !HAVE_FPUTS_UNLOCKED.
* vsprintf.c: Use fputs instead of fputs_unlocked
if !HAVE_FPUTS_UNLOCKED.
Reported-by: Elliott Hughes <enh@google.com>
diff --git a/configure.ac b/configure.ac
index db24349..75eafc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,9 @@
AC_LITTLE_ENDIAN_LONG_LONG
AC_CHECK_FUNCS(m4_normalize([
+ fopen64
fork
+ fputs_unlocked
if_indextoname
inet_ntop
prctl
diff --git a/strace.c b/strace.c
index 914b0a6..063cb94 100644
--- a/strace.c
+++ b/strace.c
@@ -439,7 +439,11 @@
}
#ifdef _LARGEFILE64_SOURCE
-# define fopen_for_output fopen64
+# ifdef HAVE_FOPEN64
+# define fopen_for_output fopen64
+# else
+# define fopen_for_output fopen
+# endif
# define struct_stat struct stat64
# define stat_file stat64
# define struct_dirent struct dirent64
@@ -537,6 +541,10 @@
va_end(args);
}
+#ifndef HAVE_FPUTS_UNLOCKED
+# define fputs_unlocked fputs
+#endif
+
void
tprints(const char *str)
{
diff --git a/vsprintf.c b/vsprintf.c
index 92fe1a7..0125e72 100644
--- a/vsprintf.c
+++ b/vsprintf.c
@@ -16,6 +16,10 @@
#include <stdarg.h>
#include <limits.h>
+#ifndef HAVE_FPUTS_UNLOCKED
+# define fputs_unlocked fputs
+#endif
+
#define noinline_for_stack /*nothing*/
#define likely(expr) (expr)
#define unlikely(expr) (expr)