2013-12-07 07:08:51

by Zheng Liu

Subject: [PATCH] debugfs: print missing argument in usage for open, filefrag and ls

From: Zheng Liu <[email protected]>

This commit prints missing argument in usage for open, filefrag and ls
commands, which might help us to use debugfs tool.

Cc: Theodore Ts'o <[email protected]>
Signed-off-by: Zheng Liu <[email protected]>
---
debugfs/debugfs.c | 3 ++-
debugfs/filefrag.c | 2 +-
debugfs/ls.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index 8c32eff..4dd5ba9 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -201,7 +201,8 @@ void do_open_filesys(int argc, char **argv)
return;

print_usage:
- fprintf(stderr, "%s: Usage: open [-s superblock] [-b blocksize] [-c] "
+ fprintf(stderr, "%s: Usage: open [-s superblock] [-b blocksize] "
+ "[d image_filename] [-c] [-i] [-f] [-e] [-D] "
#ifndef READ_ONLY
"[-w] "
#endif
diff --git a/debugfs/filefrag.c b/debugfs/filefrag.c
index e82d133..6219d7c 100644
--- a/debugfs/filefrag.c
+++ b/debugfs/filefrag.c
@@ -289,7 +289,7 @@ void do_filefrag(int argc, char *argv[])

if (argc > optind+1) {
print_usage:
- com_err(0, 0, "Usage: filefrag [-dv] file");
+ com_err(0, 0, "Usage: filefrag [-dvr] file");
return;
}

diff --git a/debugfs/ls.c b/debugfs/ls.c
index 69c7897..3603e46 100644
--- a/debugfs/ls.c
+++ b/debugfs/ls.c
@@ -167,7 +167,7 @@ void do_list_dir(int argc, char *argv[])

if (argc > optind+1) {
print_usage:
- com_err(0, 0, "Usage: ls [-l] [-d] [-p] file");
+ com_err(0, 0, "Usage: ls [-l] [-d] [-p] [-c] file");
return;
}

--
1.7.9.7

2013-12-09 02:09:17

by Theodore Ts'o

Subject: Re: debugfs: print missing argument in usage for open, filefrag and ls

I've commited the first two hunks of this patch to the maint branch,
and fixed up a missing hyphen:

> print_usage:
> - fprintf(stderr, "%s: Usage: open [-s superblock] [-b blocksize] [-c] "
> + fprintf(stderr, "%s: Usage: open [-s superblock] [-b blocksize] "
> + "[d image_filename] [-c] [-i] [-f] [-e] [-D] "


I'll add the final commit to the master/next branch, which is where
the ls -c option was added without updating the usage message.

- Ted