Mercurial > mxe-octave
view src/units-1-fixes.patch @ 4192:438a4bfdc887
new rules for creating a tarball from Octave's hg sources
* hg-octave-dist.mk: New file.
* Makefile.in: Include hg-octave-dist.mk.
(ENV_PATH, ENV_PKG_CONFIG_PATH, ENV_LD_LIBRARY_PATH):
Capture values from environment.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 29 Aug 2016 11:21:19 -0400 |
parents | e7cb2340feff |
children |
line wrap: on
line source
--- a/units.c.orig 2013-10-21 11:47:34 -0400 +++ b/units.c 2013-10-21 12:18:24 -0400 @@ -1166,23 +1166,23 @@ int setenv(const char *name, const char *val, int overwrite) { - char *environ; + char *environ1; if (!overwrite && getenv(name) != NULL) return 0; - environ = (char *) malloc(strlen(name) + strlen(val) + 2); - if (!environ) + environ1 = (char *) malloc(strlen(name) + strlen(val) + 2); + if (!environ1) return 1; - strcpy(environ, name); - strcat(environ, "="); - strcat(environ, val); + strcpy(environ1, name); + strcat(environ1, "="); + strcat(environ1, val); /* putenv() doesn't copy its argument, so don't free environ */ #if defined _WIN32 && defined _MSC_VER - return _putenv(environ); + return _putenv(environ1); #else - return putenv(environ); + return putenv(environ1); #endif } #endif