aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1999-08-19 20:05:08 +0000
committerUlrich Drepper <drepper@redhat.com>1999-08-19 20:05:08 +0000
commit7195db12adc439aa7e4b1f494b144031dd50e30a (patch)
treeff46404749aca5fc8f1b78bc17a4b1a94521526d
parent70aea399c8b3661f238b947c3f151866d3260c24 (diff)
downloadglibc-7195db12adc439aa7e4b1f494b144031dd50e30a.tar
glibc-7195db12adc439aa7e4b1f494b144031dd50e30a.tar.gz
glibc-7195db12adc439aa7e4b1f494b144031dd50e30a.tar.bz2
glibc-7195db12adc439aa7e4b1f494b144031dd50e30a.zip
Update.
1999-08-19 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/setenv.c: Update(__add_to_environ): Initialize ep after we have the lock. * sysdeps/unix/sysv/linux/alpha/sigcontextinfo.h: New file. Patch by Richard Henderson.
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/generic/setenv.c6
-rw-r--r--sysdeps/unix/sysv/linux/alpha/sigcontextinfo.h22
3 files changed, 35 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 003eef6036..2efec730a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-08-19 Ulrich Drepper <drepper@cygnus.com>
+
+ * sysdeps/generic/setenv.c: Update(__add_to_environ): Initialize
+ ep after we have the lock.
+
+ * sysdeps/unix/sysv/linux/alpha/sigcontextinfo.h: New file.
+ Patch by Richard Henderson.
+
1999-08-19 Andreas Schwab <schwab@suse.de>
* libio/iovswscanf.c (vswscanf): Make stream unoriented initially
diff --git a/sysdeps/generic/setenv.c b/sysdeps/generic/setenv.c
index 387152dcad..29fc60c3fb 100644
--- a/sysdeps/generic/setenv.c
+++ b/sysdeps/generic/setenv.c
@@ -113,13 +113,17 @@ __add_to_environ (name, value, combined, replace)
const char *combined;
int replace;
{
- register char **ep = __environ;
+ register char **ep;
register size_t size;
const size_t namelen = strlen (name);
const size_t vallen = value != NULL ? strlen (value) + 1 : 0;
LOCK;
+ /* We have to get the pointer now that we have the lock and not earlier
+ since another thread might have created a new environment. */
+ ep = __environ;
+
size = 0;
if (ep != NULL)
{
diff --git a/sysdeps/unix/sysv/linux/alpha/sigcontextinfo.h b/sysdeps/unix/sysv/linux/alpha/sigcontextinfo.h
new file mode 100644
index 0000000000..3125e9ba9b
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/alpha/sigcontextinfo.h
@@ -0,0 +1,22 @@
+/* Copyright (C) 1999 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#define SIGCONTEXT struct sigcontext
+#define GET_PC(ctx) ((void *) (ctx).sc_pc)
+#define GET_FRAME(ctx) ((void *) (ctx).sc_regs[15])
+#define GET_STACK(ctx) ((void *) (ctx).sc_regs[30])