xnu-344.49.tar.gz

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

diff --git a/bsd/isofs/cd9660/cd9660_util.c b/bsd/isofs/cd9660/cd9660_util.c
index 689c091bc1191e47ece76e8b364745a27a1cf0b5..dc724462a30fe6b7d695c188d0dda33d1a81cc40 100644 (file)
--- a/bsd/isofs/cd9660/cd9660_util.c
+++ b/bsd/isofs/cd9660/cd9660_util.c
@@ -1,21 +1,24 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2001 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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
  * 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@
  */
@@ -293,7 +296,7 @@ ucsfntrans(infn, infnlen, outfn, outfnlen, dir)
                                fnidx = infnlen/2;
                }
 
-               flags = UTF_NO_NULL_TERM;
+               flags = UTF_NO_NULL_TERM | UTF_DECOMPOSED;
                if (BYTE_ORDER != BIG_ENDIAN)
                        flags |= UTF_REVERSE_ENDIAN;
 
@@ -780,6 +783,8 @@ packcommonattr (struct attrlist *alist,
                        struct finder_info finfo = {0};
 
                        finfo.fdFlags = ip->i_FinderFlags;
+                       finfo.fdLocation.v = -1;
+                       finfo.fdLocation.h = -1;
                        if (ITOV(ip)->v_type == VREG) {
                                finfo.fdType = ip->i_FileType;
                                finfo.fdCreator = ip->i_Creator;