mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
fa0bc87c32
* stdlib/canonicalize.c: New file. * stdlib/stdlib.h: Declare canonicalize_file_name, realpath. * stdlib/Makefile (routines): Add canonicalize. * posix/unistd.h: Declare __canonicalize_directory_name_internal. Thu May 23 00:01:10 1996 Ulrich Drepper <drepper@cygnus.com> * db/recno/rec_seq.c: Prevent `sccsid' definition by using the same #if condition as in the other db files. * intl/Makefile: Add -Wno-unused CFLAGS for compilation of bindtextdom.c, finddomain.c, and localealias.c. * intl/dcgettext.c: Don't define prototype for getcwd() when compiling in glibc. * libio/cleanup.c: Add prototype for _IO_register_cleanup. * libio/filedoalloc.c, libio/fileops.c, libio/iopopen.c: Don't define _POSIX_SOURCE unconditionally. * libio/filedoalloc.c, libio/iopopen.c: Include <unistd.h> if compiling in glibc. * libio/fileops.c (_IO_file_close_it): Don't sync file, call flush instead. This relaxes the rules from POSIX.1 about changing the active handle a bit. * libio/iofopncook.c (struct _IO_cookie_file): Move definition into <libio.h>. Add prototypes for local functions to prevent warnings. * libio/iopopen.c: Change prototypes for _IO_fork, _IO_pipe, and _IO_DUP2 to contain complete parameter list. * libio/libio.h: Add definition of struct _IO_cookie_file. * libio/libioP.h: Add prototypes for _IO_vasprintf, _IO_vdprintf, and _IO_vsnprintf. * libio/memstream.c: Include <stdio.h>. * libio/stdio.h: Add prototypes for fopencookie, __stdio_gen_tempname, __vfscanf, __vsscanf, and __vsnprintf. * libio/strops.c: Avoid useless expression in `for' initializer. * locale/findlocale.c: Add some casts to prevent warnings. * locale/programs/locfile.c (write_locale_data): Don't use double `/' in locale binary file. * posix/unistd.h: Remove prototype for `reboot'. Update from bind-4.9.4-T1A. * resolv/Makefile (routines): Add inet_ntop and inet_pton. * resolv/arpa/nameser.h: Add definition of IN6ADDRSZ. * resolv/gethnamaddr.c, resolv/getnetnamadr.c, resolv/res_comp.c, resolv/res_debug.c, resolv/res_init.c * resolv/inet_ntop.c, resolv/inet_pton.c: New files. * resolv/resolv.h: Add RES_USE_INET6 flag. (__dn_isvalid): Renamed to __res_dnok. Add prototypes for __res_ownok and __res_mailok. * stdio-common/Makefile: Add -Wno-unused to CFLAGS for _itoa.c. * stdio-common/getline.c, stdio-common/vfscanf.c, sysdeps/posix/tempname.c: Don't use <ansidecl.h> anymore. * sysdeps/unix/sysv/linux/Makefile [$subdir == misc] (sysdep_routines): Add s_reboot. (install-others): Add $(includedir)/sys/syscall.h. New rule for $(includedir)/sys/syscall.h to produce from <asm/unistd.h>. * sysdeps/unix/sysv/linux/reboot.c: New file. Make single argument function call 3 argument system call. * sysdeps/unix/sysv/linux/sys/reboot.h: New file. Linux specific definition for reboot function. * sysdeps/unix/sysv/linux/syscall.h: Remove old and obsolete comment. * sysdeps/unix/sysv/linux/syscalls.list: Rename function for reboot syscall to __syscall_reboot. * wcsmbs/wchar.h: Protect prototypes for wcstof and wcstold by __USE_GNU, not USE_GNU. Tue May 21 21:55:49 1996 David Mosberger-Tang <davidm@AZStarNet.com> * locale/programs/charset.c, locale/programs/ld-collate.c: Add casts to prevent warnings on 64-bit machines. * locale/programs/ld-monetary.c: Don't do unnecessary tests for int_frac_digits and frac_digits which only produce warnings. Mon May 13 23:45:29 1996 David Mosberger-Tang <davidm@AZStarNet.com> * inet/arpa/inet.h: Backup return type of inet_addr to u_long. * resolv/inet_addr.c: Likewise. * resolv/Makefile (distribute): Add res_hconf.h (routines): Add res_hconf. * resolv/gethnamaddr.c: Add support for /etc/host.conf. * resolv/res_init.c: Initialize /etc/host.conf reader. * resolv/res_hconf.c, resolv/res_hconf.h: New files. Implementation of reading /etc/host.conf. Wed May 22 21:21:15 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * Rules (%.out rules): Prepend $($*-ENV) to the command. * sysdeps/unix/sysv/linux/i386/brk.c (___brk_addr): Define as weak alias for __curbrk. Wed May 22 19:37:27 1996 Miles Bader <miles@gnu.ai.mit.edu> * hurd/hurdexec.c (_hurd_exec): Pass INIT_TRACEMASK. * hurd/hurdmsg.c (set_int): Support INIT_TRACEMASK. Wed May 22 18:47:31 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/mach/hurd/getcwd.c (_hurd_canonicalize_directory_name_internal): New function, broken out of __getcwd. (__getcwd): Use it. (__canonicalize_directory_name_internal): New function using it. * sysdeps/posix/getcwd.c (__canonicalize_directory_name_internal): New function, broken out of __getcwd. (__getcwd): Use it. Wed May 22 18:14:05 1996 Miles Bader <miles@gnu.ai.mit.edu> * string/argz-create.c (__argz_create): Correctly calculate length. * string/argz-extract.c (__argz_extract): Add terminating 0 entry. * hurd/hurdstartup.c (_hurd_startup): ... and don't so here. [HAVE_VMSDIR_H]: Include "vmsdir.h". (glob) [VMS]: Don't grok ~.
391 lines
8.4 KiB
C
391 lines
8.4 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 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
|
||
|
||
/* Get the canonical absolute name of the named 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 *
|
||
__canonicalize_directory_name_internal (thisdir, buf, size)
|
||
const char *thisdir;
|
||
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)
|
||
{
|
||
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 (thisdir, &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 || 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);
|
||
errno = save;
|
||
goto lose;
|
||
}
|
||
if (st.st_dev == thisdev && st.st_ino == thisino)
|
||
break;
|
||
}
|
||
}
|
||
if (d == NULL)
|
||
{
|
||
int save = errno;
|
||
(void) closedir (dirstream);
|
||
errno = save;
|
||
goto lose;
|
||
}
|
||
else
|
||
{
|
||
size_t namlen = _D_EXACT_NAMLEN (d);
|
||
|
||
if (pathp - path < namlen)
|
||
{
|
||
if (buf != NULL)
|
||
{
|
||
errno = ERANGE;
|
||
return NULL;
|
||
}
|
||
else
|
||
{
|
||
size *= 2;
|
||
buf = realloc (path, size);
|
||
if (buf == NULL)
|
||
{
|
||
(void) closedir (dirstream);
|
||
free (path);
|
||
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;
|
||
}
|
||
|
||
/* 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. */
|
||
|
||
#ifndef _LIBC
|
||
#define __getcwd getcwd
|
||
#endif
|
||
|
||
char *
|
||
__getcwd (buf, size)
|
||
char *buf;
|
||
size_t size;
|
||
{
|
||
return __canonicalize_directory_name_internal (".", buf, size);
|
||
}
|
||
|
||
#ifdef _LIBC
|
||
weak_alias (__getcwd, getcwd)
|
||
#endif
|