#include "toys.h"
#ifndef TOYBOX_VERSION
-#define TOYBOX_VERSION "0.5.2"
+#define TOYBOX_VERSION "0.7.0"
#endif
// Populate toy_list[].
#include "generated/newtoys.h"
0; // Ends the opts || opts || opts...
-// Subset of init needed by singlemain
+// Setup toybox global state for this command.
static void toy_singleinit(struct toy_list *which, char *argv[])
{
toys.which = which;
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();
+ show_help(stdout);
xexit();
}
if (NEED_OPTIONS && which->options) get_optflags();
else {
toys.optargs = argv+1;
- for (toys.optc=0; toys.optargs[toys.optc]; toys.optc++);
+ for (toys.optc = 0; toys.optargs[toys.optc]; toys.optc++);
}
toys.old_umask = umask(0);
if (!(which->flags & TOYFLAG_UMASK)) umask(toys.old_umask);
toys.toycount = ARRAY_LEN(toy_list);
}
-// Setup toybox global state for this command.
-
+// Full init needed by multiplexer or reentrant calls, calls singleinit at end
void toy_init(struct toy_list *which, char *argv[])
{
+ void *oldwhich = toys.which;
+
// Drop permissions for non-suid commands.
if (CFG_TOYBOX_SUID) {
+ if (!toys.which) toys.which = toy_list;
+
uid_t uid = getuid(), euid = geteuid();
if (!(which->flags & TOYFLAG_STAYROOT)) {
if (uid != euid) {
- if (!setuid(uid)) perror_exit("setuid %d->%d", euid, uid); // drop root
- else euid = uid;
+ if (setuid(uid)) perror_exit("setuid %d->%d", euid, uid); // drop root
+ euid = uid;
+ toys.wasroot++;
}
} else if (CFG_TOYBOX_DEBUG && uid && which != toy_list)
error_msg("Not installed suid root");
- if ((which->flags & TOYFLAG_NEEDROOT) && euid) {
- toys.exithelp++;
- error_exit("Not root");
- }
+ if ((which->flags & TOYFLAG_NEEDROOT) && euid) help_exit("Not root");
}
// Free old toys contents (to be reentrant), but leave rebound if any
-
- if (toys.optargs != toys.argv+1) free(toys.optargs);
+ // don't blank old optargs if our new argc lives in the old optargs.
+ if (argv<toys.optargs || argv>toys.optargs+toys.optc) free(toys.optargs);
memset(&toys, 0, offsetof(struct toy_context, rebound));
- if (toys.recursion > 1) memset(&this, 0, sizeof(this));
+ if (oldwhich) memset(&this, 0, sizeof(this));
- // Subset of init needed by singlemain.
+ // Continue to portion of init needed by standalone commands
toy_singleinit(which, argv);
}
{
struct toy_list *which;
- // Return if we can't find it, or need to re-exec to acquire root,
- // or if stack depth is getting silly.
- if (!(which = toy_find(argv[0]))) return;
- if (toys.recursion && (which->flags & TOYFLAG_ROOTONLY) && getuid()) return;
- if (toys.recursion++ > 5) return;
+ // Return if we can't find it (which includes no multiplexer case),
+ if (!(which = toy_find(*argv))) 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;
+ // Return if stack depth getting noticeable (proxy for leaked heap, etc).
+ if (toys.stacktop && labs((char *)toys.stacktop-(char *)&which)>6000)
+ return;
+
+ // Return if we need to re-exec to acquire root via suid bit.
+ if (toys.which && (which->flags&TOYFLAG_ROOTONLY) && toys.wasroot) return;
// Run command
toy_init(which, argv);
// Multiplexer command, first argument is command to run, rest are args to that.
// If first argument starts with - output list of command install paths.
-
void toybox_main(void)
{
static char *toy_paths[]={"usr/","bin/","sbin/",0};
int i, len = 0;
+ // fast path: try to exec immediately.
+ // (Leave toys.which null to disable suid return logic.)
+ if (toys.argv[1]) toy_exec(toys.argv+1);
+
+ // For early error reporting
toys.which = toy_list;
+
if (toys.argv[1]) {
- 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] != '-') error_exit("Unknown command %s", toys.argv[1]);
+ if (toys.argv[1][0] != '-') {
+ toys.exitval = 127;
+ error_exit("Unknown command %s", toys.argv[1]);
+ }
}
// Output list of command.
xputc('\n');
}
-static void shutup_sigpipe(int i)
-{
- // exit success from sigpipe to mollify overzealous crash reporting.
- _exit(0);
-}
-
int main(int argc, char *argv[])
{
- if (CFG_TOYBOX_ON_ANDROID) signal(SIGPIPE, shutup_sigpipe);
- else signal(SIGPIPE, SIG_IGN);
+ if (!*argv) return 127;
- if (CFG_TOYBOX) {
- // Trim path off of command name
- *argv = basename(*argv);
+ // Snapshot stack location so we can detect recursion depth later.
+ // This is its own block so probe doesn't permanently consume stack.
+ else {
+ int stack;
+
+ toys.stacktop = &stack;
+ }
+ *argv = basename_r(*argv);
+
+ // If nommu can't fork, special reentry path.
+ // Use !stacktop to signal "vfork happened", both before and after xexec()
+ if (!CFG_TOYBOX_FORK) {
+ if (0x80 & **argv) {
+ **argv &= 0x7f;
+ toys.stacktop = 0;
+ }
+ }
+ if (CFG_TOYBOX) {
// Call the multiplexer, adjusting this argv[] to be its' argv[1].
// (It will adjust it back before calling toy_exec().)
toys.argv = argv-1;