xnu-2782.1.97.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_endian.c

diff --git a/bsd/hfs/hfs_endian.c b/bsd/hfs/hfs_endian.c
index db0f489d53a3c89dbd272d988bbc86814723aa69..50fb1ddd9a509d3d76d7ad5e4439149225a7ab0f 100644 (file)
--- a/bsd/hfs/hfs_endian.c
+++ b/bsd/hfs/hfs_endian.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2014 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -49,13 +49,17 @@
  * The direction parameter must be kSwapBTNodeBigToHost or kSwapBTNodeHostToBig.
  * The kSwapBTNodeHeaderRecordOnly "direction" is not valid for these routines.
  */
-static int hfs_swap_HFSPlusBTInternalNode (BlockDescriptor *src, HFSCatalogNodeID fileID, enum HFSBTSwapDirection direction);
-static int hfs_swap_HFSBTInternalNode (BlockDescriptor *src, HFSCatalogNodeID fileID, enum HFSBTSwapDirection direction);
+int hfs_swap_HFSPlusBTInternalNode (BlockDescriptor *src, HFSCatalogNodeID fileID, enum HFSBTSwapDirection direction);
+void hfs_swap_HFSPlusForkData (HFSPlusForkData *src);
+
+#if CONFIG_HFS_STD
+int hfs_swap_HFSBTInternalNode (BlockDescriptor *src, HFSCatalogNodeID fileID, enum HFSBTSwapDirection direction);
+#endif
 
 /*
  * hfs_swap_HFSPlusForkData
  */
-static void
+void
 hfs_swap_HFSPlusForkData (
     HFSPlusForkData *src
 )
@@ -90,16 +94,16 @@ hfs_swap_BTNode (
     BTNodeDescriptor *srcDesc = src->buffer;
     u_int16_t *srcOffs = NULL;
        BTreeControlBlockPtr btcb = (BTreeControlBlockPtr)VTOF(vp)->fcbBTCBPtr;
-    u_int32_t i;
+    u_int16_t i; /* index to match srcDesc->numRecords */
     int error = 0;
 
 #ifdef ENDIAN_DEBUG
     if (direction == kSwapBTNodeBigToHost) {
-        printf ("BE -> Native Swap\n");
+        printf ("hfs: BE -> Native Swap\n");
     } else if (direction == kSwapBTNodeHostToBig) {
-        printf ("Native -> BE Swap\n");
+        printf ("hfs: Native -> BE Swap\n");
     } else if (direction == kSwapBTNodeHeaderRecordOnly) {
-        printf ("Not swapping descriptors\n");
+        printf ("hfs: Not swapping descriptors\n");
     } else {
         panic ("hfs_swap_BTNode: This is impossible");
     }
@@ -145,6 +149,7 @@ hfs_swap_BTNode (
                                goto fail;
                        }
 
+
                }
                
                /* 
@@ -159,7 +164,7 @@ hfs_swap_BTNode (
                /*
                 * Check srcDesc->height.  Don't swap it because it's only one byte.
                 */
-               if (srcDesc->height > btcb->treeDepth) {
+               if (srcDesc->height > kMaxTreeDepth) {
                        printf("hfs_swap_BTNode: invalid node height (%d)\n", srcDesc->height);
                        error = fsBTInvalidHeaderErr;
                        goto fail;
@@ -227,9 +232,12 @@ hfs_swap_BTNode (
 
         if (VTOVCB(vp)->vcbSigWord == kHFSPlusSigWord) {
             error = hfs_swap_HFSPlusBTInternalNode (src, VTOC(vp)->c_fileid, direction);
-        } else {
+        } 
+#if CONFIG_HFS_STD
+               else {
             error = hfs_swap_HFSBTInternalNode (src, VTOC(vp)->c_fileid, direction);
         }
+#endif
         
         if (error) goto fail;
         
@@ -313,7 +321,7 @@ hfs_swap_BTNode (
                /* 
                 * Check srcDesc->height.  Don't swap it because it's only one byte.
                 */
-               if (srcDesc->height > btcb->treeDepth) {
+               if (srcDesc->height > kMaxTreeDepth) {
                        panic("hfs_UNswap_BTNode: invalid node height (%d)\n", srcDesc->height);
                        error = fsBTInvalidHeaderErr;
                        goto fail;
@@ -380,15 +388,15 @@ fail:
                /*
                 * Log some useful information about where the corrupt node is.
                 */
-               printf("node=%lld fileID=%u volume=%s device=%s\n", src->blockNum, VTOC(vp)->c_fileid,
+               printf("hfs: node=%lld fileID=%u volume=%s device=%s\n", src->blockNum, VTOC(vp)->c_fileid,
                        VTOVCB(vp)->vcbVN, vfs_statfs(vnode_mount(vp))->f_mntfromname);
-               hfs_mark_volume_inconsistent(VTOVCB(vp));
+               hfs_mark_inconsistent(VTOVCB(vp), HFS_INCONSISTENCY_DETECTED);
        }
        
     return (error);
 }
 
-static int
+int
 hfs_swap_HFSPlusBTInternalNode (
     BlockDescriptor *src,
     HFSCatalogNodeID fileID,
@@ -489,7 +497,7 @@ hfs_swap_HFSPlusBTInternalNode (
              * to be sure the current record doesn't overflow into the next
              * record.
              */
-                       nextRecord = (char *)src->buffer + srcOffs[i-1];
+                       nextRecord = (char *)src->buffer + (uintptr_t)(srcOffs[i-1]);
 
                        /*
                         * Make sure we can safely dereference the keyLength and parentID fields. 
@@ -924,7 +932,8 @@ hfs_swap_HFSPlusBTInternalNode (
     return (0);
 }
 
-static int
+#if CONFIG_HFS_STD
+int
 hfs_swap_HFSBTInternalNode (
     BlockDescriptor *src,
     HFSCatalogNodeID fileID,
@@ -1214,3 +1223,5 @@ hfs_swap_HFSBTInternalNode (
 
     return (0);
 }
+#endif
+