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

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (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 changes

File:

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

kernel/genarch/src/multiboot/multiboot.c

@@ -71 +71 @@
 }
 
+/** Extract arguments from the multiboot module command line.
+ *
+ * @param buf      Destination buffer (will be always NULL-terminated).
+ * @param size     Size of destination buffer (in bytes).
+ * @param cmd_line Input string (the command line).
+ *
+ */
+void multiboot_extract_argument(char *buf, size_t size, const char *cmd_line)
+{
+        /* Start after first space. */
+        const char *start = str_chr(cmd_line, ' ');
+        if (start == NULL) {
+                str_cpy(buf, size, "");
+                return;
+        }
+
+        const char *end = cmd_line + str_size(cmd_line);
+
+        /* Skip the space(s). */
+        while (start != end) {
+                if (start[0] == ' ')
+                        start++;
+                else
+                        break;
+        }
+
+        str_ncpy(buf, size, start, (size_t) (end - start));
+}
+
 static void multiboot_modules(uint32_t count, multiboot_module_t *mods)
 {
@@ -84 +113 @@
                         multiboot_extract_command(init.tasks[init.cnt].name,
                             CONFIG_TASK_NAME_BUFLEN, MULTIBOOT_PTR(mods[i].string));
-                } else
+                        multiboot_extract_argument(init.tasks[init.cnt].arguments,
+                            CONFIG_TASK_ARGUMENTS_BUFLEN, MULTIBOOT_PTR(mods[i].string));
+                } else {
                         init.tasks[init.cnt].name[0] = 0;
+                        init.tasks[init.cnt].arguments[0] = 0;
+                }
                 
                 init.cnt++;