This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, ibm/2.12/master, updated. glibc-2.12.1-41-gd320728
- From: rsa at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 May 2011 16:12:45 -0000
- Subject: GNU C Library master sources branch, ibm/2.12/master, updated. glibc-2.12.1-41-gd320728
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, ibm/2.12/master has been updated
via d3207287b36184f3d0fe531bb2dba1a9fb67e3c3 (commit)
from a789ac929256779b79a40a654fe80cdea384897d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d3207287b36184f3d0fe531bb2dba1a9fb67e3c3
commit d3207287b36184f3d0fe531bb2dba1a9fb67e3c3
Author: Ryan S. Arnold <rsa@us.ibm.com>
Date: Wed May 25 11:11:25 2011 -0500
Correct "//" in search paths due to LD_AT_PLATFORM=""
diff --git a/ChangeLog b/ChangeLog
index 37438bb..f172c0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-25 Ryan S. Arnold <rsa@us.ibm.com>
+
+ * sysdeps/unix/sysv/linux/powerpc/dl-librecon.h
+ (EXTRA_LD_ENVVARS_11): Fix condition where there's an extra slash in
+ the search path, i.e., "//" when LD_AT_PLATFORM= or
+ LD_AT_PLATFORM="".
+ (EXTRA_UNSECURE_ENVVARS): Add LD_AT_PLATFORM to the list.
+
2011-02-11 Jakub Jelinek <jakub@redhat.com>
* stdio-common/printf-parsemb.c (__parse_one_specmb): Handle
diff --git a/sysdeps/unix/sysv/linux/powerpc/dl-librecon.h b/sysdeps/unix/sysv/linux/powerpc/dl-librecon.h
index 19dafac..19c3da7 100644
--- a/sysdeps/unix/sysv/linux/powerpc/dl-librecon.h
+++ b/sysdeps/unix/sysv/linux/powerpc/dl-librecon.h
@@ -1,5 +1,5 @@
/* Optional code to distinguish library flavours.
- Copyright (C) 2010 Free Software Foundation, Inc.
+ Copyright (C) 2010, 2011 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Peter Bergner <bergner@linux.vnet.ibm.com>
@@ -20,17 +20,27 @@
#ifndef _DL_LIBRECON_H
+#include <string.h>
#include <sysdeps/unix/sysv/linux/dl-librecon.h>
/* Recognizing extra environment variables. */
#define EXTRA_LD_ENVVARS_11 \
if (memcmp (envline, "AT_PLATFORM", 11) == 0) \
{ \
- GLRO(dl_platform) = &envline[12]; \
- /* Determine the length of the platform name. */ \
- if (GLRO(dl_platform) != NULL) \
- GLRO(dl_platformlen) = strlen (GLRO(dl_platform)); \
+ int platformlen = strlen (&envline[12]); \
+ GLRO(dl_platformlen) = platformlen; \
+ if (platformlen > 0) \
+ { \
+ GLRO(dl_platform) = &envline[12]; \
+ break; \
+ } \
+ GLRO(dl_platform) = NULL; \
break; \
}
+/* Extra unsecure variables. The names are all stuffed in a single
+ string which means they have to be terminated with a '\0' explicitly. */
+#define EXTRA_UNSECURE_ENVVARS \
+ "LD_AT_PLATFORM\0"
+
#endif /* dl-librecon.h */
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 8 ++++++++
sysdeps/unix/sysv/linux/powerpc/dl-librecon.h | 20 +++++++++++++++-----
2 files changed, 23 insertions(+), 5 deletions(-)
hooks/post-receive
--
GNU C Library master sources