xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 12:20:40 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4191 from whowutwut/4053_multiple_args

Browse Source 
Improve the parsing for rflash and detect error arguments in parsing
This commit is contained in:
chenglch
2017-10-26 21:35:09 -05:00
committed by GitHub
parent 607d3e229f d947e6b899
commit 1aca1aa60b
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@ -755,22 +755,47 @@ sub parse_args {
my $filename_passed = 0;
my $updateid_passed = 0;
my $option_flag;
my $invalid_options = "";
my @flash_arguments;
foreach my $opt (@$extrargs) {
# Only files ending on .tar are allowed
if ($opt =~ /.*\.tar$/i) {
$filename_passed = 1;
push (@flash_arguments, $opt);
next;
}
# Check if hex number for the updateid is passed
if ($opt =~ /^[[:xdigit:]]+$/i) {
elsif ($opt =~ /^[[:xdigit:]]+$/i) {
$updateid_passed = 1;
push (@flash_arguments, $opt);
next;
}
# check if option starting with - was passed
if ($opt =~ /^-/) {
$option_flag = $opt;
elsif ($opt =~ /^-/) {
if ($option_flag) {
$option_flag .= " " . $opt;
} else {
$option_flag .= $opt;
}
}
else {
push (@flash_arguments, $opt);
$invalid_options .= $opt . " ";
}
}
# show options parsed in bypass mode
print "DEBUG filename=$filename_passed, updateid=$updateid_passed, options=$option_flag, invalid=$invalid_options\n";
if ($option_flag =~ tr{ }{ } > 0) {
return ([ 1, "Multiple options specified is not supported. Options specified: $option_flag"]);
}
if (scalar @flash_arguments > 1) {
return ([1, "More than one firmware specified is not supported."]);
}
if ($filename_passed) {
# Filename was passed, check flags allowed with file
if ($option_flag !~ /^-c$|^--check$|^-u$|^--upload$|^-a$|^--activate$/) {
@ -787,7 +812,7 @@ sub parse_args {
else {
# Neither Filename nor updateid was not passed, check flags allowed without file or updateid
if ($option_flag !~ /^-c$|^--check$|^-l$|^--list/) {
return ([ 1, "Invalid option specified: $option_flag" ]);
return ([ 1, "Invalid option specified with $option_flag: $invalid_options" ]);
}
}
}
@ -1029,7 +1054,6 @@ sub parse_command_status {
my $upload = 0;
my $activate = 0;
my $update_file;
my @flash_arguments;
foreach $subcommand (@$subcommands) {
if ($subcommand =~ /-c|--check/) {
@ -1044,17 +1068,9 @@ sub parse_command_status {
$activate = 1;
} else {
$update_file = $subcommand;
push (@flash_arguments, $subcommand);
}
}
if (scalar @flash_arguments > 1) {
my $flag = "";
if ($delete) { $flag = "to delete"; }
if ($activate) { $flag = "to activate"; }
xCAT::SvrUtils::sendmsg([1, "More than one firmware specified $flag is currently not supported."], $callback);
return 1;
}
my $file_id = undef;
my $grep_cmd = "/usr/bin/grep -a";
my $version_tag = '"^version="';