xnu-792.6.22.tar.gz

[apple/xnu.git] / bsd / sys / dirent.h

diff --git a/bsd/sys/dirent.h b/bsd/sys/dirent.h
index 61877ae36d863495d5394d4478669e57abb1fda5..1b4d5e501ea31f5736d1b007c69111486fbc9063 100644 (file)
--- a/bsd/sys/dirent.h
+++ b/bsd/sys/dirent.h
@@ -1,24 +1,21 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * The contents of this file constitute Original Code as defined in and
+ * are subject to the Apple Public Source License Version 1.1 (the
+ * "License").  You may not use this file except in compliance with the
+ * License.  Please obtain a copy of the License at
+ * http://www.apple.com/publicsource and read it before using this file.

  * 
  * 

- * 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
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
- * 
- * The Original Code and all software distributed under the License are
- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * This Original Code and all software distributed under the License are
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -72,19 +69,50 @@
 #ifndef _SYS_DIRENT_H 
 #define _SYS_DIRENT_H 
 
 #ifndef _SYS_DIRENT_H 
 #define _SYS_DIRENT_H 
 

+#include <sys/_types.h>
+#include <sys/cdefs.h>
+
+#ifndef        _INO_T
+typedef        __darwin_ino_t  ino_t;          /* inode number */
+#define _INO_T
+#endif
+
+#define __DARWIN_MAXNAMLEN     255
+
+#if __DARWIN_ALIGN_POWER
+#pragma options align=power
+#endif
+

 struct dirent {
 struct dirent {

-       u_int32_t d_fileno;             /* file number of entry */
-       u_int16_t d_reclen;             /* length of this record */
-       u_int8_t  d_type;               /* file type, see below */
-       u_int8_t  d_namlen;             /* length of string in d_name */
-#ifdef _POSIX_SOURCE
-       char    d_name[255 + 1];        /* name must be no longer than this */
-#else
-#define        MAXNAMLEN       255
-       char    d_name[MAXNAMLEN + 1];  /* name must be no longer than this */
+       ino_t d_ino;                    /* file number of entry */
+       __uint16_t d_reclen;            /* length of this record */
+       __uint8_t  d_type;              /* file type, see below */
+       __uint8_t  d_namlen;            /* length of string in d_name */
+       char d_name[__DARWIN_MAXNAMLEN + 1];    /* name must be no longer than this */
+};
+
+#if __DARWIN_ALIGN_POWER
+#pragma options align=reset

 #endif
 #endif

+
+#ifdef KERNEL
+#include <sys/kernel_types.h>
+
+/* Extended directory entry */
+struct direntry{
+       ino64_t     d_ino;      /* file number of entry */
+       __uint64_t  d_seekoff;   /* seek offset (optional, used by servers) */
+       __uint16_t  d_reclen;   /* length of this record */
+       __uint16_t  d_namlen;   /* length of string in d_name */
+       __uint8_t   d_type;     /* file type, see below */
+       u_char      d_name[MAXPATHLEN - 1]; /* entry name (up to MAXPATHLEN - 1 bytes) */

 };
 };

+#endif
+

 
 

+#ifndef _POSIX_C_SOURCE
+#define        d_fileno        d_ino           /* backward compatibility */
+#define        MAXNAMLEN       __DARWIN_MAXNAMLEN

 /*
  * File types
  */
 /*
  * File types
  */


@@ -103,5 +131,6 @@ struct dirent {
  */
 #define        IFTODT(mode)    (((mode) & 0170000) >> 12)
 #define        DTTOIF(dirtype) ((dirtype) << 12)
  */
 #define        IFTODT(mode)    (((mode) & 0170000) >> 12)
 #define        DTTOIF(dirtype) ((dirtype) << 12)

+#endif

 
 #endif /* _SYS_DIRENT_H  */
 
 #endif /* _SYS_DIRENT_H  */