diff options
| -rw-r--r-- | lib/fuse.c | 5 | ||||
| -rwxr-xr-x | lib/fuse_lowlevel.c | 4 | ||||
| -rw-r--r-- | lib/helper.c | 9 | ||||
| -rw-r--r-- | lib/mount.c | 4 | ||||
| -rw-r--r-- | lib/mount_bsd.c | 4 |
5 files changed, 13 insertions, 13 deletions
@@ -4453,6 +4453,7 @@ static const struct fuse_opt fuse_lib_opts[] = { static void fuse_lib_help(void) { printf( +"High-level options\n" " -o hard_remove immediate removal (don't hide files)\n" " -o use_ino let filesystem set inode numbers\n" " -o readdir_ino try to fill in d_ino in readdir\n" @@ -4471,8 +4472,8 @@ static void fuse_lib_help(void) " -o nopath don't supply path if not necessary\n" " -o intr allow requests to be interrupted\n" " -o intr_signal=NUM signal to send on interrupt (%i)\n" -" -o modules=M1[:M2...] names of modules to push onto filesystem stack\n" -"\n", FUSE_DEFAULT_INTR_SIGNAL); +" -o modules=M1[:M2...] names of modules to push onto filesystem stack\n\n", + FUSE_DEFAULT_INTR_SIGNAL); } static void fuse_lib_help_modules(void) diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c index 43539da..8682c31 100755 --- a/lib/fuse_lowlevel.c +++ b/lib/fuse_lowlevel.c @@ -2639,6 +2639,7 @@ static void fuse_ll_version(void) static void fuse_ll_help(void) { printf( +"Low-level options\n" " -o max_write=N set maximum size of write requests\n" " -o max_readahead=N set maximum readahead\n" " -o max_background=N set number of maximum background requests\n" @@ -2658,8 +2659,7 @@ static void fuse_ll_help(void) " -o [no_]async_dio asynchronous direct I/O\n" " -o [no_]writeback_cache asynchronous, buffered writes\n" " -o time_gran=N time granularity in nsec\n" -" -o clone_fd clone fuse device file descriptors\n" -); +" -o clone_fd clone fuse device file descriptors\n\n"); } static int fuse_ll_opt_proc(void *data, const char *arg, int key, diff --git a/lib/helper.c b/lib/helper.c index 7ee767b..309c096 100644 --- a/lib/helper.c +++ b/lib/helper.c @@ -59,16 +59,13 @@ static const struct fuse_opt fuse_helper_opts[] = { static void usage(const char *progname) { printf("usage: %s mountpoint [options]\n\n", progname); - printf("general options:\n" - " -o opt,[opt...] mount options\n" - " -h --help print help\n" - " -V --version print version\n" - "\n"); } static void helper_help(void) { - printf("FUSE options:\n" + printf("General options:\n" + " -h --help print help\n" + " -V --version print version\n" " -d -o debug enable debug output (implies -f)\n" " -f foreground operation\n" " -s disable multi-threaded operation\n" diff --git a/lib/mount.c b/lib/mount.c index fb17c00..d7f4bdd 100644 --- a/lib/mount.c +++ b/lib/mount.c @@ -121,6 +121,7 @@ static const struct fuse_opt fuse_mount_opts[] = { void fuse_mount_help(void) { printf( +"Mount options:\n" " -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" @@ -129,8 +130,7 @@ void fuse_mount_help(void) " -o fsname=NAME set filesystem name\n" " -o subtype=NAME set filesystem type\n" " -o large_read issue large read requests (2.4 only)\n" -" -o max_read=N set maximum size of read requests\n" -"\n"); +" -o max_read=N set maximum size of read requests\n\n"); } static void exec_fusermount(const char *argv[]) diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c index 0d886b0..4dce8c4 100644 --- a/lib/mount_bsd.c +++ b/lib/mount_bsd.c @@ -95,7 +95,9 @@ static const struct fuse_opt fuse_mount_opts[] = { void fuse_mount_help(void) { - printf(" -o allow_root allow access to root\n"); + printf( +"Mount options:\n" +" -o allow_root allow access to root\n"); system(FUSERMOUNT_PROG " --help"); fputc('\n', stderr); } |