Merge remote-tracking branch 'toybox/master' into HEAD

[android-x86/external-toybox.git] / generated / flags.h

diff --git a/generated/flags.h b/generated/flags.h
index 0082936..a240db1 100644 (file)
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -240,18 +240,18 @@
 #undef FOR_chroot
 #endif
 
-// chrt mp#bfiorR[!bfior] mp#bfiorR[!bfior]
+// chrt ^mp#<0iRbrfo[!ibrfo] ^mp#<0iRbrfo[!ibrfo]
 #undef OPTSTR_chrt
-#define OPTSTR_chrt "mp#bfiorR[!bfior]"
+#define OPTSTR_chrt "^mp#<0iRbrfo[!ibrfo]"
 #ifdef CLEANUP_chrt
 #undef CLEANUP_chrt
 #undef FOR_chrt
-#undef FLAG_R
-#undef FLAG_r
 #undef FLAG_o
-#undef FLAG_i
 #undef FLAG_f
+#undef FLAG_r
 #undef FLAG_b
+#undef FLAG_R
+#undef FLAG_i
 #undef FLAG_p
 #undef FLAG_m
 #endif
@@ -354,9 +354,9 @@
 #undef FLAG_preserve
 #endif
 
-// cpio (no-preserve-owner)mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF] (no-preserve-owner)mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]
+// cpio (no-preserve-owner)(trailer)mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF] (no-preserve-owner)(trailer)mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]
 #undef OPTSTR_cpio
-#define OPTSTR_cpio "(no-preserve-owner)mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]"
+#define OPTSTR_cpio "(no-preserve-owner)(trailer)mduH:p:|i|t|F:v(verbose)o|[!pio][!pot][!pF]"
 #ifdef CLEANUP_cpio
 #undef CLEANUP_cpio
 #undef FOR_cpio
@@ -371,6 +371,7 @@
 #undef FLAG_u
 #undef FLAG_d
 #undef FLAG_m
+#undef FLAG_trailer
 #undef FLAG_no_preserve_owner
 #endif
 
@@ -572,9 +573,9 @@
 #undef FOR_dirname
 #endif
 
-// dmesg w(follow)CSTtrs#<1n#c[!Ttr][!Cc] w(follow)CSTtrs#<1n#c[!Ttr][!Cc]
+// dmesg w(follow)CSTtrs#<1n#c[!Ttr][!Cc][!Sw] w(follow)CSTtrs#<1n#c[!Ttr][!Cc][!Sw]
 #undef OPTSTR_dmesg
-#define OPTSTR_dmesg "w(follow)CSTtrs#<1n#c[!Ttr][!Cc]"
+#define OPTSTR_dmesg "w(follow)CSTtrs#<1n#c[!Ttr][!Cc][!Sw]"
 #ifdef CLEANUP_dmesg
 #undef CLEANUP_dmesg
 #undef FOR_dmesg
@@ -650,14 +651,15 @@
 #undef FLAG_s
 #endif
 
-// env ^iu* ^iu*
+// env ^0iu* ^0iu*
 #undef OPTSTR_env
-#define OPTSTR_env "^iu*"
+#define OPTSTR_env "^0iu*"
 #ifdef CLEANUP_env
 #undef CLEANUP_env
 #undef FOR_env
 #undef FLAG_u
 #undef FLAG_i
+#undef FLAG_0
 #endif
 
 // exit    
@@ -903,9 +905,9 @@
 #undef FLAG_t
 #endif
 
-// grep C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw] C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw]
+// grep S(exclude)*M(include)*C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw] S(exclude)*M(include)*C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw]
 #undef OPTSTR_grep
-#define OPTSTR_grep "C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw]"
+#define OPTSTR_grep "S(exclude)*M(include)*C#B#A#ZzEFHabhinorsvwclqe*f*m#x[!wx][!EFw]"
 #ifdef CLEANUP_grep
 #undef CLEANUP_grep
 #undef FOR_grep
@@ -934,6 +936,10 @@
 #undef FLAG_A
 #undef FLAG_B
 #undef FLAG_C
+#undef FLAG_include
+#undef FLAG_M
+#undef FLAG_exclude
+#undef FLAG_S
 #endif
 
 // groupadd   <1>2g#<0S
@@ -1004,12 +1010,14 @@
 #undef FLAG_c
 #endif
 
