hfs-165.tar.gz

[apple/hfs.git] / hfs_util / hfsutil_main.c

diff --git a/hfs_util/hfsutil_main.c b/hfs_util/hfsutil_main.c
index 3d899f87564db9faa8bce07eddc463c26715563b..15bb2d1ba87a56258749f90bd7953b210df4031e 100644 (file)
--- a/hfs_util/hfsutil_main.c
+++ b/hfs_util/hfsutil_main.c
@@ -65,12 +65,21 @@
 #include <unistd.h>
 #include <syslog.h>
 
 #include <unistd.h>
 #include <syslog.h>
 

-#include <openssl/sha.h>
+/*
+ * CommonCrypto provides a more stable API than OpenSSL guarantees;
+ * the #define causes it to use the same API for MD5 and SHA1, so the rest of
+ * the code need not change.
+ */
+#define COMMON_DIGEST_FOR_OPENSSL
+#include  <CommonCrypto/CommonDigest.h>

 
 

-#include <architecture/byte_order.h>
+#include <libkern/OSByteOrder.h>

 
 #include <CoreFoundation/CFString.h>
 
 
 #include <CoreFoundation/CFString.h>
 

+#include <System/uuid/uuid.h>
+#include <System/uuid/namespace.h>
+

 #define READ_DEFAULT_ENCODING 1
 
 #ifndef FSUC_ADOPT
 #define READ_DEFAULT_ENCODING 1
 
 #ifndef FSUC_ADOPT


@@ -97,6 +106,10 @@
 #define FSUC_UNJNL   'U'
 #endif
 
 #define FSUC_UNJNL   'U'
 #endif
 

+#ifndef FSUC_UNJNL_RAW
+#define FSUC_UNJNL_RAW 'N'
+#endif
+

 #ifndef FSUC_JNLINFO
 #define FSUC_JNLINFO 'I'
 #endif
 #ifndef FSUC_JNLINFO
 #define FSUC_JNLINFO 'I'
 #endif


@@ -181,6 +194,7 @@ static int  DoDisown( const char * theDeviceNamePtr );
 extern int  DoMakeJournaled( const char * volNamePtr, int journalSize );  // XXXdbg
 extern int  DoUnJournal( const char * volNamePtr );      // XXXdbg
 extern int  DoGetJournalInfo( const char * volNamePtr );
 extern int  DoMakeJournaled( const char * volNamePtr, int journalSize );  // XXXdbg
 extern int  DoUnJournal( const char * volNamePtr );      // XXXdbg
 extern int  DoGetJournalInfo( const char * volNamePtr );

+extern int  RawDisableJournaling( const char *devname );

 
 static int     ParseArgs( int argc, const char * argv[], const char ** actionPtr, const char ** mountPointPtr, boolean_t * isEjectablePtr, boolean_t * isLockedPtr, boolean_t * isSetuidPtr, boolean_t * isDevPtr );
 
 
 static int     ParseArgs( int argc, const char * argv[], const char ** actionPtr, const char ** mountPointPtr, boolean_t * isEjectablePtr, boolean_t * isLockedPtr, boolean_t * isSetuidPtr, boolean_t * isDevPtr );
 


@@ -193,7 +207,7 @@ static int  SetVolumeUUIDRaw(const char *deviceNamePtr, VolumeUUID *volumeUUIDPtr
 static int     SetVolumeUUIDAttr(const char *path, VolumeUUID *volumeUUIDPtr);
 static int     SetVolumeUUID(const char *deviceNamePtr, VolumeUUID *volumeUUIDPtr);
 static int     GetEmbeddedHFSPlusVol(HFSMasterDirectoryBlock * hfsMasterDirectoryBlockPtr, off_t * startOffsetPtr);
 static int     SetVolumeUUIDAttr(const char *path, VolumeUUID *volumeUUIDPtr);
 static int     SetVolumeUUID(const char *deviceNamePtr, VolumeUUID *volumeUUIDPtr);
 static int     GetEmbeddedHFSPlusVol(HFSMasterDirectoryBlock * hfsMasterDirectoryBlockPtr, off_t * startOffsetPtr);

-static int     GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * name_o);
+static int     GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, unsigned char * name_o);

 static int     GetBTreeNodeInfo(int fd, off_t hfsPlusVolumeOffset, u_int32_t blockSize,
                                                        u_int32_t extentCount, const HFSPlusExtentDescriptor *extentList,
                                                        u_int32_t *nodeSize, u_int32_t *firstLeafNode);
 static int     GetBTreeNodeInfo(int fd, off_t hfsPlusVolumeOffset, u_int32_t blockSize,
                                                        u_int32_t extentCount, const HFSPlusExtentDescriptor *extentList,
                                                        u_int32_t *nodeSize, u_int32_t *firstLeafNode);


