Various cleanups I made while going through Erik Hovland's patch submissions,

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

diff --git a/networking/udhcp/script.c b/networking/udhcp/script.c
index b7d78624c1a43b898a3ac912bae49bc61572b951..d1b272de6b9f9538cd6d6b6b811b728c2de8ec7c 100644 (file)
--- a/networking/udhcp/script.c
+++ b/networking/udhcp/script.c
@@ -1,22 +1,10 @@
 /* script.c
  *
- * Functions to call the DHCP client notification scripts 
+ * Functions to call the DHCP client notification scripts
  *
  * Russ Dill <Russ.Dill@asu.edu> July 2001
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 #include <string.h>
@@ -29,10 +17,10 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#include "common.h"
 #include "options.h"
 #include "dhcpd.h"
 #include "dhcpc.h"
-#include "common.h"
 
 /* get a rough idea of how long an option will be (rounding up...) */
 static const int max_option_length[] = {
@@ -96,7 +84,7 @@ static void fill_options(char *dest, uint8_t *option, struct dhcp_option *type_p
                        optlen = 4;
                case OPTION_IP: /* Works regardless of host byte order. */
                        dest += sprintip(dest, "", option);
-                       break;
+                       break;
                case OPTION_BOOLEAN:
                        dest += sprintf(dest, *option ? "yes" : "no");
                        break;
@@ -132,7 +120,7 @@ static void fill_options(char *dest, uint8_t *option, struct dhcp_option *type_p
 }
 
 
-/* put all the paramaters into an environment */
+/* put all the parameters into an environment */
 static char **fill_envp(struct dhcpMessage *packet)
 {
        int num_options = 0;
@@ -157,13 +145,13 @@ static char **fill_envp(struct dhcpMessage *packet)
                if (!(over & FILE_FIELD) && packet->file[0]) num_options++;
                if (!(over & SNAME_FIELD) && packet->sname[0]) num_options++;
        }
-       
-       envp = xcalloc(sizeof(char *), num_options + 5);
+
+       envp = xzalloc(sizeof(char *) * (num_options + 5));
        j = 0;
-       asprintf(&envp[j++], "interface=%s", client_config.interface);
-       asprintf(&envp[j++], "%s=%s", "PATH",
+       envp[j++] = bb_xasprintf("interface=%s", client_config.interface);
+       envp[j++] = bb_xasprintf("PATH=%s",
                getenv("PATH") ? : "/bin:/usr/bin:/sbin:/usr/sbin");
-       asprintf(&envp[j++], "%s=%s", "HOME", getenv("HOME") ? : "/");
+       envp[j++] = bb_xasprintf("HOME=%s", getenv("HOME") ? : "/");
 
        if (packet == NULL) return envp;
 
@@ -181,7 +169,7 @@ static char **fill_envp(struct dhcpMessage *packet)
                /* Fill in a subnet bits option for things like /24 */
                if (dhcp_options[i].code == DHCP_SUBNET) {
                        memcpy(&subnet, temp, 4);
-                       asprintf(&envp[j++], "mask=%d", mton(&subnet));
+                       envp[j++] = bb_xasprintf("mask=%d", mton(&subnet));
                }
        }
        if (packet->siaddr) {
@@ -191,42 +179,43 @@ static char **fill_envp(struct dhcpMessage *packet)
        if (!(over & FILE_FIELD) && packet->file[0]) {
                /* watch out for invalid packets */
                packet->file[sizeof(packet->file) - 1] = '\0';
-               asprintf(&envp[j++], "boot_file=%s", packet->file);
+               envp[j++] = bb_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';
-               asprintf(&envp[j++], "sname=%s", packet->sname);
+               envp[j++] = bb_xasprintf("sname=%s", packet->sname);
        }
        return envp;
 }
 
 
 /* Call a script with a par file and env vars */
-void run_script(struct dhcpMessage *packet, const char *name)
+void udhcp_run_script(struct dhcpMessage *packet, const char *name)
 {
        int pid;
-       char **envp;
+       char **envp, **curr;
 
        if (client_config.script == NULL)
                return;
 
        DEBUG(LOG_INFO, "vforking and execle'ing %s", client_config.script);
 
+       envp = fill_envp(packet);
        /* call script */
        pid = vfork();
        if (pid) {
                waitpid(pid, NULL, 0);
+               for (curr = envp; *curr; curr++) free(*curr);
+               free(envp);
                return;
        } else if (pid == 0) {
-               envp = fill_envp(packet);
-               
                /* 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);
-       }                       
+       }
 }