1
0
mirror of https://github.com/nmap/nmap.git synced 2025-12-15 20:29:03 +00:00

Be more compatible with SysV sh

Although $((arithmetic expansion)) is POSIX-specified, some systems have
non-POSIX System V shell, which can't handle it. This patch replaces
$((something)) with $(expr something) to fix compatibility. This
actually slows things down considerably, since a subshell must be
launched for each increment operation, but the tests aren't that
critical. Bug report: http://seclists.org/nmap-dev/2013/q4/198
This commit is contained in:
dmiller
2013-12-03 19:11:12 +00:00
parent e74d61829a
commit 46eb0fed75

View File

@@ -19,17 +19,17 @@ test_addrset() {
ret=$?
# Change newlines to spaces.
result=$(echo $result)
TESTS=$((TESTS + 1));
TESTS=$(expr $TESTS + 1);
if [ "$ret" != "0" ]; then
echo "FAIL $ADDRSET returned $ret."
TEST_FAIL=$((TEST_FAIL + 1))
TEST_FAIL=$(expr $TEST_FAIL + 1)
elif [ "$result" != "$expected" ]; then
echo "FAIL \"$result\" !="
echo " \"$expected\"."
TEST_FAIL=$((TEST_FAIL + 1))
TEST_FAIL=$(expr $TEST_FAIL + 1)
else
echo "PASS $specs"
TEST_PASS=$((TEST_PASS + 1))
TEST_PASS=$(expr $TEST_PASS + 1)
fi
}
@@ -39,13 +39,13 @@ expect_fail() {
specs=$1
$ADDRSET $specs < /dev/null 2> /dev/null
ret=$?
TESTS=$((TESTS + 1))
TESTS=$(expr $TESTS + 1)
if [ "$ret" = "0" ]; then
echo "FAIL $ADDRSET $specs was expected to fail, but didn't."
TEST_FAIL=$((TEST_FAIL + 1))
TEST_FAIL=$(expr $TEST_FAIL + 1)
else
echo "PASS $specs"
TEST_PASS=$((TEST_PASS + 1))
TEST_PASS=$(expr $TEST_PASS + 1)
fi
}
@@ -55,7 +55,7 @@ seq() {
high=$2
while [ $low -le $high ]; do
echo $low
low=$((low + 1))
low=$(expr $low + 1)
done
}