mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
d68171edce
Sat Sep 28 03:02:49 1996 Ulrich Drepper <drepper@cygnus.com> * 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 <drepper@cygnus.com> * 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 <pty.h>. * 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 <drepper@cygnus.com> * 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 <smurf@smurf.noris.de>. 1996-09-27 Paul Eggert <eggert@twinsun.com> * strftime.c (strftime): Output incomplete formats like %E at end of string. 1996-09-27 Paul Eggert <eggert@twinsun.com> * 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 <drepper@cygnus.com> Security related patch by Elliot Lee <sopwith@redhat.com> and David Holland <dholland@eecs.harvard.edu>. * 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.
379 lines
8.0 KiB
C
379 lines
8.0 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 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., 675 Mass Ave,
|
||
Cambridge, MA 02139, USA. */
|
||
|
||
/* Wants:
|
||
AC_STDC_HEADERS
|
||
AC_DIR_HEADER
|
||
AC_UNISTD_H
|
||
AC_MEMORY_H
|
||
AC_CONST
|
||
AC_ALLOCA
|
||
*/
|
||
|
||
/* AIX requires this to be the first thing in the file. */
|
||
#if defined (_AIX) && !defined (__GNUC__)
|
||
#pragma alloca
|
||
#endif
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
#include "config.h"
|
||
#endif
|
||
|
||
#include <errno.h>
|
||
#include <sys/types.h>
|
||
#include <sys/stat.h>
|
||
|
||
#ifdef STDC_HEADERS
|
||
#include <stddef.h>
|
||
#endif
|
||
|
||
#if !defined(__GNU_LIBRARY__) && !defined(STDC_HEADERS)
|
||
extern int errno;
|
||
#endif
|
||
#ifndef __set_errno
|
||
#define __set_errno(val) errno = (val)
|
||
#endif
|
||
|
||
#ifndef NULL
|
||
#define NULL 0
|
||
#endif
|
||
|
||
#if defined (USGr3) && !defined (DIRENT)
|
||
#define DIRENT
|
||
#endif /* USGr3 */
|
||
#if defined (Xenix) && !defined (SYSNDIR)
|
||
#define SYSNDIR
|
||
#endif /* Xenix */
|
||
|
||
#if defined (POSIX) || defined (DIRENT) || defined (__GNU_LIBRARY__)
|
||
#include <dirent.h>
|
||
#ifndef __GNU_LIBRARY__
|
||
#define D_NAMLEN(d) strlen((d)->d_name)
|
||
#else
|
||
#define HAVE_D_NAMLEN
|
||
#define D_NAMLEN(d) ((d)->d_namlen)
|
||
#endif
|
||
#else /* not POSIX or DIRENT */
|
||
#define dirent direct
|
||
#define D_NAMLEN(d) ((d)->d_namlen)
|
||
#define HAVE_D_NAMLEN
|
||
#if defined (USG) && !defined (sgi)
|
||
#if defined (SYSNDIR)
|
||
#include <sys/ndir.h>
|
||
#else /* Not SYSNDIR */
|
||
#include "ndir.h"
|
||
#endif /* SYSNDIR */
|
||
#else /* not USG */
|
||
#include <sys/dir.h>
|
||
#endif /* USG */
|
||
#endif /* POSIX or DIRENT or __GNU_LIBRARY__ */
|
||
|
||
#if defined (HAVE_UNISTD_H) || defined (__GNU_LIBRARY__)
|
||
#include <unistd.h>
|
||
#endif
|
||
|
||
#if (defined (STDC_HEADERS) || defined (__GNU_LIBRARY__) \
|
||
|| defined (POSIX))
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#define ANSI_STRING
|
||
#else /* No standard headers. */
|
||
|
||
#ifdef USG
|
||
|
||
#include <string.h>
|
||
#ifdef NEED_MEMORY_H
|
||
#include <memory.h>
|
||
#endif
|
||
#define ANSI_STRING
|
||
|
||
#else /* Not USG. */
|
||
|
||
#ifdef NeXT
|
||
|
||
#include <string.h>
|
||
|
||
#else /* Not NeXT. */
|
||
|
||
#include <strings.h>
|
||
|
||
#ifndef bcmp
|
||
extern int bcmp ();
|
||
#endif
|
||
#ifndef bzero
|
||
extern void bzero ();
|
||
#endif
|
||
#ifndef bcopy
|
||
extern void bcopy ();
|
||
#endif
|
||
|
||
#endif /* NeXT. */
|
||
|
||
#endif /* USG. */
|
||
|
||
extern char *malloc (), *realloc ();
|
||
extern void free ();
|
||
|
||
#endif /* Standard headers. */
|
||
|
||
#ifndef ANSI_STRING
|
||
#define memcpy(d, s, n) bcopy((s), (d), (n))
|
||
#define memmove memcpy
|
||
#endif /* Not ANSI_STRING. */
|
||
|
||
#if !defined(__alloca) && !defined(__GNU_LIBRARY__)
|
||
|
||
#ifdef __GNUC__
|
||
#undef alloca
|
||
#define alloca(n) __builtin_alloca (n)
|
||
#else /* Not GCC. */
|
||
#if defined (sparc) || defined (HAVE_ALLOCA_H)
|
||
#include <alloca.h>
|
||
#else /* Not sparc or HAVE_ALLOCA_H. */
|
||
#ifndef _AIX
|
||
extern char *alloca ();
|
||
#endif /* Not _AIX. */
|
||
#endif /* sparc or HAVE_ALLOCA_H. */
|
||
#endif /* GCC. */
|
||
|
||
#define __alloca alloca
|
||
|
||
#endif
|
||
|
||
#if (defined (HAVE_LIMITS_H) || defined (STDC_HEADERS) || \
|
||
defined (__GNU_LIBRARY__))
|
||
#include <limits.h>
|
||
#else
|
||
#include <sys/param.h>
|
||
#endif
|
||
|
||
#ifndef PATH_MAX
|
||
#ifdef MAXPATHLEN
|
||
#define PATH_MAX MAXPATHLEN
|
||
#else
|
||
#define PATH_MAX 1024
|
||
#endif
|
||
#endif
|
||
|
||
#if !defined (STDC_HEADERS) && !defined (__GNU_LIBRARY__)
|
||
#undef size_t
|
||
#define size_t unsigned int
|
||
#endif
|
||
|
||
#if !__STDC__ && !defined (const)
|
||
#define const
|
||
#endif
|
||
|
||
#ifndef __GNU_LIBRARY__
|
||
#define __lstat stat
|
||
#endif
|
||
|
||
#ifndef _LIBC
|
||
#define __getcwd getcwd
|
||
#endif
|
||
|
||
/* Get the pathname of the current working directory, and put it in SIZE
|
||
bytes of BUF. Returns NULL if the directory couldn't be determined or
|
||
SIZE was too small. If successful, returns BUF. In GNU, if BUF is
|
||
NULL, an array is allocated with `malloc'; the array is SIZE bytes long,
|
||
unless SIZE <= 0, in which case it is as big as necessary. */
|
||
|
||
char *
|
||
__getcwd (buf, size)
|
||
char *buf;
|
||
size_t size;
|
||
{
|
||
static const char dots[]
|
||
= "../../../../../../../../../../../../../../../../../../../../../../../\
|
||
../../../../../../../../../../../../../../../../../../../../../../../../../../\
|
||
../../../../../../../../../../../../../../../../../../../../../../../../../..";
|
||
const char *dotp, *dotlist;
|
||
size_t dotsize;
|
||
dev_t rootdev, thisdev;
|
||
ino_t rootino, thisino;
|
||
char *path;
|
||
register char *pathp;
|
||
struct stat st;
|
||
|
||
if (size == 0)
|
||
{
|
||
if (buf != NULL)
|
||
{
|
||
__set_errno (EINVAL);
|
||
return NULL;
|
||
}
|
||
|
||
size = PATH_MAX + 1;
|
||
}
|
||
|
||
if (buf != NULL)
|
||
path = buf;
|
||
else
|
||
{
|
||
path = malloc (size);
|
||
if (path == NULL)
|
||
return NULL;
|
||
}
|
||
|
||
pathp = path + size;
|
||
*--pathp = '\0';
|
||
|
||
if (__lstat (".", &st) < 0)
|
||
return NULL;
|
||
thisdev = st.st_dev;
|
||
thisino = st.st_ino;
|
||
|
||
if (__lstat ("/", &st) < 0)
|
||
return NULL;
|
||
rootdev = st.st_dev;
|
||
rootino = st.st_ino;
|
||
|
||
dotsize = sizeof (dots) - 1;
|
||
dotp = &dots[sizeof (dots)];
|
||
dotlist = dots;
|
||
while (!(thisdev == rootdev && thisino == rootino))
|
||
{
|
||
register DIR *dirstream;
|
||
register struct dirent *d;
|
||
dev_t dotdev;
|
||
ino_t dotino;
|
||
char mount_point;
|
||
|
||
/* Look at the parent directory. */
|
||
if (dotp == dotlist)
|
||
{
|
||
/* My, what a deep directory tree you have, Grandma. */
|
||
char *new;
|
||
if (dotlist == dots)
|
||
{
|
||
new = malloc (dotsize * 2 + 1);
|
||
if (new == NULL)
|
||
return NULL;
|
||
memcpy (new, dots, dotsize);
|
||
}
|
||
else
|
||
{
|
||
new = realloc ((__ptr_t) dotlist, dotsize * 2 + 1);
|
||
if (new == NULL)
|
||
goto lose;
|
||
}
|
||
memcpy (&new[dotsize], new, dotsize);
|
||
dotp = &new[dotsize];
|
||
dotsize *= 2;
|
||
new[dotsize] = '\0';
|
||
dotlist = new;
|
||
}
|
||
|
||
dotp -= 3;
|
||
|
||
/* Figure out if this directory is a mount point. */
|
||
if (__lstat (dotp, &st) < 0)
|
||
goto lose;
|
||
dotdev = st.st_dev;
|
||
dotino = st.st_ino;
|
||
mount_point = dotdev != thisdev;
|
||
|
||
/* Search for the last directory. */
|
||
dirstream = __opendir (dotp);
|
||
if (dirstream == NULL)
|
||
goto lose;
|
||
while ((d = __readdir (dirstream)) != NULL)
|
||
{
|
||
if (d->d_name[0] == '.' &&
|
||
(d->d_name[1] == '\0' ||
|
||
(d->d_name[1] == '.' && d->d_name[2] == '\0')))
|
||
continue;
|
||
if (mount_point || (ino_t) d->d_ino == thisino)
|
||
{
|
||
char name[dotlist + dotsize - dotp + 1 + _D_ALLOC_NAMLEN (d)];
|
||
memcpy (name, dotp, dotlist + dotsize - dotp);
|
||
name[dotlist + dotsize - dotp] = '/';
|
||
strcpy (&name[dotlist + dotsize - dotp + 1], d->d_name);
|
||
if (__lstat (name, &st) < 0)
|
||
{
|
||
int save = errno;
|
||
(void) __closedir (dirstream);
|
||
__set_errno (save);
|
||
goto lose;
|
||
}
|
||
if (st.st_dev == thisdev && st.st_ino == thisino)
|
||
break;
|
||
}
|
||
}
|
||
if (d == NULL)
|
||
{
|
||
int save = errno;
|
||
(void) __closedir (dirstream);
|
||
__set_errno (save);
|
||
goto lose;
|
||
}
|
||
else
|
||
{
|
||
size_t namlen = _D_EXACT_NAMLEN (d);
|
||
|
||
if ((size_t) (pathp - path) < namlen)
|
||
{
|
||
if (buf != NULL)
|
||
{
|
||
__set_errno (ERANGE);
|
||
return NULL;
|
||
}
|
||
else
|
||
{
|
||
size *= 2;
|
||
buf = realloc (path, size);
|
||
if (buf == NULL)
|
||
{
|
||
(void) __closedir (dirstream);
|
||
free (path);
|
||
__set_errno (ENOMEM);/* closedir might have changed it.*/
|
||
return NULL;
|
||
}
|
||
pathp = &buf[pathp - path];
|
||
path = buf;
|
||
}
|
||
}
|
||
pathp -= namlen;
|
||
(void) memcpy (pathp, d->d_name, namlen);
|
||
*--pathp = '/';
|
||
(void) __closedir (dirstream);
|
||
}
|
||
|
||
thisdev = dotdev;
|
||
thisino = dotino;
|
||
}
|
||
|
||
if (pathp == &path[size - 1])
|
||
*--pathp = '/';
|
||
|
||
if (dotlist != dots)
|
||
free ((__ptr_t) dotlist);
|
||
|
||
memmove (path, pathp, path + size - pathp);
|
||
return path;
|
||
|
||
lose:
|
||
if (dotlist != dots)
|
||
free ((__ptr_t) dotlist);
|
||
return NULL;
|
||
}
|
||
|
||
#ifdef _LIBC
|
||
weak_alias (__getcwd, getcwd)
|
||
#endif
|