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 5fa4ed7..06fe37e 100644 (file)
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -39,13 +39,6 @@ struct skeleton_data {
   int more_globals;
 };
 
-// toys/lsb/dmesg.c
-
-struct dmesg_data {
-  long level;
-  long size;
-};
-
 // toys/lsb/hostname.c
 
 struct hostname_data {
@@ -139,12 +132,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 {
@@ -199,6 +211,7 @@ struct dos2unix_data {
 // toys/other/fallocate.c
 
 struct fallocate_data {
+  long offset;
   long size;
 };
 
@@ -536,6 +549,16 @@ struct diff_data {
   int *offset[2];
 };
 
+// toys/pending/dmesg.c
+
+struct dmesg_data {
+  long level;
+  long size;
+
+  int use_color;
+  struct sysinfo info;
+};
+
 // toys/pending/dumpleases.c
 
 struct dumpleases_data {
@@ -581,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 {
@@ -730,12 +740,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
@@ -1029,7 +1040,6 @@ struct date_data {
   char *setfmt;
   char *showdate;
 
-  char *tz;
   unsigned nano;
 };
 
@@ -1118,6 +1128,7 @@ struct kill_data {
 // toys/posix/ls.c
 
 struct ls_data {
+  long ll;
   char *color;
 
   struct dirtree *files, *singledir;
@@ -1182,7 +1193,9 @@ struct od_data {
 // toys/posix/paste.c
 
 struct paste_data {
-  char *delim;
+  char *d;
+
+  int files;
 };
 
 // toys/posix/patch.c
@@ -1374,7 +1387,6 @@ extern union global_union {
        struct log_data log;
        struct hello_data hello;
        struct skeleton_data skeleton;
-       struct dmesg_data dmesg;
        struct hostname_data hostname;
        struct killall_data killall;
        struct md5sum_data md5sum;
@@ -1386,7 +1398,9 @@ 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;
@@ -1429,12 +1443,12 @@ extern union global_union {
        struct dhcp6_data dhcp6;
        struct dhcpd_data dhcpd;
        struct diff_data diff;
+       struct dmesg_data dmesg;
        struct dumpleases_data dumpleases;
        struct expr_data expr;
        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;