@@ -213,6 +227,8 @@ static int  GetEncodingBias(void);
 
 CF_EXPORT Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *buffer, CFIndex maxBufLen);
 
 
 CF_EXPORT Boolean _CFStringGetFileSystemRepresentation(CFStringRef string, UInt8 *buffer, CFIndex maxBufLen);
 

+static void     uuid_create_md5_from_name(uuid_t result_uuid, const uuid_t namespace, const void *name, int namelen);
+

 /*
  * The fuction CFStringGetSystemEncoding does not work correctly in
  * our context (autodiskmount deamon).  We include a local copy here
 /*
  * The fuction CFStringGetSystemEncoding does not work correctly in
  * our context (autodiskmount deamon).  We include a local copy here


@@ -436,6 +452,10 @@ int main (int argc, const char *argv[])
                        result = DoUnJournal( argv[2] );
                        break;
                        
                        result = DoUnJournal( argv[2] );
                        break;
                        

+               case FSUC_UNJNL_RAW:
+                       result = RawDisableJournaling( argv[2] );
+                       break;
+                       

                case FSUC_JNLINFO:
                        result = DoGetJournalInfo( argv[2] );
                        break;
                case FSUC_JNLINFO:
                        result = DoGetJournalInfo( argv[2] );
                        break;


@@ -675,20 +695,20 @@ DoProbe(char *deviceNamePtr)
                goto Return;
 
        /* get classic HFS volume name (from MDB) */
                goto Return;
 
        /* get classic HFS volume name (from MDB) */

-       if (NXSwapBigShortToHost(mdbPtr->drSigWord) == kHFSSigWord &&
-           NXSwapBigShortToHost(mdbPtr->drEmbedSigWord) != kHFSPlusSigWord) {
+       if (OSSwapBigToHostInt16(mdbPtr->drSigWord) == kHFSSigWord &&
+           OSSwapBigToHostInt16(mdbPtr->drEmbedSigWord) != kHFSPlusSigWord) {

                Boolean cfOK;
                CFStringRef cfstr;
                CFStringEncoding encoding;
 
                /* Some poorly mastered HFS CDs have an empty MDB name field! */
                if (mdbPtr->drVN[0] == '\0') {
                Boolean cfOK;
                CFStringRef cfstr;
                CFStringEncoding encoding;
 
                /* Some poorly mastered HFS CDs have an empty MDB name field! */
                if (mdbPtr->drVN[0] == '\0') {

-                       strcpy(&mdbPtr->drVN[1], gHFS_FS_NAME_NAME);
+                       strcpy((char *)&mdbPtr->drVN[1], gHFS_FS_NAME_NAME);

                        mdbPtr->drVN[0] = strlen(gHFS_FS_NAME_NAME);
                }
 
                /* Check for an encoding hint in the Finder Info (field 4). */
                        mdbPtr->drVN[0] = strlen(gHFS_FS_NAME_NAME);
                }
 
                /* Check for an encoding hint in the Finder Info (field 4). */

-               encoding = GET_HFS_TEXT_ENCODING(NXSwapBigLongToHost(mdbPtr->drFndrInfo[4]));
+               encoding = GET_HFS_TEXT_ENCODING(OSSwapBigToHostInt32(mdbPtr->drFndrInfo[4]));

                if (encoding == kCFStringEncodingInvalidId) {
                        /* Next try the encoding bias in the kernel. */
                        encoding = GetEncodingBias();
                if (encoding == kCFStringEncodingInvalidId) {
                        /* Next try the encoding bias in the kernel. */
                        encoding = GetEncodingBias();


@@ -722,13 +742,13 @@ DoProbe(char *deviceNamePtr)
                }
  
        /* get HFS Plus volume name (from Catalog) */
                }
  
        /* get HFS Plus volume name (from Catalog) */

-       } else if ((NXSwapBigShortToHost(volHdrPtr->signature) == kHFSPlusSigWord)  ||
-                  (NXSwapBigShortToHost(volHdrPtr->signature) == kHFSXSigWord)  ||
-                  (NXSwapBigShortToHost(mdbPtr->drSigWord) == kHFSSigWord &&
-                   NXSwapBigShortToHost(mdbPtr->drEmbedSigWord) == kHFSPlusSigWord)) {
+       } else if ((OSSwapBigToHostInt16(volHdrPtr->signature) == kHFSPlusSigWord)  ||
+                  (OSSwapBigToHostInt16(volHdrPtr->signature) == kHFSXSigWord)  ||
+                  (OSSwapBigToHostInt16(mdbPtr->drSigWord) == kHFSSigWord &&
+                   OSSwapBigToHostInt16(mdbPtr->drEmbedSigWord) == kHFSPlusSigWord)) {

                off_t startOffset;
 
                off_t startOffset;
 

-               if (NXSwapBigShortToHost(volHdrPtr->signature) == kHFSSigWord) {
+               if (OSSwapBigToHostInt16(volHdrPtr->signature) == kHFSSigWord) {

                        /* embedded volume, first find offset */
                        result = GetEmbeddedHFSPlusVol(mdbPtr, &startOffset);
                        if ( result != FSUR_IO_SUCCESS )
                        /* embedded volume, first find offset */
                        result = GetEmbeddedHFSPlusVol(mdbPtr, &startOffset);
                        if ( result != FSUR_IO_SUCCESS )


@@ -744,7 +764,7 @@ DoProbe(char *deviceNamePtr)
        }
 
        if (FSUR_IO_SUCCESS == result) {
        }
 
        if (FSUR_IO_SUCCESS == result) {

-               char *s;
+               unsigned char *s;

                
                /* Change slashes to colons in the volume name */
                for (s=volnameUTF8; *s; ++s) {
                
                /* Change slashes to colons in the volume name */
                for (s=volnameUTF8; *s; ++s) {


@@ -753,7 +773,7 @@ DoProbe(char *deviceNamePtr)
                }
 
                /* Print the volume name to standard output */
                }
 
                /* Print the volume name to standard output */

-               write(1, volnameUTF8, strlen(volnameUTF8));
+               write(1, volnameUTF8, strlen((char *)volnameUTF8));

                result = FSUR_RECOGNIZED;
        }
 
                result = FSUR_RECOGNIZED;
        }
 


@@ -769,11 +789,34 @@ Return:
 
 } /* DoProbe */
 
 
 } /* DoProbe */
 

