xnu-3789.51.2.tar.gz

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

diff --git a/pexpert/gen/bootargs.c b/pexpert/gen/bootargs.c
index 33a8db7741e7693dcdfca07571d2afb18e986bc3..5a010bc372784afebae9bbf043f97c05de8258ea 100644 (file)
--- a/pexpert/gen/bootargs.c
+++ b/pexpert/gen/bootargs.c
@@ -105,9 +105,14 @@ PE_parse_boot_argn_internal(
                        goto gotit;
 
                if (arg_boolean) {
                        goto gotit;
 
                if (arg_boolean) {

-                       if (!force_string){
-                               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 {
                        }
                        break;
                } else {


@@ -119,23 +124,39 @@ PE_parse_boot_argn_internal(
                        }
                        if ('_' == *arg_string) /* Force a string copy if the argument name begins with an underscore */
                        {
                        }
                        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 ((force_string && *cp == '=') ? STR : getval(cp, &val, isargsep, FALSE))
                        {
                                case NUM:
                                break;
                        }
                        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:
                                        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;
+                                       }
+                                       else if (max_len == -1) { /* unreachable on embedded */

                                                argstrcpy(++cp, (char *)arg_ptr);
                                                argstrcpy(++cp, (char *)arg_ptr);

-                                       arg_found = TRUE;
+                                               arg_found = TRUE;
+                                       }

                                        break;
                        }
                        goto gotit;
                                        break;
                        }
                        goto gotit;