Tweak of Elliott Hughes's fix for an off by one error in human_readable

[android-x86/external-toybox.git] / toys.h

diff --git a/toys.h b/toys.h
index 8450b80..aa4381c 100644 (file)
--- a/toys.h
+++ b/toys.h
@@ -3,25 +3,26 @@
  * Copyright 2006 Rob Landley <rob@landley.net>
  */
 
-#include "generated/config.h"
+// Stuff that needs to go before the standard headers
 
+#include "generated/config.h"
 #include "lib/portability.h"
 
+// General posix-2008 headers
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
+#include <fnmatch.h>
 #include <grp.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <libgen.h>
 #include <math.h>
-#include <pty.h>
 #include <pwd.h>
+#include <regex.h>
 #include <sched.h>
 #include <setjmp.h>
-#include <sched.h>
-#include <shadow.h>
+#include <signal.h>
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
@@ -29,33 +30,22 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
-#include <sys/ioctl.h>
 #include <sys/mman.h>
-#include <sys/mount.h>
 #include <sys/resource.h>
 #include <sys/stat.h>
-#include <sys/statfs.h>
 #include <sys/statvfs.h>
-#include <sys/sysinfo.h>
-#include <sys/swap.h>
 #include <sys/time.h>
 #include <sys/times.h>
 #include <sys/types.h>
 #include <sys/utsname.h>
 #include <sys/wait.h>
 #include <syslog.h>
+#include <termios.h>
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
-#include <utmpx.h>
 
-// Internationalization support
-
-#include <locale.h>
-#include <wchar.h>
-#include <wctype.h>
-
-// Networking stuff
+// Posix networking
 
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -66,15 +56,26 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
+// Internationalization support (also in POSIX and LSB)
+
+#include <locale.h>
+#include <wchar.h>
+#include <wctype.h>
+
+// LSB 4.1 headers
+#include <pty.h>
+#include <sys/ioctl.h>
+#include <sys/statfs.h>
+#include <sys/sysinfo.h>
+
 #include "lib/lib.h"
 #include "toys/e2fs.h"
 
 // Get list of function prototypes for all enabled command_main() functions.
 
 #define NEWTOY(name, opts, flags) void name##_main(void);
-#define OLDTOY(name, oldname, opts, flags)
+#define OLDTOY(name, oldname, flags) void oldname##_main(void);
 #include "generated/newtoys.h"
-#include "generated/oldtoys.h"
 #include "generated/flags.h"
 #include "generated/globals.h"
 
@@ -102,6 +103,10 @@ void toy_exec(char *argv[]);
 #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 {
@@ -115,14 +120,20 @@ extern struct toy_list {
 
 extern struct toy_context {
   struct toy_list *which;  // Which entry in toy_list is this one?
-  int exitval;             // Value error_exit feeds to exit()
   char **argv;             // Original command line arguments
-  unsigned optflags;       // Command line option flags from get_optflags()
   char **optargs;          // Arguments left over from get_optflags()
+  unsigned 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
+  int signalfd;            // and writes signal to this fd, if set
+
+  // 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()
 } toys;
 
 // Two big temporary buffers: one for use by commands, one for library functions