X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..c18c124eaa464aaaa5549e99e5a70fc9cbb50944:/bsd/hfs/hfs_encodinghint.c?ds=sidebyside

diff --git a/bsd/hfs/hfs_encodinghint.c b/bsd/hfs/hfs_encodinghint.c
index 7e208cca2..232944bd9 100644
--- a/bsd/hfs/hfs_encodinghint.c
+++ b/bsd/hfs/hfs_encodinghint.c
@@ -1,32 +1,31 @@
 /*
- * Copyright (c) 2001-2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2001-2013 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@
  */
+#if HFS
 
 #include <sys/param.h>
 #include <hfs/hfs_macos_defs.h>
@@ -74,6 +73,9 @@ u_int8_t cjk_encoding[] = {
 	/* 1111 */  kTextEncodingMacJapanese
 };
 
+
+#if CONFIG_HFS_STD
+
 /*
  * CJK Mac Encoding Bitmap
  *
@@ -737,6 +739,7 @@ static u_int8_t cjk_bitmap[] = {
  0x0D,0x04,0x04,0x00,0x00,0x00,0x00,0x00,
 };
 
+
 /*
  * Pick a suitable Mac encoding value for a Unicode string.
  *
@@ -898,6 +901,16 @@ hfs_pickencoding(const u_int16_t *src, int len)
 	return guess;
 }
 
+#else /* HFS standard *NOT* supported */
+
+u_int32_t
+hfs_pickencoding(__unused const u_int16_t *src, __unused int len) {
+	/* Just return kTextEncodingMacRoman if HFS standard is not supported. */
+	return kTextEncodingMacRoman;
+}
+
+#endif  /* CONFIG_HFS_STD */
+
 
 __private_extern__
 u_int32_t
@@ -932,3 +945,17 @@ hfs_setencodingbias(u_int32_t bias)
 	lck_mtx_unlock(&encodinglst_mutex);
 }
 
+#else /* not HFS - temp workaround until 4277828 is fixed */
+/* stubs for exported routines that aren't present when we build kernel without HFS */
+
+#include <sys/types.h>
+
+u_int32_t hfs_pickencoding(u_int16_t *src, int len);
+
+u_int32_t hfs_pickencoding(__unused u_int16_t *src, __unused int len)
+{
+	return(0);
+}
+
+#endif /* HFS */
+