Merge pull request #418 from trapexit/fix

use fusepath from fileinfo. closes #417
trapexit · Jun 24, 2017 · fa3ff40 · fa3ff40
2 parents 721bd4d + bfd410d
commit fa3ff40
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/src/fs.cpp b/src/fs.cpp
@@ -137,7 +137,7 @@ namespace fs
 
   int
   findonfs(const vector<string> &srcmounts,
-           const char           *fusepath,
+           const string         &fusepath,
            const int             fd,
            string               &basepath)
   {

diff --git a/src/fs.hpp b/src/fs.hpp
@@ -49,7 +49,7 @@ namespace fs
                     vector<string>       &paths);
 
   int findonfs(const vector<string> &srcmounts,
-               const char           *fusepath,
+               const string         &fusepath,
                const int             fd,
                string               &basepath);
 

diff --git a/src/fs_movefile.cpp b/src/fs_movefile.cpp
@@ -41,15 +41,6 @@ namespace fs
            const string         &fusepath,
            const size_t          additional_size,
            int                  &origfd)
-  {
-    return fs::movefile(basepaths,fusepath.c_str(),additional_size,origfd);
-  }
-
-  int
-  movefile(const vector<string> &basepaths,
-           const char           *fusepath,
-           const size_t          additional_size,
-           int                  &origfd)
   {
     int rv;
     int fdin;

diff --git a/src/fs_movefile.hpp b/src/fs_movefile.hpp
@@ -27,12 +27,6 @@ namespace fs
            const std::string              &fusepath,
            const size_t                    additional_size,
            int                            &origfd);
-
-  int
-  movefile(const std::vector<std::string> &basepaths,
-           const char                     *fusepath,
-           const size_t                    additional_size,
-           int                            &origfd);
 }
 
 #endif
diff --git a/src/fs_path.hpp b/src/fs_path.hpp
@@ -38,6 +38,14 @@ namespace fs
       base += suffix;
     }
 
+    inline
+    void
+    append(string       &base,
+           const string &suffix)
+    {
+      base += suffix;
+    }
+
     inline
     void
     make(const string *base,
@@ -47,6 +55,16 @@ namespace fs
       output  = *base;
       output += suffix;
     }
+
+    inline
+    void
+    make(const string *base,
+         const string &suffix,
+         string       &output)
+    {
+      output  = *base;
+      output += suffix;
+    }
   }
 };
 

diff --git a/src/write_buf.cpp b/src/write_buf.cpp
@@ -87,7 +87,7 @@ namespace mergerfs
               const rwlock::ReadGuard readlock(&config.srcmountslock);
 
               extra = fuse_buf_size(src);
-              rv = fs::movefile(config.srcmounts,fusepath,extra,fi->fd);
+              rv = fs::movefile(config.srcmounts,fi->fusepath,extra,fi->fd);
               if(rv == -1)
                 return -ENOSPC;