BootX-74.1.tar.gz

[apple/bootx.git] / bootx.tproj / fs.subproj / ext2fs.c

diff --git a/bootx.tproj/fs.subproj/ext2fs.c b/bootx.tproj/fs.subproj/ext2fs.c
index 1d16ab39e15ca476f031f6a1d363c98c0f1ee674..c8bdc99e1042835d3e32f5c2aa6b767518b736a8 100644 (file)
--- a/bootx.tproj/fs.subproj/ext2fs.c
+++ b/bootx.tproj/fs.subproj/ext2fs.c
@@ -3,22 +3,19 @@
  *
  * @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,
- * 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@
  */
@@ -172,6 +169,16 @@ long Ext2GetDirEntry(CICell ih, char *dirPath, long *dirIndex,
   return 0;
 }
 
+// XX no support in AppleFileSystemDriver yet
+long Ext2GetUUID(CICell ih, char *uuidStr)
+{
+  uint8_t *uuid = gFS->e2fs.e2fs_uuid;
+
+  if (Ext2InitPartition(ih) == -1) return -1;
+
+  return CreateUUIDString(uuid, sizeof(gFS->e2fs.e2fs_uuid), uuidStr);
+}
+
 // Private functions
 
 static long HowMany(long bufferSize, long unitSize)
@@ -337,17 +344,17 @@ static char *ReadFileBlock(InodePtr fileInode, long blockNum, long blockOffset,
       
       // Get Double Indirect Block Number.
       if (blockNum < (refsPerBlock * refsPerBlock)) {
-       indBlockNum = fileInode->e2di_blocks[NDADDR + 1];
+               indBlockNum = bswap32(fileInode->e2di_blocks[NDADDR + 1]);
       } else {
-       blockNum -= refsPerBlock * refsPerBlock;
+               blockNum -= refsPerBlock * refsPerBlock;
        
-       // Get Triple Indirect Block Number.
-       indBlockNum = fileInode->e2di_blocks[NDADDR + 2];
+               // Get Triple Indirect Block Number.
+               indBlockNum = bswap32(fileInode->e2di_blocks[NDADDR + 2]);
        
-       indBlock = ReadBlock(indBlockNum, 0, gBlockSize, 0, 1);
-       indBlockOff = blockNum / (refsPerBlock * refsPerBlock);
-       blockNum %= (refsPerBlock * refsPerBlock);
-       indBlockNum = bswap32(((u_int32_t *)indBlock)[indBlockOff]);
+               indBlock = ReadBlock(indBlockNum, 0, gBlockSize, 0, 1);
+               indBlockOff = blockNum / (refsPerBlock * refsPerBlock);
+               blockNum %= (refsPerBlock * refsPerBlock);
+               indBlockNum = bswap32(((u_int32_t *)indBlock)[indBlockOff]);
       }
       
       indBlock = ReadBlock(indBlockNum, 0, gBlockSize, 0, 1);