Mercurial > mxe-octave

annotate src/units-1-fixes.patch @ 3338:1e9695b83a80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imported patch msvc-gl2ps-doc
author Michael Goffioul <michael.goffioul@gmail.com>
date Fri, 29 Nov 2013 18:46:47 -0500
parents e7cb2340feff
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3274
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 --- a/units.c.orig 2013-10-21 11:47:34 -0400
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 +++ b/units.c 2013-10-21 12:18:24 -0400
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 @@ -1166,23 +1166,23 @@
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 int
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 setenv(const char *name, const char *val, int overwrite)
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6 {
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 - char *environ;
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 + char *environ1;
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 if (!overwrite && getenv(name) != NULL)
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 return 0;
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 - environ = (char *) malloc(strlen(name) + strlen(val) + 2);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 - if (!environ)
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 + environ1 = (char *) malloc(strlen(name) + strlen(val) + 2);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 + if (!environ1)
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 return 1;
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 - strcpy(environ, name);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 - strcat(environ, "=");
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 - strcat(environ, val);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 + strcpy(environ1, name);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 + strcat(environ1, "=");
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 + strcat(environ1, val);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 /* putenv() doesn't copy its argument, so don't free environ */
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 #if defined _WIN32 && defined _MSC_VER
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 - return _putenv(environ);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 + return _putenv(environ1);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 #else
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30 - return putenv(environ);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 + return putenv(environ1);
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 #endif
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 }
e7cb2340feff Add gnu units
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 #endif