diff options
| author | Florian Weimer <fweimer@redhat.com> | 2012-07-25 19:46:22 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2012-07-25 19:46:22 +0200 |
| commit | 84b3fd8407cc9a2e7f487b6247681bd8a78a4560 (patch) | |
| tree | 26e482f31c4fe6e36d8aa64394ff4659908bdc4f /sysdeps/posix | |
| parent | 56e49b714ecd32c72c334802b00e3d62008d98e3 (diff) | |
| download | glibc-84b3fd8407cc9a2e7f487b6247681bd8a78a4560.tar.gz glibc-84b3fd8407cc9a2e7f487b6247681bd8a78a4560.tar.xz glibc-84b3fd8407cc9a2e7f487b6247681bd8a78a4560.zip | |
Rename __secure_getenv to secure_getenv
Diffstat (limited to 'sysdeps/posix')
| -rw-r--r-- | sysdeps/posix/libc_fatal.c | 5 | ||||
| -rw-r--r-- | sysdeps/posix/sysconf.c | 5 | ||||
| -rw-r--r-- | sysdeps/posix/tempname.c | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/sysdeps/posix/libc_fatal.c b/sysdeps/posix/libc_fatal.c index 62acb9bead..6b741297ce 100644 --- a/sysdeps/posix/libc_fatal.c +++ b/sysdeps/posix/libc_fatal.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1993-1995,1997,2000,2004,2005,2009,2011 - Free Software Foundation, Inc. +/* Copyright (C) 1993-2012 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 @@ -61,7 +60,7 @@ __libc_message (int do_abort, const char *fmt, ...) /* Open a descriptor for /dev/tty unless the user explicitly requests errors on standard error. */ - const char *on_2 = __secure_getenv ("LIBC_FATAL_STDERR_"); + const char *on_2 = __libc_secure_getenv ("LIBC_FATAL_STDERR_"); if (on_2 == NULL || *on_2 == '\0') fd = open_not_cancel_2 (_PATH_TTY, O_RDWR | O_NOCTTY | O_NDELAY); diff --git a/sysdeps/posix/sysconf.c b/sysdeps/posix/sysconf.c index 1f988d547a..d9b3c83ab7 100644 --- a/sysdeps/posix/sysconf.c +++ b/sysdeps/posix/sysconf.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1991,1993,1995-1997,1999-2003,2004,2006,2009 - Free Software Foundation, Inc. +/* Copyright (C) 1991-2012 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 @@ -1259,7 +1258,7 @@ __sysconf_check_spec (const char *spec) { int save_errno = errno; - const char *getconf_dir = __secure_getenv ("GETCONF_DIR") ?: GETCONF_DIR; + const char *getconf_dir = __libc_secure_getenv ("GETCONF_DIR") ?: GETCONF_DIR; size_t getconf_dirlen = strlen (getconf_dir); size_t speclen = strlen (spec); diff --git a/sysdeps/posix/tempname.c b/sysdeps/posix/tempname.c index a98f1d6e9b..2f0bfef34f 100644 --- a/sysdeps/posix/tempname.c +++ b/sysdeps/posix/tempname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-2001, 2006, 2007, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1991-2012 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 @@ -101,8 +101,12 @@ # define __xstat64(version, path, buf) stat (path, buf) #endif -#if ! (HAVE___SECURE_GETENV || _LIBC) -# define __secure_getenv getenv +#if ! (HAVE_SECURE_GETENV || _LIBC) +# ifdef HAVE___SECURE_GETENV +# define __libc_secure_getenv __secure_getenv +# else +# define __libc_secure_getenv getenv +# endif #endif #ifdef _LIBC @@ -168,7 +172,7 @@ __path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx, if (try_tmpdir) { - d = __secure_getenv ("TMPDIR"); + d = __libc_secure_getenv ("TMPDIR"); if (d != NULL && direxists (d)) dir = d; else if (dir != NULL && direxists (dir)) |