Todd's patch for exec.c

wainstead · Jul 14, 2012 · 64b24b1 · 64b24b1
1 parent edf4cc4
commit 64b24b1
Showing 1 changed file with 100 additions and 0 deletions.
diff --git a/patches/applied/0001-Cleaned-up-the-compilation-errors.patch b/patches/applied/0001-Cleaned-up-the-compilation-errors.patch
@@ -0,0 +1,100 @@
+From ae26223d3d999118c58074e5b2ef2c9f3bfdb1eb Mon Sep 17 00:00:00 2001
+From: Todd Sundsted <todd@sundsted.com>
+Date: Fri, 13 Jul 2012 20:00:41 -0400
+Subject: [PATCH] Cleaned up the compilation errors.
+
+---
+ exec.c |   24 +++++++++++++++---------
+ 1 files changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/exec.c b/exec.c
+index 8c14f38..1cacd7d 100644
+--- a/exec.c
++++ b/exec.c
+@@ -89,7 +89,7 @@ static task_waiting_on_exec *
+ malloc_task_waiting_on_exec()
+ {
+     task_waiting_on_exec *tw =
+-	mymalloc(sizeof(task_waiting_on_exec), M_TASK);
++	(task_waiting_on_exec *)mymalloc(sizeof(task_waiting_on_exec), M_TASK);
+     tw->cmd = NULL;
+     tw->args = NULL;
+     tw->in = NULL;
+@@ -169,7 +169,7 @@ write_all(int fd, const char *buffer, size_t length)
+ static void
+ stdout_readable(int fd, void *data)
+ {
+-    task_waiting_on_exec *tw = data;
++    task_waiting_on_exec *tw = (task_waiting_on_exec *)data;
+     char buffer[1000];
+     int n;
+     while ((n = read(fd, buffer, sizeof(buffer))) > 0) {
+@@ -180,7 +180,7 @@ stdout_readable(int fd, void *data)
+ static void
+ stderr_readable(int fd, void *data)
+ {
+-    task_waiting_on_exec *tw = data;
++    task_waiting_on_exec *tw = (task_waiting_on_exec *)data;
+     char buffer[1000];
+     int n;
+     while ((n = read(fd, buffer, sizeof(buffer))) > 0) {
+@@ -279,7 +279,7 @@ set_nonblocking(int fd)
+ static enum error
+ exec_waiter_suspender(vm the_vm, void *data)
+ {
+-    task_waiting_on_exec *tw = data;
++    task_waiting_on_exec *tw = (task_waiting_on_exec *)data;
+     enum error error = E_QUOTA;
+
+     BLOCK_SIGCHLD;
+@@ -346,6 +346,12 @@ bf_exec(Var arglist, Byte next, void *vdata, Objid progr)
+ {
+     package pack;
+
++    const char **args = 0;
++    task_waiting_on_exec *tw = 0;
++    const char *in = 0;
++    const char *cmd = 0;
++    int len;
++
+     /* The first argument must be a list of strings.  The first string
+      * is the command (required).  The rest are command line arguments
+      * to the command.
+@@ -365,7 +371,7 @@ bf_exec(Var arglist, Byte next, void *vdata, Objid progr)
+     }
+
+     /* check the path */
+-    const char *cmd = arglist.v.list[1].v.list[1].v.str;
++    cmd = arglist.v.list[1].v.list[1].v.str;
+     if (0 == strlen(cmd)) {
+ 	pack = make_raise_pack(E_INVARG, "Invalid path", var_ref(zero));
+ 	goto free_arglist;
+@@ -389,8 +395,8 @@ bf_exec(Var arglist, Byte next, void *vdata, Objid progr)
+     cmd = str_dup(reset_stream(s));
+
+     /* clean input */
+-    const char *in = NULL;
+-    int len = 0;
++    in = 0;
++    len = 0;
+     if (listlength(arglist) > 1) {
+ 	if ((in = binary_to_raw_bytes(arglist.v.list[2].v.str, &len)) == NULL) {
+ 	    pack = make_error_pack(E_INVARG);
+@@ -416,12 +422,12 @@ bf_exec(Var arglist, Byte next, void *vdata, Objid progr)
+ 	goto free_in;
+     }
+
+-    const char **args = mymalloc(sizeof(const char *) * i, M_ARRAY);
++    args = (const char **)mymalloc(sizeof(const char *) * i, M_ARRAY);
+     FOR_EACH(v, arglist.v.list[1], i, c)
+ 	args[i - 1] = str_dup(v.v.str);
+     args[i - 1] = NULL;
+
+-    task_waiting_on_exec *tw = malloc_task_waiting_on_exec();
++    tw = malloc_task_waiting_on_exec();
+     tw->cmd = cmd;
+     tw->args = args;
+     tw->in = in;
+-- 
+1.7.3.4
+