udhcpc: fix my breakage

[oweals/busybox.git] / networking / udhcp / script.c

diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c
index 3c4b51b246c22dca28c0b2034f6335bdcd3c7104..07f68362c3ecd2a17e884f822c34f8d16d9cbf0e 100644 (file)
--- a/networking/udhcp/script.c
+++ b/networking/udhcp/script.c
@@ -8,20 +8,11 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <string.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
 #include "common.h"
-#include "options.h"
 #include "dhcpd.h"
 #include "dhcpc.h"
+#include "options.h"
+
 
 /* get a rough idea of how long an option will be (rounding up...) */
 static const int max_option_length[] = {
@@ -63,7 +54,8 @@ static int mton(struct in_addr *mask)
 
 
 /* Fill dest with the text of option 'option'. */
-static void fill_options(char *dest, uint8_t *option, struct dhcp_option *type_p)
+static void fill_options(char *dest, uint8_t *option,
+                       const struct dhcp_option *type_p)
 {
        int type, optlen;
        uint16_t val_u16;
@@ -76,7 +68,7 @@ static void fill_options(char *dest, uint8_t *option, struct dhcp_option *type_p
 
        type = type_p->flags & TYPE_MASK;
        optlen = option_lengths[type];
-       for(;;) {
+       for (;;) {
                switch (type) {
                case OPTION_IP_PAIR:
                        dest += sprintip(dest, "", option);
@@ -159,9 +151,9 @@ static char **fill_envp(struct dhcpMessage *packet)
        envp[j] = xmalloc(sizeof("ip=255.255.255.255"));
        sprintip(envp[j++], "ip=", (uint8_t *) &packet->yiaddr);
 
-
        for (i = 0; dhcp_options[i].code; i++) {
-               if (!(temp = get_option(packet, dhcp_options[i].code)))
+               temp = get_option(packet, dhcp_options[i].code);
+               if (!temp)
                        continue;
                envp[j] = xmalloc(upper_length(temp[OPT_LEN - 2],
                        dhcp_options[i].flags & TYPE_MASK) + strlen(dhcp_options[i].name) + 2);
@@ -212,7 +204,6 @@ void udhcp_run_script(struct dhcpMessage *packet, const char *name)
                return;
        } else if (pid == 0) {
                /* close fd's? */
-
                /* exec script */
                execle(client_config.script, client_config.script,
                       name, NULL, envp);