PWN-Hunter/android_external_toybox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ryan Prichard pointed out --help and --version can't be first in aliases.

Browse Source
This commit is contained in:
Rob Landley 2021-06-09 19:00:46 -05:00
parent 412054cff0
commit 0c6000ad48
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.c
View File

@ -30,7 +30,7 @@ struct toy_list *toy_find(char *name)
if (!CFG_TOYBOX || strchr(name, '/')) return 0; if (!CFG_TOYBOX || strchr(name, '/')) return 0;
// Multiplexer name works as prefix, else skip first entry (it's out of order) // Multiplexer name works as prefix, else skip first entry (it's out of order)
if (!toys.which && strstart(&name, "toybox")) return toy_list; if (!toys.which && strstart(&name, toy_list->name)) return toy_list;
bottom = 1; bottom = 1;
// Binary search to find this command. // Binary search to find this command.
@ -75,17 +75,21 @@ void toy_singleinit(struct toy_list *which, char *argv[])
toys.toycount = ARRAY_LEN(toy_list); toys.toycount = ARRAY_LEN(toy_list);
// Parse --help and --version for (almost) all commands // Parse --help and --version for (almost) all commands
if (CFG_TOYBOX_HELP_DASHDASH && !(which->flags & TOYFLAG_NOHELP) && argv[1]) { if (CFG_TOYBOX_HELP_DASHDASH && !(which->flags & TOYFLAG_NOHELP)) {
if (!strcmp(argv[1], "--help")) { char **args;
if (CFG_TOYBOX && toys.which == toy_list && toys.argv[2])
if (!(toys.which = toy_find(toys.argv[2]))) unknown(toys.argv[2]);
show_help(stdout, 1);
xexit();
}
if (!strcmp(argv[1], "--version")) { for (args = toys.argv+1; *args; args++) {
xprintf("toybox %s\n", toybox_version); if (!strcmp(*args, "--help")) {
xexit(); if (CFG_TOYBOX && toys.which == toy_list && args[1])
if (!(toys.which = toy_find(args[1]))) unknown(args[1]);
show_help(stdout, 1);
xexit();
}
if (!strcmp(*args, "--version")) {
xprintf("toybox %s\n", toybox_version);
xexit();
}
} }
} }