Archives/fuse-friends_fuse-native
1
0
Fork 0
mirror of https://github.com/fuse-friends/fuse-native synced 2024-10-27 18:34:01 +00:00
Code Issues Releases Wiki Activity

just use umount - much more reliable

Browse Source
This commit is contained in:
Mathias Buus 2015-03-22 12:34:05 +01:00
parent 77c3d8ae9a
commit 0d0490b781
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fuse-bindings.cc
View File

@ -154,13 +154,6 @@ NAN_INLINE static void semaphore_wait (sem_t *sem) {
NAN_INLINE static void semaphore_signal (sem_t *sem) { NAN_INLINE static void semaphore_signal (sem_t *sem) {
sem_post(sem); sem_post(sem);
} }
static void bindings_fusermount (char *path) {
char *argv[] = {(char *) "fusermount", (char *) "-q", (char *) "-u", path, NULL};
pid_t cpid = vfork();
if (cpid > 0) waitpid(cpid, NULL, 0);
else execvp(argv[0], argv);
}
#endif #endif
static bindings_t *bindings_find_mounted (char *path) { static bindings_t *bindings_find_mounted (char *path) {
@ -173,15 +166,22 @@ static bindings_t *bindings_find_mounted (char *path) {
return NULL; return NULL;
} }
static void bindings_fusermount (char *path) {
#ifdef __APPLE__
char *argv[] = {(char *) "umount", path, NULL};
#else
char *argv[] = {(char *) "fusermount", (char *) "-q", (char *) "-u", path, NULL};
#endif
pid_t cpid = vfork();
if (cpid > 0) waitpid(cpid, NULL, 0);
else execvp(argv[0], argv);
}
static void bindings_unmount (char *path) { static void bindings_unmount (char *path) {
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
bindings_t *b = bindings_find_mounted(path); bindings_t *b = bindings_find_mounted(path);
if (b != NULL) b->gc = 1; if (b != NULL) b->gc = 1;
#ifdef __APPLE__
unmount(path, 0);
#else
bindings_fusermount(path); bindings_fusermount(path);
#endif
if (b != NULL) pthread_join(b->thread, NULL); if (b != NULL) pthread_join(b->thread, NULL);
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
} }