--- xnu/xnu-517.7.21/libkern/c++/OSSerialize.cpp
+++ xnu/xnu-2782.30.5/libkern/c++/OSSerialize.cpp
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 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.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * @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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 /* OSSerialize.cpp created by rsulack on Wen 25-Nov-1998 */
 
@@ -30,6 +36,7 @@
 #include <libkern/c++/OSContainers.h>
 #include <libkern/c++/OSLib.h>
 #include <libkern/c++/OSDictionary.h>
+#include <libkern/OSSerializeBinary.h>
 
 #define super OSObject
 
@@ -59,8 +66,17 @@
 
 void OSSerialize::clearText()
 {
-	bzero((void *)data, capacity);
-	length = 1;
+	if (binary)
+	{
+		length = sizeof(kOSSerializeBinarySignature);
+		bzero(&data[length], capacity - length);
+		endCollection = true;
+	}
+    else
+    {
+		bzero((void *)data, capacity);
+		length = 1;
+    }
 	tag = 0;
 	tags->flushCollection();
 }
@@ -70,9 +86,12 @@
 	char temp[16];
 	OSString *tagString;
 
+	if (binary) return (binarySerialize(o));
+
 	// look it up
 	tagString = (OSString *)tags->getObject((const OSSymbol *) o);
 
+// xx-review: no error checking here for addString calls!
 	// does it exist?
 	if (tagString) {
 		addString("<reference IDREF=\"");
@@ -82,7 +101,7 @@
 	}
 
 	// build a tag
-	sprintf(temp, "%u", tag++);
+	snprintf(temp, sizeof(temp), "%u", tag++);
 	tagString = OSString::withCString(temp);
 
 	// add to tag dictionary
@@ -94,6 +113,11 @@
 
 bool OSSerialize::addXMLStartTag(const OSMetaClassBase *o, const char *tagString)
 {
+	if (binary)
+    {
+		printf("class %s: xml serialize\n", o->getMetaClass()->getClassName());
+		return (false);
+	}
 
 	if (!addChar('<')) return false;
 	if (!addString(tagString)) return false;
@@ -117,6 +141,12 @@
 
 bool OSSerialize::addChar(const char c)
 {
+	if (binary)
+    {
+		printf("xml serialize\n");
+		return (false);
+	}
+
 	// add char, possibly extending our capacity
 	if (length >= capacity && length >=ensureCapacity(capacity+capacityIncrement))
 		return false;