Changeset 95c675b in mainline for kernel/genarch/src/multiboot/multiboot.c

Timestamp:

2017-10-17T13:11:35Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

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

kernel/genarch/src/multiboot/multiboot.c ¶

@@ -36 +36 @@
 #include <genarch/multiboot/multiboot.h>
 #include <config.h>
+#include <stddef.h>
 #include <str.h>
 
@@ -98 +99 @@
 
         str_ncpy(buf, size, start, (size_t) (end - start));
-}
-
-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];
-        } 
 }