From ec3624aa755fe06678cdc6f762cd1d1f04c979b4 Mon Sep 17 00:00:00 2001 From: Frederick Grose Date: Tue, 4 Apr 2017 00:31:59 -0400 Subject: losetup.8: Reorder options documentation Reorder options to match onboard help and group functionally. Include some missing optional arguments. [kzak@redhat.com: - don't include available columns in man page, - add comments to the usage() - fix order in usage() - fix typo in usage()] Signed-off-by: Karel Zak --- sys-utils/losetup.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'sys-utils/losetup.c') diff --git a/sys-utils/losetup.c b/sys-utils/losetup.c index 5f599ead5..2218d3b43 100644 --- a/sys-utils/losetup.c +++ b/sys-utils/losetup.c @@ -385,6 +385,7 @@ static void usage(FILE *out) fputs(USAGE_SEPARATOR, out); fputs(_("Set up and control loop devices.\n"), out); + /* commands */ fputs(USAGE_OPTIONS, out); fputs(_(" -a, --all list all used devices\n"), out); fputs(_(" -d, --detach ... detach one or more devices\n"), out); @@ -394,8 +395,8 @@ static void usage(FILE *out) fputs(_(" -j, --associated list all devices associated with \n"), out); fputs(_(" -L, --nooverlap avoid possible conflict between devices\n"), out); + /* commands options */ fputs(USAGE_SEPARATOR, out); - fputs(_(" -o, --offset start at offset into file\n"), out); fputs(_(" --sizelimit device is limited to bytes of the file\n"), out); fputs(_(" -P, --partscan create a partitioned loop device\n"), out); @@ -404,19 +405,19 @@ static void usage(FILE *out) fputs(_(" --show print device name after setup (with -f)\n"), out); fputs(_(" -v, --verbose verbose mode\n"), out); + /* output options */ fputs(USAGE_SEPARATOR, out); - + fputs(_(" -J, --json use JSON --list output format\n"), out); fputs(_(" -l, --list list info about all or specified (default)\n"), out); - fputs(_(" -O, --output specify columns to output for --list\n"), out); fputs(_(" -n, --noheadings don't print headings for --list output\n"), out); + fputs(_(" -O, --output specify columns to output for --list\n"), out); fputs(_(" --raw use raw --list output format\n"), out); - fputs(_(" -J, --json use JSON --list output format\n"), out); fputs(USAGE_SEPARATOR, out); fputs(USAGE_HELP, out); fputs(USAGE_VERSION, out); - fputs(_("\nAvailable --list columns:\n"), out); + fputs(_("\nAvailable --output columns:\n"), out); for (i = 0; i < ARRAY_SIZE(infos); i++) fprintf(out, " %12s %s\n", infos[i].name, _(infos[i].help)); -- cgit v1.2.3-55-g7522