xnu-344.21.74.tar.gz

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

diff --git a/bsd/sys/namei.h b/bsd/sys/namei.h
index 1dd8bffadd508b4debd7a82609a16bc468c84ffd..40faa46e9f9182cc79e3c7921067a348b78220da 100644 (file)
--- a/bsd/sys/namei.h
+++ b/bsd/sys/namei.h
@@ -1,21 +1,24 @@
 /*
 /*

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

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

- * 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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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

  * 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.

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


@@ -58,6 +61,10 @@
 #ifndef _SYS_NAMEI_H_
 #define        _SYS_NAMEI_H_
 
 #ifndef _SYS_NAMEI_H_
 #define        _SYS_NAMEI_H_
 

+#include <sys/appleapiopts.h>
+
+#ifdef __APPLE_API_UNSTABLE
+

 #include <sys/queue.h>
 #include <sys/uio.h>
 
 #include <sys/queue.h>
 #include <sys/uio.h>
 


@@ -161,7 +168,8 @@ struct nameidata {
 #define        ISSYMLINK       0x010000 /* symlink needs interpretation */
 #define        ISWHITEOUT      0x020000 /* found whiteout */
 #define        DOWHITEOUT      0x040000 /* do whiteouts */
 #define        ISSYMLINK       0x010000 /* symlink needs interpretation */
 #define        ISWHITEOUT      0x020000 /* found whiteout */
 #define        DOWHITEOUT      0x040000 /* do whiteouts */

-#define        NODELETEBUSY    0x800000 /* do not delete busy files (HFS semantic) */
+#define        WILLBEDIR       0x080000 /* new files will be dirs; allow trailing / */
+#define        NODELETEBUSY    0x800000 /* donot delete busy files (Carbon semantic) */

 #define        PARAMASK        0x0fff00 /* mask of parameter descriptors */
 /*
  * Initialization of an nameidata structure.
 #define        PARAMASK        0x0fff00 /* mask of parameter descriptors */
 /*
  * Initialization of an nameidata structure.


@@ -196,6 +204,7 @@ struct      namecache {
 };
 
 #ifdef KERNEL
 };
 
 #ifdef KERNEL

+struct mount;

 extern u_long  nextvnodeid;
 int    namei __P((struct nameidata *ndp));
 int    lookup __P((struct nameidata *ndp));
 extern u_long  nextvnodeid;
 int    namei __P((struct nameidata *ndp));
 int    lookup __P((struct nameidata *ndp));


@@ -224,4 +233,6 @@ struct      nchstats {
        long    ncs_pass2;              /* names found with passes == 2 */
        long    ncs_2passes;            /* number of times we attempt it */
 };
        long    ncs_pass2;              /* names found with passes == 2 */
        long    ncs_2passes;            /* number of times we attempt it */
 };

+#endif /* __APPLE_API_UNSTABLE */
+

 #endif /* !_SYS_NAMEI_H_ */
 #endif /* !_SYS_NAMEI_H_ */