From a2949aa217f255341a0507b6e340285bdea1001f Mon Sep 17 00:00:00 2001
From: Manuel Novoa III <mjn3@codepoet.org>
Date: Fri, 29 Jun 2001 18:59:32 +0000
Subject: [PATCH] Add some missing includes to kill warnings when building with
 the default Config.h and using gcc's -fno-builtin.  There are probably other
 files with the similar problems. Also, if building against uClibc, don't
 include asm/unistd.h in syscalls.c and module_syscalls.c.

---
 archival/libunarchive/decompress_unzip.c | 1 +
 archival/libunarchive/unzip.c            | 1 +
 coreutils/rm.c                           | 1 +
 libbb/concat_path_file.c                 | 1 +
 libbb/copy_file.c                        | 1 +
 libbb/dirname.c                          | 1 +
 libbb/last_char_is.c                     | 1 +
 libbb/module_syscalls.c                  | 2 ++
 libbb/remove_file.c                      | 1 +
 libbb/syscalls.c                         | 2 ++
 libbb/unzip.c                            | 1 +
 rm.c                                     | 1 +
 12 files changed, 14 insertions(+)

diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 40b8af427..b85eb9981 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -64,6 +64,7 @@ static char *license_msg[] = {
 #include <sys/wait.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 #include "libbb.h"
 
 FILE *in_file, *out_file;
diff --git a/archival/libunarchive/unzip.c b/archival/libunarchive/unzip.c
index 40b8af427..b85eb9981 100644
--- a/archival/libunarchive/unzip.c
+++ b/archival/libunarchive/unzip.c
@@ -64,6 +64,7 @@ static char *license_msg[] = {
 #include <sys/wait.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 #include "libbb.h"
 
 FILE *in_file, *out_file;
diff --git a/coreutils/rm.c b/coreutils/rm.c
index f8e16625c..51c9f4ceb 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <getopt.h>
 #include "busybox.h"
 
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 12a57c837..61efa9c3e 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -6,6 +6,7 @@
  *
 */
 
+#include <string.h>
 #include "libbb.h"
 
 extern char *concat_path_file(const char *path, const char *filename)
diff --git a/libbb/copy_file.c b/libbb/copy_file.c
index 24bdf9002..c79fbeb14 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <dirent.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "libbb.h"
 
diff --git a/libbb/dirname.c b/libbb/dirname.c
index 2e89fc17a..cc50f5870 100644
--- a/libbb/dirname.c
+++ b/libbb/dirname.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include <string.h>
 #include "libbb.h"
 
 /* Return a string on the heap containing the directory component of PATH.  */
diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index ae2d24bf7..a95e57c35 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -19,6 +19,7 @@
  *
  */
 
+#include <string.h>
 #include "libbb.h"
 
 /* Find out if the last character of a string matches the one given Don't
diff --git a/libbb/module_syscalls.c b/libbb/module_syscalls.c
index 2fb4cd177..36b75fb93 100644
--- a/libbb/module_syscalls.c
+++ b/libbb/module_syscalls.c
@@ -28,7 +28,9 @@
    _syscall* defined.  */
 #define __LIBRARY__
 #include <sys/syscall.h>
+#ifndef __UCLIBC__
 #include <asm/unistd.h>
+#endif
 #include "libbb.h"
 
 
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index 23be40429..3b84680c4 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <getopt.h>
 #include "libbb.h"
 
diff --git a/libbb/syscalls.c b/libbb/syscalls.c
index f183b26c3..426a14aa1 100644
--- a/libbb/syscalls.c
+++ b/libbb/syscalls.c
@@ -30,7 +30,9 @@
 
 
 #include <sys/syscall.h>
+#ifndef __UCLIBC__
 #include <asm/unistd.h>
+#endif
 #include "libbb.h"
 
 #if defined(__ia64__)
diff --git a/libbb/unzip.c b/libbb/unzip.c
index 40b8af427..b85eb9981 100644
--- a/libbb/unzip.c
+++ b/libbb/unzip.c
@@ -64,6 +64,7 @@ static char *license_msg[] = {
 #include <sys/wait.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <string.h>
 #include "libbb.h"
 
 FILE *in_file, *out_file;
diff --git a/rm.c b/rm.c
index f8e16625c..51c9f4ceb 100644
--- a/rm.c
+++ b/rm.c
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <getopt.h>
 #include "busybox.h"