- remove last reminiscents of IN_BUSYBOX

diff --git a/networking/udhcp/Makefile.in b/networking/udhcp/Makefile.in
index 77c4b720a9080bddebd217b0f1a853d38a3a22bd..cbc6f2b39a680762284ea0d7d7be582fe122bf4b 100644 (file)
--- a/networking/udhcp/Makefile.in
+++ b/networking/udhcp/Makefile.in
@@ -43,11 +43,11 @@ APPLET_SRC-a+=$(UDHCP-a)
 
 UDHCP_INCLUDES:=$(srcdir)
 
-APPLETS_DEFINE-y+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES)
-APPLETS_DEFINE-a+=-DIN_BUSYBOX -I$(UDHCP_INCLUDES)
+APPLETS_DEFINE-y+= -I$(UDHCP_INCLUDES)
+APPLETS_DEFINE-a+= -I$(UDHCP_INCLUDES)
 
 $(UDHCP_DIR)$(UDHCP_AR): $(UDHCP_OBJS)
        $(do_ar)
 
 $(UDHCP_OBJS): $(UDHCP_DIR)%.o : $(srcdir)/%.c
-       $(compile.c) -DIN_BUSYBOX
+       $(compile.c)

diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 97dfcc18507c9c6e7a65f1aeee7062a9236c853b..6e254f604b4fff3b27c28f4aeb85db92e0819bc7 100644 (file)
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -44,11 +44,7 @@ int arpping(uint32_t yiaddr, uint32_t ip, uint8_t *mac, char *interface)
 
 
        if ((s = socket (PF_PACKET, SOCK_PACKET, htons(ETH_P_ARP))) == -1) {
-#ifdef IN_BUSYBOX
                LOG(LOG_ERR, bb_msg_can_not_create_raw_socket);
-#else
-               LOG(LOG_ERR, "Could not open raw socket");
-#endif
                return -1;
        }
 

diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index 08a22f17d2fa7ac668065eee5fbdef6d20f21f46..60e6b7edf969f0d0b83124dcda4fb407df37bef0 100644 (file)
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -23,27 +23,7 @@
 #define REMAINING 0
 #define ABSOLUTE 1
 
-
-#ifndef IN_BUSYBOX
-static void ATTRIBUTE_NORETURN show_usage(void)
-{
-       printf(
-"Usage: dumpleases -f <file> -[r|a]\n\n"
-"  -f, --file=FILENAME             Leases file to load\n"
-"  -r, --remaining                 Interepret lease times as time remaining\n"
-"  -a, --absolute                  Interepret lease times as expire time\n");
-       exit(0);
-}
-#else
-#define show_usage bb_show_usage
-#endif
-
-
-#ifdef IN_BUSYBOX
 int dumpleases_main(int argc, char *argv[])
-#else
-int main(int argc, char *argv[])
-#endif
 {
        FILE *fp;
        int i, c, mode = REMAINING;
@@ -71,7 +51,7 @@ int main(int argc, char *argv[])
                        file = optarg;
                        break;
                default:
-                       show_usage();
+                       bb_show_usage();
                }
        }