mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-12 12:07:12 +08:00
0e3426bbcf
* string/argz-extract.c: Remove const from decl. * string/argz.h: Here too. * Makeconfig (version.mk): Fix regexp in sed cmd. Depend on $(..)Makeconfig. * GMP code updated from gmp-2.0 release. * stdlib/Makefile (mpn-routines): Removed add_1, added inlines. * sysdeps/generic/add_1.c: File removed. * stdlib/strtod.c: mp_limb is now mp_limb_t. * stdlib/fpioconst.c, stdlib/fpioconst.h: Likewise. * stdio-common/_itoa.c: Likewise. * stdio-common/printf_fp.c: Likewise. Don't include ansidecl.h. * sysdeps/mach/hurd/getcwd.c: Use io_identity instead of io_stat. * shlib-versions: New file. * Makerules (soversions.mk): New target, include file generated from shlib-versions. Moved shared library rules before installation rules. Rewrote shared library installation rules for versioned libraries. * math/Makefile (libm.so-version): Variable removed. * sysdeps/mach/hurd/i386/exc2signal.c: Use struct hurd_signal_detail. * hurd/report-wait.c (_S_msg_describe_ports): New function. * configure.in: Add AC_PROG_LN_S check. * config.make.in (LN_S): New variable. Sun May 5 03:10:44 1996 Ulrich Drepper <drepper@cygnus.com> * misc/efgcvt_r.c (ecvt_r): Work aroung gcc bug. gcc does not know about weak aliases now and optimizes necessary `if' statement away. * posix/unistd.h: Add swapoff prototype. * sysdeps/generic/confname.h: Add even more POSIX.4 symbols. * sysdeps/posix/fpathconf.c (__fpathconf): Get information for _PC_PATH_MAX from fstatfs function if available. * sysdeps/posix/sysconf.c: Add code to handle _SC_AIO_LISTIO_MAX, _SC_AIO_MAX, _SC_AIO_PRIO_DELTA_MAX, _SC_DELAYTIMER_MAX, _SC_MQ_OPEN_MAX, _SC_MQ_PRIO_MAX, _SC_RTSIG_MAX, _SC_SEM_NSEMS_MAX, _SC_SEM_VALUE_MAX, _SC_SIGQUEUE_MAX, and _SC_TIMER_MAX. * sysdeps/unix/sysv/sysv4/sysconf.c: Ditto. * sysdeps/stub/swapoff.c: New file. Stub version for swapoff function. * sysdeps/unix/syscalls.list: Add swapoff. * sysdeps/unix/sysv/linux/Dist: Add sys/acct.h. * sysdeps/unix/sysv/linux/Makefile [$(subdir) == misc] (sysdep_routines): Add mount, umount, llseek, setfsgid, setfsuid, sysinfo, and uselib. (headers): Add sys/sysinfo.h. * sysdeps/unix/sysv/linux/gethostid.c: Prevent warning. * sysdeps/unix/sysv/linux/i386/Makefile [$(subdir) == misc] (sysdep_routines): Add ioperm, iopl, and vm86. (headers): Add sys/perm.h and sys/vm86.h. * sysdeps/unix/sysv/linux/i386/sys/perm.h: New file. Contains prototypes for iopl and ioperm. * sysdeps/unix/sysv/linux/i386/sys/vm86.h: New file. Contains prototype for vm86. * sysdeps/unix/sysv/linux/i386/syscalls.list: New file. Add vm86 system call. * sysdeps/unix/sysv/linux/sys/acct.h: New file. Contains prototypes for acct function. * sysdeps/unix/sysv/linux/sys/socket.h: Provide real header file with prototypes. * sysdeps/unix/sysv/linux/sys/sysinfo.h: New file. Contains prototype for sysinfo function. * sysdeps/unix/sysv/linux/syscalls.list: Add flock, ioperm, iopl, llseek, setfsgid, setfsuid, sysinfo, and uselib. * sysdeps/unix/sysv/linux/sysconf.c: Instead of duplicating posix/sysconf.c now only handle cases different to that implementation. Tue May 7 15:08:19 1996 Miles Bader <miles@gnu.ai.mit.edu> * stdio/linewrap.c (__line_wrap_output): Renamed from lwoutput (all references changed). Now exported. * stdio/linewrap.c (struct data): Type deleted (moved to linewrap.h). (wrap_stream, unwrap_stream, lwclose, lwfileno, lwoutput, line_wrap_stream, line_unwrap_stream): Use struct line_wrap_data instead of struct data. (lwoutput, line_wrap_stream, line_unwrap_stream): Rename various occurences of `wrap' and `wrapmargin' to `wmargin'. (line_wrapped, line_wrap_lmargin, line_wrap_set_lmargin, line_wrap_rmargin, line_wrap_set_rmargin, line_wrap_wmargin, line_wrap_set_wmargin, line_wrap_point): New functions. * stdio/linewrap.h: New file. * stdio/Makefile (headers): Add linewrap.h. Tue May 7 14:19:12 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/i386/Makefile: File removed. * stdio/stdio.h: Remove line_wrap_stream, line_unwap_stream decls. * sysdeps/unix/sysv/linux/schedbits.h: New file. Tue May 7 13:47:02 1996 Miles Bader <miles@gnu.ai.mit.edu> * stdio/linewrap.c (struct data): Make margin fields not-pointers. (lwoutput): Adjust uses acordingly. * sysdeps/mach/hurd/fdatasync.c: New file. * sysdeps/mach/hurd/fsync.c: Pass new flag to file_sync. * sysdeps/mach/hurd/xmknod.c: Pass new flag to dir_link. * sysdeps/mach/hurd/symlink.c: Likewise. * sysdeps/mach/hurd/link.c: Likewise. * sysdeps/mach/hurd/bind.c: Likewise. * hurd/hurdsig.c (write_corefile): Likewise. * hurd/hurdsig.c (write_corefile): Pass cttyid port to crash server. * sysdeps/mach/hurd/fpathconf.c: RPC takes int pointer, not long int. * sysdeps/mach/hurd/_exit.c (_hurd_exit): Pass sigcode arg to proc_mark_exit. * sysdeps/mach/hurd/dl-sysdep.c (_exit): Likewise. * sysdeps/mach/hurd/wait4.c: Pass sigcode arg to proc_wait. * sysdeps/mach/hurd/rename.c: Pass new flag to dir_rename. * hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise): Use struct hurd_signal_detail. * hurd/catch-exc.c (_S_catch_exception_raise): Likewise. * hurd/hurd-raise.c (_hurd_raise_signal): Likewise. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Likewise. * sysdeps/mach/hurd/setitimer.c (restart_itimer): Likewise. * hurd/hurd/signal.h: Fix _hurd_exception2signal prototype. * hurd/hurdsig.c (write_corefile): Take const struct hurd_signal_detail * arg. Pass all details to crash_dump_task. (_hurd_internal_post_signal): Pass DETAIL to write_corefile. (_hurd_internal_post_signal: suspend): Pass code and error to proc_mark_stop. * hurd/hurdprio.c (_hurd_priority_which_map): Pass flags arg to proc_getprocinfo by reference.
259 lines
7.0 KiB
C
259 lines
7.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. */
|
|
|
|
#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 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)
|
|
{
|
|
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);
|
|
|
|
/* Get a port to our current working directory and stat it. */
|
|
|
|
if (err = __USEPORT (CRDIR, __io_identity (port,
|
|
&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;
|
|
}
|
|
weak_alias (__getcwd, getcwd)
|