sync busybox and udhcp trees

diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 0c85eca830c0e944bc2bed4ea33389bda985dbb5..fe2225a0c8dfb6934ce33544b881c65e1c260345 100644 (file)
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -469,6 +469,7 @@ int main(int argc, char *argv[])
                                        (unsigned long) packet.xid, xid);
                                continue;
                        }
+
                        /* Ignore packets that aren't for us */
                        if (memcmp(packet.chaddr, client_config.arp, 6)) {
                                DEBUG(LOG_INFO, "packet does not have our chaddr -- ignoring");

diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index 80c3fc2f8e71cd8e2d67df7fecd5bfff2fc1db4d..7c93f42326fa0d4d1c3a7a87b0480b2c64f9c8f3 100644 (file)
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -2,9 +2,8 @@
 #ifndef _DHCPC_H
 #define _DHCPC_H
 
-#ifndef DEFAULT_SCRIPT
-#define DEFAULT_SCRIPT  "/usr/share/udhcpc/default.script"
-#endif
+/* grab define DEFAULT_SCRIPT */
+#include "libbb_udhcp.h"
 
 #define INIT_SELECTING 0
 #define REQUESTING     1

diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index ca5c6059e4aa85cba000af680635e07e423cd1d0..c0c58ee357171dc18d70d39cb6d58554cbac5a35 100644 (file)
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
-   Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 #include <fcntl.h>
 #include <string.h>

diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index 416b1feb0e624bd9f3159d3f414e4e67cb80df84..fe853c7cc79140997f3da5c53216787f66f03b9f 100644 (file)
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -139,6 +139,7 @@ static void attach_option(struct option_set **opt_list, struct dhcp_option *opti
        }
 }
 
+
 /* read a dhcp option and add it to opt_list */
 static int read_opt(const char *const_line, void *arg)
 {

diff --git a/networking/udhcp/libbb_udhcp.h b/networking/udhcp/libbb_udhcp.h
index 30e167f64b666b7b6036a9b26b71940f15473e8a..dd58f1bd64cba653b79e3cd4326b3c5375c689f5 100644 (file)
--- a/networking/udhcp/libbb_udhcp.h
+++ b/networking/udhcp/libbb_udhcp.h
@@ -3,14 +3,15 @@
 /* bit of a hack, do this no matter what the order of the includes.
  * (for busybox) */
 
-#ifdef CONFIG_INSTALL_NO_USR
-#undef DEFAULT_SCRIPT
-#define DEFAULT_SCRIPT  "/share/udhcpc/default.script"
-#endif
-
 #ifndef _LIBBB_UDHCP_H
 #define _LIBBB_UDHCP_H
 
+#ifdef CONFIG_INSTALL_NO_USR
+# define DEFAULT_SCRIPT  "/share/udhcpc/default.script"
+#else
+# define DEFAULT_SCRIPT  "/usr/share/udhcpc/default.script"
+#endif
+
 #ifdef IN_BUSYBOX
 #include "busybox.h"
 
@@ -56,12 +57,20 @@
 /* from dhcpd.h */
 #define server_config          udhcp_server_config
 
-#else /* ! BB_VER */
+#else /* ! IN_BUSYBOX */
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/sysinfo.h>
 
+#ifndef ATTRIBUTE_NORETURN
+#define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#endif /* ATTRIBUTE_NORETURN */
+
+#ifndef ATTRIBUTE_PACKED
+#define ATTRIBUTE_PACKED __attribute__ ((__packed__))
+#endif /* ATTRIBUTE_PACKED */
+
 #define TRUE                   1
 #define FALSE                  0
 
@@ -78,6 +87,6 @@ static inline FILE *xfopen(const char *file, const char *mode)
        return fp;
 }
 
-#endif /* BB_VER */
+#endif /* IN_BUSYBOX */
 
 #endif /* _LIBBB_UDHCP_H */

diff --git a/networking/udhcp/options.c b/networking/udhcp/options.c
index eebcaaa58fe6167ae669bbcefd23b562a58e5abf..d394b4c39cc5ab9d725f819ac399f9b6aa201488 100644 (file)
--- a/networking/udhcp/options.c
+++ b/networking/udhcp/options.c
@@ -170,4 +170,3 @@ int add_simple_option(uint8_t *optionptr, uint8_t code, uint32_t data)
        DEBUG(LOG_ERR, "Could not add option 0x%02x", code);
        return 0;
 }
-

diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index fe74b828f30c5d635830599642f84b99aa60da0d..32fb8a70f8a457ddd93430f426185a0d34fd8a37 100644 (file)
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -50,7 +50,6 @@ int get_packet(struct dhcpMessage *packet, int fd)
                "MSFT 98",
                ""
        };
-
        int bytes;
        int i;
        char unsigned *vendor;
@@ -79,7 +78,6 @@ int get_packet(struct dhcpMessage *packet, int fd)
                }
        }
 
-
        return bytes;
 }