+/*
+ * Create a version 3 UUID from a unique "name" in the given "name space".  
+ * Version 3 UUID are derived using "name" via MD5 checksum.
+ *
+ * Parameters:
+ *     result_uuid     - resulting UUID.
+ *     namespace       - namespace in which given name exists and UUID should be created.
+ *     name            - unique string used to create version 3 UUID.
+ *     namelen     - length of the name string.
+ */
+static void
+uuid_create_md5_from_name(uuid_t result_uuid, const uuid_t namespace, const void *name, int namelen)
+{
+    MD5_CTX c;
+
+    MD5_Init(&c);
+    MD5_Update(&c, namespace, sizeof(uuid_t));
+    MD5_Update(&c, name, namelen);
+    MD5_Final(result_uuid, &c);
+
+    result_uuid[6] = (result_uuid[6] & 0x0F) | 0x30;
+    result_uuid[8] = (result_uuid[8] & 0x3F) | 0x80;
+}

 
 
 /* **************************************** DoGetUUIDKey *******************************************
 Purpose -
 
 
 /* **************************************** DoGetUUIDKey *******************************************
 Purpose -

-    This routine will open the given block device and return the volume UUID in text form written to stdout.
+    This routine will open the given block device and return the 128-bit volume UUID in text form written to stdout.

 Input -
     theDeviceNamePtr - pointer to the device name (full path, like /dev/disk0s2).
 Output -
 Input -
     theDeviceNamePtr - pointer to the device name (full path, like /dev/disk0s2).
 Output -


@@ -783,13 +826,18 @@ static int
 DoGetUUIDKey( const char * theDeviceNamePtr ) {
        int result;
        VolumeUUID targetVolumeUUID;
 DoGetUUIDKey( const char * theDeviceNamePtr ) {
        int result;
        VolumeUUID targetVolumeUUID;

-       VolumeUUIDString UUIDString;
-       char uuidLine[VOLUMEUUIDLENGTH+2];
-       
+       uuid_t uuid;
+       char uuidLine[40];
+
+       unsigned char rawUUID[8];
+

        if ((result = GetVolumeUUID(theDeviceNamePtr, &targetVolumeUUID, FALSE)) != FSUR_IO_SUCCESS) goto Err_Exit;
        if ((result = GetVolumeUUID(theDeviceNamePtr, &targetVolumeUUID, FALSE)) != FSUR_IO_SUCCESS) goto Err_Exit;

-       
-       ConvertVolumeUUIDToString( &targetVolumeUUID, UUIDString);
-       strncpy(uuidLine, UUIDString, VOLUMEUUIDLENGTH+1);
+
+       ((uint32_t *)rawUUID)[0] = OSSwapHostToBigInt32(targetVolumeUUID.v.high);
+       ((uint32_t *)rawUUID)[1] = OSSwapHostToBigInt32(targetVolumeUUID.v.low);
+
+       uuid_create_md5_from_name(uuid, kFSUUIDNamespaceSHA1, rawUUID, sizeof(rawUUID));
+       uuid_unparse(uuid, uuidLine);

        write(1, uuidLine, strlen(uuidLine));
        result = FSUR_IO_SUCCESS;
        
        write(1, uuidLine, strlen(uuidLine));
        result = FSUR_IO_SUCCESS;
        


@@ -1050,6 +1098,11 @@ ParseArgs(int argc, const char *argv[], const char ** actionPtr,
                        doLengthCheck = 0;
                        break;
 
                        doLengthCheck = 0;
                        break;
 

+               case FSUC_UNJNL_RAW:
+                       index = 0;
+                       doLengthCheck = 0;
+                       break;
+

                case FSUC_JNLINFO:
                        index = 0;
                        doLengthCheck = 0;
                case FSUC_JNLINFO:
                        index = 0;
                        doLengthCheck = 0;


@@ -1143,6 +1196,7 @@ DoDisplayUsage(const char *argv[])
     printf("       -%c (Adopt permissions)\n", FSUC_ADOPT);
        printf("       -%c (Make a file system journaled)\n", FSUC_MKJNL);
        printf("       -%c (Turn off journaling on a file system)\n", FSUC_UNJNL);
     printf("       -%c (Adopt permissions)\n", FSUC_ADOPT);
        printf("       -%c (Make a file system journaled)\n", FSUC_MKJNL);
        printf("       -%c (Turn off journaling on a file system)\n", FSUC_UNJNL);

+       printf("       -%c (Turn off journaling on a raw device)\n", FSUC_UNJNL_RAW);

        printf("       -%c (Get size & location of journaling on a file system)\n", FSUC_JNLINFO);
     printf("device_arg:\n");
     printf("       device we are acting upon (for example, 'disk0s2')\n");
        printf("       -%c (Get size & location of journaling on a file system)\n", FSUC_JNLINFO);
     printf("device_arg:\n");
     printf("       device we are acting upon (for example, 'disk0s2')\n");


@@ -1240,8 +1294,8 @@ ReadHeaderBlock(int fd, void *bufPtr, off_t *startOffset, VolumeUUID **finderInf
         * If this is a wrapped HFS Plus volume, read the Volume Header from
         * sector 2 of the embedded volume.
         */
         * If this is a wrapped HFS Plus volume, read the Volume Header from
         * sector 2 of the embedded volume.
         */

