undo tabification inside strings

diff --git a/lib/fuse.c b/lib/fuse.c
index 7bcbe76572c567ed3f166a04ea65c5e312cc8eea..c0c1889c8911feb3be93826b10b44af74b6505be 100644 (file)
--- a/lib/fuse.c
+++ b/lib/fuse.c
@@ -2912,21 +2912,21 @@ static const struct fuse_opt fuse_lib_opts[] = {
 static void fuse_lib_help(void)
 {
        fprintf(stderr,
-"    -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"
-"    -o direct_io          use direct I/O\n"
-"    -o kernel_cache       cache files in kernel\n"
-"    -o [no]auto_cache     enable caching based on modification times\n"
-"    -o umask=M                    set file permissions (octal)\n"
-"    -o uid=N              set file owner\n"
-"    -o gid=N              set file group\n"
-"    -o entry_timeout=T            cache timeout for names (1.0s)\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"
+"    -o direct_io           use direct I/O\n"
+"    -o kernel_cache        cache files in kernel\n"
+"    -o [no]auto_cache      enable caching based on modification times (off)\n"
+"    -o umask=M             set file permissions (octal)\n"
+"    -o uid=N               set file owner\n"
+"    -o gid=N               set file group\n"
+"    -o entry_timeout=T     cache timeout for names (1.0s)\n"
 "    -o negative_timeout=T  cache timeout for deleted names (0.0s)\n"
-"    -o attr_timeout=T     cache timeout for attributes (1.0s)\n"
+"    -o attr_timeout=T      cache timeout for attributes (1.0s)\n"
 "    -o ac_attr_timeout=T   auto cache timeout for attributes (attr_timeout)\n"
-"    -o intr               allow requests to be interrupted\n"
-"    -o intr_signal=NUM            signal to send on interrupt (%i)\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);
 }

diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c
index 5c9dc56db0653744c1d95a84d3124c0ec41ed479..64a9b121031d9f380ee58ed40f4e5169b4cd5825 100644 (file)
--- a/lib/fuse_lowlevel.c
+++ b/lib/fuse_lowlevel.c
@@ -1213,10 +1213,11 @@ static void fuse_ll_version(void)
 static void fuse_ll_help(void)
 {
        fprintf(stderr,
-"    -o max_write=N        set maximum size of write requests\n"
-"    -o max_readahead=N            set maximum readahead\n"
-"    -o async_read         perform reads asynchronously (default)\n"
-"    -o sync_read          perform reads synchronously\n");
+"    -o max_write=N         set maximum size of write requests\n"
+"    -o max_readahead=N     set maximum readahead\n"
+"    -o async_read          perform reads asynchronously (default)\n"
+"    -o sync_read           perform reads synchronously\n"
+"    -o atomic_o_trunc      enable atomic open+truncate support\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 a175ee902952e7a09c8f40a6109c99cf57a37a78..e3c5985cc8520e72aa17d42b5bd4097042a88f75 100644 (file)
--- a/lib/helper.c
+++ b/lib/helper.c
@@ -62,9 +62,9 @@ static void usage(const char *progname)
                "usage: %s mountpoint [options]\n\n", progname);
        fprintf(stderr,
                "general options:\n"
-               "    -o opt,[opt...]        mount options\n"
-               "    -h   --help            print help\n"
-               "    -V   --version         print version\n"
+               "    -o opt,[opt...]        mount options\n"
+               "    -h   --help            print help\n"
+               "    -V   --version         print version\n"
                "\n");
 }
 
@@ -72,9 +72,9 @@ static void helper_help(void)
 {
        fprintf(stderr,
                "FUSE options:\n"
-               "    -d   -o debug          enable debug output (implies -f)\n"
-               "    -f                     foreground operation\n"
-               "    -s                     disable multi-threaded operation\n"
+               "    -d   -o debug          enable debug output (implies -f)\n"
+               "    -f                     foreground operation\n"
+               "    -s                     disable multi-threaded operation\n"
                "\n"
                );
 }

diff --git a/lib/mount.c b/lib/mount.c
index 14fbfb511fe9f36d3dbf5300d6ff60e52f24f98c..2c15e54bddbf3ebd39fd950edb1212d0bf87127b 100644 (file)
--- a/lib/mount.c
+++ b/lib/mount.c
@@ -108,14 +108,14 @@ static const struct fuse_opt fuse_mount_opts[] = {
 static void mount_help(void)
 {
        fprintf(stderr,
-"    -o allow_other        allow access to other users\n"
-"    -o allow_root         allow access to root\n"
-"    -o nonempty           allow mounts over non-empty file/dir\n"
+"    -o allow_other         allow access to other users\n"
+"    -o allow_root          allow access to root\n"
+"    -o nonempty            allow mounts over non-empty file/dir\n"
 "    -o default_permissions enable permission checking by kernel\n"
-"    -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"
+"    -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");
 }
 

diff --git a/lib/mount_bsd.c b/lib/mount_bsd.c
index cf19a7b2a9caf1c00fd9efdd6beb493ea1637321..62443ac25f99d4a83d7c1748a8049f12faee76c0 100644 (file)
--- a/lib/mount_bsd.c
+++ b/lib/mount_bsd.c
@@ -102,7 +102,7 @@ static const struct fuse_opt fuse_mount_opts[] = {
 static void mount_help(void)
 {
        fprintf(stderr,
-               "    -o allow_root          allow access to root\n"
+               "    -o allow_root          allow access to root\n"
                );
        system(FUSERMOUNT_PROG " --help");
        fputc('\n', stderr);
@@ -156,7 +156,7 @@ void fuse_unmount_compat22(const char *mountpoint)
                "exec 2>/dev/null; "
                "/usr/bin/fstat " FUSE_DEV_TRUNK "* | "
                "/usr/bin/awk 'BEGIN{ getline; if (! ($3 == \"PID\" && $10 == \"NAME\")) exit 1; }; "
-               "              { if ($3 == %d) print $10; }' | "
+               "              { if ($3 == %d) print $10; }' | "
                "/usr/bin/sort | "
                "/usr/bin/uniq | "
                "/usr/bin/awk '{ i += 1; if (i > 1){ exit 1; }; printf; }; END{ if (i == 0) exit 1; }'";