busybox-1.0.1-rc1.patch

http://busybox.net/lists/busybox/2005-July/014974.html

6 files changed, 16 insertions, 14 deletions

diff --git a/busybox/include/.cvsignore b/busybox/include/.cvsignore
deleted file mode 100644
index 9c68c95..0000000
--- a/busybox/include/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-config
-config.h
diff --git a/busybox/include/applets.h b/busybox/include/applets.h
index 90d4195..21f82f5 100644
--- a/busybox/include/applets.h
+++ b/busybox/include/applets.h
@@ -440,7 +440,7 @@
 	APPLET_NOUSAGE("pipe_progress", pipe_progress_main, _BB_DIR_BIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_PIVOT_ROOT
- 	APPLET(pivot_root, pivot_root_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+	APPLET(pivot_root, pivot_root_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_POWEROFF
 	APPLET(poweroff, poweroff_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
@@ -482,7 +482,7 @@
 	APPLET(rmmod, rmmod_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_ROUTE
- 	APPLET(route, route_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
+	APPLET(route, route_main, _BB_DIR_SBIN, _BB_SUID_NEVER)
 #endif
 #ifdef CONFIG_RPM
 	APPLET(rpm, rpm_main, _BB_DIR_BIN, _BB_SUID_NEVER)
diff --git a/busybox/include/busybox.h b/busybox/include/busybox.h
index f6f5759..3ff3d8a 100644
--- a/busybox/include/busybox.h
+++ b/busybox/include/busybox.h
@@ -32,10 +32,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#if __GNU_LIBRARY__ < 5
-#ifndef __dietlibc__
-#error "Sorry, libc5 is not supported"
-#endif
+#if __GNU_LIBRARY__ < 5 && \
+    !defined(__dietlibc__) && \
+    !defined(_NEWLIB_VERSION)
+#error "Sorry, this libc version is not supported :("
 #endif
 
 #ifndef BB_EXTRA_VERSION
diff --git a/busybox/include/inet_common.h b/busybox/include/inet_common.h
index afea5de..4a9c3a2 100644
--- a/busybox/include/inet_common.h
+++ b/busybox/include/inet_common.h
@@ -29,5 +29,7 @@ extern int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirs
 extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
 			 int numeric, unsigned int netmask);
 
+#ifdef CONFIG_FEATURE_IPV6
 extern int INET6_resolve(const char *name, struct sockaddr_in6 *sin6);
 extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric);
+#endif
diff --git a/busybox/include/libbb.h b/busybox/include/libbb.h
index 93ab537..467a15c 100644
--- a/busybox/include/libbb.h
+++ b/busybox/include/libbb.h
@@ -150,6 +150,7 @@ extern FILE *bb_xfopen(const char *path, const char *mode);
 extern int   bb_fclose_nonstdin(FILE *f);
 extern void  bb_fflush_stdout_and_exit(int retval) __attribute__ ((noreturn));
 
+#define BB_GETOPT_ERROR 0x80000000UL
 extern const char *bb_opt_complementaly;
 extern const struct option *bb_applet_long_options;
 extern unsigned long bb_getopt_ulflags(int argc, char **argv, const char *applet_opts, ...);
@@ -323,6 +324,7 @@ extern const char * const bb_msg_full_version;
 extern const char * const bb_msg_memory_exhausted;
 extern const char * const bb_msg_invalid_date;
 extern const char * const bb_msg_io_error;
+extern const char * const bb_msg_read_error;
 extern const char * const bb_msg_write_error;
 extern const char * const bb_msg_name_longer_than_foo;
 extern const char * const bb_msg_unknown;
diff --git a/busybox/include/usage.h b/busybox/include/usage.h
index 377eb10..ad44101 100644
--- a/busybox/include/usage.h
+++ b/busybox/include/usage.h
@@ -204,7 +204,7 @@
 	"Copies SOURCE to DEST, or multiple SOURCE(s) to DIRECTORY.\n" \
 	"\n" \
 	"\t-a\tSame as -dpR\n" \
-	"\t-d\tPreserves links\n" \
+	"\t-d,-P\tPreserves links\n" \
 	"\t-p\tPreserves file attributes if possible\n" \
 	"\t-f\tforce (implied; ignored) - always set\n" \
 	"\t-i\tinteractive, prompt before overwrite\n" \
@@ -522,13 +522,13 @@
 	"\t-e\tinterpret backslash-escaped characters (i.e., \\t=tab)\n" \
 	"\t-E\tdisable interpretation of backslash-escaped characters")
 #define echo_example_usage \
-	"$ echo "Erik is cool"\n" \
+	"$ echo \"Erik is cool\"\n" \
 	"Erik is cool\n" \
-	USAGE_FANCY_ECHO("$  echo -e "Erik\\nis\\ncool"\n" \
+	USAGE_FANCY_ECHO("$  echo -e \"Erik\\nis\\ncool\"\n" \
 	"Erik\n" \
 	"is\n" \
 	"cool\n" \
-	"$ echo "Erik\\nis\\ncool"\n" \
+	"$ echo \"Erik\\nis\\ncool\"\n" \
 	"Erik\\nis\\ncool\n")
 
 #define env_trivial_usage \
@@ -751,7 +751,7 @@
         "$ cat getopt.test\n" \
         "#!/bin/sh\n" \
         "GETOPT=`getopt -o ab:c:: --long a-long,b-long:,c-long:: \\\n" \
-        "       -n 'example.busybox' -- "$@"`\n" \
+        "       -n 'example.busybox' -- \"$@\"`\n" \
         "if [ $? != 0 ] ; then  exit 1 ; fi\n" \
         "eval set -- "$GETOPT"\n" \
         "while true ; do\n" \
@@ -1940,7 +1940,7 @@
 	"Formats and prints ARGUMENT(s) according to FORMAT,\n" \
 	"Where FORMAT controls the output exactly as in C printf."
 #define printf_example_usage \
-	"$ printf "Val=%d\\n" 5\n" \
+	"$ printf \"Val=%d\\n\" 5\n" \
 	"Val=5\n"
 
 #ifdef CONFIG_SELINUX