From 22a1292a42facff7597f3336a91eea57db9709e6 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Sat, 25 Feb 1995 01:23:32 +0000 Subject: * 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. --- sysdeps/unix/dirfd.c | 28 ++++++++++++++++++++++++++++ sysdeps/unix/dirstream.h | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 sysdeps/unix/dirfd.c (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/dirfd.c b/sysdeps/unix/dirfd.c new file mode 100644 index 0000000000..6b6f980a41 --- /dev/null +++ b/sysdeps/unix/dirfd.c @@ -0,0 +1,28 @@ +/* dirfd -- Return the file desciptor used by a DIR stream. Unix version. +Copyright (C) 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 +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 +#include + +int +dirfd (dirp) + FILE *dirp; +{ + return dirp->__fd; +} diff --git a/sysdeps/unix/dirstream.h b/sysdeps/unix/dirstream.h index 20c4922fb9..d8c23959ad 100644 --- a/sysdeps/unix/dirstream.h +++ b/sysdeps/unix/dirstream.h @@ -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 @@ -40,4 +40,6 @@ typedef struct struct dirent __entry; /* Returned by `readdir'. */ } DIR; +#define _DIR_dirfd(dirp) ((dirp)->__fd) + #endif /* dirstream.h */ -- cgit v1.2.3-70-g09d2