xnu-517.tar.gz

[apple/xnu.git] / bsd / isofs / cd9660 / cd9660_bmap.c

diff --git a/bsd/isofs/cd9660/cd9660_bmap.c b/bsd/isofs/cd9660/cd9660_bmap.c
index b0d7d46017cc7775e28b910532bfda5b02f5fffe..e071621975d3f680cb210f273834cfa228ad0ccc 100644 (file)
--- a/bsd/isofs/cd9660/cd9660_bmap.c
+++ b/bsd/isofs/cd9660/cd9660_bmap.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 


@@ -102,6 +102,17 @@ cd9660_bmap(ap)
        if (ap->a_bnp == NULL)
                return (0);
 
        if (ap->a_bnp == NULL)
                return (0);
 

+       /*
+        * Associated files have an Apple Double header
+        */
+       if ((ip->i_flag & ISO_ASSOCIATED) && (lblkno > (ADH_BLKS - 1))) {
+               lblkno -= ADH_BLKS;
+               *ap->a_bnp = (ip->iso_start + lblkno);
+               if (ap->a_runp)
+                       *ap->a_runp = 0;
+               return (0);
+       }
+

        /*
         * Compute the requested block number
         */
        /*
         * Compute the requested block number
         */


@@ -137,7 +148,7 @@ cd9660_blktooff(ap)
        } */ *ap;
 {
        register struct iso_node *ip;
        } */ *ap;
 {
        register struct iso_node *ip;

-    register struct iso_mnt *imp;
+       register struct iso_mnt *imp;

 
        if (ap->a_vp == NULL)
                return (EINVAL);
 
        if (ap->a_vp == NULL)
                return (EINVAL);


@@ -185,6 +196,7 @@ struct vop_cmap_args /* {
        struct iso_node *ip = VTOI(ap->a_vp);
        size_t cbytes;
        int devBlockSize = 0;
        struct iso_node *ip = VTOI(ap->a_vp);
        size_t cbytes;
        int devBlockSize = 0;

+       off_t offset = ap->a_foffset;

 
        /*
         * Check for underlying vnode requests and ensure that logical
 
        /*
         * Check for underlying vnode requests and ensure that logical


@@ -195,15 +207,29 @@ struct vop_cmap_args /* {
 
        VOP_DEVBLOCKSIZE(ip->i_devvp, &devBlockSize);
 
 
        VOP_DEVBLOCKSIZE(ip->i_devvp, &devBlockSize);
 

-       *ap->a_bpn = (daddr_t)(ip->iso_start + lblkno(ip->i_mnt, ap->a_foffset));
+       /*
+        * Associated files have an Apple Double header
+        */
+       if (ip->i_flag & ISO_ASSOCIATED) {
+               if (offset < ADH_SIZE) {
+                       if (ap->a_run)
+                               *ap->a_run = 0;
+                       *ap->a_bpn = -1;
+                       goto out;
+               } else {
+                       offset -= ADH_SIZE;
+               }
+       }
+
+       *ap->a_bpn = (daddr_t)(ip->iso_start + lblkno(ip->i_mnt, offset));

 
        /*
         * Determine maximum number of contiguous bytes following the
         * requested offset.
         */
        if (ap->a_run) {
 
        /*
         * Determine maximum number of contiguous bytes following the
         * requested offset.
         */
        if (ap->a_run) {

-               if (ip->i_size > ap->a_foffset)
-                       cbytes = ip->i_size - ap->a_foffset;
+               if (ip->i_size > offset)
+                       cbytes = ip->i_size - offset;

                else
                        cbytes = 0;
 
                else
                        cbytes = 0;
 


@@ -211,9 +237,9 @@ struct vop_cmap_args /* {
 
                *ap->a_run = MIN(cbytes, ap->a_size);
        };
 
                *ap->a_run = MIN(cbytes, ap->a_size);
        };

-
+out:

        if (ap->a_poff)
        if (ap->a_poff)

-               *(int *)ap->a_poff = (long)ap->a_foffset & (devBlockSize - 1);
+               *(int *)ap->a_poff = (long)offset & (devBlockSize - 1);

 
        return (0);     
 }
 
        return (0);     
 }