Mercurial > mxe-octave
view src/units-1-fixes.patch @ 3453:70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
* binary-dist-rules.mk: copy installer-files/README.html to dist folder.
* installer-files/README.html: New file.
* makeinst-script.sh: Added custom page for Install for all users and Create shortcuts. Reassigned show readme checkbox for showing README.html at end of install. Run octave-gui as the Run program.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Sat, 25 Jan 2014 19:24:09 -0500 |
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