Deleted Added
full compact
dirent.h (103192) dirent.h (123257)
1/*-
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)dirent.h 8.2 (Berkeley) 7/28/94
1/*-
2 * Copyright (c) 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)dirent.h 8.2 (Berkeley) 7/28/94
34 * $FreeBSD: head/include/dirent.h 103192 2002-09-10 18:12:16Z mike $
34 * $FreeBSD: head/include/dirent.h 123257 2003-12-07 21:10:06Z marcel $
35 */
36
37#ifndef _DIRENT_H_
38#define _DIRENT_H_
39
40/*
41 * The kernel defines the format of directory entries returned by
42 * the getdirentries(2) system call.

--- 6 unchanged lines hidden (view full) ---

49 * XXX this is probably illegal in the __XSI_VISIBLE case, but brings us closer
50 * to the specification.
51 */
52#define d_ino d_fileno /* backward and XSI compatibility */
53#endif
54
55#if __BSD_VISIBLE
56
35 */
36
37#ifndef _DIRENT_H_
38#define _DIRENT_H_
39
40/*
41 * The kernel defines the format of directory entries returned by
42 * the getdirentries(2) system call.

--- 6 unchanged lines hidden (view full) ---

49 * XXX this is probably illegal in the __XSI_VISIBLE case, but brings us closer
50 * to the specification.
51 */
52#define d_ino d_fileno /* backward and XSI compatibility */
53#endif
54
55#if __BSD_VISIBLE
56
57#include <sys/_null.h>
58
57/* definitions for library routines operating on directories. */
58#define DIRBLKSIZ 1024
59
60struct _telldir; /* see telldir.h */
61
62/* structure describing an open directory. */
63typedef struct _dirdesc {
64 int dd_fd; /* file descriptor associated with directory */

--- 11 unchanged lines hidden (view full) ---

76#define dirfd(dirp) ((dirp)->dd_fd)
77
78/* flags for opendir2 */
79#define DTF_HIDEW 0x0001 /* hide whiteout entries */
80#define DTF_NODUP 0x0002 /* don't return duplicate names */
81#define DTF_REWIND 0x0004 /* rewind after reading union stack */
82#define __DTF_READALL 0x0008 /* everything has been read */
83
59/* definitions for library routines operating on directories. */
60#define DIRBLKSIZ 1024
61
62struct _telldir; /* see telldir.h */
63
64/* structure describing an open directory. */
65typedef struct _dirdesc {
66 int dd_fd; /* file descriptor associated with directory */

--- 11 unchanged lines hidden (view full) ---

78#define dirfd(dirp) ((dirp)->dd_fd)
79
80/* flags for opendir2 */
81#define DTF_HIDEW 0x0001 /* hide whiteout entries */
82#define DTF_NODUP 0x0002 /* don't return duplicate names */
83#define DTF_REWIND 0x0004 /* rewind after reading union stack */
84#define __DTF_READALL 0x0008 /* everything has been read */
85
84#ifndef NULL
85#define NULL 0
86#endif
87
88#else /* !__BSD_VISIBLE */
89
90typedef void * DIR;
91
92#endif /* __BSD_VISIBLE */
93
94#ifndef _KERNEL
95

--- 28 unchanged lines hidden ---
86#else /* !__BSD_VISIBLE */
87
88typedef void * DIR;
89
90#endif /* __BSD_VISIBLE */
91
92#ifndef _KERNEL
93

--- 28 unchanged lines hidden ---