kernel: handle missing KV tokens in commandline parsing

achreto · achreto · commit 19050ae72b2a · 2023-08-16T09:42:57.000-07:00
Signed-off-by: Reto Achermann &lt;achreto@gmail.com&gt;
diff --git a/kernel/src/cmdline.rs b/kernel/src/cmdline.rs
@@ -232,8 +232,14 @@ impl CommandLineArguments {
                         && prev != CmdToken::Test
                         && prev != CmdToken::MachineId
                         && prev != CmdToken::Workers
+                        && prev != CmdToken::Mode
+                        && prev != CmdToken::Transport
                     {
-                        sprint!("Malformed args (unexpected equal sign) in {}\r\n", args);
+                        sprint!(
+                            "Malformed args (unexpected equal sign) in `{}` previous token was {:?}\r\n",
+                            args,
+                            prev
+                        );
                         return Err(KError::MalformedCmdLine);
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,14 @@ impl CommandLineArguments {`
`232`	`232`	`&& prev != CmdToken::Test`
`233`	`233`	`&& prev != CmdToken::MachineId`
`234`	`234`	`&& prev != CmdToken::Workers`
	`235`	`+ && prev != CmdToken::Mode`
	`236`	`+ && prev != CmdToken::Transport`
`235`	`237`	`{`
`236`		`- sprint!("Malformed args (unexpected equal sign) in {}\r\n", args);`
	`238`	`+ sprint!(`
	`239`	+ "Malformed args (unexpected equal sign) in `{}` previous token was {:?}\r\n",
	`240`	`+ args,`
	`241`	`+ prev`
	`242`	`+ );`
`237`	`243`	`return Err(KError::MalformedCmdLine);`
`238`	`244`	`}`
`239`	`245`	`}`