xnu-4903.231.4.tar.gz

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

diff --git a/pexpert/gen/bootargs.c b/pexpert/gen/bootargs.c
index c5efead48273faaf190fecdbd5ff09dff00f54d9..754513a5cb09e9fae8e68c99efa079bcfb7247ef 100644 (file)
--- a/pexpert/gen/bootargs.c
+++ b/pexpert/gen/bootargs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2000-2016 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  *
@@ -32,7 +32,9 @@ typedef boolean_t (*argsep_func_t) (char c);
 
 static boolean_t isargsep( char c);
 static boolean_t israngesep( char c);
+#ifndef CONFIG_EMBEDDED
 static int argstrcpy(char *from, char *to);
+#endif
 static int argstrcpy2(char *from,char *to, unsigned maxlen);
 static int argnumcpy(long long val, void *to, unsigned maxlen);
 static int getval(char *s, long long *val, argsep_func_t issep, boolean_t skip_equal_sign);
@@ -57,27 +59,35 @@ PE_parse_boot_arg(
 {
        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)
+static boolean_t
+PE_parse_boot_argn_internal(
+       const char *arg_string,
+       void *      arg_ptr,
+       int         max_len,
+       boolean_t   force_string)
 {
        char *args;
        char *cp, c;
        uintptr_t i;
-       long long val;
+       long long val = 0;
        boolean_t arg_boolean;
        boolean_t arg_found;
 
        args = PE_boot_args();
        if (*args == '\0') return FALSE;
 
+#ifdef CONFIG_EMBEDDED
+       if (max_len == -1) return FALSE;
+#endif
 
        arg_found = FALSE;
 
@@ -102,9 +112,17 @@ PE_parse_boot_argn(
                if (strncmp(args, arg_string, i) ||
                    (i!=strlen(arg_string)))
                        goto gotit;
+
                if (arg_boolean) {
-                       argnumcpy(1, arg_ptr, max_len);
-                       arg_found = TRUE;
+                       if (!force_string) {
+                               if (max_len > 0) {
+                                       argnumcpy(1, arg_ptr, max_len);/* max_len of 0 performs no copy at all*/
+                                       arg_found = TRUE;
+                               }
+                               else if (max_len == 0) {        
+                                       arg_found = TRUE;
+                               }
+                       }
                        break;
                } else {
                        while (*cp && isargsep (*cp))
@@ -115,23 +133,41 @@ PE_parse_boot_argn(
                        }
                        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;
+                               if (max_len > 0) {
+                                       int hacklen = 17 > max_len ? 17 : max_len;
+                                       argstrcpy2 (++cp, (char *)arg_ptr, hacklen - 1); /* Hack - terminate after 16 characters */
+                                       arg_found = TRUE;
+                               }
+                               else if (max_len == 0) {
+                                       arg_found = TRUE;
+                               }
                                break;
                        }
-                       switch (getval(cp, &val, isargsep, FALSE))
+                       switch ((force_string && *cp == '=') ? STR : getval(cp, &val, isargsep, FALSE))
                        {
                                case NUM:
-                                       argnumcpy(val, arg_ptr, max_len);
-                                       arg_found = TRUE;
+                                       if (max_len > 0) {
+                                               argnumcpy(val, arg_ptr, max_len);
+                                               arg_found = TRUE;
+                                       }
+                                       else if (max_len == 0) {
+                                               arg_found = TRUE;
+                                       }
                                        break;
                                case STR:
-                                       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) // unreachable on embedded
+                                       if (max_len > 0) {
+                                               argstrcpy2(++cp, (char *)arg_ptr, max_len - 1);/*max_len of 0 performs no copy at all*/
+                                               arg_found = TRUE;
+                                       }
+                                       else if (max_len == 0) {
+                                               arg_found = TRUE;
+                                       }
+#if !CONFIG_EMBEDDED
+                                       else if (max_len == -1) { /* unreachable on embedded */
                                                argstrcpy(++cp, (char *)arg_ptr);
-                                       arg_found = TRUE;
+                                               arg_found = TRUE;
+                                       }
+#endif
                                        break;
                        }
                        goto gotit;
@@ -147,6 +183,24 @@ gotit:
        return(arg_found);
 }
 
+boolean_t
+PE_parse_boot_argn(
+       const char      *arg_string,
+       void            *arg_ptr,
+       int                     max_len)
+{
+       return PE_parse_boot_argn_internal(arg_string, arg_ptr, max_len, FALSE);
+}
+
+boolean_t
+PE_parse_boot_arg_str(
+       const char      *arg_string,
+       char            *arg_ptr,
+       int                     strlen)
+{
+       return PE_parse_boot_argn_internal(arg_string, arg_ptr, strlen, TRUE);
+}
+
 static boolean_t
 isargsep(char c)
 {
@@ -165,6 +219,7 @@ israngesep(char c)
                return (FALSE);
 }
 
+#if !CONFIG_EMBEDDED
 static int
 argstrcpy(
        char *from,
@@ -179,6 +234,7 @@ argstrcpy(
        *to = 0;
        return(i);
 }
+#endif
 
 static int
 argstrcpy2(
@@ -245,8 +301,10 @@ getval(
        }
 
        if (has_value || skip_equal_sign) {
-               if (*s == '-')
-                       sign = -1, s++;
+               if (*s == '-') {
+                       sign = -1;
+                       s++;
+               }
                intval = *s++-'0';
                radix = 10;
                if (intval == 0) {