system_cmds-258.tar.gz

[apple/system_cmds.git] / nvram.tproj / nvram.c

diff --git a/nvram.tproj/nvram.c b/nvram.tproj/nvram.c
index 284a34de374accf2c37e298445ec79b0e7456958..a681211065dc04da99527ae13011af034d33503c 100644 (file)
--- a/nvram.tproj/nvram.c
+++ b/nvram.tproj/nvram.c
@@ -2,24 +2,21 @@
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * 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
+ *
+ * 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
  * 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.
- * 
+ * 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@
  */
 /*
@@ -369,15 +366,44 @@ static kern_return_t SetOFVariable(char *name, char *value)
   if (valueRef) {
     typeID = CFGetTypeID(valueRef);
     CFRelease(valueRef);
-  } else typeID = CFDataGetTypeID();
-  
-  valueRef = ConvertValueToCFTypeRef(typeID, value);
-  if (valueRef == 0) {
-    FatalError(-1, "Error (-1) creating CFTypeRef for value %s",(long)value);
+    
+    valueRef = ConvertValueToCFTypeRef(typeID, value);
+    if (valueRef == 0) {
+      FatalError(-1, "Error (-1) creating CFTypeRef for value %s",(long)value);
+    }  result = IORegistryEntrySetCFProperty(gOptionsRef, nameRef, valueRef);
+  } else {
+    while (1) {
+      // In the default case, try data, string, number, then boolean.    
+      
+      valueRef = ConvertValueToCFTypeRef(CFDataGetTypeID(), value);
+      if (valueRef != 0) {
+       result = IORegistryEntrySetCFProperty(gOptionsRef, nameRef, valueRef);
+       if (result == KERN_SUCCESS) break;
+      }
+      
+      valueRef = ConvertValueToCFTypeRef(CFStringGetTypeID(), value);
+      if (valueRef != 0) {
+       result = IORegistryEntrySetCFProperty(gOptionsRef, nameRef, valueRef);
+       if (result == KERN_SUCCESS) break;
+      }
+      
+      valueRef = ConvertValueToCFTypeRef(CFNumberGetTypeID(), value);
+      if (valueRef != 0) {
+       result = IORegistryEntrySetCFProperty(gOptionsRef, nameRef, valueRef);
+       if (result == KERN_SUCCESS) break;
+      }
+      
+      valueRef = ConvertValueToCFTypeRef(CFBooleanGetTypeID(), value);
+      if (valueRef != 0) {
+       result = IORegistryEntrySetCFProperty(gOptionsRef, nameRef, valueRef);
+       if (result == KERN_SUCCESS) break;
+      }
+      
+      result = -1;
+      break;
+    }
   }
   
-  result = IORegistryEntrySetCFProperty(gOptionsRef, nameRef, valueRef);
-  
   CFRelease(nameRef);
   
   return result;