-// head ?n#<0=10 ?n#<0=10
+// head ?n#<0=10qv ?n#<0=10qv
 #undef OPTSTR_head
-#define OPTSTR_head "?n#<0=10"
+#define OPTSTR_head "?n#<0=10qv"
 #ifdef CLEANUP_head
 #undef CLEANUP_head
 #undef FOR_head
+#undef FLAG_v
+#undef FLAG_q
 #undef FLAG_n
 #endif
 
@@ -1462,9 +1470,9 @@
 #undef FLAG_l
 #endif
 
-// lspci   emkn@i:
+// lspci emkn emkn@i:
 #undef OPTSTR_lspci
-#define OPTSTR_lspci "emkn@i:"
+#define OPTSTR_lspci "emkn\ 1"
 #ifdef CLEANUP_lspci
 #undef CLEANUP_lspci
 #undef FOR_lspci
@@ -2529,9 +2537,9 @@
 #undef FLAG_f
 #endif
 
-// tar &(no-recursion)(numeric-owner)(no-same-permissions)(overwrite)(exclude)*(to-command):o(no-same-owner)p(same-permissions)k(keep-old)c(create)|h(dereference)x(extract)|t(list)|v(verbose)z(gzip)O(to-stdout)m(touch)X(exclude-from)*T(files-from)*C(directory):f(file):[!txc] &(no-recursion)(numeric-owner)(no-same-permissions)(overwrite)(exclude)*(to-command):o(no-same-owner)p(same-permissions)k(keep-old)c(create)|h(dereference)x(extract)|t(list)|v(verbose)z(gzip)O(to-stdout)m(touch)X(exclude-from)*T(files-from)*C(directory):f(file):[!txc]
+// tar &(no-recursion)(numeric-owner)(no-same-permissions)(overwrite)(exclude)*(to-command):o(no-same-owner)p(same-permissions)k(keep-old)c(create)|h(dereference)x(extract)|t(list)|v(verbose)j(bzip2)z(gzip)O(to-stdout)m(touch)X(exclude-from)*T(files-from)*C(directory):f(file):[!txc][!jz] &(no-recursion)(numeric-owner)(no-same-permissions)(overwrite)(exclude)*(to-command):o(no-same-owner)p(same-permissions)k(keep-old)c(create)|h(dereference)x(extract)|t(list)|v(verbose)j(bzip2)z(gzip)O(to-stdout)m(touch)X(exclude-from)*T(files-from)*C(directory):f(file):[!txc][!jz]
 #undef OPTSTR_tar
-#define OPTSTR_tar "&(no-recursion)(numeric-owner)(no-same-permissions)(overwrite)(exclude)*(to-command):o(no-same-owner)p(same-permissions)k(keep-old)c(create)|h(dereference)x(extract)|t(list)|v(verbose)z(gzip)O(to-stdout)m(touch)X(exclude-from)*T(files-from)*C(directory):f(file):[!txc]"
+#define OPTSTR_tar "&(no-recursion)(numeric-owner)(no-same-permissions)(overwrite)(exclude)*(to-command):o(no-same-owner)p(same-permissions)k(keep-old)c(create)|h(dereference)x(extract)|t(list)|v(verbose)j(bzip2)z(gzip)O(to-stdout)m(touch)X(exclude-from)*T(files-from)*C(directory):f(file):[!txc][!jz]"
 #ifdef CLEANUP_tar
 #undef CLEANUP_tar
 #undef FOR_tar
@@ -2549,6 +2557,8 @@
 #undef FLAG_O
 #undef FLAG_gzip
 #undef FLAG_z
+#undef FLAG_bzip2
+#undef FLAG_j
 #undef FLAG_verbose
 #undef FLAG_v
 #undef FLAG_list
@@ -3410,12 +3420,12 @@
 #ifndef TT
 #define TT this.chrt
 #endif
-#define FLAG_R (1<<0)
-#define FLAG_r (1<<1)
-#define FLAG_o (1<<2)
-#define FLAG_i (1<<3)
-#define FLAG_f (1<<4)
-#define FLAG_b (1<<5)
+#define FLAG_o (1<<0)
+#define FLAG_f (1<<1)
+#define FLAG_r (1<<2)
+#define FLAG_b (1<<3)
+#define FLAG_R (1<<4)
+#define FLAG_i (1<<5)
 #define FLAG_p (1<<6)
 #define FLAG_m (1<<7)
 #endif
