From 4e039bab375a273344b6c847daa04f13d8317c04 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 4 Jan 2021 03:50:38 +0100 Subject: ash: improve --help function old new delta packed_usage 33504 33499 -5 Signed-off-by: Denys Vlasenko --- shell/ash.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index e24b74c03..37f9dd71b 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -314,9 +314,12 @@ typedef long arith_t; /* ============ Shell options */ +/* If you add/change options hare, update --help text too */ static const char *const optletters_optnames[] = { "e" "errexit", "f" "noglob", +/* bash has '-o ignoreeof', but no short synonym -I for it */ +/* (in bash, set -I disables invisible variables (what's that?)) */ "I" "ignoreeof", /* The below allowed this invocation: * ash -c 'set -i; echo $-; sleep 5; echo $-' @@ -325,9 +328,10 @@ static const char *const optletters_optnames[] = { * In our code, this is denoted by empty long name: */ "i" "", +/* (removing "i" altogether would remove it from "$-", not good) */ "m" "monitor", "n" "noexec", -/* Ditto: bash has no "set -s" */ +/* Ditto: bash has no "set -s", "set -c" */ "s" "", "c" "", "x" "xtrace", @@ -14265,7 +14269,8 @@ init(void) //usage:#define ash_trivial_usage -//usage: "[-/+OPTIONS] [-/+o OPT]... [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]" +//usage: "[-il] [-/+Cabefmnuvx] [-/+o OPT]... [-c 'SCRIPT' [ARG0 [ARGS]] / FILE [ARGS] / -s [ARGS]]" +//////// comes from ^^^^^^^^^^optletters //usage:#define ash_full_usage "\n\n" //usage: "Unix shell interpreter" -- cgit v1.2.3