Rework fortify implementation to use extern inline

Overriding functions with macros is legal in C but a lot of software
is not prepared for it.  Use the extern inline method to achieve the
same result.

1 files changed, 12 insertions, 13 deletions

diff --git a/include/strings.h b/include/strings.h
index d7118f3..1adbf51 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -10,32 +10,31 @@
 #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) || defined(_POSIX_SOURCE) \
  || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE+0 < 200809L) \
  || (defined(_XOPEN_SOURCE) && _XOPEN_SOURCE+0 < 700)
-static inline __attribute__ ((always_inline))
-void
-__fortify_bcopy(const void *src, void *dest, size_t n)
+#undef bcopy
+#undef bzero
+extern void __bcopy_orig(const void *, void *, size_t)
+        __asm__(__USER_LABEL_PREFIX__ "bcopy");
+extern __inline __attribute__((__always_inline__,__gnu_inline__))
+void bcopy(const void *src, void *dest, size_t n)
 {
         size_t bos = __builtin_object_size(dest, 0);
 
         if (n > bos)
                 __builtin_trap();
-        return bcopy(src, dest, n);
+        return __bcopy_orig(src, dest, n);
 }
 
-static inline __attribute__ ((always_inline))
-void
-__fortify_bzero(void *src, size_t n)
+extern void __bzero_orig(void *, size_t)
+        __asm__(__USER_LABEL_PREFIX__ "bzero");
+extern __inline __attribute__((__always_inline__,__gnu_inline__))
+void bzero(void *src, size_t n)
 {
         size_t bos = __builtin_object_size(src, 0);
 
         if (n > bos)
                 __builtin_trap();
-        return bzero(src, n);
+        return __bzero_orig(src, n);
 }
-
-#undef bcopy
-#define bcopy(src, dest, n) __fortify_bcopy(src, dest, n)
-#undef bzero
-#define bzero(src, n) __fortify_bzero(src, n)
 #endif
 
 #endif