Inlined fuse_mount_help() into fuse_lowlevel_help().

Both the BSD and Linux implementation actually accept mostly the same
FUSE-specific mount options. Up to now, the BSD help function appended
the output of ``mount_fusefs --help``, but looking at
http://www.unix.com/man-page/freebsd/8/mount_fusefs/ this is likely more
confusing than helpful (since the user is not actually invoking
mount_fusefs directly, most of the options don't make sense).

diff --git a/lib/fuse_i.h b/lib/fuse_i.h
index e612b3f3a00ba98d8a04061f6b406389fee01d05..50962e323ed2a50a14d2653d13749672175832c3 100644 (file)
--- a/lib/fuse_i.h
+++ b/lib/fuse_i.h
@@ -107,9 +107,7 @@ void fuse_chan_put(struct fuse_chan *ch);
 
 struct mount_opts *parse_mount_opts(struct fuse_args *args);
 void destroy_mount_opts(struct mount_opts *mo);
-void fuse_mount_help(void);
 void fuse_mount_version(void);
-
 void fuse_kern_unmount(const char *mountpoint, int fd);
 int fuse_kern_mount(const char *mountpoint, struct mount_opts *mo);
 

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index fc37a2474baa9dfd09c4fb0573b38d82dc0fa5dd..86940ebbdc4c1b20b8fb561842aef9b693117347 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -2537,7 +2537,12 @@ void fuse_lowlevel_version(void)
 
 void fuse_lowlevel_help(void)
 {
-       fuse_mount_help();
+       /* These are not all options, but the ones that are
+          potentially of interest to an end-user */
+       printf(
+"    -o allow_other         allow access to other users\n"
+"    -o allow_root          allow access to root\n"
+"    -o auto_unmount        auto unmount on process termination\n");
 }
 
 void fuse_session_destroy(struct fuse_session *se)

diff --git a/lib/helper.c b/lib/helper.c
index 6d72802b982eddb0ebda806a107650c2db5e9767..cc1002da6800cd9a191edc72e3fdf13e12d7da7d 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -258,7 +258,6 @@ int fuse_main_real(int argc, char *argv[], const struct fuse_operations *op,
        if (opts.show_version) {
                printf("FUSE library version %s\n", PACKAGE_VERSION);
                fuse_lowlevel_version();
-               fuse_mount_version();
                res = 0;
                goto out1;
        }

diff --git a/lib/mount.c b/lib/mount.c
index c00367fc7dc91c086c0b45a0bed29f937aa05568..051b424fcf6d0b47a9f0fbc301c6710a55ac004d 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -115,16 +115,6 @@ static const struct fuse_opt fuse_mount_opts[] = {
        FUSE_OPT_END
 };
 
-void fuse_mount_help(void)
-{
-       /* These are not all options, but the ones that are
-          potentially of interest to an end-user */
-       printf(
-"    -o allow_other         allow access to other users\n"
-"    -o allow_root          allow access to root\n"
-"    -o auto_unmount        auto unmount on process termination\n");
-}
-
 static void exec_fusermount(const char *argv[])
 {
        execv(FUSERMOUNT_DIR "/" FUSERMOUNT_PROG, (char **) argv);

diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c
index c39414beb824b56a1a9cafe17e2eb6a71050445b..9cf9dfad75fd3039fbd248a1b8a7f8f2540ac198 100644 (file)
--- a/lib/mount_bsd.c
+++ b/lib/mount_bsd.c
@@ -93,13 +93,6 @@ static const struct fuse_opt fuse_mount_opts[] = {
        FUSE_OPT_END
 };
 
-void fuse_mount_help(void)
-{
-       printf(
-"    -o allow_root          allow access to root\n");
-       system(FUSERMOUNT_PROG " --help");
-}
-
 void fuse_mount_version(void)
 {
        system(FUSERMOUNT_PROG " --version");