@@ -3517,7 +3527,8 @@
 #define FLAG_u (1<<7)
 #define FLAG_d (1<<8)
 #define FLAG_m (1<<9)
-#define FLAG_no_preserve_owner (1<<10)
+#define FLAG_trailer (1<<10)
+#define FLAG_no_preserve_owner (1<<11)
 #endif
 
 #ifdef FOR_crond
@@ -3766,6 +3777,7 @@
 #endif
 #define FLAG_u (1<<0)
 #define FLAG_i (1<<1)
+#define FLAG_0 (1<<2)
 #endif
 
 #ifdef FOR_exit
@@ -3996,6 +4008,10 @@
 #define FLAG_A (1<<22)
 #define FLAG_B (1<<23)
 #define FLAG_C (1<<24)
+#define FLAG_include (1<<25)
+#define FLAG_M (1<<25)
+#define FLAG_exclude (1<<26)
+#define FLAG_S (1<<26)
 #endif
 
 #ifdef FOR_groupadd
@@ -4060,7 +4076,9 @@
 #ifndef TT
 #define TT this.head
 #endif
-#define FLAG_n (1<<0)
+#define FLAG_v (1<<0)
+#define FLAG_q (1<<1)
+#define FLAG_n (1<<2)
 #endif
 
 #ifdef FOR_hello
@@ -4443,10 +4461,10 @@
 #define TT this.lspci
 #endif
 #define FLAG_i (FORCED_FLAG<<0)
-#define FLAG_n (FORCED_FLAG<<1)
-#define FLAG_k (FORCED_FLAG<<2)
-#define FLAG_m (FORCED_FLAG<<3)
-#define FLAG_e (FORCED_FLAG<<4)
+#define FLAG_n (1<<1)
+#define FLAG_k (1<<2)
+#define FLAG_m (1<<3)
+#define FLAG_e (1<<4)
 #endif
 
 #ifdef FOR_lsusb
@@ -5345,28 +5363,30 @@
 #define FLAG_O (1<<5)
 #define FLAG_gzip (1<<6)
 #define FLAG_z (1<<6)
-#define FLAG_verbose (1<<7)
-#define FLAG_v (1<<7)
-#define FLAG_list (1<<8)
-#define FLAG_t (1<<8)
-#define FLAG_extract (1<<9)
-#define FLAG_x (1<<9)
-#define FLAG_dereference (1<<10)
-#define FLAG_h (1<<10)
-#define FLAG_create (1<<11)
-#define FLAG_c (1<<11)
-#define FLAG_keep_old (1<<12)
-#define FLAG_k (1<<12)
-#define FLAG_same_permissions (1<<13)
-#define FLAG_p (1<<13)
-#define FLAG_no_same_owner (1<<14)
-#define FLAG_o (1<<14)
-#define FLAG_to_command (1<<15)
-#define FLAG_exclude (1<<16)
-#define FLAG_overwrite (1<<17)
-#define FLAG_no_same_permissions (1<<18)
-#define FLAG_numeric_owner (1<<19)
-#define FLAG_no_recursion (1<<20)
+#define FLAG_bzip2 (1<<7)
+#define FLAG_j (1<<7)
+#define FLAG_verbose (1<<8)
+#define FLAG_v (1<<8)
+#define FLAG_list (1<<9)
+#define FLAG_t (1<<9)
+#define FLAG_extract (1<<10)
+#define FLAG_x (1<<10)
+#define FLAG_dereference (1<<11)
+#define FLAG_h (1<<11)
+#define FLAG_create (1<<12)
+#define FLAG_c (1<<12)
+#define FLAG_keep_old (1<<13)
+#define FLAG_k (1<<13)
+#define FLAG_same_permissions (1<<14)
+#define FLAG_p (1<<14)
+#define FLAG_no_same_owner (1<<15)
+#define FLAG_o (1<<15)
+#define FLAG_to_command (1<<16)
+#define FLAG_exclude (1<<17)
+#define FLAG_overwrite (1<<18)
+#define FLAG_no_same_permissions (1<<19)
+#define FLAG_numeric_owner (1<<20)
+#define FLAG_no_recursion (1<<21)
 #endif
 
 #ifdef FOR_taskset