xnu-517.tar.gz

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

diff --git a/pexpert/gen/bootargs.c b/pexpert/gen/bootargs.c
index 63a90941de725f06c3a2f37ef4f1a2d5c691bbac..06dc52316e2ea20d3746f14b33796f75bc3fac76 100644 (file)
--- a/pexpert/gen/bootargs.c
+++ b/pexpert/gen/bootargs.c
@@ -80,7 +80,12 @@ PE_parse_boot_arg(
                                args = cp+1;
                                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;
+                         }
                        switch (getval(cp, &val)) 
                        {
                                case NUM:
@@ -129,6 +134,22 @@ argstrcpy(
        return(i);
 }
 
+int
+argstrcpy2(
+       char *from, 
+       char *to,
+       unsigned maxlen)
+{
+       int i = 0;
+
+       while (!isargsep(*from) && i < maxlen) {
+               i++;
+               *to++ = *from++;
+       }
+       *to = 0;
+       return(i);
+}
+
 int
 getval(
        char *s, 
@@ -175,6 +196,12 @@ getval(
                                c -= 'a' - 10;
                        else if ((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))
                                break;
                        else