3274
|
1 --- a/units.c.orig 2013-10-21 11:47:34 -0400 |
|
2 +++ b/units.c 2013-10-21 12:18:24 -0400 |
|
3 @@ -1166,23 +1166,23 @@ |
|
4 int |
|
5 setenv(const char *name, const char *val, int overwrite) |
|
6 { |
|
7 - char *environ; |
|
8 + char *environ1; |
|
9 |
|
10 if (!overwrite && getenv(name) != NULL) |
|
11 return 0; |
|
12 - environ = (char *) malloc(strlen(name) + strlen(val) + 2); |
|
13 - if (!environ) |
|
14 + environ1 = (char *) malloc(strlen(name) + strlen(val) + 2); |
|
15 + if (!environ1) |
|
16 return 1; |
|
17 - strcpy(environ, name); |
|
18 - strcat(environ, "="); |
|
19 - strcat(environ, val); |
|
20 + strcpy(environ1, name); |
|
21 + strcat(environ1, "="); |
|
22 + strcat(environ1, val); |
|
23 |
|
24 /* putenv() doesn't copy its argument, so don't free environ */ |
|
25 |
|
26 #if defined _WIN32 && defined _MSC_VER |
|
27 - return _putenv(environ); |
|
28 + return _putenv(environ1); |
|
29 #else |
|
30 - return putenv(environ); |
|
31 + return putenv(environ1); |
|
32 #endif |
|
33 } |
|
34 #endif |