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 1769c45..06fe37e 100644 (file)
--- a/generated/globals.h
+++ b/generated/globals.h
@@ -39,15 +39,6 @@ struct skeleton_data {
   int more_globals;
 };
 
-// toys/lsb/dmesg.c
-
-struct dmesg_data {
-  long level;
-  long size;
-
-  int color;
-};
-
 // toys/lsb/hostname.c
 
 struct hostname_data {
@@ -558,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 {
@@ -739,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
@@ -1038,7 +1040,6 @@ struct date_data {
   char *setfmt;
   char *showdate;
 
-  char *tz;
   unsigned nano;
 };
 
@@ -1127,6 +1128,7 @@ struct kill_data {
 // toys/posix/ls.c
 
 struct ls_data {
+  long ll;
   char *color;
 
   struct dirtree *files, *singledir;
@@ -1191,7 +1193,9 @@ struct od_data {
 // toys/posix/paste.c
 
 struct paste_data {
-  char *delim;
+  char *d;
+
+  int files;
 };
 
 // toys/posix/patch.c
@@ -1383,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;
@@ -1440,6 +1443,7 @@ 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;