mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-20 12:00:06 +00: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 ~.
288 lines
7.9 KiB
C
288 lines
7.9 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. */
|
||
|
||
#include <errno.h>
|
||
#include <sys/types.h>
|
||
#include <sys/stat.h>
|
||
#include <hurd.h>
|
||
#include <hurd/port.h>
|
||
#include <dirent.h>
|
||
#include <unistd.h>
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include <stdio.h>
|
||
#include <fcntl.h>
|
||
|
||
|
||
/* Get the canonical absolute name of the given directory port, 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 *
|
||
_hurd_canonicalize_directory_name_internal (file_t thisdir,
|
||
char *buf,
|
||
size_t size)
|
||
{
|
||
error_t err;
|
||
mach_port_t rootid, thisid, rootdevid, thisdevid;
|
||
ino_t rootino, thisino;
|
||
char *file_name;
|
||
register char *file_namep;
|
||
file_t parent;
|
||
char *dirbuf = NULL;
|
||
unsigned int dirbufsize = 0;
|
||
|
||
inline void cleanup (void)
|
||
{
|
||
__mach_port_deallocate (__mach_task_self (), parent);
|
||
__mach_port_deallocate (__mach_task_self (), thisid);
|
||
__mach_port_deallocate (__mach_task_self (), thisdevid);
|
||
__mach_port_deallocate (__mach_task_self (), rootid);
|
||
__mach_port_deallocate (__mach_task_self (), rootdevid);
|
||
|
||
if (dirbuf != NULL)
|
||
__vm_deallocate (__mach_task_self (),
|
||
(vm_address_t) dirbuf, dirbufsize);
|
||
}
|
||
|
||
|
||
if (size == 0)
|
||
{
|
||
if (buf != NULL)
|
||
{
|
||
errno = EINVAL;
|
||
return NULL;
|
||
}
|
||
|
||
size = FILENAME_MAX * 4 + 1; /* Good starting guess. */
|
||
}
|
||
|
||
if (buf != NULL)
|
||
file_name = buf;
|
||
else
|
||
{
|
||
file_name = malloc (size);
|
||
if (file_name == NULL)
|
||
return NULL;
|
||
}
|
||
|
||
file_namep = file_name + size;
|
||
*--file_namep = '\0';
|
||
|
||
/* Get a port to our root directory and get its identity. */
|
||
|
||
if (err = __USEPORT (CRDIR, __io_identity (port,
|
||
&rootid, &rootdevid, &rootino)))
|
||
return __hurd_fail (err), NULL;
|
||
__mach_port_deallocate (__mach_task_self (), rootdevid);
|
||
|
||
/* Stat the port to the directory of interest. */
|
||
|
||
if (err = __io_identity (thisdir, &thisid, &thisdevid, &thisino))
|
||
{
|
||
__mach_port_deallocate (__mach_task_self (), rootid);
|
||
return __hurd_fail (err), NULL;
|
||
}
|
||
|
||
while (thisid != rootid)
|
||
{
|
||
/* PARENT is a port to the directory we are currently on;
|
||
THISID, THISDEV, and THISINO are its identity.
|
||
Look in its parent (..) for a file with the same file number. */
|
||
|
||
struct dirent *d;
|
||
mach_port_t dotid, dotdevid;
|
||
ino_t dotino;
|
||
int mount_point;
|
||
file_t newp;
|
||
char *dirdata;
|
||
unsigned int dirdatasize;
|
||
int direntry, nentries;
|
||
|
||
|
||
/* Look at the parent directory. */
|
||
newp = __file_name_lookup_under (parent, "..", O_READ, 0);
|
||
if (newp == MACH_PORT_NULL)
|
||
goto lose;
|
||
__mach_port_deallocate (__mach_task_self (), parent);
|
||
parent = newp;
|
||
|
||
/* Get this directory's identity and figure out if it's a mount point. */
|
||
if (err = __io_identity (parent, &dotid, &dotdevid, &dotino))
|
||
goto errlose;
|
||
__mach_port_deallocate (__mach_task_self (), dotid);
|
||
__mach_port_deallocate (__mach_task_self (), dotdevid);
|
||
mount_point = dotdevid != thisdevid;
|
||
|
||
/* Search for the last directory. */
|
||
direntry = 0;
|
||
dirdata = dirbuf;
|
||
dirdatasize = dirbufsize;
|
||
while (!(err = __dir_readdir (parent, &dirdata, &dirdatasize,
|
||
direntry, -1, 0, &nentries)) &&
|
||
nentries != 0)
|
||
{
|
||
/* We have a block of directory entries. */
|
||
|
||
unsigned int offset;
|
||
|
||
direntry += nentries;
|
||
|
||
if (dirdata != dirbuf)
|
||
{
|
||
/* The data was passed out of line, so our old buffer is no
|
||
longer useful. Deallocate the old buffer and reset our
|
||
information for the new buffer. */
|
||
__vm_deallocate (__mach_task_self (),
|
||
(vm_address_t) dirbuf, dirbufsize);
|
||
dirbuf = dirdata;
|
||
dirbufsize = round_page (dirdatasize);
|
||
}
|
||
|
||
/* Iterate over the returned directory entries, looking for one
|
||
whose file number is THISINO. */
|
||
|
||
offset = 0;
|
||
while (offset < dirdatasize)
|
||
{
|
||
d = (struct dirent *) &dirdata[offset];
|
||
offset += d->d_reclen;
|
||
|
||
/* Ignore `.' and `..'. */
|
||
if (d->d_name[0] == '.' &&
|
||
(d->d_namlen == 1 ||
|
||
(d->d_namlen == 2 && d->d_name[1] == '.')))
|
||
continue;
|
||
|
||
if (mount_point || d->d_ino == thisino)
|
||
{
|
||
file_t try = __file_name_lookup_under (parent, d->d_name,
|
||
O_NOLINK, 0);
|
||
file_t id, devid;
|
||
ino_t fileno;
|
||
if (try == MACH_PORT_NULL)
|
||
goto lose;
|
||
err = __io_identity (try, &id, &devid, &fileno);
|
||
__mach_port_deallocate (__mach_task_self (), try);
|
||
if (err)
|
||
goto errlose;
|
||
__mach_port_deallocate (__mach_task_self (), id);
|
||
__mach_port_deallocate (__mach_task_self (), devid);
|
||
if (id == thisid)
|
||
goto found;
|
||
}
|
||
}
|
||
}
|
||
|
||
if (err)
|
||
goto errlose;
|
||
else if (nentries == 0)
|
||
{
|
||
/* We got to the end of the directory without finding anything!
|
||
We are in a directory that has been unlinked, or something is
|
||
broken. */
|
||
err = ENOENT;
|
||
goto errlose;
|
||
}
|
||
else
|
||
found:
|
||
{
|
||
/* Prepend the directory name just discovered. */
|
||
|
||
if (file_namep - file_name < d->d_namlen + 1)
|
||
{
|
||
if (buf != NULL)
|
||
{
|
||
errno = ERANGE;
|
||
return NULL;
|
||
}
|
||
else
|
||
{
|
||
size *= 2;
|
||
buf = realloc (file_name, size);
|
||
if (buf == NULL)
|
||
{
|
||
free (file_name);
|
||
return NULL;
|
||
}
|
||
file_namep = &buf[file_namep - file_name];
|
||
file_name = buf;
|
||
}
|
||
}
|
||
file_namep -= d->d_namlen;
|
||
(void) memcpy (file_namep, d->d_name, d->d_namlen);
|
||
*--file_namep = '/';
|
||
}
|
||
|
||
/* The next iteration will find the name of the directory we
|
||
just searched through. */
|
||
__mach_port_deallocate (__mach_task_self (), thisid);
|
||
__mach_port_deallocate (__mach_task_self (), thisdevid);
|
||
thisid = dotid;
|
||
thisdevid = dotdevid;
|
||
thisino = dotino;
|
||
}
|
||
|
||
if (file_namep == &file_name[size - 1])
|
||
/* We found nothing and got all the way to the root.
|
||
So the root is our current directory. */
|
||
*--file_namep = '/';
|
||
|
||
memmove (file_name, file_namep, file_name + size - file_namep);
|
||
cleanup ();
|
||
return file_name;
|
||
|
||
errlose:
|
||
/* Set errno. */
|
||
(void) __hurd_fail (err);
|
||
lose:
|
||
cleanup ();
|
||
return NULL;
|
||
}
|
||
|
||
char *
|
||
__canonicalize_directory_name_internal (thisdir, buf, size)
|
||
const char *thisdir;
|
||
char *buf;
|
||
size_t size;
|
||
{
|
||
char *result;
|
||
file_t port = __file_name_lookup (thisdir, 0, 0);
|
||
if (port == MACH_PORT_NULL)
|
||
return NULL;
|
||
result = _hurd_canonicalize_directory_name_internal (port, buf, size);
|
||
__mach_port_deallocate (__mach_task_self (), port);
|
||
return result;
|
||
}
|
||
|
||
/* 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 (char *buf, size_t size)
|
||
{
|
||
return __USEPORT (CWDIR,
|
||
_hurd_canonicalize_directory_name_internal (port,
|
||
buf, size));
|
||
}
|
||
weak_alias (__getcwd, getcwd)
|