Rolling back to using FUSE 2.9

Author: Peter Watkins

.travis.yml

@@ -1,8 +1,6 @@
 notifications:
   email: false
 
-sudo: required
-
 git:
   depth: 3
 
@@ -13,8 +11,7 @@ addons:
     packages:
       - cmake
       - cmake-data
-      - gettext
-      - util-linux
+      - libfuse-dev
 
 before_install:
   util/travis-before_install.sh

src/directory.cpp

@@ -9,7 +9,7 @@
 #ifdef __APPLE__
 #include <osxfuse/fuse/fuse_lowlevel.h>
 #else
-#include <fuse3/fuse_lowlevel.h>
+#include <fuse/fuse_lowlevel.h>
 #endif
 
 #include "inode.hpp"

src/file.cpp

@@ -12,7 +12,7 @@
 #ifdef __APPLE__
 #include <osxfuse/fuse/fuse_lowlevel.h>
 #else
-#include <fuse3/fuse_lowlevel.h>
+#include <fuse/fuse_lowlevel.h>
 #endif
 
 #include "util.hpp"

src/fuse_cpp_ramfs.cpp

@@ -13,7 +13,7 @@
 #ifdef __APPLE__
 #include <osxfuse/fuse/fuse_lowlevel.h>
 #else
-#include <fuse3/fuse_lowlevel.h>
+#include <fuse/fuse_lowlevel.h>
 #endif
 #include <unistd.h>
 

src/inode.cpp

@@ -14,7 +14,7 @@
 #ifdef __APPLE__
 #include <osxfuse/fuse/fuse_lowlevel.h>
 #else
-#include <fuse3/fuse_lowlevel.h>
+#include <fuse/fuse_lowlevel.h>
 #endif
 #include <sys/xattr.h>
 
@@ -25,6 +25,11 @@ using namespace std;
 
 Inode::~Inode() {}
 
+/** Fix until FUSE 3 is available on all platforms. */
+#ifndef FUSE_SET_ATTR_CTIME
+#define FUSE_SET_ATTR_CTIME   (1 << 10)
+#endif
+
 int Inode::ReplyEntry(fuse_req_t req) {
     m_nlookup++;
     return fuse_reply_entry(req, &m_fuseEntryParam);

src/main.cpp

@@ -5,7 +5,7 @@
 #ifdef __APPLE__
 #include <osxfuse/fuse/fuse_lowlevel.h>
 #else
-#include <fuse3/fuse_lowlevel.h>
+#include <fuse/fuse_lowlevel.h>
 #endif
 #include <iostream>
 #include <vector>

src/special_inode.cpp

@@ -9,7 +9,7 @@
 #ifdef __APPLE__
 #include <osxfuse/fuse/fuse_lowlevel.h>
 #else
-#include <fuse3/fuse_lowlevel.h>
+#include <fuse/fuse_lowlevel.h>
 #endif
 
 #include "inode.hpp"

src/symlink.cpp

@@ -10,7 +10,7 @@
 #ifdef __APPLE__
 #include <osxfuse/fuse/fuse_lowlevel.h>
 #else
-#include <fuse3/fuse_lowlevel.h>
+#include <fuse/fuse_lowlevel.h>
 #endif
 
 #include "util.hpp"

util/travis-before_install.sh

@@ -1,12 +1,3 @@
 #!/bin/sh
 
 set -ex
-
-# libfuse
-wget https://github.com/libfuse/libfuse/archive/fuse-3.0.2.tar.gz
-tar -xzf fuse-3.0.2.tar.gz
-cd libfuse-fuse-3.0.2
-./makeconf.sh
-./configure --prefix=/usr
-make
-sudo make install