xnu-124.8.tar.gz

diff --git a/bsd/conf/version.variant b/bsd/conf/version.variant
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/bsd/conf/version.variant
+++ b/bsd/conf/version.variant
@@ -1 +1 @@
-2
+3

diff --git a/bsd/hfs/hfs_vnodeops.c b/bsd/hfs/hfs_vnodeops.c
index f922b4471c83b2bec0aca98dbff4d9c2cd47adf0..14a784ee927516ce2a06de0d4e7b399066dc2f71 100644 (file)
--- a/bsd/hfs/hfs_vnodeops.c
+++ b/bsd/hfs/hfs_vnodeops.c
@@ -3227,7 +3227,7 @@ struct vop_readdir_args /* {
                        goto Exit;
        }
        
-       diroffset = uio->uio_offset - sizeof(rootdots);
+       diroffset = uio->uio_offset;
 
        /* lock catalog b-tree */
        retval = hfs_metafilelocking(VTOHFS(ap->a_vp), kHFSCatalogFileID, LK_SHARED, p);

diff --git a/bsd/hfs/hfscommon/Catalog/Catalog.c b/bsd/hfs/hfscommon/Catalog/Catalog.c
index d200f63ecf9f84701c98a4ca3ac13f57a69be9ca..0e94bef133faa3b191e9513b72a41f37af5c6f3b 100644 (file)
--- a/bsd/hfs/hfscommon/Catalog/Catalog.c
+++ b/bsd/hfs/hfscommon/Catalog/Catalog.c
@@ -816,7 +816,7 @@ GetDirEntrySize(BTreeIterator *bip, ExtendedVCB * vol)
 OSErr
 PositionIterator(CatalogIterator *cip, UInt32 offset, BTreeIterator *bip, UInt16 *op)
 {
-#define CAT_START_OFFSET 0
+#define CAT_START_OFFSET (2 * sizeof(struct hfsdotentry))
        ExtendedVCB *   vol;
        FCB *           fcb;
        OSErr           result = 0;
@@ -877,7 +877,7 @@ PositionIterator(CatalogIterator *cip, UInt32 offset, BTreeIterator *bip, UInt16
                        pid = *idp;
 
                        curOffset = CAT_START_OFFSET;
-                       nextOffset = GetDirEntrySize(bip, vol);
+                       nextOffset = CAT_START_OFFSET + GetDirEntrySize(bip, vol);
 
                        while (nextOffset < offset) {
                                result = BTIterateRecord( fcb, kBTreeNextRecord, bip, NULL, NULL );             

diff --git a/iokit/KernelConfigTables.cpp b/iokit/KernelConfigTables.cpp
index f7f4e6ec464550c8b108bb4ab41673e2e7e4b257..f64c800afa0bf38452a9a6b536fc34b1b67a1209 100644 (file)
--- a/iokit/KernelConfigTables.cpp
+++ b/iokit/KernelConfigTables.cpp
@@ -28,21 +28,21 @@
  */
 const char * gIOKernelKmods =
 "{
-    'com.apple.kernel'                         = '1.3.2';
-    'com.apple.kernel.bsd'                     = '1.0.2';
-    'com.apple.kernel.iokit'                   = '1.0.2';
-    'com.apple.kernel.libkern'                 = '1.0.2';
-    'com.apple.kernel.mach'                    = '1.0.2';
-    'com.apple.iokit.IOADBFamily'              = '1.0.2';
-    'com.apple.iokit.IOCDStorageFamily'        = '1.0.2';
-    'com.apple.iokit.IODVDStorageFamily'       = '1.0.2';
-    'com.apple.iokit.IOGraphicsFamily'         = '1.0.2';
-    'com.apple.iokit.IOHIDSystem'              = '1.0.2';
-    'com.apple.iokit.IONDRVSupport'            = '1.0.2';
-    'com.apple.iokit.IONetworkingFamily'       = '1.0.2';
-    'com.apple.iokit.IOPCIFamily'              = '1.0.2';
-    'com.apple.iokit.IOStorageFamily'          = '1.0.2';
-    'com.apple.iokit.IOSystemManagementFamily' = '1.0.2';
+    'com.apple.kernel'                         = '1.3.3';
+    'com.apple.kernel.bsd'                     = '1.0.3';
+    'com.apple.kernel.iokit'                   = '1.0.3';
+    'com.apple.kernel.libkern'                 = '1.0.3';
+    'com.apple.kernel.mach'                    = '1.0.3';
+    'com.apple.iokit.IOADBFamily'              = '1.0.3';
+    'com.apple.iokit.IOCDStorageFamily'        = '1.0.3';
+    'com.apple.iokit.IODVDStorageFamily'       = '1.0.3';
+    'com.apple.iokit.IOGraphicsFamily'         = '1.0.3';
+    'com.apple.iokit.IOHIDSystem'              = '1.0.3';
+    'com.apple.iokit.IONDRVSupport'            = '1.0.3';
+    'com.apple.iokit.IONetworkingFamily'       = '1.0.3';
+    'com.apple.iokit.IOPCIFamily'              = '1.0.3';
+    'com.apple.iokit.IOStorageFamily'          = '1.0.3';
+    'com.apple.iokit.IOSystemManagementFamily' = '1.0.3';
 }";
 
 

diff --git a/iokit/conf/version.variant b/iokit/conf/version.variant
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/iokit/conf/version.variant
+++ b/iokit/conf/version.variant
@@ -1 +1 @@
-2
+3

diff --git a/libkern/conf/version.variant b/libkern/conf/version.variant
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/libkern/conf/version.variant
+++ b/libkern/conf/version.variant
@@ -1 +1 @@
-2
+3

diff --git a/libsa/conf/version.variant b/libsa/conf/version.variant
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/libsa/conf/version.variant
+++ b/libsa/conf/version.variant
@@ -1 +1 @@
-2
+3

diff --git a/osfmk/conf/kernelversion.variant b/osfmk/conf/kernelversion.variant
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/osfmk/conf/kernelversion.variant
+++ b/osfmk/conf/kernelversion.variant
@@ -1 +1 @@
-2
+3

diff --git a/osfmk/conf/version.variant b/osfmk/conf/version.variant
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/osfmk/conf/version.variant
+++ b/osfmk/conf/version.variant
@@ -1 +1 @@
-2
+3

diff --git a/pexpert/conf/version.variant b/pexpert/conf/version.variant
index 0cfbf08886fca9a91cb753ec8734c84fcbe52c9f..00750edc07d6415dcc07ae0351e9397b0222b7ba 100644 (file)
--- a/pexpert/conf/version.variant
+++ b/pexpert/conf/version.variant
@@ -1 +1 @@
-2
+3