[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#55748: df: wrong column is checked in condition in total-verify.sh
From: |
Pádraig Brady |
Subject: |
bug#55748: df: wrong column is checked in condition in total-verify.sh |
Date: |
Wed, 1 Jun 2022 11:03:28 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:98.0) Gecko/20100101 Thunderbird/98.0 |
tag 55748 notabug
close 55748
stop
On 01/06/2022 09:01, Daniel Hofstetter wrote:
Hi,
While looking at
https://github.com/coreutils/coreutils/blob/master/tests/df/total-verify.sh
I noticed the following lines and I think "$5" in the last line (line
38 in the source code) should be "$6" because there are six columns in
the df output and '-' is in the sixth column of the row starting with
"total".
# Recognize df output lines like these:
# /dev/sdc1 0 0 0 - /c
# tmpfs 1536000 12965 1523035 1% /tmp
# total 5285932 787409 4498523 15% -
/^(.*?) +(-?\d+|-) +(-?\d+|-) +(-?\d+|-) +(?:-|[0-9]+%) (.*)$/
or die "$0: invalid input line\n: $_";
if ($1 eq 'total' && $5 eq '-')
Notice the non capturing group, i.e. (?:)
This is because the percentage column is not needed
in the subsequent processing.
I.e. the following would work, but isn't needed.
cheers,
Pádraig
diff --git a/tests/df/total-verify.sh b/tests/df/total-verify.sh
index 87589d23d..d3f109d97 100755
--- a/tests/df/total-verify.sh
+++ b/tests/df/total-verify.sh
@@ -33,9 +33,9 @@ while (<>)
# /dev/sdc1 0 0 0 - /c
# tmpfs 1536000 12965 1523035 1% /tmp
# total 5285932 787409 4498523 15% -
- /^(.*?) +(-?\d+|-) +(-?\d+|-) +(-?\d+|-) +(?:-|[0-9]+%) (.*)$/
+ /^(.*?) +(-?\d+|-) +(-?\d+|-) +(-?\d+|-) +(-|[0-9]+%) (.*)$/
or die "$0: invalid input line\n: $_";
- if ($1 eq 'total' && $5 eq '-')
+ if ($1 eq 'total' && $6 eq '-')
{
$total == $2 or die "$total != $2";
$used == $3 or die "$used != $3";