Changeset 9ef1fade in mainline for kernel/genarch/src/multiboot/multiboot2.c

Timestamp:

2017-07-21T19:21:59Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3009164

Parents:

9f64c1e

Message:

Support boot_args also for multiboot2 boots

File:

• kernel/genarch/src/multiboot/multiboot2.c (modified) (2 diffs)

kernel/genarch/src/multiboot/multiboot2.c

@@ -41 +41 @@
 
 #define MULTIBOOT2_TAG_ALIGN  8
+
+static void multiboot2_cmdline(const multiboot2_cmdline_t *module)
+{
+        /*
+         * GRUB passes the command line in an escaped form.
+         */
+        for (size_t i = 0, j = 0;
+            module->string[i] && j < CONFIG_BOOT_ARGUMENTS_BUFLEN;
+            i++, j++) {
+                if (module->string[i] == '\\') {
+                        switch (module->string[i + 1]) {
+                        case '\\':
+                        case '\'':
+                        case '\"':
+                                i++;
+                                break;
+                        }
+                }
+                bargs[j] = module->string[i];
+        } 
+}
 
 static void multiboot2_module(const multiboot2_module_t *module)
@@ -117 +138 @@
         while (tag->type != MULTIBOOT2_TAG_TERMINATOR) {
                 switch (tag->type) {
+                case MULTIBOOT2_TAG_CMDLINE:
+                        multiboot2_cmdline(&tag->cmdline);
+                        break;
                 case MULTIBOOT2_TAG_MODULE:
                         multiboot2_module(&tag->module);