X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=toys.h;h=0ca270f7c1d642054b3d71da1fd24cdee25254a6;hb=00a7af60ddbe98baa838326809f9b7293929c8b8;hp=7975425728014bc44816443d21f242d11a0ce1b4;hpb=0cb5b70fa4ef093b08e59db813e73f3be6ecef4b;p=android-x86%2Fexternal-toybox.git

diff --git a/toys.h b/toys.h
index 79754257..0ca270f7 100644
--- a/toys.h
+++ b/toys.h
@@ -62,13 +62,16 @@
 #include <wctype.h>
 
 // LSB 4.1 headers
+#ifndef __APPLE__
 #include <pty.h>
-#include <sys/ioctl.h>
 #include <sys/statfs.h>
 #include <sys/sysinfo.h>
+#endif
+#include <sys/ioctl.h>
 
 #include "lib/lib.h"
 #include "lib/lsm.h"
+#include "lib/toyflags.h"
 #include "toys/e2fs.h"
 
 // Get list of function prototypes for all enabled command_main() functions.
@@ -78,6 +81,7 @@
 #include "generated/newtoys.h"
 #include "generated/flags.h"
 #include "generated/globals.h"
+#include "generated/tags.h"
 
 // These live in main.c
 
@@ -85,28 +89,6 @@ struct toy_list *toy_find(char *name);
 void toy_init(struct toy_list *which, char *argv[]);
 void toy_exec(char *argv[]);
 
-// Flags describing command behavior.
-
-#define TOYFLAG_USR      (1<<0)
-#define TOYFLAG_BIN      (1<<1)
-#define TOYFLAG_SBIN     (1<<2)
-#define TOYMASK_LOCATION ((1<<4)-1)
-
-// This is a shell built-in function, running in the same process context.
-#define TOYFLAG_NOFORK   (1<<4)
-
-// Start command with a umask of 0 (saves old umask in this.old_umask)
-#define TOYFLAG_UMASK    (1<<5)
-
-// This command runs as root.
-#define TOYFLAG_STAYROOT (1<<6)
-#define TOYFLAG_NEEDROOT (1<<7)
-#define TOYFLAG_ROOTONLY (TOYFLAG_STAYROOT|TOYFLAG_NEEDROOT)
-
-// Call setlocale to listen to environment variables.
-// This invalidates sprintf("%.*s", size, string) as a valid length constraint.
-#define TOYFLAG_LOCALE   (1<<8)
-
 // Array of available commands
 
 extern struct toy_list {
@@ -122,18 +104,19 @@ extern struct toy_context {
   struct toy_list *which;  // Which entry in toy_list is this one?
   char **argv;             // Original command line arguments
   char **optargs;          // Arguments left over from get_optflags()
-  unsigned optflags;       // Command line option flags from get_optflags()
+  unsigned long long optflags; // Command line option flags from get_optflags()
   int exitval;             // Value error_exit feeds to exit()
   int optc;                // Count of optargs
-  int exithelp;            // Should error_exit print a usage message first?
   int old_umask;           // Old umask preserved by TOYFLAG_UMASK
-  int toycount;            // Total number of commands in this build
-  int signal;              // generic_signal() records what signal it saw here
+  short toycount;          // Total number of commands in this build
+  short signal;            // generic_signal() records what signal it saw here
   int signalfd;            // and writes signal to this fd, if set
+  int wasroot;             // dropped setuid
 
   // This is at the end so toy_init() doesn't zero it.
   jmp_buf *rebound;        // longjmp here instead of exit when do_rebound set
-  int recursion;           // How many nested calls to toy_exec()
+  struct arg_list *xexit;  // atexit() functions for xexit(), set by sigatexit()
+  void *stacktop;          // nested toy_exec() call count, or 0 if vforked
 } toys;
 
 // Two big temporary buffers: one for use by commands, one for library functions
@@ -143,5 +126,5 @@ extern char toybuf[4096], libbuf[4096];
 extern char **environ;
 
 #define GLOBALS(...)
-
 #define ARRAY_LEN(array) (sizeof(array)/sizeof(*array))
+#define TAGGED_ARRAY(X, ...) {__VA_ARGS__}