From 1d1694bbb56a668f040d3461048766f124e8f999 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Wed, 20 Jan 2016 17:24:50 -0500 Subject: [PATCH] fix indexing of mknod targets. closes #202 --- src/mkdir.cpp | 7 +++---- src/mknod.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/mkdir.cpp b/src/mkdir.cpp index 0bc3b088..6b940fd2 100644 --- a/src/mkdir.cpp +++ b/src/mkdir.cpp @@ -47,9 +47,8 @@ _mkdir(Policy::Func::Search searchFunc, int rv; int error; string dirname; - string fullpath; + string existingpath; vector createpaths; - vector existingpath; dirname = fs::path::dirname(fusepath); rv = searchFunc(srcmounts,dirname,minfreespace,existingpath); @@ -65,10 +64,10 @@ _mkdir(Policy::Func::Search searchFunc, { string &createpath = createpaths[i]; - if(createpath != existingpath[0]) + if(createpath != existingpath) { const ugid::SetRootGuard ugidGuard; - fs::clonepath(existingpath[0],createpath,dirname); + fs::clonepath(existingpath,createpath,dirname); } fs::path::append(createpath,fusepath); diff --git a/src/mknod.cpp b/src/mknod.cpp index 32d4bc38..539d78f0 100644 --- a/src/mknod.cpp +++ b/src/mknod.cpp @@ -49,8 +49,8 @@ _mknod(Policy::Func::Search searchFunc, int rv; int error; string dirname; + string existingpath; vector createpaths; - vector existingpath; dirname = fs::path::dirname(fusepath); rv = searchFunc(srcmounts,dirname,minfreespace,existingpath); @@ -64,12 +64,12 @@ _mknod(Policy::Func::Search searchFunc, error = -1; for(size_t i = 0, ei = createpaths.size(); i != ei; i++) { - string &createpath = createpaths[0]; + string &createpath = createpaths[i]; - if(createpath != existingpath[0]) + if(createpath != existingpath) { const ugid::SetRootGuard ugidGuard; - fs::clonepath(existingpath[0],createpath,dirname); + fs::clonepath(existingpath,createpath,dirname); } fs::path::append(createpath,fusepath);