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.

diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index 40b8af427d2f3761226df63f03c2512c52e979cb..b85eb9981c5cab8ee50f2052a4482c7f13a0e17f 100644 (file)
--- 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 40b8af427d2f3761226df63f03c2512c52e979cb..b85eb9981c5cab8ee50f2052a4482c7f13a0e17f 100644 (file)
--- 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 f8e16625c9063fd90596168a6e99637fd8530168..51c9f4ceb5363f71919be999637198bc8a8b5771 100644 (file)
--- 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 12a57c837391ba387312641de3c0c19e72370671..61efa9c3e16ac7ab13fdbe3f8ec0125c727425e1 100644 (file)
--- 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 24bdf9002f99b702a02cd27d6caa0a3663e7e772..c79fbeb14912fb8461ab0b1958896239c47846b1 100644 (file)
--- 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 2e89fc17a11e7c531cad68a6dba6ab89fb879d86..cc50f5870d6ae4c81cc29616166e4d22e54426f5 100644 (file)
--- 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 ae2d24bf71894d479778cded3ed7643729f661bb..a95e57c3564e6bcf8cf63c16c8e7709562b57deb 100644 (file)
--- 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 2fb4cd1775affca886fdd7a84e495d0f92cb816e..36b75fb934a40015ca9b51cb049ba85dfa941357 100644 (file)
--- 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 23be40429333231f25e986035445ffd9c1935c13..3b84680c4d03647903bf83d24fd186ca5940ce5c 100644 (file)
--- 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 f183b26c3a4c5744bdee10166f2dda2e5d92bd44..426a14aa18999c7e79e157433829fbf32887a5b8 100644 (file)
--- 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 40b8af427d2f3761226df63f03c2512c52e979cb..b85eb9981c5cab8ee50f2052a4482c7f13a0e17f 100644 (file)
--- 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 f8e16625c9063fd90596168a6e99637fd8530168..51c9f4ceb5363f71919be999637198bc8a8b5771 100644 (file)
--- 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"