From de47eb59bb829423b1d0f47ba13099073999b3cb Mon Sep 17 00:00:00 2001
From: Nicolas Planel <nplanel@mandriva.com>
Date: Wed, 29 Oct 2003 16:07:11 +0000
Subject: Corporate Server 2.1.1 release

---
 mdk-stage1/insmod-busybox/busybox.h | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'mdk-stage1/insmod-busybox/busybox.h')

diff --git a/mdk-stage1/insmod-busybox/busybox.h b/mdk-stage1/insmod-busybox/busybox.h
index a2d620c8b..9e6052fce 100644
--- a/mdk-stage1/insmod-busybox/busybox.h
+++ b/mdk-stage1/insmod-busybox/busybox.h
@@ -464,4 +464,14 @@ extern int sysinfo (struct sysinfo* info);
 #define isclr(a,i)      (((a)[(i)/NBBY] & (1<<((i)%NBBY))) == 0)
 #endif
 
+/* Merge from busybox 0.60.5 */
+#define error_msg				errorMsg
+#define perror_msg(FORMAT,...)	error_msg(FORMAT ": %s", ## __VA_ARGS__, strerror(errno))
+#define recursive_action		recursiveAction
+
+#define safe_strncpy(DST, SRC, SIZE) do {		\
+  (DST)[SIZE-1] = '\0';							\
+  return strncpy((DST), (SRC),(SIZE)-1);		\
+} while (0)
+
 #endif /* _BB_INTERNAL_H_ */
-- 
cgit v1.2.1