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

Fix path bug when writing config file to rootdir

Browse Source
This commit is contained in:
Sebastian Messmer 2015-10-28 13:44:29 +01:00
parent 9048a4809a
commit bac18cfbfc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.cpp
View File

@ -45,6 +45,7 @@ using boost::none;
//TODO Improve error message when root blob wasn't found. //TODO Improve error message when root blob wasn't found.
//TODO Replace ASSERTs with other error handling when it is not a programming error but an environment influence (e.g. a block is missing) //TODO Replace ASSERTs with other error handling when it is not a programming error but an environment influence (e.g. a block is missing)
//TODO When creating a new filesystem, we need 2x kill to kill the process (probably because we access random values before daemonizing) //TODO When creating a new filesystem, we need 2x kill to kill the process (probably because we access random values before daemonizing)
//TODO Fuse error messages like "fuse: bad mount point `...': Transport endpoint is not connected" go missing when running in background
void showVersion() { void showVersion() {
cout << "CryFS Version " << version::VERSION_STRING << endl; cout << "CryFS Version " << version::VERSION_STRING << endl;
@ -82,7 +83,7 @@ string askPassword() {
bf::path determineConfigFile(const ProgramOptions &options) { bf::path determineConfigFile(const ProgramOptions &options) {
auto configFile = options.configFile(); auto configFile = options.configFile();
if (configFile == none) { if (configFile == none) {
return options.baseDir() + "cryfs.config"; return bf::path(options.baseDir()) / "cryfs.config";
} }
return *configFile; return *configFile;
} }