From bbc7bee9664b582c8237c4b879bba1bdee4d62a6 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Sat, 21 Jan 2017 02:49:58 +0100 Subject: make --help texts more uniform function old new delta packed_usage 31062 31035 -27 Signed-off-by: Denys Vlasenko --- util-linux/fstrim.c | 6 +++--- util-linux/getopt.c | 8 ++++---- util-linux/nsenter.c | 26 +++++++++++++------------- util-linux/rtcwake.c | 8 ++++---- util-linux/unshare.c | 16 ++++++++-------- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'util-linux') diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c index fc51878b6..563aa9720 100644 --- a/util-linux/fstrim.c +++ b/util-linux/fstrim.c @@ -23,9 +23,9 @@ //usage: "[OPTIONS] MOUNTPOINT" //usage:#define fstrim_full_usage "\n\n" //usage: IF_LONG_OPTS( -//usage: " -o,--offset=OFFSET Offset in bytes to discard from" -//usage: "\n -l,--length=LEN Bytes to discard" -//usage: "\n -m,--minimum=MIN Minimum extent length" +//usage: " -o,--offset OFFSET Offset in bytes to discard from" +//usage: "\n -l,--length LEN Bytes to discard" +//usage: "\n -m,--minimum MIN Minimum extent length" //usage: "\n -v,--verbose Print number of discarded bytes" //usage: ) //usage: IF_NOT_LONG_OPTS( diff --git a/util-linux/getopt.c b/util-linux/getopt.c index f6ecc3dde..63294c520 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -57,13 +57,13 @@ //usage: IF_LONG_OPTS( //usage: IF_FEATURE_GETOPT_LONG( //usage: " -a,--alternative Allow long options starting with single -\n" -//usage: " -l,--longoptions=LOPT[,...] Long options to recognize\n" +//usage: " -l,--longoptions LOPT[,...] Long options to recognize\n" //usage: ) -//usage: " -n,--name=PROGNAME The name under which errors are reported" -//usage: "\n -o,--options=OPTSTRING Short options to recognize" +//usage: " -n,--name PROGNAME The name under which errors are reported" +//usage: "\n -o,--options OPTSTRING Short options to recognize" //usage: "\n -q,--quiet No error messages on unrecognized options" //usage: "\n -Q,--quiet-output No normal output" -//usage: "\n -s,--shell=SHELL Set shell quoting conventions" +//usage: "\n -s,--shell SHELL Set shell quoting conventions" //usage: "\n -T,--test Version test (exits with 4)" //usage: "\n -u,--unquoted Don't quote output" //usage: ) diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c index 6834292da..57b218dab 100644 --- a/util-linux/nsenter.c +++ b/util-linux/nsenter.c @@ -30,19 +30,19 @@ //usage: "[OPTIONS] [PROG [ARGS]]" //usage:#if ENABLE_FEATURE_NSENTER_LONG_OPTS //usage:#define nsenter_full_usage "\n" -//usage: "\n -t, --target=PID Target process to get namespaces from" -//usage: "\n -m, --mount[=FILE] Enter mount namespace" -//usage: "\n -u, --uts[=FILE] Enter UTS namespace (hostname etc)" -//usage: "\n -i, --ipc[=FILE] Enter System V IPC namespace" -//usage: "\n -n, --net[=FILE] Enter network namespace" -//usage: "\n -p, --pid[=FILE] Enter pid namespace" -//usage: "\n -U, --user[=FILE] Enter user namespace" -//usage: "\n -S, --setuid=UID Set uid in entered namespace" -//usage: "\n -G, --setgid=GID Set gid in entered namespace" -//usage: "\n --preserve-credentials Don't touch uids or gids" -//usage: "\n -r, --root[=DIR] Set root directory" -//usage: "\n -w, --wd[=DIR] Set working directory" -//usage: "\n -F, --no-fork Don't fork before exec'ing PROG" +//usage: "\n -t,--target PID Target process to get namespaces from" +//usage: "\n -m,--mount[=FILE] Enter mount namespace" +//usage: "\n -u,--uts[=FILE] Enter UTS namespace (hostname etc)" +//usage: "\n -i,--ipc[=FILE] Enter System V IPC namespace" +//usage: "\n -n,--net[=FILE] Enter network namespace" +//usage: "\n -p,--pid[=FILE] Enter pid namespace" +//usage: "\n -U,--user[=FILE] Enter user namespace" +//usage: "\n -S,--setuid UID Set uid in entered namespace" +//usage: "\n -G,--setgid GID Set gid in entered namespace" +//usage: "\n --preserve-credentials Don't touch uids or gids" +//usage: "\n -r,--root[=DIR] Set root directory" +//usage: "\n -w,--wd[=DIR] Set working directory" +//usage: "\n -F,--no-fork Don't fork before exec'ing PROG" //usage:#else //usage:#define nsenter_full_usage "\n" //usage: "\n -t PID Target process to get namespaces from" diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c index 54fc70583..b63164588 100644 --- a/util-linux/rtcwake.c +++ b/util-linux/rtcwake.c @@ -41,10 +41,10 @@ //usage: "\n -a,--auto Read clock mode from adjtime" //usage: "\n -l,--local Clock is set to local time" //usage: "\n -u,--utc Clock is set to UTC time" -//usage: "\n -d,--device=DEV Specify the RTC device" -//usage: "\n -m,--mode=MODE Set sleep state (default: standby)" -//usage: "\n -s,--seconds=SEC Set timeout in SEC seconds from now" -//usage: "\n -t,--time=TIME Set timeout to TIME seconds from epoch" +//usage: "\n -d,--device DEV Specify the RTC device" +//usage: "\n -m,--mode MODE Set sleep state (default: standby)" +//usage: "\n -s,--seconds SEC Set timeout in SEC seconds from now" +//usage: "\n -t,--time TIME Set timeout to TIME seconds from epoch" //usage: ) //usage: IF_NOT_LONG_OPTS( //usage: "\n -a Read clock mode from adjtime" diff --git a/util-linux/unshare.c b/util-linux/unshare.c index bbabeef55..52e8f1421 100644 --- a/util-linux/unshare.c +++ b/util-linux/unshare.c @@ -25,14 +25,14 @@ //usage:#define unshare_trivial_usage //usage: "[OPTIONS] [PROG [ARGS]]" //usage:#define unshare_full_usage "\n" -//usage: "\n -m, --mount[=FILE] Unshare mount namespace" -//usage: "\n -u, --uts[=FILE] Unshare UTS namespace (hostname etc.)" -//usage: "\n -i, --ipc[=FILE] Unshare System V IPC namespace" -//usage: "\n -n, --net[=FILE] Unshare network namespace" -//usage: "\n -p, --pid[=FILE] Unshare PID namespace" -//usage: "\n -U, --user[=FILE} Unshare user namespace" -//usage: "\n -f, --fork Fork before execing PROG" -//usage: "\n -r, --map-root-user Map current user to root (implies -u)" +//usage: "\n -m,--mount[=FILE] Unshare mount namespace" +//usage: "\n -u,--uts[=FILE] Unshare UTS namespace (hostname etc.)" +//usage: "\n -i,--ipc[=FILE] Unshare System V IPC namespace" +//usage: "\n -n,--net[=FILE] Unshare network namespace" +//usage: "\n -p,--pid[=FILE] Unshare PID namespace" +//usage: "\n -U,--user[=FILE] Unshare user namespace" +//usage: "\n -f,--fork Fork before execing PROG" +//usage: "\n -r,--map-root-user Map current user to root (implies -u)" //usage: "\n --mount-proc[=DIR] Mount /proc filesystem first (implies -m)" //usage: "\n --propagation slave|shared|private|unchanged" //usage: "\n Modify mount propagation in mount namespace" -- cgit v1.2.3