aboutsummaryrefslogtreecommitdiff
path: root/dirent
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-02-25 01:23:32 +0000
committerRoland McGrath <roland@gnu.org>1995-02-25 01:23:32 +0000
commit22a1292a42facff7597f3336a91eea57db9709e6 (patch)
tree90182d921edc7ecb39254237386f7a2a07d7e64b /dirent
parente66f63fb6364729aad510f5b3feb8a046775ec1a (diff)
downloadglibc-22a1292a42facff7597f3336a91eea57db9709e6.zip
glibc-22a1292a42facff7597f3336a91eea57db9709e6.tar.gz
glibc-22a1292a42facff7597f3336a91eea57db9709e6.tar.bz2
* 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 'dirent')
-rw-r--r--dirent/Makefile2
-rw-r--r--dirent/dirent.h9
2 files changed, 9 insertions, 2 deletions
diff --git a/dirent/Makefile b/dirent/Makefile
index ed3335c..0235276 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -24,7 +24,7 @@ subdir := dirent
headers := dirent.h dirstream.h
routines := opendir closedir readdir rewinddir \
seekdir telldir scandir alphasort \
- getdents
+ getdents dirfd
distribute := direct.h
tests := list tst-seekdir
diff --git a/dirent/dirent.h b/dirent/dirent.h
index b102a47..88a6fc8 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 1994, 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
@@ -96,6 +96,13 @@ extern void rewinddir __P ((DIR * __dirp));
#if defined(__USE_BSD) || defined(__USE_MISC)
+/* Return the file descriptor used by DIRP. */
+extern int dirfd __P ((DIR *__dirp));
+
+#if defined (__OPTIMIZE__) && defined (_DIR_dirfd)
+#define dirfd(dirp) _DIR_dirfd (dirp)
+#endif
+
#ifndef MAXNAMLEN
/* Get the definitions of the POSIX.1 limits. */
#include <posix1_lim.h>