xnu-792.6.56.tar.gz

[apple/xnu.git] / bsd / hfs / hfscommon / BTree / BTreeMiscOps.c

diff --git a/bsd/hfs/hfscommon/BTree/BTreeMiscOps.c b/bsd/hfs/hfscommon/BTree/BTreeMiscOps.c
index 93828720a8f563989ba7e89bcf453a633c10c832..6ba19f120c9791973969bf8b770703de78d21531 100644 (file)
--- a/bsd/hfs/hfscommon/BTree/BTreeMiscOps.c
+++ b/bsd/hfs/hfscommon/BTree/BTreeMiscOps.c
@@ -1,21 +1,22 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
  * @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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
- * 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@
  */
@@ -153,7 +154,7 @@ Result:             noErr           - success
 OSStatus       VerifyHeader    (FCB                            *filePtr,
                                                         BTHeaderRec                     *header )
 {
-       UInt32          forkSize;
+       UInt64          forkSize;
        UInt32          totalNodes;
        
 
@@ -171,9 +172,9 @@ OSStatus    VerifyHeader    (FCB                            *filePtr,
        
        totalNodes = header->totalNodes;
 
-       forkSize = totalNodes * header->nodeSize;
+       forkSize = (UInt64)totalNodes * (UInt64)header->nodeSize;
        
-       if ( forkSize != filePtr->fcbEOF )
+       if ( forkSize > filePtr->fcbEOF )
                return fsBTInvalidHeaderErr;
        
        if ( header->freeNodes >= totalNodes )
@@ -209,6 +210,14 @@ OSStatus   VerifyHeader    (FCB                            *filePtr,
 
 
 
+__private_extern__
+OSStatus TreeIsDirty(BTreeControlBlockPtr btreePtr)
+{
+    return (btreePtr->flags & kBTHeaderDirty);
+}
+
+
+
 /*-------------------------------------------------------------------------------
 Routine:       UpdateHeader    -       Write BTreeInfoRec fields to Header node.
 
@@ -229,15 +238,18 @@ OSStatus UpdateHeader(BTreeControlBlockPtr btreePtr, Boolean forceWrite)
        BTHeaderRec     *header;        
        UInt32 options;
 
-
        if ((btreePtr->flags & kBTHeaderDirty) == 0)                    // btree info already flushed
        return  noErr;
        
        
        err = GetNode (btreePtr, kHeaderNodeNum, &node );
-       if (err != noErr)
+       if (err != noErr) {
                return  err;
+       }
        
+       // XXXdbg
+       ModifyBlockStart(btreePtr->fileRefNum, &node);
+
        header = (BTHeaderRec*) ((char *)node.buffer + sizeof(BTNodeDescriptor));
        
        header->treeDepth               = btreePtr->treeDepth;
@@ -315,8 +327,11 @@ OSStatus   FindIteratorPosition    (BTreeControlBlockPtr    btreePtr,
        // assume foundRecord points to Boolean
        
        left->buffer            = nil;
+       left->blockHeader   = nil;
        middle->buffer          = nil;
+       middle->blockHeader     = nil;
        right->buffer           = nil;
+       right->blockHeader      = nil;
        
        foundIt                         = false;