xnu-1699.24.23.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_encodinghint.c

diff --git a/bsd/hfs/hfs_encodinghint.c b/bsd/hfs/hfs_encodinghint.c
index 9a42b1ba0cbe3105caa7d8627c5f1fbc89d6e4dc..94b926e9ecf3f4e316a38c5731bb483d3ba84b7d 100644 (file)
--- a/bsd/hfs/hfs_encodinghint.c
+++ b/bsd/hfs/hfs_encodinghint.c
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2001-2003 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @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. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * 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
@@ -20,11 +23,13 @@
  * 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 */
@@ -45,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,
@@ -892,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);
 }
@@ -902,6 +910,8 @@ __private_extern__
 void
 hfs_setencodingbias(u_int32_t bias)
 {
+       lck_mtx_lock(&encodinglst_mutex);
+
        hfs_encodingbias = bias;
 
        switch (bias) {
@@ -917,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 */
+