Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/udhcp/script.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/udhcp/script.c (modified) (10 diffs)

branches/2.2.5/mindi-busybox/networking/udhcp/script.c

@@ +1 @@
+/* vi: set sw=4 ts=4: */
 /* script.c
  *
@@ -8 +9 @@
  */
 
-#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 "dhcpc.h"
 #include "options.h"
-#include "dhcpd.h"
-#include "dhcpc.h"
+
 
 /* get a rough idea of how long an option will be (rounding up...) */
-static const int max_option_length[] = {
+static const uint8_t max_option_length[] = {
     [OPTION_IP] =       sizeof("255.255.255.255 "),
     [OPTION_IP_PAIR] =  sizeof("255.255.255.255 ") * 2,
     [OPTION_STRING] =   1,
+#if ENABLE_FEATURE_RFC3397
+    [OPTION_STR1035] =  1,
+#endif
     [OPTION_BOOLEAN] =  sizeof("yes "),
     [OPTION_U8] =       sizeof("255 "),
@@ -44 +38 @@
 
 
-static int sprintip(char *dest, char *pre, uint8_t *ip)
+static int sprintip(char *dest, const char *pre, const uint8_t *ip)
 {
     return sprintf(dest, "%s%d.%d.%d.%d", pre, ip[0], ip[1], ip[2], ip[3]);
@@ -62 +56 @@
 
 
-/* Fill dest with the text of option 'option'. */
-static void fill_options(char *dest, uint8_t *option, struct dhcp_option *type_p)
-{
-    int type, optlen;
+/* Allocate and fill with the text of option 'option'. */
+static char *alloc_fill_opts(uint8_t *option, const struct dhcp_option *type_p)
+{
+    int len, type, optlen;
     uint16_t val_u16;
     int16_t val_s16;
     uint32_t val_u32;
     int32_t val_s32;
-    int len = option[OPT_LEN - 2];
-
-    dest += sprintf(dest, "%s=", type_p->name);
-
+    char *dest, *ret;
+
+    len = option[OPT_LEN - 2];
     type = type_p->flags & TYPE_MASK;
     optlen = option_lengths[type];
-    for(;;) {
+
+    dest = ret = xmalloc(upper_length(len, type) + strlen(type_p->name) + 2);
+    dest += sprintf(ret, "%s=", type_p->name);
+
+    for (;;) {
         switch (type) {
         case OPTION_IP_PAIR:
             dest += sprintip(dest, "", option);
-            *(dest++) = '/';
+            *dest++ = '/';
             option += 4;
             optlen = 4;
@@ -111 +108 @@
             memcpy(dest, option, len);
             dest[len] = '\0';
-            return;  /* Short circuit this case */
+            return ret;  /* Short circuit this case */
+#if ENABLE_FEATURE_RFC3397
+        case OPTION_STR1035:
+            /* unpack option into dest; use ret for prefix (i.e., "optname=") */
+            dest = dname_dec(option, len, ret);
+            free(ret);
+            return dest;
+#endif
         }
         option += optlen;
@@ -118 +122 @@
         dest += sprintf(dest, " ");
     }
+    return ret;
 }
 
@@ -127 +132 @@
     int i, j;
     char **envp;
+    char *var;
     uint8_t *temp;
     struct in_addr subnet;
     char over = 0;
 
-    if (packet == NULL)
-        num_options = 0;
-    else {
-        for (i = 0; dhcp_options[i].code; i++)
+    if (packet) {
+        for (i = 0; dhcp_options[i].code; i++) {
             if (get_option(packet, dhcp_options[i].code)) {
                 num_options++;
@@ -140 +144 @@
                     num_options++; /* for mton */
             }
-        if (packet->siaddr) num_options++;
-        if ((temp = get_option(packet, DHCP_OPTION_OVER)))
+        }
+        if (packet->siaddr)
+            num_options++;
+        temp = get_option(packet, DHCP_OPTION_OVER);
+        if (temp)
             over = *temp;
-        if (!(over & FILE_FIELD) && packet->file[0]) num_options++;
-        if (!(over & SNAME_FIELD) && packet->sname[0]) num_options++;
+        if (!(over & FILE_FIELD) && packet->file[0])
+            num_options++;
+        if (!(over & SNAME_FIELD) && packet->sname[0])
+            num_options++;
     }
 
     envp = xzalloc(sizeof(char *) * (num_options + 5));
     j = 0;
-    envp[j++] = bb_xasprintf("interface=%s", client_config.interface);
-    envp[j++] = bb_xasprintf("PATH=%s",
-        getenv("PATH") ? : "/bin:/usr/bin:/sbin:/usr/sbin");
-    envp[j++] = bb_xasprintf("HOME=%s", getenv("HOME") ? : "/");
-
-    if (packet == NULL) return envp;
+    envp[j++] = xasprintf("interface=%s", client_config.interface);
+    var = getenv("PATH");
+    if (var)
+        envp[j++] = xasprintf("PATH=%s", var);
+    var = getenv("HOME");
+    if (var)
+        envp[j++] = xasprintf("HOME=%s", var);
+
+    if (packet == NULL)
+        return envp;
 
     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);
-        fill_options(envp[j++], temp, &dhcp_options[i]);
+        envp[j++] = alloc_fill_opts(temp, &dhcp_options[i]);
 
         /* Fill in a subnet bits option for things like /24 */
         if (dhcp_options[i].code == DHCP_SUBNET) {
             memcpy(&subnet, temp, 4);
-            envp[j++] = bb_xasprintf("mask=%d", mton(&subnet));
+            envp[j++] = xasprintf("mask=%d", mton(&subnet));
         }
     }
@@ -180 +191 @@
         /* watch out for invalid packets */
         packet->file[sizeof(packet->file) - 1] = '\0';
-        envp[j++] = bb_xasprintf("boot_file=%s", packet->file);
+        envp[j++] = xasprintf("boot_file=%s", packet->file);
     }
     if (!(over & SNAME_FIELD) && packet->sname[0]) {
         /* watch out for invalid packets */
         packet->sname[sizeof(packet->sname) - 1] = '\0';
-        envp[j++] = bb_xasprintf("sname=%s", packet->sname);
+        envp[j++] = xasprintf("sname=%s", packet->sname);
     }
     return envp;
@@ -200 +211 @@
         return;
 
-    DEBUG(LOG_INFO, "vforking and execle'ing %s", client_config.script);
+    DEBUG("vfork'ing and execle'ing %s", client_config.script);
 
     envp = fill_envp(packet);
+
     /* call script */
+// can we use wait4pid(spawn(...)) here?
     pid = vfork();
-    if (pid) {
-        waitpid(pid, NULL, 0);
-        for (curr = envp; *curr; curr++) free(*curr);
-        free(envp);
-        return;
-    } else if (pid == 0) {
+    if (pid < 0) return;
+    if (pid == 0) {
         /* close fd's? */
-
         /* exec script */
         execle(client_config.script, client_config.script,
                name, NULL, envp);
-        LOG(LOG_ERR, "script %s failed: %m", client_config.script);
-        exit(1);
-    }
-}
+        bb_perror_msg_and_die("script %s failed", client_config.script);
+    }
+    waitpid(pid, NULL, 0);
+    for (curr = envp; *curr; curr++)
+        free(*curr);
+    free(envp);
+}