udhcpc: fix my breakage

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

diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c
index 6e0ca885f142bdd1abcbb8ad77a1a25c737472d4..07f68362c3ecd2a17e884f822c34f8d16d9cbf0e 100644 (file)
--- a/networking/udhcp/script.c
+++ b/networking/udhcp/script.c
@@ -54,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;
@@ -150,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);
@@ -203,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);