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 9de354c..00fcc16 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 {
@@ -190,6 +212,12 @@ struct blockdev_data {
   long bsz;
 };
 
+// toys/other/chrt.c
+
+struct chrt_data {
+  long pid;
+};
+
 // toys/other/dos2unix.c
 
 struct dos2unix_data {
@@ -428,12 +456,6 @@ struct brctl_data {
     int sockfd;
 };
 
-// toys/pending/chrt.c
-
-struct chrt_data {
-  long pid;
-};
-
 // toys/pending/compress.c
 
 struct compress_data {
@@ -582,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 {
@@ -623,6 +632,12 @@ struct groupadd_data {
   long gid;
 };
 
+// toys/pending/gzip.c
+
+struct gzip_data {
+  int level;
+};
+
 // toys/pending/host.c
 
 struct host_data {
@@ -731,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
@@ -1030,7 +1046,6 @@ struct date_data {
   char *setfmt;
   char *showdate;
 
-  char *tz;
   unsigned nano;
 };
 
@@ -1092,8 +1107,11 @@ 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
@@ -1119,6 +1137,7 @@ struct kill_data {
 // toys/posix/ls.c
 
 struct ls_data {
+  long ll;
   char *color;
 
   struct dirtree *files, *singledir;
@@ -1183,7 +1202,9 @@ struct od_data {
 // toys/posix/paste.c
 
 struct paste_data {
-  char *delim;
+  char *d;
+
+  int files;
 };
 
 // toys/posix/patch.c
@@ -1387,13 +1408,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;
@@ -1421,7 +1445,6 @@ extern union global_union {
        struct arping_data arping;
        struct bootchartd_data bootchartd;
        struct brctl_data brctl;
-       struct chrt_data chrt;
        struct compress_data compress;
        struct crond_data crond;
        struct crontab_data crontab;
@@ -1435,10 +1458,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;