Merge branch 'en/abort-df-conflict-fixes'

diff --git a/banned.h b/banned.h
index 34f22a4c25658b326d04c28d9fb096d2c4671859..28f5937035b762ad9fb091ea8fb7cc96f38fc92d 100644 (file)
--- a/banned.h
+++ b/banned.h
@@ -14,5 +14,17 @@
 #define strcpy(x,y) BANNED(strcpy)
 #undef strcat
 #define strcat(x,y) BANNED(strcat)
+#undef strncpy
+#define strncpy(x,y,n) BANNED(strncpy)
+
+#undef sprintf
+#undef vsprintf
+#ifdef HAVE_VARIADIC_MACROS
+#define sprintf(...) BANNED(sprintf)
+#define vsprintf(...) BANNED(vsprintf)
+#else
+#define sprintf(buf,fmt,arg) BANNED(sprintf)
+#define vsprintf(buf,fmt,arg) BANNED(sprintf)
+#endif
 
 #endif /* BANNED_H */