xnu-1456.1.26.tar.gz

[apple/xnu.git] / pexpert / gen / bootargs.c

diff --git a/pexpert/gen/bootargs.c b/pexpert/gen/bootargs.c
index 193261b2e9b0f8949c5e89b31d22c4689c106eb2..4c5b5f07d0a4e9684ba471ba5890dc62783cf9f5 100644 (file)
--- a/pexpert/gen/bootargs.c
+++ b/pexpert/gen/bootargs.c
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2008 Apple 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,
  * 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@

  */
 #include <pexpert/pexpert.h>
 
  */
 #include <pexpert/pexpert.h>
 


@@ -25,25 +31,47 @@ extern boolean_t isargsep( char c);
 extern int argstrcpy(char *from, char *to);
 extern int getval(char *s, int *val);
 
 extern int argstrcpy(char *from, char *to);
 extern int getval(char *s, int *val);
 

+static int argstrcpy2(char *from,char *to, unsigned maxlen);
+

 #define        NUM     0
 #define        STR     1
 
 #define        NUM     0
 #define        STR     1
 

-boolean_t
+#if !defined(__LP64__) && !defined(__arm__)
+boolean_t 

 PE_parse_boot_arg(
 PE_parse_boot_arg(

-       char    *arg_string,
-       void    *arg_ptr)
+       const char  *arg_string,
+       void            *arg_ptr)
+{
+       int max_len = -1;
+
+#if CONFIG_EMBEDDED
+       /* Limit arg size to 4 byte when no size is given */
+       max_len = 4;
+#endif
+
+       return PE_parse_boot_argn(arg_string, arg_ptr, max_len);
+}
+#endif
+
+boolean_t
+PE_parse_boot_argn(
+       const char      *arg_string,
+       void            *arg_ptr,
+       int                     max_len)

 {
        char *args;
        char *cp, c;
 {
        char *args;
        char *cp, c;

-       int i;
+       unsigned int i;

        int val;
        boolean_t arg_boolean;
        boolean_t arg_found;
 
        args = PE_boot_args();
        int val;
        boolean_t arg_boolean;
        boolean_t arg_found;
 
        args = PE_boot_args();

+       if (*args == '\0') return FALSE;
+

        arg_found = FALSE;
 
        arg_found = FALSE;
 

-       while(isargsep(*args)) args++;
+       while(*args && isargsep(*args)) args++;

 
        while (*args)
        {
 
        while (*args)
        {


@@ -69,13 +97,19 @@ PE_parse_boot_arg(
                        arg_found = TRUE;
                        break;
                } else {
                        arg_found = TRUE;
                        break;
                } else {

-                       while (isargsep (*cp))
+                       while (*cp && isargsep (*cp))

                                cp++;
                        if (*cp == '=' && c != '=') {
                                args = cp+1;
                                goto gotit;
                        }
                                cp++;
                        if (*cp == '=' && c != '=') {
                                args = cp+1;
                                goto gotit;
                        }

-
+                       if ('_' == *arg_string) /* Force a string copy if the argument name begins with an underscore */
+                       {
+                               int hacklen = 17 > max_len ? 17 : max_len;
+                               argstrcpy2 (++cp, (char *)arg_ptr, hacklen - 1); /* Hack - terminate after 16 characters */
+                               arg_found = TRUE;
+                               break;
+                       }

                        switch (getval(cp, &val)) 
                        {
                                case NUM:
                        switch (getval(cp, &val)) 
                        {
                                case NUM:


@@ -83,7 +117,10 @@ PE_parse_boot_arg(
                                        arg_found = TRUE;
                                        break;
                                case STR:
                                        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 - 1);
+                                       else if(max_len == -1)
+                                               argstrcpy(++cp, (char *)arg_ptr);

                                        arg_found = TRUE;
                                        break;
                        }
                                        arg_found = TRUE;
                                        break;
                        }


@@ -124,13 +161,29 @@ argstrcpy(
        return(i);
 }
 
        return(i);
 }
 

+static int
+argstrcpy2(
+       char *from, 
+       char *to,
+       unsigned maxlen)
+{
+       unsigned int i = 0;
+
+       while (!isargsep(*from) && i < maxlen) {
+               i++;
+               *to++ = *from++;
+       }
+       *to = 0;
+       return(i);
+}
+

 int
 getval(
        char *s, 
        int *val)
 {
 int
 getval(
        char *s, 
        int *val)
 {

-       register unsigned radix, intval;
-       register unsigned char c;
+       unsigned int radix, intval;
+    unsigned char c;

        int sign = 1;
 
        if (*s == '=') {
        int sign = 1;
 
        if (*s == '=') {


@@ -139,7 +192,7 @@ getval(
                        sign = -1, s++;
                intval = *s++-'0';
                radix = 10;
                        sign = -1, s++;
                intval = *s++-'0';
                radix = 10;

-               if (intval == 0)
+               if (intval == 0) {

                        switch(*s) {
 
                        case 'x':
                        switch(*s) {
 
                        case 'x':


@@ -163,22 +216,44 @@ getval(
                                if (!isargsep(*s))
                                        return (STR);
                        }
                                if (!isargsep(*s))
                                        return (STR);
                        }

+                } else if (intval >= radix) {
+                    return (STR);
+                }

                for(;;) {
                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';
                                c -= '0';

-                       else if ((c >= 'a') && (c <= 'f'))
+                        } else if ((radix == 16) &&
+                                   ((c >= 'a') && (c <= 'f'))) {

                                c -= 'a' - 10;
                                c -= 'a' - 10;

-                       else if ((c >= 'A') && (c <= 'F'))
+                        } else if ((radix == 16) &&
+                                   ((c >= 'A') && (c <= 'F'))) {

                                c -= 'A' - 10;
                                c -= 'A' - 10;

-                       else if (isargsep(c))
+                        } else if (c == 'k' || c == 'K') {
+                               sign *= 1024;

                                break;
                                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);
                                return (STR);

+                        }

                        if (c >= radix)
                                return (STR);
                        intval *= radix;
                        intval += c;
                }
                        if (c >= radix)
                                return (STR);
                        intval *= radix;
                        intval += c;
                }

+                if (!isargsep(c) && !isargsep(*s))
+                    return STR;

                *val = intval * sign;
                return (NUM);
        }
                *val = intval * sign;
                return (NUM);
        }