Changeset ba1ea40 in mainline for kernel/genarch/src/multiboot/multiboot.c

Timestamp:

2016-12-26T20:03:08Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

db521b05

Parents:

3b3faf51

Message:

Copy boot arguments from multiboot info to bargs

File:

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

kernel/genarch/src/multiboot/multiboot.c

@@ -100 +100 @@
 }
 
+static void multiboot_cmdline(char *cmdline)
+{
+        /*
+         * GRUB passes the command line in an escaped form.
+         */
+        for (size_t i = 0, j = 0;
+            cmdline[i] && j < CONFIG_BOOT_ARGUMENTS_BUFLEN;
+            i++, j++) {
+                if (cmdline[i] == '\\') {
+                        switch (cmdline[i + 1]) {
+                        case '\\':
+                        case '\'':
+                        case '\"':
+                                i++;
+                                break;
+                        }
+                }
+                bargs[j] = cmdline[i];
+        } 
+}
+
 static void multiboot_modules(uint32_t count, multiboot_module_t *mods)
 {
@@ -153 +174 @@
         if (signature != MULTIBOOT_LOADER_MAGIC)
                 return;
-        
+
+        /* Copy command line. */
+        if ((info->flags & MULTIBOOT_INFO_FLAGS_CMDLINE) != 0)
+                multiboot_cmdline((char *) MULTIBOOT_PTR(info->cmd_line));
+
         /* Copy modules information. */
         if ((info->flags & MULTIBOOT_INFO_FLAGS_MODS) != 0)