X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=generated%2Fglobals.h;h=06fe37e628ac873709038c2b132c85f7b34bee82;hb=52a5544db41867cdf4a61a7b6515e6f7bd9d9f25;hp=e94633d158d311c764556189eb17ec36aac2c876;hpb=28e81a7a2bdb93b2cf9b885b0c4a24dc23cbcb08;p=android-x86%2Fexternal-toybox.git

diff --git a/generated/globals.h b/generated/globals.h
index e94633d1..06fe37e6 100644
--- 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 {
@@ -152,6 +164,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.
 };
 
@@ -198,6 +211,7 @@ struct dos2unix_data {
 // toys/other/fallocate.c
 
 struct fallocate_data {
+  long offset;
   long size;
 };
 
@@ -316,12 +330,6 @@ struct oneit_data {
   char *console;
 };
 
-// toys/other/setfattr.c
-
-struct setfattr_data {
-  char *x, *v, *n;
-};
-
 // toys/other/shred.c
 
 struct shred_data {
@@ -541,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 {
@@ -586,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 {
@@ -735,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
@@ -775,6 +781,12 @@ struct route_data {
   char *family;
 };
 
+// toys/pending/setfattr.c
+
+struct setfattr_data {
+  char *x, *v, *n;
+};
+
 // toys/pending/sh.c
 
 struct sh_data {
@@ -1028,7 +1040,6 @@ struct date_data {
   char *setfmt;
   char *showdate;
 
-  char *tz;
   unsigned nano;
 };
 
@@ -1047,7 +1058,7 @@ struct df_data {
 struct du_data {
   long maxdepth;
 
-  long depth, total;
+  unsigned long depth, total;
   dev_t st_dev;
   void *inodes;
 };
@@ -1117,6 +1128,7 @@ struct kill_data {
 // toys/posix/ls.c
 
 struct ls_data {
+  long ll;
   char *color;
 
   struct dirtree *files, *singledir;
@@ -1181,7 +1193,9 @@ struct od_data {
 // toys/posix/paste.c
 
 struct paste_data {
-  char *delim;
+  char *d;
+
+  int files;
 };
 
 // toys/posix/patch.c
@@ -1373,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;
@@ -1385,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;
@@ -1408,7 +1423,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;
@@ -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;
@@ -1453,6 +1467,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;