Make xopen() skip stdin/stdout/stderr, add xopen_stdio() if you want stdout,

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

diff --git a/main.c b/main.c
index 14c4ff7..31e51b1 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.1"
 #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},
 
@@ -140,7 +140,8 @@ void toy_exec(char *argv[])
 
   // Compiler writers have decided subtracting char * is undefined behavior,
   // so convert to integers. (LP64 says sizeof(long)==sizeof(pointer).)
-  if (toys.stacktop && labs((long)toys.stacktop-(long)&which)>6000) return;
+  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;