BootX-81.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 7b3ae3e9567a4e829221d4c535967627f1fc1877..47b0e4fc40d3bbbc4df5dc769e9d33d1d9440980 100644 (file)
--- a/bootx.tproj/fs.subproj/ext2fs.c
+++ b/bootx.tproj/fs.subproj/ext2fs.c
@@ -1,24 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
- * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
+ 
 /*
  *  ext2.c - File System Module for Ext2.
  *
@@ -44,7 +51,7 @@ static long ReadInode(long inodeNum, InodePtr inode, long *flags, long *time);
 static long ResolvePathToInode(char *filePath, long *flags,
                                InodePtr fileInode, InodePtr dirInode);
 static long ReadDirEntry(InodePtr dirInode, long *fileInodeNum,
-                        long *dirIndex, char **name);
+                        unsigned long *dirIndex, char **name);
 static long FindFileInDir(char *fileName, long *flags,
                           InodePtr fileInode, InodePtr dirInode);
 static char *ReadFileBlock(InodePtr fileInode, long blockNum, long blockOffset,
@@ -146,8 +153,7 @@ long Ext2LoadFile(CICell ih, char *filePath)
   return length;
 }
 
-
-long Ext2GetDirEntry(CICell ih, char *dirPath, long *dirIndex,
+long Ext2GetDirEntry(CICell ih, char *dirPath, unsigned long *dirIndex,
                     char **name, long *flags, long *time)
 {
   long  ret, fileInodeNum, dirFlags;
@@ -169,6 +175,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)
@@ -259,7 +275,7 @@ static long ResolvePathToInode(char *filePath, long *flags,
 
 
 static long ReadDirEntry(InodePtr dirInode, long *fileInodeNum,
-                        long *dirIndex, char **name)
+                        unsigned long *dirIndex, char **name)
 {
   struct ext2fs_direct *dir;
   char                 *buffer;
@@ -294,7 +310,8 @@ static long ReadDirEntry(InodePtr dirInode, long *fileInodeNum,
 static long FindFileInDir(char *fileName, long *flags,
                           InodePtr fileInode, InodePtr dirInode)
 {
-  long ret, inodeNum, index = 0;
+  long ret, inodeNum;
+  unsigned long index = 0;
   char *name;
   
   while (1) {
@@ -334,17 +351,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);