From c3d3967cd2a9ebf8bd312ca5be09b6a844f3edf5 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 4 Mar 1996 22:45:04 +0000 Subject: Mon Mar 4 17:35:09 1996 Roland McGrath * hurd/catch-signal.c (hurd_safe_memmove): New function. (hurd_safe_copyin, hurd_safe_copyout): New functions. * hurd/hurd/sigpreempt.h: Declare them. --- sysdeps/unix/bsd/dirstream.h | 43 --------------------------- sysdeps/unix/bsd/readdir.c | 70 -------------------------------------------- 2 files changed, 113 deletions(-) delete mode 100644 sysdeps/unix/bsd/dirstream.h delete mode 100644 sysdeps/unix/bsd/readdir.c (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/bsd/dirstream.h b/sysdeps/unix/bsd/dirstream.h deleted file mode 100644 index d46c59ec58..0000000000 --- a/sysdeps/unix/bsd/dirstream.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright (C) 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 -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. */ - -#ifndef _DIRSTREAM_H - -#define _DIRSTREAM_H 1 - -#define __need_size_t -#include -#include /* For __off_t. */ - -/* Directory stream type. - - The BSD directory format is the same as `struct dirent', so `readdir' - returns a pointer into the buffer we read directory data into. */ - -struct __dirstream - { - int __fd; /* File descriptor. */ - - char *__data; /* Directory block. */ - size_t __allocation; /* Space allocated for the block. */ - size_t __offset; /* Current offset into the block. */ - size_t __size; /* Total valid data in the block. */ - __off_t __pos; /* Position in directory of this block. */ - }; - -#endif /* dirstream.h */ diff --git a/sysdeps/unix/bsd/readdir.c b/sysdeps/unix/bsd/readdir.c deleted file mode 100644 index e3d020cd46..0000000000 --- a/sysdeps/unix/bsd/readdir.c +++ /dev/null @@ -1,70 +0,0 @@ -/* 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 -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 -#include -#include -#include -#include -#include -#include -#include "direct.h" -#include "dirstream.h" - -/* Read a directory entry from DIRP. */ -struct dirent * -DEFUN(readdir, (dirp), DIR *dirp) -{ - struct dirent *dp; - - if (dirp == NULL || dirp->__data == NULL) - { - errno = EINVAL; - return NULL; - } - - do - { - if (dirp->__offset >= dirp->__size) - { - /* We've emptied out our buffer. Refill it. */ - - ssize_t bytes = __getdirentries (dirp->__fd, dirp->__data, - dirp->__allocation, &dirp->__pos); - if (bytes <= 0) - return NULL; - dirp->__size = (size_t) bytes; - - /* Reset the offset into the buffer. */ - dirp->__offset = 0; - } - - dp = (struct dirent *) &dirp->__data[dirp->__offset]; - dirp->__offset += dp->d_reclen; - -#ifndef HAVE_D_TYPE - dp->d_namlen = ((struct direct *) dp)->d_namlen; - dp->d_type = DT_UNKNOWN; -#endif - - /* Loop to ignore deleted files. */ - } while (dp->d_fileno == 0); - - return dp; -} -- cgit v1.2.3