summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/insmod-busybox/busybox.h
diff options
context:
space:
mode:
authorMystery Man <unknown@mandriva.org>2003-08-20 07:37:27 +0000
committerMystery Man <unknown@mandriva.org>2003-08-20 07:37:27 +0000
commit7f2ac73888b8ef372ea597049981b27e7d810ac2 (patch)
tree354132889b63bbe5f446cb82869b3c3367135a80 /mdk-stage1/insmod-busybox/busybox.h
parent327bd24f8e4291bd1882de1990dd7339f781a9cb (diff)
downloaddrakx-backup-do-not-use-7f2ac73888b8ef372ea597049981b27e7d810ac2.tar
drakx-backup-do-not-use-7f2ac73888b8ef372ea597049981b27e7d810ac2.tar.gz
drakx-backup-do-not-use-7f2ac73888b8ef372ea597049981b27e7d810ac2.tar.bz2
drakx-backup-do-not-use-7f2ac73888b8ef372ea597049981b27e7d810ac2.tar.xz
drakx-backup-do-not-use-7f2ac73888b8ef372ea597049981b27e7d810ac2.zip
This commit was manufactured by cvs2svn to create branch 'MDKC_1_0'.topic/MDKC_1_0
Diffstat (limited to 'mdk-stage1/insmod-busybox/busybox.h')
-rw-r--r--mdk-stage1/insmod-busybox/busybox.h10
1 files changed, 10 insertions, 0 deletions
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_ */