Libc-391.5.22.tar.gz

[apple/libc.git] / include / dirent.h

diff --git a/include/dirent.h b/include/dirent.h
index af819d49b80257f5c0a8ea8c3aaa22d2fdddf2f0..dd61429b4e08ff42d5dfa37d596fe3c497eed3ee 100644 (file)
--- a/include/dirent.h
+++ b/include/dirent.h
@@ -3,8 +3,6 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
@@ -64,19 +62,13 @@
  * The kernel defines the format of directory entries returned by 
  * the getdirentries(2) system call.
  */
+#include <_types.h>
 #include <sys/dirent.h>
 
-#ifdef _POSIX_SOURCE
-typedef void * DIR;
-#else
-
-#define        d_ino           d_fileno        /* backward compatibility */
-
-/* definitions for library routines operating on directories. */
-#define        DIRBLKSIZ       1024
+struct _telldir;               /* forward reference */
 
 /* structure describing an open directory. */
-typedef struct _dirdesc {
+typedef struct {
        int     dd_fd;          /* file descriptor associated with directory */
        long    dd_loc;         /* offset in current buffer */
        long    dd_size;        /* amount of data returned by getdirentries */
@@ -85,8 +77,14 @@ typedef struct _dirdesc {
        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;
 
+#ifndef _POSIX_C_SOURCE
+/* definitions for library routines operating on directories. */
+#define        DIRBLKSIZ       1024
+
 #define        dirfd(dirp)     ((dirp)->dd_fd)
 
 /* flags for opendir2 */
@@ -95,31 +93,33 @@ typedef struct _dirdesc {
 #define DTF_REWIND     0x0004  /* rewind after reading union stack */
 #define __DTF_READALL  0x0008  /* everything has been read */
 
-#ifndef NULL
-#define        NULL    0
-#endif
-
-#endif /* _POSIX_SOURCE */
+#endif /* ! _POSIX_C_SOURCE */
 
 #ifndef KERNEL
 
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
-DIR *opendir __P((const char *));
-struct dirent *readdir __P((DIR *));
-void rewinddir __P((DIR *));
-int closedir __P((DIR *));
-#ifndef _POSIX_SOURCE
-DIR *__opendir2 __P((const char *, int));
-long telldir __P((const DIR *));
-void seekdir __P((DIR *, long));
-int scandir __P((const char *, struct dirent ***,
-    int (*)(struct dirent *), int (*)(const void *, const void *)));
-int alphasort __P((const void *, const void *));
-int getdirentries __P((int, char *, int, long *));
-int readdir_r __P((DIR *, struct dirent *, struct dirent **));
+#ifndef _POSIX_C_SOURCE
+int alphasort(const void *, const void *);
+#endif /* not POSIX */
+int closedir(DIR *) __DARWIN_ALIAS(closedir);
+#ifndef _POSIX_C_SOURCE
+int getdirentries(int, char *, int, long *);
+#endif /* not POSIX */
+DIR *opendir(const char *) __DARWIN_ALIAS(opendir);
+#ifndef _POSIX_C_SOURCE
+DIR *__opendir2(const char *, int) __DARWIN_ALIAS(__opendir2);
+#endif /* not POSIX */
+struct dirent *readdir(DIR *);
+int readdir_r(DIR *, struct dirent *, struct dirent **);
+void rewinddir(DIR *) __DARWIN_ALIAS(rewinddir);
+#ifndef _POSIX_C_SOURCE
+int scandir(const char *, struct dirent ***,
+    int (*)(struct dirent *), int (*)(const void *, const void *));
 #endif /* not POSIX */
+void seekdir(DIR *, long) __DARWIN_ALIAS(seekdir);
+long telldir(DIR *) __DARWIN_ALIAS(telldir);
 __END_DECLS
 
 #endif /* !KERNEL */