#include "toys.h"
#ifndef TOYBOX_VERSION
-#define TOYBOX_VERSION "0.7.0"
+#ifndef TOYBOX_VENDOR
+#define TOYBOX_VENDOR ""
+#endif
+#define TOYBOX_VERSION "0.7.5"TOYBOX_VENDOR
#endif
// Populate toy_list[].
#undef NEWTOY
#undef OLDTOY
-#define NEWTOY(name, opts, flags) {#name, name##_main, opts, flags},
+#define NEWTOY(name, opts, flags) {#name, name##_main, OPTSTR_##name, flags},
#define OLDTOY(name, oldname, flags) \
{#name, oldname##_main, OPTSTR_##oldname, flags},
if (middle<bottom || middle>top) return NULL;
result = strcmp(name,toy_list[middle].name);
if (!result) return toy_list+middle;
- if (result<0) top=--middle;
+ if (result<0) top = --middle;
else bottom = ++middle;
}
}
#include "generated/newtoys.h"
0; // Ends the opts || opts || opts...
+static void unknown(char *name)
+{
+ toys.exitval = 127;
+ toys.which = toy_list;
+ error_exit("Unknown command %s", name);
+}
+
// Setup toybox global state for this command.
static void toy_singleinit(struct toy_list *which, char *argv[])
{
toys.which = which;
toys.argv = argv;
- if (CFG_TOYBOX_I18N) setlocale(LC_ALL, "C"+!!(which->flags & TOYFLAG_LOCALE));
+ if (CFG_TOYBOX_I18N) setlocale(LC_CTYPE, "C.UTF-8");
+
+ // Parse --help and --version for (almost) all commands
+ if (CFG_TOYBOX_HELP_DASHDASH && !(which->flags & TOYFLAG_NOHELP) && argv[1]) {
+ if (!strcmp(argv[1], "--help")) {
+ 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);
+ xexit();
+ }
- if (CFG_TOYBOX_HELP_DASHDASH && argv[1] && !strcmp(argv[1], "--help")) {
- if (CFG_TOYBOX && toys.which == toy_list && toys.argv[2])
- if (!(toys.which = toy_find(toys.argv[2]))) return;
- show_help(stdout);
- xexit();
+ if (!strcmp(argv[1], "--version")) {
+ xputs("toybox "TOYBOX_VERSION);
+ xexit();
+ }
}
if (NEED_OPTIONS && which->options) get_optflags();
// For early error reporting
toys.which = toy_list;
- if (toys.argv[1]) {
- if (!strcmp("--version", toys.argv[1])) {
- xputs(TOYBOX_VERSION);
- xexit();
- }
- if (toys.argv[1][0] != '-') {
- toys.exitval = 127;
- error_exit("Unknown command %s", toys.argv[1]);
- }
- }
+ if (toys.argv[1] && toys.argv[1][0] != '-') unknown(toys.argv[1]);
// Output list of command.
for (i=1; i<ARRAY_LEN(toy_list); i++) {
}
*argv = getbasename(*argv);
+ // Up to and including Android M, bionic's dynamic linker added a handler to
+ // cause a crash dump on SIGPIPE. That was removed in Android N, but adbd
+ // was still setting the SIGPIPE disposition to SIG_IGN, and its children
+ // were inheriting that. In Android O, adbd is fixed, but manually asking
+ // for the default disposition is harmless, and it'll be a long time before
+ // no one's using anything older than O!
+ if (CFG_TOYBOX_ON_ANDROID) signal(SIGPIPE, SIG_DFL);
+
// If nommu can't fork, special reentry path.
// Use !stacktop to signal "vfork happened", both before and after xexec()
if (!CFG_TOYBOX_FORK) {