xnu-1228.3.13.tar.gz

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

diff --git a/bsd/isofs/cd9660/cd9660_node.c b/bsd/isofs/cd9660/cd9660_node.c
index e951440dee294a3dfc5188ae720f891f4d245816..0b9ddcff8cfb38c6425a1380fe04f86bbc45f23c 100644 (file)
--- a/bsd/isofs/cd9660/cd9660_node.c
+++ b/bsd/isofs/cd9660/cd9660_node.c
@@ -1,31 +1,29 @@
 /*
  * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * 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.
- *
- * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
- * Please see the License for the specific language governing rights and 
+ * 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.
+ * 
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
  * limitations under the License.
- *
- * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
+ * 
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*     $NetBSD: cd9660_node.c,v 1.13 1994/12/24 15:30:07 cgd Exp $     */
 
@@ -117,10 +115,17 @@ extern u_char isonullname[];
 int
 cd9660_init(__unused struct vfsconf *cp)
 {
+    return 0;
+}
 
-       isohashtbl = hashinit(desiredvnodes, M_ISOFSMNT, &isohash);
+int
+cd9660_hashinit(void)
+{
+       if (!isohashtbl)
+               isohashtbl = hashinit(desiredvnodes, M_ISOFSMNT, &isohash);
 #ifdef ISODEVMAP
-       idvhashtbl = hashinit(desiredvnodes / 8, M_ISOFSMNT, &idvhash);
+       if (!idvhashtbl)
+               idvhashtbl = hashinit(desiredvnodes / 8, M_ISOFSMNT, &idvhash);
 #endif
     return 0;
 }
@@ -182,7 +187,7 @@ iso_dunmap(dev_t device)
  * to it. If it is in core, but locked, wait for it.
  */
 struct vnode *
-cd9660_ihashget(dev_t device, ino_t inum, struct proc *p)
+cd9660_ihashget(dev_t device, ino_t inum, __unused struct proc *p)
 {
        register struct iso_node *ip;
        struct vnode *vp;
@@ -343,7 +348,7 @@ cd9660_defattr(struct iso_directory_record *isodir, struct iso_node *inop,
                bp = bp2;
        }
        if (bp) {
-               ap = (struct iso_extended_attributes *)buf_dataptr(bp);
+               ap = (struct iso_extended_attributes *)((char *)0 + buf_dataptr(bp));
                
                if (isonum_711(ap->version) == 1) {
                        if (!(ap->perm[0]&0x40))
@@ -392,7 +397,7 @@ cd9660_deftstamp(struct iso_directory_record *isodir, struct iso_node *inop,
                bp = bp2;
        }
        if (bp) {
-               ap = (struct iso_extended_attributes *)buf_dataptr(bp);
+               ap = (struct iso_extended_attributes *)((char *)0 + buf_dataptr(bp));
                
                if (isonum_711(ap->version) == 1) {
                        if (!cd9660_tstamp_conv17(ap->ftime,&inop->inode.iso_atime))