diff options
author | jbeich <jbeich@FreeBSD.org> | 2016-03-20 23:11:50 +0800 |
---|---|---|
committer | jbeich <jbeich@FreeBSD.org> | 2016-03-20 23:11:50 +0800 |
commit | 16d226ae10dffe970a4687cf0c2017024e87edc8 (patch) | |
tree | b6a6659826cba282c89d6084fbce3864fc579d74 /sysutils | |
parent | 4fdb29e0413b62094ade855b17e09b688c4d64ae (diff) | |
download | freebsd-ports-gnome-16d226ae10dffe970a4687cf0c2017024e87edc8.tar.gz freebsd-ports-gnome-16d226ae10dffe970a4687cf0c2017024e87edc8.tar.zst freebsd-ports-gnome-16d226ae10dffe970a4687cf0c2017024e87edc8.zip |
sysutils/fusefs-libs: break before repo surgery
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/fusefs-libs/files/patch-lib_mount__bsd.c | 77 | ||||
-rw-r--r-- | sysutils/fusefs-libs/files/patch-lib_mount__util.c | 23 | ||||
-rw-r--r-- | sysutils/fusefs-libs/files/patch-lib_mount__util.h | 7 |
3 files changed, 0 insertions, 107 deletions
diff --git a/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c b/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c deleted file mode 100644 index 765ec8fb8159..000000000000 --- a/sysutils/fusefs-libs/files/patch-lib_mount__bsd.c +++ /dev/null @@ -1,77 +0,0 @@ ---- lib/mount_bsd.c.orig 2015-05-22 09:24:02 UTC -+++ lib/mount_bsd.c -@@ -10,6 +10,8 @@ - #include "fuse_misc.h" - #include "fuse_opt.h" - -+#include <sys/param.h> -+#include <sys/mount.h> - #include <sys/stat.h> - #include <sys/wait.h> - #include <sys/sysctl.h> -@@ -78,6 +80,7 @@ static const struct fuse_opt fuse_mount_ - FUSE_DUAL_OPT_KEY("ro", KEY_KERN), - FUSE_DUAL_OPT_KEY("rw", KEY_KERN), - FUSE_DUAL_OPT_KEY("auto", KEY_KERN), -+ FUSE_DUAL_OPT_KEY("automounted", KEY_KERN), - /* options supported under both Linux and FBSD */ - FUSE_DUAL_OPT_KEY("allow_other", KEY_KERN), - FUSE_DUAL_OPT_KEY("default_permissions",KEY_KERN), -@@ -192,56 +195,12 @@ void fuse_unmount_compat22(const char *m - free(umount_cmd); - } - --static void do_unmount(char *dev, int fd) --{ -- char device_path[SPECNAMELEN + 12]; -- const char *argv[4]; -- const char umount_cmd[] = "/sbin/umount"; -- pid_t pid; -- -- snprintf(device_path, SPECNAMELEN + 12, _PATH_DEV "%s", dev); -- -- argv[0] = umount_cmd; -- argv[1] = "-f"; -- argv[2] = device_path; -- argv[3] = NULL; -- -- pid = fork(); -- -- if (pid == -1) -- return; -- -- if (pid == 0) { -- close(fd); -- execvp(umount_cmd, (char **)argv); -- exit(1); -- } -- -- waitpid(pid, NULL, 0); --} -- - void fuse_kern_unmount(const char *mountpoint, int fd) - { - char *ep, dev[128]; - struct stat sbuf; - -- (void)mountpoint; -- -- if (fstat(fd, &sbuf) == -1) -- goto out; -- -- devname_r(sbuf.st_rdev, S_IFCHR, dev, 128); -- -- if (strncmp(dev, "fuse", 4)) -- goto out; -- -- strtol(dev + 4, &ep, 10); -- if (*ep != '\0') -- goto out; -- -- do_unmount(dev, fd); -- --out: -+ unmount(mountpoint, MNT_FORCE); - close(fd); - } - diff --git a/sysutils/fusefs-libs/files/patch-lib_mount__util.c b/sysutils/fusefs-libs/files/patch-lib_mount__util.c deleted file mode 100644 index 1d6a5db2a488..000000000000 --- a/sysutils/fusefs-libs/files/patch-lib_mount__util.c +++ /dev/null @@ -1,23 +0,0 @@ ---- lib/mount_util.c.orig 2015-05-22 09:24:02 UTC -+++ lib/mount_util.c -@@ -344,20 +344,3 @@ int fuse_mnt_check_empty(const char *pro - } - return 0; - } -- --int fuse_mnt_check_fuseblk(void) --{ -- char buf[256]; -- FILE *f = fopen("/proc/filesystems", "r"); -- if (!f) -- return 1; -- -- while (fgets(buf, sizeof(buf), f)) -- if (strstr(buf, "fuseblk\n")) { -- fclose(f); -- return 1; -- } -- -- fclose(f); -- return 0; --} diff --git a/sysutils/fusefs-libs/files/patch-lib_mount__util.h b/sysutils/fusefs-libs/files/patch-lib_mount__util.h deleted file mode 100644 index 07865d839d77..000000000000 --- a/sysutils/fusefs-libs/files/patch-lib_mount__util.h +++ /dev/null @@ -1,7 +0,0 @@ ---- lib/mount_util.h.orig 2015-05-22 09:24:02 UTC -+++ lib/mount_util.h -@@ -16,4 +16,3 @@ int fuse_mnt_umount(const char *progname - char *fuse_mnt_resolve_path(const char *progname, const char *orig); - int fuse_mnt_check_empty(const char *progname, const char *mnt, - mode_t rootmode, off_t rootsize); --int fuse_mnt_check_fuseblk(void); |