extern/encfs
1
0
Fork 0
mirror of https://github.com/vgough/encfs.git synced 2024-11-24 08:53:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unmount improvements (#507)

Browse Source 
Log OSX unmount system error
Better handle Cygwin unmount child
Use WinFsp expected INT signal
This commit is contained in:
Ben RUBSON 2018-04-10 10:58:08 +02:00 committed by GitHub
parent 0fb264d531
commit df7403c256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
encfs/FileUtils.cpp
View File

@ -1733,19 +1733,30 @@ RootPtr initFS(EncFS_Context *ctx, const std::shared_ptr<EncFS_Opts> &opts) {
} }
void unmountFS(const char *mountPoint) { void unmountFS(const char *mountPoint) {
// fuse_unmount succeeds and returns void // fuse_unmount returns void, is assumed to succeed
fuse_unmount(mountPoint, nullptr); fuse_unmount(mountPoint, nullptr);
#ifdef __APPLE__ #ifdef __APPLE__
// fuse_unmount does not work on Mac OS, see #428 // fuse_unmount does not work on Mac OS, see #428
unmount(mountPoint, MNT_FORCE); // However it makes encfs to hang, so we must unmount
if (unmount(mountPoint, MNT_FORCE) != 0) {
int eno = errno;
if (eno != EINVAL) { //[EINVAL] The requested directory is not in the mount table.
RLOG(ERROR) << "Filesystem unmount failed: " << strerror(eno);
}
}
#endif #endif
#ifdef __CYGWIN__ #ifdef __CYGWIN__
if(fork() == 0) pid_t pid;
{
execl("/usr/bin/pkill", "/usr/bin/pkill", "-f", string("(^|/)encfs .*/.* ").append(mountPoint).append("?( |$)").c_str(), (char *)0);
}
int status; int status;
wait(&status); if ((pid = fork()) == 0) {
execl("/usr/bin/pkill", "/usr/bin/pkill", "-INT", "-f", string("(^|/)encfs .*/.* ").append(mountPoint).append("?( |$)").c_str(), (char *)0);
int eno = errno;
RLOG(ERROR) << "Filesystem unmount failed: " << strerror(eno);
_Exit(127);
}
if (pid > 0) {
waitpid(pid, &status, 0);
}
#endif #endif
} }
@ -1770,8 +1781,8 @@ bool unmountFS(EncFS_Context *ctx) {
return false; return false;
} }
// Time to unmount! // Time to unmount!
RLOG(INFO) << "Filesystem inactive, unmounting: " << ctx->opts->mountPoint;
unmountFS(ctx->opts->mountPoint.c_str()); unmountFS(ctx->opts->mountPoint.c_str());
RLOG(INFO) << "Filesystem inactive, unmounted: " << ctx->opts->mountPoint;
return true; return true;
} }

17
encfs/main.cpp
View File

@ -323,6 +323,8 @@ static bool processArgs(int argc, char *argv[],
out->opts->config.assign(optarg); out->opts->config.assign(optarg);
break; break;
case 'u': case 'u':
//we want to log to console, not to syslog, in case of error
out->isDaemon = false;
out->opts->unmount = true; out->opts->unmount = true;
break; break;
case 'f': case 'f':
@ -656,16 +658,17 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE; return EXIT_FAILURE;
} }
// Let's unmount if requested
if (encfsArgs->opts->unmount) {
unmountFS(encfsArgs->opts->mountPoint.c_str());
cout << "Filesystem unmounting: " << encfsArgs->opts->mountPoint << endl;
return 0;
}
encfs::initLogging(encfsArgs->isVerbose, encfsArgs->isDaemon); encfs::initLogging(encfsArgs->isVerbose, encfsArgs->isDaemon);
ELPP_INITIALIZE_SYSLOG(encfsArgs->syslogTag.c_str(), LOG_PID, LOG_USER); ELPP_INITIALIZE_SYSLOG(encfsArgs->syslogTag.c_str(), LOG_PID, LOG_USER);
// Let's unmount if requested
if (encfsArgs->opts->unmount) {
// We use cout here to avoid logging to stderr (and to mess-up tests output)
cout << "Filesystem unmounting: " << encfsArgs->opts->mountPoint << endl;
unmountFS(encfsArgs->opts->mountPoint.c_str());
return 0;
}
VLOG(1) << "Root directory: " << encfsArgs->opts->rootDir; VLOG(1) << "Root directory: " << encfsArgs->opts->rootDir;
VLOG(1) << "Fuse arguments: " << encfsArgs->toString(); VLOG(1) << "Fuse arguments: " << encfsArgs->toString();