Build vendor toybox unconditionally. am: 3829236617 am: cb54b3a2cf am: 4dfba4ea3a

[android-x86/external-toybox.git] / main.c

diff --git a/main.c b/main.c
index 9c70c96..fcb8702 100644 (file)
--- a/main.c
+++ b/main.c
@@ -6,14 +6,14 @@
 #include "toys.h"
 
 #ifndef TOYBOX_VERSION
-#define TOYBOX_VERSION "0.7.0"
+#define TOYBOX_VERSION "0.7.3"
 #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},
 
@@ -49,7 +49,7 @@ struct toy_list *toy_find(char *name)
     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;
   }
 }
@@ -67,6 +67,13 @@ static const int NEED_OPTIONS =
 #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[])
 {
@@ -75,11 +82,19 @@ static void toy_singleinit(struct toy_list *which, char *argv[])
 
   if (CFG_TOYBOX_I18N) setlocale(LC_ALL, "C"+!!(which->flags & TOYFLAG_LOCALE));
 
-  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();
+  // 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 (!strcmp(argv[1], "--version")) {
+      xputs("toybox "TOYBOX_VERSION);
+      xexit();
+    }
   }
 
   if (NEED_OPTIONS && which->options) get_optflags();
@@ -137,8 +152,11 @@ void toy_exec(char *argv[])
   if (!(which = toy_find(*argv))) return;
 
   // Return if stack depth getting noticeable (proxy for leaked heap, etc).
-  if (toys.stacktop && labs((char *)toys.stacktop-(char *)&which)>6000)
-    return;
+
+  // Compiler writers have decided subtracting char * is undefined behavior,
+  // so convert to integers. (LP64 says sizeof(long)==sizeof(pointer).)
+  if (!CFG_TOYBOX_NORECURSE)
+    if (toys.stacktop && labs((long)toys.stacktop-(long)&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;
@@ -163,16 +181,7 @@ void toybox_main(void)
   // 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++) {
@@ -204,6 +213,14 @@ int main(int argc, char *argv[])
   }
   *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) {