mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Enable diskfree on kfreebsd, using statvfs.

Browse source 
Could not reproduce the build failure I had seen related to this,
but the numbers were wrong with statfs64. Probably pulling from the wrong
place in the structure. statvfs seems to work..
This commit is contained in:
Joey Hess 2012-06-17 18:10:57 -04:00
parent 123766963e
commit 66344a3613
2 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Utility/libdiskfree.c
View file

@ -22,16 +22,9 @@
# define STATCALL statfs /* statfs64 not yet tested on a real FreeBSD machine */ # define STATCALL statfs /* statfs64 not yet tested on a real FreeBSD machine */
# define STATSTRUCT statfs # define STATSTRUCT statfs
#else #else
#if defined (__FreeBSD_kernel__) /* Debian kFreeBSD */ #if defined (__linux__) || defined (__FreeBSD_kernel__)
# include <sys/param.h> /* Linux or Debian kFreeBSD */
# include <sys/mount.h> /* This is a POSIX standard, so might also work elsewhere too. */
# define STATCALL statfs64
# define STATSTRUCT statfs
# warning free space checking code temporarily disabled due to build failure
# define UNKNOWN
#else
#if defined (__linux__)
/* This is a POSIX standard, so might also work elsewhere. */
# include <sys/statvfs.h> # include <sys/statvfs.h>
# define STATCALL statvfs # define STATCALL statvfs
# define STATSTRUCT statvfs # define STATSTRUCT statvfs
@ -41,7 +34,6 @@
#endif #endif
#endif #endif
#endif #endif
#endif
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>

1
debian/changelog vendored
View file

@ -3,6 +3,7 @@ git-annex (3.20120616) UNRELEASED; urgency=low
* watch: New subcommand, which uses inotify to watch for changes to * watch: New subcommand, which uses inotify to watch for changes to
files and automatically annexes new files, etc, so you don't need files and automatically annexes new files, etc, so you don't need
to manually run git commands when manipulating files. to manually run git commands when manipulating files.
* Enable diskfree on kfreebsd, using statvfs.
-- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400 -- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400