#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.
#include "generated/newtoys.h"
#include "generated/flags.h"
#include "generated/globals.h"
+#include "generated/tags.h"
// These live in main.c
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 {
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 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
- void *stacktop; // nested toy_exec() call count, or -1 if vforked
+ 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
extern char **environ;
#define GLOBALS(...)
-
#define ARRAY_LEN(array) (sizeof(array)/sizeof(*array))
+#define TAGGED_ARRAY(X, ...) {__VA_ARGS__}