mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
* 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.
This commit is contained in:
@ -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 */
|
||||
|
@ -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 *
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user