summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-07-05 20:53:58 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-07-05 20:53:58 -0400
commit497b1e60926d822f8acdeb6f3df80f597e81086e (patch)
treee11fc1cbcd2a6989649390a620f2183a44f38ae5
parentcab4ac247ca990a03537f7611b299efca8edaffe (diff)
Fix sign bug in disk free space checking.
Giulio Eulisse reported that on OSX, bad free space numbers were being shown. It thought he had negative free space. While the documentation is not clear, especially across OS's, it seems likely that statfs uses unsigned long. It doesn't make sense for any numbers to be negative.
-rw-r--r--StatFS.hsc2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/StatFS.hsc b/StatFS.hsc
index 0828f1378..feb82aa9a 100644
--- a/StatFS.hsc
+++ b/StatFS.hsc
@@ -96,7 +96,7 @@ foreign import ccall unsafe "sys/vfs.h statfs64"
c_statfs :: CString -> Ptr CStatfs -> IO CInt
#endif
-toI :: CLong -> Integer
+toI :: CULong -> Integer
toI = toInteger
getFileSystemStats :: String -> IO (Maybe FileSystemStats)
diff --git a/debian/changelog b/debian/changelog
index 773c91b7e..8d1a396cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (3.20110706) UNRELEASED; urgency=low
+
+ * Fix sign bug in disk free space checking.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 05 Jul 2011 20:52:11 -0400
+
git-annex (3.20110705) unstable; urgency=low
* uninit: Delete the git-annex branch and .git/annex/