X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/e5568f75972dfc723778653c11cb6b4dc825716a..bd504ef0e0b883cdd7917b73b3574eb9ce669905:/bsd/hfs/hfs_encodinghint.c?ds=inline

diff --git a/bsd/hfs/hfs_encodinghint.c b/bsd/hfs/hfs_encodinghint.c
index 2aede276a..94b926e9e 100644
--- a/bsd/hfs/hfs_encodinghint.c
+++ b/bsd/hfs/hfs_encodinghint.c
@@ -1,27 +1,35 @@
 /*
  * Copyright (c) 2001-2003 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_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.
+ * 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.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
+#if HFS
 
 #include <sys/param.h>
 #include <hfs/hfs_macos_defs.h>
+#include <hfs/hfs.h>
 
 
 /* CJK Mac Encoding Bits */
@@ -42,6 +50,9 @@ u_int8_t cjk_lastunique = 0;
 u_int32_t hfs_encodingbias = 0;
 int hfs_islatinbias = 0;
 
+extern lck_mtx_t  encodinglst_mutex;
+
+
 /* Map CJK bits to Mac encoding */
 u_int8_t cjk_encoding[] = {
 	/* 0000 */  kTextEncodingMacUnicode,
@@ -889,7 +900,7 @@ hfs_pickencoding(const u_int16_t *src, int len)
 
 __private_extern__
 u_int32_t
-hfs_getencodingbias()
+hfs_getencodingbias(void)
 {
 	return (hfs_encodingbias);
 }
@@ -899,6 +910,8 @@ __private_extern__
 void
 hfs_setencodingbias(u_int32_t bias)
 {
+	lck_mtx_lock(&encodinglst_mutex);
+
 	hfs_encodingbias = bias;
 
 	switch (bias) {
@@ -914,5 +927,21 @@ hfs_setencodingbias(u_int32_t bias)
 		hfs_islatinbias = 0;
 		break;					
 	}
+
+	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 */
+