emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reset: better --help text

Browse Source 
function                                             old     new   delta
packed_usage                                       34175   34233     +58

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2022-01-12 17:21:14 +01:00
parent 524fecf7c3
commit 004cefa918
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
console-tools/reset.c
View File

@ -21,7 +21,7 @@
//usage:#define reset_trivial_usage //usage:#define reset_trivial_usage
//usage: "" //usage: ""
//usage:#define reset_full_usage "\n\n" //usage:#define reset_full_usage "\n\n"
//usage: "Reset the screen" //usage: "Reset terminal (ESC codes) and termios (signals, buffering, echo)"
/* "Standard" version of this tool is in ncurses package */ /* "Standard" version of this tool is in ncurses package */

9
shell/ash.c
View File

@ -11358,7 +11358,7 @@ options(int *login_sh)
int val; int val;
int c; int c;
if (login_sh) if (login_sh != NULL) /* if we came from startup code */
minusc = NULL; minusc = NULL;
while ((p = *argptr) != NULL) { while ((p = *argptr) != NULL) {
c = *p++; c = *p++;
@ -11369,7 +11369,7 @@ options(int *login_sh)
if (c == '-') { if (c == '-') {
val = 1; val = 1;
if (p[0] == '\0' || LONE_DASH(p)) { if (p[0] == '\0' || LONE_DASH(p)) {
if (!login_sh) { if (login_sh == NULL) { /* we came from setcmd() */
/* "-" means turn off -x and -v */ /* "-" means turn off -x and -v */
if (p[0] == '\0') if (p[0] == '\0')
xflag = vflag = 0; xflag = vflag = 0;
@ -11382,7 +11382,7 @@ options(int *login_sh)
} }
/* first char was + or - */ /* first char was + or - */
while ((c = *p++) != '\0') { while ((c = *p++) != '\0') {
if (login_sh) { if (login_sh != NULL) { /* if we came from startup code */
/* bash 3.2 indeed handles -c CMD and +c CMD the same */ /* bash 3.2 indeed handles -c CMD and +c CMD the same */
if (c == 'c') { if (c == 'c') {
minusc = p; /* command is after shell args */ minusc = p; /* command is after shell args */
@ -11406,6 +11406,9 @@ options(int *login_sh)
if (strcmp(p, "login") == 0) { if (strcmp(p, "login") == 0) {
*login_sh = 1; *login_sh = 1;
} }
/* TODO: --noprofile: e.g. if I want to run emergency shell from sulogin,
* I want minimal/no shell init scripts - but it insists on running it as "-ash"...
*/
break; break;
} }
} }