diff options
| author | Roland McGrath <roland@gnu.org> | 1995-02-25 01:23:32 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-02-25 01:23:32 +0000 |
| commit | 22a1292a42facff7597f3336a91eea57db9709e6 (patch) | |
| tree | 90182d921edc7ecb39254237386f7a2a07d7e64b /sysdeps/mach/hurd/closedir.c | |
| parent | e66f63fb6364729aad510f5b3feb8a046775ec1a (diff) | |
| download | glibc-22a1292a42facff7597f3336a91eea57db9709e6.tar glibc-22a1292a42facff7597f3336a91eea57db9709e6.tar.gz glibc-22a1292a42facff7597f3336a91eea57db9709e6.tar.bz2 glibc-22a1292a42facff7597f3336a91eea57db9709e6.zip | |
* io/Makefile (routines): Add euidaccess.
* sysdeps/mach/hurd/euidaccess.c: New file.
* sysdeps/stub/euidaccess.c: New file.
* posix/unistd.h [__USE_GNU] (euidaccess): Declare it.
* dirent/Makefile (routines): Add dirfd.
* sysdeps/stub/dirfd.c: New file.
* sysdeps/unix/dirfd.c: New file.
* sysdeps/unix/dirstream.h (_DIR_dirfd): New macro.
* dirent/dirent.h (dirfd): Declare new function. Define as macro
_DIR_dirfd if that is defined.
* sysdeps/mach/hurd/dirstream.h (DIR): Replace `__port' member
with `void *__fd'.
* sysdeps/mach/hurd/opendir.c: Use DIRP->__fd instead of DIRP->__port.
Open the file with `open'; set FD_CLOEXEC on the fd.
* sysdeps/mach/hurd/closedir.c: Likewise.
* sysdeps/mach/hurd/readdir.c: Likewise.
* sysdeps/mach/hurd/dirfd.c: New file.
* posix/Makefile (glob/configure): Do cvs commit if there is a CVS
directory.
(glob/ChangeLog): Likewise.
* locale/locale.h (LC_*): Use small integers instead of bit masks.
Diffstat (limited to 'sysdeps/mach/hurd/closedir.c')
| -rw-r--r-- | sysdeps/mach/hurd/closedir.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sysdeps/mach/hurd/closedir.c b/sysdeps/mach/hurd/closedir.c index 9d20621747..bb970aed9e 100644 --- a/sysdeps/mach/hurd/closedir.c +++ b/sysdeps/mach/hurd/closedir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995 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 @@ -37,13 +37,13 @@ DEFUN(closedir, (dirp), DIR *dirp) return -1; } - if ((err = __vm_deallocate (__mach_task_self (), - (vm_address_t) dirp->__data, dirp->__allocation)) - || (err = __mach_port_deallocate (__mach_task_self (), dirp->__port))) - { - errno = err; - return -1; - } + if (err = __vm_deallocate (__mach_task_self (), + (vm_address_t) dirp->__data, dirp->__allocation)) + return __hurd_fail (err); + dirp->__data = NULL; + + if (err = _hurd_fd_close (dirp->__fd)) + return __hurd_fail (err); free (dirp); |