Loading...
--- Libc/Libc-825.26/include/dirent.h
+++ Libc/Libc-498/include/dirent.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2002-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -59,12 +59,11 @@
#define _DIRENT_H_
/*
- * The kernel defines the format of directory entries
+ * The kernel defines the format of directory entries returned by
+ * the getdirentries(2) system call.
*/
#include <_types.h>
#include <sys/dirent.h>
-#include <sys/cdefs.h>
-#include <Availability.h>
struct _telldir; /* forward reference */
@@ -72,20 +71,21 @@
typedef struct {
int __dd_fd; /* file descriptor associated with directory */
long __dd_loc; /* offset in current buffer */
- long __dd_size; /* amount of data returned */
+ long __dd_size; /* amount of data returned by getdirentries */
char *__dd_buf; /* data buffer */
int __dd_len; /* size of data buffer */
- long __dd_seek; /* magic cookie returned */
+ long __dd_seek; /* magic cookie returned by getdirentries */
long __dd_rewind; /* magic cookie for rewinding */
int __dd_flags; /* flags for readdir */
__darwin_pthread_mutex_t __dd_lock; /* for thread locking */
struct _telldir *__dd_td; /* telldir position recording */
} DIR;
-#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
-
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
/* definitions for library routines operating on directories. */
#define DIRBLKSIZ 1024
+
+#define dirfd(dirp) ((dirp)->__dd_fd)
/* flags for opendir2 */
#define DTF_HIDEW 0x0001 /* hide whiteout entries */
@@ -93,12 +93,16 @@
#define DTF_REWIND 0x0004 /* rewind after reading union stack */
#define __DTF_READALL 0x0008 /* everything has been read */
-#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
+#endif /* (!_POSIX_C_SOURCE || _DARWIN_C_SOURCE) */
#ifndef KERNEL
+#include <sys/cdefs.h>
+
__BEGIN_DECLS
-
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int alphasort(const void *, const void *) __DARWIN_INODE64(alphasort);
+#endif /* not POSIX */
//Begin-Libc
#ifndef LIBC_ALIAS_CLOSEDIR
//End-Libc
@@ -108,7 +112,9 @@
int closedir(DIR *) LIBC_ALIAS(closedir);
#endif /* !LIBC_ALIAS_CLOSEDIR */
//End-Libc
-
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int getdirentries(int, char *, int, long *);
+#endif /* not POSIX */
//Begin-Libc
#ifndef LIBC_ALIAS_OPENDIR
//End-Libc
@@ -118,10 +124,19 @@
DIR *opendir(const char *) LIBC_ALIAS_I(opendir);
#endif /* !LIBC_ALIAS_OPENDIR */
//End-Libc
-
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+//Begin-Libc
+#ifndef LIBC_ALIAS___OPENDIR2
+//End-Libc
+DIR *__opendir2(const char *, int) __DARWIN_ALIAS_I(__opendir2);
+//Begin-Libc
+#else /* LIBC_ALIAS___OPENDIR2 */
+DIR *__opendir2(const char *, int) LIBC_ALIAS_I(__opendir2);
+#endif /* !LIBC_ALIAS___OPENDIR2 */
+//End-Libc
+#endif /* not POSIX */
struct dirent *readdir(DIR *) __DARWIN_INODE64(readdir);
int readdir_r(DIR *, struct dirent *, struct dirent **) __DARWIN_INODE64(readdir_r);
-
//Begin-Libc
#ifndef LIBC_ALIAS_REWINDDIR
//End-Libc
@@ -131,7 +146,10 @@
void rewinddir(DIR *) LIBC_ALIAS_I(rewinddir);
#endif /* !LIBC_ALIAS_REWINDDIR */
//End-Libc
-
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+int scandir(const char *, struct dirent ***,
+ int (*)(struct dirent *), int (*)(const void *, const void *)) __DARWIN_INODE64(scandir);
+#endif /* not POSIX */
//Begin-Libc
#ifndef LIBC_ALIAS_SEEKDIR
//End-Libc
@@ -141,7 +159,6 @@
void seekdir(DIR *, long) LIBC_ALIAS_I(seekdir);
#endif /* !LIBC_ALIAS_SEEKDIR */
//End-Libc
-
//Begin-Libc
#ifndef LIBC_ALIAS_TELLDIR
//End-Libc
@@ -151,80 +168,7 @@
long telldir(DIR *) LIBC_ALIAS_I(telldir);
#endif /* !LIBC_ALIAS_TELLDIR */
//End-Libc
-
__END_DECLS
-
-
-/* Additional functionality provided by:
- * POSIX.1-2008
- */
-
-#if __DARWIN_C_LEVEL >= 200809L
-__BEGIN_DECLS
-
-int alphasort(const struct dirent **, const struct dirent **) __DARWIN_INODE64(alphasort);
-
-#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_8) || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_6_0)
-#include <errno.h>
-#include <stdlib.h>
-#define dirfd(dirp) ({ \
- DIR *_dirp = (dirp); \
- int ret = -1; \
- if (_dirp == NULL || _dirp->__dd_fd < 0) \
- errno = EINVAL; \
- else \
- ret = _dirp->__dd_fd; \
- ret; \
-})
-#else
-int dirfd(DIR *dirp) __OSX_AVAILABLE_STARTING(__MAC_10_8, __IPHONE_6_0);
-#endif
-
-int scandir(const char *, struct dirent ***,
- int (*)(const struct dirent *), int (*)(const struct dirent **, const struct dirent **)) __DARWIN_INODE64(scandir);
-#ifdef __BLOCKS__
-int scandir_b(const char *, struct dirent ***,
- int (^)(const struct dirent *), int (^)(const struct dirent **, const struct dirent **)) __DARWIN_INODE64(scandir_b) __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2);
-#endif /* __BLOCKS__ */
-
-__END_DECLS
-#endif /* __DARWIN_C_LEVEL >= 200809L */
-
-
-#if __DARWIN_C_LEVEL >= __DARWIN_C_FULL
-__BEGIN_DECLS
-
-int getdirentries(int, char *, int, long *)
-
-//Begin-Libc
-#ifndef __LIBC__
-//End-Libc
-#if __DARWIN_64_BIT_INO_T
-/*
- * getdirentries() doesn't work when 64-bit inodes is in effect, so we
- * generate a link error.
- */
- __asm("_getdirentries_is_not_available_when_64_bit_inodes_are_in_effect")
-#else /* !__DARWIN_64_BIT_INO_T */
- __OSX_AVAILABLE_BUT_DEPRECATED(__MAC_10_0,__MAC_10_6, __IPHONE_2_0,__IPHONE_2_0)
-#endif /* __DARWIN_64_BIT_INO_T */
-//Begin-Libc
-#endif /* !__LIBC__ */
-//End-Libc
-;
-
-//Begin-Libc
-#ifndef LIBC_ALIAS___OPENDIR2
-//End-Libc
-DIR *__opendir2(const char *, int) __DARWIN_ALIAS_I(__opendir2);
-//Begin-Libc
-#else /* LIBC_ALIAS___OPENDIR2 */
-DIR *__opendir2(const char *, int) LIBC_ALIAS_I(__opendir2);
-#endif /* !LIBC_ALIAS___OPENDIR2 */
-//End-Libc
-
-__END_DECLS
-#endif /* __DARWIN_C_LEVEL >= __DARWIN_C_FULL */
#endif /* !KERNEL */