diff options
author | Holger Schurig <holgerschurig@gmail.com> | 2014-05-13 10:28:42 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-14 10:03:43 +0200 |
commit | f1f532084a6e9ee8225f047353999b459455df7e (patch) | |
tree | f2b8b1f25c5c630209c6970e3a7ce57a3d55d367 /commands/mount.c | |
parent | ab23d0bb3f66cfb7a97a8aa6b8007687ed7a6925 (diff) | |
download | barebox-f1f532084a6e9ee8225f047353999b459455df7e.tar.gz barebox-f1f532084a6e9ee8225f047353999b459455df7e.tar.xz |
commands: harmonize in-barebox documentation
This patch does probably too much, but it's hard (and very
cumbersome/time consuming) to break it out. What is does is this:
* each command has one short description, e.g. "list MUX configuration"
* made sure the short descriptions start lowercase
* each command has one usage. That string contains just the
options, e.g. "[-npn]". It's not part of the long help text.
* that is, it doesn't say "[OPTIONS]" anymore, every usable option
is listed by character in this (short) option string (the long
description is in the long help text, as before)
* help texts have been reworked, to make them
- sometimes smaller
- sometimes describe the options better
- more often present themselves in a nicer format
* all long help texts are now created with BUSYBOX_CMD_HELP_
macros, no more 'static const __maybe_unused char cmd_foobar_help[]'
* made sure the long help texts starts uppercase
* because cmdtp->name and cmdtp->opts together provide the new usage,
all "Usage: foobar" texts have been removed from the long help texts
* BUSYBOX_CMD_HELP_TEXT() provides the trailing newline by itself, this
is nicer in the source code
* BUSYBOX_CMD_HELP_OPT() provides the trailing newline by itself
* made sure no line gets longer than 77 characters
* delibertely renamed cmdtp->usage, so that we can get compile-time
errors (e.g. in out-of-tree modules that use register_command()
* the 'help' command can now always emit the usage, even without
compiled long help texts
* 'help -v' gives a list of commands with their short description, this
is similar like the old "help" command before my patchset
* 'help -a' gives out help of all commands
Signed-off-by: Holger Schurig <holgerschurig@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands/mount.c')
-rw-r--r-- | commands/mount.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/commands/mount.c b/commands/mount.c index 0996a6acea..7aa155edbe 100644 --- a/commands/mount.c +++ b/commands/mount.c @@ -116,17 +116,18 @@ static int do_mount(int argc, char *argv[]) } BAREBOX_CMD_HELP_START(mount) -BAREBOX_CMD_HELP_USAGE("mount [[OPTIONS] <device> [mountpoint]]\n") -BAREBOX_CMD_HELP_OPT("-t <type>", "specify filesystem type\n") -BAREBOX_CMD_HELP_OPT("-a", "Mount all blockdevices.\n") -BAREBOX_CMD_HELP_OPT("-v", "be more verbose\n") -BAREBOX_CMD_HELP_SHORT("Mount a filesystem of a given type to a mountpoint.\n") -BAREBOX_CMD_HELP_SHORT("If no fstype is specified, try to detect it automatically.\n") -BAREBOX_CMD_HELP_SHORT("If no argument is given, list mounted filesystems.\n") -BAREBOX_CMD_HELP_SHORT("With -a the mount command mounts all block devices whose filesystem\n") -BAREBOX_CMD_HELP_SHORT("can be detected automatically to /mnt/<partname>\n") -BAREBOX_CMD_HELP_SHORT("If mountpoint is not given a standard mountpoint of /mnt/devname>\n") -BAREBOX_CMD_HELP_SHORT("is used. This directoy is created automatically if necessary.\n") +BAREBOX_CMD_HELP_TEXT("If no argument is given, list mounted filesystems.") +BAREBOX_CMD_HELP_TEXT("If no FSTYPE is specified, try to detect it automatically.") +BAREBOX_CMD_HELP_TEXT("With -a the mount command mounts all block devices whose filesystem") +BAREBOX_CMD_HELP_TEXT("can be detected automatically to /mnt/PARTNAME") +BAREBOX_CMD_HELP_TEXT("If mountpoint is not given, a standard mountpoint of /mnt/DEVICE") +BAREBOX_CMD_HELP_TEXT("is used. This directoy is created automatically if necessary.") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Options:") +BAREBOX_CMD_HELP_OPT("-a\t", "mount all blockdevices") +BAREBOX_CMD_HELP_OPT("-t FSTYPE", "specify filesystem type") +BAREBOX_CMD_HELP_OPT("-o OPTIONS", "set file system OPTIONS") +BAREBOX_CMD_HELP_OPT("-v\t", "verbose") BAREBOX_CMD_HELP_END /** @@ -162,7 +163,8 @@ the filesystem has been unmounted. BAREBOX_CMD_START(mount) .cmd = do_mount, - .usage = "Mount a filesystem of a given type to a mountpoint or list mounted filesystems.", + BAREBOX_CMD_DESC("mount a filesystem or list mounted filesystems") + BAREBOX_CMD_OPTS("[[-atov] [DEVICE] [MOUNTPOINT]]") BAREBOX_CMD_GROUP(CMD_GRP_PART) BAREBOX_CMD_HELP(cmd_mount_help) BAREBOX_CMD_END |