Fix parsing of grace column, for real this time
authorJamie Cameron <jcameron@webmin.com>
Thu, 11 Dec 2008 18:55:00 +0000 (18:55 +0000)
committerJamie Cameron <jcameron@webmin.com>
Thu, 11 Dec 2008 18:55:00 +0000 (18:55 +0000)
quota/linux-lib.pl

index 2cf5e69..d45ce26 100644 (file)
@@ -357,7 +357,9 @@ if (!$st) {
 local $nn = 0;
 local %already;
 for($n=0; $n<@rep; $n++) {
-       if ($rep[$n] =~ /^\s*(\S.*\S|\S)\s+[\-\+]{2}\s+(\S+)\s+(\S+)\s+(\S+)(.{8})\s+(\S+)\s+(\S+)\s+(\S+)(.*)/ || $rep[$n] =~ /([^\-\s]\S*)\s*[\-\+]{2}(.{8})(.{8})(.{8})(.{7})(.{8})(.{6})(.{6})(.*)/) {
+       if ($rep[$n] =~ /^\s*(\S.*\S|\S)\s+[\-\+]{2}\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)(.*)/ ||
+           $rep[$n] =~ /^\s*(\S.*\S|\S)\s+[\-\+]{2}\s+(\S+)\s+(\S+)\s+(\S+)(.{7})\s+(\S+)\s+(\S+)\s+(\S+)(.*)/ ||
+           $rep[$n] =~ /([^\-\s]\S*)\s*[\-\+]{2}(.{8})(.{8})(.{8})(.{7})(.{8})(.{6})(.{6})(.*)/) {
                $$what{$nn,$what} = $1;
                $$what{$nn,'ublocks'} = int($2);
                $$what{$nn,'sblocks'} = int($3);