usage.c: remove reference to busybox.h
*: s/include "busybox.h"/include "libbb.h"
diff --git a/networking/arp.c b/networking/arp.c
index 7a36f44..6a7c862 100644
--- a/networking/arp.c
+++ b/networking/arp.c
@@ -13,7 +13,7 @@
* modified for getopt32 by Arne Bernin <arne [at] alamut.de>
*/
-#include "busybox.h"
+#include "libbb.h"
#include "inet_common.h"
#include <arpa/inet.h>
diff --git a/networking/arping.c b/networking/arping.c
index d71ac49..0371df3 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -16,7 +16,7 @@
#include <netinet/ether.h>
#include <netpacket/packet.h>
-#include "busybox.h"
+#include "libbb.h"
static struct in_addr src;
static struct in_addr dst;
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 8807bbe..32166e5 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -18,7 +18,7 @@
*/
#include <syslog.h>
-#include "busybox.h"
+#include "libbb.h"
//#define DEBUG 1
#define DEBUG 0
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index ed41590..9de0d48 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -70,7 +70,7 @@
#include <netinet/ether.h>
#include <linux/if.h>
-#include "busybox.h"
+#include "libbb.h"
/* Note: PF_INET, SOCK_DGRAM, IPPROTO_UDP would allow SIOCGIFHWADDR to
* work as non-root, but we need SOCK_PACKET to specify the Ethernet
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 9b0510d..54b5f5a 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -13,8 +13,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
#include <getopt.h>
+#include "libbb.h"
typedef struct ftp_host_info_s {
const char *user;
diff --git a/networking/hostname.c b/networking/hostname.c
index 3f6a658..50ef7b5 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -12,7 +12,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
+#include "libbb.h"
static void do_sethostname(char *s, int isfile)
{
diff --git a/networking/httpd.c b/networking/httpd.c
index d8ea483..f47e2c1 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -91,7 +91,7 @@
*
*/
-#include "busybox.h"
+#include "libbb.h"
/* amount of buffering in a pipe */
#ifndef PIPE_BUF
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 3dcc902..5742399 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -37,7 +37,7 @@
#include <netinet/if_ether.h>
#endif
#include "inet_common.h"
-#include "busybox.h"
+#include "libbb.h"
#if ENABLE_FEATURE_IFCONFIG_SLIP
# include <net/if_slip.h>
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5b22517..8e8341e 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -15,11 +15,12 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
-#include "busybox.h"
#include <sys/utsname.h>
#include <fnmatch.h>
#include <getopt.h>
+#include "libbb.h"
+
#define MAX_OPT_DEPTH 10
#define EUNBALBRACK 10001
#define EUNDEFVAR 10002
diff --git a/networking/inetd.c b/networking/inetd.c
index dc191a4..211a8dc 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -155,7 +155,7 @@
* setuid()
*/
-#include "busybox.h"
+#include "libbb.h"
#include <syslog.h>
#include <sys/un.h>
diff --git a/networking/interface.c b/networking/interface.c
index b1b935e..51e3d74 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -34,7 +34,7 @@
#include <net/if.h>
#include <net/if_arp.h>
#include "inet_common.h"
-#include "busybox.h"
+#include "libbb.h"
#if ENABLE_FEATURE_IPV6
# define HAVE_AFINET6 1
diff --git a/networking/ip.c b/networking/ip.c
index c7816c8..0105bd9 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -13,7 +13,7 @@
* Bernhard Fischer rewrote to use index_in_substr_array
*/
-#include "busybox.h"
+#include "libbb.h"
#include "libiproute/utils.h"
#include "libiproute/ip_common.h"
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 63ce99f..a39ad1a 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -12,12 +12,12 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
-#include <ctype.h>
#include <getopt.h>
#include <sys/socket.h>
#include <arpa/inet.h>
+#include "libbb.h"
+
#define CLASS_A_NETMASK ntohl(0xFF000000)
#define CLASS_B_NETMASK ntohl(0xFFFF0000)
#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
diff --git a/networking/isrv.c b/networking/isrv.c
index f0df222..a51618a 100644
--- a/networking/isrv.c
+++ b/networking/isrv.c
@@ -8,7 +8,7 @@
* Licensed under GPL version 2, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
+#include "libbb.h"
#include "isrv.h"
#define DEBUG 0
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index 59daf99..84cf6da 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -8,7 +8,7 @@
*/
#include <syslog.h>
-#include "busybox.h"
+#include "libbb.h"
#include "isrv.h"
enum { TIMEOUT = 20 };
diff --git a/networking/libiproute/ip_common.h b/networking/libiproute/ip_common.h
index 96df610..9710107 100644
--- a/networking/libiproute/ip_common.h
+++ b/networking/libiproute/ip_common.h
@@ -2,7 +2,7 @@
#ifndef _IP_COMMON_H
#define _IP_COMMON_H 1
-#include "busybox.h"
+#include "libbb.h"
#include <asm/types.h>
#include <linux/netlink.h>
#include <linux/rtnetlink.h>
diff --git a/networking/nameif.c b/networking/nameif.c
index ec77512..a65f308 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -9,7 +9,7 @@
* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
*/
-#include "busybox.h"
+#include "libbb.h"
#include <syslog.h>
#include <net/if.h>
#include <netinet/ether.h>
diff --git a/networking/nc.c b/networking/nc.c
index e89eb76..1fb38f8 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -7,7 +7,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
+#include "libbb.h"
#if ENABLE_DESKTOP
#include "nc_bloaty.c"
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c
index 57af7eb..3e333b7 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -48,7 +48,7 @@
* are closed, but nc doesn't exit - continues to listen/accept.
*/
-/* done in nc.c: #include "busybox.h" */
+/* done in nc.c: #include "libbb.h" */
enum {
SLEAZE_PORT = 31337, /* for UDP-scan RTT trick, change if ya want */
diff --git a/networking/netstat.c b/networking/netstat.c
index 5fb5c38..38091ae 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -11,7 +11,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include "busybox.h"
+#include "libbb.h"
#include "inet_common.h"
enum {
diff --git a/networking/nslookup.c b/networking/nslookup.c
index 424a0e4..608e654 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -12,7 +12,7 @@
*/
#include <resolv.h>
-#include "busybox.h"
+#include "libbb.h"
/*
* I'm only implementing non-interactive mode;
diff --git a/networking/ping.c b/networking/ping.c
index e413bec..2f33191 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -27,7 +27,7 @@
#include <net/if.h>
#include <netinet/ip_icmp.h>
-#include "busybox.h"
+#include "libbb.h"
#if ENABLE_PING6
#include <netinet/icmp6.h>
diff --git a/networking/route.c b/networking/route.c
index da59698..881332b 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -25,12 +25,13 @@
* remove ridiculous amounts of bloat.
*/
-#include "busybox.h"
-#include "inet_common.h"
#include <getopt.h>
#include <net/route.h>
#include <net/if.h>
+#include "libbb.h"
+#include "inet_common.h"
+
#ifndef RTF_UP
/* Keep this in sync with /usr/src/linux/include/linux/route.h */
diff --git a/networking/telnet.c b/networking/telnet.c
index 5c75a74..a594505 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -24,7 +24,7 @@
#include <termios.h>
#include <arpa/telnet.h>
#include <netinet/in.h>
-#include "busybox.h"
+#include "libbb.h"
#ifdef DOTRACE
#define TRACE(x, y) do { if (x) printf y; } while (0)
diff --git a/networking/telnetd.c b/networking/telnetd.c
index 4ab6f56..21b704a 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -24,7 +24,7 @@
/*#define DEBUG 1 */
#define DEBUG 0
-#include "busybox.h"
+#include "libbb.h"
#if DEBUG
#define TELCMDS
diff --git a/networking/tftp.c b/networking/tftp.c
index 3fb76ec..e1e278a 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -19,7 +19,7 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
* ------------------------------------------------------------------------- */
-#include "busybox.h"
+#include "libbb.h"
#if ENABLE_FEATURE_TFTP_GET || ENABLE_FEATURE_TFTP_PUT
diff --git a/networking/traceroute.c b/networking/traceroute.c
index b4cca25..ce8dc83 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -215,7 +215,7 @@
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
-#include "busybox.h"
+#include "libbb.h"
#include "inet_common.h"
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index 6c0db5b..006d580 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -10,7 +10,7 @@
#ifndef _COMMON_H
#define _COMMON_H
-#include "busybox.h"
+#include "libbb.h"
#define DEFAULT_SCRIPT "/usr/share/udhcpc/default.script"
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 06c06cb..e063d0a 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -9,7 +9,7 @@
/* BB_AUDIT SUSv3 N/A */
-#include "busybox.h"
+#include "libbb.h"
#include <net/if.h>
/* Stuff from linux/if_vlan.h, kernel version 2.4.23 */
diff --git a/networking/wget.c b/networking/wget.c
index 026722a..2c060d7 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -10,8 +10,8 @@
/* http://www.unix.org/version2/whatsnew/lfs20mar.html */
#define _LARGEFILE64_SOURCE 1
-#include "busybox.h"
#include <getopt.h> /* for struct option */
+#include "libbb.h"
struct host_info {
// May be used if we ever will want to free() all xstrdup()s...
diff --git a/networking/zcip.c b/networking/zcip.c
index 195ae50..3b67a03 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -23,7 +23,7 @@
// - avoid silent script failures, especially under load...
// - link status monitoring (restart on link-up; stop on link-down)
-#include "busybox.h"
+#include "libbb.h"
#include <syslog.h>
#include <poll.h>
#include <sys/wait.h>