// Populate toy_list[].
#undef NEWTOY
#undef OLDTOY
#define NEWTOY(name, opts, flags) {#name, name##_main, opts, flags},
// Populate toy_list[].
#undef NEWTOY
#undef OLDTOY
#define NEWTOY(name, opts, flags) {#name, name##_main, opts, flags},
-#define OLDTOY(name, oldname, opts, flags) {#name, oldname##_main, opts, flags},
+#define OLDTOY(name, oldname, flags) \
+ {#name, oldname##_main, OPTSTR_##oldname, flags},
// If the name starts with "toybox" accept that as a match. Otherwise
// skip the first entry, which is out of order.
// If the name starts with "toybox" accept that as a match. Otherwise
// skip the first entry, which is out of order.
-#define OLDTOY(name, oldname, opts, flags) opts ||
+#define OLDTOY(name, oldname, flags) OPTSTR_##oldname ||
static const int NEED_OPTIONS =
#include "generated/newtoys.h"
0; // Ends the opts || opts || opts...
static const int NEED_OPTIONS =
#include "generated/newtoys.h"
0; // Ends the opts || opts || opts...
uid_t uid = getuid(), euid = geteuid();
if (!(which->flags & TOYFLAG_STAYROOT)) {
uid_t uid = getuid(), euid = geteuid();
if (!(which->flags & TOYFLAG_STAYROOT)) {
}
// Free old toys contents (to be reentrant), but leave rebound if any
if (toys.optargs != toys.argv+1) free(toys.optargs);
memset(&toys, 0, offsetof(struct toy_context, rebound));
}
// Free old toys contents (to be reentrant), but leave rebound if any
if (toys.optargs != toys.argv+1) free(toys.optargs);
memset(&toys, 0, offsetof(struct toy_context, rebound));
// Subset of init needed by singlemain.
toy_singleinit(which, argv);
}
// Like exec() but runs an internal toybox command instead of another file.
// Subset of init needed by singlemain.
toy_singleinit(which, argv);
}
// Like exec() but runs an internal toybox command instead of another file.
+ if (toys.recursion && (which->flags & TOYFLAG_ROOTONLY) && getuid()) return;
+ if (toys.recursion++ > 5) return;
+
+ // don't blank old optargs if our new argc lives in the old optargs.
+ if (argv>=toys.optargs && argv<=toys.optargs+toys.optc) toys.optargs = 0;
+
+ // Run command
- if (CFG_TOYBOX_HELP_DASHDASH && !strcmp(toys.argv[1], "--help")) {
- if (toys.argv[2]) toys.which = toy_find(toys.argv[2]);
- if (toys.which) {
- show_help();
- return;
- }
- } else {
- toy_exec(toys.argv+1);
- if (toys.argv[1][0] == '-') goto list;
+ toys.optc = toys.recursion = 0;
+ toy_exec(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]);
// Output list of command.
for (i=1; i<ARRAY_LEN(toy_list); i++) {
int fl = toy_list[i].flags;
// Output list of command.
for (i=1; i<ARRAY_LEN(toy_list); i++) {
int fl = toy_list[i].flags;
for (j=0; toy_paths[j]; j++)
if (fl & (1<<j)) len += printf("%s", toy_paths[j]);
}
for (j=0; toy_paths[j]; j++)
if (fl & (1<<j)) len += printf("%s", toy_paths[j]);
}
- len += printf("%s ",toy_list[i].name);
- if (len>65) {
- xputc('\n');
- len=0;
- }
+ len += printf("%s",toy_list[i].name);
+ if (++len > 65) len = 0;
+ xputc(len ? ' ' : '\n');
- if (CFG_TOYBOX_I18N) setlocale(LC_ALL, "");
+ // We check our own stdout errors, disable sigpipe killer
+ signal(SIGPIPE, SIG_IGN);
// a single toybox command built standalone with no multiplexer
toy_singleinit(toy_list, argv);
toy_list->toy_main();
// a single toybox command built standalone with no multiplexer
toy_singleinit(toy_list, argv);
toy_list->toy_main();