From b0d2dd34997faa686ce8af9a3bfe6830a216ab35 Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Thu, 9 Feb 2012 16:31:25 -0800
Subject: [PATCH] Handle new FreeBSD 9 quota format
 https://www.virtualmin.com/node/21077

---
 quota/freebsd-lib.pl | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/quota/freebsd-lib.pl b/quota/freebsd-lib.pl
index 1583a63cc..91e8dbc90 100755
--- a/quota/freebsd-lib.pl
+++ b/quota/freebsd-lib.pl
@@ -240,11 +240,17 @@ local($rv, $line, %mtab, @m);
 @line = split(/\n/, $_[0]);
 for($i=0; $i<@line; $i++) {
 	if ($line[$i] =~ /^(\S+): (blocks|kbytes) in use: (\d+), limits \(soft = (\d+), hard = (\d+)\)$/ && $1 eq $_[1]) {
-		# found lines to change
+		# found lines to change, old style
 		$rv .= "$1: $2 in use: $3, limits (soft = $_[2], hard = $_[3])\n";
 		$line[++$i] =~ /^\s*inodes in use: (\d+), limits \(soft = (\d+), hard = (\d+)\)$/;
 		$rv .= "\tinodes in use: $1, limits (soft = $_[4], hard = $_[5])\n";
 		}
+	elsif ($line[$i] =~ /^(\S+): in use: (\d+)k, limits \(soft = (\d+)k, hard = (\d+)k\)$/ && $1 eq $_[1]) {
+		# found lines to change, new style
+		$rv .= "$1: in use: ${2}k, limits (soft = $_[2]k, hard = $_[3]k)\n";
+		$line[++$i] =~ /^\s*inodes in use: (\d+), limits \(soft = (\d+), hard = (\d+)\)$/;
+		$rv .= "\tinodes in use: $1, limits (soft = $_[4], hard = $_[5])\n";
+		}
 	else { $rv .= "$line[$i]\n"; }
 	}
 return $rv;