Browse Source

Merge pull request #316 from trapexit/debian-kfreebsd

small tweaks to build on Debian kFreeBSD
pull/317/head
Antonio SJ Musumeci 8 years ago
committed by GitHub
parent
commit
12d2cf7464
  1. 2
      src/access.cpp
  2. 2
      src/chmod.cpp
  3. 3
      src/chown.cpp
  4. 2
      src/clone.cpp
  5. 4
      src/config.cpp
  6. 8
      src/create.cpp
  7. 3
      src/create.hpp
  8. 29
      src/errno.hpp
  9. 5
      src/fallocate.cpp
  10. 2
      src/fgetattr.cpp
  11. 2
      src/flush.cpp
  12. 2
      src/fs.cpp
  13. 3
      src/fs_attr_linux.icpp
  14. 8
      src/fs_attr_unsupported.icpp
  15. 2
      src/fs_clonefile.cpp
  16. 4
      src/fs_clonepath.cpp
  17. 2
      src/fs_fadvise_posix.icpp
  18. 2
      src/fs_fadvise_unsupported.icpp
  19. 2
      src/fs_fallocate.cpp
  20. 2
      src/fs_fallocate.hpp
  21. 2
      src/fs_fallocate_linux.icpp
  22. 2
      src/fs_fallocate_osx.icpp
  23. 2
      src/fs_fallocate_posix.icpp
  24. 3
      src/fs_fallocate_unsupported.icpp
  25. 8
      src/fs_movefile.cpp
  26. 3
      src/fs_sendfile_linux.icpp
  27. 3
      src/fs_sendfile_unsupported.icpp
  28. 2
      src/fs_xattr.cpp
  29. 2
      src/fsync.cpp
  30. 2
      src/ftruncate.cpp
  31. 2
      src/ftruncate.hpp
  32. 4
      src/fusefunc.cpp
  33. 2
      src/getattr.cpp
  34. 2
      src/getxattr.cpp
  35. 4
      src/gidcache.cpp
  36. 2
      src/ioctl.cpp
  37. 2
      src/link.cpp
  38. 2
      src/listxattr.cpp
  39. 2
      src/mkdir.cpp
  40. 6
      src/mknod.cpp
  41. 7
      src/open.cpp
  42. 4
      src/policy.cpp
  43. 3
      src/policy_all.cpp
  44. 3
      src/policy_epall.cpp
  45. 3
      src/policy_epff.cpp
  46. 3
      src/policy_eplfs.cpp
  47. 3
      src/policy_eplus.cpp
  48. 3
      src/policy_epmfs.cpp
  49. 5
      src/policy_eprand.cpp
  50. 3
      src/policy_erofs.cpp
  51. 3
      src/policy_ff.cpp
  52. 3
      src/policy_invalid.cpp
  53. 3
      src/policy_lfs.cpp
  54. 3
      src/policy_lus.cpp
  55. 3
      src/policy_mfs.cpp
  56. 2
      src/policy_newest.cpp
  57. 5
      src/policy_rand.cpp
  58. 4
      src/read.cpp
  59. 2
      src/read_buf.cpp
  60. 2
      src/readdir.cpp
  61. 6
      src/readlink.cpp
  62. 2
      src/release.cpp
  63. 2
      src/removexattr.cpp
  64. 2
      src/rename.cpp
  65. 2
      src/rmdir.cpp
  66. 4
      src/setxattr.cpp
  67. 2
      src/statfs.cpp
  68. 3
      src/symlink.cpp
  69. 4
      src/truncate.cpp
  70. 2
      src/unlink.cpp
  71. 2
      src/utimens.cpp
  72. 2
      src/write.cpp
  73. 3
      src/write_buf.cpp
  74. 12
      src/xattr.hpp
  75. 2
      tools/cppfind

2
src/access.cpp

@ -17,11 +17,11 @@
#include <string>
#include <vector>
#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rwlock.hpp"
#include "ugid.hpp"

2
src/chmod.cpp

@ -16,11 +16,11 @@
#include <fuse.h>
#include <errno.h>
#include <string>
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rv.hpp"
#include "rwlock.hpp"

3
src/chown.cpp

