summaryrefslogtreecommitdiffstats
path: root/winsup
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2000-07-17 15:59:27 +0000
committerCorinna Vinschen <corinna@vinschen.de>2000-07-17 15:59:27 +0000
commitb0d5cd02dc25d24e7f45d393929ae79cc9808862 (patch)
treea49418208d2f90892768667541d98d702b243ab5 /winsup
parentc609f9dcec38474b392b672cfbb1291dbc1a60e1 (diff)
downloadcygnal-b0d5cd02dc25d24e7f45d393929ae79cc9808862.tar.gz
cygnal-b0d5cd02dc25d24e7f45d393929ae79cc9808862.tar.bz2
cygnal-b0d5cd02dc25d24e7f45d393929ae79cc9808862.zip
* environ.cc (setenv): Use __cygwin_environ instead of
environ after reallocating environment space.
Diffstat (limited to 'winsup')
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/environ.cc4
2 files changed, 7 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 976a685e5..56c48a884 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 17 17:56:00 2000 Corinna Vinschen <corinna@vinschen.de>
+
+ * environ.cc (setenv): Use __cygwin_environ instead of
+ environ after reallocating environment space.
+
Sun Jul 16 20:23:21 2000 Christopher Faylor <cgf@cygnus.com>
* _cygwin_crt0_common.cc: Undef 'environ' or suffer compiler error.
diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc
index 4aa5ad75b..b53600724 100644
--- a/winsup/cygwin/environ.cc
+++ b/winsup/cygwin/environ.cc
@@ -228,9 +228,9 @@ setenv (const char *name, const char *value, int rewrite)
;
__cygwin_environ = (char **) realloc ((char *) environ,
(size_t) (sizeof (char *) * (cnt + 2)));
- if (!environ)
+ if (!__cygwin_environ)
return -1;
- environ[cnt + 1] = NULL;
+ __cygwin_environ[cnt + 1] = NULL;
update_envptrs ();
offset = cnt;
}