Merge from R9_0-AMD64, most notably:

- AMD64 support to insmod-busybox, minilibc, et al.
- Sync with insmod-modutils 2.4.19 something but everyone should use
  dietlibc nowadays
- Factor out compilation and prefix with $(DIET) for dietlibc builds
- 64-bit & varargs fixes

1 files changed, 7 insertions, 5 deletions

diff --git a/mdk-stage1/dietlibc/libugly/setenv.c b/mdk-stage1/dietlibc/libugly/setenv.c
index bf47cdb79..c65910471 100644
--- a/mdk-stage1/dietlibc/libugly/setenv.c
+++ b/mdk-stage1/dietlibc/libugly/setenv.c
@@ -5,13 +5,15 @@
 link_warning("setenv","setenv calls malloc.  Avoid it in small programs.");
 
 int setenv(const char *name, const char *value, int overwrite) {
-  char *c=malloc(strlen(name)+strlen(value)+3);
   if (getenv(name)) {
     if (!overwrite) return 0;
     unsetenv(name);
   }
-  strcpy(c,name);
-  strcat(c,"=");
-  strcat(c,value);
-  return putenv(c);
+  {
+    char *c=malloc(strlen(name)+strlen(value)+3);
+    strcpy(c,name);
+    strcat(c,"=");
+    strcat(c,value);
+    return putenv(c);
+  }
 }