@ -16,12 +16,11 @@
#include <fuse.h>
#include <errno.h>
#include <string>
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rv.hpp"
#include "rwlock.hpp"

2
src/clone.cpp

@ -14,12 +14,12 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <iostream>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_clonefile.hpp"
#include "fs_clonepath.hpp"

4
src/config.cpp

@ -19,11 +19,11 @@
#include <unistd.h>
#include <sys/stat.h>
#include <errno.h>
#include "config.hpp"
#include "rwlock.hpp"
#include "errno.hpp"
#include "fs.hpp"
#include "rwlock.hpp"
#define MINFREESPACE_DEFAULT (4294967295ULL)
#define POLICYINIT(X) X(policies[FuseFunc::Enum::X])

8
src/create.cpp

@ -16,18 +16,18 @@
#include <fuse.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <string>
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fileinfo.hpp"
#include "fs_path.hpp"
#include "fs_clonepath.hpp"
#include "fs_path.hpp"
#include "rwlock.hpp"
#include "ugid.hpp"

3
src/create.hpp

@ -14,9 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/types.h>
#include <fuse.h>
#include <sys/types.h>
namespace mergerfs
{
namespace fuse

29
src/errno.hpp

@ -0,0 +1,29 @@
/*
Copyright (c) 2016, Antonio SJ Musumeci <trapexit@spawn.link>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
copyright notice and this permission notice appear in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#if defined(ENODATA) && !defined(ENOATTR)
#define ENOATTR ENODATA
#endif
#if defined(ENOATTR) && !defined(ENODATA)
#define ENODATA ENOATTR
#endif
#if !defined(ENOATTR) && !defined(ENODATA)
#error "Neither ENOATTR or ENODATA defined: please contact mergerfs author with platform information"
#endif

5
src/fallocate.cpp

@ -18,10 +18,9 @@
#include <fuse.h>
#include <errno.h>
#include "fs_fallocate.hpp"
#include "errno.hpp"
#include "fileinfo.hpp"
#include "fs_fallocate.hpp"
static
int

2
src/fgetattr.cpp

@ -19,8 +19,8 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include "errno.hpp"
#include "fileinfo.hpp"
static

2
src/flush.cpp

@ -17,8 +17,8 @@
#include <fuse.h>
#include <unistd.h>
#include <errno.h>
#include "errno.hpp"
#include "fileinfo.hpp"
static

2
src/fs.cpp

@ -17,7 +17,6 @@
#include <string>
#include <vector>
#include <errno.h>
#include <fcntl.h>
#include <fcntl.h>
#include <glob.h>
@ -29,6 +28,7 @@
#include <sys/types.h>
#include <unistd.h>
#include "errno.hpp"
#include "fs_attr.hpp"
#include "fs_path.hpp"
#include "fs_xattr.hpp"

3
src/fs_attr_linux.icpp

@ -14,7 +14,6 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <fcntl.h>
#include <linux/fs.h>
#include <sys/ioctl.h>
@ -24,6 +23,8 @@
#include <string>
#include "errno.hpp"
using std::string;
namespace fs

8
src/fs_attr_unsupported.icpp

@ -14,7 +14,9 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <string>
#include "errno.hpp"
namespace fs
{
@ -28,8 +30,8 @@ namespace fs
}
int
copy(const string &from,
const string &to)
copy(const std::string &from,
const std::string &to)
{
return ENOTSUP;
}

2
src/fs_clonefile.cpp

@ -14,7 +14,6 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <sys/stat.h>
@ -24,6 +23,7 @@
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs_attr.hpp"
#include "fs_fadvise.hpp"
#include "fs_fallocate.hpp"

4
src/fs_clonepath.cpp

@ -17,12 +17,12 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include <string>
#include "fs_path.hpp"
#include "errno.h"
#include "fs_attr.hpp"
#include "fs_path.hpp"
#include "fs_xattr.hpp"
using std::string;

2
src/fs_fadvise_posix.icpp

@ -14,7 +14,7 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include "errno.hpp"
namespace fs
{

2
src/fs_fadvise_unsupported.icpp

@ -14,7 +14,7 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include "errno.hpp"
namespace fs
{

2
src/fs_fallocate.cpp

@ -14,6 +14,8 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <fcntl.h>
#ifdef __linux__
# include "fs_fallocate_linux.icpp"
#elif _XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L

2
src/fs_fallocate.hpp

@ -17,6 +17,8 @@
#ifndef __FS_FALLOCATE_HPP__
#define __FS_FALLOCATE_HPP__
#include <fcntl.h>
namespace fs
{
int

2
src/fs_fallocate_linux.icpp

@ -14,9 +14,9 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <fcntl.h>
#include "errno.hpp"
#include "fs_fallocate.hpp"
namespace fs

2
src/fs_fallocate_osx.icpp

@ -14,9 +14,9 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <fcntl.h>
#include "errno.hpp"
#include "fs_fallocate.hpp"
namespace fs

2
src/fs_fallocate_posix.icpp

@ -14,9 +14,9 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <fcntl.h>
#include "errno.hpp"
#include "fs_fallocate.hpp"
namespace fs

3
src/fs_fallocate_unsupported.icpp

@ -14,8 +14,7 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include "errno.hpp"
#include "fs_fallocate.hpp"
namespace fs

8
src/fs_movefile.cpp

@ -14,18 +14,18 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <sys/types.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <fcntl.h>
#include <string>
#include <vector>
#include "fs.hpp"
#include "fs_path.hpp"
#include "fs_clonepath.hpp"
#include "fs_clonefile.hpp"
#include "fs_clonepath.hpp"
#include "fs_path.hpp"
using std::string;
using std::vector;

3
src/fs_sendfile_linux.icpp

@ -14,9 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <sys/sendfile.h>
#include "errno.hpp"
namespace fs
{
ssize_t

3
src/fs_sendfile_unsupported.icpp

@ -14,9 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <sys/types.h>
#include "errno.hpp"
namespace fs
{
ssize_t

2
src/fs_xattr.cpp

@ -14,7 +14,6 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <sys/stat.h>
@ -26,6 +25,7 @@
#include <map>
#include <sstream>
#include "errno.hpp"
#include "str.hpp"
#include "xattr.hpp"

2
src/fsync.cpp

@ -24,8 +24,8 @@
#include <vector>
#include <unistd.h>
#include <errno.h>
#include "errno.hpp"
#include "fileinfo.hpp"
static

2
src/ftruncate.cpp

@ -18,8 +18,8 @@
#include <unistd.h>
#include <sys/types.h>
#include <errno.h>
#include "errno.hpp"
#include "fileinfo.hpp"
static

2
src/ftruncate.hpp

@ -16,8 +16,8 @@
#include <fuse.h>
#include <unistd.h>
#include <sys/types.h>
#include <unistd.h>
namespace mergerfs
{

4
src/fusefunc.cpp

@ -17,9 +17,9 @@
#include <string>
#include <vector>
#include "fusefunc.hpp"
#include "category.hpp"
#include "buildvector.hpp"
#include "category.hpp"
#include "fusefunc.hpp"
#define FUSEFUNC(X,Y) FuseFunc(FuseFunc::Enum::X,#X,Category::Enum::Y)

2
src/getattr.cpp

@ -22,9 +22,9 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <errno.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rwlock.hpp"
#include "ugid.hpp"

2
src/getxattr.cpp

@ -21,13 +21,13 @@
#include <set>
#include <algorithm>
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rwlock.hpp"
#include "str.hpp"

4
src/gidcache.cpp

@ -14,10 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <grp.h>
#include <pwd.h>
#include <stdlib.h>
#include <sys/types.h>
#include <pwd.h>
#include <grp.h>
#include <unistd.h>
#if defined __linux__ and UGID_USE_RWLOCK == 0

2
src/ioctl.cpp

@ -19,13 +19,13 @@
#include <string>
#include <vector>
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include "config.hpp"
#include "errno.hpp"
#include "fileinfo.hpp"
#include "fs_path.hpp"
#include "rwlock.hpp"

2
src/link.cpp

@ -19,10 +19,10 @@
#include <string>
#include <vector>
#include <errno.h>
#include <unistd.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_clonepath.hpp"
#include "fs_path.hpp"
#include "rv.hpp"

2
src/listxattr.cpp

@ -20,12 +20,12 @@
#include <vector>
#include <sys/types.h>
#include <errno.h>
#include <string.h>
#include "buildvector.hpp"
#include "category.hpp"
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rwlock.hpp"
#include "ugid.hpp"

2
src/mkdir.cpp

@ -16,7 +16,6 @@
#include <fuse.h>
#include <errno.h>
#include <sys/stat.h>
#include <sys/types.h>
@ -24,6 +23,7 @@
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fs_clonepath.hpp"
#include "fs_path.hpp"
#include "rv.hpp"

6
src/mknod.cpp

@ -19,13 +19,13 @@
#include <string>
#include <vector>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_clonepath.hpp"
#include "fs_path.hpp"
#include "rv.hpp"

7
src/open.cpp

@ -16,14 +16,15 @@
#include <fuse.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <string>
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fileinfo.hpp"
#include "fs_path.hpp"
#include "rwlock.hpp"

4
src/policy.cpp

@ -16,9 +16,9 @@
#include <vector>
#include "policy.hpp"
#include "fs.hpp"
#include "buildvector.hpp"
#include "fs.hpp"
#include "policy.hpp"
#define POLICY(X,PP) (Policy(Policy::Enum::X,#X,Policy::Func::X,PP))
#define PRESERVES_PATH true

3
src/policy_all.cpp

@ -14,11 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

3
src/policy_epall.cpp

@ -14,11 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

3
src/policy_epff.cpp

@ -14,11 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

3
src/policy_eplfs.cpp

@ -14,12 +14,11 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <limits>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

3
src/policy_eplus.cpp

@ -14,12 +14,11 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <limits>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

3
src/policy_epmfs.cpp

@ -14,12 +14,11 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <limits>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

5
src/policy_eprand.cpp

@ -14,12 +14,11 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <algorithm>
#include <string>
#include <vector>
#include <algorithm>
#include "errno.hpp"
#include "policy.hpp"
#include "success_fail.hpp"

3
src/policy_erofs.cpp

@ -14,11 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <string>
#include <vector>
#include "errno.hpp"
#include "policy.hpp"
using std::string;

3
src/policy_ff.cpp

@ -14,11 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

3
src/policy_invalid.cpp

@ -14,11 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <string>
#include <vector>
#include "errno.hpp"
#include "policy.hpp"
using std::string;

3
src/policy_lfs.cpp

@ -14,12 +14,11 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <limits>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

3
src/policy_lus.cpp

@ -14,12 +14,11 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <limits>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

3
src/policy_mfs.cpp

@ -14,11 +14,10 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <string>
#include <vector>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

2
src/policy_newest.cpp

@ -14,13 +14,13 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <sys/stat.h>
#include <string>
#include <vector>
#include <limits>
#include "errno.hpp"
#include "fs.hpp"
#include "fs_path.hpp"
#include "policy.hpp"

5
src/policy_rand.cpp

@ -14,12 +14,11 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <algorithm>
#include <string>
#include <vector>
#include <algorithm>
#include "errno.hpp"
#include "policy.hpp"
#include "success_fail.hpp"

4
src/read.cpp

@ -16,12 +16,12 @@
#include <fuse.h>
#include <errno.h>
#include <unistd.h>
#include <string.h>
#include <unistd.h>
#include <string>
#include "errno.hpp"
#include "fileinfo.hpp"
static

2
src/read_buf.cpp

@ -19,9 +19,9 @@
#include <fuse.h>
#include <stdlib.h>
#include <errno.h>
#include <string.h>
#include "errno.hpp"
#include "fileinfo.hpp"
typedef struct fuse_bufvec fuse_bufvec;

2
src/readdir.cpp

@ -22,10 +22,10 @@
#include <set>
#include <vector>
#include <errno.h>
#include <dirent.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "readdir.hpp"
#include "rwlock.hpp"

6
src/readlink.cpp

@ -16,13 +16,13 @@
#include <fuse.h>
#include <errno.h>
#include <sys/types.h>
#include <unistd.h>
#include <string.h>
#include <string>
#include <sys/types.h>
#include <unistd.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rwlock.hpp"
#include "ugid.hpp"

2
src/release.cpp

@ -17,10 +17,10 @@
#include <fuse.h>
#include <unistd.h>
#include <errno.h>
#include <string>
#include "errno.hpp"
#include "fileinfo.hpp"
static

2
src/removexattr.cpp

@ -19,10 +19,10 @@
#include <string>
#include <vector>
#include <errno.h>
#include <sys/types.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rv.hpp"
#include "rwlock.hpp"

2
src/rename.cpp

@ -14,7 +14,6 @@
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
#include <errno.h>
#include <stdio.h>
#include <unistd.h>
@ -24,6 +23,7 @@
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fs_clonepath.hpp"
#include "fs_path.hpp"
#include "rv.hpp"

2
src/rmdir.cpp

@ -16,12 +16,12 @@
#include <fuse.h>
#include <errno.h>
#include <unistd.h>
#include <string>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rv.hpp"
#include "rwlock.hpp"

4
src/setxattr.cpp

@ -20,11 +20,11 @@
#include <vector>
#include <sstream>
#include <errno.h>
#include <sys/types.h>
#include <string.h>
#include <sys/types.h>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "num.hpp"
#include "rv.hpp"

2
src/statfs.cpp

@ -17,7 +17,6 @@
#include <fuse.h>
#include <sys/statvfs.h>
#include <errno.h>
#include <algorithm>
#include <climits>
@ -26,6 +25,7 @@
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "rwlock.hpp"
#include "success_fail.hpp"
#include "ugid.hpp"

3
src/symlink.cpp

@ -16,12 +16,13 @@
#include <fuse.h>
#include <errno.h>
#include <sys/types.h>
#include <unistd.h>
#include <string>
#include "config.hpp"
#include "errno.hpp"
#include "fs_clonepath.hpp"
#include "fs_path.hpp"
#include "rv.hpp"

4
src/truncate.cpp

@ -16,14 +16,14 @@
#include <fuse.h>
#include <unistd.h>
#include <sys/types.h>
#include <errno.h>
#include <unistd.h>
#include <string>
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rv.hpp"
#include "rwlock.hpp"

2
src/unlink.cpp

@ -16,13 +16,13 @@
#include <fuse.h>
#include <errno.h>
#include <unistd.h>
#include <string>
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rv.hpp"
#include "rwlock.hpp"

2
src/utimens.cpp

@ -16,7 +16,6 @@
#include <fuse.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/stat.h>
@ -24,6 +23,7 @@
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fs_path.hpp"
#include "rv.hpp"
#include "rwlock.hpp"

2
src/write.cpp

@ -16,10 +16,10 @@
#include <fuse.h>
#include <errno.h>
#include <unistd.h>
#include "config.hpp"
#include "errno.hpp"
#include "fileinfo.hpp"
#include "fs_movefile.hpp"
#include "rwlock.hpp"

3
src/write_buf.cpp

@ -17,14 +17,15 @@
#if WRITE_BUF
#include <fuse.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <string>
#include <vector>
#include "config.hpp"
#include "errno.hpp"
#include "fileinfo.hpp"
#include "fs_movefile.hpp"
#include "policy.hpp"

12
src/xattr.hpp

@ -18,18 +18,6 @@
#include <attr/xattr.h>
#endif
#if defined(ENODATA) && !defined(ENOATTR)
#define ENOATTR ENODATA
#endif
#if defined(ENOATTR) && !defined(ENODATA)
#define ENODATA ENOATTR
#endif
#if !defined(ENOATTR) && !defined(ENODATA)
#error "Neither ENOATTR or ENODATA defined: please contact mergerfs author with platform information"
#endif
#ifndef XATTR_CREATE
# define XATTR_CREATE 0x1
#endif

2
tools/cppfind

@ -1,6 +1,6 @@
#!/bin/sh
FUSE_CFLAGS=$(pkg-config --cflags fuse)
FUSE_CFLAGS="$(pkg-config --cflags fuse) -DFUSE_USE_VERSION=29"
echo "#include <fuse.h>" | cpp ${FUSE_CFLAGS} | grep -q "${1}"

Loading…
Cancel
Save