Explorar el Código

Merge pull request #849 from uvelichitel/master

Correct umount fusefs on FreeBSD. rel. issue  #848
master
Mischievous Meerkat GitHub hace 3 años
padre
commit
4178f62ece
No se encontró ninguna clave conocida en la base de datos para esta firma ID de clave GPG: 4AEE18F83AFDEB23
Se han modificado 1 ficheros con 5 adiciones y 3 borrados
  1. +5
    -3
      src/nnn.c

+ 5
- 3
src/nnn.c Ver fichero

@@ -4437,7 +4437,7 @@ static bool remote_mount(char *newpath)
*/
static bool unmount(char *name, char *newpath, int *presel, char *currentpath)
{
#ifdef __APPLE__
#if defined (__APPLE__) || defined (__FreeBSD__)
static char cmd[] = "umount";
#else
static char cmd[] = "fusermount3"; /* Arch Linux utility */
@@ -4450,7 +4450,7 @@ static bool unmount(char *name, char *newpath, int *presel, char *currentpath)
bool hovered = TRUE;
char mntpath[PATH_MAX];

#ifndef __APPLE__
#if !defined ( __APPLE__) && !defined (__FreeBSD__)
/* On Ubuntu it's fusermount */
if (!found && !getutil(cmd)) {
cmd[10] = '\0';
@@ -4484,7 +4484,7 @@ static bool unmount(char *name, char *newpath, int *presel, char *currentpath)
return FALSE;
}

#ifdef __APPLE__
#if defined (__APPLE__) || defined (__FreeBSD__)
if (spawn(cmd, newpath, NULL, F_NORMAL)) {
#else
if (spawn(cmd, "-u", newpath, F_NORMAL)) {
@@ -4494,6 +4494,8 @@ static bool unmount(char *name, char *newpath, int *presel, char *currentpath)

#ifdef __APPLE__
if (spawn(cmd, "-l", newpath, F_NORMAL)) {
#elif defined (__FreeBSD__)
if (spawn(cmd, "-f", newpath, F_NORMAL)) {
#else
if (spawn(cmd, "-uz", newpath, F_NORMAL)) {
#endif


Cargando…
Cancelar
Guardar