RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

marsadm: fix shortcut operators

This commit is contained in:
Thomas Schoebel-Theuer 2022-02-17 13:03:21 +01:00 committed by Thomas Schoebel-Theuer
parent 56be0c1fc2
commit 6a9a355d76
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
userspace/marsadm
View File

@ -7537,14 +7537,23 @@ sub eval_fn {
$op = "&&" if $op eq "and";
$op = "||" if $op eq "or";
my $number = parse_macro($arg1, $env);
while (defined(my $next = shift)) {
$_ = $op;
if (/^&&$/) { return 0 if !$number; }
if (/^\|\|$/) { return 1 if $number; }
my $operand = parse_macro($next, $env);
$_ = $op;
if (/^&&$/) { $number &= $operand; next; }
if (/^\|\|$/) { $number |= $operand; next; }
while (my $next_arg = shift) {
last unless defined($next_arg);
if ($op eq "&&") {
return 0 if !$number;
}
if ($op eq "||") {
return 1 if $number;
}
my $operand = parse_macro($next_arg, $env);
if ($op eq "&&") {
$number &&= $operand;
next;
}
if ($op eq "||") {
$number ||= $operand;
next;
}
ldie "bad shortcut operator '$op'";
}
return $number;