diff options
| author | Roland McGrath <roland@gnu.org> | 1995-08-28 09:00:05 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-08-28 09:00:05 +0000 |
| commit | 9e865adecff6cb94e8c638a47929dcee62267f20 (patch) | |
| tree | d448dcae82f2e6b5ac25bb0d3efb5b65505833bf /sysdeps/unix/bsd | |
| parent | 7752137a6a9d9a042d2c2f00e245b920e41737bc (diff) | |
* sysdeps/mach/hurd/dirstream.h: Define `struct __dirstream'
instead of `DIR'.
* sysdeps/unix/bsd/dirstream.h: Likewise.
* sysdeps/stub/dirstream.h: Likewise.
* sysdeps/unix/dirstream.h: Likewise.
* sysdeps/mach/hurd/telldir.c: Include "dirstream.h".
* sysdeps/mach/hurd/seekdir.c: Likewise.
* sysdeps/mach/hurd/opendir.c: Likewise.
* sysdeps/mach/hurd/closedir.c: Likewise.
* sysdeps/mach/hurd/readdir.c: Likewise.
* sysdeps/unix/telldir.c: Likewise.
* sysdeps/unix/seekdir.c: Likewise.
* sysdeps/unix/rewinddir.c: Likewise.
* sysdeps/unix/readdir.c: Likewise.
* sysdeps/unix/opendir.c: Likewise.
* sysdeps/unix/closedir.c: Likewise.
* sysdeps/unix/bsd/telldir.c: Likewise.
* sysdeps/unix/bsd/readdir.c: Likewise.
* dirent/Makefile (headers): Remove dirstream.h.
(distribute): Put it here instead.
Diffstat (limited to 'sysdeps/unix/bsd')
| -rw-r--r-- | sysdeps/unix/bsd/dirstream.h | 11 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/readdir.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/bsd/telldir.c | 3 |
3 files changed, 7 insertions, 11 deletions
diff --git a/sysdeps/unix/bsd/dirstream.h b/sysdeps/unix/bsd/dirstream.h index f3bf9ca894..d46c59ec58 100644 --- a/sysdeps/unix/bsd/dirstream.h +++ b/sysdeps/unix/bsd/dirstream.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 1994 Free Software Foundation, Inc. +/* 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 @@ -29,7 +29,7 @@ Cambridge, MA 02139, USA. */ The BSD directory format is the same as `struct dirent', so `readdir' returns a pointer into the buffer we read directory data into. */ -typedef struct +struct __dirstream { int __fd; /* File descriptor. */ @@ -38,11 +38,6 @@ typedef struct 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. */ - } DIR; - -#ifdef __USE_BSD -/* Macro to return the file descriptor used for an open directory. */ -#define dirfd(DIR) ((DIR)->__fd) -#endif + }; #endif /* dirstream.h */ diff --git a/sysdeps/unix/bsd/readdir.c b/sysdeps/unix/bsd/readdir.c index e86a94dd52..e3d020cd46 100644 --- a/sysdeps/unix/bsd/readdir.c +++ b/sysdeps/unix/bsd/readdir.c @@ -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 @@ -25,7 +25,7 @@ Cambridge, MA 02139, USA. */ #include <unistd.h> #include <sys/types.h> #include "direct.h" - +#include "dirstream.h" /* Read a directory entry from DIRP. */ struct dirent * diff --git a/sysdeps/unix/bsd/telldir.c b/sysdeps/unix/bsd/telldir.c index 0321f954b8..dbab289a37 100644 --- a/sysdeps/unix/bsd/telldir.c +++ b/sysdeps/unix/bsd/telldir.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994 Free Software Foundation, Inc. +/* Copyright (C) 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 @@ -23,6 +23,7 @@ Cambridge, MA 02139, USA. */ #include <unistd.h> #include <sys/types.h> #include <stdlib.h> +#include "dirstream.h" /* Internal data structure for telldir and seekdir. */ struct record |