Fix extra-wide field in freebsd quota

diff --git a/quota/freebsd-lib.pl b/quota/freebsd-lib.pl
index e4b1732..fabdb28 100755 (executable)
--- a/quota/freebsd-lib.pl
+++ b/quota/freebsd-lib.pl
@@ -111,7 +111,9 @@ $n=0; while(<QUOTA>) {
        if (/^(\S+)$/) {
                # Bogus wrapped line
                $filesys{$n,'filesys'} = $1;
-               <QUOTA>=~/^.{15}(.{8}).(.{7})(.{8}).{8}(.{8}).(.{7})(.{8})/;
+               local $nl = <QUOTA>;
+               $nl =~ /^\s+(\S+)\s+(\S+)\s+(\S+)(.{8}\s+)(\S+)\s+(\S+)\s+(\S+)(.*)/ ||
+                 $nl =~ /^.{15}(.{8}).(.{7})(.{8}).{8}(.{8}).(.{7})(.{8})/;
                $filesys{$n,'ublocks'} = int($1);
                $filesys{$n,'sblocks'} = int($2);
                $filesys{$n,'hblocks'} = int($3);
@@ -120,7 +122,8 @@ $n=0; while(<QUOTA>) {
                $filesys{$n,'hfiles'} = int($6);
                $n++;
                }
-       elsif (/^(.{15})(.{8}).(.{7})(.{8}).{8}(.{8}).(.{7})(.{8})/) {
+       elsif (/^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)(.{8}\s+)(\S+)\s+(\S+)\s+(\S+)(.*)/ ||
+              /^(.{15})(.{8}).(.{7})(.{8}).{8}(.{8}).(.{7})(.{8})/) {
                $filesys{$n,'ublocks'} = int($2);
                $filesys{$n,'sblocks'} = int($3);
                $filesys{$n,'hblocks'} = int($4);

diff --git a/quota/linux-lib.pl b/quota/linux-lib.pl
index 53a8ef4..ff77b50 100755 (executable)
--- a/quota/linux-lib.pl
+++ b/quota/linux-lib.pl
@@ -353,7 +353,7 @@ $n=0; while(<QUOTA>) {
                $filesys{$n,'filesys'} = $mtab{$1};
                local $nl = <QUOTA>;
                $nl =~/^\s+(\S+)\s+(\S+)\s+(\S+)(.{8}\s+)(\S+)\s+(\S+)\s+(\S+)(.*)/ ||
-                     /^.{15}.(.{7}).(.{7}).(.{7})(.{8}.)(.{7}).(.{7}).(.{7})(.*)/;
+                     $nl =~ /^.{15}.(.{7}).(.{7}).(.{7})(.{8}.)(.{7}).(.{7}).(.{7})(.*)/;
                $filesys{$n,'ublocks'} = int($1);
                $filesys{$n,'sblocks'} = int($2);
                $filesys{$n,'hblocks'} = int($3);