Squid-2.2.STABLE4: cachemgr storedir fs available space
    Changed cachemgr filesystem statistics to take into account the amount
    of reserved (root only) disk space instead of showing raw disk space
    available.

Index: squid/src/store_dir.c
diff -u squid/src/store_dir.c:1.1.1.22.2.2 squid/src/store_dir.c:1.1.1.22.2.4
--- squid/src/store_dir.c:1.1.1.22.2.2	Sun Aug  1 17:44:26 1999
+++ squid/src/store_dir.c	Sun Aug  1 18:08:10 1999
@@ -635,19 +635,19 @@
 #endif
 	{
 #if HAVE_STATVFS
-	    storeAppendPrintf(sentry, "Filesystem Space in use: %d/%d KB (%d%%)\n",
-		fsbtoblk((sfs.f_blocks - sfs.f_bfree), sfs.f_frsize, 1024),
-		fsbtoblk(sfs.f_blocks, sfs.f_frsize, 1024),
-		percent(sfs.f_blocks - sfs.f_bfree, sfs.f_blocks));
+	    storeAppendPrintf(sentry, "Filesystem Space in use: %ld/%ld KB (%d%%)\n",
+		(long int)fsbtoblk((sfs.f_blocks - sfs.f_bavail), sfs.f_frsize, 1024),
+		(long int)fsbtoblk(sfs.f_blocks - sfs.f_bfree + sfs.f_bavail, sfs.f_frsize, 1024),
+		(int)percent(sfs.f_blocks - sfs.f_bfree, sfs.f_blocks - sfs.f_bfree + sfs.f_bavail));
 #elif HAVE_STATFS
-	    storeAppendPrintf(sentry, "Filesystem Space in use: %d/%d KB (%d%%)\n",
-		fsbtoblk((sfs.f_blocks - sfs.f_bfree), sfs.f_bsize, 1024),
-		fsbtoblk(sfs.f_blocks, sfs.f_bsize, 1024),
-		percent(sfs.f_blocks - sfs.f_bfree, sfs.f_blocks));
+	    storeAppendPrintf(sentry, "Filesystem Space in use: %ld/%ld KB (%d%%)\n",
+		(long int)fsbtoblk((sfs.f_blocks - sfs.f_bfree), sfs.f_bsize, 1024),
+		(long int)fsbtoblk(sfs.f_blocks - sfs.f_bfree + sfs.f_bavail, sfs.f_bsize, 1024),
+		(int)percent(sfs.f_blocks - sfs.f_bfree, sfs.f_blocks - sfs.f_bfree + sfs.f_bavail));
 #endif
-	    storeAppendPrintf(sentry, "Filesystem Inodes in use: %d/%d (%d%%)\n",
-		sfs.f_files - sfs.f_ffree, sfs.f_files,
-		percent(sfs.f_files - sfs.f_ffree, sfs.f_files));
+	    storeAppendPrintf(sentry, "Filesystem Inodes in use: %ld/%ld (%d%%)\n",
+		(long int)sfs.f_files - sfs.f_ffree, (long int)sfs.f_files,
+		(int)percent(sfs.f_files - sfs.f_ffree, sfs.f_files));
 	}
 #endif
 	storeAppendPrintf(sentry, "Flags:");