Change xgetpwnamid/xgetgrnamid to xgetuid/xgetgid returning the id number

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

diff --git a/main.c b/main.c
index 3949c84..c0c1b82 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},
 
@@ -75,7 +75,9 @@ 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_HELP_DASHDASH && !(which->flags & TOYFLAG_NOHELP)
+    && 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);
@@ -96,15 +98,20 @@ static void toy_singleinit(struct toy_list *which, char *argv[])
 // 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");
@@ -116,7 +123,7 @@ void toy_init(struct toy_list *which, char *argv[])
   // 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.which) memset(&this, 0, sizeof(this));
+  if (oldwhich) memset(&this, 0, sizeof(this));
 
   // Continue to portion of init needed by standalone commands
   toy_singleinit(which, argv);
@@ -132,11 +139,14 @@ 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) && getuid()) return;
+  if (toys.which && (which->flags&TOYFLAG_ROOTONLY) && toys.wasroot) return;
 
   // Run command
   toy_init(which, argv);
@@ -197,7 +207,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()