Rename namespace fusepp -> fspp

src/cryfs_lib/CryDevice.cpp

@@ -11,7 +11,7 @@ using std::unique_ptr;
 using std::make_unique;
 
 //TODO Get rid of this in favor of exception hierarchy
-using fusepp::CHECK_RETVAL;
+using fspp::CHECK_RETVAL;
 
 namespace cryfs {
 
@@ -21,7 +21,7 @@ CryDevice::CryDevice(const bf::path &root_path): _root_path(root_path) {
 CryDevice::~CryDevice() {
 }
 
-unique_ptr<fusepp::Node> CryDevice::Load(const bf::path &path) {
+unique_ptr<fspp::Node> CryDevice::Load(const bf::path &path) {
   auto real_path = RootDir() / path;
   if(bf::is_directory(real_path)) {
     return make_unique<CryDir>(this, path);
@@ -29,7 +29,7 @@ unique_ptr<fusepp::Node> CryDevice::Load(const bf::path &path) {
     return make_unique<CryFile>(this, path);
   }
 
-  throw fusepp::FuseErrnoException(ENOENT);
+  throw fspp::FuseErrnoException(ENOENT);
 }
 
 void CryDevice::statfs(const bf::path &path, struct statvfs *fsstat) {

src/cryfs_lib/CryDevice.h

@@ -11,7 +11,7 @@ namespace cryfs {
 
 namespace bf = boost::filesystem;
 
-class CryDevice: public fusepp::Device {
+class CryDevice: public fspp::Device {
 public:
   CryDevice(const bf::path &rootdir);
   virtual ~CryDevice();
@@ -20,7 +20,7 @@ public:
 
   const bf::path &RootDir() const;
 private:
-  std::unique_ptr<fusepp::Node> Load(const bf::path &path) override;
+  std::unique_ptr<fspp::Node> Load(const bf::path &path) override;
 
   const bf::path _root_path;
 

src/cryfs_lib/CryDir.cpp

@@ -10,7 +10,7 @@
 #include "CryFile.h"
 
 //TODO Get rid of this in favor of exception hierarchy
-using fusepp::CHECK_RETVAL;
+using fspp::CHECK_RETVAL;
 
 namespace bf = boost::filesystem;
 
@@ -29,7 +29,7 @@ CryDir::CryDir(CryDevice *device, const bf::path &path)
 CryDir::~CryDir() {
 }
 
-unique_ptr<fusepp::File> CryDir::createFile(const string &name, mode_t mode) {
+unique_ptr<fspp::File> CryDir::createFile(const string &name, mode_t mode) {
   auto file_path = base_path() / name;
   //Create file
   int fd = ::creat(file_path.c_str(), mode);
@@ -38,7 +38,7 @@ unique_ptr<fusepp::File> CryDir::createFile(const string &name, mode_t mode) {
   return make_unique<CryFile>(device(), path() / name);
 }
 
-unique_ptr<fusepp::Dir> CryDir::createDir(const string &name, mode_t mode) {
+unique_ptr<fspp::Dir> CryDir::createDir(const string &name, mode_t mode) {
   auto dir_path = base_path() / name;
   //Create dir
   int retval = ::mkdir(dir_path.c_str(), mode);
@@ -54,7 +54,7 @@ void CryDir::rmdir() {
 unique_ptr<vector<string>> CryDir::children() const {
   DIR *dir = ::opendir(base_path().c_str());
   if (dir == nullptr) {
-    throw fusepp::FuseErrnoException(errno);
+    throw fspp::FuseErrnoException(errno);
   }
 
   // Set errno=0 so we can detect whether it changed later
@@ -71,7 +71,7 @@ unique_ptr<vector<string>> CryDir::children() const {
   if (errno != 0) {
     int readdir_errno = errno;
     ::closedir(dir);
-    throw fusepp::FuseErrnoException(readdir_errno);
+    throw fspp::FuseErrnoException(readdir_errno);
   }
   int retval = ::closedir(dir);
   CHECK_RETVAL(retval);

src/cryfs_lib/CryDir.h

@@ -7,14 +7,14 @@
 
 namespace cryfs {
 
-class CryDir: public fusepp::Dir, CryNode {
+class CryDir: public fspp::Dir, CryNode {
 public:
   CryDir(CryDevice *device, const bf::path &path);
   virtual ~CryDir();
 
   //TODO return type variance to CryFile/CryDir?
-  std::unique_ptr<fusepp::File> createFile(const std::string &name, mode_t mode) override;
+  std::unique_ptr<fspp::File> createFile(const std::string &name, mode_t mode) override;
-  std::unique_ptr<fusepp::Dir> createDir(const std::string &name, mode_t mode) override;
+  std::unique_ptr<fspp::Dir> createDir(const std::string &name, mode_t mode) override;
   void rmdir() override;
 
   std::unique_ptr<std::vector<std::string>> children() const override;

src/cryfs_lib/CryFile.cpp

@@ -7,7 +7,7 @@
 namespace bf = boost::filesystem;
 
 //TODO Get rid of this in favor of exception hierarchy
-using fusepp::CHECK_RETVAL;
+using fspp::CHECK_RETVAL;
 
 using std::unique_ptr;
 using std::make_unique;
@@ -22,7 +22,7 @@ CryFile::CryFile(CryDevice *device, const bf::path &path)
 CryFile::~CryFile() {
 }
 
-unique_ptr<fusepp::OpenFile> CryFile::open(int flags) const {
+unique_ptr<fspp::OpenFile> CryFile::open(int flags) const {
   return make_unique<CryOpenFile>(device(), path(), flags);
 }
 

src/cryfs_lib/CryFile.h

@@ -7,12 +7,12 @@
 
 namespace cryfs {
 
-class CryFile: public fusepp::File, CryNode {
+class CryFile: public fspp::File, CryNode {
 public:
   CryFile(CryDevice *device, const boost::filesystem::path &path);
   virtual ~CryFile();
 
-  std::unique_ptr<fusepp::OpenFile> open(int flags) const override;
+  std::unique_ptr<fspp::OpenFile> open(int flags) const override;
   void truncate(off_t size) const override;
   void unlink() override;
 

src/cryfs_lib/CryNode.cpp

@@ -8,7 +8,7 @@
 namespace bf = boost::filesystem;
 
 //TODO Get rid of this in favor of an exception hierarchy
-using fusepp::CHECK_RETVAL;
+using fspp::CHECK_RETVAL;
 
 namespace cryfs {
 

src/cryfs_lib/CryNode.h

@@ -9,7 +9,7 @@
 
 namespace cryfs {
 
-class CryNode: public virtual fusepp::Node {
+class CryNode: public virtual fspp::Node {
 public:
   CryNode(CryDevice *device, const boost::filesystem::path &path);
   virtual ~CryNode();

src/cryfs_lib/CryOpenFile.cpp

@@ -9,7 +9,7 @@
 namespace bf = boost::filesystem;
 
 //TODO Get rid of this in favor of a exception hierarchy
-using fusepp::CHECK_RETVAL;
+using fspp::CHECK_RETVAL;
 
 namespace cryfs {
 

src/cryfs_lib/CryOpenFile.h

@@ -8,7 +8,7 @@
 namespace cryfs {
 class CryDevice;
 
-class CryOpenFile: public fusepp::OpenFile {
+class CryOpenFile: public fspp::OpenFile {
 public:
   CryOpenFile(const CryDevice *device, const boost::filesystem::path &path, int flags);
   virtual ~CryOpenFile();

src/fusepp/fs_interface/Device.h

@@ -1,12 +1,12 @@
 #pragma once
-#ifndef FUSEPP_DEVICE_H_
+#ifndef FSPP_DEVICE_H_
-#define FUSEPP_DEVICE_H_
+#define FSPP_DEVICE_H_
 
 #include <boost/filesystem.hpp>
 #include <memory>
 #include <sys/statvfs.h>
 
-namespace fusepp {
+namespace fspp {
 class Node;
 
 class Device {
@@ -19,4 +19,4 @@ public:
 
 }
 
-#endif /* FUSEPP_DEVICE_H_ */
+#endif /* FSPP_DEVICE_H_ */

src/fusepp/fs_interface/Dir.h

@@ -1,12 +1,12 @@
 #pragma once
-#ifndef FUSEPP_DIR_H_
+#ifndef FSPP_DIR_H_
-#define FUSEPP_DIR_H_
+#define FSPP_DIR_H_
 
 #include <fusepp/fs_interface/Node.h>
 #include <memory>
 #include <string>
 
-namespace fusepp {
+namespace fspp {
 class Device;
 class File;
 
@@ -21,6 +21,6 @@ public:
   virtual std::unique_ptr<std::vector<std::string>> children() const = 0;
 };
 
-} /* namespace fusepp */
+} /* namespace fspp */
 
-#endif /* FUSEPP_DIR_H_ */
+#endif /* FSPP_DIR_H_ */

src/fusepp/fs_interface/File.h

@@ -1,11 +1,11 @@
 #pragma once
-#ifndef FUSEPP_FILE_H_
+#ifndef FSPP_FILE_H_
-#define FUSEPP_FILE_H_
+#define FSPP_FILE_H_
 
 #include <fusepp/fs_interface/Node.h>
 #include <memory>
 
-namespace fusepp {
+namespace fspp {
 class Device;
 class OpenFile;
 
@@ -18,6 +18,6 @@ public:
   virtual void unlink() = 0;
 };
 
-} /* namespace fusepp */
+} /* namespace fspp */
 
-#endif /* FUSEPP_FILE_H_ */
+#endif /* FSPP_FILE_H_ */

src/fusepp/fs_interface/Node.h

@@ -1,12 +1,12 @@
 #pragma once
-#ifndef FUSEPP_NODE_H_
+#ifndef FSPP_NODE_H_
-#define FUSEPP_NODE_H_
+#define FSPP_NODE_H_
 
 #include <boost/filesystem.hpp>
 
 #include <sys/stat.h>
 
-namespace fusepp {
+namespace fspp {
 
 class Node {
 public:
@@ -18,6 +18,6 @@ public:
   virtual void utimens(const timespec times[2]) = 0;
 };
 
-} /* namespace fusepp */
+} /* namespace fspp */
 
-#endif /* FUSEPP_NODE_H_ */
+#endif /* FSPP_NODE_H_ */

src/fusepp/fs_interface/OpenFile.h

@@ -1,11 +1,11 @@
 #pragma once
-#ifndef FUSEPP_OPENFILE_H_
+#ifndef FSPP_OPENFILE_H_
-#define FUSEPP_OPENFILE_H_
+#define FSPP_OPENFILE_H_
 
 #include <boost/filesystem.hpp>
 #include <sys/stat.h>
 
-namespace fusepp {
+namespace fspp {
 class Device;
 
 class OpenFile {
@@ -22,4 +22,4 @@ public:
 
 }
 
-#endif /* FUSEPP_OPENFILE_H_ */
+#endif /* FSPP_OPENFILE_H_ */

src/fusepp/fusebindings/Fuse.cpp

@@ -11,7 +11,7 @@ using std::string;
 
 namespace bf = boost::filesystem;
 
-using namespace fusepp::fusebindings;
+using namespace fspp::fuse;
 
 #define FUSE_OBJ ((Fuse *) fuse_get_context()->private_data)
 
@@ -218,7 +218,7 @@ int Fuse::getattr(const bf::path &path, struct stat *stbuf) {
   try {
     _impl->lstat(path, stbuf);
     return 0;
-  } catch(fusepp::FuseErrnoException &e) {
+  } catch(fspp::FuseErrnoException &e) {
     return -e.getErrno();
   }
 }
@@ -238,7 +238,7 @@ int Fuse::fgetattr(const bf::path &path, struct stat *stbuf, fuse_file_info *fil
   try {
   _impl->fstat(fileinfo->fh, stbuf);
   return 0;
-  } catch(fusepp::FuseErrnoException &e) {
+  } catch(fspp::FuseErrnoException &e) {
     return -e.getErrno();
   }
 }
@@ -265,7 +265,7 @@ int Fuse::mkdir(const bf::path &path, mode_t mode) {
   try {
     _impl->mkdir(path, mode);
     return 0;
-  } catch(fusepp::FuseErrnoException &e) {
+  } catch(fspp::FuseErrnoException &e) {
     return -e.getErrno();
   }
 }
@@ -275,7 +275,7 @@ int Fuse::unlink(const bf::path &path) {
   try {
     _impl->unlink(path);
     return 0;
-  } catch(fusepp::FuseErrnoException &e) {
+  } catch(fspp::FuseErrnoException &e) {
     return -e.getErrno();
   }
 }
@@ -284,7 +284,7 @@ int Fuse::rmdir(const bf::path &path) {
   try {
     _impl->rmdir(path);
     return 0;
-  } catch(fusepp::FuseErrnoException &e) {
+  } catch(fspp::FuseErrnoException &e) {
     return -e.getErrno();
   }
 }
@@ -304,7 +304,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
   try {
     _impl->rename(from, to);
     return 0;
-  } catch(fusepp::FuseErrnoException &e) {
+  } catch(fspp::FuseErrnoException &e) {
     return -e.getErrno();
   }
 }

src/fusepp/fusebindings/Fuse.h

@@ -1,20 +1,19 @@
 #pragma once
-#ifndef FUSEPP_FUSE_H_
+#ifndef FSPP_FUSE_FUSE_H_
-#define FUSEPP_FUSE_H_
+#define FSPP_FUSE_FUSE_H_
 
 #include "params.h"
-#include <fuse.h>
 #include <cstdio>
 #include <string>
 #include <sys/stat.h>
 #include <boost/filesystem.hpp>
 #include "../utils/macros.h"
 
-namespace fusepp {
+namespace fspp {
 class Device;
 class FilesystemImpl;
 
-namespace fusebindings {
+namespace fuse {
 
 class Fuse {
 public:
@@ -62,4 +61,4 @@ private:
 }
 }
 
-#endif /* FUSEPP_FUSE_H_ */
+#endif /* FSPP_FUSE_FUSE_H_ */

src/fusepp/fusebindings/params.h

@@ -1,7 +1,8 @@
 #pragma once
-#ifndef FUSEPP_PARAMS_H_
+#ifndef FSPP_FUSE_PARAMS_H_
-#define FUSEPP_PARAMS_H_
+#define FSPP_FUSE_PARAMS_H_
 
 #define FUSE_USE_VERSION 26
+#include <fuse.h>
 
-#endif /* FUSEPP_PARAMS_H_ */
+#endif /* FSPP_FUSE_PARAMS_H_ */

src/fusepp/impl/FilesystemImpl.cpp

@@ -11,7 +11,7 @@
 
 #include "fusepp/utils/pointer.h"
 
-using namespace fusepp;
+using namespace fspp;
 
 using std::unique_ptr;
 using std::make_unique;

src/fusepp/impl/FilesystemImpl.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FUSEPP_FILESYSTEMIMPL_H_
+#ifndef FSPP_IMPL_FILESYSTEMIMPL_H_
-#define FUSEPP_FILESYSTEMIMPL_H_
+#define FSPP_IMPL_FILESYSTEMIMPL_H_
 
 #include <boost/filesystem.hpp>
 #include "FuseOpenFileList.h"
@@ -10,7 +10,7 @@
 
 #include "fusepp/utils/macros.h"
 
-namespace fusepp {
+namespace fspp {
 class Node;
 class File;
 class OpenFile;
@@ -54,4 +54,4 @@ private:
 
 }
 
-#endif /* FUSEPP_FILESYSTEMIMPL_H_ */
+#endif /* FSPP_IMPL_FILESYSTEMIMPL_H_ */

src/fusepp/impl/FuseErrnoException.cpp

@@ -7,7 +7,7 @@
 using std::string;
 using std::runtime_error;
 
-namespace fusepp {
+namespace fspp {
 
 FuseErrnoException::FuseErrnoException(int errno_)
   :runtime_error(strerror(errno_)), _errno(errno_) {

src/fusepp/impl/FuseErrnoException.h

@@ -1,11 +1,11 @@
 #pragma once
-#ifndef FUSEPP_FUSEERRNOEXCEPTION_H_
+#ifndef FSPP_FUSE_FUSEERRNOEXCEPTION_H_
-#define FUSEPP_FUSEERRNOEXCEPTION_H_
+#define FSPP_FUSE_FUSEERRNOEXCEPTION_H_
 
 #include <stdexcept>
 #include <errno.h>
 
-namespace fusepp {
+namespace fspp {
 
 class FuseErrnoException: public std::runtime_error {
 public:
@@ -23,6 +23,6 @@ inline void CHECK_RETVAL(int retval) {
   }
 }
 
-} /* namespace fusepp */
+} /* namespace fspp */
 
-#endif /* FUSEPP_FUSEERRNOEXCEPTION_H_ */
+#endif /* FSPP_FUSE_FUSEERRNOEXCEPTION_H_ */

src/fusepp/impl/FuseOpenFileList.cpp

@@ -1,6 +1,6 @@
 #include "FuseOpenFileList.h"
 
-using namespace fusepp;
+using namespace fspp;
 
 FuseOpenFileList::~FuseOpenFileList() {
 }

src/fusepp/impl/FuseOpenFileList.h

@@ -1,13 +1,13 @@
 #pragma once
-#ifndef FUSEPP_FUSEOPENFILELIST_H_
+#ifndef FSPP_IMPL_FUSEOPENFILELIST_H_
-#define FUSEPP_FUSEOPENFILELIST_H_
+#define FSPP_IMPL_FUSEOPENFILELIST_H_
 
 #include <fusepp/fs_interface/File.h>
 #include <fusepp/fs_interface/OpenFile.h>
 #include "fusepp/utils/macros.h"
 #include "IdList.h"
 
-namespace fusepp {
+namespace fspp {
 
 class FuseOpenFileList {
 public:
@@ -43,4 +43,4 @@ inline void FuseOpenFileList::close(int descriptor) {
 
 }
 
-#endif /* FUSEPP_FUSEOPENFILELIST_H_ */
+#endif /* FSPP_IMPL_FUSEOPENFILELIST_H_ */

src/fusepp/impl/IdList.h

@@ -1,13 +1,13 @@
 #pragma once
-#ifndef FUSEPP_IDLIST_H_
+#ifndef FSPP_FUSE_IDLIST_H_
-#define FUSEPP_IDLIST_H_
+#define FSPP_FUSE_IDLIST_H_
 
 #include <map>
 #include <memory>
 #include <mutex>
 #include "fusepp/utils/macros.h"
 
-namespace fusepp {
+namespace fspp {
 
 template<class Entry>
 class IdList {
@@ -65,4 +65,4 @@ void IdList<Entry>::remove(int id) {
 
 } /* namespace fusepp */
 
-#endif /* FUSEPP_IDLIST_H_ */
+#endif /* FSPP_FUSE_IDLIST_H_ */

src/fusepp/utils/macros.h

@@ -1,6 +1,6 @@
 #pragma once
-#ifndef FUSEPP_UTILS_MACROS_H_
+#ifndef FSPP_UTILS_MACROS_H_
-#define FUSEPP_UTILS_MACROS_H_
+#define FSPP_UTILS_MACROS_H_
 
 #define DISALLOW_COPY_AND_ASSIGN(Class)        \
   Class(const Class &rhs) = delete;            \
@@ -8,4 +8,4 @@
 
 #define UNUSED(expr) (void)(expr)
 
-#endif /* FUSEPP_UTILS_MACROS_H_ */
+#endif /* FSPP_UTILS_MACROS_H_ */

src/fusepp/utils/pointer.h

@@ -1,10 +1,10 @@
 #pragma once
-#ifndef FUSEPP_UTILS_POINTER_H_
+#ifndef FSPP_UTILS_POINTER_H_
-#define FUSEPP_UTILS_POINTER_H_
+#define FSPP_UTILS_POINTER_H_
 
 #include <memory>
 
-namespace fusepp {
+namespace fspp {
 
   template<typename DST, typename SRC>
   inline std::unique_ptr<DST> dynamic_pointer_move(std::unique_ptr<SRC> &source) {

src/main.cpp

@@ -13,8 +13,8 @@ int main (int argc, char *argv[])
 {
   printf("Version: %d\n", buildconfig::VERSION::MAJOR);
   cryfs::CryDevice device(bf::path("/home/heinzi/cryfstest/root"));
-  fusepp::FilesystemImpl fsimpl(&device);
+  fspp::FilesystemImpl fsimpl(&device);
-  fusepp::fusebindings::Fuse fuse(&fsimpl);
+  fspp::fuse::Fuse fuse(&fsimpl);
   fuse.run(argc, argv);
   return 0;
 }