-       if (NXSwapBigShortToHost(mdbPtr->drSigWord) == kHFSSigWord &&
-               NXSwapBigShortToHost(mdbPtr->drEmbedSigWord) == kHFSPlusSigWord) {
+       if (OSSwapBigToHostInt16(mdbPtr->drSigWord) == kHFSSigWord &&
+               OSSwapBigToHostInt16(mdbPtr->drEmbedSigWord) == kHFSPlusSigWord) {

                result = GetEmbeddedHFSPlusVol(mdbPtr, startOffset);
                if (result != FSUR_IO_SUCCESS)
                        goto Err_Exit;
                result = GetEmbeddedHFSPlusVol(mdbPtr, startOffset);
                if (result != FSUR_IO_SUCCESS)
                        goto Err_Exit;


@@ -1255,10 +1309,10 @@ ReadHeaderBlock(int fd, void *bufPtr, off_t *startOffset, VolumeUUID **finderInf
         * volumes (including wrapped HFS Plus).  Verify the signature and grab the
         * UUID from the Finder Info.
         */
         * volumes (including wrapped HFS Plus).  Verify the signature and grab the
         * UUID from the Finder Info.
         */

-       if (NXSwapBigShortToHost(mdbPtr->drSigWord) == kHFSSigWord) {
+       if (OSSwapBigToHostInt16(mdbPtr->drSigWord) == kHFSSigWord) {

            *finderInfoUUIDPtr = (VolumeUUID *)(&mdbPtr->drFndrInfo[6]);
            *finderInfoUUIDPtr = (VolumeUUID *)(&mdbPtr->drFndrInfo[6]);

-       } else if (NXSwapBigShortToHost(volHdrPtr->signature) == kHFSPlusSigWord ||
-                               NXSwapBigShortToHost(volHdrPtr->signature) == kHFSXSigWord) {
+       } else if (OSSwapBigToHostInt16(volHdrPtr->signature) == kHFSPlusSigWord ||
+                               OSSwapBigToHostInt16(volHdrPtr->signature) == kHFSXSigWord) {

            *finderInfoUUIDPtr = (VolumeUUID *)&volHdrPtr->finderInfo[24];
        } else {
                result = FSUR_UNRECOGNIZED;
            *finderInfoUUIDPtr = (VolumeUUID *)&volHdrPtr->finderInfo[24];
        } else {
                result = FSUR_UNRECOGNIZED;


@@ -1312,8 +1366,8 @@ GetVolumeUUIDRaw(const char *deviceNamePtr, VolumeUUID *volumeUUIDPtr)
        /*
         * Copy the volume UUID out of the Finder Info
         */
        /*
         * Copy the volume UUID out of the Finder Info
         */

-       volumeUUIDPtr->v.high = NXSwapBigLongToHost(finderInfoUUIDPtr->v.high);
-       volumeUUIDPtr->v.low = NXSwapBigLongToHost(finderInfoUUIDPtr->v.low);
+       volumeUUIDPtr->v.high = OSSwapBigToHostInt32(finderInfoUUIDPtr->v.high);
+       volumeUUIDPtr->v.low = OSSwapBigToHostInt32(finderInfoUUIDPtr->v.low);

 
 Err_Exit:
        if (fd > 0) close(fd);
 
 Err_Exit:
        if (fd > 0) close(fd);


@@ -1369,8 +1423,8 @@ SetVolumeUUIDRaw(const char *deviceNamePtr, VolumeUUID *volumeUUIDPtr)
        /*
         * Update the UUID in the Finder Info
         */
        /*
         * Update the UUID in the Finder Info
         */

-       finderInfoUUIDPtr->v.high = NXSwapHostLongToBig(volumeUUIDPtr->v.high);
-       finderInfoUUIDPtr->v.low = NXSwapHostLongToBig(volumeUUIDPtr->v.low);
+       finderInfoUUIDPtr->v.high = OSSwapHostToBigInt32(volumeUUIDPtr->v.high);
+       finderInfoUUIDPtr->v.low = OSSwapHostToBigInt32(volumeUUIDPtr->v.low);

 
        /*
         * Write the modified MDB or VHB back to disk
 
        /*
         * Write the modified MDB or VHB back to disk


@@ -1422,8 +1476,8 @@ GetVolumeUUIDAttr(const char *path, VolumeUUID *volumeUUIDPtr)
 
        /* Copy the UUID from the Finder Into to caller's buffer */
        finderInfoUUIDPtr = (VolumeUUID *)(&volFinderInfo.finderinfo[6]);
 
        /* Copy the UUID from the Finder Into to caller's buffer */
        finderInfoUUIDPtr = (VolumeUUID *)(&volFinderInfo.finderinfo[6]);

-       volumeUUIDPtr->v.high = NXSwapBigLongToHost(finderInfoUUIDPtr->v.high);
-       volumeUUIDPtr->v.low = NXSwapBigLongToHost(finderInfoUUIDPtr->v.low);
+       volumeUUIDPtr->v.high = OSSwapBigToHostInt32(finderInfoUUIDPtr->v.high);
+       volumeUUIDPtr->v.low = OSSwapBigToHostInt32(finderInfoUUIDPtr->v.low);

        result = FSUR_IO_SUCCESS;
 
 Err_Exit:
        result = FSUR_IO_SUCCESS;
 
 Err_Exit:


@@ -1465,8 +1519,8 @@ SetVolumeUUIDAttr(const char *path, VolumeUUID *volumeUUIDPtr)
 
        /* Update the UUID in the Finder Info */
        finderInfoUUIDPtr = (VolumeUUID *)(&volFinderInfo.finderinfo[6]);
 
        /* Update the UUID in the Finder Info */
        finderInfoUUIDPtr = (VolumeUUID *)(&volFinderInfo.finderinfo[6]);

-       finderInfoUUIDPtr->v.high = NXSwapHostLongToBig(volumeUUIDPtr->v.high);
-       finderInfoUUIDPtr->v.low = NXSwapHostLongToBig(volumeUUIDPtr->v.low);
+       finderInfoUUIDPtr->v.high = OSSwapHostToBigInt32(volumeUUIDPtr->v.high);
+       finderInfoUUIDPtr->v.low = OSSwapHostToBigInt32(volumeUUIDPtr->v.low);

 
        /* Write the Finder Info back to the volume */
        result = setattrlist(path, &alist, &volFinderInfo.finderinfo, sizeof(volFinderInfo.finderinfo), 0);
 
        /* Write the Finder Info back to the volume */
        result = setattrlist(path, &alist, &volFinderInfo.finderinfo, sizeof(volFinderInfo.finderinfo), 0);


@@ -1595,21 +1649,21 @@ GetEmbeddedHFSPlusVol (HFSMasterDirectoryBlock * hfsMasterDirectoryBlockPtr, off
     int                result = FSUR_IO_SUCCESS;
     u_int32_t  allocationBlockSize, firstAllocationBlock, startBlock, blockCount;
 
     int                result = FSUR_IO_SUCCESS;
     u_int32_t  allocationBlockSize, firstAllocationBlock, startBlock, blockCount;
 

-    if (NXSwapBigShortToHost(hfsMasterDirectoryBlockPtr->drSigWord) != kHFSSigWord) {
+    if (OSSwapBigToHostInt16(hfsMasterDirectoryBlockPtr->drSigWord) != kHFSSigWord) {

         result = FSUR_UNRECOGNIZED;
         goto Return;
     }
 
         result = FSUR_UNRECOGNIZED;
         goto Return;
     }
 

-    allocationBlockSize = NXSwapBigLongToHost(hfsMasterDirectoryBlockPtr->drAlBlkSiz);
-    firstAllocationBlock = NXSwapBigShortToHost(hfsMasterDirectoryBlockPtr->drAlBlSt);
+    allocationBlockSize = OSSwapBigToHostInt32(hfsMasterDirectoryBlockPtr->drAlBlkSiz);
+    firstAllocationBlock = OSSwapBigToHostInt16(hfsMasterDirectoryBlockPtr->drAlBlSt);

 
 

-    if (NXSwapBigShortToHost(hfsMasterDirectoryBlockPtr->drEmbedSigWord) != kHFSPlusSigWord) {
+    if (OSSwapBigToHostInt16(hfsMasterDirectoryBlockPtr->drEmbedSigWord) != kHFSPlusSigWord) {

         result = FSUR_UNRECOGNIZED;
         goto Return;
     }
 
         result = FSUR_UNRECOGNIZED;
         goto Return;
     }
 

-    startBlock = NXSwapBigShortToHost(hfsMasterDirectoryBlockPtr->drEmbedExtent.startBlock);
-    blockCount = NXSwapBigShortToHost(hfsMasterDirectoryBlockPtr->drEmbedExtent.blockCount);
+    startBlock = OSSwapBigToHostInt16(hfsMasterDirectoryBlockPtr->drEmbedExtent.startBlock);
+    blockCount = OSSwapBigToHostInt16(hfsMasterDirectoryBlockPtr->drEmbedExtent.blockCount);

 
     if ( startOffsetPtr )
         *startOffsetPtr = ((u_int64_t)startBlock * (u_int64_t)allocationBlockSize) +
 
     if ( startOffsetPtr )
         *startOffsetPtr = ((u_int64_t)startBlock * (u_int64_t)allocationBlockSize) +


@@ -1631,7 +1685,7 @@ Return:
  */
 
 static int
  */
 
 static int

-GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * name_o)
+GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, unsigned char * name_o)

 {
     int                                        result = FSUR_IO_SUCCESS;
     u_int32_t                          blockSize;
 {
     int                                        result = FSUR_IO_SUCCESS;
     u_int32_t                          blockSize;


@@ -1663,8 +1717,8 @@ GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * nam
 
     /* Verify that it is an HFS+ volume. */
 
 
     /* Verify that it is an HFS+ volume. */
 

-    if (NXSwapBigShortToHost(volHdrPtr->signature) != kHFSPlusSigWord &&
-        NXSwapBigShortToHost(volHdrPtr->signature) != kHFSXSigWord) {
+    if (OSSwapBigToHostInt16(volHdrPtr->signature) != kHFSPlusSigWord &&
+        OSSwapBigToHostInt16(volHdrPtr->signature) != kHFSXSigWord) {

         result = FSUR_IO_FAIL;
 #if TRACE_HFS_UTIL
         fprintf(stderr, "hfs.util: GetNameFromHFSPlusVolumeStartingAt: volHdrPtr->signature != kHFSPlusSigWord\n");
         result = FSUR_IO_FAIL;
 #if TRACE_HFS_UTIL
         fprintf(stderr, "hfs.util: GetNameFromHFSPlusVolumeStartingAt: volHdrPtr->signature != kHFSPlusSigWord\n");


@@ -1672,7 +1726,7 @@ GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * nam
         goto Return;
     }
 
         goto Return;
     }
 

-    blockSize = NXSwapBigLongToHost(volHdrPtr->blockSize);
+    blockSize = OSSwapBigToHostInt32(volHdrPtr->blockSize);

     catalogExtents = (HFSPlusExtentDescriptor *) malloc(sizeof(HFSPlusExtentRecord));
     if ( ! catalogExtents ) {
         result = FSUR_IO_FAIL;
     catalogExtents = (HFSPlusExtentDescriptor *) malloc(sizeof(HFSPlusExtentRecord));
     if ( ! catalogExtents ) {
         result = FSUR_IO_FAIL;


@@ -1682,7 +1736,7 @@ GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * nam
        catalogExtCount = kHFSPlusExtentDensity;
 
        /* if there are overflow catalog extents, then go get them */
        catalogExtCount = kHFSPlusExtentDensity;
 
        /* if there are overflow catalog extents, then go get them */

-       if (NXSwapBigLongToHost(catalogExtents[7].blockCount) != 0) {
+       if (OSSwapBigToHostInt32(catalogExtents[7].blockCount) != 0) {

                result = GetCatalogOverflowExtents(fd, hfsPlusVolumeOffset, volHdrPtr, &catalogExtents, &catalogExtCount);
                if (result != FSUR_IO_SUCCESS)
                        goto Return;
                result = GetCatalogOverflowExtents(fd, hfsPlusVolumeOffset, volHdrPtr, &catalogExtents, &catalogExtCount);
                if (result != FSUR_IO_SUCCESS)
                        goto Return;


@@ -1722,7 +1776,7 @@ GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * nam
         HFSPlusCatalogKey      *       k;
        CFStringRef cfstr;
 
         HFSPlusCatalogKey      *       k;
        CFStringRef cfstr;
 

-        if ( bTreeNodeDescriptorPtr->numRecords < 1) {
+        if ( OSSwapBigToHostInt16(bTreeNodeDescriptorPtr->numRecords) < 1) {

             result = FSUR_IO_FAIL;
 #if TRACE_HFS_UTIL
                        fprintf(stderr, "hfs.util: ERROR: bTreeNodeDescriptorPtr->numRecords < 1\n");
             result = FSUR_IO_FAIL;
 #if TRACE_HFS_UTIL
                        fprintf(stderr, "hfs.util: ERROR: bTreeNodeDescriptorPtr->numRecords < 1\n");


@@ -1737,12 +1791,12 @@ GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * nam
 
        // Get a pointer to the first record.
 
 
        // Get a pointer to the first record.
 

-        p = bufPtr + NXSwapBigShortToHost(*v); // pointer arithmetic in bytes
+        p = bufPtr + OSSwapBigToHostInt16(*v); // pointer arithmetic in bytes

         k = (HFSPlusCatalogKey *)p;
 
        // There should be only one record whose parent is the root parent.  It should be the first record.
 
         k = (HFSPlusCatalogKey *)p;
 
        // There should be only one record whose parent is the root parent.  It should be the first record.
 

-        if (NXSwapBigLongToHost(k->parentID) != kHFSRootParentID) {
+        if (OSSwapBigToHostInt32(k->parentID) != kHFSRootParentID) {

             result = FSUR_IO_FAIL;
 #if TRACE_HFS_UTIL
             fprintf(stderr, "hfs.util: ERROR: k->parentID != kHFSRootParentID\n");
             result = FSUR_IO_FAIL;
 #if TRACE_HFS_UTIL
             fprintf(stderr, "hfs.util: ERROR: k->parentID != kHFSRootParentID\n");


@@ -1761,14 +1815,14 @@ GetNameFromHFSPlusVolumeStartingAt(int fd, off_t hfsPlusVolumeOffset, char * nam
                result = FSUR_IO_FAIL;
                goto Return;
            }
                result = FSUR_IO_FAIL;
                goto Return;
            }

-           swapped->length = NXSwapBigShortToHost(k->nodeName.length);
+           swapped->length = OSSwapBigToHostInt16(k->nodeName.length);

            
            for (i=0; i<swapped->length; i++) {
            
            for (i=0; i<swapped->length; i++) {

-               swapped->unicode[i] = NXSwapBigShortToHost(k->nodeName.unicode[i]);
+               swapped->unicode[i] = OSSwapBigToHostInt16(k->nodeName.unicode[i]);

            }
            swapped->unicode[i] = 0;
            cfstr = CFStringCreateWithCharacters(kCFAllocatorDefault, swapped->unicode, swapped->length);
            }
            swapped->unicode[i] = 0;
            cfstr = CFStringCreateWithCharacters(kCFAllocatorDefault, swapped->unicode, swapped->length);

-           (void) CFStringGetCString(cfstr, name_o, NAME_MAX, kCFStringEncodingUTF8);
+           (void) CFStringGetCString(cfstr, (char *)name_o, NAME_MAX, kCFStringEncodingUTF8);

            CFRelease(cfstr);
            free(swapped);
        }
            CFRelease(cfstr);
            free(swapped);
        }


@@ -1836,12 +1890,12 @@ GetBTreeNodeInfo(int fd, off_t hfsPlusVolumeOffset, u_int32_t blockSize,
                goto free;
        }
 
                goto free;
        }
 

-       *nodeSize = NXSwapBigShortToHost(bTreeHeaderPtr->header.nodeSize);
+       *nodeSize = OSSwapBigToHostInt16(bTreeHeaderPtr->header.nodeSize);

 
 

-       if (NXSwapBigLongToHost(bTreeHeaderPtr->header.leafRecords) == 0)
+       if (OSSwapBigToHostInt32(bTreeHeaderPtr->header.leafRecords) == 0)

                *firstLeafNode = 0;
        else
                *firstLeafNode = 0;
        else

-               *firstLeafNode = NXSwapBigLongToHost(bTreeHeaderPtr->header.firstLeafNode);
+               *firstLeafNode = OSSwapBigToHostInt32(bTreeHeaderPtr->header.firstLeafNode);

 
 free:;
        free((char*) bTreeHeaderPtr);
 
 free:;
        free((char*) bTreeHeaderPtr);


@@ -1864,6 +1918,7 @@ GetCatalogOverflowExtents(int fd, off_t hfsPlusVolumeOffset,
                u_int32_t *catalogExtCount)
 {
        off_t offset;
                u_int32_t *catalogExtCount)
 {
        off_t offset;

+       u_int32_t numRecords;

        u_int32_t nodeSize;
        u_int32_t leafNode;
        u_int32_t blockSize;
        u_int32_t nodeSize;
        u_int32_t leafNode;
        u_int32_t blockSize;


@@ -1874,10 +1929,10 @@ GetCatalogOverflowExtents(int fd, off_t hfsPlusVolumeOffset,
        int i;
        int result;
 
        int i;
        int result;
 

-       blockSize = NXSwapBigLongToHost(volHdrPtr->blockSize);
+       blockSize = OSSwapBigToHostInt32(volHdrPtr->blockSize);

        listsize = *catalogExtCount * sizeof(HFSPlusExtentDescriptor);
        extents = *catalogExtents;
        listsize = *catalogExtCount * sizeof(HFSPlusExtentDescriptor);
        extents = *catalogExtents;

-       offset = (off_t)volHdrPtr->extentsFile.extents[0].startBlock *
+       offset = (off_t)OSSwapBigToHostInt32(volHdrPtr->extentsFile.extents[0].startBlock) *

                    (off_t)blockSize;
 
        /* Read the header node of the extents B-Tree */
                    (off_t)blockSize;
 
        /* Read the header node of the extents B-Tree */


@@ -1918,7 +1973,8 @@ again:
                goto Return;
        }
 
                goto Return;
        }
 

-       for (i = 1; i <= bTreeNodeDescriptorPtr->numRecords; ++i) {
+       numRecords = OSSwapBigToHostInt16(bTreeNodeDescriptorPtr->numRecords);
+       for (i = 1; i <= numRecords; ++i) {

                u_int16_t * v;
                char * p;
                HFSPlusExtentKey * k;
                u_int16_t * v;
                char * p;
                HFSPlusExtentKey * k;


@@ -1932,23 +1988,23 @@ again:
 
                /* Get a pointer to the record */
 
 
                /* Get a pointer to the record */
 

-               p = bufPtr + NXSwapBigShortToHost(*v); /* pointer arithmetic in bytes */
+               p = bufPtr + OSSwapBigToHostInt16(*v); /* pointer arithmetic in bytes */

                k = (HFSPlusExtentKey *)p;
 
                k = (HFSPlusExtentKey *)p;
 

-               if (NXSwapBigLongToHost(k->fileID) != kHFSCatalogFileID)
+               if (OSSwapBigToHostInt32(k->fileID) != kHFSCatalogFileID)

                        goto Return;
 
                /* grow list and copy additional extents */
                listsize += sizeof(HFSPlusExtentRecord);
                extents = (HFSPlusExtentDescriptor *) realloc(extents, listsize);
                        goto Return;
 
                /* grow list and copy additional extents */
                listsize += sizeof(HFSPlusExtentRecord);
                extents = (HFSPlusExtentDescriptor *) realloc(extents, listsize);

-               bcopy(p + NXSwapBigShortToHost(k->keyLength) + sizeof(u_int16_t),
+               bcopy(p + OSSwapBigToHostInt16(k->keyLength) + sizeof(u_int16_t),

                        &extents[*catalogExtCount], sizeof(HFSPlusExtentRecord));
 
                *catalogExtCount += kHFSPlusExtentDensity;
                *catalogExtents = extents;
        }
        
                        &extents[*catalogExtCount], sizeof(HFSPlusExtentRecord));
 
                *catalogExtCount += kHFSPlusExtentDensity;
                *catalogExtents = extents;
        }
        

-       if ((leafNode = bTreeNodeDescriptorPtr->fLink) != 0) {
+       if ((leafNode = OSSwapBigToHostInt32(bTreeNodeDescriptorPtr->fLink)) != 0) {

        
                offset = (off_t) leafNode * (off_t) nodeSize;
                
        
                offset = (off_t) leafNode * (off_t) nodeSize;
                


@@ -1997,7 +2053,7 @@ static int        LogicalToPhysical(off_t offset, ssize_t length, u_int32_t blockSize,
        /* Find the extent containing logicalBlock */
        for (extent = 0; extent < extentCount; ++extent)
        {
        /* Find the extent containing logicalBlock */
        for (extent = 0; extent < extentCount; ++extent)
        {

-               blockCount = NXSwapBigLongToHost(extentList[extent].blockCount);
+               blockCount = OSSwapBigToHostInt32(extentList[extent].blockCount);

                
                if (blockCount == 0)
                        return FSUR_IO_FAIL;    /* Tried to map past physical end of file */
                
                if (blockCount == 0)
                        return FSUR_IO_FAIL;    /* Tried to map past physical end of file */


@@ -2017,7 +2073,7 @@ static int        LogicalToPhysical(off_t offset, ssize_t length, u_int32_t blockSize,
         */
        
        /* Compute the physical starting position */
         */
        
        /* Compute the physical starting position */

-       temp = NXSwapBigLongToHost(extentList[extent].startBlock) + logicalBlock;       /* First physical block */
+       temp = OSSwapBigToHostInt32(extentList[extent].startBlock) + logicalBlock;      /* First physical block */

        temp *= blockSize;      /* Byte offset of first physical block */
        *physicalOffset = temp + offset;
 
        temp *= blockSize;      /* Byte offset of first physical block */
        *physicalOffset = temp + offset;