From d68171edce96cb59b5cb869f6a82afcc50db00be Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 28 Sep 1996 03:24:10 +0000 Subject: update from main archive 960927 Sat Sep 28 03:02:49 1996 Ulrich Drepper * dirent/Makefile (routines): Add readdir_r. * dirent/readdir_r.c: New file. Wrapper around readdir.c. * dirent/dirent.h: Add prototype for readdir_r. * misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int' to prevent warnings. * sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path): Initialize `result'. Sat Sep 28 01:16:42 1996 Ulrich Drepper * sysdeps/generic/strsep.c: Rename to __strsep and make strsep weak alias. * string/string.h: Add prototype for __strsep. * misc/mntent_r.c: Use __strsep instead of strsep to keep namespace clean. * sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make __nanosleep and nanosleep weak aliases. * sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak alias. * sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of nanosleep to keep namespace clean. * sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning. * sysdeps/posix/ttyname_r.c (ttyname_r): Likewise. * sysdeps/posix/getcwd.c (__getcwd): Likewise. * sysdeps/unix/nlist.c: Use ISO C definition since we don't always have prototype. * login/Makefile (headers): Add pty.h. * login/pty.h: New file. * sysdeps/generic/pty.h: Include . * login/pututline_r.c: Add cast to prevent warning. * gmon/gmon.c: Add prototype for __profile_frequency. (monstartup): Add cast to prevent warning. * sysdeps/generic/prof-freq.c: Change to use ISO C style definition. * locale/programs/ld-time.c (time_output): Write `era' information in correct order. Sat Sep 28 00:11:08 1996 Ulrich Drepper * sysdeps/unix/sysv/linux/syscalls.list: Add weak alias `adjtimex'. Set caller for mlock, mlockall, mremap, munlock, and munlockall to EXTRA. Reported by Matthias Urlichs . 1996-09-27 Paul Eggert * strftime.c (strftime): Output incomplete formats like %E at end of string. 1996-09-27 Paul Eggert * strftime.c (strftime): Add support for %EC and %Ey. Fix support for %EY. This uses the new _nl_get_era_entry function. Fri Sep 27 14:12:27 1996 Ulrich Drepper Security related patch by Elliot Lee and David Holland . * inet/rexec.c (rexec): Increase size of `num' array from 8 to 32. * inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist. * sysdeps/generic/getenv.c (__secure_getenv): New function. Return NULL when programs runs with SUID or SGID enabled. * sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv. * stdlib/stdlib.h: Add prototype for __secure_getenv. * locale/setlocale.c: Use __secure_getenv. * resolv/res_init.c: Likewise. * resolv/res_query.c: Likewise. * inet/ruserpass.c: Likewise. * sysdeps/posix/tempname.c: Likewise. * malloc/mtrace.c: Likewise. * catgets/catgets.c: Likewise. Make temporary file handling functions reentrant. * stdio-common/tmpnam.c: Rewrite to have own buffer to write result to. The called __stdio_gen_tempname function must be thread safe. * stdio-common/tmpnam_r.c: New file. * stdio/stdio.h: Add prototype for `tmpnam_r'. Change prototype for __stdio_gen_tempname. * stdio/libio.h: Likewise. * sysdeps/posix/tempname.c: Add new parameters and use them instead of static buffer. Don't reset `indeces' when PID changed between calls. Don't fail for long running programs when index counter once reached the limit. * sysdeps/stub/tempname.c: Likewise. * stdio-common/tempnam.c: Provide local buffer as extra argument to __stdio_gen_tempname. This makes this function reentrant. * stdio-common/tmpfile.c: Likewise. * stdio-common/temptest.c: Provide extra argument to __stdio_gen_tempname. * manual/filesys.texi: Describe tmpnam_r and add comments about reentrancy of the functions. * inet/rcmd.c: Fixed address length handling. * sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value. * time/strftime.c: Remove unused variables alt_digits and end_alt_digits. * sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names for get_nprocs and get_nprocs_conf. * sysdeps/generic/sys/sysinfo.h: Likewise. * stdlib/test-canon.c: Finally do the right fix. * misc/Makefile: Only compile force-wrapper when compiling reentrant libc. --- sysdeps/generic/getenv.c | 23 +++++++++++++++++------ sysdeps/generic/prof-freq.c | 2 +- sysdeps/generic/pty.c | 3 ++- sysdeps/generic/strsep.c | 3 ++- sysdeps/generic/sys/sysinfo.h | 8 ++++---- 5 files changed, 26 insertions(+), 13 deletions(-) (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/getenv.c b/sysdeps/generic/getenv.c index d4099a9733..daf292743a 100644 --- a/sysdeps/generic/getenv.c +++ b/sysdeps/generic/getenv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1994 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1994, 1996 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 @@ -16,7 +16,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include #include #include #include @@ -28,17 +27,29 @@ Cambridge, MA 02139, USA. */ /* Return the value of the environment variable NAME. */ char * -DEFUN(getenv, (name), register CONST char *name) +getenv (name) + const char *name; { - register CONST size_t len = strlen(name); - register char **ep; + const size_t len = strlen (name); + char **ep; if (__environ == NULL) return NULL; for (ep = __environ; *ep != NULL; ++ep) - if (!strncmp(*ep, name, len) && (*ep)[len] == '=') + if (!strncmp (*ep, name, len) && (*ep)[len] == '=') return &(*ep)[len + 1]; return NULL; } + + +/* Some programs and especially the libc itself have to be careful + what values to accept from the environment. This special version + checks for SUID or SGID first before doing any work. */ +char * +__secure_getenv (name) + const char *name; +{ + return __libc_enable_secure ? NULL : getenv (name); +} diff --git a/sysdeps/generic/prof-freq.c b/sysdeps/generic/prof-freq.c index 4ad42124e8..ff085145b5 100644 --- a/sysdeps/generic/prof-freq.c +++ b/sysdeps/generic/prof-freq.c @@ -37,7 +37,7 @@ #include int -__profile_frequency () +__profile_frequency (void) { /* * Discover the tick frequency of the machine if something goes wrong, diff --git a/sysdeps/generic/pty.c b/sysdeps/generic/pty.c index dda2125836..6995417d3a 100644 --- a/sysdeps/generic/pty.c +++ b/sysdeps/generic/pty.c @@ -46,6 +46,7 @@ static char sccsid[] = "@(#)pty.c 8.1 (Berkeley) 6/4/93"; #include #include #include +#include int openpty(amaster, aslave, name, termp, winp) @@ -105,7 +106,7 @@ forkpty(amaster, name, termp, winp) struct termios *termp; struct winsize *winp; { - extern int login_tty(); + extern int login_tty __P ((int fd)); int master, slave, pid; if (openpty(&master, &slave, name, termp, winp) == -1) diff --git a/sysdeps/generic/strsep.c b/sysdeps/generic/strsep.c index 6fbcb084a6..15c5891044 100644 --- a/sysdeps/generic/strsep.c +++ b/sysdeps/generic/strsep.c @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. */ #include char * -strsep (char **stringp, const char *delim) +__strsep (char **stringp, const char *delim) { char *begin, *end; @@ -41,3 +41,4 @@ strsep (char **stringp, const char *delim) return begin; } +weak_alias (__strsep, strsep) diff --git a/sysdeps/generic/sys/sysinfo.h b/sysdeps/generic/sys/sysinfo.h index e9f667499e..f68fcc032c 100644 --- a/sysdeps/generic/sys/sysinfo.h +++ b/sysdeps/generic/sys/sysinfo.h @@ -22,12 +22,12 @@ Boston, MA 02111-1307, USA. */ #include /* Return number of configured processors. */ -extern int __get_nproc_conf __P ((void)); -extern int get_nproc_conf __P ((void)); +extern int __get_nprocs_conf __P ((void)); +extern int get_nprocs_conf __P ((void)); /* Return number of available processors. */ -extern int __get_nproc __P ((void)); -extern int get_nproc __P ((void)); +extern int __get_nprocs __P ((void)); +extern int get_nprocs __P ((void)); /* Return number of physical pages of memory in the system. */ -- cgit 1.4.1