From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Wed, 10 Dec 2008 13:46:19 +0000 (-0000)
Subject: busybox: additional 1.13.1 fixes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cdd72cd08ff91be59ba6fecb1261cd32d29c7df9;p=buildroot.git

busybox: additional 1.13.1 fixes
---

diff --git a/package/busybox/busybox-1.13.1-init.patch b/package/busybox/busybox-1.13.1-init.patch
new file mode 100644
index 0000000000..23187720fc
--- /dev/null
+++ b/package/busybox/busybox-1.13.1-init.patch
@@ -0,0 +1,28 @@
+--- busybox-1.13.1/init/init.c	Sat Nov 29 07:48:56 2008
++++ busybox-1.13.1-init/init/init.c	Tue Dec  9 22:17:43 2008
+@@ -118,18 +118,18 @@
+ 
+ 	msg[0] = '\r';
+ 	va_start(arguments, fmt);
+-	l = vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments);
+-	if (l > sizeof(msg) - 2)
+-		l = sizeof(msg) - 2;
++	l = 1 + vsnprintf(msg + 1, sizeof(msg) - 2, fmt, arguments);
++	if (l > sizeof(msg) - 1)
++		l = sizeof(msg) - 1;
+ 	msg[l] = '\0';
+ 	va_end(arguments);
+ 
+ 	if (ENABLE_FEATURE_INIT_SYSLOG) {
+-		/* Log the message to syslogd */
+ 		if (where & L_LOG) {
+-			/* don't print out "\r" */
+-			openlog(applet_name, 0, LOG_DAEMON);
+-			syslog(LOG_INFO, "init: %s", msg + 1);
++			/* Log the message to syslogd */
++			openlog("init", 0, LOG_DAEMON);
++			/* don't print "\r" */
++			syslog(LOG_INFO, "%s", msg + 1);
+ 			closelog();
+ 		}
+ 		msg[l++] = '\n';
diff --git a/package/busybox/busybox-1.13.1-printf.patch b/package/busybox/busybox-1.13.1-printf.patch
new file mode 100644
index 0000000000..43f4135b68
--- /dev/null
+++ b/package/busybox/busybox-1.13.1-printf.patch
@@ -0,0 +1,19 @@
+--- busybox-1.13.1/coreutils/printf.c	Sun Nov  9 18:28:07 2008
++++ busybox-1.13.1-printf/coreutils/printf.c	Wed Dec 10 12:50:55 2008
+@@ -359,8 +359,15 @@
+ 	 * We will mimic coreutils. */
+ 	if (argv[1] && argv[1][0] == '-' && argv[1][1] == '-' && !argv[1][2])
+ 		argv++;
+-	if (!argv[1])
++	if (!argv[1]) {
++		if (ENABLE_ASH_BUILTIN_PRINTF
++		 && applet_name[0] != 'p'
++		) {
++			bb_error_msg("usage: printf FORMAT [ARGUMENT...]");
++			return 2; /* bash compat */
++		}
+ 		bb_show_usage();
++	}
+ 
+ 	format = argv[1];
+ 	argv2 = argv + 2;