hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix sigsev on startup which was introduced by commit 1bb38f39b4

Browse Source
This commit is contained in:
Sebastian Messmer 2016-06-07 12:44:35 -07:00
parent 2642507344
commit 8bf8081464
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/fspp/fuse/Fuse.cpp
View File

@ -241,14 +241,14 @@ void Fuse::run(const bf::path &mountdir, const vector<string> &fuseOptions) {
vector<char *> Fuse::_build_argv(const bf::path &mountdir, const vector<string> &fuseOptions) { vector<char *> Fuse::_build_argv(const bf::path &mountdir, const vector<string> &fuseOptions) {
vector<char *> argv; vector<char *> argv;
_argv.reserve(6 + fuseOptions.size()); // fuseOptions + executable name + mountdir + 2x fuse options (subtype, fsname), each taking 2 entries ("-o", "key=value"). argv.reserve(6 + fuseOptions.size()); // fuseOptions + executable name + mountdir + 2x fuse options (subtype, fsname), each taking 2 entries ("-o", "key=value").
_argv.push_back(_create_c_string(_fstype)); // The first argument (executable name) is the file system type argv.push_back(_create_c_string(_fstype)); // The first argument (executable name) is the file system type
_argv.push_back(_create_c_string(mountdir.native())); // The second argument is the mountdir argv.push_back(_create_c_string(mountdir.native())); // The second argument is the mountdir
for (const string &option : fuseOptions) { for (const string &option : fuseOptions) {
_argv.push_back(_create_c_string(option)); argv.push_back(_create_c_string(option));
} }
_add_fuse_option_if_not_exists(&_argv, "subtype", _fstype); _add_fuse_option_if_not_exists(&argv, "subtype", _fstype);
_add_fuse_option_if_not_exists(&_argv, "fsname", _fsname.get_value_or(_fstype)); _add_fuse_option_if_not_exists(&argv, "fsname", _fsname.get_value_or(_fstype));
return argv; return argv;
} }