Add optional openssl accelerated versions of hash functions, loosely based on

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

diff --git a/main.c b/main.c
index e95c641..31e51b1 100644 (file)
--- a/main.c
+++ b/main.c
@@ -6,14 +6,14 @@
 #include "toys.h"
 
 #ifndef TOYBOX_VERSION
-#define TOYBOX_VERSION "0.6.1"
+#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},
 
@@ -107,7 +107,7 @@ void toy_init(struct toy_list *which, char *argv[])
 
     if (!(which->flags & TOYFLAG_STAYROOT)) {
       if (uid != euid) {
-        if (!setuid(uid)) perror_exit("setuid %d->%d", euid, uid); // drop root
+        if (setuid(uid)) perror_exit("setuid %d->%d", euid, uid); // drop root
         euid = uid;
         toys.wasroot++;
       }
@@ -137,8 +137,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;
@@ -202,7 +205,7 @@ int main(int argc, char *argv[])
 
     toys.stacktop = &stack;
   }
-  *argv = basename_r(*argv);
+  *argv = getbasename(*argv);
 
   // If nommu can't fork, special reentry path.
   // Use !stacktop to signal "vfork happened", both before and after xexec()