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 e55cecb..00fcc16 100644 (file)
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -39,6 +39,16 @@ struct skeleton_data {
   int more_globals;
 };
 
+// toys/lsb/dmesg.c
+
+struct dmesg_data {
+  long level;
+  long size;
+
+  int use_color;
+  time_t tea;
+};
+
 // toys/lsb/hostname.c
 
 struct hostname_data {
@@ -202,6 +212,12 @@ struct blockdev_data {
   long bsz;
 };
 
+// toys/other/chrt.c
+
+struct chrt_data {
+  long pid;
+};
+
 // toys/other/dos2unix.c
 
 struct dos2unix_data {
@@ -440,12 +456,6 @@ struct brctl_data {
     int sockfd;
 };
 
-// toys/pending/chrt.c
-
-struct chrt_data {
-  long pid;
-};
-
 // toys/pending/compress.c
 
 struct compress_data {
@@ -549,15 +559,6 @@ struct diff_data {
   int *offset[2];
 };
 
-// toys/pending/dmesg.c
-
-struct dmesg_data {
-  long level;
-  long size;
-
-  int color;
-};
-
 // toys/pending/dumpleases.c
 
 struct dumpleases_data {
@@ -631,6 +632,12 @@ struct groupadd_data {
   long gid;
 };
 
+// toys/pending/gzip.c
+
+struct gzip_data {
+  int level;
+};
+
 // toys/pending/host.c
 
 struct host_data {
@@ -1039,7 +1046,6 @@ struct date_data {
   char *setfmt;
   char *showdate;
 
-  char *tz;
   unsigned nano;
 };
 
@@ -1101,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
@@ -1128,6 +1137,7 @@ struct kill_data {
 // toys/posix/ls.c
 
 struct ls_data {
+  long ll;
   char *color;
 
   struct dirtree *files, *singledir;
@@ -1386,6 +1396,7 @@ 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;
@@ -1406,6 +1417,7 @@ extern union global_union {
        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;
@@ -1433,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;
@@ -1442,7 +1453,6 @@ 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;
@@ -1451,6 +1461,7 @@ extern union global_union {
        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;