External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2024-12-22 13:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

option_parser: Support quoting to avoid splitting

Browse Source 
This is esential where the parameter value could contain commas like a
kernel command line.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
This commit is contained in:
Rob Bradford 2022-08-08 14:04:59 +01:00
parent 531621474f
commit 71a7d5d85e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
option_parser/src/lib.rs
View File

@ -41,6 +41,7 @@ type OptionParserResult<T> = std::result::Result<T, OptionParserError>;
fn split_commas(s: &str) -> OptionParserResult<Vec<String>> { fn split_commas(s: &str) -> OptionParserResult<Vec<String>> {
let mut list: Vec<String> = Vec::new(); let mut list: Vec<String> = Vec::new();
let mut opened_brackets = 0; let mut opened_brackets = 0;
let mut in_quotes = false;
let mut current = String::new(); let mut current = String::new();
for c in s.trim().chars() { for c in s.trim().chars() {
@ -56,8 +57,9 @@ fn split_commas(s: &str) -> OptionParserResult<Vec<String>> {
} }
current.push(']'); current.push(']');
} }
'"' => in_quotes = !in_quotes,
',' => { ',' => {
if opened_brackets > 0 { if opened_brackets > 0 || in_quotes {
current.push(',') current.push(',')
} else { } else {
list.push(current); list.push(current);
@ -69,7 +71,7 @@ fn split_commas(s: &str) -> OptionParserResult<Vec<String>> {
} }
list.push(current); list.push(current);
if opened_brackets != 0 { if opened_brackets != 0 || in_quotes {
return Err(OptionParserError::InvalidSyntax(s.to_owned())); return Err(OptionParserError::InvalidSyntax(s.to_owned()));
} }
@ -358,7 +360,8 @@ mod tests {
.add("mergeable") .add("mergeable")
.add("hotplug_method") .add("hotplug_method")
.add("hotplug_size") .add("hotplug_size")
.add("topology"); .add("topology")
.add("cmdline");
assert!(parser.parse("size=128M,hanging_param").is_err()); assert!(parser.parse("size=128M,hanging_param").is_err());
assert!(parser.parse("size=128M,too_many_equals=foo=bar").is_err()); assert!(parser.parse("size=128M,too_many_equals=foo=bar").is_err());
@ -388,6 +391,14 @@ mod tests {
assert_eq!(parser.get("topology"), Some("[[1,2],[3,4]]".to_owned())); assert_eq!(parser.get("topology"), Some("[[1,2],[3,4]]".to_owned()));
assert!(parser.parse("topology=[").is_err()); assert!(parser.parse("topology=[").is_err());
assert!(parser.parse("topology=[[[]]]]").is_err()) assert!(parser.parse("topology=[[[]]]]").is_err());
assert!(parser.parse("cmdline=\"console=ttyS0,9600n8\"").is_ok());
assert_eq!(
parser.get("cmdline"),
Some("console=ttyS0,9600n8".to_owned())
);
assert!(parser.parse("cmdline=\"").is_err());
assert!(parser.parse("cmdline=\"\"\"").is_err());
} }
} }