Merge remote-tracking branch 'toybox/master' into HEAD

[android-x86/external-toybox.git] / generated / globals.h

diff --git a/generated/globals.h b/generated/globals.h
index 8a9be04..5e4f8ce 100644 (file)
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -44,6 +44,9 @@ struct skeleton_data {
 struct dmesg_data {
   long level;
   long size;
+
+  int use_color;
+  time_t tea;
 };
 
 // toys/lsb/hostname.c
@@ -139,12 +142,31 @@ struct umount_data {
   char *types;
 };
 
+// toys/net/ftpget.c
+
+struct ftpget_data {
+  char *user;
+  char *port;
+  char *password;
+
+  int fd;
+};
+
 // toys/net/ifconfig.c
 
 struct ifconfig_data {
   int sockfd;
 };
 
+// toys/net/microcom.c
+
+struct microcom_data {
+  char *s;
+
+  int fd;
+  struct termios original_stdin_state, original_fd_state;
+};
+
 // toys/net/netcat.c
 
 struct netcat_data {
@@ -152,6 +174,7 @@ struct netcat_data {
   long quit_delay;       // -q Exit after EOF from stdin after # seconds.
   char *source_address;  // -s Bind to a specific source address.
   long port;             // -p Bind to a specific source port.
+  long idle;             // -W Wait # seconds for more data
   long wait;             // -w Wait # seconds for a connection.
 };
 
@@ -162,6 +185,12 @@ struct netstat_data {
   int wpad;
 };;
 
+// toys/net/tunctl.c
+
+struct tunctl_data {
+  char *user;
+};
+
 // toys/other/acpi.c
 
 struct acpi_data {
@@ -183,6 +212,12 @@ struct blockdev_data {
   long bsz;
 };
 
+// toys/other/chrt.c
+
+struct chrt_data {
+  long pid;
+};
+
 // toys/other/dos2unix.c
 
 struct dos2unix_data {
@@ -192,6 +227,7 @@ struct dos2unix_data {
 // toys/other/fallocate.c
 
 struct fallocate_data {
+  long offset;
   long size;
 };
 
@@ -310,12 +346,6 @@ struct oneit_data {
   char *console;
 };
 
-// toys/other/setfattr.c
-
-struct setfattr_data {
-  char *x, *v, *n;
-};
-
 // toys/other/shred.c
 
 struct shred_data {
@@ -574,19 +604,6 @@ struct fsck_data {
   long max_nr_run;
 };
 
-// toys/pending/ftpget.c
-
-struct ftpget_data {
-  long port; //  char *port;
-  char *password;
-  char *username;
-
-  FILE *sockfp;
-  int c;
-  int isget;
-  char buf[sizeof(struct sockaddr_storage)];
-};
-
 // toys/pending/getfattr.c
 
 struct getfattr_data {
@@ -615,6 +632,12 @@ struct groupadd_data {
   long gid;
 };
 
+// toys/pending/gzip.c
+
+struct gzip_data {
+  int level;
+};
+
 // toys/pending/host.c
 
 struct host_data {
@@ -723,12 +746,13 @@ struct mke2fs_data {
 // toys/pending/modprobe.c
 
 struct modprobe_data {
+  struct arg_list *dirs;
+
   struct arg_list *probes;
   struct arg_list *dbase[256];
   char *cmdopts;
   int nudeps;
   uint8_t symreq;
-  void (*dbg)(char *format, ...);
 };
 
 // toys/pending/more.c
@@ -763,6 +787,12 @@ struct route_data {
   char *family;
 };
 
+// toys/pending/setfattr.c
+
+struct setfattr_data {
+  char *x, *v, *n;
+};
+
 // toys/pending/sh.c
 
 struct sh_data {
@@ -1016,7 +1046,6 @@ struct date_data {
   char *setfmt;
   char *showdate;
 
-  char *tz;
   unsigned nano;
 };
 
@@ -1035,7 +1064,7 @@ struct df_data {
 struct du_data {
   long maxdepth;
 
-  long depth, total;
+  unsigned long depth, total;
   dev_t st_dev;
   void *inodes;
 };
@@ -1078,13 +1107,17 @@ struct grep_data {
   long a;
   long b;
   long c;
+  struct arg_list *M;
+  struct arg_list *S;
 
   char indelim, outdelim;
+  int found;
 };
 
 // toys/posix/head.c
 
 struct head_data {
+  long bytes;
   long lines;
   int file_no;
 };
@@ -1105,6 +1138,7 @@ struct kill_data {
 // toys/posix/ls.c
 
 struct ls_data {
+  long ll;
   char *color;
 
   struct dirtree *files, *singledir;
@@ -1169,7 +1203,9 @@ struct od_data {
 // toys/posix/paste.c
 
 struct paste_data {
-  char *delim;
+  char *d;
+
+  int files;
 };
 
 // toys/posix/patch.c
@@ -1291,6 +1327,7 @@ struct split_data {
 
 struct strings_data {
   long num;
+  char *t;
 };
 
 // toys/posix/tail.c
@@ -1373,12 +1410,16 @@ extern union global_union {
        struct seq_data seq;
        struct su_data su;
        struct umount_data umount;
+       struct ftpget_data ftpget;
        struct ifconfig_data ifconfig;
+       struct microcom_data microcom;
        struct netcat_data netcat;
        struct netstat_data netstat;
+       struct tunctl_data tunctl;
        struct acpi_data acpi;
        struct base64_data base64;
        struct blockdev_data blockdev;
+       struct chrt_data chrt;
        struct dos2unix_data dos2unix;
        struct fallocate_data fallocate;
        struct free_data free;
@@ -1395,7 +1436,6 @@ extern union global_union {
        struct modinfo_data modinfo;
        struct nsenter_data nsenter;
        struct oneit_data oneit;
-       struct setfattr_data setfattr;
        struct shred_data shred;
        struct stat_data stat;
        struct swapon_data swapon;
@@ -1420,10 +1460,10 @@ extern union global_union {
        struct fdisk_data fdisk;
        struct fold_data fold;
        struct fsck_data fsck;
-       struct ftpget_data ftpget;
        struct getfattr_data getfattr;
        struct getty_data getty;
        struct groupadd_data groupadd;
+       struct gzip_data gzip;
        struct host_data host;
        struct iconv_data iconv;
        struct ip_data ip;
@@ -1439,6 +1479,7 @@ extern union global_union {
        struct openvt_data openvt;
        struct ping_data ping;
        struct route_data route;
+       struct setfattr_data setfattr;
        struct sh_data sh;
        struct sulogin_data sulogin;
        struct syslogd_data syslogd;