X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/e5568f75972dfc723778653c11cb6b4dc825716a..5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e:/pexpert/gen/bootargs.c

diff --git a/pexpert/gen/bootargs.c b/pexpert/gen/bootargs.c
index a3e5e88dd..0489d7510 100644
--- a/pexpert/gen/bootargs.c
+++ b/pexpert/gen/bootargs.c
@@ -1,23 +1,31 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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
- * 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@
+ * 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@
  */
 #include <pexpert/pexpert.h>
 
@@ -28,10 +36,19 @@ extern int getval(char *s, int *val);
 #define	NUM	0
 #define	STR	1
 
-boolean_t
+boolean_t 
 PE_parse_boot_arg(
-	char	*arg_string,
-	void	*arg_ptr)
+	const char  *arg_string,
+	void		*arg_ptr)
+{
+	return PE_parse_boot_argn(arg_string, arg_ptr, -1);
+}
+
+boolean_t
+PE_parse_boot_argn(
+	const char	*arg_string,
+	void		*arg_ptr,
+	int			max_len)
 {
 	char *args;
 	char *cp, c;
@@ -78,11 +95,12 @@ PE_parse_boot_arg(
 				goto gotit;
 			}
 			if ('_' == *arg_string) /* Force a string copy if the argument name begins with an underscore */
-			  {
-			    argstrcpy2 (++cp, (char *)arg_ptr, 16); /* Hack - terminate after 16 characters */
-			    arg_found = TRUE;
-			    break;
-			  }
+			{
+				int hacklen = 16 > max_len ? 16 : max_len;
+				argstrcpy2 (++cp, (char *)arg_ptr, hacklen); /* Hack - terminate after 16 characters */
+				arg_found = TRUE;
+				break;
+			}
 			switch (getval(cp, &val)) 
 			{
 				case NUM:
@@ -90,7 +108,10 @@ PE_parse_boot_arg(
 					arg_found = TRUE;
 					break;
 				case STR:
-					argstrcpy(++cp, (char *)arg_ptr);
+					if(max_len > 0) //max_len of 0 performs no copy at all
+						argstrcpy2(++cp, (char *)arg_ptr, max_len);
+					else if(max_len == -1)
+						argstrcpy(++cp, (char *)arg_ptr);
 					arg_found = TRUE;
 					break;
 			}
@@ -152,8 +173,8 @@ getval(
 	char *s, 
 	int *val)
 {
-	register unsigned radix, intval;
-	register unsigned char c;
+	unsigned int radix, intval;
+        char c;
 	int sign = 1;
 
 	if (*s == '=') {
@@ -162,7 +183,7 @@ getval(
 			sign = -1, s++;
 		intval = *s++-'0';
 		radix = 10;
-		if (intval == 0)
+		if (intval == 0) {
 			switch(*s) {
 
 			case 'x':
@@ -186,28 +207,44 @@ getval(
 				if (!isargsep(*s))
 					return (STR);
 			}
+                } else if (intval >= radix) {
+                    return (STR);
+                }
 		for(;;) {
-			if (((c = *s++) >= '0') && (c <= '9'))
+                        c = *s++;
+                        if (isargsep(c))
+                            break;
+                        if ((radix <= 10) &&
+                            ((c >= '0') && (c <= ('9' - (10 - radix))))) {
+                                c -= '0';
+                        } else if ((radix == 16) &&
+                                   ((c >= '0') && (c <= '9'))) {
 				c -= '0';
-			else if ((c >= 'a') && (c <= 'f'))
+                        } else if ((radix == 16) &&
+                                   ((c >= 'a') && (c <= 'f'))) {
 				c -= 'a' - 10;
-			else if ((c >= 'A') && (c <= 'F'))
+                        } else if ((radix == 16) &&
+                                   ((c >= 'A') && (c <= 'F'))) {
 				c -= 'A' - 10;
-			else if (c == 'k' || c == 'K')
-				{ sign *= 1024; break; }
-			else if (c == 'm' || c == 'M')
-				{ sign *= 1024 * 1024; break; }
-			else if (c == 'g' || c == 'G')
-				{ sign *= 1024 * 1024 * 1024; break; }
-			else if (isargsep(c))
+                        } else if (c == 'k' || c == 'K') {
+				sign *= 1024;
 				break;
-			else
+			} else if (c == 'm' || c == 'M') {
+				sign *= 1024 * 1024;
+                                break;
+			} else if (c == 'g' || c == 'G') {
+				sign *= 1024 * 1024 * 1024;
+                                break;
+			} else {
 				return (STR);
+                        }
 			if (c >= radix)
 				return (STR);
 			intval *= radix;
 			intval += c;
 		}
+                if (!isargsep(c) && !isargsep(*s))
+                    return STR;
 		*val = intval * sign;
 		return (NUM);
 	}